Jesus review II

0xPolygonHermez · Feb 28, 2025 · 72fe2e8 · 72fe2e8
1 parent bab1d3a
commit 72fe2e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol b/contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol
@@ -82,7 +82,7 @@ contract GlobalExitRootManagerL2SovereignChain is
     function initialize(
         address _globalExitRootUpdater,
         address _globalExitRootRemover
-    ) external virtual reinitializer(2) {
+    ) external virtual initializer {
         // set globalExitRootUpdater
         globalExitRootUpdater = _globalExitRootUpdater;
         // set globalExitRootRemover

diff --git a/test/contractsv2/BridgeL2SovereignChainUpgradeAL.test.ts b/test/contractsv2/BridgeL2SovereignChainUpgradeAL.test.ts
@@ -92,10 +92,6 @@ describe("BridgeL2SovereignChain Contract", () => {
             }
         )) as unknown as GlobalExitRootManagerL2SovereignChain;
 
-        // initialize GlobalExitRootManagerL2SovereignChain
-        await sovereignChainGlobalExitRootContract.initialize(
-            ethers.ZeroAddress, deployer.address
-        );
         // cannot initialize bridgeV2 initializer from Sovereign bridge
         await expect(
             sovereignChainBridgeContract.initialize(

diff --git a/upgrade/upgradeSovereign/upgradeSovereignGER.ts b/upgrade/upgradeSovereign/upgradeSovereignGER.ts
@@ -94,20 +94,13 @@ async function main() {
         );
         console.log("Copy the following constructor arguments on: upgrade/arguments.js \n", [bridgeAddress]);
     }
-    // Get initialize values
-    const globalExitRootUpdater = await gerManagerL2SovereignChainContract.globalExitRootUpdater();
-    const globalExitRootRemover = await gerManagerL2SovereignChainContract.globalExitRootRemover();
-
+    // gerManagerL2SovereignChainImplementation is upgraded but not initialized
     const timelockOperation = genTimelockOperation(
         proxyAdmin.target,
         0, // value
-        proxyAdmin.interface.encodeFunctionData("upgradeAndCall", [
+        proxyAdmin.interface.encodeFunctionData("upgrade", [
             globalExitRootManagerL2SovereignChainAddress,
             gerManagerL2SovereignChainImplementation,
-            gerManagerL2SovereignChainFactory.interface.encodeFunctionData("initialize", [
-                globalExitRootUpdater,
-                globalExitRootRemover,
-            ]),
         ]), // data
         ethers.ZeroHash, // predecessor
         salt // salt