Skip to content

Commit

Permalink
Merge pull request #166 from 0xPolygonHermez/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
krlosMata authored Dec 22, 2022
2 parents a928632 + aaa2a51 commit 3ca57dd
Show file tree
Hide file tree
Showing 10,588 changed files with 1,966,521 additions and 135,986 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ evm-stack-logs
./tools/print-opcodes/input.data
./tools/print-opcodes/output.json

*-ignore.json
tools/ethereum-tests/tests
tools/ethereum-tests/eth-inputs
tools/ethereum-tests/zkproverjs
Expand All @@ -21,4 +20,11 @@ tools/ethereum-tests/info-output-*
inputs-integration
errors.txt
info.txt
tools/ethereum-tests/final-table.txt
info-inputs.txt
info-output.txt
tools/ethereum-tests/final-table.txt
tools/ethereum-tests/.DS_Store

tools-calldata/evm/.DS_Store
tools/benchmark/inputs
tools/benchmark/.DS_Store
35 changes: 18 additions & 17 deletions inputs-executor/calldata/chainId_0.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
{
"oldStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"newStateRoot": "0xb0a858ef79b75c3172cf0949c9fa9e0cfa5205156277bf393928480eec016f61",
"oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newAccInputHash": "0x453ec0178109175625d61a7f7b955e33d31f69632d4e70fbe0e340bc6ab6a150",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"oldNumBatch": 0,
"newNumBatch": 1,
"chainID": 1000,
"batchL2Data": "0xe3800a8401c9c38094100000000000000000000000000000000000000080808203e88080fb5f36a0c33e896d5005a171e3587685546a2cc2d8f839d6ca60e0892487662416efdaf0fb5f9cf814e9a722ff5ed0a16a94e0ef88bae4951c9d64c6fa47d2da1c",
"globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9",
"timestamp": 1944498031,
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchHashData": "0xb478fd3d3b468aac9876e601475b792b4c212b4068cec163e903f01188b5902e",
"contractsBytecode": {
"0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a": "0x4660015500",
"0x617b3a3528f9cdd6630fd3301b9c8911f7bf063d": "0x0000000000000000000000000000000000000000000000000000000000000000",
"0x4d5cf5032b2a844602278b01199ed191a86c93ff": "0x0000000000000000000000000000000000000000000000000000000000000000",
"0x1000000000000000000000000000000000000000": "0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a"
},
"db": {
"0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63": [
"5a62163897199a63",
Expand Down Expand Up @@ -191,22 +209,5 @@
"0000000000000000",
"0000000000000000"
]
},
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchL2Data": "0xe3800a8401c9c38094100000000000000000000000000000000000000080808203e88080fb5f36a0c33e896d5005a171e3587685546a2cc2d8f839d6ca60e0892487662416efdaf0fb5f9cf814e9a722ff5ed0a16a94e0ef88bae4951c9d64c6fa47d2da1c",
"newStateRoot": "0x2c2cda45b71964f4ac0258df000e3afa478b3ad36ef88500895e23ff9d21f29a",
"oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9",
"batchHashData": "0x1a281e07427da94405cae7e8c7f0d5d3857ef8b60d87110ce5110d5529c5b47f",
"inputHash": "0xec645a3741376b50f7923019e00caf80e49b9b5661a694e718b291b004d592bf",
"numBatch": 1,
"timestamp": 1944498031,
"chainID": 1000,
"contractsBytecode": {
"0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a": "0x4660015500",
"0x617b3a3528f9cdd6630fd3301b9c8911f7bf063d": "0x0000000000000000000000000000000000000000000000000000000000000000",
"0x4d5cf5032b2a844602278b01199ed191a86c93ff": "0x0000000000000000000000000000000000000000000000000000000000000000",
"0x1000000000000000000000000000000000000000": "0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a"
}
}
Original file line number Diff line number Diff line change
@@ -1,39 +1,31 @@
{
"oldStateRoot": "0x5c8450365638cf323841f70e4bd07aae30410c3fb626c6ecc3cac612146de2ae",
"oldStateRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
"newStateRoot": "0x7816ade23d0be72819da6f2081ce4386102e75ed2409a5ee5cda2fb79610ea44",
"oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newAccInputHash": "0xbf95cd5b5506607e62a0d217210ef0179130db064070dbc7c3b37e37747c4fd9",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"oldNumBatch": 0,
"newNumBatch": 1,
"chainID": 1000,
"batchL2Data": "0xe3800a8401c9c380944d5cf5032b2a844602278b01199ed191a86c93ff01808203e88080b091173dbf91b3b0c7d72ace33bb96fa0d4b43868fe4be91e5ae0b9de52c3dd6362efc031939fb5797c30577e66edd5ffbc34b30b4585a1a8632dd71c13f74201c",
"globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9",
"timestamp": 1944498031,
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchHashData": "0xe499dc8e948c99958bbfb3a9f25bb537065d8b5b8e5ba8c2c011ba3b309f2925",
"contractsBytecode": {
"0x617b3a3528f9cdd6630fd3301b9c8911f7bf063d": "0x0000000000000000000000000000000000000000000000000000000000000000",
"0x4d5cf5032b2a844602278b01199ed191a86c93ff": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
"db": {
"0x5c8450365638cf323841f70e4bd07aae30410c3fb626c6ecc3cac612146de2ae": [
"5bbaf45c5a67e6d7",
"f6cad0329d102d29",
"02bec29aa4f46925",
"79f6b9ac9561f845",
"9ec300ed8bd3f934",
"389b06b4dc13fc14",
"72715e7972ca0eaa",
"7782f27412c48d2c",
"0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d": [
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x79f6b9ac9561f84502bec29aa4f46925f6cad0329d102d295bbaf45c5a67e6d7": [
"708c2f9c65428551",
"9a7f02e54478494d",
"2afe4df9f0c0f2e0",
"6c873efda8f17286",
"35f28afeae0ff489",
"b6d75a1b213c2f7c",
"521f1ce7fca92f45",
"2afffacb569cf689",
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x2afffacb569cf689521f1ce7fca92f45b6d75a1b213c2f7c35f28afeae0ff489": [
"0000000063100000",
"000000006bc75e2d",
"0000000000000005",
"0000000000000000",
"9ec300ed8bd3f934",
"389b06b4dc13fc14",
"72715e7972ca0eaa",
"7782f27412c48d2c",
"0000000000000000",
"0000000000000000",
"0000000000000000",
Expand Down Expand Up @@ -90,17 +82,16 @@
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x2afffacb569cf689521f1ce7fca92f45b6d75a1b213c2f7c35f28afeae0ff489": [
"0000000063100000",
"000000006bc75e2d",
"0000000000000005",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
]
},
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchL2Data": "0xe1800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870b808203e88080a5a7a5323dd3c186eb3f4609748a542320db6d6228bbc80428b429eb999d85ab2c2a0a70c71c79d1dc7274da7eef908eef2f2691b76dcbf5a579fce7b28c2ded1c",
"newStateRoot": "0x13729d8b4625817b1e8c31bd5eaba4d15fc85439898f178db156f970f0adc965",
"oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9",
"batchHashData": "0x5a0fe06102701ff838b80c96b7c0389a077153aea90165b2c35f7749049eee9b",
"inputHash": "0x1909dfde15362773875f1426b4d559e32fb90d0266c3370938c50bfabef929be",
"numBatch": 1,
"timestamp": 1944498031,
"contractsBytecode": {}
}
}
Original file line number Diff line number Diff line change
@@ -1,39 +1,31 @@
{
"oldStateRoot": "0x5c8450365638cf323841f70e4bd07aae30410c3fb626c6ecc3cac612146de2ae",
"oldStateRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
"newStateRoot": "0x0143c4ffec267aba2b44f9c5253c41042af8388b7ac2535c566e70937242a2db",
"oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newAccInputHash": "0x73f025e7bb9b5599379736af2b3769bbbf83e36279227e483c538ac1e444f901",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"oldNumBatch": 0,
"newNumBatch": 1,
"chainID": 1000,
"batchL2Data": "0xf840809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c825208944d5cf5032b2a844602278b01199ed191a86c93ff01808203e8808001c685e7f0b0e70ede2cd8be89f84c08a36d1f3318f7fdb9cdf9342036255b5120630c55eb54a132360c247f659c64e59a454fe218c6057d83ed9f1bd593289a1c",
"globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9",
"timestamp": 1944498031,
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchHashData": "0xcd60e3409f7c5a3141583c24edbdb49b668546394211901f51341292b390cdd9",
"contractsBytecode": {
"0x617b3a3528f9cdd6630fd3301b9c8911f7bf063d": "0x0000000000000000000000000000000000000000000000000000000000000000",
"0x4d5cf5032b2a844602278b01199ed191a86c93ff": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
"db": {
"0x5c8450365638cf323841f70e4bd07aae30410c3fb626c6ecc3cac612146de2ae": [
"5bbaf45c5a67e6d7",
"f6cad0329d102d29",
"02bec29aa4f46925",
"79f6b9ac9561f845",
"9ec300ed8bd3f934",
"389b06b4dc13fc14",
"72715e7972ca0eaa",
"7782f27412c48d2c",
"0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d": [
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x79f6b9ac9561f84502bec29aa4f46925f6cad0329d102d295bbaf45c5a67e6d7": [
"708c2f9c65428551",
"9a7f02e54478494d",
"2afe4df9f0c0f2e0",
"6c873efda8f17286",
"35f28afeae0ff489",
"b6d75a1b213c2f7c",
"521f1ce7fca92f45",
"2afffacb569cf689",
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x2afffacb569cf689521f1ce7fca92f45b6d75a1b213c2f7c35f28afeae0ff489": [
"0000000063100000",
"000000006bc75e2d",
"0000000000000005",
"0000000000000000",
"9ec300ed8bd3f934",
"389b06b4dc13fc14",
"72715e7972ca0eaa",
"7782f27412c48d2c",
"0000000000000000",
"0000000000000000",
"0000000000000000",
Expand Down Expand Up @@ -90,17 +82,16 @@
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x2afffacb569cf689521f1ce7fca92f45b6d75a1b213c2f7c35f28afeae0ff489": [
"0000000063100000",
"000000006bc75e2d",
"0000000000000005",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
]
},
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchL2Data": "0xe1800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870b808203e88080a5a7a5323dd3c186eb3f4609748a542320db6d6228bbc80428b429eb999d85ab2c2a0a70c71c79d1dc7274da7eef908eef2f2691b76dcbf5a579fce7b28c2ded1c",
"newStateRoot": "0x13729d8b4625817b1e8c31bd5eaba4d15fc85439898f178db156f970f0adc965",
"oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9",
"batchHashData": "0x5a0fe06102701ff838b80c96b7c0389a077153aea90165b2c35f7749049eee9b",
"inputHash": "0x1909dfde15362773875f1426b4d559e32fb90d0266c3370938c50bfabef929be",
"numBatch": 1,
"timestamp": 1944498031,
"contractsBytecode": {}
}
}
Original file line number Diff line number Diff line change
@@ -1,39 +1,31 @@
{
"oldStateRoot": "0x5c8450365638cf323841f70e4bd07aae30410c3fb626c6ecc3cac612146de2ae",
"oldStateRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
"newStateRoot": "0x0143c4ffec267aba2b44f9c5253c41042af8388b7ac2535c566e70937242a2db",
"oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newAccInputHash": "0xaa2e7d61a42edfb1dcf0932311f47b94a04d31fadebc216b6125af3c1fdee6ef",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"oldNumBatch": 0,
"newNumBatch": 1,
"chainID": 1000,
"batchL2Data": "0xf8428064825208944d5cf5032b2a844602278b01199ed191a86c93ffa1010000000000000000000000000000000000000000000000000000000000000001808203e880801c2a264f499734587ca8ac48590d065aaf4185de0ba26f9065f1ce4f5fed678b6607c2dda468e480468714ef67624acc321030218a70cabffb5454430b3d1e7f1c",
"globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9",
"timestamp": 1944498031,
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchHashData": "0x40b29571db5a5e4a0a1c0bcbb2c0a6b8407a2f23f0e17fc80082b79f6f4f5374",
"contractsBytecode": {
"0x617b3a3528f9cdd6630fd3301b9c8911f7bf063d": "0x0000000000000000000000000000000000000000000000000000000000000000",
"0x4d5cf5032b2a844602278b01199ed191a86c93ff": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
"db": {
"0x5c8450365638cf323841f70e4bd07aae30410c3fb626c6ecc3cac612146de2ae": [
"5bbaf45c5a67e6d7",
"f6cad0329d102d29",
"02bec29aa4f46925",
"79f6b9ac9561f845",
"9ec300ed8bd3f934",
"389b06b4dc13fc14",
"72715e7972ca0eaa",
"7782f27412c48d2c",
"0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d": [
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x79f6b9ac9561f84502bec29aa4f46925f6cad0329d102d295bbaf45c5a67e6d7": [
"708c2f9c65428551",
"9a7f02e54478494d",
"2afe4df9f0c0f2e0",
"6c873efda8f17286",
"35f28afeae0ff489",
"b6d75a1b213c2f7c",
"521f1ce7fca92f45",
"2afffacb569cf689",
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x2afffacb569cf689521f1ce7fca92f45b6d75a1b213c2f7c35f28afeae0ff489": [
"0000000063100000",
"000000006bc75e2d",
"0000000000000005",
"0000000000000000",
"9ec300ed8bd3f934",
"389b06b4dc13fc14",
"72715e7972ca0eaa",
"7782f27412c48d2c",
"0000000000000000",
"0000000000000000",
"0000000000000000",
Expand Down Expand Up @@ -90,17 +82,16 @@
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x2afffacb569cf689521f1ce7fca92f45b6d75a1b213c2f7c35f28afeae0ff489": [
"0000000063100000",
"000000006bc75e2d",
"0000000000000005",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
]
},
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchL2Data": "0xe1800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870b808203e88080a5a7a5323dd3c186eb3f4609748a542320db6d6228bbc80428b429eb999d85ab2c2a0a70c71c79d1dc7274da7eef908eef2f2691b76dcbf5a579fce7b28c2ded1c",
"newStateRoot": "0x13729d8b4625817b1e8c31bd5eaba4d15fc85439898f178db156f970f0adc965",
"oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9",
"batchHashData": "0x5a0fe06102701ff838b80c96b7c0389a077153aea90165b2c35f7749049eee9b",
"inputHash": "0x1909dfde15362773875f1426b4d559e32fb90d0266c3370938c50bfabef929be",
"numBatch": 1,
"timestamp": 1944498031,
"contractsBytecode": {}
}
}
Loading

0 comments on commit 3ca57dd

Please sign in to comment.