fix: add missing _finalizePoppedL1Messages in ScrollChainMockFinalize…

… contract
scroll-tech · Jul 30, 2024 · da5a1df · da5a1df
1 parent 79bc0f9
commit da5a1df
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/mocks/ScrollChainMockFinalize.sol b/src/mocks/ScrollChainMockFinalize.sol
@@ -64,7 +64,9 @@ contract ScrollChainMockFinalize is ScrollChain {
         if (_postStateRoot == bytes32(0)) revert ErrorStateRootIsZero();
 
         // compute pending batch hash and verify
-        (, bytes32 _batchHash, uint256 _batchIndex, ) = _loadBatchHeader(_batchHeader);
+        (, bytes32 _batchHash, uint256 _batchIndex, uint256 _totalL1MessagesPoppedOverall) = _loadBatchHeader(
+            _batchHeader
+        );
         if (_batchIndex <= lastFinalizedBatchIndex) revert ErrorBatchIsAlreadyVerified();
 
         // store in state
@@ -73,6 +75,9 @@ contract ScrollChainMockFinalize is ScrollChain {
         finalizedStateRoots[_batchIndex] = _postStateRoot;
         withdrawRoots[_batchIndex] = _withdrawRoot;
 
+        // Pop finalized and non-skipped message from L1MessageQueue.
+        _finalizePoppedL1Messages(_totalL1MessagesPoppedOverall);
+
         emit FinalizeBatch(_batchIndex, _batchHash, _postStateRoot, _withdrawRoot);
     }
 }