Better globalExitRoot initialization (#29)

RealityETH · Dec 30, 2023 · a090458 · a090458
1 parent 98773c5
commit a090458
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 17 deletions.
diff --git a/contracts/PolygonZkEVMGlobalExitRootWrapper.sol b/contracts/PolygonZkEVMGlobalExitRootWrapper.sol
@@ -10,8 +10,8 @@ contract PolygonZkEVMGlobalExitRootWrapper is PolygonZkEVMGlobalExitRoot {
      * @param _rollupAddress Rollup contract address
      * @param _bridgeAddress PolygonZkEVMBridge contract address
      */
-    function initialize(address _rollupAddress, address _bridgeAddress) public override initializer {
-        PolygonZkEVMGlobalExitRoot.initialize(_rollupAddress, _bridgeAddress);
+    function initialize(address _rollupAddress, address _bridgeAddress, bytes32 _lastMainnetExitRoot, bytes32 _lastRollupExitRoot) public override initializer {
+        PolygonZkEVMGlobalExitRoot.initialize(_rollupAddress, _bridgeAddress, _lastMainnetExitRoot, _lastRollupExitRoot);
     }
 }
 
diff --git a/contracts/inheritedMainContracts/PolygonZkEVMGlobalExitRoot.sol b/contracts/inheritedMainContracts/PolygonZkEVMGlobalExitRoot.sol
@@ -37,9 +37,14 @@ contract PolygonZkEVMGlobalExitRoot is IPolygonZkEVMGlobalExitRoot, Initializabl
      * @param _rollupAddress Rollup contract address
      * @param _bridgeAddress PolygonZkEVMBridge contract address
      */
-    function initialize(address _rollupAddress, address _bridgeAddress) public virtual onlyInitializing {
+    function initialize(address _rollupAddress, address _bridgeAddress, bytes32 _lastMainnetExitRoot, bytes32 _lastRollupExitRoot) public virtual onlyInitializing {
         rollupAddress = _rollupAddress;
         bridgeAddress = _bridgeAddress;
+        lastMainnetExitRoot = _lastMainnetExitRoot;
+        lastRollupExitRoot = _lastRollupExitRoot;
+        if(_lastMainnetExitRoot != bytes32(0) || _lastRollupExitRoot != bytes32(0)){
+            _updateGlobalExitRootHash(_lastMainnetExitRoot, _lastRollupExitRoot);
+        }
     }
 
     /**
@@ -61,6 +66,15 @@ contract PolygonZkEVMGlobalExitRoot is IPolygonZkEVMGlobalExitRoot, Initializabl
             revert OnlyAllowedContracts();
         }
 
+        _updateGlobalExitRootHash(cacheLastMainnetExitRoot, cacheLastRollupExitRoot);
+    }
+
+    /**
+     * @notice Update the global exit root
+        * @param cacheLastMainnetExitRoot last mainnet exit root
+        * @param cacheLastRollupExitRoot last rollup exit root
+     */
+    function _updateGlobalExitRootHash(bytes32 cacheLastMainnetExitRoot, bytes32 cacheLastRollupExitRoot) internal {
         bytes32 newGlobalExitRoot = GlobalExitRootLib.calculateGlobalExitRoot(
             cacheLastMainnetExitRoot,
             cacheLastRollupExitRoot

diff --git a/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol b/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol
@@ -5,4 +5,7 @@ import "./IBasePolygonZkEVMGlobalExitRoot.sol";
 
 interface IPolygonZkEVMGlobalExitRoot is IBasePolygonZkEVMGlobalExitRoot {
     function getLastGlobalExitRoot() external view returns (bytes32);
+
+    function lastMainnetExitRoot() external view returns (bytes32);
+    function lastRollupExitRoot() external view returns (bytes32);
 }
diff --git a/test/contracts/bridge.test.js b/test/contracts/bridge.test.js
@@ -65,7 +65,12 @@ describe('PolygonZkEVMBridge Contract - for L2', () => {
         const PolygonZkEVMGlobalExitRootFactory = await ethers.getContractFactory('PolygonZkEVMGlobalExitRootWrapper');
         polygonZkEVMGlobalExitRoot = await upgrades.deployProxy(PolygonZkEVMGlobalExitRootFactory, [], { initializer: false });
 
-        await polygonZkEVMGlobalExitRoot.initialize(rollup.address, polygonZkEVMBridgeContract.address);
+        await polygonZkEVMGlobalExitRoot.initialize(
+            rollup.address,
+            polygonZkEVMBridgeContract.address,
+            ethers.constants.HashZero,
+            ethers.constants.HashZero,
+        );
 
         await polygonZkEVMBridgeContract.initialize(
             networkIDMainnet,
@@ -1241,7 +1246,12 @@ describe('PolygonZkEVMBridge Contract - for L1', () => {
         const PolygonZkEVMGlobalExitRootFactory = await ethers.getContractFactory('PolygonZkEVMGlobalExitRootWrapper');
         polygonZkEVMGlobalExitRoot = await upgrades.deployProxy(PolygonZkEVMGlobalExitRootFactory, [], { initializer: false });
 
-        await polygonZkEVMGlobalExitRoot.initialize(rollup.address, polygonZkEVMBridgeContract.address);
+        await polygonZkEVMGlobalExitRoot.initialize(
+            rollup.address,
+            polygonZkEVMBridgeContract.address,
+            ethers.constants.HashZero,
+            ethers.constants.HashZero,
+        );
 
         await polygonZkEVMBridgeContract.initialize(
             networkIDMainnet,

diff --git a/test/contracts/bridgeMock.test.js b/test/contracts/bridgeMock.test.js
@@ -58,7 +58,12 @@ describe('PolygonZkEVMBridge Mock Contract', () => {
         // deploy global exit root manager
         const polygonZkEVMGlobalExitRootFactory = await ethers.getContractFactory('PolygonZkEVMGlobalExitRootMock');
         polygonZkEVMGlobalExitRoot = await upgrades.deployProxy(polygonZkEVMGlobalExitRootFactory, [], { initializer: false });
-        await polygonZkEVMGlobalExitRoot.initialize(rollup.address, polygonZkEVMBridgeContract.address);
+        await polygonZkEVMGlobalExitRoot.initialize(
+            rollup.address,
+            polygonZkEVMBridgeContract.address,
+            ethers.constants.HashZero,
+            ethers.constants.HashZero,
+        );
 
         await polygonZkEVMBridgeContract.initialize(
             networkIDMainnet,

diff --git a/test/contracts/bridge_metadata.test.js b/test/contracts/bridge_metadata.test.js
@@ -49,7 +49,12 @@ describe('PolygonZkEVMBridge Contract werid metadata', () => {
         // deploy global exit root manager
         const polygonZkEVMGlobalExitRootFactory = await ethers.getContractFactory('PolygonZkEVMGlobalExitRootWrapper');
         polygonZkEVMGlobalExitRoot = await upgrades.deployProxy(polygonZkEVMGlobalExitRootFactory, [], { initializer: false });
-        await polygonZkEVMGlobalExitRoot.initialize(rollup.address, polygonZkEVMBridgeContract.address);
+        await polygonZkEVMGlobalExitRoot.initialize(
+            rollup.address,
+            polygonZkEVMBridgeContract.address,
+            ethers.constants.HashZero,
+            ethers.constants.HashZero,
+        );
 
         await polygonZkEVMBridgeContract.initialize(
             networkIDMainnet,

diff --git a/test/contracts/bridge_permit.test.js b/test/contracts/bridge_permit.test.js
@@ -67,7 +67,12 @@ describe('PolygonZkEVMBridge Contract Permit tests', () => {
         // deploy global exit root manager
         const polygonZkEVMGlobalExitRootFactory = await ethers.getContractFactory('PolygonZkEVMGlobalExitRootWrapper');
         polygonZkEVMGlobalExitRoot = await upgrades.deployProxy(polygonZkEVMGlobalExitRootFactory, [], { initializer: false });
-        await polygonZkEVMGlobalExitRoot.initialize(rollup.address, polygonZkEVMBridgeContract.address);
+        await polygonZkEVMGlobalExitRoot.initialize(
+            rollup.address,
+            polygonZkEVMBridgeContract.address,
+            ethers.constants.HashZero,
+            ethers.constants.HashZero,
+        );
 
         await polygonZkEVMBridgeContract.initialize(
             networkIDMainnet,

diff --git a/test/contracts/emergencyManager.test.js b/test/contracts/emergencyManager.test.js
@@ -87,7 +87,12 @@ describe('Emergency mode test', () => {
             initializer: false,
             constructorArgs: [],
         });
-        await polygonZkEVMGlobalExitRoot.initialize(precalculateZkevmAddress, precalculateBridgeAddress);
+        await polygonZkEVMGlobalExitRoot.initialize(
+            precalculateZkevmAddress,
+            precalculateBridgeAddress,
+            ethers.constants.HashZero,
+            ethers.constants.HashZero,
+        );
 
         // deploy PolygonZkEVMBridge
         const polygonZkEVMBridgeFactory = await ethers.getContractFactory('PolygonZkEVMBridgeWrapper');

diff --git a/test/contracts/globalExitRootManager.test.js b/test/contracts/globalExitRootManager.test.js
@@ -4,7 +4,8 @@ const { ethers, upgrades } = require('hardhat');
 function calculateGlobalExitRoot(mainnetExitRoot, rollupExitRoot) {
     return ethers.utils.solidityKeccak256(['bytes32', 'bytes32'], [mainnetExitRoot, rollupExitRoot]);
 }
-const zero32bytes = '0x0000000000000000000000000000000000000000000000000000000000000000';
+const one32bytes = '0x0000000000000000000000000000000000000000000000000000000000000001';
+const two32bytes = '0x0000000000000000000000000000000000000000000000000000000000000002';
 
 describe('Global Exit Root', () => {
     let rollup;
@@ -19,15 +20,15 @@ describe('Global Exit Root', () => {
         const PolygonZkEVMGlobalExitRootFactory = await ethers.getContractFactory('PolygonZkEVMGlobalExitRootWrapper');
         polygonZkEVMGlobalExitRoot = await upgrades.deployProxy(PolygonZkEVMGlobalExitRootFactory, [], { initializer: false });
 
-        await polygonZkEVMGlobalExitRoot.initialize(rollup.address, PolygonZkEVMBridge.address);
+        await polygonZkEVMGlobalExitRoot.initialize(rollup.address, PolygonZkEVMBridge.address, one32bytes, two32bytes);
         await polygonZkEVMGlobalExitRoot.deployed();
     });
 
     it('should check the constructor parameters', async () => {
         expect(await polygonZkEVMGlobalExitRoot.rollupAddress()).to.be.equal(rollup.address);
         expect(await polygonZkEVMGlobalExitRoot.bridgeAddress()).to.be.equal(PolygonZkEVMBridge.address);
-        expect(await polygonZkEVMGlobalExitRoot.lastRollupExitRoot()).to.be.equal(zero32bytes);
-        expect(await polygonZkEVMGlobalExitRoot.lastMainnetExitRoot()).to.be.equal(zero32bytes);
+        expect(await polygonZkEVMGlobalExitRoot.lastRollupExitRoot()).to.be.equal(two32bytes);
+        expect(await polygonZkEVMGlobalExitRoot.lastMainnetExitRoot()).to.be.equal(one32bytes);
     });
 
     it('should update root and check global exit root', async () => {
@@ -39,10 +40,10 @@ describe('Global Exit Root', () => {
         // Update root from the rollup
         await expect(polygonZkEVMGlobalExitRoot.connect(rollup).updateExitRoot(newRootRollup))
             .to.emit(polygonZkEVMGlobalExitRoot, 'UpdateGlobalExitRoot')
-            .withArgs(zero32bytes, newRootRollup);
+            .withArgs(one32bytes, newRootRollup);
 
         expect(await polygonZkEVMGlobalExitRoot.getLastGlobalExitRoot())
-            .to.be.equal(calculateGlobalExitRoot(zero32bytes, newRootRollup));
+            .to.be.equal(calculateGlobalExitRoot(one32bytes, newRootRollup));
 
         // Update root from the PolygonZkEVMBridge
         const newRootBridge = ethers.utils.hexlify(ethers.utils.randomBytes(32));

diff --git a/test/contracts/polygonZkEVM.test.js b/test/contracts/polygonZkEVM.test.js
@@ -98,7 +98,12 @@ describe('Polygon ZK-EVM', () => {
             initializer: false,
             constructorArgs: [],
         });
-        await polygonZkEVMGlobalExitRoot.initialize(precalculateZkevmAddress, precalculateBridgeAddress);
+        await polygonZkEVMGlobalExitRoot.initialize(
+            precalculateZkevmAddress,
+            precalculateBridgeAddress,
+            ethers.constants.HashZero,
+            ethers.constants.HashZero,
+        );
 
         // deploy PolygonZkEVMBridge
         const polygonZkEVMBridgeFactory = await ethers.getContractFactory('PolygonZkEVMBridgeWrapper');

diff --git a/test/contracts/polygonZkEVMTestnetV2.test.js b/test/contracts/polygonZkEVMTestnetV2.test.js
@@ -90,7 +90,12 @@ describe('Polygon ZK-EVM TestnetV2', () => {
             constructorArgs: [],
         });
 
-        await polygonZkEVMGlobalExitRoot.initialize(precalculateZkevmAddress, precalculateBridgeAddress);
+        await polygonZkEVMGlobalExitRoot.initialize(
+            precalculateZkevmAddress,
+            precalculateBridgeAddress,
+            ethers.constants.HashZero,
+            ethers.constants.HashZero,
+        );
         // deploy PolygonZkEVMBridge
         const polygonZkEVMBridgeFactory = await ethers.getContractFactory('PolygonZkEVMBridgeWrapper');
         polygonZkEVMBridgeContract = await upgrades.deployProxy(polygonZkEVMBridgeFactory, [], { initializer: false });