Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #181

Merged
merged 244 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
244 commits
Select commit Hold shift + click to select a range
2a03212
fix: multiple typos
criadoperez Jul 18, 2023
50effb0
fix OZ upgradeability filename
bap2pecs Jan 21, 2024
810eb23
first approach
invocamanman Aug 23, 2023
ca5828a
almost done
invocamanman Aug 24, 2023
a09de9f
almost done2
invocamanman Aug 24, 2023
42e0f34
done
invocamanman Aug 24, 2023
60fc0ac
fixes
invocamanman Aug 25, 2023
67082d5
update version
invocamanman Sep 12, 2023
46760ab
historic global exit root
invocamanman May 24, 2023
174f39d
first approach
invocamanman Jul 5, 2023
22014dd
update tests and fixes
laisolizq Jul 6, 2023
269a95d
first commit v2
invocamanman Aug 21, 2023
a66c38e
update version 0.8.20
invocamanman Aug 22, 2023
b230454
advance
invocamanman Aug 30, 2023
d2d947e
continue
invocamanman Aug 31, 2023
21bcf59
first approach
invocamanman Sep 21, 2023
f880a42
it does compile :D
invocamanman Sep 23, 2023
9fa8981
fix
invocamanman Sep 25, 2023
a45e0db
add gas Tokens
invocamanman Sep 25, 2023
487800e
ongoing development
invocamanman Sep 29, 2023
a6256d6
ongoing
invocamanman Oct 3, 2023
f046483
it compiles again :D
invocamanman Oct 3, 2023
74bdb2f
add validiuM
invocamanman Oct 4, 2023
196719a
not yet
invocamanman Oct 5, 2023
ca99ad6
ayay
invocamanman Oct 5, 2023
ef3f440
ongoing
invocamanman Oct 5, 2023
2f1efa1
fix bridge L2
invocamanman Oct 6, 2023
ad90ea2
almost there
invocamanman Oct 6, 2023
93e27e6
add initialize transaction
invocamanman Oct 6, 2023
c4b09e2
add effective gas
invocamanman Oct 6, 2023
0fae26c
role udpate name
invocamanman Oct 6, 2023
5b4a2a7
fee
invocamanman Oct 6, 2023
7f0e97a
comments
invocamanman Oct 6, 2023
2b98a44
pol
invocamanman Oct 6, 2023
33fe93c
forced batches
invocamanman Oct 6, 2023
017cfe8
nice approach FE
invocamanman Oct 6, 2023
1f5276f
constant variables initialize
invocamanman Oct 6, 2023
2d2f9d0
fix forced
invocamanman Oct 7, 2023
dd84e6e
small changes
invocamanman Oct 8, 2023
0958757
add comments
invocamanman Oct 8, 2023
c1c4f6d
index events
invocamanman Oct 8, 2023
eda2d5c
update package json
invocamanman Oct 8, 2023
00d6ea8
start ts migration
invocamanman Oct 8, 2023
d8eff2b
fix buuug
invocamanman Oct 8, 2023
b268acd
fix singature
invocamanman Oct 8, 2023
4481ff1
test
invocamanman Oct 8, 2023
d99d5ab
upsie
invocamanman Oct 9, 2023
50fe1a6
upsie v2
invocamanman Oct 9, 2023
fec71d4
update test
invocamanman Oct 9, 2023
4b0b316
comments and test
invocamanman Oct 9, 2023
0d79170
update event info
invocamanman Oct 9, 2023
2592723
one bridge to rull them all..
invocamanman Oct 9, 2023
d925933
one bridge to role them all with test
invocamanman Oct 9, 2023
764f294
if does not compile, jsut comment it ^^
invocamanman Oct 10, 2023
ee42c5f
fixing tests
invocamanman Oct 10, 2023
1c943df
reduce bytecode bridge
invocamanman Oct 10, 2023
edb6906
small updates
invocamanman Oct 10, 2023
c08ddae
legacy storage slots contract
invocamanman Oct 10, 2023
b934684
test bridgese heh
invocamanman Oct 11, 2023
35477c0
update comments
invocamanman Oct 11, 2023
4e2cca6
start upgradability test
invocamanman Oct 11, 2023
3890fe8
frist upgradability test
invocamanman Oct 11, 2023
206590d
test
invocamanman Oct 11, 2023
6f17175
first pending test
invocamanman Oct 11, 2023
6a02900
add natspec
invocamanman Oct 12, 2023
4f9ed9a
cool OZ comments makes everything better ^^
invocamanman Oct 13, 2023
f6047e3
comments and renamings
invocamanman Oct 15, 2023
2a97bfc
add compiled contracts and docs
invocamanman Oct 16, 2023
2a9187e
compiled contracts paris
invocamanman Oct 16, 2023
34317cf
ts deployment scripts
invocamanman Oct 17, 2023
8a223b4
ongoing
invocamanman Oct 17, 2023
0ca893b
changes
invocamanman Oct 17, 2023
999e986
paris compiled without optimizations
invocamanman Oct 17, 2023
f88c141
update paris contracts
invocamanman Oct 17, 2023
563588c
update scripts
invocamanman Oct 18, 2023
7907eb9
add paris mock artifact
invocamanman Oct 18, 2023
95a7b0c
first deployment done
invocamanman Oct 18, 2023
daaaaac
docker works
invocamanman Oct 18, 2023
5cc2671
update genesis
invocamanman Oct 18, 2023
092adec
update scripts
invocamanman Oct 19, 2023
9b6eda4
fix
invocamanman Oct 20, 2023
34752b0
start clean interfaces
invocamanman Oct 23, 2023
90ffa4a
add comments
invocamanman Oct 26, 2023
21e926d
fix comments and interfaces
invocamanman Oct 26, 2023
4368411
fix hexxens audit
invocamanman Nov 14, 2023
2d405fb
fix docker and dynamic initialize tx bridge
invocamanman Nov 14, 2023
231e6dd
fix docker
invocamanman Nov 14, 2023
f7acb59
fix metadata
invocamanman Nov 17, 2023
0b8906e
test
invocamanman Nov 17, 2023
7d0db68
add etrog support
invocamanman Nov 17, 2023
097986a
update edrog contracts
invocamanman Nov 18, 2023
f77aa86
add tests ugprade
invocamanman Nov 18, 2023
5605ec9
moar tests
invocamanman Nov 18, 2023
9b8320e
moar tests
invocamanman Nov 18, 2023
66ad842
moar tests
invocamanman Nov 18, 2023
5f6c1d4
update paris compiled contracts
invocamanman Nov 21, 2023
4065b30
update l1infotree event
invocamanman Nov 21, 2023
ab91271
update paris compiled ocntracts
invocamanman Nov 22, 2023
1d9f1f2
generate tx in canonical mode always
invocamanman Nov 22, 2023
7247b54
contract typo
invocamanman Nov 24, 2023
8e0d098
update deployment scripts
invocamanman Nov 28, 2023
0141e5b
add compile contract at beggining of scripts
invocamanman Nov 28, 2023
0996d5c
fix deployment, add sepolia
invocamanman Nov 29, 2023
b041b92
verify fixes
invocamanman Nov 29, 2023
8ddd159
add validium support to create contracts
invocamanman Nov 29, 2023
816b229
data commitee should be updatable by admind
invocamanman Nov 29, 2023
eb06bc9
update scripts
invocamanman Nov 30, 2023
f648c4f
fix verify contracts
invocamanman Dec 1, 2023
04da9fb
mini fix readme
invocamanman Dec 1, 2023
0bd4017
update bridge tests, update hardhat upgrade dependency
invocamanman Dec 13, 2023
431f226
update deployment v1tov2
invocamanman Dec 15, 2023
c2be528
ongoing add tx on legacy zkevm, pending discuss with node
invocamanman Dec 15, 2023
717d062
update deployment scripts
invocamanman Dec 18, 2023
e6fcfdc
update paris contracts
invocamanman Dec 18, 2023
1d5b413
mini fix
invocamanman Dec 18, 2023
3d44fe5
fix cp docker
invocamanman Dec 19, 2023
78f2c67
update ignore
invocamanman Dec 19, 2023
3df0605
fix create genesis
invocamanman Dec 19, 2023
89a5e86
add mising parameter to deploymentjson v1v2C
invocamanman Dec 20, 2023
0cfb128
add tx on genesis
invocamanman Dec 20, 2023
0400b14
upsie
invocamanman Jan 8, 2024
b7ced4e
fix type
invocamanman Jan 9, 2024
6b61051
update v2ToV2 Etrog
invocamanman Jan 15, 2024
a1a7547
fix deployment data commitee
invocamanman Jan 15, 2024
b9eaa78
set data commitee 0
invocamanman Jan 15, 2024
7c4516b
possible fix wrapped address
invocamanman Dec 13, 2023
c40c7d8
cleaner
invocamanman Dec 18, 2023
991bd98
same address mainnet
invocamanman Dec 18, 2023
847b25a
fix logs
invocamanman Dec 19, 2023
f545c77
udpate vierifeir
invocamanman Jan 3, 2024
e841334
udpat eveirfy contracts
invocamanman Jan 3, 2024
2e4544a
fix timeout issues when emergency state
invocamanman Jan 9, 2024
106000e
fix miscelaneousC
invocamanman Jan 10, 2024
be4b9b1
fix deployment
invocamanman Jan 10, 2024
a1617a0
permissiones forced batches
invocamanman Jan 12, 2024
31071ac
fixed
invocamanman Jan 15, 2024
27bd5c3
fix typo
invocamanman Jan 16, 2024
47a1dd7
injec tx on existen etrog
invocamanman Jan 15, 2024
7c60b71
update paris contracts
invocamanman Jan 16, 2024
e71de8b
update paris etrog
invocamanman Jan 16, 2024
2847c6b
update tx set up etrog
invocamanman Jan 16, 2024
efe19bc
delete copy cotracts
invocamanman Jan 16, 2024
e9a477f
update paris
invocamanman Jan 16, 2024
846519c
Refactor validium naming
arnaubennassar Jan 16, 2024
daa36dd
Rename sequence function
arnaubennassar Jan 16, 2024
57bdd92
Force DA protocol interface
arnaubennassar Jan 16, 2024
8f910bd
put view functions on bottom, interface view
invocamanman Jan 16, 2024
d7336b6
todo
invocamanman Jan 16, 2024
b1b6674
no more no etrog
invocamanman Jan 17, 2024
dab0ea4
update paris contracts
invocamanman Jan 17, 2024
9829c6f
update validium to sign only transactions
invocamanman Jan 17, 2024
fdeeb85
small event fix etrog
invocamanman Jan 17, 2024
3733c47
adding tests
invocamanman Jan 17, 2024
5f04142
moar tests
invocamanman Jan 18, 2024
4a8204f
add tests
invocamanman Jan 19, 2024
aede678
add tests, fix event
invocamanman Jan 20, 2024
dec03cc
validium tests
invocamanman Jan 21, 2024
278e6a8
update veriified generated with v.4.0.0-rc.5-fork.7
zkronos73 Jan 22, 2024
99d76cb
rebase changes
invocamanman Jan 25, 2024
db52cdb
update tests and fixes
laisolizq Jul 6, 2023
ecc063e
it does compile :D
invocamanman Sep 23, 2023
6e656c9
update package json
invocamanman Oct 8, 2023
54fbdb8
start ts migration
invocamanman Oct 8, 2023
d563d1d
add compiled contracts and docs
invocamanman Oct 16, 2023
d5f9bde
add comments
invocamanman Oct 26, 2023
cdbf86b
fix comments and interfaces
invocamanman Oct 26, 2023
dee575c
update bridge tests, update hardhat upgrade dependency
invocamanman Dec 13, 2023
44b92d5
upgrade scripts
invocamanman Jan 22, 2024
7b13891
rebase fixes
invocamanman Jan 25, 2024
868ede4
remove unused compiled
invocamanman Jan 25, 2024
c95a6de
fix script
invocamanman Jan 25, 2024
3f9d4d6
add contract generated with v4.0.0-rc.6-fork.7
zkronos73 Jan 25, 2024
44b8086
update precommit
invocamanman Jan 25, 2024
125b616
verifier script
invocamanman Jan 25, 2024
38faecb
fix version of some contracts
invocamanman Jan 26, 2024
85091cf
slince warnings
invocamanman Jan 26, 2024
6f400cf
update scripts, save updates
invocamanman Jan 26, 2024
b1d01f1
update verifier deployment document
zkronos73 Jan 26, 2024
d4714dd
check SC scripts
invocamanman Jan 26, 2024
924a926
update compiled contracts
invocamanman Jan 26, 2024
b2a62e6
Merge pull request #180 from 0xPolygonHermez/feature/updateScripts
invocamanman Jan 26, 2024
4968a35
Merge pull request #158 from 0xPolygonHermez/feature/etrog
invocamanman Jan 27, 2024
9eeb0fb
update commmnets
invocamanman Jan 27, 2024
37ad23d
package json mainnet scripts
invocamanman Jan 27, 2024
df92e46
update mainnet upgrade
invocamanman Jan 27, 2024
afdca9e
update verifier document
zkronos73 Jan 27, 2024
288163f
Merge pull request #182 from 0xPolygonHermez/feature/fixComments
invocamanman Jan 27, 2024
74722f1
remove --test
invocamanman Jan 27, 2024
36ca048
update verify contracts
invocamanman Jan 29, 2024
0db8689
Merge branch '0xPolygonHermez:main' into fix/criadoperez
criadoperez Jan 29, 2024
c4976ac
Removed non-existing files
criadoperez Jan 29, 2024
077b22f
Merge pull request #1 from criadoperez/develop
criadoperez Jan 29, 2024
1359a76
update optimizations on mockInternalTestnet
invocamanman Jan 29, 2024
a8586eb
Merge branch 'develop' into patch-4
bap2pecs Jan 29, 2024
7cb1c9c
Merge pull request #130 from criadoperez/fix/criadoperez
invocamanman Jan 30, 2024
e175a91
Merge pull request #177 from bap2pecs/patch-4
invocamanman Jan 30, 2024
3dfdda5
rename to testV1toV2
invocamanman Jan 29, 2024
540ad31
rename polygon internal testnet
invocamanman Jan 30, 2024
dcad2b6
test flag
invocamanman Jan 30, 2024
6d17286
fix typos tesntet contracts
invocamanman Jan 30, 2024
6466806
small scirpts fixes
invocamanman Jan 30, 2024
fb78b43
Merge pull request #183 from 0xPolygonHermez/feature/updateV2Scripts
invocamanman Jan 30, 2024
018a87d
first approach claim comrpessor
invocamanman Jan 22, 2024
822f133
claimCompressor ongoing
invocamanman Jan 31, 2024
f0c48ce
Added deployment output files to the container and serve them via nginx
begmaroman Feb 1, 2024
cf88607
Minor update
begmaroman Feb 1, 2024
cdc4596
Minor update
begmaroman Feb 1, 2024
7d5a203
Minor update
begmaroman Feb 1, 2024
9f4be22
small changes
invocamanman Feb 1, 2024
94e723f
Minor update
begmaroman Feb 2, 2024
8bc5608
steps
invocamanman Feb 2, 2024
0e41f8d
another step
invocamanman Feb 2, 2024
c25913a
first try :D
invocamanman Feb 3, 2024
11a02d4
it wooorks
invocamanman Feb 3, 2024
5ceb05b
it wworks
invocamanman Feb 5, 2024
d2b9972
finish
invocamanman Feb 5, 2024
585d99c
Improve verifyMainnetProofVerifier.md
xavier-romero Feb 5, 2024
5a14152
TODO
invocamanman Feb 5, 2024
8fe9ba8
Merge pull request #189 from 0xPolygonHermez/feature/claimCompressorO…
invocamanman Feb 6, 2024
485d5aa
Add verifyTestnetProofVerifier.md
xavier-romero Feb 6, 2024
7e23f88
Merge pull request #188 from 0xPolygonHermez/develop_verifyMainnetPro…
invocamanman Feb 6, 2024
96c0b72
Merge pull request #186 from 0xPolygonHermez/feature/CDK-45
invocamanman Feb 7, 2024
73b1efa
add mainnet fork test
invocamanman Feb 7, 2024
cd99b3a
add tools
invocamanman Feb 8, 2024
e9ac833
udpate genesis name
invocamanman Feb 8, 2024
4abf687
update addRollup type
invocamanman Feb 8, 2024
48f67db
add comment on validium etrog
invocamanman Feb 8, 2024
ba17d7d
add data commitee contract description
invocamanman Feb 8, 2024
6a9951c
prepare validium rollup type
invocamanman Feb 8, 2024
c379383
update scripts
invocamanman Feb 8, 2024
ab8268e
transaction mainnet
invocamanman Feb 8, 2024
8c23002
update readme deployment v2
invocamanman Feb 8, 2024
2f2b75c
mini fix
invocamanman Feb 9, 2024
9958fb8
fix fork test
invocamanman Feb 11, 2024
11468f1
further checks
invocamanman Feb 12, 2024
8fc03b0
Merge pull request #192 from 0xPolygonHermez/feature/addForkTests
invocamanman Feb 12, 2024
880a4e8
Updating the Rollup Manager
hecmas Feb 15, 2024
2151a78
Updating the zkEVM Bridge V2
hecmas Feb 15, 2024
bdd888c
Updating the zkEVM Global Exit Root V2
hecmas Feb 15, 2024
860a3d5
Updating the Validium of etrog
hecmas Feb 15, 2024
27a3c27
Updating the Rollup Base of etrog
hecmas Feb 15, 2024
311be35
Adding the Rollup Manager doc
hecmas Feb 15, 2024
9bdff27
udpate readme
invocamanman Feb 20, 2024
c91c003
Merge pull request #198 from 0xPolygonHermez/feature/updateReadme
invocamanman Feb 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ if npm run lint; then
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/

