diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml index 7f5fe858a716..a9d802aaaf48 100644 --- a/etc/env/base/contracts.toml +++ b/etc/env/base/contracts.toml @@ -38,7 +38,7 @@ L1_WETH_TOKEN_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9" L2_WETH_BRIDGE_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9" L2_WETH_TOKEN_IMPL_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9" L2_WETH_TOKEN_PROXY_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9" -FRI_RECURSION_LEAF_LEVEL_VK_HASH ="0x062362cb3eaf1f631406cbe19bf2a2c5d0d9ea69d069309a6003addae9f387be" +FRI_RECURSION_LEAF_LEVEL_VK_HASH ="0x400a4b532c6f072c00d1806ef299300d4c104f4ac55bd8698ade78894fcadc0a" FRI_RECURSION_NODE_LEVEL_VK_HASH ="0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080" FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH ="0x1405880dc3317d635bddb0ab62bf5d013e5d1f462161c1f7ac3289c7fef956da" SNARK_WRAPPER_VK_HASH ="0x063c6fb5c70404c2867f413a8e35563ad3d040b1ad8c11786231bfdba7b472c7" diff --git a/prover/Cargo.lock b/prover/Cargo.lock index a6c7be665143..cd7cf0fa13e0 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -586,7 +586,7 @@ dependencies = [ "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", "const_format", "convert_case", - "crossbeam 0.8.4", + "crossbeam 0.7.3", "crypto-bigint 0.5.5", "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum?branch=main)", "derivative", @@ -6808,7 +6808,7 @@ dependencies = [ [[package]] name = "zkevm_circuits" version = "1.4.1" -source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=v1.4.1#3a973afb3cf2b50b7138c1af61cc6ac3d7d0189f" +source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=v1.4.1#8bf24543ffc5bafab34182388394e887ecb37d17" dependencies = [ "arrayvec 0.7.4", "bincode", diff --git a/prover/vk_setup_data_generator_server_fri/data/commitments.json b/prover/vk_setup_data_generator_server_fri/data/commitments.json new file mode 100644 index 000000000000..919024b837a3 --- /dev/null +++ b/prover/vk_setup_data_generator_server_fri/data/commitments.json @@ -0,0 +1,6 @@ +{ + "leaf": "0x400a4b532c6f072c00d1806ef299300d4c104f4ac55bd8698ade78894fcadc0a", + "node": "0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080", + "scheduler": "0x1405880dc3317d635bddb0ab62bf5d013e5d1f462161c1f7ac3289c7fef956da", + "snark_wrapper": "0x063c6fb5c70404c2867f413a8e35563ad3d040b1ad8c11786231bfdba7b472c7" +} \ No newline at end of file diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin index 2dbd63c71931..3582cf9142c9 100644 Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin differ diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json index 2e8bd4248a45..369a2de955e4 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json @@ -19,19 +19,19 @@ "public_inputs_locations": [ [ 0, - 938954 + 938961 ], [ 1, - 938954 + 938961 ], [ 2, - 938954 + 938961 ], [ 3, - 938954 + 938961 ] ], "extra_constant_polys_for_selectors": 2, @@ -170,100 +170,100 @@ }, "setup_merkle_tree_cap": [ [ - 10364558592939111741, - 2704090932534378545, - 3848869986273969160, - 16106328006947126620 + 6169326459589056965, + 12868996474249235904, + 4289816758289209468, + 4243360719478540006 ], [ - 18358486967141014750, - 14641508205909281179, - 7093116894832566610, - 7500598559033532768 + 5611062470509268810, + 4138066156511968529, + 15567189513211239203, + 2833034719891623932 ], [ - 16215619146982875852, - 931552260993232306, - 12732515925355865703, - 10874000891781998666 + 6111509112821545159, + 6233208064304074118, + 6152280712538064079, + 1799434083109273241 ], [ - 16696055299959994592, - 7517181201234171849, - 13530124260986169974, - 12420742919152555831 + 6311297346919429495, + 3292576539084923695, + 15485847984892778776, + 15180250323611401117 ], [ - 12935551582494340631, - 11277556804627122699, - 2585203450556476813, - 6641635578391032765 + 14962919527226155913, + 5069470991213639333, + 9304262406150832041, + 2258416649417493808 ], [ - 14147502223221812516, - 10219199483850226233, - 9787631410983267539, - 2756256845301132553 + 7695043337417539399, + 11949921545559049566, + 312466220125882128, + 11202838647186028861 ], [ - 15406861586967121153, - 6131399528017195276, - 14224933511241022797, - 8698057950989472792 + 12633428456274576345, + 1964951099413421741, + 610100742411633147, + 10341167781073483346 ], [ - 10880960805700971620, - 16164526380247682456, - 12282645756801863671, - 6794498938134022476 + 11175521083140612130, + 7821409950938896852, + 6435019258148300088, + 6661921710181864350 ], [ - 5447689690988908031, - 11077827740731268910, - 11281826336784931146, - 1857605592445416779 + 18277889971952874890, + 530019907313862114, + 10785670534257797175, + 16038885183617440990 ], [ - 16543238481770974716, - 15644234753306810707, - 7325159377101369499, - 9364028963032249345 + 13771728991054863837, + 8226746389710511639, + 16213838734598052922, + 5690212737911789333 ], [ - 15668430137612641656, - 9735500688010860318, - 6232756292978092916, - 596001075134187400 + 7884335375984646659, + 17540270994435354976, + 169478786876748222, + 750953805371433030 ], [ - 10401718076460605202, - 11567967099757836303, - 12006248804213440045, - 17385738920789950897 + 12547287849984903857, + 8206248617379527116, + 8968048065075305296, + 15183586552866796613 ], [ - 5700779282136820007, - 6374023460690849286, - 2926225761189217992, - 120655127472319182 + 158424580888833467, + 9057065686832570437, + 16988225245715641333, + 11175015464760401669 ], [ - 14205253813728620805, - 16457174518919888691, - 366727105995090878, - 3239884099992559905 + 2575227872114093226, + 8337892372004302813, + 15905045321885815727, + 15638098963078996999 ], [ - 12999528173970371119, - 14057657825586485436, - 11885903378658833926, - 3645634639162950888 + 13419026218302555387, + 14803780218491305895, + 6838569026596423559, + 13083241426256851911 ], [ - 9127695548309953097, - 9124168086734357914, - 4696446350416763314, - 14190588963396757344 + 10574079111172779835, + 18429342297414568878, + 18205971793231027067, + 5038036899778093876 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json index e819d87f0563..f7f11638a040 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json @@ -162,100 +162,100 @@ }, "setup_merkle_tree_cap": [ [ - 14148284386830541652, - 14837085299135448704, - 6322573177435797385, - 9541235098780333065 + 15645744701204440307, + 7539679165673586553, + 4175848281579090130, + 13060010113539914897 ], [ - 18026891006762862860, - 8815462913262358846, - 3028459576654036894, - 4764978179870290626 + 14552103880354122438, + 9503830022402348365, + 12531159667007876097, + 3021628119309415880 ], [ - 3143414711632972556, - 215009862632575109, - 115871183085121437, - 15678879580422096616 + 1305074569582181190, + 12081460791752210260, + 4228465381056140301, + 4997176245015372569 ], [ - 7008443537620227362, - 15405045094706661453, - 7054378897351244413, - 15063094779164469832 + 16700979318129640890, + 15492255770216068203, + 15059418256704463394, + 175196415428518386 ], [ - 11380051289982529587, - 14537160074260598253, - 319143631423375734, - 3054216871356863172 + 2422258539075140840, + 3231969729717777463, + 15606280174700835903, + 10243225377805954589 ], [ - 6677826033770529061, - 12532558508585119885, - 6483341484367915585, - 13833715102611979913 + 9118114471648065570, + 3160158374967644195, + 10376824432081458633, + 15804757040589007332 ], [ - 16383714077146582615, - 6099349887502755988, - 611692769071329528, - 6249348051757898139 + 17203125641333401869, + 9700160937936809147, + 18058525205771270786, + 16372276097103886271 ], [ - 13655984727793006641, - 16299779079612206176, - 6852678328562466162, - 372227381623477635 + 15706386936208968191, + 7015021906772173670, + 2085539419351403782, + 12224606354566268833 ], [ - 4425585391371569673, - 6763900039933749019, - 16006906678055998259, - 1427464989992584471 + 853187952358133388, + 4763587692585117348, + 9863895718781375756, + 7194659926975156191 ], [ - 10046306903330433098, - 5388931302017828778, - 14561141494124910623, - 17810178181842901525 + 3399347758967233759, + 18281141882504077804, + 10824625548944543287, + 7773795261225181252 ], [ - 7153732502663673262, - 10145905956758704652, - 5539285688413432284, - 838720682164893952 + 7963500708314525041, + 13176608936922849695, + 10650271560771676733, + 8817567287556249637 ], [ - 10222632123310734549, - 15639343223634758385, - 11763187165521672016, - 3632059402025063524 + 2660320298168490470, + 4693568420199605276, + 16844054331887157566, + 13743864822564499737 ], [ - 15347417540234677848, - 734067739620863189, - 13817834505400578135, - 4053013374259122068 + 5524453016010652358, + 405923929031497414, + 16459824591850632754, + 9543976706613282382 ], [ - 1278154817848231719, - 10728883570888770764, - 18088295704053736009, - 15861821502158970546 + 1559289967667584240, + 13029795389776142037, + 5783598210700140042, + 14378814951744037363 ], [ - 14731074814234828267, - 7249639464351543805, - 14262815218043638628, - 2820426900263260210 + 18407115139106615777, + 17537103359786299185, + 15149385985550622997, + 15468410348626898427 ], [ - 8806343049474442429, - 10816590200059736523, - 7404010135457618112, - 14366274165457799247 + 14090735669234183967, + 12744274283671006320, + 6356197688708035549, + 760672040880530703 ] ] }