From 31525f5cb712a550593efc16086984a722e9cb6c Mon Sep 17 00:00:00 2001 From: Lech <88630083+Artemka374@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:34:04 +0300 Subject: [PATCH] fix cargo.lock --- Cargo.lock | 639 +++++++++++++++++++++++++++++++++------- prover/Cargo.lock | 720 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 1076 insertions(+), 283 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11c37bda57f1..756172e4ac14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,7 +44,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cipher", "cpufeatures", ] @@ -80,7 +80,7 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", "version_check", "zerocopy", @@ -338,7 +338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", - "cfg-if", + "cfg-if 1.0.0", "concurrent-queue", "futures-io", "futures-lite", @@ -393,7 +393,7 @@ dependencies = [ "async-signal", "async-task", "blocking", - "cfg-if", + "cfg-if 1.0.0", "event-listener 5.3.1", "futures-lite", "rustix", @@ -420,7 +420,7 @@ dependencies = [ "async-io", "async-lock", "atomic-waker", - "cfg-if", + "cfg-if 1.0.0", "futures-core", "futures-io", "rustix", @@ -441,7 +441,7 @@ dependencies = [ "async-io", "async-lock", "async-process", - "crossbeam-utils", + "crossbeam-utils 0.8.20", "futures-channel", "futures-core", "futures-io", @@ -636,7 +636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -706,6 +706,30 @@ dependencies = [ "serde", ] +[[package]] +name = "bellman_ce" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea340d5c1394ee4daf4415dd80e06f74e0ad9b08e21f73f6bb1fa3a9dfae80d" +dependencies = [ + "arrayvec 0.7.6", + "bit-vec", + "blake2s_const", + "blake2s_simd", + "byteorder", + "cfg-if 1.0.0", + "crossbeam 0.7.3", + "futures 0.3.30", + "hex", + "lazy_static", + "num_cpus", + "pairing_ce", + "rand 0.4.6", + "serde", + "smallvec", + "tiny-keccak 1.5.0", +] + [[package]] name = "bigdecimal" version = "0.4.5" @@ -904,6 +928,17 @@ dependencies = [ "constant_time_eq 0.3.1", ] +[[package]] +name = "blake2s_const" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f39d933cb38939f885001867874c65699c36f30f0c78aae9f4c9f01b3e4b306a" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq 0.1.5", +] + [[package]] name = "blake2s_simd" version = "0.5.11" @@ -995,7 +1030,37 @@ dependencies = [ "blake2 0.10.6", "const_format", "convert_case 0.6.0", - "crossbeam", + "crossbeam 0.8.4", + "crypto-bigint 0.5.5", + "derivative", + "ethereum-types", + "firestorm", + "itertools 0.10.5", + "lazy_static", + "num-modular", + "num_cpus", + "rand 0.8.5", + "rayon", + "serde", + "sha2 0.10.8", + "sha3_ce", + "smallvec", + "unroll", + "zksync_cs_derive 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", + "zksync_pairing 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "boojum" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "arrayvec 0.7.6", + "bincode", + "blake2 0.10.6", + "const_format", + "convert_case 0.6.0", + "crossbeam 0.8.4", "crypto-bigint 0.5.5", "derivative", "ethereum-types", @@ -1011,8 +1076,8 @@ dependencies = [ "sha3_ce", "smallvec", "unroll", - "zksync_cs_derive", - "zksync_pairing", + "zksync_cs_derive 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", + "zksync_pairing 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -1186,6 +1251,12 @@ dependencies = [ "nom", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -1204,7 +1275,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cipher", "cpufeatures", ] @@ -1275,6 +1346,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "circuit_definitions" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" +dependencies = [ + "circuit_encodings 0.150.4", + "crossbeam 0.8.4", + "derivative", + "seq-macro", + "serde", + "snark-wrapper", +] + [[package]] name = "circuit_encodings" version = "0.140.3" @@ -1313,14 +1397,13 @@ dependencies = [ [[package]] name = "circuit_encodings" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67617688c66640c84f9b98ff26d48f7898dca4faeb45241a4f21ec333788e7b" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ "derivative", "serde", - "zk_evm 0.150.5", - "zkevm_circuits 0.150.5", + "zk_evm 0.150.4", + "zkevm_circuits 0.150.4", ] [[package]] @@ -1333,7 +1416,7 @@ dependencies = [ "rayon", "serde", "zk_evm 0.133.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1347,7 +1430,7 @@ dependencies = [ "rayon", "serde", "zk_evm 0.140.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1361,7 +1444,7 @@ dependencies = [ "rayon", "serde", "zk_evm 0.141.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1375,20 +1458,19 @@ dependencies = [ "rayon", "serde", "zk_evm 0.141.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "circuit_sequencer_api" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21017310971d4a051e4a52ad70eed11d1ae69defeca8314f73a3a4bad16705a9" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ - "circuit_encodings 0.150.5", + "bellman_ce", + "circuit_encodings 0.150.4", "derivative", "rayon", "serde", - "zksync_bellman", ] [[package]] @@ -1524,7 +1606,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1647,7 +1729,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -1686,17 +1768,41 @@ dependencies = [ "itertools 0.10.5", ] +[[package]] +name = "crossbeam" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-channel 0.4.4", + "crossbeam-deque 0.7.4", + "crossbeam-epoch 0.8.2", + "crossbeam-queue 0.2.3", + "crossbeam-utils 0.7.2", +] + [[package]] name = "crossbeam" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", + "crossbeam-channel 0.5.13", + "crossbeam-deque 0.8.5", + "crossbeam-epoch 0.9.18", + "crossbeam-queue 0.3.11", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] @@ -1705,7 +1811,18 @@ version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-deque" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" +dependencies = [ + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] @@ -1714,8 +1831,23 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-epoch 0.9.18", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "lazy_static", + "maybe-uninit", + "memoffset", + "scopeguard", ] [[package]] @@ -1724,7 +1856,18 @@ version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] @@ -1733,7 +1876,18 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "lazy_static", ] [[package]] @@ -1793,6 +1947,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "cs_derive" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24cf603ca4299c6e20e644da88897f7b81d688510f4887e818b0bfe0b792081b" +dependencies = [ + "proc-macro-error", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 1.0.109", +] + [[package]] name = "ctor" version = "0.2.8" @@ -1828,7 +1994,7 @@ version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", @@ -1960,7 +2126,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "hashbrown 0.14.5", "lock_api", "once_cell", @@ -2086,7 +2252,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "dirs-sys-next", ] @@ -2270,7 +2436,7 @@ version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -2346,7 +2512,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "home", "windows-sys 0.48.0", ] @@ -2458,6 +2624,51 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff_ce" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b538e4231443a5b9c507caee3356f016d832cf7393d2d90f03ea3180d4e3fbc" +dependencies = [ + "byteorder", + "ff_derive_ce", + "hex", + "rand 0.4.6", + "serde", +] + +[[package]] +name = "ff_derive_ce" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96fbccd88dbb1fac4ee4a07c2fcc4ca719a74ffbd9d2b9d41d8c8eb073d8b20" +dependencies = [ + "num-bigint 0.4.6", + "num-integer", + "num-traits", + "proc-macro2 1.0.86", + "quote 1.0.37", + "serde", + "syn 1.0.109", +] + +[[package]] +name = "fflonk" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "bincode", + "byteorder", + "circuit_definitions", + "num-bigint 0.4.6", + "num-traits", + "rand 0.4.6", + "serde", + "serde_derive", + "serde_json", + "ureq", +] + [[package]] name = "fiat-crypto" version = "0.2.9" @@ -2567,7 +2778,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "parity-scale-codec", "scale-info", ] @@ -2578,7 +2789,7 @@ version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "parity-scale-codec", "scale-info", "serde", @@ -2595,7 +2806,7 @@ dependencies = [ "blake2 0.9.2", "blake2-rfc_bellman_edition", "blake2s_simd", - "boojum", + "boojum 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder", "derivative", "digest 0.9.0", @@ -2614,7 +2825,39 @@ dependencies = [ "smallvec", "splitmut", "tiny-keccak 1.5.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "franklin-crypto" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "arr_macro", + "bit-vec", + "blake2 0.9.2", + "blake2-rfc_bellman_edition", + "blake2s_simd", + "boojum 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", + "byteorder", + "derivative", + "digest 0.9.0", + "hex", + "indexmap 1.9.3", + "itertools 0.10.5", + "lazy_static", + "num-bigint 0.4.6", + "num-derive", + "num-integer", + "num-traits", + "rand 0.4.6", + "serde", + "sha2 0.9.9", + "sha3 0.9.1", + "smallvec", + "splitmut", + "tiny-keccak 1.5.0", + "zksync_bellman 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -2807,7 +3050,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -3062,7 +3305,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crunchy", ] @@ -3296,7 +3539,7 @@ dependencies = [ "async-trait", "base64 0.21.7", "basic-cookies", - "crossbeam-utils", + "crossbeam-utils 0.8.20", "form_urlencoded", "futures-util", "hyper 0.14.30", @@ -3609,7 +3852,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -3999,7 +4242,7 @@ version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "ecdsa 0.14.8", "elliptic-curve 0.12.3", "sha2 0.10.8", @@ -4011,7 +4254,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "ecdsa 0.16.9", "elliptic-curve 0.13.8", "once_cell", @@ -4107,7 +4350,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "windows-targets 0.52.6", ] @@ -4357,13 +4600,19 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + [[package]] name = "md-5" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "digest 0.10.7", ] @@ -4373,6 +4622,15 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg", +] + [[package]] name = "merkle_tree_consistency_checker" version = "0.1.0" @@ -4445,8 +4703,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803" dependencies = [ - "crossbeam-channel", - "crossbeam-utils", + "crossbeam-channel 0.5.13", + "crossbeam-utils 0.8.20", "dashmap", "skeptic", "smallvec", @@ -4540,7 +4798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", - "cfg-if", + "cfg-if 1.0.0", "cfg_aliases", "libc", ] @@ -4807,7 +5065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", - "cfg-if", + "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", @@ -4986,6 +5244,19 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "pairing_ce" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843b5b6fb63f00460f611dbc87a50bbbb745f0dfe5cbf67ca89299c79098640e" +dependencies = [ + "byteorder", + "cfg-if 1.0.0", + "ff_ce", + "rand 0.4.6", + "serde", +] + [[package]] name = "parity-scale-codec" version = "3.6.12" @@ -5034,7 +5305,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", @@ -5271,7 +5542,7 @@ version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", @@ -5297,7 +5568,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "opaque-debug", "universal-hash", @@ -5613,7 +5884,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", "libc", "mach", "once_cell", @@ -5754,8 +6025,8 @@ version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-deque", - "crossbeam-utils", + "crossbeam-deque 0.8.5", + "crossbeam-utils 0.8.20", ] [[package]] @@ -5953,7 +6224,31 @@ dependencies = [ "blake2 0.10.6", "byteorder", "derivative", - "franklin-crypto", + "franklin-crypto 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "log", + "num-bigint 0.3.3", + "num-integer", + "num-iter", + "num-traits", + "rand 0.4.6", + "serde", + "sha3 0.9.1", + "smallvec", + "typemap_rev", +] + +[[package]] +name = "rescue_poseidon" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "addchain", + "arrayvec 0.7.6", + "blake2 0.10.6", + "byteorder", + "derivative", + "franklin-crypto 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", "lazy_static", "log", "num-bigint 0.3.3", @@ -5995,7 +6290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if", + "cfg-if 1.0.0", "getrandom", "libc", "spin", @@ -6381,7 +6676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "bitvec", - "cfg-if", + "cfg-if 1.0.0", "derive_more 0.99.18", "parity-scale-codec", "scale-info-derive", @@ -6842,7 +7137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", "opaque-debug", @@ -6854,7 +7149,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.7", ] @@ -6866,7 +7161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", "opaque-debug", @@ -6878,7 +7173,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.7", ] @@ -6889,7 +7184,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca2daa77078f4ddff27e75c4bf59e4c2697525f56dbb3c842d34a5d1f2b04a2" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.7", ] @@ -7080,7 +7375,7 @@ dependencies = [ "blake2-rfc", "bs58", "chacha20", - "crossbeam-queue", + "crossbeam-queue 0.3.11", "derive_more 0.99.18", "ed25519-zebra", "either", @@ -7178,6 +7473,17 @@ dependencies = [ "zksync_vlog", ] +[[package]] +name = "snark-wrapper" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "derivative", + "rand 0.4.6", + "rescue_poseidon 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", + "serde", +] + [[package]] name = "snow" version = "0.9.6" @@ -7319,7 +7625,7 @@ dependencies = [ "bytes", "chrono", "crc", - "crossbeam-queue", + "crossbeam-queue 0.3.11", "either", "event-listener 5.3.1", "futures-channel", @@ -7865,7 +8171,7 @@ version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fastrand", "once_cell", "rustix", @@ -7975,7 +8281,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", ] @@ -8458,7 +8764,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "digest 0.10.7", "static_assertions", ] @@ -8607,10 +8913,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", + "flate2", "log", "native-tls", "once_cell", + "rustls 0.23.13", + "rustls-pki-types", "url", + "webpki-roots", ] [[package]] @@ -8788,7 +9098,7 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", "wasm-bindgen-macro", ] @@ -8814,7 +9124,7 @@ version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", @@ -9195,7 +9505,7 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "windows-sys 0.48.0", ] @@ -9341,9 +9651,8 @@ dependencies = [ [[package]] name = "zk_evm" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6e69931f24db5cf333b714721e8d80ff88bfdb7da8c3dc7882612ffddb8d27" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ "anyhow", "lazy_static", @@ -9351,7 +9660,7 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "zk_evm_abstractions 0.150.5", + "zk_evm_abstractions 0.150.4", ] [[package]] @@ -9380,6 +9689,18 @@ dependencies = [ "zkevm_opcode_defs 0.141.0", ] +[[package]] +name = "zk_evm_abstractions" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" +dependencies = [ + "anyhow", + "num_enum 0.6.1", + "serde", + "static_assertions", + "zkevm_opcode_defs 0.150.4", +] + [[package]] name = "zk_evm_abstractions" version = "0.150.5" @@ -9401,7 +9722,7 @@ checksum = "e3c365c801e0c6eda83fbd153df45575172beb406bfb663d386f9154b4325eda" dependencies = [ "arrayvec 0.7.6", "bincode", - "boojum", + "boojum 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "derivative", "hex", "itertools 0.10.5", @@ -9412,7 +9733,7 @@ dependencies = [ "serde_json", "smallvec", "zkevm_opcode_defs 0.132.0", - "zksync_cs_derive", + "zksync_cs_derive 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -9423,7 +9744,7 @@ checksum = "2ccd0352e122a4e6f0046d2163b7e692e627b23fc3264faa77331a21b65833fd" dependencies = [ "arrayvec 0.7.6", "bincode", - "boojum", + "boojum 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "derivative", "hex", "itertools 0.10.5", @@ -9434,7 +9755,26 @@ dependencies = [ "serde_json", "smallvec", "zkevm_opcode_defs 0.141.0", - "zksync_cs_derive", + "zksync_cs_derive 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zkevm_circuits" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" +dependencies = [ + "arrayvec 0.7.6", + "boojum 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", + "cs_derive", + "derivative", + "hex", + "itertools 0.10.5", + "rand 0.4.6", + "rand 0.8.5", + "seq-macro", + "serde", + "smallvec", + "zkevm_opcode_defs 0.150.4", ] [[package]] @@ -9444,7 +9784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784fa7cfb51e17c5ced112bca43da30b3468b2347b7af0427ad9638759fb140e" dependencies = [ "arrayvec 0.7.6", - "boojum", + "boojum 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "derivative", "hex", "itertools 0.10.5", @@ -9454,7 +9794,7 @@ dependencies = [ "serde", "smallvec", "zkevm_opcode_defs 0.150.5", - "zksync_cs_derive", + "zksync_cs_derive 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -9499,6 +9839,22 @@ dependencies = [ "sha3 0.10.8", ] +[[package]] +name = "zkevm_opcode_defs" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" +dependencies = [ + "bitflags 2.6.0", + "blake2 0.10.6", + "ethereum-types", + "k256 0.13.4", + "lazy_static", + "p256", + "serde", + "sha2 0.10.8", + "sha3 0.10.8", +] + [[package]] name = "zkevm_opcode_defs" version = "0.150.5" @@ -9569,8 +9925,30 @@ dependencies = [ "bit-vec", "blake2s_simd", "byteorder", - "cfg-if", - "crossbeam", + "cfg-if 1.0.0", + "crossbeam 0.8.4", + "futures 0.3.30", + "hex", + "lazy_static", + "num_cpus", + "rand 0.4.6", + "serde", + "smallvec", + "tiny-keccak 1.5.0", + "zksync_pairing 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zksync_bellman" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "arrayvec 0.7.6", + "bit-vec", + "blake2s_simd", + "byteorder", + "cfg-if 1.0.0", + "crossbeam 0.8.4", "futures 0.3.30", "hex", "lazy_static", @@ -9579,7 +9957,7 @@ dependencies = [ "serde", "smallvec", "tiny-keccak 1.5.0", - "zksync_pairing", + "zksync_pairing 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -9627,7 +10005,7 @@ dependencies = [ "anyhow", "circuit_sequencer_api 0.140.3", "circuit_sequencer_api 0.141.2", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.4", "futures 0.3.30", "itertools 0.10.5", "num_cpus", @@ -9639,7 +10017,7 @@ dependencies = [ "vise", "zk_evm 0.133.0", "zk_evm 0.141.0", - "zk_evm 0.150.5", + "zk_evm 0.150.4", "zksync_contracts", "zksync_dal", "zksync_eth_client", @@ -9994,6 +10372,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zksync_cs_derive" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "proc-macro-error", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 1.0.109", +] + [[package]] name = "zksync_da_client" version = "0.1.0" @@ -10304,7 +10693,19 @@ dependencies = [ "hex", "rand 0.4.6", "serde", - "zksync_ff_derive", + "zksync_ff_derive 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zksync_ff" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "byteorder", + "hex", + "rand 0.4.6", + "serde", + "zksync_ff_derive 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -10322,6 +10723,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zksync_ff_derive" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "num-bigint 0.4.6", + "num-integer", + "num-traits", + "proc-macro2 1.0.86", + "quote 1.0.37", + "serde", + "syn 1.0.109", +] + [[package]] name = "zksync_health_check" version = "0.1.0" @@ -10358,7 +10773,7 @@ version = "0.150.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb8a9c76c172a6d639855ee342b9a670e3ba472f5ae302f771b1c3ee777dc88" dependencies = [ - "boojum", + "boojum 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "derivative", "hex", "once_cell", @@ -10374,6 +10789,7 @@ name = "zksync_l1_contract_interface" version = "0.1.0" dependencies = [ "anyhow", + "fflonk", "hex", "once_cell", "rand 0.8.5", @@ -10493,7 +10909,7 @@ dependencies = [ "circuit_sequencer_api 0.140.3", "circuit_sequencer_api 0.141.2", "circuit_sequencer_api 0.142.2", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.4", "ethabi", "hex", "itertools 0.10.5", @@ -10507,7 +10923,7 @@ dependencies = [ "zk_evm 0.133.0", "zk_evm 0.140.0", "zk_evm 0.141.0", - "zk_evm 0.150.5", + "zk_evm 0.150.4", "zksync_contracts", "zksync_eth_signer", "zksync_system_constants", @@ -10548,7 +10964,7 @@ dependencies = [ "tower-http", "tracing", "vise", - "zk_evm 0.150.5", + "zk_evm 0.150.4", "zksync_config", "zksync_consensus_roles", "zksync_contracts", @@ -10850,10 +11266,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8412ae5574472fa567a097e183f9a01974b99dd0b5da3bfa1bbe6c57c579aa2" dependencies = [ "byteorder", - "cfg-if", + "cfg-if 1.0.0", + "rand 0.4.6", + "serde", + "zksync_ff 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zksync_pairing" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "byteorder", + "cfg-if 1.0.0", "rand 0.4.6", "serde", - "zksync_ff", + "zksync_ff 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -10943,7 +11371,8 @@ version = "0.1.0" dependencies = [ "bincode", "chrono", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.4", + "fflonk", "serde", "serde_json", "serde_with", @@ -11059,11 +11488,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b310ab8a21681270e73f177ddf7974cabb7a96f0624ab8b008fd6ee1f9b4f687" dependencies = [ "ethereum-types", - "franklin-crypto", + "franklin-crypto 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "handlebars", "hex", "paste", - "rescue_poseidon", + "rescue_poseidon 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "serde_derive", "serde_json", diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 1d584a473d96..bc07ee2a8787 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -45,7 +45,7 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "getrandom", "once_cell", "version_check", @@ -304,7 +304,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" dependencies = [ - "bindgen 0.69.4", + "bindgen", "cc", "cmake", "dunce", @@ -387,7 +387,7 @@ checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -439,6 +439,30 @@ dependencies = [ "serde", ] +[[package]] +name = "bellman_ce" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea340d5c1394ee4daf4415dd80e06f74e0ad9b08e21f73f6bb1fa3a9dfae80d" +dependencies = [ + "arrayvec 0.7.4", + "bit-vec", + "blake2s_const", + "blake2s_simd", + "byteorder", + "cfg-if 1.0.0", + "crossbeam 0.7.3", + "futures 0.3.30", + "hex", + "lazy_static", + "num_cpus", + "pairing_ce", + "rand 0.4.6", + "serde", + "smallvec", + "tiny-keccak 1.5.0", +] + [[package]] name = "bigdecimal" version = "0.4.5" @@ -461,29 +485,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "clap 2.34.0", - "env_logger 0.9.3", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.85", - "quote 1.0.36", - "regex", - "rustc-hash", - "shlex", - "which", -] - [[package]] name = "bindgen" version = "0.69.4" @@ -592,6 +593,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "blake2s_const" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f39d933cb38939f885001867874c65699c36f30f0c78aae9f4c9f01b3e4b306a" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq", +] + [[package]] name = "blake2s_simd" version = "0.5.11" @@ -643,15 +655,14 @@ dependencies = [ [[package]] name = "boojum" version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ec2f007ff8f90cc459f03e9f30ca1065440170f013c868823646e2e48d0234" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" dependencies = [ "arrayvec 0.7.4", "bincode", "blake2 0.10.6", "const_format", "convert_case", - "crossbeam", + "crossbeam 0.8.4", "crypto-bigint 0.5.5", "derivative", "ethereum-types", @@ -668,15 +679,14 @@ dependencies = [ "smallvec", "tracing", "unroll", - "zksync_cs_derive", - "zksync_pairing", + "zksync_cs_derive 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", + "zksync_pairing 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] name = "boojum-cuda" version = "0.150.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f9a6d958dd58a0899737e5a1fc6597aefcf7980bf8be5be5329e701cbd45ca" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu?branch=si/fflonk-gpu#b9cc031a1c61835c7d250d371b8809d00b24aa5f" dependencies = [ "boojum", "cmake", @@ -684,6 +694,7 @@ dependencies = [ "era_cudart_sys", "itertools 0.13.0", "lazy_static", + "snark-wrapper", ] [[package]] @@ -793,6 +804,12 @@ dependencies = [ "nom", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -822,16 +839,15 @@ dependencies = [ [[package]] name = "circuit_definitions" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b532214f063e5e0ee5c0fc1d3afd56dec541efa68b8985f14cc55cc324f4c48" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ - "circuit_encodings 0.150.5", - "crossbeam", + "circuit_encodings 0.150.4", + "crossbeam 0.8.4", "derivative", "seq-macro", "serde", - "snark_wrapper", + "snark-wrapper", ] [[package]] @@ -872,14 +888,13 @@ dependencies = [ [[package]] name = "circuit_encodings" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67617688c66640c84f9b98ff26d48f7898dca4faeb45241a4f21ec333788e7b" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ "derivative", "serde", - "zk_evm 0.150.5", - "zkevm_circuits 0.150.5", + "zk_evm 0.150.4", + "zkevm_circuits 0.150.4", ] [[package]] @@ -892,7 +907,7 @@ dependencies = [ "rayon", "serde", "zk_evm 0.133.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -906,7 +921,7 @@ dependencies = [ "rayon", "serde", "zk_evm 0.140.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -920,7 +935,7 @@ dependencies = [ "rayon", "serde", "zk_evm 0.141.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -934,20 +949,19 @@ dependencies = [ "rayon", "serde", "zk_evm 0.141.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "circuit_sequencer_api" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21017310971d4a051e4a52ad70eed11d1ae69defeca8314f73a3a4bad16705a9" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ - "circuit_encodings 0.150.5", + "bellman_ce", + "circuit_encodings 0.150.4", "derivative", "rayon", "serde", - "zksync_bellman", ] [[package]] @@ -1072,7 +1086,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1181,7 +1195,21 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-channel 0.4.4", + "crossbeam-deque 0.7.4", + "crossbeam-epoch 0.8.2", + "crossbeam-queue 0.2.3", + "crossbeam-utils 0.7.2", ] [[package]] @@ -1190,11 +1218,21 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", + "crossbeam-channel 0.5.13", + "crossbeam-deque 0.8.5", + "crossbeam-epoch 0.9.18", + "crossbeam-queue 0.3.11", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] @@ -1203,7 +1241,18 @@ version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-deque" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" +dependencies = [ + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] @@ -1212,8 +1261,23 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-epoch 0.9.18", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "lazy_static", + "maybe-uninit", + "memoffset", + "scopeguard", ] [[package]] @@ -1222,7 +1286,18 @@ version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] @@ -1231,7 +1306,18 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.20", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "lazy_static", ] [[package]] @@ -1328,7 +1414,7 @@ version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", @@ -1698,7 +1784,7 @@ version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -1765,8 +1851,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "era_cudart" version = "0.150.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f0d6e329b2c11d134c3140951209be968ef316ed64ddde75640eaed7f10264" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu?branch=si/fflonk-gpu#b9cc031a1c61835c7d250d371b8809d00b24aa5f" dependencies = [ "bitflags 2.6.0", "era_cudart_sys", @@ -1776,8 +1861,7 @@ dependencies = [ [[package]] name = "era_cudart_sys" version = "0.150.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060e8186234c7a281021fb95614e06e94e1fc7ab78938360a5c27af0f8fc6105" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu?branch=si/fflonk-gpu#b9cc031a1c61835c7d250d371b8809d00b24aa5f" dependencies = [ "serde_json", ] @@ -1798,7 +1882,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "home", "windows-sys 0.48.0", ] @@ -1894,6 +1978,67 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff_ce" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b538e4231443a5b9c507caee3356f016d832cf7393d2d90f03ea3180d4e3fbc" +dependencies = [ + "byteorder", + "ff_derive_ce", + "hex", + "rand 0.4.6", + "serde", +] + +[[package]] +name = "ff_derive_ce" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96fbccd88dbb1fac4ee4a07c2fcc4ca719a74ffbd9d2b9d41d8c8eb073d8b20" +dependencies = [ + "num-bigint 0.4.5", + "num-integer", + "num-traits", + "proc-macro2 1.0.85", + "quote 1.0.36", + "serde", + "syn 1.0.109", +] + +[[package]] +name = "fflonk" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "bincode", + "byteorder", + "circuit_definitions", + "num-bigint 0.4.5", + "num-traits", + "rand 0.4.6", + "serde", + "serde_derive", + "serde_json", + "ureq", +] + +[[package]] +name = "fflonk-gpu" +version = "0.150.9" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu?branch=si/fflonk-gpu#b9cc031a1c61835c7d250d371b8809d00b24aa5f" +dependencies = [ + "bincode", + "byteorder", + "derivative", + "fflonk", + "rand 0.4.6", + "serde", + "serde_derive", + "serde_json", + "zksync-gpu-ffi", +] + [[package]] name = "fiat-crypto" version = "0.2.9" @@ -2026,7 +2171,39 @@ dependencies = [ "smallvec", "splitmut", "tiny-keccak 1.5.0", - "zksync_bellman", + "zksync_bellman 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "franklin-crypto" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "arr_macro", + "bit-vec", + "blake2 0.9.2", + "blake2-rfc_bellman_edition", + "blake2s_simd", + "boojum", + "byteorder", + "derivative", + "digest 0.9.0", + "hex", + "indexmap 1.9.3", + "itertools 0.10.5", + "lazy_static", + "num-bigint 0.4.5", + "num-derive", + "num-integer", + "num-traits", + "rand 0.4.6", + "serde", + "sha2 0.9.9", + "sha3 0.9.1", + "smallvec", + "splitmut", + "tiny-keccak 1.5.0", + "zksync_bellman 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -2193,7 +2370,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "libc", "wasi", @@ -2683,7 +2860,7 @@ dependencies = [ "hyper 1.3.1", "hyper-util", "log", - "rustls", + "rustls 0.23.12", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -2868,7 +3045,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -3050,7 +3227,7 @@ dependencies = [ "http 1.1.0", "jsonrpsee-core", "pin-project", - "rustls", + "rustls 0.23.12", "rustls-pki-types", "rustls-platform-verifier", "soketto", @@ -3103,7 +3280,7 @@ dependencies = [ "hyper-util", "jsonrpsee-core", "jsonrpsee-types", - "rustls", + "rustls 0.23.12", "rustls-platform-verifier", "serde", "serde_json", @@ -3185,7 +3362,7 @@ version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "ecdsa 0.14.8", "elliptic-curve 0.12.3", "sha2 0.10.8", @@ -3197,7 +3374,7 @@ version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "ecdsa 0.16.9", "elliptic-curve 0.13.8", "once_cell", @@ -3264,7 +3441,7 @@ dependencies = [ "k8s-openapi", "kube-core", "pem", - "rustls", + "rustls 0.23.12", "rustls-pemfile 2.1.2", "secrecy", "serde", @@ -3364,7 +3541,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "windows-targets 0.52.5", ] @@ -3472,13 +3649,19 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + [[package]] name = "md-5" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "digest 0.10.7", ] @@ -3494,6 +3677,15 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg", +] + [[package]] name = "miette" version = "5.10.0" @@ -3620,7 +3812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", - "cfg-if", + "cfg-if 1.0.0", "cfg_aliases", "libc", ] @@ -3869,7 +4061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", - "cfg-if", + "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", @@ -4042,6 +4234,19 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "pairing_ce" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843b5b6fb63f00460f611dbc87a50bbbb745f0dfe5cbf67ca89299c79098640e" +dependencies = [ + "byteorder", + "cfg-if 1.0.0", + "ff_ce", + "rand 0.4.6", + "serde", +] + [[package]] name = "parity-scale-codec" version = "3.6.11" @@ -4090,7 +4295,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall 0.5.1", "smallvec", @@ -4103,12 +4308,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "3.0.4" @@ -4438,6 +4637,18 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "proof-compression-gpu" +version = "0.150.9" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu?branch=si/fflonk-gpu#b9cc031a1c61835c7d250d371b8809d00b24aa5f" +dependencies = [ + "bincode", + "circuit_definitions", + "fflonk-gpu", + "serde_json", + "shivini", +] + [[package]] name = "proptest" version = "1.4.0" @@ -4765,8 +4976,8 @@ version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-deque", - "crossbeam-utils", + "crossbeam-deque 0.8.5", + "crossbeam-utils 0.8.20", ] [[package]] @@ -4962,7 +5173,31 @@ dependencies = [ "blake2 0.10.6", "byteorder", "derivative", - "franklin-crypto", + "franklin-crypto 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "log", + "num-bigint 0.3.3", + "num-integer", + "num-iter", + "num-traits", + "rand 0.4.6", + "serde", + "sha3 0.9.1", + "smallvec", + "typemap_rev", +] + +[[package]] +name = "rescue_poseidon" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "addchain", + "arrayvec 0.7.4", + "blake2 0.10.6", + "byteorder", + "derivative", + "franklin-crypto 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", "lazy_static", "log", "num-bigint 0.3.3", @@ -5004,7 +5239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if", + "cfg-if 1.0.0", "getrandom", "libc", "spin", @@ -5127,6 +5362,20 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls" version = "0.23.12" @@ -5192,7 +5441,7 @@ dependencies = [ "jni", "log", "once_cell", - "rustls", + "rustls 0.23.12", "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", @@ -5622,7 +5871,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.7", ] @@ -5634,7 +5883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", "opaque-debug", @@ -5646,7 +5895,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.7", ] @@ -5657,7 +5906,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca2daa77078f4ddff27e75c4bf59e4c2697525f56dbb3c842d34a5d1f2b04a2" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.7", ] @@ -5712,8 +5961,7 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shivini" version = "0.150.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb6d928451f0779f14da02ee9d51d4bde560328edc6471f0d5c5c11954345c4" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu?branch=si/fflonk-gpu#b9cc031a1c61835c7d250d371b8809d00b24aa5f" dependencies = [ "bincode", "blake2 0.10.6", @@ -5724,6 +5972,7 @@ dependencies = [ "era_cudart", "era_cudart_sys", "hex", + "itertools 0.13.0", "rand 0.8.5", "serde", "sha2 0.10.8", @@ -5802,14 +6051,14 @@ dependencies = [ ] [[package]] -name = "snark_wrapper" +name = "snark-wrapper" version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5dfdc3eed51d79541adff827593743750fe6626a65006814f8cfa4273371de" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" dependencies = [ "derivative", "rand 0.4.6", - "rescue_poseidon", + "rescue_poseidon 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", + "serde", ] [[package]] @@ -5908,7 +6157,7 @@ dependencies = [ "bytes", "chrono", "crc", - "crossbeam-queue", + "crossbeam-queue 0.3.11", "either", "event-listener", "futures-channel", @@ -6274,7 +6523,7 @@ version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fastrand", "rustix", "windows-sys 0.52.0", @@ -6352,7 +6601,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", ] @@ -6475,7 +6724,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls", + "rustls 0.23.12", "rustls-pki-types", "tokio", ] @@ -6877,10 +7126,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" dependencies = [ "base64 0.22.1", + "flate2", "log", "native-tls", "once_cell", + "rustls 0.22.4", + "rustls-pki-types", + "rustls-webpki", "url", + "webpki-roots", ] [[package]] @@ -7024,7 +7278,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] @@ -7049,7 +7303,7 @@ version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", @@ -7342,7 +7596,7 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "windows-sys 0.48.0", ] @@ -7352,7 +7606,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "windows-sys 0.48.0", ] @@ -7479,9 +7733,8 @@ dependencies = [ [[package]] name = "zk_evm" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6e69931f24db5cf333b714721e8d80ff88bfdb7da8c3dc7882612ffddb8d27" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ "anyhow", "lazy_static", @@ -7489,7 +7742,7 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "zk_evm_abstractions 0.150.5", + "zk_evm_abstractions 0.150.4", ] [[package]] @@ -7518,6 +7771,18 @@ dependencies = [ "zkevm_opcode_defs 0.141.0", ] +[[package]] +name = "zk_evm_abstractions" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" +dependencies = [ + "anyhow", + "num_enum 0.6.1", + "serde", + "static_assertions", + "zkevm_opcode_defs 0.150.4", +] + [[package]] name = "zk_evm_abstractions" version = "0.150.5" @@ -7533,9 +7798,8 @@ dependencies = [ [[package]] name = "zkevm-assembly" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99106038062537c05b4e6e7754d1bbba28ba16185a3e5ee5ad22e2f8be883bb" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ "env_logger 0.9.3", "hex", @@ -7548,7 +7812,7 @@ dependencies = [ "smallvec", "structopt", "thiserror", - "zkevm_opcode_defs 0.150.5", + "zkevm_opcode_defs 0.150.4", ] [[package]] @@ -7595,6 +7859,25 @@ dependencies = [ "zkevm_opcode_defs 0.141.0", ] +[[package]] +name = "zkevm_circuits" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" +dependencies = [ + "arrayvec 0.7.4", + "boojum", + "cs_derive", + "derivative", + "hex", + "itertools 0.10.5", + "rand 0.4.6", + "rand 0.8.5", + "seq-macro", + "serde", + "smallvec", + "zkevm_opcode_defs 0.150.4", +] + [[package]] name = "zkevm_circuits" version = "0.150.5" @@ -7612,7 +7895,7 @@ dependencies = [ "serde", "smallvec", "zkevm_opcode_defs 0.150.5", - "zksync_cs_derive", + "zksync_cs_derive 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7657,6 +7940,22 @@ dependencies = [ "sha3 0.10.8", ] +[[package]] +name = "zkevm_opcode_defs" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" +dependencies = [ + "bitflags 2.6.0", + "blake2 0.10.6", + "ethereum-types", + "k256 0.13.3", + "lazy_static", + "p256", + "serde", + "sha2 0.10.8", + "sha3 0.10.8", +] + [[package]] name = "zkevm_opcode_defs" version = "0.150.5" @@ -7676,15 +7975,14 @@ dependencies = [ [[package]] name = "zkevm_test_harness" -version = "0.150.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550f82d3b7448c35168dc13bfadbccd5fd306097b6e1ea01793151c1c9137a36" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" dependencies = [ "bincode", "circuit_definitions", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.4", "codegen", - "crossbeam", + "crossbeam 0.8.4", "derivative", "env_logger 0.9.3", "hex", @@ -7698,18 +7996,16 @@ dependencies = [ "test-log", "tracing", "zkevm-assembly", - "zksync_kzg", + "zksync_kzg 0.150.4", ] [[package]] name = "zksync-gpu-ffi" version = "0.150.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86511b3957adfe415ecdbd1ee01c51aa3ca131a607e61ca024976312f613b0f9" +source = "git+https://github.com/matter-labs/zksync-crypto-gpu?branch=si/fflonk-gpu#b9cc031a1c61835c7d250d371b8809d00b24aa5f" dependencies = [ - "bindgen 0.59.2", "cmake", - "crossbeam", + "crossbeam 0.8.4", "derivative", "era_cudart_sys", "futures 0.3.30", @@ -7717,34 +8013,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "zksync-gpu-prover" -version = "0.150.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e4c00f2db603d1b696bc2e9d822bb4c087050de5b65559067fc2232786cbc93" -dependencies = [ - "bit-vec", - "cfg-if", - "crossbeam", - "franklin-crypto", - "itertools 0.10.5", - "num_cpus", - "rand 0.4.6", - "serde", - "zksync-gpu-ffi", -] - -[[package]] -name = "zksync-wrapper-prover" -version = "0.150.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58df1ec10e0d5eb58563bb01abda5ed185c9b9621502e361848ca40eb7868ac" -dependencies = [ - "circuit_definitions", - "zkevm_test_harness", - "zksync-gpu-prover", -] - [[package]] name = "zksync_basic_types" version = "0.1.0" @@ -7774,8 +8042,8 @@ dependencies = [ "bit-vec", "blake2s_simd", "byteorder", - "cfg-if", - "crossbeam", + "cfg-if 1.0.0", + "crossbeam 0.8.4", "futures 0.3.30", "hex", "lazy_static", @@ -7784,7 +8052,29 @@ dependencies = [ "serde", "smallvec", "tiny-keccak 1.5.0", - "zksync_pairing", + "zksync_pairing 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zksync_bellman" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "arrayvec 0.7.4", + "bit-vec", + "blake2s_simd", + "byteorder", + "cfg-if 1.0.0", + "crossbeam 0.8.4", + "futures 0.3.30", + "hex", + "lazy_static", + "num_cpus", + "rand 0.4.6", + "serde", + "smallvec", + "tiny-keccak 1.5.0", + "zksync_pairing 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -7985,6 +8275,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zksync_cs_derive" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "proc-macro-error", + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 1.0.109", +] + [[package]] name = "zksync_dal" version = "0.1.0" @@ -8086,7 +8387,19 @@ dependencies = [ "hex", "rand 0.4.6", "serde", - "zksync_ff_derive", + "zksync_ff_derive 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zksync_ff" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "byteorder", + "hex", + "rand 0.4.6", + "serde", + "zksync_ff_derive 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -8104,6 +8417,36 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zksync_ff_derive" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "num-bigint 0.4.5", + "num-integer", + "num-traits", + "proc-macro2 1.0.85", + "quote 1.0.36", + "serde", + "syn 1.0.109", +] + +[[package]] +name = "zksync_kzg" +version = "0.150.4" +source = "git+https://github.com/matter-labs/zksync-protocol?branch=si/fflonk#7b363954fef2b9d9f9b840f714cb677bff4822da" +dependencies = [ + "boojum", + "derivative", + "hex", + "once_cell", + "rayon", + "serde", + "serde_json", + "serde_with", + "zkevm_circuits 0.150.4", +] + [[package]] name = "zksync_kzg" version = "0.150.5" @@ -8126,11 +8469,12 @@ name = "zksync_l1_contract_interface" version = "0.1.0" dependencies = [ "anyhow", + "fflonk", "hex", "once_cell", "sha2 0.10.8", "sha3 0.10.8", - "zksync_kzg", + "zksync_kzg 0.150.5", "zksync_prover_interface", "zksync_solidity_vk_codegen", "zksync_types", @@ -8154,7 +8498,7 @@ dependencies = [ "circuit_sequencer_api 0.140.3", "circuit_sequencer_api 0.141.2", "circuit_sequencer_api 0.142.2", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.4", "ethabi", "hex", "itertools 0.10.5", @@ -8166,7 +8510,7 @@ dependencies = [ "zk_evm 0.133.0", "zk_evm 0.140.0", "zk_evm 0.141.0", - "zk_evm 0.150.5", + "zk_evm 0.150.4", "zksync_contracts", "zksync_system_constants", "zksync_types", @@ -8205,10 +8549,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8412ae5574472fa567a097e183f9a01974b99dd0b5da3bfa1bbe6c57c579aa2" dependencies = [ "byteorder", - "cfg-if", + "cfg-if 1.0.0", "rand 0.4.6", "serde", - "zksync_ff", + "zksync_ff 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zksync_pairing" +version = "0.30.1" +source = "git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk#bb72de6813024d1c5f4ea422369d48e556528941" +dependencies = [ + "byteorder", + "cfg-if 1.0.0", + "rand 0.4.6", + "serde", + "zksync_ff 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", ] [[package]] @@ -8218,10 +8574,13 @@ dependencies = [ "anyhow", "async-trait", "bincode", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.4", "clap 4.5.4", "ctrlc", + "fflonk-gpu", + "franklin-crypto 0.30.1 (git+https://github.com/matter-labs/zksync-crypto?branch=si/fflonk)", "futures 0.3.30", + "proof-compression-gpu", "reqwest 0.12.5", "serde", "serde_json", @@ -8230,7 +8589,6 @@ dependencies = [ "tracing", "vise", "zkevm_test_harness", - "zksync-wrapper-prover", "zksync_config", "zksync_core_leftovers", "zksync_env_config", @@ -8321,7 +8679,7 @@ dependencies = [ "regex", "reqwest 0.12.5", "ring", - "rustls", + "rustls 0.23.12", "serde", "serde_json", "structopt", @@ -8444,7 +8802,8 @@ name = "zksync_prover_interface" version = "0.1.0" dependencies = [ "chrono", - "circuit_sequencer_api 0.150.5", + "circuit_sequencer_api 0.150.4", + "fflonk", "serde", "serde_with", "strum", @@ -8481,6 +8840,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", + "boojum-cuda", "circuit_definitions", "futures 0.3.30", "hex", @@ -8517,11 +8877,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b310ab8a21681270e73f177ddf7974cabb7a96f0624ab8b008fd6ee1f9b4f687" dependencies = [ "ethereum-types", - "franklin-crypto", + "franklin-crypto 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "handlebars", "hex", "paste", - "rescue_poseidon", + "rescue_poseidon 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "serde_derive", "serde_json", @@ -8596,10 +8956,14 @@ name = "zksync_vk_setup_data_generator_server_fri" version = "0.1.0" dependencies = [ "anyhow", + "bincode", "circuit_definitions", "clap 4.5.4", "indicatif", + "proof-compression-gpu", "proptest", + "serde_json", + "shivini", "toml_edit 0.14.4", "tracing", "tracing-subscriber", @@ -8682,7 +9046,7 @@ dependencies = [ "jsonrpsee", "pin-project-lite", "rlp", - "rustls", + "rustls 0.23.12", "serde", "serde_json", "thiserror",