cp artifacts/contracts/v2/PolygonRollupManager.sol/PolygonRollupManager.json compiled-contracts/
cp artifacts/contracts/v2/mocks/PolygonRollupManagerMock.sol/PolygonRollupManagerMock.json compiled-contracts/
cp artifacts/contracts/v2/mocks/PolygonRollupManagerMockInternalTest.sol/PolygonRollupManagerMockInternalTest.json compiled-contracts/

cp artifacts/contracts/v2/PolygonZkEVMBridgeV2.sol/PolygonZkEVMBridgeV2.json compiled-contracts/
cp artifacts/contracts/v2/PolygonZkEVMGlobalExitRootV2.sol/PolygonZkEVMGlobalExitRootV2.json compiled-contracts/

cp artifacts/contracts/v2/PolygonZkEVMGlobalExitRootV2.sol/PolygonZkEVMGlobalExitRootV2.json compiled-contracts/
cp artifacts/contracts/v2/consensus/zkEVM/PolygonZkEVMEtrog.sol/PolygonZkEVMEtrog.json compiled-contracts/
cp artifacts/contracts/v2/consensus/zkEVM/PolygonZkEVMExistentEtrog.sol/PolygonZkEVMExistentEtrog.json compiled-contracts/

cp artifacts/contracts/v2/consensus/validium/PolygonValidiumEtrog.sol/PolygonValidiumEtrog.json compiled-contracts/
cp artifacts/contracts/v2/consensus/validium/PolygonDataCommittee.sol/PolygonDataCommittee.json compiled-contracts/
git add compiled-contracts
exit 0
else
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: hermeznetwork/geth-zkevm-contracts:1.5-integration
file: docker/Dockerfile.geth
file: docker/Dockerfile
context: .
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ deploy_parameters.json
deployments
upgrade_parameters.json
docker/gethData/
*.ignore/
*.ignore/
typechain-types/
create_rollup_parameters.json

