Merge pull request #223 from ArbitrumFoundation/l2timelock-non-batch

Added l2 single/batch timelock stage
ArbitrumFoundation · Nov 17, 2023 · 5dbe92a · 5dbe92a
2 parents c768457 + bd6daba
commit 5dbe92a
Show file tree

Hide file tree

Showing 9 changed files with 307 additions and 153 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -128,7 +128,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: OffchainLabs/actions/run-nitro-test-node@main
+      - uses: OffchainLabs/actions/run-nitro-test-node@output-logging
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
@@ -198,7 +198,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: OffchainLabs/actions/run-nitro-test-node@main
+      - uses: OffchainLabs/actions/run-nitro-test-node@output-logging
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

diff --git a/audit-ci.jsonc b/audit-ci.jsonc
@@ -49,6 +49,8 @@
         // undici - only used in hardhat, not used in prod
         "GHSA-wqq4-5wpv-mx2g",
         // get-func-name - only used in chai, not used in prod
-        "GHSA-4q6p-r6v2-jvc5"
+        "GHSA-4q6p-r6v2-jvc5",
+        // axios used only in sol2uml
+        "GHSA-wf5p-g6vw-rhxx"
     ]
   }
diff --git a/files/local/.env-sample b/files/local/.env-sample
@@ -9,9 +9,9 @@ ARB_URL="http://localhost:8547"
 NOVA_URL="http://localhost:8547"
 ETH_URL="http://localhost:8545"
 ## Test keys
-ARB_KEY="cb5790da63720727af975f42c79f69918580209889225fa7128c92402a6d3a65"
-ETH_KEY="cb5790da63720727af975f42c79f69918580209889225fa7128c92402a6d3a65"
-NOVA_KEY="cb5790da63720727af975f42c79f69918580209889225fa7128c92402a6d3a65"
+ARB_KEY="b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659"
+ETH_KEY="b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659"
+NOVA_KEY="b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659"
 
 DEPLOY_CONFIG_FILE_LOCATION="./files/local/deployConfig.json"
 VESTED_RECIPIENTS_FILE_LOCATION="./files/local/vestingWalletRecipients.json"

diff --git a/scripts/genNetwork.ts b/scripts/genNetwork.ts
@@ -1,4 +1,4 @@
-import { Wallet, ethers } from "ethers";
+import { ethers } from "ethers";
 import { setupNetworks, config, getSigner } from "../test-ts/testSetup";
 import * as fs from "fs";
 
@@ -8,7 +8,7 @@ async function main() {
 
   const ethDeployer = getSigner(ethProvider, config.ethKey);
   const arbDeployer = getSigner(arbProvider, config.arbKey);
-  
+
   const { l1Network, l2Network } = await setupNetworks(
     ethDeployer,
     arbDeployer,

diff --git a/scripts/proposalTests.ts b/scripts/proposalTests.ts
@@ -58,8 +58,8 @@ async function main() {
   const currentBlock = await arbProvider.getBlockNumber();
   while ((await arbProvider.getBlockNumber()) - currentBlock < 2) {
     if (isLocal) {
-      await mineBlock(ethDeployer);
-      await mineBlock(arbDeployer);
+      await mineBlock(ethDeployer, "2blocketh");
+      await mineBlock(arbDeployer, "2blockarb");
     }
     await wait(1000);
   }

diff --git a/src-ts/proposalPipeline.ts b/src-ts/proposalPipeline.ts
@@ -11,6 +11,7 @@ import {
   UnreachableCaseError,
   getProvider,
   BaseGovernorExecuteStage,
+  L2TimelockExecutionSingleStage,
 } from "./proposalStage";
 import { Signer } from "ethers";
 import { Provider, TransactionReceipt } from "@ethersproject/abstract-provider";
@@ -28,6 +29,7 @@ export class StageFactory {
     return [
       ...(await BaseGovernorExecuteStage.extractStages(receipt, this.arbOneSignerOrProvider)),
       ...(await L2TimelockExecutionBatchStage.extractStages(receipt, this.arbOneSignerOrProvider)),
+      ...(await L2TimelockExecutionSingleStage.extractStages(receipt, this.arbOneSignerOrProvider)),
       ...(await L1TimelockExecutionSingleStage.extractStages(receipt, this.l1SignerOrProvider)),
       ...(await L1TimelockExecutionBatchStage.extractStages(receipt, this.l1SignerOrProvider)),
       ...(await RetryableExecutionStage.extractStages(receipt, this.arbOneSignerOrProvider)),