Skip to content

Commit a7cb722

Browse files
committed
Fix compilation
1 parent b142875 commit a7cb722

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

scripts/foundry/contract-upgrades/2.0.0/ExecuteNitroContracts2Point0Point0Upgrade.s.sol

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity 0.8.16;
33

44
import "forge-std/Script.sol";
55
import {
6-
NitroContracts1Point2Point1UpgradeAction,
6+
NitroContracts2Point0Point0UpgradeAction,
77
ProxyAdmin
88
} from "../../../../contracts/parent-chain/contract-upgrades/NitroContracts2Point0Point0UpgradeAction.sol";
99
import {IBridge} from "@arbitrum/nitro-contracts-2.0.0/src/bridge/IBridge.sol";
@@ -19,20 +19,24 @@ contract ExecuteNitroContracts2Point0Point0UpgradeScript is Script {
1919
// used to check upgrade was successful
2020
bytes32 wasmModuleRoot = vm.envBytes32("WASM_MODULE_ROOT");
2121

22+
NitroContracts2Point0Point0UpgradeAction upgradeAction =
23+
NitroContracts2Point0Point0UpgradeAction(vm.envAddress("UPGRADE_ACTION_ADDRESS"));
24+
2225
vm.startBroadcast();
2326

2427
// prepare upgrade calldata
2528
ProxyAdmin proxyAdmin = ProxyAdmin(vm.envAddress("ROLLUP_ADDRESS"));
2629
IRollupCore rollup = IRollupCore(vm.envAddress("PROXY_ADMIN_ADDRESS"));
2730
bytes memory upgradeCalldata =
28-
abi.encodeCall(NitroContracts1Point2Point1UpgradeAction.perform, (rollup, proxyAdmin));
31+
abi.encodeCall(NitroContracts2Point0Point0UpgradeAction.perform, (rollup, proxyAdmin));
2932

3033
// execute the upgrade
3134
IUpgradeExecutor executor = IUpgradeExecutor(vm.envAddress("PARENT_UPGRADE_EXECUTOR_ADDRESS"));
3235
executor.execute(address(upgradeAction), upgradeCalldata);
3336

3437
// sanity check, full checks are done on-chain by the upgrade action
3538
require(rollup.wasmModuleRoot() == upgradeAction.newWasmModuleRoot(), "Wasm module root not set");
39+
require(rollup.wasmModuleRoot() == wasmModuleRoot, "Unexpected wasm module root set");
3640

3741
vm.stopBroadcast();
3842
}

scripts/foundry/stylus/DeployAddWasmCacheManagerAction.s.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity 0.8.16;
33

44
import "forge-std/Script.sol";
5-
import {AddWasmCacheManagerAction} from "../../../../contracts/child-chain/sty;us/AddWasmCacheManagerAction.sol";
5+
import {AddWasmCacheManagerAction} from "../../../contracts/child-chain/stylus/AddWasmCacheManagerAction.sol";
66

77
/**
88
* @title DeployAddWasmCacheManagerActionScript
@@ -17,8 +17,8 @@ contract DeployAddWasmCacheManagerActionScript is Script {
1717

1818
// deploy action
1919
new AddWasmCacheManagerAction({
20-
_wasmCachemanager: vm.envUint("WASM_CACHE_MANAGER_ADDRESS"),
21-
_targetArbOSVersion: TARGET_ARBOS_VERSION,
20+
_wasmCachemanager: vm.envAddress("WASM_CACHE_MANAGER_ADDRESS"),
21+
_targetArbOSVersion: TARGET_ARBOS_VERSION
2222
});
2323

2424
vm.stopBroadcast();

0 commit comments

Comments
 (0)