feat: rollup-bridge-contracts deployment and test config enhancements

Author: defistar

rollup-bridge-contracts/deploy/config/config-helper.ts

@@ -25,11 +25,23 @@ export interface L1NetworkConfig {
 }
 
 export interface L1TestConfig {
-    ethDepositTestConfig: L1ETHDepositTestConfig;
+    l2DepositRecipient: string;
+    l2FeeRefundRecipient: string;
+    l1ETHDepositTestConfig: L1ETHDepositTestConfig;
+    l1ERC20DepositTestConfig: L1ERC20DepositTestConfig;
 }
 
 export interface L1ETHDepositTestConfig {
-    ethAmount: number; // Amount of ETH to deposit on L1
+    amount: number; // Amount of ETH to deposit on L1
+    gasLimit: number;
+    totalNativeAmount: number;
+    userMaxFeePerGas: number;
+    userMaxPriorityFeePerGas: number;
+}
+
+export interface L1ERC20DepositTestConfig {
+    tokenAddress: string;
+    amount: number;
     gasLimit: number;
     totalNativeAmount: number;
     userMaxFeePerGas: number;
@@ -286,14 +298,13 @@ export interface L2NetworkConfig {
     l2BridgeMessengerConfig: L2BridgeMessengerConfig;
     l2EnshrinedTokenBridgeConfig: L2EnshrinedTokenBridgeConfig;
     l2ETHBridgeConfig: L2ETHBridgeConfig;
+    l2TestConfig: L2TestConfig;
 }
 
 export interface L2CommonConfig {
     owner: string;
     admin: string;
     relayer: string;
-    depositRecipient: string;
-    feeRefundRecipient: string;
     tokens: EnshrinedToken[];
     mockL1Bridge?: string; // Optional field to retain backward compatibility
 }
@@ -346,6 +357,19 @@ export interface L2ETHBridgeConfig {
     }
 }
 
+export interface L2TestConfig {
+    ethTestEventData: ETHTestEventData;
+    erc20TestEventData: ERC20TestEventData;
+}
+
+export interface ETHTestEventData {
+    messageHash: string;
+}
+
+export interface ERC20TestEventData {
+    messageHash: string;
+}
+
 const nilNetworkConfigFilePath = path.join(__dirname, 'nil-deployment-config.json');
 const nilNetworkConfigArchiveFilePath = path.join(
     __dirname,

rollup-bridge-contracts/deploy/config/l1-deployment-config.json

@@ -7,11 +7,23 @@
         "shardId": 1
       },
       "l1TestConfig": {
-        "ethAmount": 1000000000000,
+        "l2DepositRecipient": "",
+        "l2FeeRefundRecipient": "",
+        "l1ETHDepositTestConfig": {
+        "amount": 1000000000000,
         "gasLimit": 1000,
         "totalNativeAmount": 1200000000, 
         "userMaxFeePerGas": 0,
         "userMaxPriorityFeePerGas": 0
+       },
+        "l1ERC20DepositTestConfig": {
+          "tokenAddress": "",
+          "amount": 0,
+          "gasLimit": 0,
+          "totalNativeAmount": 0, 
+          "userMaxFeePerGas": 0,
+          "userMaxPriorityFeePerGas": 0
+       }
       },
       "l1CommonContracts": {
         "weth": ""

rollup-bridge-contracts/deploy/config/nil-deployment-config.json

@@ -5,8 +5,6 @@
         "owner": "",
         "admin": "",
         "relayer": "",
-        "depositRecipient": "",
-        "feeRefundRecipient": "",
         "tokens": [
           {
             "name": "USD Coin",
@@ -65,7 +63,15 @@
           "l2ETHBridgeProxy": "",
           "l2ETHBridgeImplementation": ""
         }
+      },
+      "l2TestConfig": {
+        "ethTestEventData": {
+          "messageHash": ""
+        },
+        "erc20TestEventData": {
+          "messageHash": ""
+        }
       }
     }
   }
-}
+}

rollup-bridge-contracts/deploy/config/nil-types.ts

