add gas limit on L1 SentMessage; add whitelist for gas oracle contract

Author: zimpha

contracts/docs/apis/L1ScrollMessenger.md

@@ -268,7 +268,7 @@ The address of Rollup contract.
 function sendMessage(address _to, uint256 _value, bytes _message, uint256 _gasLimit) external payable
 ```
 
-Send cross chain message from L1 to L2.
+Send cross chain message from L1 to L2 or L2 to L1.
 
 
 
@@ -435,7 +435,7 @@ Emitted when a cross domain message is relayed successfully.
 ### SentMessage
 
 ```solidity
-event SentMessage(address indexed sender, address indexed target, uint256 value, uint256 messageNonce, bytes message)
+event SentMessage(address indexed sender, address indexed target, uint256 value, uint256 messageNonce, uint256 gasLimit, bytes message)
 ```
 
 Emitted when a cross domain message is sent.
@@ -450,6 +450,7 @@ Emitted when a cross domain message is sent.
 | target `indexed` | address | undefined |
 | value  | uint256 | undefined |
 | messageNonce  | uint256 | undefined |
+| gasLimit  | uint256 | undefined |
 | message  | bytes | undefined |
 
 ### Unpaused

contracts/docs/apis/L2ScrollMessenger.md

@@ -55,6 +55,23 @@ The address of fee vault, collecting cross domain messaging fee.
 
 
 
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
+### gasOracle
+
+```solidity
+function gasOracle() external view returns (address)
+```
+
+The address of L2MessageQueue.
+
+
+
+
 #### Returns
 
 | Name | Type | Description |
@@ -281,7 +298,7 @@ function retryMessageWithProof(address _from, address _to, uint256 _value, uint2
 function sendMessage(address _to, uint256 _value, bytes _message, uint256 _gasLimit) external payable
 ```
 
-Send cross chain message from L2 to L1.
+Send cross chain message from L1 to L2 or L2 to L1.
 
 
 

contracts/scripts/foundry/DeployL1BridgeContracts.s.sol

@@ -19,6 +19,7 @@ import { RollupVerifier } from "../../src/libraries/verifier/RollupVerifier.sol"
 import { L1MessageQueue } from "../../src/L1/rollup/L1MessageQueue.sol";
 import { L2GasPriceOracle } from "../../src/L1/rollup/L2GasPriceOracle.sol";
 import { ScrollChain } from "../../src/L1/rollup/ScrollChain.sol";
