fix(contracts): OZ-N08 Inconsistent Order of Event Emissions (#876)

Co-authored-by: zimpha <zimpha@users.noreply.github.com> Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
scroll-tech · Aug 25, 2023 · 6631569 · 6631569
1 parent 3499c59
commit 6631569
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/common/version/version.go b/common/version/version.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-var tag = "v4.1.112"
+var tag = "v4.1.113"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

diff --git a/contracts/src/L1/rollup/ScrollChain.sol b/contracts/src/L1/rollup/ScrollChain.sol
@@ -272,9 +272,10 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
         require(_batchIndex > lastFinalizedBatchIndex, "can only revert unfinalized batch");
 
         while (_count > 0) {
+            committedBatches[_batchIndex] = bytes32(0);
+
             emit RevertBatch(_batchIndex, _batchHash);
 
-            committedBatches[_batchIndex] = bytes32(0);
             unchecked {
                 _batchIndex += 1;
                 _count -= 1;