docker/deploymentOutput
35 changes: 22 additions & 13 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
{
"overrides": [
{
"files": "*.sol",
"options": {
"printWidth": 80,
"tabWidth": 4,
"useTabs": false,
"singleQuote": false,
"bracketSpacing": false,
"explicitTypes": "always"
}
"printWidth": 120,
"tabWidth": 4,
"useTabs": false,
"semi": true,
"singleQuote": false,
"quoteProps": "as-needed",
"trailingComma": "es5",
"bracketSpacing": false,
"arrowParens": "always",
"overrides": [
{
"files": "*.sol",
"options": {
"printWidth": 80,
"tabWidth": 4,
"useTabs": false,
"singleQuote": false,
"bracketSpacing": false,
"explicitTypes": "always"
}
]
}
}
]
}
3 changes: 2 additions & 1 deletion .solcover.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
module.exports = {
skipFiles: ['mocks', 'interfaces']
skipFiles: ['mocks/', 'interfaces/'],
configureYulOptimizer: true,
};
16 changes: 13 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{
"editor.formatOnSave": false,
"editor.formatOnSave": true,
"solidity.linter": "solhint",
"solidity.compileUsingRemoteVersion": "v0.8.20+commit.e14f2714",
"solidity.remappings": ["@openzeppelin/=node_modules/@openzeppelin"],
"solidity.compileUsingRemoteVersion": "v0.8.20+commit.a1b79de6",
"solidity.remappings": [
"@openzeppelin/=node_modules/@openzeppelin"
],
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[solidity]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
}
78 changes: 37 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,33 @@
# zkevm-contracts