@@ -20,3 +20,4 @@ export interface BatchInfo {
 
 export const proposerRoleHash = ethers.keccak256(ethers.toUtf8Bytes("PROPOSER_ROLE"));
 
+export const relayerRoleHash = ethers.keccak256(ethers.toUtf8Bytes("RELAYER_ROLE"));

rollup-bridge-contracts/scripts/bridge-test/bridge-eth.ts

@@ -7,6 +7,7 @@ import {
     isValidAddress,
     loadNilNetworkConfig,
     L2NetworkConfig,
+    L1NetworkConfig,
 } from '../../deploy/config/config-helper';
 import { bigIntReplacer, extractAndParseMessageSentEventLog, MessageSentEvent } from './get-messenger-events';
 
@@ -19,7 +20,7 @@ const l1EthBridgeABI = JSON.parse(fs.readFileSync(l1EthBridgeABIPath, 'utf8')).a
 // npx hardhat run scripts/bridge-test/bridge-eth.ts --network geth
 export async function bridgeETH() {
     const networkName = network.name;
-    const config = loadL1NetworkConfig(networkName);
+    const config: L1NetworkConfig = loadL1NetworkConfig(networkName);
 
     if (!isValidAddress(config.l1ETHBridge.l1ETHBridgeProxy)) {
         throw new Error('Invalid l1ETHBridgeProxy address in config');
@@ -42,11 +43,11 @@ export async function bridgeETH() {
 
     const l2DepositRecipient = l2NetworkConfig.l2CommonConfig.depositRecipient;
     const l2FeeRefundAddress = l2NetworkConfig.l2CommonConfig.feeRefundRecipient;
-    const eth_amount = config.l1TestConfig.ethDepositTestConfig.ethAmount;
-    const gasLimit = config.l1TestConfig.ethDepositTestConfig.gasLimit;
-    const total_native_amount = config.l1TestConfig.ethDepositTestConfig.totalNativeAmount;
-    const userMaxFeePerGas = config.l1TestConfig.ethDepositTestConfig.userMaxFeePerGas;
-    const userMaxPriorityFeePerGas = config.l1TestConfig.ethDepositTestConfig.userMaxPriorityFeePerGas;
+    const eth_amount = config.l1TestConfig.l1ETHDepositTestConfig.amount;
+    const gasLimit = config.l1TestConfig.l1ETHDepositTestConfig.gasLimit;
+    const total_native_amount = config.l1TestConfig.l1ETHDepositTestConfig.totalNativeAmount;
+    const userMaxFeePerGas = config.l1TestConfig.l1ETHDepositTestConfig.userMaxFeePerGas;
+    const userMaxPriorityFeePerGas = config.l1TestConfig.l1ETHDepositTestConfig.userMaxPriorityFeePerGas;
 
     console.log(`bridging ${eth_amount} (WEI) to recipient: ${l2DepositRecipient}`);
 
@@ -77,6 +78,9 @@ export async function bridgeETH() {
     const messageSentEvent: MessageSentEvent = messageSentEventLogData;
 
     console.log(`messageSentEvent for depositETH is: ${JSON.stringify(messageSentEvent, bigIntReplacer, 2)}`);
+
+    const messageHash = messageSentEvent.messageHash;
+
 }
 
 async function main() {

rollup-bridge-contracts/task/clear-l2-deployments.ts

@@ -14,8 +14,7 @@ task("clear-l2-deployments", "Clears L2DeploymentConfig entries in nil-deploymen
         config.l2CommonConfig.admin = "";
         config.l2CommonConfig.owner = "";
         config.l2CommonConfig.mockL1Bridge = "";
-        config.l2CommonConfig.depositRecipient = "";
-        config.l2CommonConfig.feeRefundRecipient = "";
+        config.l2CommonConfig.relayer = "";
 
         // clear all deployed contract address under config
         config.l2BridgeMessengerConfig.l2BridgeMessengerContracts.l2BridgeMessengerImplementation = "";
@@ -24,6 +23,9 @@ task("clear-l2-deployments", "Clears L2DeploymentConfig entries in nil-deploymen
 
         config.l2CommonConfig.mockL1Bridge = "";
 
+        config.l2TestConfig.erc20TestEventData.messageHash = "";
+        config.l2TestConfig.ethTestEventData.messageHash = "";
+
         config.l2ETHBridgeConfig.l2ETHBridgeContracts.l2ETHBridgeImplementation = "";
         config.l2ETHBridgeConfig.l2ETHBridgeContracts.l2ETHBridgeProxy = "";
         config.l2ETHBridgeConfig.l2ETHBridgeContracts.proxyAdmin = "";