From ebc81e886a5265b8a29c746dca2ba69be772a7a3 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 20 Aug 2024 21:14:17 +0900 Subject: [PATCH] feat: use inbox instead of rollup address --- scripts/foundry/contract-upgrades/2.1.0/.env.sample | 2 +- .../2.1.0/ExecuteNitroContracts2Point1Point0Upgrade.s.sol | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/foundry/contract-upgrades/2.1.0/.env.sample b/scripts/foundry/contract-upgrades/2.1.0/.env.sample index fd46552..537d0eb 100644 --- a/scripts/foundry/contract-upgrades/2.1.0/.env.sample +++ b/scripts/foundry/contract-upgrades/2.1.0/.env.sample @@ -1,7 +1,7 @@ ## These env vars are used for ExecuteNitroContracts2Point1Point0UpgradeScript UPGRADE_ACTION_ADDRESS= -ROLLUP_ADDRESS= +INBOX_ADDRESS= PROXY_ADMIN_ADDRESS= PARENT_UPGRADE_EXECUTOR_ADDRESS= WASM_MODULE_ROOT=0x260f5fa5c3176a856893642e149cf128b5a8de9f828afec8d11184415dd8dc69 diff --git a/scripts/foundry/contract-upgrades/2.1.0/ExecuteNitroContracts2Point1Point0Upgrade.s.sol b/scripts/foundry/contract-upgrades/2.1.0/ExecuteNitroContracts2Point1Point0Upgrade.s.sol index 6733e83..1bbab40 100644 --- a/scripts/foundry/contract-upgrades/2.1.0/ExecuteNitroContracts2Point1Point0Upgrade.s.sol +++ b/scripts/foundry/contract-upgrades/2.1.0/ExecuteNitroContracts2Point1Point0Upgrade.s.sol @@ -9,6 +9,7 @@ import { import {IBridge} from "@arbitrum/nitro-contracts-2.1.0/src/bridge/IBridge.sol"; import {IRollupCore} from "@arbitrum/nitro-contracts-2.1.0/src/rollup/IRollupCore.sol"; import {IUpgradeExecutor} from "@offchainlabs/upgrade-executor/src/IUpgradeExecutor.sol"; +import {IInboxBase} from "@arbitrum/nitro-contracts-1.2.1/src/bridge/IInboxBase.sol"; /** * @title ExecuteNitroContracts1Point2Point1UpgradeScript @@ -22,8 +23,10 @@ contract ExecuteNitroContracts2Point1Point0UpgradeScript is Script { NitroContracts2Point1Point0UpgradeAction upgradeAction = NitroContracts2Point1Point0UpgradeAction(vm.envAddress("UPGRADE_ACTION_ADDRESS")); + IInboxBase inbox = IInboxBase(vm.envAddress("INBOX_ADDRESS")); + // check prerequisites - IRollupCore rollup = IRollupCore(vm.envAddress("ROLLUP_ADDRESS")); + IRollupCore rollup = IRollupCore(address(inbox.bridge().rollup())); require(rollup.wasmModuleRoot() == upgradeAction.condRoot(), "Incorrect starting wasm module root"); vm.startBroadcast();