Merge pull request #78 from 0xPolygonHermez/develop

Develop

.eslintrc.js

@@ -25,5 +25,6 @@ module.exports = {
         'import/prefer-default-export': [0],
         'lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }],
         'multiline-comment-style': 'error',
+        'import/no-extraneous-dependencies': 'off'
     },
 };

.githooks/pre-commit

@@ -6,17 +6,17 @@ if npm run lint; then
     npx hardhat compile --force
     npm run docgen
     git add docs
-    cp artifacts/contracts/Bridge.sol/Bridge.json compiled-contracts/
-    cp artifacts/contracts/GlobalExitRootManager.sol/GlobalExitRootManager.json compiled-contracts/
-    cp artifacts/contracts/GlobalExitRootManagerL2.sol/GlobalExitRootManagerL2.json compiled-contracts/
+    cp artifacts/contracts/PolygonZkEVMBridge.sol/PolygonZkEVMBridge.json compiled-contracts/
+    cp artifacts/contracts/PolygonZkEVMGlobalExitRoot.sol/PolygonZkEVMGlobalExitRoot.json compiled-contracts/
+    cp artifacts/contracts/PolygonZkEVMGlobalExitRootL2.sol/PolygonZkEVMGlobalExitRootL2.json compiled-contracts/
     cp artifacts/contracts/lib/TokenWrapped.sol/TokenWrapped.json compiled-contracts/
-    cp artifacts/contracts/mocks/BridgeMock.sol/BridgeMock.json compiled-contracts/
+    cp artifacts/contracts/mocks/PolygonZkEVMBridgeMock.sol/PolygonZkEVMBridgeMock.json compiled-contracts/
     cp artifacts/contracts/mocks/ERC20PermitMock.sol/ERC20PermitMock.json compiled-contracts/
-    cp artifacts/contracts/mocks/GlobalExitRootManagerL2Mock.sol/GlobalExitRootManagerL2Mock.json compiled-contracts/
-    cp artifacts/contracts/mocks/GlobalExitRootManagerMock.sol/GlobalExitRootManagerMock.json compiled-contracts/
-    cp artifacts/contracts/mocks/ProofOfEfficiencyMock.sol/ProofOfEfficiencyMock.json compiled-contracts/
+    cp artifacts/contracts/mocks/PolygonZkEVMGlobalExitRootL2Mock.sol/PolygonZkEVMGlobalExitRootL2Mock.json compiled-contracts/
+    cp artifacts/contracts/mocks/PolygonZkEVMGlobalExitRootMock.sol/PolygonZkEVMGlobalExitRootMock.json compiled-contracts/
+    cp artifacts/contracts/mocks/PolygonZkEVMMock.sol/PolygonZkEVMMock.json compiled-contracts/
     cp artifacts/contracts/mocks/VerifierRollupHelperMock.sol/VerifierRollupHelperMock.json compiled-contracts/
-    cp artifacts/contracts/ProofOfEfficiency.sol/ProofOfEfficiency.json compiled-contracts/
+    cp artifacts/contracts/PolygonZkEVM.sol/PolygonZkEVM.json compiled-contracts/
     cp artifacts/contracts/verifiers/Verifier.sol/Verifier.json compiled-contracts/
     git add compiled-contracts
     exit 0

.gitignore

@@ -14,4 +14,5 @@ docs/interfaces
 docs/mocks
 .vscode/launch.json
 deploy_output.json
-deploy_parameters.json
+deploy_parameters.json
+deployments

.solhint.json

@@ -6,6 +6,9 @@
     "compiler-version": ["error", "0.8.15"],
     "private-vars-leading-underscore": "error",
     "bracket-align": "off",
-    "reason-string": "off"
+    "reason-string": "off",
+    "not-rely-on-time": "off",
+    "no-inline-assembly": "off",
+    "check-send-result": "off"
   }
 }

README.md

@@ -18,10 +18,10 @@ Private keys and mnemonics contained in this repository are used for internal te
 ## Repository structure
 
 - `contracts`: zkevm contracts
-  - `Bridge.sol`: transfer assets between chains
-    - `GlobalExitRootManager.sol`: manage global exit root in L1
-    - `GlobalExitRootManagerL2.sol`: manage global exit root in L2
-  - `ProofOfEfficiency.sol`: consensus algorithm used by polyhon hermez zkevm
+  - `PolygonZkEVMBridge.sol`: transfer assets between chains
+    - `PolygonZkEVMGlobalExitRoot.sol`: manage global exit root in L1
+    - `PolygonZkEVMGlobalExitRootL2.sol`: manage global exit root in L2
+  - `PolygonZkEVM.sol`: consensus algorithm used by polyhon hermez zkevm
 - `docs`: specs and useful links
 - `test`: contracts tests
 
@@ -60,7 +60,7 @@ npm run lint:fix
 ## Deploy on hardhat
 
 ```
-npm run deploy:PoE2_0:hardhat
+npm run deploy:ZkEVM:hardhat
 ```
 
 ## Build dockers