update package json

gateway-fm · Jan 25, 2024 · eda2d5c · eda2d5c
1 parent c1c4f6d
commit eda2d5c
Show file tree

Hide file tree

Showing 5 changed files with 791 additions and 316 deletions.
diff --git a/contracts/PolygonZkEVM.sol b/contracts/PolygonZkEVM.sol
@@ -1555,6 +1555,28 @@ contract PolygonZkEVM is
         _activateEmergencyState();
     }
 
+    /**
+     * @notice Function to deactivate emergency state on both PolygonZkEVM and PolygonZkEVMBridge contracts
+     */
+    function deactivateEmergencyState() external onlyAdmin {
+        // Deactivate emergency state on PolygonZkEVMBridge
+        bridgeAddress.deactivateEmergencyState();
+
+        // Deactivate emergency state on this contract
+        super._deactivateEmergencyState();
+    }
+
+    /**
+     * @notice Internal function to activate emergency state on both PolygonZkEVM and PolygonZkEVMBridge contracts
+     */
+    function _activateEmergencyState() internal override {
+        // Activate emergency state on PolygonZkEVM Bridge
+        bridgeAddress.activateEmergencyState();
+
+        // Activate emergency state on this contract
+        super._activateEmergencyState();
+    }
+
     ////////////////////////
     // public/view functions
     ////////////////////////

diff --git a/contracts/lib/DepositContract.sol b/contracts/lib/DepositContract.sol
@@ -117,33 +117,6 @@ contract DepositContract is ReentrancyGuardUpgradeable {
         return node == root;
     }
 
-    /**
-     * @notice calcualte root from merkle proof
-     * @param leafHash Leaf hash
-     * @param smtProof Smt proof
-     * @param index Index of the leaf
-     */
-    function calculateRoot(
-        bytes32 leafHash,
-        bytes32[_DEPOSIT_CONTRACT_TREE_DEPTH] calldata smtProof,
-        uint32 index
-    ) public pure returns (bytes32) {
-        bytes32 node = leafHash;
-
-        // Check merkle proof
-        for (
-            uint256 height = 0;
-            height < _DEPOSIT_CONTRACT_TREE_DEPTH;
-            height++
-        ) {
-            if (((index >> height) & 1) == 1)
-                node = keccak256(abi.encodePacked(smtProof[height], node));
-            else node = keccak256(abi.encodePacked(node, smtProof[height]));
-        }
-
-        return node;
-    }
-
     /**
      * @notice Given the leaf data returns the leaf value
      * @param leafType Leaf type -->  [0] transfer Ether / ERC20 tokens, [1] message

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -54,6 +54,7 @@ module.exports = {
                         runs: 999999,
                     },
                 },
+
             },
             {
                 version: '0.5.16',
@@ -73,6 +74,17 @@ module.exports = {
                         enabled: true,
                         runs: 99,
                     },
+                    evmVersion: "shanghai",
+                },// try yul optimizer
+            },
+            "contracts/v2/L2/PolygonZkEVMBridgeL2.sol": {
+                version: '0.8.20',
+                settings: {
+                    optimizer: {
+                        enabled: true,
+                        runs: 9999,
+                    },
+                    evmVersion: "shanghai",
                 },
             }
         }