feat: automation, fixes, and genesis updates (#46)

Co-authored-by: Diego Garcia <diego.gm@pm.me>

Author: w-woloszyn

contracts/.env.example

@@ -0,0 +1,56 @@
+T1_L1_RPC=https://sepolia.infura.io/v3/e8d8888d41bb42c39dd591d376f5a2ba
+T1_L2_RPC=http://127.0.0.1:8545
+CHAIN_ID_L2=3151908
+
+# ---------------------------------------------------------
+# BEGIN 1Password PRIVATE KEYS
+# ---------------------------------------------------------
+L1_DEPLOYER_PRIVATE_KEY=
+L2_DEPLOYER_PRIVATE_KEY=
+L1_SECURITY_COUNCIL_PRIVATE_KEY=
+TEST_PRIVATE_KEY=
+ALICE_PRIVATE_KEY=
+MARKET_MAKER_PRIVATE_KEY=
+# ---------------------------------------------------------
+# END
+# ---------------------------------------------------------
+
+# ---------------------------------------------------------
+# BEGIN CONSTANT ADDRESSES
+# ---------------------------------------------------------
+MARKET_MAKER_ADDRESS=
+L1_POSTMAN_SIGNER_ADDRESS=0xa3e5e908868E2D881E70c304C18636A2f43E933f
+L1_PLONK_VERIFIER_ADDR=0x0000000000000000000000000000000000000001
+
+NETWORK=devnet
+L1_T1_MULTISIG_ADDR=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L1_SECURITY_COUNCIL_ADDR=0xd5B9Fc2fb05A3B95cf6C9eB6aD75707d43397d57
+L1_PROPOSAL_EXECUTOR_ADDR=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+
+L2_T1_MULTISIG_ADDR=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L2_SECURITY_COUNCIL_ADDR=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L2_PROPOSAL_EXECUTOR_ADDR=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+
+MAX_TX_IN_CHUNK=100
+MAX_L1_MESSAGE_GAS_LIMIT=10000000
+L1_COMMIT_SENDER_ADDRESS=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+L1_FINALIZE_SENDER_ADDRESS=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+L1_FEE_VAULT_ADDR=0x0000000000000000000000000000000000000001
+
+L1_EMERGENCY_MULTISIG_ADDR=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+L1_1D_TIMELOCK_ADDR=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+L1_7D_TIMELOCK_ADDR=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+L1_14D_TIMELOCK_ADDR=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+
+L2_EMERGENCY_MULTISIG_ADDR=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+L2_1D_TIMELOCK_ADDR=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+L2_7D_TIMELOCK_ADDR=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+L2_14D_TIMELOCK_ADDR=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+
+L1_USDT_ADDR=0x30E9b6B0d161cBd5Ff8cf904Ff4FA43Ce66AC346
+L2_USDT_ADDR=0x337bE36E710f7af68E1fD3DDd48070Cecc5Bb136
+L1_WETH_ADDR=0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9
+L1_PERMIT2=0x000000000022D473030F116dDEE9F6B43aC78BA3
+# ---------------------------------------------------------
+# END CONSTANT ADDRESSES
+# ---------------------------------------------------------

contracts/.env.template

@@ -10,41 +10,54 @@ reload_env() {
   set +o allexport
 }
 
-
 # Initial environment load
 reload_env
 
-# Function to determine RPC URL from the script name, dirty
-get_rpc_url() {
+# Function to determine RPC URL and verification settings
+get_rpc_and_verifier() {
   local script_name=$1
+  local rpc_url=""
+  local verifier=""
+  local verifier_url=""
+  local api_key_flag=""
 
   if [[ $script_name == *"L1"* ]]; then
-    echo "$T1_L1_RPC"
+    rpc_url="$T1_L1_RPC"
+    verifier="etherscan"
+    verifier_url="https://api-sepolia.etherscan.io/api"
+    api_key_flag="--etherscan-api-key $ETHERSCAN_API_KEY" # Only needed for Etherscan
   elif [[ $script_name == *"L2"* ]]; then
-    echo "$T1_L2_RPC"
+    rpc_url="$T1_L2_RPC"
+    verifier="blockscout"
+    verifier_url="$BLOCKSCOUT_API_URL"  # Ensure this is set in your .env
+    api_key_flag=""  # Blockscout does not require an API key
   else
     echo "ERROR: Could not determine RPC URL for script: $script_name" >&2
     exit 1
   fi
+
+  echo "$rpc_url $verifier $verifier_url $api_key_flag"
 }
 
-# Function to execute a script with the correct RPC URL
+# Function to execute a script with the correct RPC URL and verify it
 run_script() {
   local script_path=$1
   local contract_name=$2
-  local rpc_url
+  local rpc_url verifier verifier_url api_key_flag
 
-  rpc_url=$(get_rpc_url "$contract_name")
+  read rpc_url verifier verifier_url api_key_flag < <(get_rpc_and_verifier "$contract_name")
 
-  echo "=== Running $contract_name ==="
-  forge script "$script_path:$contract_name" --rpc-url "$rpc_url" --broadcast
+  echo "=== Deploying $contract_name on $( [[ $verifier == "etherscan" ]] && echo 'Sepolia' || echo 'L2 Blockscout' ) ==="
 
+  forge script "$script_path:$contract_name" --rpc-url "$rpc_url" --broadcast --verify --verifier "$verifier" --verifier-url "$verifier_url" $api_key_flag
+
+  echo "=== Deployment & Verification of $contract_name completed ==="
+  
   # Wait for the .env file to be updated
   sleep 10
-  #reload_env
 }
 
-# Deploy contracts
+# Deploy & Verify contracts
 run_script script/deploy/DeployL1BridgeProxyPlaceholder.s.sol DeployL1BridgeProxyPlaceholder
 run_script script/deploy/DeployL1T1Owner.s.sol DeployL1T1Owner
 run_script script/deploy/DeployL2BridgeProxyPlaceholder.s.sol DeployL2BridgeProxyPlaceholder
@@ -55,4 +68,4 @@ run_script script/deploy/DeployL1BridgeContracts.s.sol DeployL1BridgeContracts
 run_script script/deploy/InitializeL1BridgeContracts.s.sol InitializeL1BridgeContracts
 run_script script/deploy/InitializeL2BridgeContracts.s.sol InitializeL2BridgeContracts
 run_script script/deploy/InitializeL1T1Owner.s.sol InitializeL1T1Owner
-run_script script/deploy/InitializeL2T1Owner.s.sol InitializeL2T1Owner
+

contracts/deploy.sh

@@ -21,7 +21,7 @@ import { L2GasPriceOracle } from "../../src/L1/rollup/L2GasPriceOracle.sol";
 
 contract InitializeL1BridgeContracts is Script {
     uint256 private L1_DEPLOYER_PRIVATE_KEY = vm.envUint("L1_DEPLOYER_PRIVATE_KEY");
-    address private L1_DEPLOYER_ADDRESS = vm.envAddress("L1_DEPLOYER_ADDRESS");
+    address private L1_POSTMAN_SIGNER_ADDRESS = vm.envAddress("L1_POSTMAN_SIGNER_ADDRESS");
 
     uint256 private CHAIN_ID_L2 = vm.envUint("CHAIN_ID_L2");
     uint256 private MAX_TX_IN_CHUNK = vm.envUint("MAX_TX_IN_CHUNK");
@@ -75,7 +75,7 @@ contract InitializeL1BridgeContracts is Script {
         T1Chain(L1_T1_CHAIN_PROXY_ADDR).addSequencer(L1_COMMIT_SENDER_ADDRESS);
         T1Chain(L1_T1_CHAIN_PROXY_ADDR).addProver(L1_FINALIZE_SENDER_ADDRESS);
 
-        T1Chain(L1_T1_CHAIN_PROXY_ADDR).addProver(L1_DEPLOYER_ADDRESS);
+        T1Chain(L1_T1_CHAIN_PROXY_ADDR).addProver(L1_POSTMAN_SIGNER_ADDRESS);
 
         // initialize L2GasPriceOracle
         L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).initialize(

contracts/script/deploy/InitializeL1BridgeContracts.s.sol

@@ -205,5 +205,6 @@ contract InitializeL1T1Owner is Script {
         _selectors[1] = L1GatewayRouter.setMM.selector;
         owner.updateAccess(L1_GATEWAY_ROUTER_PROXY_ADDR, _selectors, T1_MULTISIG_NO_DELAY_ROLE, true);
         owner.updateAccess(L1_GATEWAY_ROUTER_PROXY_ADDR, _selectors, EMERGENCY_MULTISIG_NO_DELAY_ROLE, true);
+        owner.updateAccess(L1_GATEWAY_ROUTER_PROXY_ADDR, _selectors, SECURITY_COUNCIL_NO_DELAY_ROLE, true);
     }
 }

contracts/script/deploy/InitializeL1T1Owner.s.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.28;
 
-import "forge-std/Script.sol";
-import "forge-std/console.sol";
+import { Script } from "forge-std/Script.sol";
+import { console } from "forge-std/console.sol";
 
 /**
  * @dev An abstract contract that extends `Script`.

contracts/script/lib/DeploymentUtils.sol

@@ -21,9 +21,9 @@ contract DepositUsdtFromL1ToL2 is Script {
 
         uint256 gasLimit = 1_000_000;
 
-        T1StandardERC20(L1_USDT_ADDR).approve(L1_GATEWAY_ROUTER_PROXY_ADDR, 0.01 ether);
+        T1StandardERC20(L1_USDT_ADDR).approve(L1_GATEWAY_ROUTER_PROXY_ADDR, 1000 ether);
 
-        IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).depositERC20(L1_USDT_ADDR, 0.01 ether, gasLimit);
+        IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).depositERC20(L1_USDT_ADDR, 1000 ether, gasLimit);
 
         address l2usdtAddress = IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).getL2ERC20Address(L1_USDT_ADDR);
         logAddress("L2_USDT_ADDR", l2usdtAddress);

contracts/script/test/DepositUsdtFromL1ToL2.s.sol

@@ -2,6 +2,7 @@
 
 pragma solidity >=0.8.28;
 
+import { console } from "forge-std/console.sol";
 import { Script } from "forge-std/Script.sol";
 
 import { IL1GatewayRouter } from "../../src/L1/gateways/IL1GatewayRouter.sol";
@@ -10,25 +11,28 @@ import { T1Owner } from "../../src/misc/T1Owner.sol";
 // solhint-disable var-name-mixedcase
 
 contract SetMM is Script {
-    address private L1_SECURITY_COUNCIL_ADDR = vm.envAddress("L1_SECURITY_COUNCIL_ADDR");
+    bytes32 private constant SECURITY_COUNCIL_NO_DELAY_ROLE = keccak256("SECURITY_COUNCIL_NO_DELAY_ROLE");
+
     address private L1_GATEWAY_ROUTER_PROXY_ADDR = vm.envAddress("L1_GATEWAY_ROUTER_PROXY_ADDR");
-    uint256 private L1_DEPLOYER_PRIVATE_KEY = vm.envUint("L1_DEPLOYER_PRIVATE_KEY");
-    uint256 private ALICE_PRIVATE_KEY = vm.envUint("ALICE_PRIVATE_KEY");
-    address private filler = vm.addr(ALICE_PRIVATE_KEY);
+    address private L1_T1_OWNER_ADDR = vm.envAddress("L1_T1_OWNER_ADDR");
+    uint256 private L1_SECURITY_COUNCIL_PRIVATE_KEY = vm.envUint("L1_SECURITY_COUNCIL_PRIVATE_KEY");
+    address private newMarketMaker = vm.envAddress("MARKET_MAKER_ADDRESS");
 
     function run() external {
         vm.createSelectFork(vm.rpcUrl("sepolia"));
-        vm.startBroadcast(L1_DEPLOYER_PRIVATE_KEY);
+        vm.startBroadcast(L1_SECURITY_COUNCIL_PRIVATE_KEY);
 
         // Check if the market maker is set to this address
-        if (IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).marketMaker() != filler) {
-            T1Owner(payable(L1_SECURITY_COUNCIL_ADDR)).execute(
+        if (IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).marketMaker() != newMarketMaker) {
+            T1Owner(payable(L1_T1_OWNER_ADDR)).execute(
                 L1_GATEWAY_ROUTER_PROXY_ADDR,
                 0,
-                abi.encodeWithSelector(IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).setMM.selector, filler),
-                bytes32(0)
+                abi.encodeWithSelector(IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).setMM.selector, newMarketMaker),
+                SECURITY_COUNCIL_NO_DELAY_ROLE
             );
         }
+
+        console.log("[%s] is the new market maker", IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).marketMaker());
         vm.stopBroadcast();
     }
 }

contracts/script/test/SetMM.s.sol

@@ -16,6 +16,7 @@ import { PermitSignature } from "../../src/test/utils/PermitSignature.sol";
 import { T1Constants } from "../../src/libraries/constants/T1Constants.sol";
 
 // solhint-disable var-name-mixedcase
+// solhint-disable reason-string
 
 contract SwapERC20 is Script, PermitSignature {
     address private L1_GATEWAY_ROUTER_PROXY_ADDR = vm.envAddress("L1_GATEWAY_ROUTER_PROXY_ADDR");
@@ -24,12 +25,14 @@ contract SwapERC20 is Script, PermitSignature {
     address private L1_USDT_ADDR = vm.envAddress("L1_USDT_ADDR");
     uint256 private ALICE_PRIVATE_KEY = vm.envUint("ALICE_PRIVATE_KEY");
     address private alice = vm.addr(ALICE_PRIVATE_KEY);
-    uint256 private inputTokenAmount = 1e15; // WETH
-    uint256 private outputTokenAmount = 10e18; // USDT
+    uint256 private MARKET_MAKER_PRIVATE_KEY = vm.envUint("MARKET_MAKER_PRIVATE_KEY");
+    address private marketMaker = vm.addr(MARKET_MAKER_PRIVATE_KEY);
+    uint256 private inputTokenAmount = 0.0001 ether; // WETH
+    uint256 private outputTokenAmount = 1 ether; // USDT
 
     function run() external {
         vm.createSelectFork(vm.rpcUrl("sepolia"));
-        vm.startBroadcast(ALICE_PRIVATE_KEY);
+        vm.startBroadcast(MARKET_MAKER_PRIVATE_KEY);
 
         // Alice needs WETH to swap for USDT
         // Bridge should have USDT to swap for WETH
@@ -38,8 +41,8 @@ contract SwapERC20 is Script, PermitSignature {
 
         ISignatureTransfer.PermitTransferFrom memory permit = ISignatureTransfer.PermitTransferFrom({
             permitted: ISignatureTransfer.TokenPermissions({ token: L1_WETH_ADDR, amount: inputTokenAmount }),
-            nonce: 0,
-            deadline: block.timestamp + 1000
+            nonce: uint256(keccak256(abi.encodePacked(msg.sender, block.timestamp, block.prevrandao))),
+            deadline: block.timestamp + 10_000_000
         });
 
         IL1GatewayRouter.Witness memory witness = IL1GatewayRouter.Witness({
@@ -71,11 +74,11 @@ contract SwapERC20 is Script, PermitSignature {
         }
 
         // Check if the ERC20 gateway has approved the permit2 to transfer USDT
-        // TODO include check allowance transfer to the router on USDT
+        // TODO - Check if allowance has expired
         if (T1StandardERC20(L1_USDT_ADDR).allowance(L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR, permit2) < outputTokenAmount)
         {
             IL1StandardERC20Gateway(L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR).allowRouterToTransfer(
-                L1_USDT_ADDR, type(uint160).max, uint48(block.timestamp + 1000)
+                L1_USDT_ADDR, type(uint160).max, uint48(block.timestamp + 10_000_000)
             );
         }
 
@@ -85,9 +88,9 @@ contract SwapERC20 is Script, PermitSignature {
             "ERC20 gateway doesn't have enough USDT"
         );
 
-        // Use SetMM script to set this address as the router's market maker
+        // Use SetMM script to set alice as the router's market maker
         require(
-            IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).marketMaker() == address(this),
+            IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).marketMaker() == marketMaker,
             "Signer is not the market maker in the router"
         );
 

contracts/script/test/SwapERC20.s.sol

@@ -103,6 +103,9 @@
     },
     "0xa46E94F9705E17041c7Bf8d06f3c0f2B1E71C218": {
       "balance": "1000000000000000000000000"
+    },
+    "0xF1441F1d18cE531F8B16F3D80892864e9f9F333a": {
+      "balance": "1000000000000000000000000"
     }
   }
 }