Skip to content

Commit

Permalink
eldelberry2
Browse files Browse the repository at this point in the history
  • Loading branch information
invocamanman committed Mar 24, 2024
1 parent 8d97981 commit 599cdab
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion tools/addRollupType/addRollupMainnet4/add_rollup_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"polygonZkEVMGlobalExitRootAddress": "0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb",
"polTokenAddress": "0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6",
"verifierAddress": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"description": "Type: zkEVM, Version: incaberry, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
"description": "Type: zkEVM, Version: eldelberry2, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
"forkID": 9,
"rollupCompatibilityID": 0,
"timelockDelay": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"polygonZkEVMGlobalExitRootAddress": "0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb",
"polTokenAddress": "0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6",
"verifierAddress": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"description": "Type: Validium, Version: incaberry, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
"description": "Type: Validium, Version: eldelberry2, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
"forkID": 9,
"rollupCompatibilityID": 0,
"timelockDelay": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
"genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
"verifierAddress": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"consensusContract": "PolygonZkEVMEtrog",
"scheduleData": "0x01d5062a0000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144f34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000005e547970653a207a6b45564d2c2056657273696f6e3a20696e636162657272792c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955000000000000000000000000000000000000000000000000000000000000",
"executeData": "0x134008d30000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144f34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000005e547970653a207a6b45564d2c2056657273696f6e3a20696e636162657272792c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955000000000000000000000000000000000000000000000000000000000000",
"id": "0x16f7bc469c8060dc40201b34edb3d45c747d30f8cf459090ed54df0529018eb4",
"scheduleData": "0x01d5062a0000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144f34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060547970653a207a6b45564d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d41595500000000000000000000000000000000000000000000000000000000",
"executeData": "0x134008d30000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144f34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060547970653a207a6b45564d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d41595500000000000000000000000000000000000000000000000000000000",
"id": "0xdf877691807571a83db47daab96ce9c103ea6459d7a56b57f040f8039186cd31",
"decodedScheduleData": {
"target": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
"value": "0",
"data": "0xf34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000005e547970653a207a6b45564d2c2056657273696f6e3a20696e636162657272792c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d4159550000",
"data": "0xf34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f710000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060547970653a207a6b45564d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955",
"decodedData": {
"consensusImplementation": "0x2650a9a4fC64f63F573EF0F405064EF54BC46f71",
"verifier": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"forkID": "9",
"rollupCompatibilityID": "0",
"genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
"description": "Type: zkEVM, Version: incaberry, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU"
"description": "Type: zkEVM, Version: eldelberry2, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU"
},
"predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
"genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
"verifierAddress": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"consensusContract": "PolygonValidiumStorageMigration",
"scheduleData": "0x01d5062a0000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000164f34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000061547970653a2056616c696469756d2c2056657273696f6e3a20696e636162657272792c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d4159550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"executeData": "0x134008d30000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000164f34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000061547970653a2056616c696469756d2c2056657273696f6e3a20696e636162657272792c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d4159550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "0x57f0fe3545a36001f94373caed83f6c03e7a4b450903936c4fecec3907926e9a",
"scheduleData": "0x01d5062a0000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000164f34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a2056616c696469756d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"executeData": "0x134008d30000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000164f34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a2056616c696469756d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "0xdecad137d29f44776cbe1de5721dd879cbc65f189fa8f4f93451c6621fa31363",
"decodedScheduleData": {
"target": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
"value": "0",
"data": "0xf34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000061547970653a2056616c696469756d2c2056657273696f6e3a20696e636162657272792c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d41595500000000000000000000000000000000000000000000000000000000000000",
"data": "0xf34eb8eb00000000000000000000000010d296e8add0535be71639e5d1d1c30ae1c6bd4c0000000000000000000000000775e11309d75aa6b0967917fb0213c5673edf8100000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a2056616c696469756d2c2056657273696f6e3a20656c64656c6265727279322c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d4159550000000000000000000000000000000000000000000000000000000000",
"decodedData": {
"consensusImplementation": "0x10D296e8aDd0535be71639E5D1d1c30ae1C6bD4C",
"verifier": "0x0775e11309d75aA6b0967917fB0213C5673eDf81",
"forkID": "9",
"rollupCompatibilityID": "0",
"genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
"description": "Type: Validium, Version: incaberry, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU"
"description": "Type: Validium, Version: eldelberry2, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU"
},
"predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
Expand Down
2 changes: 1 addition & 1 deletion tools/addRollupType/addRollupMainnet4/testFork.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ async function main() {

// test send proofs
const data =
"0x1489ed1000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000197b00000000000000000000000000000000000000000000000000000000000019a80fe56c4f2efea23e47bddf8fef2e6d06fb90f5b196a69ffc7588ea364017341034ee14d799f2c3680dd53bddaae5fe1b844673088c5d6970234d6e62410a7c28000000000000000000000000d49cd5f9776a54fae89b68205f6af69586f9820300eed19c1d811f4241600b3be2a402878e200be40e3736b6ca7c89c3ddcde1ab2ecdfb1c13cfa5dab983f412b6c3253370850cab0d149e458d2557a5d314f3c524677695e03df1b6b27a77c9b768060bcf4042babe6188b13b8872e525c64d942acee881bc2b0f7683393dd1b4a13de3669ac9dac9168ea29c03978e0d0baaa203b51e873b660e15330cf2ac2ca926fa65832f2a50c868e0fdc050c28a4eb21927fd81067536f64dc49f95fcfa9b5a397cd297d571d1593fe456de58b42cbcdf024f15050c3645d67ec4784a305cc8108f9537ff5aa90b3e6a66e7aa87395a6f1d1fa403803b88a6d51dafbb6a1292ebc94bc7eaa1903eaee6470a77c460de3a20106d237399168b0ac976933f4cb178e1214ec6f6219d470e7ce73525475e020942e695d9b2870e8760fe8c484625e16374c35ab1b30d41162744deb0b30797241476107b1bf4f65fbd5dca450812b872615cd856a7b1b4c232aff564d956b311d7fbb3abea808cf82f03f64c912d03ced239076378df19c1a1fe80abe8fb440303d1229741fab0eb67232c6c5fc4b7781c427388337eb141720d7dbddc514022b199fd12bddc8c0f42934d092dc90e6ccc290e7c1fb0c426652f3150400ec5146fdf930a975c114ccdab9dd2f74084057f62e72f2d2264da595370e4df4e240d93eb1d5eaaedb7af082fcaf6700b0a3c0afbe43a7ee406e7674014f324cb0c0a63c523f956c33fe1e8774704faa113f77cf6071cc0b795d4760a4186f6193e2ec9152224fd753ef086e7181b3bb089e7e35d36e424fb4a8ff8c84045c8b4db0df689659c40c25c3411afece8ee643d9ed7e6edc469a3f7952522f1b775bb703009add201617dca64439fbe27508909f810c8893c9d01358bf4f266029bf9d815b3cc326bd27fdf4e0fb208408346601713c8f84eb055bb7368776998e74c0f1b71743d6abcb15d2258ea27af669ebffa3a3092252d474fe8b551c90b5f735929d320e04494e2d4a3743040afa1a8372a8f6bf2520b28d886a1cd48fe127af703c32b250621f926efcc294664ac7e4a13d95cb7cf7289d84992dc2e90548609";
"0x1489ed100000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001e8a2200000000000000000000000000000000000000000000000000000000001e8a28d6b09a304c1325a27d1a7d9d96716be3920d3da8935a6786c70d4b5a67b14e55f2ef1c2ab6e2b3eec6ed2548d8ee3f04a0cdbe030a198a7c29e7493b1ac750e70000000000000000000000006329fe417621925c81c16f9f9a18c203c21af7ab2463a2efb16d392337e3548d6969c0ec270d7d874ef92272efd206b08fb17d8a2cc7dcdbda9f05a132fb18a6faabbb19f0c421f9ef46cfbc6f0bb36020616a9b01d283d5f505873fe8dab7ef89a5022cde735962e7da2534c3805772c8fe7b5c2f9a979557cea5edaf8fd633d3d52b071339baa32835f93338ba31e864963b822dfa56e33ff664db4540eedc0e4cb158ca44ecfa5b8b5bbbc55a2a833229b08d264bcdea19b3b684084ec48000dfc9af18a0355cbcdd7bff5cdd134959e921cc29899a7ae9f39e94886074debb8d8ec4d1feb60cd0b54d198a758803cb26eb792c936577b48ff072fc02d6de84a8b402d56727fb26a1c93c205a1048c9cc41990afc32a3a60bb468ad8f939239dfd29ed9922dadd58c0a365b52e389e924e89a10565c6dbec95900a31560df050c094b936d9e1c5a4f6c7632867baece9a72101a95d88c38fac73686e2a26a578dc1bb22398e43cc56f5c0fb268da509a9aea317f31f6ca142fc47d8987ce502203ab1a69a250e8f6313fa920e301d065b86a308f65f748ce68065dba1918872c724f1f353b21d01dbbaf1bb1baa497e94624a1d8cc75dfe932334f5ea1a15b9af74e55bfb280731a8536180c9689e78c7af992cb6bc33fa5d232e760e6b11bba6b2ca017a92ae3bc4469b576f2f9cf7cf3da90dd3a8d2644db151b32df2b5b267bd022c5c72a9eecff7436bc9ac1c6381366b07231ea18c5661bdf0700929a5f0d8afd590d1e694a0f257fabc8e839af345352956bb3adbdc5f79ebe2f8ab9be8a501443ecef43909ccfae545ef4938a1432f0712839ab85cca5a3b052fae1a0806aaae61c63ed991eb5b08b8ab2ec25de83918b4d49452f01cf1b3b60d2185d8d9c459d69d8d8a422aa131ac26d64c72b55c141ecd66b59b3acdee601fedb1f8038d70be16822a56c8aa738e7f05d357a6b123eb1677158a22d6868099fb1a1820ccbff79c063f6f29bcb32fc79c85563aa32ff9e44a72b103e0e18ee760a6d72b307aca41c3ffaa4dc70d1d1fe2710b41221bf047c0247134b90e1013705f6e7f9b389b9ecb272a13db65a768c2699b0ad2";

const aggregator = "0x6329Fe417621925C81c16F9F9a18c203C21Af7ab";
const tx = {
Expand Down

0 comments on commit 599cdab

Please sign in to comment.