Smart contract implementation which will be used by the polygon-hermez zkevm
Smart contract implementation which will be used by the polygon zkevm

[![Main CI](https://github.com/0xPolygonHermez/zkevm-contracts/actions/workflows/main.yml/badge.svg)](https://github.com/0xPolygonHermez/zkevm-contracts/actions/workflows/main.yml)

## Note

Private keys and mnemonics contained in this repository are used for internal test exclusively. Do not use them in production environments

## Requirements
## Mainnet Contracts:

- node version: 16.x
- npm version: 7.x
| Contract Name | Address |
| ---------------------------- | --------------------------------------------------------------------------------------------------------------------- |
| PolygonRollupManager | [0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2](https://etherscan.io/address/0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2) |
| PolygonZkEVMBridgeV2 | [0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe](https://etherscan.io/address/0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe) |
| PolygonZkEVMGlobalExitRootV2 | [0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb](https://etherscan.io/address/0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb) |
| FflonkVerifier | [0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9](https://etherscan.io/address/0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9) |
| PolygonZkEVMDeployer | [0xCB19eDdE626906eB1EE52357a27F62dd519608C2](https://etherscan.io/address/0xCB19eDdE626906eB1EE52357a27F62dd519608C2) |
| PolygonZkEVMTimelock | [0xEf1462451C30Ea7aD8555386226059Fe837CA4EF](https://etherscan.io/address/0xEf1462451C30Ea7aD8555386226059Fe837CA4EF) |

## Repository structure
## zkEVM Contracts:

- `contracts`: zkevm contracts
- `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 polygon hermez zkevm
- `docs`: specs and useful links
- `test`: contracts tests
| Contract Name | Address |
| -------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
| PolygonZkEVMBridgeV2 | [0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe](https://zkevm.polygonscan.com/address/0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe) |
| PolygonZkEVMTimelock | [0xBBa0935Fa93Eb23de7990b47F0D96a8f75766d13](https://zkevm.polygonscan.com/address/0xBBa0935Fa93Eb23de7990b47F0D96a8f75766d13) |

## Activate github hook
## Requirements

```
git config --local core.hooksPath .githooks/
```
- node version: 16.x
- npm version: 7.x

## Install
## Install repo

```
npm i
Expand All @@ -41,20 +39,6 @@ npm i
npm run test
```

## Run Linter

See errors:

```
npm run lint
```

Autofix errors:

```
npm run lint:fix
```

## Deploy on hardhat

```
Expand All @@ -67,22 +51,34 @@ npm run deploy:ZkEVM:hardhat
npm run docker:contracts
```

A new docker `hermez-geth1.3:latest` will be created
Or if using new docker-compose version

```
npm run dockerv2:contracts
```

A new docker `hermeznetwork/geth-zkevm-contracts` will be created
This docker will contain a geth node with the deployed contracts
The deployment output can be found in: `docker/deploymentOutput/deploy_output.json`
To run the docker you can use: `docker run -p 8545:8545 hermez-geth1.3:latest`
To run the docker you can use: `docker run -p 8545:8545 hermeznetwork/geth-zkevm-contracts`

## Note

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`
- private key: `0xdfd01798f92667dbf91df722434e8fbe96af0211d4d1b82bbbbc8f1def7a814f`
- address:`0xc949254d682d8c9ad5682521675b8f43b102aec4`
- private key: `0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80`
- address:`0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266`
- private key: `0xdfd01798f92667dbf91df722434e8fbe96af0211d4d1b82bbbbc8f1def7a814f`
- address:`0xc949254d682d8c9ad5682521675b8f43b102aec4`

# Verify Deployed Smart Contracts

To verify that the smartcontracts of this repository are the same deployed on mainnet, you could follow the instructions described [document](verifyMainnetDeployment/verifyDeployment.md)

The smartcontract used to verify a proof, it's a generated contract from zkEVM Rom and Pil (constraints). To verify the deployment of this smartcontract you could follow the instructions described in this [document](verifyMainnetDeployment/verifyMainnetProofVerifier.md)

## Activate github hook

```
git config --local core.hooksPath .githooks/
```
4 changes: 2 additions & 2 deletions compiled-contracts/FflonkVerifier.json

Large diffs are not rendered by default.

Loading
Loading