+import { Whitelist } from "../../src/L2/predeploys/Whitelist.sol";
 
 contract DeployL1BridgeContracts is Script {
   uint256 L1_DEPLOYER_PRIVATE_KEY = vm.envUint("L1_DEPLOYER_PRIVATE_KEY");
@@ -41,6 +42,7 @@ contract DeployL1BridgeContracts is Script {
     // note: the RollupVerifier library is deployed implicitly
 
     deployProxyAdmin();
+    deployL1Whitelist();
     deployL1MessageQueue();
     deployL2GasPriceOracle();
     deployScrollChain();
@@ -62,6 +64,13 @@ contract DeployL1BridgeContracts is Script {
     logAddress("L1_PROXY_ADMIN_ADDR", address(proxyAdmin));
   }
 
+  function deployL1Whitelist() internal {
+    address owner = vm.addr(L1_DEPLOYER_PRIVATE_KEY);
+    Whitelist whitelist = new Whitelist(owner);
+
+    logAddress("L1_WHITELIST_ADDR", address(whitelist));
+  }
+
   function deployScrollChain() internal {
     ScrollChain impl = new ScrollChain(CHAIN_ID_L2, MAX_TX_IN_ONE_BATCH, PADDING_TX_HASH);
     TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(

contracts/scripts/foundry/DeployL2BridgeContracts.s.sol

@@ -137,7 +137,7 @@ contract DeployL2BridgeContracts is Script {
   }
 
   function deployL2ScrollMessenger() internal {
-    L2ScrollMessenger impl = new L2ScrollMessenger(address(container), address(queue));
+    L2ScrollMessenger impl = new L2ScrollMessenger(address(container), address(oracle), address(queue));
     TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
       address(impl),
       address(proxyAdmin),

contracts/scripts/foundry/InitializeL1BridgeContracts.s.sol

@@ -23,6 +23,7 @@ contract InitializeL1BridgeContracts is Script {
 
   address L1_FEE_VAULT_ADDR = vm.envAddress("L1_FEE_VAULT_ADDR");
 
+  address L1_WHITELIST_ADDR = vm.envAddress("L1_WHITELIST_ADDR");
   address L1_ZK_ROLLUP_PROXY_ADDR = vm.envAddress("L1_ZK_ROLLUP_PROXY_ADDR");
   address L1_MESSAGE_QUEUE_PROXY_ADDR = vm.envAddress("L1_MESSAGE_QUEUE_PROXY_ADDR");
   address L2_GAS_PRICE_ORACLE_PROXY_ADDR = vm.envAddress("L2_GAS_PRICE_ORACLE_PROXY_ADDR");
@@ -55,6 +56,7 @@ contract InitializeL1BridgeContracts is Script {
 
     // initialize L2GasPriceOracle
     L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).initialize();
+    L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).updateWhitelist(L1_WHITELIST_ADDR);
 
     // initialize L1MessageQueue
     L1MessageQueue(L1_MESSAGE_QUEUE_PROXY_ADDR).initialize(
@@ -69,6 +71,7 @@ contract InitializeL1BridgeContracts is Script {
       L1_ZK_ROLLUP_PROXY_ADDR,
       L1_MESSAGE_QUEUE_PROXY_ADDR
     );
+    L1ScrollMessenger(payable(L1_SCROLL_MESSENGER_PROXY_ADDR)).updateWhitelist(L1_WHITELIST_ADDR);
 
     // initialize L1GatewayRouter
     L1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).initialize(

contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol

@@ -14,6 +14,7 @@ import { L2WETHGateway } from "../../src/L2/gateways/L2WETHGateway.sol";
 import { L2MessageQueue } from "../../src/L2/predeploys/L2MessageQueue.sol";
 import { L2TxFeeVault } from "../../src/L2/predeploys/L2TxFeeVault.sol";
 import { L1BlockContainer } from "../../src/L2/predeploys/L1BlockContainer.sol";
+import { L1GasPriceOracle } from "../../src/L2/predeploys/L1GasPriceOracle.sol";
 import { Whitelist } from "../../src/L2/predeploys/Whitelist.sol";
 import { ScrollStandardERC20Factory } from "../../src/libraries/token/ScrollStandardERC20Factory.sol";
 
@@ -31,6 +32,7 @@ contract InitializeL2BridgeContracts is Script {
 
   address L2_TX_FEE_VAULT_ADDR = vm.envAddress("L2_TX_FEE_VAULT_ADDR");
   address L1_BLOCK_CONTAINER_ADDR = vm.envAddress("L1_BLOCK_CONTAINER_ADDR");
+  address L1_GAS_PRICE_ORACLE_ADDR = vm.envAddress("L1_GAS_PRICE_ORACLE_ADDR");
   address L2_WHITELIST_ADDR = vm.envAddress("L2_WHITELIST_ADDR");
   address L2_MESSAGE_QUEUE_ADDR = vm.envAddress("L2_MESSAGE_QUEUE_ADDR");
 
@@ -57,6 +59,9 @@ contract InitializeL2BridgeContracts is Script {
     // initialize L1BlockContainer
     L1BlockContainer(L1_BLOCK_CONTAINER_ADDR).updateWhitelist(L2_WHITELIST_ADDR);
 
+    // initialize L1GasPriceOracle
+    L1GasPriceOracle(L1_GAS_PRICE_ORACLE_ADDR).updateWhitelist(L2_WHITELIST_ADDR);
+
     // initialize L2ScrollMessenger
     L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_PROXY_ADDR)).initialize(
       L1_SCROLL_MESSENGER_PROXY_ADDR,

contracts/src/L1/IL1ScrollMessenger.sol

@@ -5,18 +5,6 @@ pragma solidity ^0.8.0;
 import { IScrollMessenger } from "../libraries/IScrollMessenger.sol";
 
 interface IL1ScrollMessenger is IScrollMessenger {
-  /**********
-   * Events *
-   **********/
-
-  /// @notice Emitted when a cross domain message is sent.
-  /// @param sender The address of the sender who initiates the message.
-  /// @param target The address of target contract to call.
-  /// @param value The amount of value passed to the target contract.
-  /// @param messageNonce The nonce of the message.
-  /// @param message The calldata passed to the target contract.
-  event SentMessage(address indexed sender, address indexed target, uint256 value, uint256 messageNonce, bytes message);
-
   /***********
    * Structs *
    ***********/
@@ -32,18 +20,6 @@ interface IL1ScrollMessenger is IScrollMessenger {
    * Public Mutated Functions *
    ****************************/
 
-  /// @notice Send cross chain message from L1 to L2.
-  /// @param target The address of account who recieve the message.
-  /// @param value The amount of ether passed when call target contract.
-  /// @param message The content of the message.
-  /// @param gasLimit Gas limit required to complete the message relay on L2.
-  function sendMessage(
-    address target,
-    uint256 value,
-    bytes calldata message,
-    uint256 gasLimit
-  ) external payable;
-
   /// @notice Relay a L2 => L1 message with message proof.
   /// @param from The address of the sender of the message.
   /// @param to The address of the recipient of the message.

contracts/src/L1/L1ScrollMessenger.sol

@@ -6,8 +6,9 @@ import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/securit
 
 import { IScrollChain } from "./rollup/IScrollChain.sol";
 import { IL1MessageQueue } from "./rollup/IL1MessageQueue.sol";
-import { IL1ScrollMessenger, IScrollMessenger } from "./IL1ScrollMessenger.sol";
+import { IL1ScrollMessenger } from "./IL1ScrollMessenger.sol";
 import { ScrollConstants } from "../libraries/ScrollConstants.sol";
+import { IScrollMessenger } from "../libraries/IScrollMessenger.sol";
 import { ScrollMessengerBase } from "../libraries/ScrollMessengerBase.sol";
 import { WithdrawTrieVerifier } from "../libraries/verifier/WithdrawTrieVerifier.sol";
 
@@ -72,7 +73,7 @@ contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1Scrol
    * Public Mutated Functions *
    ****************************/
 
-  /// @inheritdoc IL1ScrollMessenger
+  /// @inheritdoc IScrollMessenger
   function sendMessage(
     address _to,
     uint256 _value,
@@ -106,7 +107,7 @@ contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1Scrol
     bytes32 _xDomainCalldataHash = keccak256(_xDomainCalldata);
     isL1MessageSent[_xDomainCalldataHash] = true;
 
-    emit SentMessage(msg.sender, _to, _value, _messageNonce, _message);
+    emit SentMessage(msg.sender, _to, _value, _messageNonce, _gasLimit, _message);
   }
 
   /// @inheritdoc IL1ScrollMessenger

contracts/src/L1/rollup/L2GasPriceOracle.sol

@@ -4,13 +4,20 @@ pragma solidity ^0.8.0;
 
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
+import { IWhitelist } from "../../libraries/common/IWhitelist.sol";
+
 import { IL2GasPriceOracle } from "./IL2GasPriceOracle.sol";
 
 contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
   /**********
    * Events *
    **********/
 
+  /// @notice Emitted when owner updates whitelist contract.
+  /// @param _oldWhitelist The address of old whitelist contract.
+  /// @param _newWhitelist The address of new whitelist contract.
+  event UpdateWhitelist(address _oldWhitelist, address _newWhitelist);
+
   /// @notice Emitted when current fee overhead is updated.
   /// @param overhead The current fee overhead updated.
   event OverheadUpdated(uint256 overhead);
@@ -51,6 +58,9 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
   /// @notice The latest known l2 base fee.
   uint256 public l2BaseFee;
 
+  /// @notice The address of whitelist contract.
+  IWhitelist public whitelist;
+
   /***************
    * Constructor *
    ***************/
@@ -105,6 +115,20 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
     }
   }
 
+  /****************************
+   * Public Mutated Functions *
+   ****************************/
+
+  /// @notice Allows the owner to modify the l2 base fee.
+  /// @param _l2BaseFee The new l2 base fee.
+  function setL2BaseFee(uint256 _l2BaseFee) external {
+    require(whitelist.isSenderAllowed(msg.sender), "Not whitelisted sender");
+
+    l2BaseFee = _l2BaseFee;
+
+    emit L2BaseFeeUpdated(_l2BaseFee);
+  }
+
   /************************
    * Restricted Functions *
    ************************/
@@ -127,11 +151,13 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
     emit ScalarUpdated(_scalar);
   }
 
-  /// Allows the owner to modify the l2 base fee.
-  /// @param _l2BaseFee The new l2 base fee.
-  function setL2BaseFee(uint256 _l2BaseFee) external onlyOwner {
-    l2BaseFee = _l2BaseFee;
+  /// @notice Update whitelist contract.
+  /// @dev This function can only called by contract owner.
+  /// @param _newWhitelist The address of new whitelist contract.
+  function updateWhitelist(address _newWhitelist) external onlyOwner {
+    address _oldWhitelist = address(whitelist);
 
-    emit L2BaseFeeUpdated(_l2BaseFee);
+    whitelist = IWhitelist(_newWhitelist);
+    emit UpdateWhitelist(_oldWhitelist, _newWhitelist);
   }
 }

contracts/src/L2/IL2ScrollMessenger.sol

@@ -5,26 +5,6 @@ pragma solidity ^0.8.0;
 import { IScrollMessenger } from "../libraries/IScrollMessenger.sol";
 
 interface IL2ScrollMessenger is IScrollMessenger {
-  /**********
-   * Events *
-   **********/
-
-  /// @notice Emitted when a cross domain message is sent.
-  /// @param sender The address of the sender who initiates the message.
-  /// @param target The address of target contract to call.
-  /// @param value The amount of value passed to the target contract.
-  /// @param messageNonce The nonce of the message.
-  /// @param gasLimit The optional gas limit passed to L1.
-  /// @param message The calldata passed to the target contract.
-  event SentMessage(
-    address indexed sender,
-    address indexed target,
-    uint256 value,
-    uint256 messageNonce,
-    uint256 gasLimit,
-    bytes message
-  );
-
   /***********
    * Structs *
    ***********/
@@ -38,18 +18,6 @@ interface IL2ScrollMessenger is IScrollMessenger {
    * Public Mutated Functions *
    ****************************/
 
-  /// @notice Send cross chain message from L2 to L1.
-  /// @param target The address of account who recieve the message.
-  /// @param value The amount of ether passed when call target contract.
-  /// @param message The content of the message.
-  /// @param gasLimit Gas limit required to complete the message relay on L1.
-  function sendMessage(
-    address target,
-    uint256 value,
-    bytes calldata message,
-    uint256 gasLimit
-  ) external payable;
-
   /// @notice execute L1 => L2 message
   /// @dev Make sure this is only called by privileged accounts.
   /// @param from The address of the sender of the message.