chore: bold deploy script improvements

.env.sample.testnode

@@ -0,0 +1,5 @@
+L1_RPC_URL="http://localhost:8545"
+L1_PRIV_KEY="0xdc04c5399f82306ec4b4d654a342f40e2e0620fe39950d967e1e574b32d4dd36"
+CONFIG_NETWORK_NAME="local"
+DEPLOYED_CONTRACTS_DIR="./scripts/files/"
+DISABLE_VERIFICATION=true

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"
   ]
 }

package.json

@@ -52,7 +52,7 @@
     "create-rollup-testnode": "hardhat run scripts/local-deployment/deployCreatorAndCreateRollup.ts",
     "script:bold-prepare": "hardhat run ./scripts/prepareBoldUpgrade.ts",
     "script:bold-populate-lookup": "hardhat run ./scripts/populateLookup.ts",
-    "script:bold-local-execute": "hardhat run ./scripts/testLocalExecuteBoldUpgrade.ts",
+    "script:bold-local-execute": "hardhat run ./scripts/executeBoldUpgrade.ts",
     "deploy-cachemanager-testnode": "hardhat run scripts/local-deployment/deployCacheManager.ts"
   },
   "dependencies": {
@@ -64,7 +64,7 @@
   },
   "private": false,
   "devDependencies": {
-    "@arbitrum/nitro-contracts-2.0.0": "npm:@arbitrum/nitro-contracts@2.0.0-beta.0",
+    "@arbitrum/nitro-contracts-2.1.0": "npm:@arbitrum/nitro-contracts@2.1.0",
     "@arbitrum/sdk": "^3.4.1",
     "@ethersproject/providers": "^5.7.2",
     "@nomicfoundation/hardhat-verify": "^2.0.9",

scripts/boldUpgradeCommon.ts

@@ -36,6 +36,10 @@ export const getConfig = async (
   if (!config) {
     throw new Error('config not found')
   }
+  if (process.env.ROLLUP_ADDRESS) {
+    console.log('Using ROLLUP_ADDRESS from env:', process.env.ROLLUP_ADDRESS)
+    config.contracts.rollup = process.env.ROLLUP_ADDRESS
+  }
   await validateConfig(config, l1Rpc)
   return config
 }
@@ -93,10 +97,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')
   }

scripts/boldUpgradeFunctions.ts

@@ -25,7 +25,7 @@ import { AssertionStateStruct } from '../build/types/src/challengeV2/IAssertionC
 import {
   abi as OldRollupAbi,
   bytecode as OldRollupBytecode,
-} from '@arbitrum/nitro-contracts-2.0.0/build/contracts/src/rollup/RollupUserLogic.sol/RollupUserLogic.json'
+} from '@arbitrum/nitro-contracts-2.1.0/build/contracts/src/rollup/RollupUserLogic.sol/RollupUserLogic.json'
 import { verifyContract } from './deploymentUtils'
 
 export const deployDependencies = async (
@@ -40,6 +40,7 @@ export const deployDependencies = async (
 > => {
   const bridgeFac = new Bridge__factory(signer)
   const bridge = await bridgeFac.deploy()
+  await bridge.deployed()
   if (log) {
     console.log(`Bridge implementation deployed at: ${bridge.address}`)
   }
@@ -69,6 +70,7 @@ export const deployDependencies = async (
     isUsingFeeToken,
     isDelayBufferable
   )
+  await seqInbox.deployed()
   if (log) {
     console.log(
       `Sequencer inbox implementation deployed at: ${seqInbox.address}`
@@ -86,6 +88,7 @@ export const deployDependencies = async (
 
   const reiFac = new RollupEventInbox__factory(signer)
   const rei = await reiFac.deploy()
+  await rei.deployed()
   if (log) {
     console.log(`Rollup event inbox implementation deployed at: ${rei.address}`)
   }
@@ -96,6 +99,7 @@ export const deployDependencies = async (
 
   const outboxFac = new Outbox__factory(signer)
   const outbox = await outboxFac.deploy()
+  await outbox.deployed()
   if (log) {
     console.log(`Outbox implementation deployed at: ${outbox.address}`)
   }
@@ -106,6 +110,7 @@ export const deployDependencies = async (
 
   const inboxFac = new Inbox__factory(signer)
   const inbox = await inboxFac.deploy(maxDataSize)
+  await inbox.deployed()
   if (log) {
     console.log(`Inbox implementation deployed at: ${inbox.address}`)
   }
@@ -120,6 +125,7 @@ export const deployDependencies = async (
     signer
   )
   const oldRollupUser = await oldRollupUserFac.deploy()
+  await oldRollupUser.deployed()
   if (log) {
     console.log(`Old rollup user logic deployed at: ${oldRollupUser.address}`)
   }
@@ -130,6 +136,7 @@ export const deployDependencies = async (
 
   const newRollupUserFac = new RollupUserLogic__factory(signer)
   const newRollupUser = await newRollupUserFac.deploy()
+  await newRollupUser.deployed()
   if (log) {
     console.log(`New rollup user logic deployed at: ${newRollupUser.address}`)
   }
@@ -140,6 +147,7 @@ export const deployDependencies = async (
 
   const newRollupAdminFac = new RollupAdminLogic__factory(signer)
   const newRollupAdmin = await newRollupAdminFac.deploy()
+  await newRollupAdmin.deployed()
   if (log) {
     console.log(`New rollup admin logic deployed at: ${newRollupAdmin.address}`)
   }
@@ -150,6 +158,7 @@ export const deployDependencies = async (
 
   const challengeManagerFac = new EdgeChallengeManager__factory(signer)
   const challengeManager = await challengeManagerFac.deploy()
+  await challengeManager.deployed()
   if (log) {
     console.log(`Challenge manager deployed at: ${challengeManager.address}`)
   }
@@ -303,15 +312,21 @@ export const populateLookup = async (
   for (let i = 0; i < 100; i++) {
     latestConfirmedLog = await wallet.provider!.getLogs({
       address: rollupAddr,
-      fromBlock: toBlock - 1000,
+      fromBlock: toBlock >= 1000 ? toBlock - 1000 : 0,
       toBlock: toBlock,
       topics: [
         oldRollup.interface.getEventTopic('NodeCreated'),
         ethers.utils.hexZeroPad(ethers.utils.hexlify(latestConfirmed), 32),
       ],
     })
     if (latestConfirmedLog.length == 1) break
+    if (toBlock == 0) {
+      throw new Error('Could not find latest confirmed node')
+    }
     toBlock -= 1000
+    if (toBlock < 0) {
+      toBlock = 0
+    }
   }
 
   if (!latestConfirmedLog || latestConfirmedLog.length != 1) {