Merge branch 'bold-merge-script' into bold-merge-action

OffchainLabs · Nov 21, 2024 · 1b1f090 · 1b1f090
2 parents a647b13 + a1cfde6
commit 1b1f090
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/audit-ci.jsonc b/audit-ci.jsonc
@@ -73,6 +73,8 @@
     // Valid ECDSA signatures erroneously rejected in Elliptic
     "GHSA-fc9h-whq2-v747",
     // secp256k1-node allows private key extraction over ECDH
-    "GHSA-584q-6j8j-r5pm"
+    "GHSA-584q-6j8j-r5pm",
+    // Regular Expression Denial of Service (ReDoS) in cross-spawn
+    "GHSA-3xgq-45jj-v275"
   ]
 }
diff --git a/scripts/boldUpgradeCommon.ts b/scripts/boldUpgradeCommon.ts
@@ -95,10 +95,6 @@ export const validateConfig = async (
   config: Config,
   l1Rpc: providers.Provider
 ) => {
-  // check all the config.contracts exist
-  // if ((await l1Rpc.getCode(config.contracts.excessStakeReceiver)).length <= 2) {
-  //   throw new Error('excessStakeReceiver address is not a contract')
-  // }
   if ((await l1Rpc.getCode(config.contracts.rollup)).length <= 2) {
     throw new Error('rollup address is not a contract')
   }

diff --git a/scripts/executeBoldUpgrade.ts b/scripts/executeBoldUpgrade.ts
@@ -112,7 +112,7 @@ async function perform(
     timelockSigner
   )
 
-  // // what validators did we have in the old rollup?
+  // what validators did we have in the old rollup?
   const boldActionPerformData = boldAction.interface.encodeFunctionData(
     'perform',
     [config.validators]