update arbos11 action contracts

ArbitrumFoundation · Nov 2, 2023 · 3c2cdcb · 3c2cdcb
1 parent 92657b4
commit 3c2cdcb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11VersionAction.sol b/src/gov-action-contracts/AIPs/ArbOS11/SetArbOS11VersionAction.sol
@@ -4,14 +4,7 @@ pragma solidity 0.8.16;
 import "../../arbos-upgrade/UpgradeArbOSVersionAction.sol";
 import "../../address-registries/L1AddressRegistry.sol";
 
+/// @notice identical copies of this contract to be deployed on Arb One and Nova for ArbOS11 upgrades
 contract SetArbOS11VersionAction is UpgradeArbOSVersionAction {
-    constructor()
-        UpgradeArbOSVersionAction(
-            uint64(11),
-            // TODO:
-            uint64(0)
-        )
-    {
-        require(upgradeTimeDelaySeconds != uint64(0), "TODO: remove");
-    }
+    constructor() UpgradeArbOSVersionAction(uint64(11), uint64(1 weeks)) {}
 }
diff --git a/...Ps/ArbOS11/SetArbOS11ModuleRootAciton.sol → ...OS11/SetArbOneArbOS11ModuleRootAciton.sol b/...Ps/ArbOS11/SetArbOS11ModuleRootAciton.sol → ...OS11/SetArbOneArbOS11ModuleRootAciton.sol
@@ -4,12 +4,12 @@ pragma solidity 0.8.16;
 import "../../arbos-upgrade/SetWasmModuleRootAction.sol";
 import "../../address-registries/L1AddressRegistry.sol";
 
-contract SetArbOS11ModuleRootAciton is SetWasmModuleRootAction {
+/// @notice action deployed on L1 to set Arb One's wasm module root for ARBOS11 upgrade
+contract SetArbOneArbOS11ModuleRootAciton is SetWasmModuleRootAction {
     constructor()
         SetWasmModuleRootAction(
             L1AddressRegistry(0xd514C2b3aaBDBfa10800B9C96dc1eB25427520A0),
-            // TODO
-            bytes32(0)
+            bytes32(0x92a7978d7ef64fa82a33c9d9af77647d9014c345a24ebf41635bc89e1c45e35b)
         )
     {
         require(newWasmModuleRoot != bytes32(0), "TODO: remove");

diff --git a/src/gov-action-contracts/AIPs/ArbOS11/SetNovaArbOS11ModuleRootAction.sol b/src/gov-action-contracts/AIPs/ArbOS11/SetNovaArbOS11ModuleRootAction.sol
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.16;
+
+import "../../arbos-upgrade/SetWasmModuleRootAction.sol";
+import "../../address-registries/L1AddressRegistry.sol";
+
+/// @notice action deployed on L1 to set nova's wasm module root for ARBOS11 upgrade
+contract SetNovaArbOS11ModuleRootAction is SetWasmModuleRootAction {
+    constructor()
+        SetWasmModuleRootAction(
+            L1AddressRegistry(0x2F06643fc2CC18585Ae790b546388F0DE4Ec6635),
+            bytes32(0x92a7978d7ef64fa82a33c9d9af77647d9014c345a24ebf41635bc89e1c45e35b)
+        )
+    {}
+}