feat(contracts): accept batches with version > 1 (#1317)

Co-authored-by: HAOYUatHZ <[email protected]>
Co-authored-by: Xi Lin <[email protected]>

Author: 3 people

docs/apis/ScrollChain.md

@@ -882,17 +882,6 @@ error ErrorIncorrectPreviousStateRoot()
 *Thrown when the previous state root doesn't match stored one.*
 
 
-### ErrorInvalidBatchHeaderVersion
-
-```solidity
-error ErrorInvalidBatchHeaderVersion()
-```
-
-
-
-*Thrown when the batch header version is invalid.*
-
-
 ### ErrorLastL1MessageSkipped
 
 ```solidity

integration-test/ScrollChain.blob.spec.ts

@@ -98,19 +98,6 @@ describe("ScrollChain.blob", async () => {
       batchHeader0[25] = 1;
     });
 
-    it("should revert when ErrorInvalidBatchHeaderVersion", async () => {
-      const header = new Uint8Array(121);
-      header[0] = 2;
-      await expect(chain.commitBatch(1, header, ["0x"], "0x")).to.revertedWithCustomError(
-        chain,
-        "ErrorInvalidBatchHeaderVersion"
-      );
-      await expect(chain.commitBatch(2, batchHeader0, ["0x"], "0x")).to.revertedWithCustomError(
-        chain,
-        "ErrorInvalidBatchHeaderVersion"
-      );
-    });
-
     it("should revert when ErrorNoBlobFound", async () => {
       await expect(chain.commitBatch(1, batchHeader0, ["0x"], "0x")).to.revertedWithCustomError(
         chain,

src/L1/rollup/ScrollChain.sol

@@ -74,9 +74,6 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
     /// @dev Thrown when the previous state root doesn't match stored one.
     error ErrorIncorrectPreviousStateRoot();
 
-    /// @dev Thrown when the batch header version is invalid.
-    error ErrorInvalidBatchHeaderVersion();
-
     /// @dev Thrown when the last message is skipped.
     error ErrorLastL1MessageSkipped();
 
@@ -119,7 +116,8 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
 
     /// @dev BLS Modulus value defined in EIP-4844 and the magic value returned from a successful call to the
     /// point evaluation precompile
-    uint256 private constant BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513;
+    uint256 private constant BLS_MODULUS =
+        52435875175126190479447740508185965837690552500527637822603658699938581184513;
 
     /// @notice The chain id of the corresponding layer 2 chain.
     uint64 public immutable layer2ChainId;
@@ -310,7 +308,10 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
                 batchPtr,
                 BatchHeaderV0Codec.BATCH_HEADER_FIXED_LENGTH + _skippedL1MessageBitmap.length
             );
-        } else if (_version == 1) {
+        } else if (_version >= 1) {
+            // versions 1 and 2 both use ChunkCodecV1 and BatchHeaderV1Codec,
+            // but they use different blob encoding and different verifiers.
+
             bytes32 blobVersionedHash;
             (blobVersionedHash, _dataHash, _totalL1MessagesPoppedInBatch) = _commitChunksV1(
                 _totalL1MessagesPoppedOverall,
@@ -322,7 +323,7 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
                 _totalL1MessagesPoppedOverall := add(_totalL1MessagesPoppedOverall, _totalL1MessagesPoppedInBatch)
             }
             // store entries, the order matters
-            BatchHeaderV1Codec.storeVersion(batchPtr, 1);
+            BatchHeaderV1Codec.storeVersion(batchPtr, _version);
             BatchHeaderV1Codec.storeBatchIndex(batchPtr, _batchIndex);
             BatchHeaderV1Codec.storeL1MessagePopped(batchPtr, _totalL1MessagesPoppedInBatch);
             BatchHeaderV1Codec.storeTotalL1MessagePopped(batchPtr, _totalL1MessagesPoppedOverall);
@@ -335,8 +336,6 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
                 batchPtr,
                 BatchHeaderV1Codec.BATCH_HEADER_FIXED_LENGTH + _skippedL1MessageBitmap.length
             );
-        } else {
-            revert ErrorInvalidBatchHeaderVersion();
         }
 
         // check the length of bitmap
@@ -711,18 +710,15 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
             version := shr(248, calldataload(_batchHeader.offset))
         }
 
-        // version should be always 0 or 1 in current code
         uint256 _length;
         if (version == 0) {
             (batchPtr, _length) = BatchHeaderV0Codec.loadAndValidate(_batchHeader);
             _batchHash = BatchHeaderV0Codec.computeBatchHash(batchPtr, _length);
             _batchIndex = BatchHeaderV0Codec.getBatchIndex(batchPtr);
-        } else if (version == 1) {
+        } else if (version >= 1) {
             (batchPtr, _length) = BatchHeaderV1Codec.loadAndValidate(_batchHeader);
             _batchHash = BatchHeaderV1Codec.computeBatchHash(batchPtr, _length);
             _batchIndex = BatchHeaderV1Codec.getBatchIndex(batchPtr);
-        } else {
-            revert ErrorInvalidBatchHeaderVersion();
         }
         // only check when genesis is imported
         if (committedBatches[_batchIndex] != _batchHash && finalizedStateRoots[0] != bytes32(0)) {

src/test/ScrollChain.t.sol

@@ -89,12 +89,6 @@ contract ScrollChainTest is DSTestPlus {
         rollup.commitBatch(0, batchHeader0, new bytes[](0), new bytes(0));
         hevm.stopPrank();
 
-        // invalid version, revert
-        hevm.startPrank(address(0));
-        hevm.expectRevert(ScrollChain.ErrorInvalidBatchHeaderVersion.selector);
-        rollup.commitBatch(2, batchHeader0, new bytes[](1), new bytes(0));
-        hevm.stopPrank();
-
         // batch header length too small, revert
         hevm.startPrank(address(0));
         hevm.expectRevert(BatchHeaderV0Codec.ErrorBatchHeaderLengthTooSmall.selector);