feat: EigenDA v2.1.0 migration action - address feedback

Layr-Labs · Oct 23, 2024 · 0bc2322 · 0bc2322
1 parent acf39f1
commit 0bc2322
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/contracts/parent-chain/contract-upgrades/NitroContractsEigenDA2Point1Point0UpgradeAction.sol b/contracts/parent-chain/contract-upgrades/NitroContractsEigenDA2Point1Point0UpgradeAction.sol
@@ -77,7 +77,7 @@ contract NitroContractsEigenDA2Point1Point0UpgradeAction {
         osp = _newOsp;
         wasmModuleRoot = _newWasmModuleRoot;
 
-        // require(Address.isContract(address(_condOsp)), 'Invalid conditional OSP contract');
+        require(Address.isContract(address(_condOsp)), 'Invalid conditional OSP contract');
         condOsp = _condOsp;
         condRoot = _condOspRoot;
 
@@ -157,6 +157,8 @@ contract NitroContractsEigenDA2Point1Point0UpgradeAction {
             rollup.wasmModuleRoot() == wasmModuleRoot,
             "NitroContracts2Point1Point0UpgradeAction: wasm module root not set"
         );
+
+        _upgradeRollup(address(rollup));
     }
 
     function _upgradeRollup(address rollupProxy) internal {

diff --git a/...ntract-upgrades/eigenda-2.1.0/DeployNitroContractsEigenDA2Point1Point0UpgradeAction.s.sol b/...ntract-upgrades/eigenda-2.1.0/DeployNitroContractsEigenDA2Point1Point0UpgradeAction.s.sol
@@ -15,7 +15,7 @@ import {console} from "forge-std/console.sol";
  */
 contract DeployNitroContractsEigenDA2Point1Point0UpgradeActionScript is DeploymentHelpersScript {
     // ArbOS x EigenDA v32 {LINK OFFICIAL RELEASE HERE WHEN READY}
-    bytes32 public constant WASM_MODULE_ROOT = 0xddc237b76a502661518781d4fcf4b42461439cb7fc670b40f7689efcd27b9113;
+    bytes32 public constant WASM_MODULE_ROOT = 0xe8c8b8228ea07ce8fec67d88d7a7f5fd52c104d262f2cca255569b38b183d285;
     // ArbOS v32 https://github.com/OffchainLabs/nitro/releases/tag/consensus-v32
     bytes32 public constant COND_WASM_MODULE_ROOT = 0x184884e1eb9fefdc158f6c8ac912bb183bf3cf83f0090317e0bc4ac5860baa39;