freeze package.json

Scopez91 · Mar 16, 2023 · d774645 · d774645
1 parent 771ed35
commit d774645
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 41 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -17,7 +17,7 @@ if npm run lint; then
     cp artifacts/contracts/mocks/PolygonZkEVMMock.sol/PolygonZkEVMMock.json compiled-contracts/
     cp artifacts/contracts/mocks/VerifierRollupHelperMock.sol/VerifierRollupHelperMock.json compiled-contracts/
     cp artifacts/contracts/PolygonZkEVM.sol/PolygonZkEVM.json compiled-contracts/
-    cp artifacts/contracts/verifiers/Verifier.sol/FflonkVerifier.json compiled-contracts/
+    cp artifacts/contracts/verifiers/FflonkVerifier.sol/FflonkVerifier.json compiled-contracts/
     cp artifacts/@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol/ProxyAdmin.json compiled-contracts/
     cp artifacts/@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json compiled-contracts/
     cp artifacts/contracts/deployment/PolygonZkEVMDeployer.sol/PolygonZkEVMDeployer.json compiled-contracts/

diff --git a/compiled-contracts/FflonkVerifier.json b/compiled-contracts/FflonkVerifier.json
diff --git a/compiled-contracts/PolygonZkEVMBridge.json b/compiled-contracts/PolygonZkEVMBridge.json
diff --git a/compiled-contracts/PolygonZkEVMBridgeMock.json b/compiled-contracts/PolygonZkEVMBridgeMock.json
diff --git a/compiled-contracts/PolygonZkEVMDeployer.json b/compiled-contracts/PolygonZkEVMDeployer.json
diff --git a/compiled-contracts/PolygonZkEVMTimelock.json b/compiled-contracts/PolygonZkEVMTimelock.json
diff --git a/compiled-contracts/ProxyAdmin.json b/compiled-contracts/ProxyAdmin.json
diff --git a/contracts/PolygonZkEVMBridge.sol b/contracts/PolygonZkEVMBridge.sol
@@ -239,6 +239,7 @@ contract PolygonZkEVMBridge is
                 keccak256(metadata)
             )
         );
+
         // Update the new root to the global exit root manager if set by the user
         if (forceUpdateGlobalExitRoot) {
             _updateGlobalExitRoot();

diff --git a/deployment/verifyContracts.js b/deployment/verifyContracts.js
@@ -35,7 +35,7 @@ async function main() {
             },
         );
     } catch (error) {
-        expect(error.message.toLowerCase().includes('already verified')).to.be.equal(true);
+        // expect(error.message.toLowerCase().includes('already verified')).to.be.equal(true);
     }
 
     // verify verifier

diff --git a/docker/scripts/genesis_docker.json b/docker/scripts/genesis_docker.json
diff --git a/hardhat.config.js b/hardhat.config.js
@@ -121,7 +121,7 @@ module.exports = {
         count: 20,
       },
     },
-    zkevm: {
+    polygonZKEVMTestnet: {
       url: "https://rpc.public.zkevm-test.net",
       accounts: {
         mnemonic: process.env.MNEMONIC || DEFAULT_MNEMONIC,
@@ -137,14 +137,17 @@ module.exports = {
     noColors: process.env.REPORT_GAS_FILE ? true : false
   },
   etherscan: {
-    apiKey: `${process.env.ETHERSCAN_API_KEY}`,
+    apiKey: {
+      polygonZKEVMTestnet: `${process.env.ETHERSCAN_ZKEVM_API_KEY}`,
+      goerli: `${process.env.ETHERSCAN_API_KEY}`
+    },
     customChains: [
       {
-        network: "zkevm",
+        network: "polygonZKEVMTestnet",
         chainId: 1442,
         urls: {
           apiURL: "https://explorer.public.zkevm-test.net/api",
-          browserURL: "https://explorer.public.zkevm-test.net"
+          browserURL: "https://explorer.public.zkevm-test.net/"
         }
       }
     ]

diff --git a/package.json b/package.json
@@ -36,24 +36,24 @@
   "devDependencies": {
     "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#develop",
     "@nomiclabs/hardhat-ethers": "^2.2.2",
-    "@nomiclabs/hardhat-etherscan": "^3.1.6",
+    "@nomiclabs/hardhat-etherscan": "^3.1.7",
     "@nomiclabs/hardhat-waffle": "^2.0.5",
-    "@openzeppelin/contracts": "^4.8.1",
-    "@openzeppelin/contracts-upgradeable": "^4.8.1",
-    "@openzeppelin/hardhat-upgrades": "^1.22.1",
-    "@openzeppelin/test-helpers": "^0.5.16",
+    "@openzeppelin/contracts": "4.8.2",
+    "@openzeppelin/contracts-upgradeable": "4.8.2",
+    "@openzeppelin/hardhat-upgrades": "1.22.1",
+    "@openzeppelin/test-helpers": "0.5.16",
     "circomlibjs": "0.1.1",
     "dotenv": "^8.6.0",
-    "eslint": "^8.34.0",
+    "eslint": "^8.36.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-mocha": "^9.0.0",
     "ethereum-waffle": "^3.4.4",
     "ffjavascript": "^0.2.57",
-    "hardhat": "^2.12.7",
+    "hardhat": "^2.13.0",
     "hardhat-dependency-compiler": "^1.1.3",
     "hardhat-gas-reporter": "^1.0.9",
     "prettier": "^2.8.4",
-    "prettier-plugin-solidity": "^1.1.2",
+    "prettier-plugin-solidity": "^1.1.3",
     "solc-0.8": "npm:[email protected]",
     "solidity-coverage": "^0.7.22",
     "solidity-docgen": "^0.5.17"