diff --git a/.gas-snapshot b/.gas-snapshot index a6f2bd6..05f1a85 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -1,4 +1,4 @@ NitroContracts2Point1Point2UpgradeActionTest:testShouldRevertOnEth() (gas: 61684) NitroContracts2Point1Point2UpgradeActionTest:testShouldRevertOnV2() (gas: 65683) -NitroContracts2Point1Point2UpgradeActionTest:testShouldUpgradeAndSetDecimals() (gas: 91928) +NitroContracts2Point1Point2UpgradeActionTest:testShouldUpgradeAndSetDecimals() (gas: 92108) UpgradeArbOSVersionAtTimestampActionTest:test_1() (gas: 165) \ No newline at end of file diff --git a/contracts/parent-chain/contract-upgrades/NitroContracts2Point1Point3UpgradeAction.sol b/contracts/parent-chain/contract-upgrades/NitroContracts2Point1Point3UpgradeAction.sol new file mode 100644 index 0000000..7411acb --- /dev/null +++ b/contracts/parent-chain/contract-upgrades/NitroContracts2Point1Point3UpgradeAction.sol @@ -0,0 +1,80 @@ +// SPDX-License-Identifier: Apache-2.0 +pragma solidity 0.8.16; + +import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol"; +import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; +import {Address} from "@openzeppelin/contracts/utils/Address.sol"; + +interface IInbox { + function bridge() external view returns (address); + function sequencerInbox() external view returns (address); +} + +interface IERC20Bridge { + function nativeToken() external view returns (address); +} + +interface IERC20Bridge_v2 { + function nativeTokenDecimals() external view returns (uint8); +} + +/** + * @title NitroContracts2Point1Point3UpgradeAction + * @notice Upgrade the bridge to Inbox and SequencerInbox to v2.1.3 + * Will revert if the bridge is an ERC20Bridge below v2.x.x + */ +contract NitroContracts2Point1Point3UpgradeAction { + address public immutable newEthInboxImpl; + address public immutable newERC20InboxImpl; + address public immutable newSequencerInboxImpl; + + constructor(address _newEthInboxImpl, address _newERC20InboxImpl, address _newSequencerInboxImpl) { + require( + Address.isContract(_newEthInboxImpl), + "NitroContracts2Point1Point3UpgradeAction: _newEthInboxImpl is not a contract" + ); + require( + Address.isContract(_newERC20InboxImpl), + "NitroContracts2Point1Point3UpgradeAction: _newERC20InboxImpl is not a contract" + ); + require( + Address.isContract(_newSequencerInboxImpl), + "NitroContracts2Point1Point3UpgradeAction: _newSequencerInboxImpl is not a contract" + ); + + newEthInboxImpl = _newEthInboxImpl; + newERC20InboxImpl = _newERC20InboxImpl; + newSequencerInboxImpl = _newSequencerInboxImpl; + } + + function perform(address inbox, ProxyAdmin proxyAdmin) external { + address bridge = IInbox(inbox).bridge(); + address sequencerInbox = IInbox(inbox).sequencerInbox(); + + bool isERC20 = false; + + // if the bridge is an ERC20Bridge below v2.x.x, revert + try IERC20Bridge(bridge).nativeToken() returns (address) {} + catch { + isERC20 = true; + // it is an ERC20Bridge, check if it is on v2.x.x + try IERC20Bridge_v2(address(bridge)).nativeTokenDecimals() returns (uint8) {} + catch { + // it is not on v2.x.x, revert + revert("NitroContracts2Point1Point3UpgradeAction: bridge is an ERC20Bridge below v2.x.x"); + } + } + + // upgrade the sequencer inbox + proxyAdmin.upgrade({ + proxy: TransparentUpgradeableProxy(payable((sequencerInbox))), + implementation: newSequencerInboxImpl + }); + + // upgrade the inbox + proxyAdmin.upgrade({ + proxy: TransparentUpgradeableProxy(payable((inbox))), + implementation: isERC20 ? newERC20InboxImpl : newEthInboxImpl + }); + } +} diff --git a/package.json b/package.json index 5684275..a4b802f 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@arbitrum/nitro-contracts-1.3.0": "npm:@arbitrum/nitro-contracts@1.3.0", "@arbitrum/nitro-contracts-2.1.0": "npm:@arbitrum/nitro-contracts@2.1.0", "@arbitrum/nitro-contracts-2.1.2": "npm:godzillaba-nitro-contracts@2.1.2-0", + "@arbitrum/nitro-contracts-2.1.3": "npm:godzillaba-nitro-contracts@2.1.3-0", "@arbitrum/token-bridge-1.2.2": "npm:@arbitrum/token-bridge-contracts@1.2.2", "@nomicfoundation/hardhat-chai-matchers": "^2.0.0", "@nomicfoundation/hardhat-ethers": "^3.0.0", diff --git a/scripts/foundry/contract-upgrades/2.1.3/.env.sample b/scripts/foundry/contract-upgrades/2.1.3/.env.sample new file mode 100644 index 0000000..eba03a6 --- /dev/null +++ b/scripts/foundry/contract-upgrades/2.1.3/.env.sample @@ -0,0 +1,6 @@ +## These env vars are used for ExecuteNitroContracts2Point1Point2UpgradeScript + +UPGRADE_ACTION_ADDRESS= +INBOX_ADDRESS= +PROXY_ADMIN_ADDRESS= +PARENT_UPGRADE_EXECUTOR_ADDRESS= \ No newline at end of file diff --git a/scripts/foundry/contract-upgrades/2.1.3/DeployNitroContracts2Point1Point3UpgradeAction.s.sol b/scripts/foundry/contract-upgrades/2.1.3/DeployNitroContracts2Point1Point3UpgradeAction.s.sol new file mode 100644 index 0000000..cd2aa02 --- /dev/null +++ b/scripts/foundry/contract-upgrades/2.1.3/DeployNitroContracts2Point1Point3UpgradeAction.s.sol @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: Apache-2.0 +pragma solidity 0.8.16; + +import {DeploymentHelpersScript} from "../../helper/DeploymentHelpers.s.sol"; +import {NitroContracts2Point1Point3UpgradeAction} from + "../../../../contracts/parent-chain/contract-upgrades/NitroContracts2Point1Point3UpgradeAction.sol"; + +/** + * @title DeployNitroContracts2Point1Point2UpgradeActionScript + * @notice This script deploys the ERC20Bridge contract and NitroContracts2Point1Point2UpgradeAction contract. + */ +contract DeployNitroContracts2Point1Point3UpgradeActionScript is DeploymentHelpersScript { + function run() public { + vm.startBroadcast(); + + // deploy new ERC20Inbox contract from v2.1.3 + address newEthInboxImpl = deployBytecodeFromJSON( + "/node_modules/@arbitrum/nitro-contracts-2.1.3/build/contracts/src/bridge/Inbox.sol/Inbox.json" + ); + // deploy new ERC20Inbox contract from v2.1.3 + address newERC20InboxImpl = deployBytecodeFromJSON( + "/node_modules/@arbitrum/nitro-contracts-2.1.3/build/contracts/src/bridge/ERC20Inbox.sol/ERC20Inbox.json" + ); + // deploy new ERC20Inbox contract from v2.1.3 + address newSeqInboxImpl = deployBytecodeFromJSON( + "/node_modules/@arbitrum/nitro-contracts-2.1.3/build/contracts/src/bridge/SequencerInbox.sol/SequencerInbox.json" + ); + + // deploy upgrade action + new NitroContracts2Point1Point3UpgradeAction(newEthInboxImpl, newERC20InboxImpl, newSeqInboxImpl); + + vm.stopBroadcast(); + } +} diff --git a/scripts/foundry/contract-upgrades/2.1.3/ExecuteNitroContracts2Point1Point3Upgrade.s.sol b/scripts/foundry/contract-upgrades/2.1.3/ExecuteNitroContracts2Point1Point3Upgrade.s.sol new file mode 100644 index 0000000..4b28116 --- /dev/null +++ b/scripts/foundry/contract-upgrades/2.1.3/ExecuteNitroContracts2Point1Point3Upgrade.s.sol @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: Apache-2.0 +pragma solidity 0.8.16; + +import "forge-std/Script.sol"; +import { + NitroContracts2Point1Point3UpgradeAction, + ProxyAdmin +} from "../../../../contracts/parent-chain/contract-upgrades/NitroContracts2Point1Point3UpgradeAction.sol"; +import {IInboxBase} from "@arbitrum/nitro-contracts-1.2.1/src/bridge/IInboxBase.sol"; +import {IERC20Bridge} from "@arbitrum/nitro-contracts-2.1.2/src/bridge/IERC20Bridge.sol"; +import {IUpgradeExecutor} from "@offchainlabs/upgrade-executor/src/IUpgradeExecutor.sol"; + +/** + * @title ExecuteNitroContracts1Point2Point3UpgradeScript + * @notice This script executes nitro contracts 2.1.3 upgrade through UpgradeExecutor + */ +contract ExecuteNitroContracts2Point1Point3UpgradeScript is Script { + function run() public { + NitroContracts2Point1Point3UpgradeAction upgradeAction = + NitroContracts2Point1Point3UpgradeAction(vm.envAddress("UPGRADE_ACTION_ADDRESS")); + + address inbox = (vm.envAddress("INBOX_ADDRESS")); + + // prepare upgrade calldata + ProxyAdmin proxyAdmin = ProxyAdmin(vm.envAddress("PROXY_ADMIN_ADDRESS")); + bytes memory upgradeCalldata = + abi.encodeCall(NitroContracts2Point1Point3UpgradeAction.perform, (inbox, proxyAdmin)); + + // execute the upgrade + // action checks prerequisites, and script will fail if the action reverts + IUpgradeExecutor executor = IUpgradeExecutor(vm.envAddress("PARENT_UPGRADE_EXECUTOR_ADDRESS")); + vm.startBroadcast(); + executor.execute(address(upgradeAction), upgradeCalldata); + vm.stopBroadcast(); + } +} diff --git a/scripts/foundry/contract-upgrades/2.1.3/README.md b/scripts/foundry/contract-upgrades/2.1.3/README.md new file mode 100644 index 0000000..90a733f --- /dev/null +++ b/scripts/foundry/contract-upgrades/2.1.3/README.md @@ -0,0 +1,84 @@ +# Nitro contracts 2.1.3 upgrade + +> [!CAUTION] +> This is a patch version and is only necessary for chains that aren't ready for v3.0.0 whose parent chains are upgrading to include EIP7702. +> +> v3.0.0 is also compatible with an EIP7702 enabled parent chain. + +These scripts deploy and execute the `NitroContracts2Point1Point3UpgradeAction` contract which allows Orbit chains to upgrade to [2.1.3 release](https://github.com/OffchainLabs/nitro-contracts/releases/tag/v2.1.3). Predeployed instances of the upgrade action exist on the chains listed in the following section. + +Upgrading to `v2.1.3` not required nor recommended if the chain aims to upgrade to v3.0.0 before the parent chain gets EIP7702. + +`NitroContracts2Point1Point3UpgradeAction` will perform the following action: + +1. Upgrade the `Inbox` or `ERC20Inbox` contract to `v2.1.3` +1. Upgrade the `SequencerInbox` contract to `v2.1.3` + +## Requirements + +This upgrade only support upgrading from the following [nitro-contract release](https://github.com/OffchainLabs/nitro-contracts/releases): + +- Inbox: v1.1.0 - v2.1.0 inclusive +- Outbox: v1.1.0 - v2.1.0 inclusive +- SequencerInbox: v1.2.1 - v2.1.0 inclusive +- Bridge: v1.1.0 - v2.1.0 inclusive (note this is not ERC20Bridge) +- ERC20Bridge: v2.0.0 - v2.1.2 inclusive +- RollupProxy: v1.1.0 - v2.1.0 inclusive +- RollupAdminLogic: v2.0.0 - v2.1.0 inclusive +- RollupUserLogic: v2.0.0 - v2.1.0 inclusive +- ChallengeManager: v2.0.0 - v2.1.0 inclusive + +Please refer to the top [README](/README.md#check-version-and-upgrade-path) `Check Version and Upgrade Path` on how to determine your current nitro contracts version. + +## Deployed instances + +### Mainnets +- L1 Mainnet: TODO +- L2 Arb1: TODO +- L2 Nova: TODO +- L2 Base: TODO + +### Testnets +- L1 Sepolia: TODO +- L1 Holesky: TODO +- L2 ArbSepolia: TODO +- L2 BaseSepolia: TODO + +## How to use it + +1. Setup .env according to the example files, make sure you have everything correctly defined. The .env file must be in project root for recent foundry versions. + +> [!CAUTION] +> The .env file must be in project root. + +2. (Skip this step if you can use the deployed instances of action contract) + `DeployNitroContracts2Point1Point3UpgradeActionScript.s.sol` script deploys templates, and upgrade action itself. It can be executed in this directory like this: + +```bash +forge script --sender $DEPLOYER --rpc-url $PARENT_CHAIN_RPC --broadcast --slow DeployNitroContracts2Point1Point3UpgradeActionScript -vvv --verify --skip-simulation +# use --account XXX / --private-key XXX / --interactive / --ledger to set the account to send the transaction from +``` + +As a result, all templates and upgrade action are deployed. Note the last deployed address - that's the upgrade action. + +3. `ExecuteNitroContracts2Point1Point3Upgrade.s.sol` script uses previously deployed upgrade action to execute the upgrade. It makes following assumptions - L1UpgradeExecutor is the rollup owner, and there is an EOA which has executor rights on the L1UpgradeExecutor. Proceed with upgrade using the owner account (the one with executor rights on L1UpgradeExecutor): + +```bash +forge script --sender $EXECUTOR --rpc-url $PARENT_CHAIN_RPC --broadcast ExecuteNitroContracts2Point1Point3UpgradeScript -vvv +# use --account XXX / --private-key XXX / --interactive / --ledger to set the account to send the transaction from +``` + +If you have a multisig as executor, you can still run the above command without broadcasting to get the payload for the multisig transaction. + +4. That's it, upgrade has been performed. You can make sure it has successfully executed by checking the native token decimals. + +```bash +# should return 18 +cast call --rpc-url $PARENT_CHAIN_RPC $BRIDGE "nativeTokenDecimals()(uint8)" +``` + +## FAQ + +### Q: intrinsic gas too low when running foundry script + +A: try to add -g 1000 to the command diff --git a/scripts/foundry/creator-upgrades/1.2.1/output/1.json b/scripts/foundry/creator-upgrades/1.2.1/output/1.json index d5cfb46..bf86fbb 100644 --- a/scripts/foundry/creator-upgrades/1.2.1/output/1.json +++ b/scripts/foundry/creator-upgrades/1.2.1/output/1.json @@ -5,4 +5,4 @@ "updateBridgeErc20TemplatesCalldata": "0x1bb7c6cc0000000000000000000000007efcb76d0e2e776a298aaa603d433336e5f8b6ab000000000000000000000000383f16fb2809a56fc639c1ee2c93ad2aa7ee130a00000000000000000000000031faaab44e74eb408d1fc69a14806b4b9ca09da2000000000000000000000000302275067251f5fcdb9359bda735fd8f7a4a54c000000000000000000000000019431dc37098877486532250fb3158140717c00c", "updateBridgeEthTemplatesCalldata": "0xd94d6e0a0000000000000000000000001c6accd9d66f3b993928e7439c9a2d67b94a445f000000000000000000000000958985cf2c54f99ba4a599221a8090c1f9cee9a50000000000000000000000001162084c3c6575121146582db5be43189e8cee6b00000000000000000000000013be515e44eefaf3ebefad684f1fbb574ac0a4940000000000000000000000002a6dd4433ffa96dc1755814fc0d9cc83a5f68dec", "updateRollupCreatorTemplatesCalldata": "0xac9a97b40000000000000000000000001135265fe014d3fa32b3507e325642b92affeaeb00000000000000000000000057ea090ac0554d174ae0e2855b460e84a1a7c2210000000000000000000000001d901dd7a5efe421c3c437b147040e5af22e6a430000000000000000000000000ae4dd666748bf0f6db5c149eab1d8ad27820a6a000000000000000000000000660ea1675f7323dc3ba0c8ddfb593225eb01e3c10000000000000000000000006c21303f5986180b1394d2c89f3e883890e2867b0000000000000000000000002b0e04dc90e3fa58165cb41e2834b44a56e766af0000000000000000000000009cad81628ab7d8e239f1a5b497313341578c5f710000000000000000000000002e31291fa573db3dfeae00c9bd1806b73c7185c8" -} \ No newline at end of file +} diff --git a/scripts/foundry/creator-upgrades/1.2.1/output/1337.json b/scripts/foundry/creator-upgrades/1.2.1/output/1337.json index 785a6d5..22ad429 100644 --- a/scripts/foundry/creator-upgrades/1.2.1/output/1337.json +++ b/scripts/foundry/creator-upgrades/1.2.1/output/1337.json @@ -5,4 +5,4 @@ "updateBridgeErc20TemplatesCalldata": "0x1bb7c6cc0000000000000000000000004e5b65fb12d4165e22f5861d97a33ba45c006114000000000000000000000000457f2a773d9ebd5eadd5d014db162749a1ea92eb0000000000000000000000009df23e34ac13a7145eba1164660e701839197b1b0000000000000000000000009f1ece352ce8d540738ccb38aa3fa3d44d00a2590000000000000000000000000bdad990640a488400565fe6fb1d879ffe12da37", "updateBridgeEthTemplatesCalldata": "0xd94d6e0a000000000000000000000000217788c286797d56cd59af5e493f3699c39cbbe80000000000000000000000006ca66235758bccd08a4d1612662482f08fab93470000000000000000000000000f1f89aaf1c6fdb7ff9d361e4388f5f3997f12a800000000000000000000000060571c8f4b52954a24a5e7306d435e951528d963000000000000000000000000b075b82c7a23e0994df4793422a1f03dbcf9136f", "updateRollupCreatorTemplatesCalldata": "0xac9a97b40000000000000000000000005e36aa9caaf5f708fca5c04d2d4c776a62b2b2580000000000000000000000002766e96f90f9f027835e0c00c04c8119c635ce02000000000000000000000000037b11bb930dbb7c875ce459eeff69fc2e9fd40d0000000000000000000000009c2ed9f57d053fdfaecbf1b6dfd7c97e2e340b84000000000000000000000000f7ec0b16a45dc99ae21bfa8b4b737d1d61ca9fa4000000000000000000000000dfb681cc1f2c180c2131bb4deb46642d6258b0ff000000000000000000000000bd4cc2f69ffd94b5f62dcc5a27c2eb805093fc0d000000000000000000000000a80482dddb7f8b9dcc24a1cd13488e3379a1456800000000000000000000000092f58045ffb1c00a7b9486b9d2a55d316380cb45" -} \ No newline at end of file +} diff --git a/scripts/foundry/creator-upgrades/1.2.1/output/42161.json b/scripts/foundry/creator-upgrades/1.2.1/output/42161.json index 507add5..a9e3e65 100644 --- a/scripts/foundry/creator-upgrades/1.2.1/output/42161.json +++ b/scripts/foundry/creator-upgrades/1.2.1/output/42161.json @@ -5,4 +5,4 @@ "updateBridgeErc20TemplatesCalldata": "0x1bb7c6cc0000000000000000000000002a6dd4433ffa96dc1755814fc0d9cc83a5f68dec0000000000000000000000007a299ad29499736994aa3a9afa3f476445faeb2c0000000000000000000000007efcb76d0e2e776a298aaa603d433336e5f8b6ab00000000000000000000000018fd37a4fb9e1f06d9383958afd236771f15a8cb000000000000000000000000302275067251f5fcdb9359bda735fd8f7a4a54c0", "updateBridgeEthTemplatesCalldata": "0xd94d6e0a000000000000000000000000b23214f241bdeb275f7dcbfbb1ea79349101d4b000000000000000000000000018ed2d5bf7c5943bfd20a2995b9879e30c9e8dda0000000000000000000000008f6406781cc955398c45a48dcefeebdb2c8e2caa000000000000000000000000f40c24ba346aa459ed28e196d4a46cf17174bd6c00000000000000000000000013be515e44eefaf3ebefad684f1fbb574ac0a494", "updateRollupCreatorTemplatesCalldata": "0xac9a97b400000000000000000000000019431dc37098877486532250fb3158140717c00c000000000000000000000000b20107bfb36d3b5aca534acafbd8857b10b402a80000000000000000000000005ca988f213efbcb86ed7e2aacb0c15c91e648f8d000000000000000000000000ee9e5546a11cb5b4a86e92da05f2ef75c26e47540000000000000000000000000ae4dd666748bf0f6db5c149eab1d8ad27820a6a000000000000000000000000660ea1675f7323dc3ba0c8ddfb593225eb01e3c10000000000000000000000006c21303f5986180b1394d2c89f3e883890e2867b0000000000000000000000002b0e04dc90e3fa58165cb41e2834b44a56e766af00000000000000000000000090d68b056c411015eae3ec0b98ad94e2c91419f1" -} \ No newline at end of file +} diff --git a/scripts/foundry/creator-upgrades/1.2.2/output/1.json b/scripts/foundry/creator-upgrades/1.2.2/output/1.json index d557097..3011dac 100644 --- a/scripts/foundry/creator-upgrades/1.2.2/output/1.json +++ b/scripts/foundry/creator-upgrades/1.2.2/output/1.json @@ -3,4 +3,4 @@ "creatorCalldata": "0x99a88ec400000000000000000000000060d9a46f24d5a35b95a78dd3e793e55d94ee0660000000000000000000000000f39a8a43cffa0513cc057d290fa3e7a57dcd8d46", "retryableSenderCalldata": "0x99a88ec4000000000000000000000000a96b7f9e20a1f6e11815d4af08d911b21cb380ec0000000000000000000000008de0fb2651fdd10975088ae61a71cac6d372063d", "to": "0xE60081476E505F14C231a7efa47e607ff50dAEB5" -} \ No newline at end of file +} diff --git a/scripts/foundry/creator-upgrades/1.2.2/output/11155111.json b/scripts/foundry/creator-upgrades/1.2.2/output/11155111.json index d2a92dd..3410357 100644 --- a/scripts/foundry/creator-upgrades/1.2.2/output/11155111.json +++ b/scripts/foundry/creator-upgrades/1.2.2/output/11155111.json @@ -3,4 +3,4 @@ "creatorCalldata": "0x99a88ec40000000000000000000000007edb2dfbeef9417e0454a80c51ee0c034e45a570000000000000000000000000757143a7ed0dc76499607c7e5b0771965ae1fe06", "retryableSenderCalldata": "0x99a88ec40000000000000000000000002e9da5298ce57818caf96735bdcf900215c25d060000000000000000000000005d0e7fd5fca46aca13e475c070aa3e2f8eb01925", "to": "0xE58B76B21A98334CFD7FD6757102efe029E62Ed0" -} \ No newline at end of file +} diff --git a/scripts/foundry/creator-upgrades/1.2.2/output/42161.json b/scripts/foundry/creator-upgrades/1.2.2/output/42161.json index f213f5e..d6db95b 100644 --- a/scripts/foundry/creator-upgrades/1.2.2/output/42161.json +++ b/scripts/foundry/creator-upgrades/1.2.2/output/42161.json @@ -3,4 +3,4 @@ "creatorCalldata": "0x99a88ec40000000000000000000000002f5624dc8800dfa0a82ac03509ef8bb8e7ac000e00000000000000000000000052d5181dd67ac17176127e670e5baee4d47c6c9e", "retryableSenderCalldata": "0x99a88ec4000000000000000000000000f9fbfc857d51ff51fedd4ea88efc29039871dccf0000000000000000000000009ea06b8753bca071a5c57002ab84598577fb08c1", "to": "0xBE95d0EE267f3E90606537b1C8A6Fb36d2DC1Ce6" -} \ No newline at end of file +} diff --git a/scripts/foundry/creator-upgrades/1.2.2/output/421614.json b/scripts/foundry/creator-upgrades/1.2.2/output/421614.json index 4e5695c..3418ce2 100644 --- a/scripts/foundry/creator-upgrades/1.2.2/output/421614.json +++ b/scripts/foundry/creator-upgrades/1.2.2/output/421614.json @@ -3,4 +3,4 @@ "creatorCalldata": "0x99a88ec400000000000000000000000056c486d3786fa26cc61473c499a36eb9cc1fbd8e000000000000000000000000ec43416728f656ac5b7d860236bb102e2abe0f88", "retryableSenderCalldata": "0x99a88ec4000000000000000000000000a665705700774a40b73b4e3509ae01c7ef05ba0f0000000000000000000000009308a1264ab831002821971ac5fa342c4f775637", "to": "0x8E112dd87E71Ac9061caA2ccC2513027C3cF5D90" -} \ No newline at end of file +} diff --git a/scripts/foundry/creator-upgrades/1.2.2/output/42170.json b/scripts/foundry/creator-upgrades/1.2.2/output/42170.json index 7cee851..b4895a0 100644 --- a/scripts/foundry/creator-upgrades/1.2.2/output/42170.json +++ b/scripts/foundry/creator-upgrades/1.2.2/output/42170.json @@ -3,4 +3,4 @@ "creatorCalldata": "0x99a88ec40000000000000000000000008b9d9490a68b1f16ac8a21ddae5fd7ab9d708c140000000000000000000000004998b99dd376a0cfff0e4b7f1ee0056f79910e64", "retryableSenderCalldata": "0x99a88ec4000000000000000000000000841a23c7c4e20515eaf03debd8ab60f12b5cc13e000000000000000000000000e60081476e505f14c231a7efa47e607ff50daeb5", "to": "0x211A5579D21e1938b2B5ff87a3F7896933543E97" -} \ No newline at end of file +} diff --git a/scripts/orbit-versioner/orbitVersioner.ts b/scripts/orbit-versioner/orbitVersioner.ts index 5dc1702..53eb7c5 100644 --- a/scripts/orbit-versioner/orbitVersioner.ts +++ b/scripts/orbit-versioner/orbitVersioner.ts @@ -146,6 +146,10 @@ function _checkForPossibleUpgrades( version: 'v3.0.0', actionName: 'BOLD UpgradeAction', }, + { + version: 'v2.1.3', + actionName: 'NitroContracts2Point1Point3UpgradeAction', + }, { version: 'v2.1.2', actionName: 'NitroContracts2Point1Point2UpgradeAction', @@ -219,6 +223,45 @@ function _canBeUpgradedToTargetVersion( } if (isFeeTokenChain) { // cannot upgrade erc20 orbit chains from v1 to v3 right now due to a storage diff + supportedSourceVersionsPerContract.Bridge = [ + 'v2.0.0', + 'v2.1.0', + 'v2.1.2', + '2.1.3', + ] + } + } else if (targetVersion === 'v2.1.3') { + // v2.1.3 will upgrade the SequencerInbox and Inbox contracts to prevent 7702 accounts from calling certain functions + // v2.1.3 or v3.0.0 must be performed before the parent chain upgrades with 7702 + // has the same prerequisites as v3.0.0 + supportedSourceVersionsPerContract = { + Inbox: [ + 'v1.1.0', + 'v1.1.1', + 'v1.2.0', + 'v1.2.1', + 'v1.3.0', + 'v2.0.0', + 'v2.1.0', + ], + Outbox: ['any'], + Bridge: [ + 'v1.1.0', + 'v1.1.1', + 'v1.2.0', + 'v1.2.1', + 'v1.3.0', + 'v2.0.0', + 'v2.1.0', + ], + RollupEventInbox: ['any'], + RollupProxy: ['any'], + RollupAdminLogic: ['v2.0.0', 'v2.1.0'], + RollupUserLogic: ['v2.0.0', 'v2.1.0'], + ChallengeManager: ['v2.0.0', 'v2.1.0'], + SequencerInbox: ['v1.2.1', 'v1.3.0', 'v2.0.0', 'v2.1.0'], + } + if (isFeeTokenChain) { supportedSourceVersionsPerContract.Bridge = ['v2.0.0', 'v2.1.0', 'v2.1.2'] } } else if (targetVersion === 'v2.1.2') { diff --git a/test/signatures/AddWasmCacheManagerAction b/test/signatures/AddWasmCacheManagerAction index d60470d..e69de29 100644 --- a/test/signatures/AddWasmCacheManagerAction +++ b/test/signatures/AddWasmCacheManagerAction @@ -1,5 +0,0 @@ -{ - "perform()": "b147f40c", - "targetArbOSVersion()": "fcb528a2", - "wasmCachemanager()": "b6763099" -} diff --git a/test/signatures/EnableFastConfirmAction b/test/signatures/EnableFastConfirmAction index a47b3e4..e69de29 100644 --- a/test/signatures/EnableFastConfirmAction +++ b/test/signatures/EnableFastConfirmAction @@ -1,6 +0,0 @@ -{ - "GNOSIS_COMPATIBILITY_FALLBACK_HANDLER()": "e9f250c1", - "GNOSIS_SAFE_1_3_0()": "acbd7fb4", - "GNOSIS_SAFE_PROXY_FACTORY()": "97ce5a2b", - "perform(address,address[],uint256,uint256)": "6214cbd9" -} diff --git a/test/signatures/NitroContracts1Point2Point1UpgradeAction b/test/signatures/NitroContracts1Point2Point1UpgradeAction index c0ce1ae..e69de29 100644 --- a/test/signatures/NitroContracts1Point2Point1UpgradeAction +++ b/test/signatures/NitroContracts1Point2Point1UpgradeAction @@ -1,7 +0,0 @@ -{ - "newChallengeManagerImpl()": "924ef096", - "newOsp()": "5c4bb63c", - "newSequencerInboxImpl()": "d268538a", - "newWasmModuleRoot()": "6741148c", - "perform(address,address)": "857d1ab7" -} diff --git a/test/signatures/NitroContracts2Point1Point0UpgradeAction b/test/signatures/NitroContracts2Point1Point0UpgradeAction index cc15fe3..e69de29 100644 --- a/test/signatures/NitroContracts2Point1Point0UpgradeAction +++ b/test/signatures/NitroContracts2Point1Point0UpgradeAction @@ -1,10 +0,0 @@ -{ - "condOsp()": "acdf78b9", - "condRoot()": "828545a7", - "newChallengeManagerImpl()": "924ef096", - "newRollupAdminLogic()": "719c1d83", - "newRollupUserLogic()": "98ab2129", - "newWasmModuleRoot()": "6741148c", - "osp()": "f26a62c6", - "perform(address,address)": "857d1ab7" -} diff --git a/test/signatures/NitroContracts2Point1Point2UpgradeAction b/test/signatures/NitroContracts2Point1Point2UpgradeAction index 0804187..e69de29 100644 --- a/test/signatures/NitroContracts2Point1Point2UpgradeAction +++ b/test/signatures/NitroContracts2Point1Point2UpgradeAction @@ -1,4 +0,0 @@ -{ - "newBridgeImpl()": "28b07406", - "perform(address,address)": "857d1ab7" -} diff --git a/test/signatures/NitroContracts2Point1Point3UpgradeAction b/test/signatures/NitroContracts2Point1Point3UpgradeAction new file mode 100644 index 0000000..e69de29 diff --git a/test/signatures/SetSequencerInboxMaxTimeVariationAction b/test/signatures/SetSequencerInboxMaxTimeVariationAction index 109f1ed..e69de29 100644 --- a/test/signatures/SetSequencerInboxMaxTimeVariationAction +++ b/test/signatures/SetSequencerInboxMaxTimeVariationAction @@ -1,7 +0,0 @@ -{ - "delayBlocks()": "ad9c0c2e", - "delaySeconds()": "b752a7d1", - "futureBlocks()": "4f359a37", - "futureSeconds()": "2f1ec5e9", - "perform(address)": "b38ed43b" -} diff --git a/test/signatures/UpgradeArbOSVersionAtTimestampAction b/test/signatures/UpgradeArbOSVersionAtTimestampAction index fc6cfce..e69de29 100644 --- a/test/signatures/UpgradeArbOSVersionAtTimestampAction +++ b/test/signatures/UpgradeArbOSVersionAtTimestampAction @@ -1,5 +0,0 @@ -{ - "newArbOSVersion()": "0959267e", - "perform()": "b147f40c", - "upgradeTimestamp()": "921bd6f0" -} diff --git a/test/storage/AddWasmCacheManagerAction b/test/storage/AddWasmCacheManagerAction index 1ec5dc0..e69de29 100644 --- a/test/storage/AddWasmCacheManagerAction +++ b/test/storage/AddWasmCacheManagerAction @@ -1,6 +0,0 @@ - -╭------+------+------+--------+-------+----------╮ -| Name | Type | Slot | Offset | Bytes | Contract | -+================================================+ -╰------+------+------+--------+-------+----------╯ - diff --git a/test/storage/EnableFastConfirmAction b/test/storage/EnableFastConfirmAction index 1ec5dc0..e69de29 100644 --- a/test/storage/EnableFastConfirmAction +++ b/test/storage/EnableFastConfirmAction @@ -1,6 +0,0 @@ - -╭------+------+------+--------+-------+----------╮ -| Name | Type | Slot | Offset | Bytes | Contract | -+================================================+ -╰------+------+------+--------+-------+----------╯ - diff --git a/test/storage/NitroContracts1Point2Point1UpgradeAction b/test/storage/NitroContracts1Point2Point1UpgradeAction index 1ec5dc0..e69de29 100644 --- a/test/storage/NitroContracts1Point2Point1UpgradeAction +++ b/test/storage/NitroContracts1Point2Point1UpgradeAction @@ -1,6 +0,0 @@ - -╭------+------+------+--------+-------+----------╮ -| Name | Type | Slot | Offset | Bytes | Contract | -+================================================+ -╰------+------+------+--------+-------+----------╯ - diff --git a/test/storage/NitroContracts2Point1Point0UpgradeAction b/test/storage/NitroContracts2Point1Point0UpgradeAction index 1ec5dc0..e69de29 100644 --- a/test/storage/NitroContracts2Point1Point0UpgradeAction +++ b/test/storage/NitroContracts2Point1Point0UpgradeAction @@ -1,6 +0,0 @@ - -╭------+------+------+--------+-------+----------╮ -| Name | Type | Slot | Offset | Bytes | Contract | -+================================================+ -╰------+------+------+--------+-------+----------╯ - diff --git a/test/storage/NitroContracts2Point1Point2UpgradeAction b/test/storage/NitroContracts2Point1Point2UpgradeAction index 1ec5dc0..e69de29 100644 --- a/test/storage/NitroContracts2Point1Point2UpgradeAction +++ b/test/storage/NitroContracts2Point1Point2UpgradeAction @@ -1,6 +0,0 @@ - -╭------+------+------+--------+-------+----------╮ -| Name | Type | Slot | Offset | Bytes | Contract | -+================================================+ -╰------+------+------+--------+-------+----------╯ - diff --git a/test/storage/NitroContracts2Point1Point3UpgradeAction b/test/storage/NitroContracts2Point1Point3UpgradeAction new file mode 100644 index 0000000..e69de29 diff --git a/test/storage/SetSequencerInboxMaxTimeVariationAction b/test/storage/SetSequencerInboxMaxTimeVariationAction index 1ec5dc0..e69de29 100644 --- a/test/storage/SetSequencerInboxMaxTimeVariationAction +++ b/test/storage/SetSequencerInboxMaxTimeVariationAction @@ -1,6 +0,0 @@ - -╭------+------+------+--------+-------+----------╮ -| Name | Type | Slot | Offset | Bytes | Contract | -+================================================+ -╰------+------+------+--------+-------+----------╯ - diff --git a/test/storage/UpgradeArbOSVersionAtTimestampAction b/test/storage/UpgradeArbOSVersionAtTimestampAction index 1ec5dc0..e69de29 100644 --- a/test/storage/UpgradeArbOSVersionAtTimestampAction +++ b/test/storage/UpgradeArbOSVersionAtTimestampAction @@ -1,6 +0,0 @@ - -╭------+------+------+--------+-------+----------╮ -| Name | Type | Slot | Offset | Bytes | Contract | -+================================================+ -╰------+------+------+--------+-------+----------╯ - diff --git a/yarn.lock b/yarn.lock index 86565f7..1a24d16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -54,6 +54,17 @@ patch-package "^6.4.7" solady "0.0.182" +"@arbitrum/nitro-contracts-2.1.3@npm:godzillaba-nitro-contracts@2.1.3-0": + version "2.1.3-0" + resolved "https://registry.yarnpkg.com/godzillaba-nitro-contracts/-/godzillaba-nitro-contracts-2.1.3-0.tgz#c2a0dc6e0f13bc650eede99b40863b71a6e84466" + integrity sha512-SPQeF9vQupq2oNEKbXdMvAf2cp27oScOvg2xqA5WTvD1c4qPhXZgeAHtwLRuLpcUxerpodDLd2Q+UFG5li4+Mg== + dependencies: + "@offchainlabs/upgrade-executor" "1.1.0-beta.0" + "@openzeppelin/contracts" "4.5.0" + "@openzeppelin/contracts-upgradeable" "4.5.2" + patch-package "^6.4.7" + solady "0.0.182" + "@arbitrum/nitro-contracts@1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@arbitrum/nitro-contracts/-/nitro-contracts-1.1.1.tgz#2d8a2f9ab757bb7654562aebe435bff833c4b98d"