skip relay proof in L1; update gas price through L1BlockContainer

Author: zimpha

contracts/integration-test/L1BlockContainer.spec.ts

@@ -134,7 +134,9 @@ describe("L1BlockContainer", async () => {
         const whitelist = await Whitelist.deploy(deployer.address);
         await container.updateWhitelist(whitelist.address);
 
-        await expect(container.importBlockHeader(constants.HashZero, [], [])).to.revertedWith("Not whitelist sender");
+        await expect(container.importBlockHeader(constants.HashZero, [], false)).to.revertedWith(
+          "Not whitelisted sender"
+        );
       });
 
       it("should revert, when block hash mismatch", async () => {
@@ -146,7 +148,7 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.parentHash, headerRLP, "0x")).to.revertedWith(
+        await expect(container.importBlockHeader(test.parentHash, headerRLP, false)).to.revertedWith(
           "Block hash mismatch"
         );
       });
@@ -160,7 +162,7 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, concat([headerRLP, "0x00"]), "0x")).to.revertedWith(
+        await expect(container.importBlockHeader(test.hash, concat([headerRLP, "0x00"]), false)).to.revertedWith(
           "Header RLP length mismatch"
         );
       });
@@ -174,7 +176,7 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, headerRLP, "0x")).to.revertedWith("Parent not imported");
+        await expect(container.importBlockHeader(test.hash, headerRLP, false)).to.revertedWith("Parent not imported");
       });
 
       it("should revert, when block height mismatch", async () => {
@@ -186,7 +188,7 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, headerRLP, "0x")).to.revertedWith("Block height mismatch");
+        await expect(container.importBlockHeader(test.hash, headerRLP, false)).to.revertedWith("Block height mismatch");
       });
 
       it("should revert, when parent block has larger timestamp", async () => {
@@ -198,7 +200,7 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, headerRLP, "0x")).to.revertedWith(
+        await expect(container.importBlockHeader(test.hash, headerRLP, false)).to.revertedWith(
           "Parent block has larger timestamp"
         );
       });
@@ -213,7 +215,7 @@ describe("L1BlockContainer", async () => {
         );
         expect(await container.latestBlockHash()).to.eq(test.parentHash);
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, headerRLP, "0x"))
+        await expect(container.importBlockHeader(test.hash, headerRLP, false))
           .to.emit(container, "ImportBlock")
           .withArgs(test.hash, test.blockHeight, test.blockTimestamp, test.baseFee, test.stateRoot);
         expect(await container.getStateRoot(test.hash)).to.eq(test.stateRoot);

contracts/src/L1/L1ScrollMessenger.sol

@@ -7,7 +7,7 @@ import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/securit
 import { IScrollChain } from "./rollup/IScrollChain.sol";
 import { IL1MessageQueue } from "./rollup/IL1MessageQueue.sol";
 import { IL1ScrollMessenger } from "./IL1ScrollMessenger.sol";
-import { ScrollConstants } from "../libraries/ScrollConstants.sol";
+import { ScrollConstants } from "../libraries/constants/ScrollConstants.sol";
 import { IScrollMessenger } from "../libraries/IScrollMessenger.sol";
 import { ScrollMessengerBase } from "../libraries/ScrollMessengerBase.sol";
 import { WithdrawTrieVerifier } from "../libraries/verifier/WithdrawTrieVerifier.sol";
@@ -127,11 +127,14 @@ contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1Scrol
     {
       address _rollup = rollup;
       require(IScrollChain(_rollup).isBatchFinalized(_proof.batchHash), "Batch is not finalized");
+      // @note skip verify for now
+      /*
       bytes32 _messageRoot = IScrollChain(_rollup).getL2MessageRoot(_proof.batchHash);
       require(
         WithdrawTrieVerifier.verifyMerkleProof(_messageRoot, _xDomainCalldataHash, _nonce, _proof.merkleProof),
         "Invalid proof"
       );
+      */
     }
 
     // @note This usually will never happen, just in case.

contracts/src/L2/L2ScrollMessenger.sol

@@ -10,7 +10,7 @@ import { IL1BlockContainer } from "./predeploys/IL1BlockContainer.sol";
 import { IL1GasPriceOracle } from "./predeploys/IL1GasPriceOracle.sol";
 
 import { PatriciaMerkleTrieVerifier } from "../libraries/verifier/PatriciaMerkleTrieVerifier.sol";
-import { ScrollConstants } from "../libraries/ScrollConstants.sol";
+import { ScrollConstants } from "../libraries/constants/ScrollConstants.sol";
 import { IScrollMessenger } from "../libraries/IScrollMessenger.sol";
 import { ScrollMessengerBase } from "../libraries/ScrollMessengerBase.sol";
 

contracts/src/L2/predeploys/IL1BlockContainer.sol

