fix: ci issue due to new geth behavior (ArbitrumFoundation#313)

* cI: perf * ci: fix submission cost * ci: whitelist audit issue * ci: fix new geth behavior * ci: fix new geth behavior 2 * format: reduce diff * format: reduce diff 2
ScopeLift · Aug 29, 2024 · 691c022 · 691c022
1 parent 90f47e4
commit 691c022
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -129,6 +129,8 @@ jobs:
         with:
           submodules: recursive
       - uses: OffchainLabs/actions/run-nitro-test-node@main
+        with:
+          no-token-bridge: true
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
@@ -190,6 +192,8 @@ jobs:
         with:
           submodules: recursive
       - uses: OffchainLabs/actions/run-nitro-test-node@main
+        with:
+          no-token-bridge: true
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

diff --git a/audit-ci.jsonc b/audit-ci.jsonc
@@ -81,7 +81,10 @@
         // ECDSA missing leading bit r and s check - only used in dev
         "GHSA-977x-g7h5-7qgw",
         // EDDSA missing sig length check - package only used in dev
-        "GHSA-f7q4-pwc6-w24p"
-
+        "GHSA-f7q4-pwc6-w24p",
+        // Server-Side Request Forgery in axios
+        "GHSA-8hc4-vh64-cxmj",
+        // Regular Expression Denial of Service (ReDoS) in micromatch
+        "GHSA-952p-6rrq-rcjv"
     ]
   }
diff --git a/scripts/governanceDeployer.ts b/scripts/governanceDeployer.ts
@@ -725,7 +725,7 @@ async function registerTokenOnArbOne(
   const arbGatewaySubmissionFee = (
     await arbInbox.callStatic.calculateRetryableSubmissionFee(
       ethers.utils.hexDataLength(arbGatewayRegistrationData),
-      0
+      await ethDeployer.getGasPrice()
     )
   ).mul(2);
   const valueForArbGateway = arbGatewaySubmissionFee.add(arbMaxGas.mul(arbGasPrice));
@@ -772,7 +772,7 @@ async function registerTokenOnArbOne(
   const arbRouterSubmissionFee = (
     await arbInbox.callStatic.calculateRetryableSubmissionFee(
       ethers.utils.hexDataLength(arbRouterRegistrationData),
-      0
+      await ethDeployer.getGasPrice()
     )
   ).mul(2);
   const valueForArbRouter = arbRouterSubmissionFee.add(arbMaxGas.mul(arbGasPrice));
@@ -834,7 +834,7 @@ async function registerTokenOnNova(
   const novaGatewaySubmissionFee = (
     await novaInbox.callStatic.calculateRetryableSubmissionFee(
       ethers.utils.hexDataLength(novaGatewayRegistrationData),
-      0
+      await ethDeployer.getGasPrice()
     )
   ).mul(2);
   const valueForNovaGateway = novaGatewaySubmissionFee.add(maxGas.mul(novaGasPrice));
@@ -847,7 +847,7 @@ async function registerTokenOnNova(
   const novaRouterSubmissionFee = (
     await novaInbox.callStatic.calculateRetryableSubmissionFee(
       ethers.utils.hexDataLength(novaRouterRegistrationData),
-      0
+      await ethDeployer.getGasPrice()
     )
   ).mul(2);
   const valueForNovaRouter = novaRouterSubmissionFee.add(maxGas.mul(novaGasPrice));

diff --git a/src-ts/proposalStage.ts b/src-ts/proposalStage.ts
@@ -1058,7 +1058,7 @@ abstract class L1TimelockExecutionStage {
       const inbox = Inbox__factory.connect(inboxAddress, timelock.provider!);
       const submissionFee = await inbox.callStatic.calculateRetryableSubmissionFee(
         hexDataLength(innerData),
-        0
+        await inbox.provider!.getGasPrice()
       );
 
       // enough value to create a retryable ticket = submission fee + gas

diff --git a/test-ts/integration.ts b/test-ts/integration.ts
@@ -719,7 +719,7 @@ const execL1Component = async (
     const inbox = Inbox__factory.connect(l2Network.ethBridge.inbox, l1Deployer.provider!);
     const submissionFee = await inbox.callStatic.calculateRetryableSubmissionFee(
       propFormNonEmpty.l1Gov.retryableDataLength,
-      0
+      await inbox.provider!.getGasPrice()
     );
     value = submissionFee.mul(2);
   }