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.

Sign up for GitHub

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 #247

Merged
merged 29 commits into from
Jun 18, 2024
Merged

Develop #247

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9a93376
Update README.md
bap2pecs Feb 6, 2024
7b67bbd
update contract generated with buildsetup v6.0.0-rc.1-fork.9
zkronos73 Mar 24, 2024
0155417
update previosu verifiers
invocamanman Mar 24, 2024
18112de
update
invocamanman Mar 24, 2024
5def95e
new upgrade info
invocamanman Mar 24, 2024
97c9c02
Merge pull request #221 from 0xPolygonHermez/feature/verifier-v6.0.0-…
invocamanman Mar 25, 2024
1187308
update jsons
invocamanman Mar 25, 2024
25f4432
Update README
Stefan-Ethernal Mar 25, 2024
9844e68
Merge pull request #222 from 0xPolygonHermez/feat/update-readme-param…
invocamanman Mar 25, 2024
8222986
Merge pull request #190 from bap2pecs/patch-3
invocamanman Mar 25, 2024
a4a678e
fix: wrong variable name in verify script
JacksonRGB Mar 26, 2024
a38e68b
Merge pull request #223 from JacksonRGB/fix-variable-name
invocamanman Mar 26, 2024
5ed0104
Remove duplicated test case
gavfu Mar 26, 2024
e898062
fix: `forge build` on linux/arm
leovct Mar 27, 2024
e3ec44c
fix: compilation errors
leovct Mar 27, 2024
6bf2c00
Merge pull request #226 from leovct/fix/forge-build-on-linux-arm
invocamanman Mar 27, 2024
171129d
Add possibility to override origin check for the native token on sove…
gretzke Mar 28, 2024
f6da4f6
update Verify deployment on Mainnet document
zkronos73 Apr 1, 2024
6c2be0f
Merge pull request #231 from 0xPolygonHermez/update-doc-verifydeploy-…
invocamanman Apr 2, 2024
54f58c8
Merge pull request #225 from gavfu/develop
invocamanman Apr 7, 2024
b297fd5
compilation fix
gretzke Apr 19, 2024
65f9481
Merge pull request #230 from 0xPolygonHermez/feat/origin-check-override
invocamanman Apr 19, 2024
83b69d7
Use the newer go-ethereum Docker image
Stefan-Ethernal Apr 26, 2024
78490a9
udpate claim compressor
invocamanman May 7, 2024
658f154
Merge pull request #255 from 0xPolygonHermez/feature/updateClaimCompr…
invocamanman May 7, 2024
1a07c5f
Use the Geth v1.14.3
Stefan-Ethernal May 16, 2024
6552d78
Merge pull request #250 from 0xPolygonHermez/feat/use-go-ethereum-ima…
invocamanman May 21, 2024
e4cd5cf
add sigpaudit
invocamanman Jun 17, 2024
9cfe119
Merge pull request #267 from 0xPolygonHermez/addSigPAudit
invocamanman Jun 17, 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
4 changes: 2 additions & 2 deletions contracts/verifiers/FflonkVerifier.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ contract FflonkVerifier {
uint256 constant w8_7 = 8613538655231327379234925296132678673308827349856085326283699237864372525723;

// Verifier preprocessed input C_0(x)·[1]_1
uint256 constant C0x = 21160666715172434637225720476256763871501363117729999199262494595796582644427;
uint256 constant C0y = 15161784655278302587190494591488856640885304569426835678458555890947087546457;
uint256 constant C0x = 19531210301294568511992648735135291982401633864004026433715722115099857739632;
uint256 constant C0y = 16913517370715546973488219367119174715262034757907912789481968159710930517904;

// Verifier preprocessed input x·[1]_2
uint256 constant X2x1 = 21831381940315734285607113342023901060522397560371972897001948545212302161822;
Expand Down
2,158 changes: 2,158 additions & 0 deletions contracts/verifiers/previousVerifiers/FflonkVerifierIncaberry.sol
View file
Open in desktop

Large diffs are not rendered by default.

0 ...addRollupMainnet3/updateRollupOutput.json → ...Mainnet3/updateRollupOutputCancelled.json
View file
Open in desktop
File renamed without changes.
19 changes: 19 additions & 0 deletions tools/addRollupType/addRollupMainnet4/add_rollup_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"consensusContract": "PolygonZkEVMEtrog",
"polygonRollupManagerAddress": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
"polygonZkEVMBridgeAddress": "0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe",
"polygonZkEVMGlobalExitRootAddress": "0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb",
"polTokenAddress": "0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6",
"verifierAddress": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"description": "Type: zkEVM, Version: eldelberry2, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
"forkID": 9,
"rollupCompatibilityID": 0,
"timelockDelay": 0,
"polygonconsensusContract": "0x2650a9a4fC64f63F573EF0F405064EF54BC46f71",
"gasTokenAddress": "",
"timelockSalt": "",
"deployerPvtKey": "",
"maxFeePerGas": "",
"maxPriorityFeePerGas": "",
"multiplierGas": ""
}
19 changes: 19 additions & 0 deletions tools/addRollupType/addRollupMainnet4/add_rollup_type_input_astar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"consensusContract": "PolygonValidiumStorageMigration",
"polygonRollupManagerAddress": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
"polygonZkEVMBridgeAddress": "0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe",
"polygonZkEVMGlobalExitRootAddress": "0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb",
"polTokenAddress": "0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6",
"verifierAddress": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"description": "Type: Validium, Version: eldelberry2, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
"forkID": 9,
"rollupCompatibilityID": 0,
"timelockDelay": 0,
"polygonconsensusContract": "0x10D296e8aDd0535be71639E5D1d1c30ae1C6bD4C",
"gasTokenAddress": "",
"timelockSalt": "",
"deployerPvtKey": "",
"maxFeePerGas": "",
"maxPriorityFeePerGas": "",
"multiplierGas": ""
}
24 changes: 24 additions & 0 deletions tools/addRollupType/addRollupMainnet4/add_rollup_type_output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
"verifierAddress": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"consensusContract": "PolygonZkEVMEtrog",
"scheduleData": "0x01d5062a0000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144f34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060547970653a207a6b45564d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d41595500000000000000000000000000000000000000000000000000000000",
"executeData": "0x134008d30000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144f34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060547970653a207a6b45564d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d41595500000000000000000000000000000000000000000000000000000000",
"id": "0xdf877691807571a83db47daab96ce9c103ea6459d7a56b57f040f8039186cd31",
"decodedScheduleData": {
"target": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
"value": "0",
"data": "0xf34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060547970653a207a6b45564d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955",
"decodedData": {
"consensusImplementation": "0x2650a9a4fC64f63F573EF0F405064EF54BC46f71",
"verifier": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"forkID": "9",
"rollupCompatibilityID": "0",
"genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
"description": "Type: zkEVM, Version: eldelberry2, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU"
},
"predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
"delay": "0"
}
}
24 changes: 24 additions & 0 deletions tools/addRollupType/addRollupMainnet4/add_rollup_type_output_astar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
"verifierAddress": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"consensusContract": "PolygonValidiumStorageMigration",
"scheduleData": "0x01d5062a0000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000164f34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a2056616c696469756d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"executeData": "0x134008d30000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000164f34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a2056616c696469756d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "0xdecad137d29f44776cbe1de5721dd879cbc65f189fa8f4f93451c6621fa31363",
"decodedScheduleData": {
"target": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
"value": "0",
"data": "0xf34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a2056616c696469756d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d4159550000000000000000000000000000000000000000000000000000000000",
"decodedData": {
"consensusImplementation": "0x10D296e8aDd0535be71639E5D1d1c30ae1C6bD4C",
"verifier": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"forkID": "9",
"rollupCompatibilityID": "0",
"genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
"description": "Type: Validium, Version: eldelberry2, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU"
},
"predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
"delay": "0"
}
}
22 changes: 22 additions & 0 deletions tools/addRollupType/addRollupMainnet4/deploy_output_mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"polygonZkEVMAddress": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
"polygonZkEVMBridgeAddress": "0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe",
"polygonZkEVMGlobalExitRootAddress": "0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb",
"maticTokenAddress": "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
"verifierAddress": "0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9",
"zkEVMDeployerContract": "0xCB19eDdE626906eB1EE52357a27F62dd519608C2",
"deployerAddress": "0x7c280C055CBf830F77D6DA3a6363e961E0B91C7d",
"timelockContractAddress": "0xEf1462451C30Ea7aD8555386226059Fe837CA4EF",
"deploymentBlockNumber": 16896721,
"genesisRoot": "0x3f86b09b43e3e49a41fc20a07579b79eba044253367817d5c241d23c0e2bc5c9",
"trustedSequencer": "0x148Ee7dAF16574cD020aFa34CC658f8F3fbd2800",
"trustedSequencerURL": "https://zkevm-rpc.com/",
"chainID": 1101,
"networkName": "polygon zkEVM",
"admin": "0x242daE44F5d8fb54B198D03a94dA45B5a4413e21",
"trustedAggregator": "0xdA87c4a76922598Ac0272F4D9503a35071D686eA",
"proxyAdminAddress": "0x0F99738B2Fc14D77308337f3e2596b63aE7BCC4A",
"forkID": 4,
"salt": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
"version": "v1.1.0-fork.4"
}
Loading
Loading