Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use inbox instead of rollup address #21

Merged
merged 1 commit into from
Aug 20, 2024
Merged

feat: use inbox instead of rollup address #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/foundry/contract-upgrades/2.1.0/.env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion scripts/foundry/contract-upgrades/2.1.0/ExecuteNitroContracts2Point1Point0Upgrade.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
Expand Down