feat: configurable l1deposit test config

Author: defistar

rollup-bridge-contracts/.env.example

@@ -12,6 +12,8 @@ GETH_WALLET_ADDRESS="0xc8d5559BA22d11B0845215a781ff4bF3CCa0EF89"
 
 NIL_PRIVATE_KEY="0x4d47e8aed46e8b1bb4f4573f68ad43cade273d149b0c2942526ad5141c51b517"
 NIL_SMART_ACCOUNT_ADDRESS=
+DEPOSIT_RECIPIENT_PRIVATE_KEY="0xe4d6ddfd7479614249381d4bd240fa2408efc53dad5f7f31cb7ae7e5962fc1d0"
+NIL_FEE_REFUND_PRIVATE_KEY="0xe18382d8e3ada94004d5d3287cd1b0938cb56071b2e3295cbd3db577cfe03143"
 NIL_RPC_ENDPOINT="http://127.0.0.1:8529"
 NIL=0x0001111111111111111111111111111111111110
 RELAYER_RPC_URL="http://127.0.0.1:7777"

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

@@ -14,6 +14,7 @@ export interface L1Config {
 
 export interface L1NetworkConfig {
     l1DeployerConfig: L1DeployerConfig;
+    l1TestConfig: L1TestConfig;
     l1CommonContracts: L1CommonContracts;
     nilRollup: NilRollup;
     l1BridgeRouter: L1BridgeRouter;
@@ -23,6 +24,18 @@ export interface L1NetworkConfig {
     nilGasPriceOracle: NilGasPriceOracle;
 }
 
+export interface L1TestConfig {
+    ethDepositTestConfig: L1ETHDepositTestConfig;
+}
+
+export interface L1ETHDepositTestConfig {
+    ethAmount: number; // Amount of ETH to deposit on L1
+    gasLimit: number;
+    totalNativeAmount: number;
+    userMaxFeePerGas: number;
+    userMaxPriorityFeePerGas: number;
+}
+
 export interface L1DeployerConfig {
     owner: string;
     admin: string;
@@ -279,6 +292,8 @@ export interface L2CommonConfig {
     owner: string;
     admin: string;
     relayer: string;
+    depositRecipient: string;
+    feeRefundRecipient: string;
     tokens: EnshrinedToken[];
     mockL1Bridge?: string; // Optional field to retain backward compatibility
 }
@@ -311,7 +326,6 @@ export interface L2BridgeMessengerConfig {
         l2BridgeMessengerImplementation: string;
     };
     l2BridgeMessengerDeployerConfig: {
-        relayerAddress: string;
         messageExpiryDeltaValue: number;
     };
 }

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

@@ -6,6 +6,13 @@
         "admin": "",
         "shardId": 1
       },
+      "l1TestConfig": {
+        "ethAmount": 1000000000000,
+        "gasLimit": 1000,
+        "totalNativeAmount": 1200000000, 
+        "userMaxFeePerGas": 0,
+        "userMaxPriorityFeePerGas": 0
+      },
       "l1CommonContracts": {
         "weth": ""
       },

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

@@ -4,6 +4,9 @@
       "l2CommonConfig": {
         "owner": "",
         "admin": "",
+        "relayer": "",
+        "depositRecipient": "",
+        "feeRefundRecipient": "",
         "tokens": [
           {
             "name": "USD Coin",

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

@@ -5,6 +5,8 @@ import * as path from 'path';
 import {
     loadL1NetworkConfig,
     isValidAddress,
+    loadNilNetworkConfig,
+    L2NetworkConfig,
 } from '../../deploy/config/config-helper';
 import { bigIntReplacer, extractAndParseMessageSentEventLog, MessageSentEvent } from './get-messenger-events';
 
@@ -34,13 +36,17 @@ export async function bridgeETH() {
         signer,
     ) as Contract;
 
-    const l2DepositRecipient = "0x66bFaD51E02513C5B6bEfe1Acc9a31Cb6eE152F1";
-    const l2FeeRefundAddress = "0x878f824Ffde85B7Bd6ad6c6Fd97275bb6724c55a";
-    const eth_amount = 100;
-    const gasLimit = 1000;
-    const total_native_amount = 1200000000;
-    const userMaxFeePerGas = 0;
-    const userMaxPriorityFeePerGas = 0;
+
+    // save the nilMessageTree Address in the json config for l2
+    const l2NetworkConfig: L2NetworkConfig = loadNilNetworkConfig("local");
+
+    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;
 
     console.log(`bridging ${eth_amount} (WEI) to recipient: ${l2DepositRecipient}`);
 

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

@@ -14,12 +14,13 @@ 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 = "";
 
         // clear all deployed contract address under config
         config.l2BridgeMessengerConfig.l2BridgeMessengerContracts.l2BridgeMessengerImplementation = "";
         config.l2BridgeMessengerConfig.l2BridgeMessengerContracts.l2BridgeMessengerProxy = "";
         config.l2BridgeMessengerConfig.l2BridgeMessengerContracts.proxyAdmin = "";
-        config.l2BridgeMessengerConfig.l2BridgeMessengerDeployerConfig.relayerAddress = "";
 
         config.l2CommonConfig.mockL1Bridge = "";
 

rollup-bridge-contracts/task/deploy-l2-bridge-messenger.ts

@@ -49,10 +49,6 @@ task("deploy-l2-bridge-messenger", "Deploys L2BridgeMessenger contract on Nil Ch
 
         validateAddress(l2NetworkConfig.l2CommonConfig.owner, "l2CommonConfig.owner");
         validateAddress(l2NetworkConfig.l2CommonConfig.admin, "l2CommonConfig.admin");
-        validateAddress(
-            l2NetworkConfig.l2BridgeMessengerConfig.l2BridgeMessengerDeployerConfig.relayerAddress,
-            "l2BridgeMessengerDeployerConfig.relayerAddress"
-        );
         validateAddress(
             l2NetworkConfig.nilMessageTreeConfig.nilMessageTreeContracts.nilMessageTreeImplementationAddress,
             "nilMessageTreeContracts.nilMessageTreeImplementationAddress"
@@ -95,7 +91,7 @@ task("deploy-l2-bridge-messenger", "Deploys L2BridgeMessenger contract on Nil Ch
             functionName: "initialize",
             args: [l2NetworkConfig.l2CommonConfig.owner,
             l2NetworkConfig.l2CommonConfig.admin,
-            l2NetworkConfig.l2BridgeMessengerConfig.l2BridgeMessengerDeployerConfig.relayerAddress,
+            l2NetworkConfig.l2CommonConfig.owner,
             l2NetworkConfig.nilMessageTreeConfig.nilMessageTreeContracts.nilMessageTreeImplementationAddress,
             l2NetworkConfig.l2BridgeMessengerConfig.l2BridgeMessengerDeployerConfig.messageExpiryDeltaValue],
         });

rollup-bridge-contracts/task/nil-smart-account.ts

@@ -77,6 +77,31 @@ export async function generateNilSmartAccount(networkName: string): Promise<Smar
         console.log("🆕 New Smart Account Generated:", smartAccount.address);
     }
 
+    //DEPOSIT_RECIPIENT_PRIVATE_KEY = "0xe4d6ddfd7479614249381d4bd240fa2408efc53dad5f7f31cb7ae7e5962fc1d0"
+    const depositRecipientPrivateKey = process.env.DEPOSIT_RECIPIENT_PRIVATE_KEY as `0x${string}`;
+    let signer = new LocalECDSAKeySigner({ privateKey: depositRecipientPrivateKey });
+    const depositRecipientSmartAccount = new SmartAccountV1({
+        signer,
+        client,
+        salt: BigInt(Math.floor(Math.random() * 10000)),
+        shardId: 1,
+        pubkey: signer.getPublicKey(),
+    });
+    const depositRecipientSmartAccountAddress = depositRecipientSmartAccount.address;
+    console.log("🆕 New Smart Account Generated:", depositRecipientSmartAccountAddress);
+
+
+    const nilFeeRefundAddressPrivateKey = process.env.NIL_FEE_REFUND_PRIVATE_KEY as `0x${string}`;
+    signer = new LocalECDSAKeySigner({ privateKey: depositRecipientPrivateKey });
+    const feeRefundSmartAccount = new SmartAccountV1({
+        signer,
+        client,
+        salt: BigInt(Math.floor(Math.random() * 10000)),
+        shardId: 1,
+        pubkey: signer.getPublicKey(),
+    });
+    const feeRefundSmartAccountAddress = feeRefundSmartAccount.address;
+
     const topUpFaucet = await faucetClient.topUp({
         smartAccountAddress: smartAccount.address,
         amount: convertEthToWei(0.1),
@@ -96,7 +121,8 @@ export async function generateNilSmartAccount(networkName: string): Promise<Smar
 
     config.l2CommonConfig.owner = getCheckSummedAddress(smartAccountAddress);
     config.l2CommonConfig.admin = getCheckSummedAddress(smartAccountAddress);
-    config.l2BridgeMessengerConfig.l2BridgeMessengerDeployerConfig.relayerAddress = getCheckSummedAddress(smartAccountAddress);
+    config.l2CommonConfig.depositRecipient = getCheckSummedAddress(depositRecipientSmartAccountAddress);
+    config.l2CommonConfig.feeRefundRecipient = getCheckSummedAddress(feeRefundSmartAccountAddress);
 
     // Save the updated config
     saveNilNetworkConfig(networkName, config);

rollup-bridge-contracts/test_integration.sh

@@ -125,6 +125,8 @@ curl -XPOST http://127.0.0.1:7777 -H "Content-Type: application/json" --data '{"
 echo "TODO: L2 contract deployment is not ready yet"
 
 echo "Triggering L1 deposit event"
+
+npx hardhat grant-relayer-role --networkname local
 npx hardhat run scripts/bridge-test/bridge-eth.ts --network geth
 
 echo "TODO: ensure that event was received and processed by the L2 side"