From 6c98703f8d307398a2d5a9ad1a987f95def0f720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cperekopskiy=E2=80=9D?= Date: Thu, 2 Nov 2023 12:36:41 +0200 Subject: [PATCH 1/2] Update to protocol version 17 --- .../data/verification_3_key.json | 258 +++++++++--------- core/lib/commitment_utils/src/lib.rs | 24 +- core/lib/types/src/protocol_version.rs | 9 +- .../src/api_server/tx_sender/mod.rs | 3 +- etc/env/base/contracts.toml | 2 +- .../1698390925-c4-circuit-fixes/common.json | 5 + .../mainnet2/crypto.json | 7 + .../mainnet2/transactions.json | 59 ++++ .../stage2/crypto.json | 7 + .../stage2/transactions.json | 59 ++++ .../testnet2/crypto.json | 7 + .../testnet2/transactions.json | 59 ++++ 12 files changed, 349 insertions(+), 150 deletions(-) create mode 100644 etc/upgrades/1698390925-c4-circuit-fixes/common.json create mode 100644 etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/crypto.json create mode 100644 etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/transactions.json create mode 100644 etc/upgrades/1698390925-c4-circuit-fixes/stage2/crypto.json create mode 100644 etc/upgrades/1698390925-c4-circuit-fixes/stage2/transactions.json create mode 100644 etc/upgrades/1698390925-c4-circuit-fixes/testnet2/crypto.json create mode 100644 etc/upgrades/1698390925-c4-circuit-fixes/testnet2/transactions.json diff --git a/core/bin/verification_key_generator_and_server/data/verification_3_key.json b/core/bin/verification_key_generator_and_server/data/verification_3_key.json index efc3726eccd1..613c65dec32a 100644 --- a/core/bin/verification_key_generator_and_server/data/verification_3_key.json +++ b/core/bin/verification_key_generator_and_server/data/verification_3_key.json @@ -6,121 +6,121 @@ "gate_setup_commitments": [ { "x": [ - 974750104498669965, - 8834694375170731028, - 17769568165179068263, - 1849964290686413257 + 4247884029119603815, + 14048318895702359089, + 1617022869923646571, + 1004300266779052296 ], "y": [ - 2843958502709968021, - 14935491193053445350, - 17474331455917570677, - 3480256926594645294 + 17868528514201987465, + 4244261302597587354, + 10221573892940475912, + 2482382880446840010 ], "infinity": false }, { "x": [ - 12247266302470255326, - 5464334033464606744, - 14546720066962635103, - 3390803970213094244 + 6238506840459074871, + 18254983327500098151, + 12976360180164130634, + 1219856697105853614 ], "y": [ - 1712883459777313087, - 8894684513803091578, - 7336029034040207862, - 1084942733964754038 + 1359994609126438238, + 17827470346804056210, + 16773833510918183872, + 2604619773311417557 ], "infinity": false }, { "x": [ - 11977576082511042092, - 13911318721427630536, - 319094179978428102, - 953394664847088490 + 5480908979724966765, + 3393255975447524652, + 10371160681199271551, + 3483125449532424455 ], "y": [ - 5661602966428088380, - 18066888770140331931, - 10148625466830766086, - 532999801462127665 + 6910224697959110691, + 8190986918875328214, + 18233342390114194740, + 371038657258361111 ], "infinity": false }, { "x": [ - 10638316621700142822, - 6209825954391834011, - 6018402549491433521, - 2545954919587131385 + 1589636458242554884, + 17321835409586313003, + 13993520794641679178, + 1266542986497561712 ], "y": [ - 3871396302214628234, - 10421121582832311901, - 3487262368594849688, - 47097530491220969 + 5397891169353072140, + 5878548729835574296, + 15706893227817678651, + 1769961527856953483 ], "infinity": false }, { "x": [ - 5177078736350587057, - 913561536392131154, - 5845225668116211782, - 1148177573394811202 + 17541435070606794744, + 2655627213950653916, + 11216216944579921605, + 1313780180047509779 ], "y": [ - 8211065483139055749, - 11150796128594731149, - 12060516803886544192, - 1369115203017663219 + 16950319453735037870, + 1632204383055288188, + 15201163922365522932, + 2864472556240937346 ], "infinity": false }, { "x": [ - 13164869081104983842, - 8055457852373227775, - 14586708642322040767, - 1635508642571745116 + 11997977223945303553, + 14325590013978700522, + 15557533141347230729, + 3289139360100222484 ], "y": [ - 13200963466266892674, - 5743120645853669652, - 13845956436885115425, - 190245686570654182 + 2276406350677881932, + 12276125258173429823, + 6135372778488654786, + 2960027660870022236 ], "infinity": false }, { "x": [ - 14509622964666644543, - 14326815147327339718, - 14403865749203816615, - 3250250446651605086 + 8889079782908651911, + 9444258938063781000, + 6152157289837951831, + 2046144251434758098 ], "y": [ - 16982880826411734238, - 7223038929743846372, - 13243677057981888895, - 3343376109946605946 + 3506685845878604982, + 480610274681523215, + 17898829927408725055, + 478373452366390807 ], "infinity": false }, { "x": [ - 2186705028467599783, - 10754157155083578321, - 9835223072941921904, - 622934131449235283 + 9543795530837745598, + 5641706788025454992, + 2058665597673045347, + 3199980849578540913 ], "y": [ - 18146384691082289702, - 3710418457832183420, - 9065618198278602094, - 1385809660894704773 + 2134420461745303677, + 11079036403297001210, + 13973590059437528369, + 2236186172656440899 ], "infinity": false } @@ -128,31 +128,31 @@ "gate_selectors_commitments": [ { "x": [ - 17931943108498820694, - 4676695383650659094, - 9553383984112211657, - 2582659305204352628 + 17082763384512425754, + 5415974525679408765, + 2982831717715582652, + 2185533346241584143 ], "y": [ - 12954711565738560879, - 8077826911980788091, - 11395265968148743331, - 2855607571527172113 + 889517497459248510, + 11305258809453581163, + 14785916458686019285, + 712045239932611417 ], "infinity": false }, { "x": [ - 1579731699170899555, - 2930979681521170129, - 14423227389748779725, - 3843483067412713 + 1486326951928055275, + 17648143945822975405, + 8789056175543467342, + 1582641302957127155 ], "y": [ - 12757858203360676100, - 11658617912640524507, - 18404463112235833117, - 216398038700598122 + 16130216435506275947, + 186882025793811656, + 5333388052689527168, + 2555185016165074595 ], "infinity": false } @@ -160,78 +160,78 @@ "permutation_commitments": [ { "x": [ - 17803109611249396349, - 11283859494780689211, - 13999735262776985506, - 1616317395767274315 + 6775436174991417687, + 1962133343483010121, + 3639644700285584252, + 2751431324201714590 ], "y": [ - 4702080082438660327, - 10318021266807502248, - 1343468927015043909, - 1458947702127238817 + 16721581791017871189, + 2572212631009994187, + 12263629829130796245, + 1194783809693078725 ], "infinity": false }, { "x": [ - 13991248091180946539, - 9572452770464844385, - 7281256466642465445, - 1589821161594539260 + 9781583375044732502, + 17099127122236789849, + 15683598159868779227, + 2137916464125382410 ], "y": [ - 16330872592308522669, - 11643961078499332590, - 7621286777424912214, - 1961788650881680195 + 11971077938028623721, + 14460546631248863771, + 3674726360546135290, + 2587006282919627488 ], "infinity": false }, { "x": [ - 14854997120241085994, - 893859077870132655, - 10853933192917459827, - 2671373989840251193 + 2258960665841769264, + 11476106728738999555, + 2154715457718708453, + 1652460267728538717 ], "y": [ - 11492939649862087988, - 1925620351626108277, - 12007636802682139817, - 1315346956977275889 + 591013691648424928, + 2747643213972148016, + 4382285331965077793, + 700518369290275435 ], "infinity": false }, { "x": [ - 13343929807426311972, - 3234215523073799496, - 4658804614957804350, - 123243726695066707 + 17029386353507514799, + 12736838109975824615, + 17948233540620781856, + 1661567367117856229 ], "y": [ - 14958243475655956241, - 4034118281425140294, - 1019154098165161379, - 2657524750158613958 + 5088293739561490025, + 257269786506894093, + 7029871828271960168, + 2982592857123453815 ], "infinity": false } ], - "total_lookup_entries_length": 15208907, + "total_lookup_entries_length": 15390957, "lookup_selector_commitment": { "x": [ - 3869759959209659371, - 17545310949245876386, - 6597968549104995840, - 1547642766729861753 + 3143229288506876352, + 14398478555351850494, + 17971061391349533728, + 2397240458539623423 ], "y": [ - 5629222579571396955, - 16315207580711001852, - 15947168783307514478, - 2534006098464270073 + 2507720097747632492, + 4897824016944146490, + 8535810669426357324, + 2617442440174156771 ], "infinity": false }, @@ -299,16 +299,16 @@ ], "lookup_table_type_commitment": { "x": [ - 6380759427317126685, - 6672737265924091686, - 14552369645196037262, - 1668823783737500912 + 7406705046881629689, + 13550366909312172285, + 11707241152492715411, + 1951231993396003315 ], "y": [ - 4951884449279236371, - 16324193898368483526, - 10792452284404778772, - 929770155761471462 + 649840467305243342, + 10916062129580101841, + 7643158916474300887, + 1216418901317802861 ], "infinity": false }, diff --git a/core/lib/commitment_utils/src/lib.rs b/core/lib/commitment_utils/src/lib.rs index 49b8ee7ef50d..b8f8784832eb 100644 --- a/core/lib/commitment_utils/src/lib.rs +++ b/core/lib/commitment_utils/src/lib.rs @@ -9,26 +9,18 @@ pub fn events_queue_commitment( events_queue: &Vec, protocol_version: ProtocolVersionId, ) -> Option { - match protocol_version { - id if id.is_pre_boojum() => None, - ProtocolVersionId::Version17 => Some(H256(events_queue_commitment_fixed(events_queue))), - id => unimplemented!("events_queue_commitment is not implemented for {id:?}"), - } + (!protocol_version.is_pre_boojum()).then(|| H256(events_queue_commitment_fixed(events_queue))) } pub fn bootloader_initial_content_commitment( initial_bootloader_contents: &[(usize, U256)], protocol_version: ProtocolVersionId, ) -> Option { - match protocol_version { - id if id.is_pre_boojum() => None, - ProtocolVersionId::Version17 => { - let full_bootloader_memory = - expand_memory_contents(initial_bootloader_contents, USED_BOOTLOADER_MEMORY_BYTES); - Some(H256(initial_heap_content_commitment_fixed( - &full_bootloader_memory, - ))) - } - id => unimplemented!("events_queue_commitment is not implemented for {id:?}"), - } + (!protocol_version.is_pre_boojum()).then(|| { + let full_bootloader_memory = + expand_memory_contents(initial_bootloader_contents, USED_BOOTLOADER_MEMORY_BYTES); + H256(initial_heap_content_commitment_fixed( + &full_bootloader_memory, + )) + }) } diff --git a/core/lib/types/src/protocol_version.rs b/core/lib/types/src/protocol_version.rs index 05d25d6db939..19f80e56ac3d 100644 --- a/core/lib/types/src/protocol_version.rs +++ b/core/lib/types/src/protocol_version.rs @@ -37,15 +37,16 @@ pub enum ProtocolVersionId { Version15, Version16, Version17, + Version18, } impl ProtocolVersionId { pub fn latest() -> Self { - Self::Version16 + Self::Version17 } pub fn next() -> Self { - Self::Version17 + Self::Version18 } /// Returns VM version to be used by API for this protocol version. @@ -70,11 +71,12 @@ impl ProtocolVersionId { ProtocolVersionId::Version15 => VmVersion::VmVirtualBlocks, ProtocolVersionId::Version16 => VmVersion::VmVirtualBlocksRefundsEnhancement, ProtocolVersionId::Version17 => VmVersion::VmVirtualBlocksRefundsEnhancement, + ProtocolVersionId::Version18 => VmVersion::VmVirtualBlocksRefundsEnhancement, } } pub fn is_pre_boojum(&self) -> bool { - self <= &ProtocolVersionId::Version17 + self <= &ProtocolVersionId::Version18 } } @@ -686,6 +688,7 @@ impl From for VmVersion { ProtocolVersionId::Version15 => VmVersion::VmVirtualBlocks, ProtocolVersionId::Version16 => VmVersion::VmVirtualBlocksRefundsEnhancement, ProtocolVersionId::Version17 => VmVersion::VmVirtualBlocksRefundsEnhancement, + ProtocolVersionId::Version18 => VmVersion::VmVirtualBlocksRefundsEnhancement, } } } diff --git a/core/lib/zksync_core/src/api_server/tx_sender/mod.rs b/core/lib/zksync_core/src/api_server/tx_sender/mod.rs index 7a29112d879b..1d4ab862213a 100644 --- a/core/lib/zksync_core/src/api_server/tx_sender/mod.rs +++ b/core/lib/zksync_core/src/api_server/tx_sender/mod.rs @@ -93,7 +93,8 @@ impl MultiVMBaseSystemContracts { ProtocolVersionId::Version14 | ProtocolVersionId::Version15 | ProtocolVersionId::Version16 - | ProtocolVersionId::Version17 => self.post_virtual_blocks_finish_upgrade_fix, + | ProtocolVersionId::Version17 + | ProtocolVersionId::Version18 => self.post_virtual_blocks_finish_upgrade_fix, } } } diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml index d31c124d30ff..7197f5e9f5fa 100644 --- a/etc/env/base/contracts.toml +++ b/etc/env/base/contracts.toml @@ -24,7 +24,7 @@ VALIDATOR_TIMELOCK_EXECUTION_DELAY=0 RECURSION_SCHEDULER_LEVEL_VK_HASH="0x2b53d65c2b3310daa4b3b747f3b5c73881469197d1d2c3f29b2033d4b947a427" RECURSION_NODE_LEVEL_VK_HASH="0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8" RECURSION_LEAF_LEVEL_VK_HASH="0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210" -RECURSION_CIRCUITS_SET_VKS_HASH="0x236c97bfbe75ff507e03909fae32a78be3a70d1b468b183f430010810284ed45" +RECURSION_CIRCUITS_SET_VKS_HASH="0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c" GENESIS_TX_HASH="0xb99ebfea46cbe05a21cd80fe5597d97b204befc52a16303f579c607dc1ac2e2e" GENESIS_ROOT="0x2d5ab622df708ab44944bb02377be85b6f27812e9ae520734873b7a193898ba4" PRIORITY_TX_MAX_GAS_LIMIT=72000000 diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/common.json b/etc/upgrades/1698390925-c4-circuit-fixes/common.json new file mode 100644 index 000000000000..f521d6b85945 --- /dev/null +++ b/etc/upgrades/1698390925-c4-circuit-fixes/common.json @@ -0,0 +1,5 @@ +{ + "name": "circuit-fixes", + "creationTimestamp": 1698390925, + "protocolVersion": "17" +} \ No newline at end of file diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/crypto.json b/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/crypto.json new file mode 100644 index 000000000000..c66cc2547dca --- /dev/null +++ b/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/crypto.json @@ -0,0 +1,7 @@ +{ + "keys": { + "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8", + "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210", + "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c" + } +} \ No newline at end of file diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/transactions.json b/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/transactions.json new file mode 100644 index 000000000000..13015513ec8e --- /dev/null +++ b/etc/upgrades/1698390925-c4-circuit-fixes/mainnet2/transactions.json @@ -0,0 +1,59 @@ +{ + "proposeUpgradeTx": { + "l2ProtocolUpgradeTx": { + "txType": 0, + "from": "0x0000000000000000000000000000000000000000", + "to": "0x0000000000000000000000000000000000000000", + "gasLimit": 0, + "gasPerPubdataByteLimit": 0, + "maxFeePerGas": 0, + "maxPriorityFeePerGas": 0, + "paymaster": 0, + "nonce": 0, + "value": 0, + "reserved": [ + 0, + 0, + 0, + 0 + ], + "data": "0x", + "signature": "0x", + "factoryDeps": [], + "paymasterInput": "0x", + "reservedDynamic": "0x" + }, + "bootloaderHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "verifier": "0x0000000000000000000000000000000000000000", + "verifierParams": { + "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8", + "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210", + "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c" + }, + "l1ContractsUpgradeCalldata": "0x", + "postUpgradeCalldata": "0x", + "upgradeTimestamp": { + "type": "BigNumber", + "hex": "0x654221a0" + }, + "factoryDeps": [], + "newProtocolVersion": "17", + "newAllowList": "0x0000000000000000000000000000000000000000" + }, + "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000654221a000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "upgradeAddress": "0x91Ca046daD8c3Db41f296267E1720d9C940f613d", + "protocolVersion": "17", + "diamondUpgradeProposalId": { + "type": "BigNumber", + "hex": "0x0a" + }, + "upgradeTimestamp": "1698832800", + "proposeTransparentUpgradeCalldata": "0x8043760a0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000006000000000000000000000000091ca046dad8c3db41f296267e1720d9c940f613d0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000654221a000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transparentUpgrade": { + "facetCuts": [], + "initAddress": "0x91Ca046daD8c3Db41f296267E1720d9C940f613d", + "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000654221a000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + }, + "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000091ca046dad8c3db41f296267e1720d9c940f613d0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000654221a000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" +} \ No newline at end of file diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/stage2/crypto.json b/etc/upgrades/1698390925-c4-circuit-fixes/stage2/crypto.json new file mode 100644 index 000000000000..c66cc2547dca --- /dev/null +++ b/etc/upgrades/1698390925-c4-circuit-fixes/stage2/crypto.json @@ -0,0 +1,7 @@ +{ + "keys": { + "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8", + "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210", + "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c" + } +} \ No newline at end of file diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/stage2/transactions.json b/etc/upgrades/1698390925-c4-circuit-fixes/stage2/transactions.json new file mode 100644 index 000000000000..fbe169507964 --- /dev/null +++ b/etc/upgrades/1698390925-c4-circuit-fixes/stage2/transactions.json @@ -0,0 +1,59 @@ +{ + "proposeUpgradeTx": { + "l2ProtocolUpgradeTx": { + "txType": 0, + "from": "0x0000000000000000000000000000000000000000", + "to": "0x0000000000000000000000000000000000000000", + "gasLimit": 0, + "gasPerPubdataByteLimit": 0, + "maxFeePerGas": 0, + "maxPriorityFeePerGas": 0, + "paymaster": 0, + "nonce": 0, + "value": 0, + "reserved": [ + 0, + 0, + 0, + 0 + ], + "data": "0x", + "signature": "0x", + "factoryDeps": [], + "paymasterInput": "0x", + "reservedDynamic": "0x" + }, + "bootloaderHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "verifier": "0x0000000000000000000000000000000000000000", + "verifierParams": { + "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8", + "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210", + "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c" + }, + "l1ContractsUpgradeCalldata": "0x", + "postUpgradeCalldata": "0x", + "upgradeTimestamp": { + "type": "BigNumber", + "hex": "0x653b7c10" + }, + "factoryDeps": [], + "newProtocolVersion": "17", + "newAllowList": "0x0000000000000000000000000000000000000000" + }, + "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000653b7c1000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "upgradeAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7", + "protocolVersion": "17", + "diamondUpgradeProposalId": { + "type": "BigNumber", + "hex": "0x08" + }, + "upgradeTimestamp": "1698397200", + "proposeTransparentUpgradeCalldata": "0x8043760a000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000653b7c1000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transparentUpgrade": { + "facetCuts": [], + "initAddress": "0xdb876240F01A6dd38F5EFC4EcEFe52e5C13dB3C7", + "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000653b7c1000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + }, + "executeUpgradeCalldata": "0x36d4eb84000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000db876240f01a6dd38f5efc4ecefe52e5c13db3c70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000653b7c1000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" +} \ No newline at end of file diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/crypto.json b/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/crypto.json new file mode 100644 index 000000000000..c66cc2547dca --- /dev/null +++ b/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/crypto.json @@ -0,0 +1,7 @@ +{ + "keys": { + "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8", + "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210", + "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c" + } +} \ No newline at end of file diff --git a/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/transactions.json b/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/transactions.json new file mode 100644 index 000000000000..16accbfb6772 --- /dev/null +++ b/etc/upgrades/1698390925-c4-circuit-fixes/testnet2/transactions.json @@ -0,0 +1,59 @@ +{ + "proposeUpgradeTx": { + "l2ProtocolUpgradeTx": { + "txType": 0, + "from": "0x0000000000000000000000000000000000000000", + "to": "0x0000000000000000000000000000000000000000", + "gasLimit": 0, + "gasPerPubdataByteLimit": 0, + "maxFeePerGas": 0, + "maxPriorityFeePerGas": 0, + "paymaster": 0, + "nonce": 0, + "value": 0, + "reserved": [ + 0, + 0, + 0, + 0 + ], + "data": "0x", + "signature": "0x", + "factoryDeps": [], + "paymasterInput": "0x", + "reservedDynamic": "0x" + }, + "bootloaderHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "verifier": "0x0000000000000000000000000000000000000000", + "verifierParams": { + "recursionNodeLevelVkHash": "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8", + "recursionLeafLevelVkHash": "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210", + "recursionCircuitsSetVksHash": "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c" + }, + "l1ContractsUpgradeCalldata": "0x", + "postUpgradeCalldata": "0x", + "upgradeTimestamp": { + "type": "BigNumber", + "hex": "0x6540d020" + }, + "factoryDeps": [], + "newProtocolVersion": "17", + "newAllowList": "0x0000000000000000000000000000000000000000" + }, + "l1upgradeCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000006540d02000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "upgradeAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8", + "protocolVersion": "17", + "diamondUpgradeProposalId": { + "type": "BigNumber", + "hex": "0x0c" + }, + "upgradeTimestamp": "1698746400", + "proposeTransparentUpgradeCalldata": "0x8043760a0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000006540d02000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transparentUpgrade": { + "facetCuts": [], + "initAddress": "0x70EEdd750Ce140c6320a721D3e6Ff62c80e29DB8", + "initCalldata": "0x1ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000006540d02000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + }, + "executeUpgradeCalldata": "0x36d4eb8400000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000070eedd750ce140c6320a721d3e6ff62c80e29db80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005241ed824a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a21b8f7ef78bd09a8db8101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba86321018c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c00000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000006540d02000000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" +} \ No newline at end of file From 3483f9c338cc4df09ce1e348d6c16e533f1b058e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cperekopskiy=E2=80=9D?= Date: Fri, 3 Nov 2023 10:10:42 +0200 Subject: [PATCH 2/2] Update Cargo.lock s --- Cargo.lock | 6 +++--- prover/Cargo.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 150123dc6145..89c8b7d008bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1750,7 +1750,7 @@ dependencies = [ [[package]] name = "cs_derive" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51" +source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d" dependencies = [ "proc-macro-error", "proc-macro2 1.0.66", @@ -6433,7 +6433,7 @@ dependencies = [ [[package]] name = "sync_vm" version = "1.3.3" -source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51" +source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d" dependencies = [ "arrayvec 0.7.3", "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3)", @@ -7802,7 +7802,7 @@ dependencies = [ [[package]] name = "zkevm_test_harness" version = "1.3.3" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d26aa4133f2b5e114c0bf084b8c3f1eca9aa9929" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d52b56d6ba8196c8a3c74c4933654469e6f27a5a" dependencies = [ "bincode", "circuit_testing", diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 73ecf49890f2..6b6585aef324 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -1302,7 +1302,7 @@ dependencies = [ [[package]] name = "cs_derive" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51" +source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d" dependencies = [ "proc-macro-error", "proc-macro2 1.0.69", @@ -5430,7 +5430,7 @@ dependencies = [ [[package]] name = "sync_vm" version = "1.3.3" -source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51" +source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d" dependencies = [ "arrayvec 0.7.4", "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3)", @@ -6549,7 +6549,7 @@ dependencies = [ [[package]] name = "zkevm_test_harness" version = "1.3.3" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d26aa4133f2b5e114c0bf084b8c3f1eca9aa9929" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d52b56d6ba8196c8a3c74c4933654469e6f27a5a" dependencies = [ "bincode", "circuit_testing",