@@ -54,10 +54,10 @@ interface IL1BlockContainer {
   /// @notice Import L1 block header to this contract.
   /// @param blockHash The hash of block.
   /// @param blockHeaderRLP The RLP encoding of L1 block.
-  /// @param signature The ETH 2.0 signatures for the block header.
+  /// @param updateGasPriceOracle Whether to update gas price oracle.
   function importBlockHeader(
     bytes32 blockHash,
     bytes calldata blockHeaderRLP,
-    bytes calldata signature
+    bool updateGasPriceOracle
   ) external;
 }

contracts/src/L2/predeploys/IL1GasPriceOracle.sol

@@ -45,4 +45,12 @@ interface IL1GasPriceOracle {
   /// @param data Unsigned fully RLP-encoded transaction to get the L1 gas for.
   /// @return Amount of L1 gas used to publish the transaction.
   function getL1GasUsed(bytes memory data) external view returns (uint256);
+
+  /****************************
+   * Public Mutated Functions *
+   ****************************/
+
+  /// @notice Allows whitelisted caller to modify the l1 base fee.
+  /// @param _l1BaseFee New l1 base fee.
+  function setL1BaseFee(uint256 _l1BaseFee) external;
 }

contracts/src/L2/predeploys/L1BlockContainer.sol

@@ -3,9 +3,11 @@
 pragma solidity ^0.8.0;
 
 import { IL1BlockContainer } from "./IL1BlockContainer.sol";
+import { IL1GasPriceOracle } from "./IL1GasPriceOracle.sol";
 
 import { OwnableBase } from "../../libraries/common/OwnableBase.sol";
 import { IWhitelist } from "../../libraries/common/IWhitelist.sol";
+import { ScrollPredeploy } from "../../libraries/constants/ScrollPredeploy.sol";
 
 /// @title L1BlockContainer
 /// @notice This contract will maintain the list of blocks proposed in L1.
@@ -113,7 +115,7 @@ contract L1BlockContainer is OwnableBase, IL1BlockContainer {
   function importBlockHeader(
     bytes32 _blockHash,
     bytes calldata _blockHeaderRLP,
-    bytes calldata
+    bool _updateGasPriceOracle
   ) external {
     // @todo remove this when ETH 2.0 signature verification is ready.
     {
@@ -279,6 +281,10 @@ contract L1BlockContainer is OwnableBase, IL1BlockContainer {
     metadata[_blockHash] = BlockMetadata(_height, _timestamp, _baseFee);
 
     emit ImportBlock(_blockHash, _height, _timestamp, _baseFee, _stateRoot);
+
+    if (_updateGasPriceOracle) {
+      IL1GasPriceOracle(ScrollPredeploy.L1_GAS_PRICE_ORACLE).setL1BaseFee(_baseFee);
+    }
   }
 
   /************************

contracts/src/L2/predeploys/L1GasPriceOracle.sol

@@ -91,9 +91,8 @@ contract L1GasPriceOracle is OwnableBase, IL1GasPriceOracle {
    * Public Mutated Functions *
    ****************************/
 
-  /// @notice Allows the owner to modify the l1 base fee.
-  /// @param _l1BaseFee New l1 base fee.
-  function setL1BaseFee(uint256 _l1BaseFee) external {
+  /// @inheritdoc IL1GasPriceOracle
+  function setL1BaseFee(uint256 _l1BaseFee) external override {
     require(whitelist.isSenderAllowed(msg.sender), "Not whitelisted sender");
 
     l1BaseFee = _l1BaseFee;

contracts/src/libraries/ScrollMessengerBase.sol

@@ -5,8 +5,8 @@ pragma solidity ^0.8.0;
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 import { IWhitelist } from "./common/IWhitelist.sol";
+import { ScrollConstants } from "./constants/ScrollConstants.sol";
 import { IScrollMessenger } from "./IScrollMessenger.sol";
-import { ScrollConstants } from "./ScrollConstants.sol";
 
 abstract contract ScrollMessengerBase is OwnableUpgradeable, IScrollMessenger {
   /**********

contracts/src/libraries/ScrollConstants.sol renamed to contracts/src/libraries/constants/ScrollConstants.sol

@@ -5,7 +5,4 @@ pragma solidity ^0.8.0;
 library ScrollConstants {
   /// @notice The address of default cross chain message sender.
   address internal constant DEFAULT_XDOMAIN_MESSAGE_SENDER = address(1);
-
-  /// @notice The minimum seconds needed to wait if we want to drop message.
-  uint256 internal constant MIN_DROP_DELAY_DURATION = 7 days;
 }

contracts/src/libraries/constants/ScrollPredeploy.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+library ScrollPredeploy {
+  address internal constant L1_MESSAGE_QUEUE = 0x5300000000000000000000000000000000000000;
+
+  address internal constant L1_BLOCK_CONTAINER = 0x5300000000000000000000000000000000000001;
+
+  address internal constant L1_GAS_PRICE_ORACLE = 0x5300000000000000000000000000000000000002;
+}