Merge branch 'main' into non-emergency-action

ArbitrumFoundation · Dec 8, 2023 · fd71ac0 · fd71ac0
2 parents a68fd30 + 5dbe92a
commit fd71ac0
Show file tree

Hide file tree

Showing 10 changed files with 349 additions and 185 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
@@ -43,6 +43,14 @@
         // Server-Side Request Forgery in Request
         "GHSA-p8p7-x288-28g6",
         // OpenZeppelin: Using ERC2771Context with a custom forwarder can yield address(0)
-        "GHSA-g4vp-m682-qqmp"
+        "GHSA-g4vp-m682-qqmp",
+        // regular expression DoS in debug - low severity
+        "GHSA-gxpj-cx7g-858c",
+        // 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",
+        // 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="e887f7d17d07cc7b8004053fb8826f6657084e88904bb61590e498ca04704cf2"
-ETH_KEY=""
-NOVA_KEY="e887f7d17d07cc7b8004053fb8826f6657084e88904bb61590e498ca04704cf2"
+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/package.json b/package.json
@@ -67,7 +67,7 @@
     "hardhat": "^2.12.6",
     "hardhat-gas-reporter": "^1.0.9",
     "http-server": "^14.1.1",
-    "solidity-coverage": "^0.8.2",
+    "solidity-coverage": "^0.8.5",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.0",
     "typescript": "^4.8.4"

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)),