Merge pull request #106 from 0xPolygonHermez/develop

Develop

.githooks/pre-commit

@@ -17,7 +17,11 @@ 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/Verifier.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/
+    cp artifacts/contracts/PolygonZkEVMTimelock.sol/PolygonZkEVMTimelock.json compiled-contracts/
     git add compiled-contracts
     exit 0
 else

.gitignore

@@ -15,4 +15,7 @@ docs/mocks
 .vscode/launch.json
 deploy_output.json
 deploy_parameters.json
-deployments
+deployments
+upgrade_parameters.json
+docker/gethData/
+*.ignore/

.solcover.js

@@ -0,0 +1,3 @@
+module.exports = {
+  skipFiles: ['mocks', 'interfaces']
+};

.solhint.json

@@ -3,7 +3,7 @@
   "rules": {
     "mark-callable-contracts": "off",
     "no-empty-blocks": "off",
-    "compiler-version": ["error", "0.8.15"],
+    "compiler-version": ["error", "0.8.17"],
     "private-vars-leading-underscore": "error",
     "bracket-align": "off",
     "reason-string": "off",

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
   "editor.formatOnSave": false,
   "solidity.linter": "solhint",
-  "solidity.compileUsingRemoteVersion": "v0.8.15+commit.e14f2714"
+  "solidity.compileUsingRemoteVersion": "v0.8.17+commit.e14f2714"
 }

README.md

@@ -12,7 +12,7 @@ Private keys and mnemonics contained in this repository are used for internal te
 
 ## Requirements
 
-- node version: 14.x
+- node version: 16.x
 - npm version: 7.x
 
 ## Repository structure
@@ -21,7 +21,7 @@ Private keys and mnemonics contained in this repository are used for internal te
   - `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
+  - `PolygonZkEVM.sol`: consensus algorithm used by polygon hermez zkevm
 - `docs`: specs and useful links
 - `test`: contracts tests
 
@@ -82,7 +82,7 @@ Polygon `zkevm-contracts` was developed by Polygon. While we plan to adopt an op
 
 ## Note
 
-In order to test, the following private keys are being used. This keys are not meant to be used in any production environment:
+In order to test, the following private keys are being used. These keys are not meant to be used in any production environment:
 
 - private key: `0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80`
   - address:`0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266`