fix unit tests

Author: zimpha

src/L1/rollup/IScrollChain.sol

@@ -124,13 +124,11 @@ interface IScrollChain {
     /// @param postStateRoot The state root after current batch.
     /// @param withdrawRoot The withdraw trie root after current batch.
     /// @param zkProof The zk proof for current batch (single-batch bundle).
-    /// @param teeProof The tee proof for current batch (single-batch bundle).
     struct FinalizeStruct {
         bytes batchHeader;
         bytes32 postStateRoot;
         bytes32 withdrawRoot;
         bytes zkProof;
-        bytes teeProof;
     }
 
     /// @notice Commit a batch of transactions on layer 1 with blob data proof and finalize it.

src/L1/rollup/ScrollChain.sol

@@ -257,7 +257,7 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
                 step <<= 1;
             }
             step >>= 1;
-            while (step > 1) {
+            while (step > 0) {
                 if (committedBatches[index + step] != bytes32(0)) {
                     index += step;
                 }
@@ -363,6 +363,11 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
                 _totalL1MessagesPoppedOverallFirstBatch - l1MessagePoppedFirstBatch
             );
         }
+
+        // update lastCommittedBatchIndex
+        unchecked {
+            enforcedBatchParameters.lastCommittedBatchIndex = uint64(_firstBatchIndex - 1);
+        }
     }
 
     /// @inheritdoc IScrollChain
@@ -556,21 +561,14 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
         }
     }
 
-    /// @dev Internal function to get the blob versioned hash.
+    /// @dev Internal function to get and check the blob versioned hash.
+    /// @param _blobDataProof The blob data proof passing to point evaluation precompile.
     /// @return _blobVersionedHash The retrieved blob versioned hash.
-    function _checkAndGetBlobVersionedHash(bytes calldata _blobDataProof)
+    function _getAndCheckBlobVersionedHash(bytes calldata _blobDataProof)
         internal
-        virtual
         returns (bytes32 _blobVersionedHash)
     {
-        bytes32 _secondBlob;
-        // Get blob's versioned hash
-        assembly {
-            _blobVersionedHash := blobhash(0)
-            _secondBlob := blobhash(1)
-        }
-        if (_blobVersionedHash == bytes32(0)) revert ErrorNoBlobFound();
-        if (_secondBlob != bytes32(0)) revert ErrorFoundMultipleBlobs();
+        _blobVersionedHash = _getBlobVersionedHash();
 
         // Calls the point evaluation precompile and verifies the output
         (bool success, bytes memory data) = POINT_EVALUATION_PRECOMPILE_ADDR.staticcall(
@@ -583,6 +581,19 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
         if (result != BLS_MODULUS) revert ErrorUnexpectedPointEvaluationPrecompileOutput();
     }
 
+    /// @dev Internal function to get the blob versioned hash.
+    /// @return _blobVersionedHash The retrieved blob versioned hash.
+    function _getBlobVersionedHash() internal virtual returns (bytes32 _blobVersionedHash) {
+        bytes32 _secondBlob;
+        // Get blob's versioned hash
+        assembly {
+            _blobVersionedHash := blobhash(0)
+            _secondBlob := blobhash(1)
+        }
+        if (_blobVersionedHash == bytes32(0)) revert ErrorNoBlobFound();
+        if (_secondBlob != bytes32(0)) revert ErrorFoundMultipleBlobs();
+    }
+
     /// @dev Internal function to commit a batch.
     function _commitBatch(
         uint8 _version,
@@ -639,7 +650,7 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
         BatchHeaderV0Codec.storeDataHash(batchPtr, _dataHash);
 
         // verify blob versioned hash
-        BatchHeaderV1Codec.storeBlobVersionedHash(batchPtr, _checkAndGetBlobVersionedHash(_blobDataProof));
+        BatchHeaderV1Codec.storeBlobVersionedHash(batchPtr, _getAndCheckBlobVersionedHash(_blobDataProof));
         BatchHeaderV1Codec.storeParentBatchHash(batchPtr, _parentBatchHash);
 
         uint256 lastBlockTimestamp;

src/mocks/ScrollChainMockBlob.sol

@@ -50,12 +50,7 @@ contract ScrollChainMockBlob is ScrollChain {
         overrideBatchHashCheck = status;
     }
 
-    function _checkAndGetBlobVersionedHash(bytes calldata)
-        internal
-        virtual
-        override
-        returns (bytes32 _blobVersionedHash)
-    {
+    function _getBlobVersionedHash() internal virtual override returns (bytes32 _blobVersionedHash) {
         _blobVersionedHash = blobVersionedHash;
     }
 

src/test/L1GatewayTestBase.t.sol

@@ -161,29 +161,26 @@ abstract contract L1GatewayTestBase is ScrollTestBase {
         chunk0[0] = bytes1(uint8(1)); // one block in this chunk
         chunks[0] = chunk0;
         hevm.startPrank(address(0));
-        // rollup.commitBatch(1, batchHeader0, chunks, new bytes(0));
+        rollup.commitBatchWithBlobProof(3, batchHeader0, chunks, new bytes(0), blobDataProof);
         hevm.stopPrank();
 
-        bytes memory batchHeader1 = new bytes(121);
+        bytes memory batchHeader1 = new bytes(193);
         assembly {
-            mstore8(add(batchHeader1, 0x20), 1) // version
+            mstore8(add(batchHeader1, 0x20), 3) // version
             mstore(add(batchHeader1, add(0x20, 1)), shl(192, 1)) // batchIndex
-            mstore(add(batchHeader1, add(0x20, 9)), 0) // l1MessagePopped
-            mstore(add(batchHeader1, add(0x20, 17)), 0) // totalL1MessagePopped
+            mstore(add(batchHeader1, add(0x20, 9)), shl(192, 0)) // l1MessagePopped
+            mstore(add(batchHeader1, add(0x20, 17)), shl(192, 0)) // totalL1MessagePopped
             mstore(add(batchHeader1, add(0x20, 25)), 0x246394445f4fe64ed5598554d55d1682d6fb3fe04bf58eb54ef81d1189fafb51) // dataHash
-            mstore(add(batchHeader1, add(0x20, 57)), blobVersionedHash) // blobVersionedHash
+            mstore(add(batchHeader1, add(0x20, 57)), 0x013590dc3544d56629ba81bb14d4d31248f825001653aa575eb8e3a719046757) // blobVersionedHash
             mstore(add(batchHeader1, add(0x20, 89)), batchHash0) // parentBatchHash
+            mstore(add(batchHeader1, add(0x20, 121)), 0) // lastBlockTimestamp
+            mcopy(add(batchHeader1, add(0x20, 129)), add(blobDataProof, 0x20), 64) // blobDataProof
         }
 
         hevm.startPrank(address(0));
-        /*rollup.finalizeBatchWithProof4844(
-            batchHeader1,
-            bytes32(uint256(1)),
-            bytes32(uint256(2)),
-            messageHash,
-            blobDataProof,
-            new bytes(0)
-        );*/
+        rollup.finalizeBundleWithProof(batchHeader1, bytes32(uint256(2)), messageHash, new bytes(0));
         hevm.stopPrank();
+
+        rollup.lastFinalizedBatchIndex();
     }
 }