diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml index b7229e8e4e48..b6f5402c61aa 100644 --- a/etc/env/base/contracts.toml +++ b/etc/env/base/contracts.toml @@ -38,9 +38,9 @@ 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 ="0x72167c43a46cf38875b267d67716edc4563861364a3c03ab7aee73498421e828" +FRI_RECURSION_LEAF_LEVEL_VK_HASH ="0x14628525c227822148e718ca1138acfc6d25e759e19452455d89f7f610c3dcb8" FRI_RECURSION_NODE_LEVEL_VK_HASH ="0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080" -FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH ="0x201d4c7d8e781d51a3bbd451a43a8f45240bb765b565ae6ce69192d918c3563d" +FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH ="0x61ed1ea338680a9f83945b300a4a4778dd76d74a015b43a3e9b7fedba914a3d0" SNARK_WRAPPER_VK_HASH = "0x4be443afd605a782b6e56d199df2460a025c81b3dea144e135bece83612563f2" # Prover that should be used at genesis. 'fri' or 'snark' diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 6b6585aef324..716a8fa24568 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -73,9 +73,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom 0.2.10", "once_cell", @@ -84,13 +84,14 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -223,7 +224,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -234,7 +235,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -313,9 +314,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -335,7 +336,7 @@ dependencies = [ "byteorder", "cfg-if 1.0.0", "crossbeam 0.7.3", - "futures 0.3.28", + "futures 0.3.29", "hex", "lazy_static", "num_cpus", @@ -358,7 +359,7 @@ dependencies = [ "byteorder", "cfg-if 1.0.0", "crossbeam 0.7.3", - "futures 0.3.28", + "futures 0.3.29", "hex", "lazy_static", "num_cpus", @@ -431,14 +432,14 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ "bitflags 2.4.1", "cexpr", @@ -453,7 +454,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.39", "which", ] @@ -651,7 +652,7 @@ dependencies = [ [[package]] name = "boojum-cuda" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#ecf246a02d89954f277de16cbbe67ddc5ef386e1" +source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#af269f667e0609f08a9cf303f330461ed5cd00ba" dependencies = [ "boojum", "cmake", @@ -675,9 +676,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytecount" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "byteorder" @@ -824,10 +825,11 @@ dependencies = [ [[package]] name = "circuit_definitions" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#43aeb53d7d9c909508a98f9fc140edff0e9d2357" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#d2e3670e0c5115b7cc7cc24e6d3dbdd17a214aad" dependencies = [ "crossbeam 0.8.2", "derivative", + "seq-macro", "serde", "snark_wrapper", "zk_evm 1.4.0", @@ -870,18 +872,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstyle", "clap_lex", @@ -889,9 +891,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cloudabi" @@ -1023,9 +1025,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1054,7 +1056,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.6", + "clap 4.4.7", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1333,7 +1335,7 @@ dependencies = [ [[package]] name = "cudart" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#ecf246a02d89954f277de16cbbe67ddc5ef386e1" +source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#af269f667e0609f08a9cf303f330461ed5cd00ba" dependencies = [ "bitflags 2.4.1", "criterion", @@ -1343,9 +1345,9 @@ dependencies = [ [[package]] name = "cudart-sys" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#ecf246a02d89954f277de16cbbe67ddc5ef386e1" +source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#af269f667e0609f08a9cf303f330461ed5cd00ba" dependencies = [ - "bindgen 0.68.1", + "bindgen 0.69.1", "serde_json", ] @@ -1391,7 +1393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core 0.9.9", @@ -1874,7 +1876,7 @@ dependencies = [ [[package]] name = "franklin-crypto" version = "0.0.5" -source = "git+https://github.com/matter-labs/franklin-crypto?branch=snark_wrapper#900332b8c2fe528b5008bb4e6bf2d3f206a9ae56" +source = "git+https://github.com/matter-labs/franklin-crypto?branch=snark_wrapper#a9e29acd73245bd3b670b62b4d481ece06d43803" dependencies = [ "arr_macro", "bellman_ce 0.3.2 (git+https://github.com/matter-labs/bellman?branch=snark-wrapper)", @@ -1929,9 +1931,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1944,9 +1946,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1954,15 +1956,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1983,9 +1985,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-locks" @@ -2000,26 +2002,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-timer" @@ -2029,9 +2031,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2097,7 +2099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "644f40175857d0b8d7b6cad6cd9594284da5041387fa2ddff30ab6d8faef65eb" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.5", "google-cloud-metadata", "google-cloud-token", "home", @@ -2130,7 +2132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "215abab97e07d144428425509c1dad07e57ea72b84b21bcdb6a8a5f12a5c4932" dependencies = [ "async-stream", - "base64 0.21.4", + "base64 0.21.5", "bytes", "futures-util", "google-cloud-auth", @@ -2141,7 +2143,7 @@ dependencies = [ "percent-encoding", "regex", "reqwest", - "ring", + "ring 0.16.20", "rsa", "serde", "serde_json", @@ -2170,7 +2172,7 @@ dependencies = [ "bindgen 0.59.2", "crossbeam 0.8.2", "derivative", - "futures 0.3.28", + "futures 0.3.29", "futures-locks", "num_cpus", ] @@ -2247,7 +2249,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -2262,14 +2264,14 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", ] [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "hashlink" @@ -2286,7 +2288,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "headers-core", "http", @@ -2448,7 +2450,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2457,9 +2459,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", @@ -2589,12 +2591,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -2608,9 +2610,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ipnetwork" @@ -2664,9 +2666,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2677,7 +2679,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "futures-executor", "futures-util", "log", @@ -2692,9 +2694,9 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -2727,7 +2729,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -2738,9 +2740,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" @@ -2758,6 +2760,17 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "librocksdb-sys" version = "0.11.0+8.1.1" @@ -2800,7 +2813,7 @@ checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2907,7 +2920,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "metrics-macros", "portable-atomic", ] @@ -2918,7 +2931,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "hyper", "indexmap 1.9.3", "ipnet", @@ -2938,7 +2951,7 @@ checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3004,9 +3017,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -3025,7 +3038,8 @@ dependencies = [ "tracing", "vise", "zk_evm 1.3.1", - "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc1)", + "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)", + "zk_evm 1.4.0", "zksync_contracts", "zksync_state", "zksync_system_constants", @@ -3317,7 +3331,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3349,9 +3363,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ "bitflags 2.4.1", "cfg-if 1.0.0", @@ -3370,7 +3384,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3381,9 +3395,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3637,9 +3651,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ "memchr", "thiserror", @@ -3648,9 +3662,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" dependencies = [ "pest", "pest_generator", @@ -3658,22 +3672,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "pest_meta" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" dependencies = [ "once_cell", "pest", @@ -3697,7 +3711,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3780,9 +3794,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "powerfmt" @@ -3803,7 +3817,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2 1.0.69", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3910,7 +3924,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4274,15 +4288,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4294,12 +4299,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom 0.2.10", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -4359,7 +4364,7 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -4461,12 +4466,26 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "ripemd160" version = "0.9.1" @@ -4547,9 +4566,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ "bitflags 2.4.1", "errno", @@ -4560,12 +4579,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", - "ring", + "ring 0.17.5", "rustls-webpki", "sct", ] @@ -4576,17 +4595,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -4664,12 +4683,12 @@ dependencies = [ [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -4863,31 +4882,37 @@ dependencies = [ "uuid", ] +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + [[package]] name = "serde" -version = "1.0.189" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -5140,7 +5165,7 @@ dependencies = [ [[package]] name = "snark_wrapper" version = "0.1.0" -source = "git+https://github.com/matter-labs/snark-wrapper.git?branch=main#52f9ef98a7e6c86b405dd0ec42291dacf6e2bcb4" +source = "git+https://github.com/matter-labs/snark-wrapper.git?branch=main#42661a9ff9d00853441589679c101f71e3785f55" dependencies = [ "derivative", "rand 0.4.6", @@ -5149,9 +5174,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -5159,9 +5184,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys", @@ -5173,6 +5198,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.5.4" @@ -5226,7 +5257,7 @@ version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", "atoi", "base64 0.13.1", "bigdecimal", @@ -5418,9 +5449,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", @@ -5446,11 +5477,8 @@ dependencies = [ "rand 0.4.6", "rescue_poseidon 0.4.1 (git+https://github.com/matter-labs/rescue-poseidon)", "serde", - "sha2 0.10.8", - "sha3 0.10.6", "smallvec", "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3)", - "zkevm_opcode_defs 1.3.2", ] [[package]] @@ -5488,13 +5516,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.1", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", "windows-sys", ] @@ -5516,7 +5544,7 @@ checksum = "f66edd6b6cd810743c0c71e1d085e92b01ce6a72782032e3f794c8284fe4bcdd" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5530,22 +5558,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5644,7 +5672,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys", ] @@ -5657,7 +5685,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5693,9 +5721,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -5707,9 +5735,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" @@ -5728,7 +5756,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "toml_datetime", "winnow", ] @@ -5758,7 +5786,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5773,12 +5801,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -5941,13 +5969,19 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "ureq" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "log", "native-tls", "once_cell", @@ -6037,7 +6071,7 @@ source = "git+https://github.com/matter-labs/vise.git?rev=dd05139b76ab0843443ab3 dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6117,9 +6151,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -6127,24 +6161,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -6154,9 +6188,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote 1.0.33", "wasm-bindgen-macro-support", @@ -6164,22 +6198,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-streams" @@ -6196,9 +6230,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -6211,12 +6245,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5388522c899d1e1c96a4c307e3797e0f697ba7c77dd8e0e625ecba9dd0342937" dependencies = [ "arrayvec 0.7.4", - "base64 0.21.4", + "base64 0.21.5", "bytes", "derive_more", "ethabi", "ethereum-types 0.14.1", - "futures 0.3.28", + "futures 0.3.29", "futures-timer", "headers", "hex", @@ -6371,9 +6405,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -6403,6 +6437,26 @@ dependencies = [ "tap", ] +[[package]] +name = "zerocopy" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.39", +] + [[package]] name = "zeroize" version = "1.6.0" @@ -6429,7 +6483,7 @@ dependencies = [ [[package]] name = "zk_evm" version = "1.3.3" -source = "git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc1#fe8215a7047d24430ad470cf15a19bedb4d6ba0b" +source = "git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2#fbee20f5bac7d6ca3e22ae69b2077c510a07de4e" dependencies = [ "anyhow", "lazy_static", @@ -6444,7 +6498,7 @@ dependencies = [ [[package]] name = "zk_evm" version = "1.3.3" -source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3#fe8215a7047d24430ad470cf15a19bedb4d6ba0b" +source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3#fbee20f5bac7d6ca3e22ae69b2077c510a07de4e" dependencies = [ "anyhow", "lazy_static", @@ -6504,7 +6558,7 @@ dependencies = [ [[package]] name = "zkevm_circuits" version = "1.4.0" -source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=main#4fba537ccecc238e2da9c80844dc8c185e42466f" +source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=main#fb3e2574b5c890342518fc930c145443f039a105" dependencies = [ "arrayvec 0.7.4", "bincode", @@ -6515,6 +6569,7 @@ dependencies = [ "itertools 0.10.5", "rand 0.4.6", "rand 0.8.5", + "seq-macro", "serde", "serde_json", "smallvec", @@ -6576,7 +6631,7 @@ dependencies = [ [[package]] name = "zkevm_test_harness" version = "1.4.0" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#43aeb53d7d9c909508a98f9fc140edff0e9d2357" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#d2e3670e0c5115b7cc7cc24e6d3dbdd17a214aad" dependencies = [ "bincode", "circuit_definitions", @@ -6613,7 +6668,7 @@ dependencies = [ "async-trait", "backon", "convert_case 0.6.0", - "futures 0.3.28", + "futures 0.3.29", "hex", "metrics", "serde_json", @@ -6633,7 +6688,7 @@ version = "0.1.0" dependencies = [ "anyhow", "ctrlc", - "futures 0.3.28", + "futures 0.3.29", "local-ip-address", "metrics", "prometheus_exporter", @@ -6711,6 +6766,7 @@ dependencies = [ "itertools 0.10.5", "num 0.3.1", "once_cell", + "rand 0.8.5", "serde", "serde_json", "sqlx", @@ -6718,6 +6774,7 @@ dependencies = [ "thiserror", "tokio", "tracing", + "url", "vise", "zksync_contracts", "zksync_health_check", @@ -6768,7 +6825,7 @@ name = "zksync_health_check" version = "0.1.0" dependencies = [ "async-trait", - "futures 0.3.28", + "futures 0.3.29", "serde", "serde_json", "tokio", @@ -6809,7 +6866,7 @@ dependencies = [ "async-trait", "bincode", "ctrlc", - "futures 0.3.28", + "futures 0.3.29", "metrics", "prometheus_exporter", "structopt", @@ -6838,7 +6895,7 @@ dependencies = [ "chrono", "ctrlc", "ethabi", - "futures 0.3.28", + "futures 0.3.29", "hex", "local-ip-address", "metrics", @@ -6873,7 +6930,7 @@ dependencies = [ "async-trait", "circuit_definitions", "ctrlc", - "futures 0.3.28", + "futures 0.3.29", "local-ip-address", "metrics", "prometheus_exporter", @@ -6902,7 +6959,7 @@ dependencies = [ "anyhow", "async-trait", "ctrlc", - "futures 0.3.28", + "futures 0.3.29", "log", "metrics", "prometheus_exporter", @@ -6949,7 +7006,7 @@ dependencies = [ "anyhow", "async-trait", "ctrlc", - "futures 0.3.28", + "futures 0.3.29", "regex", "reqwest", "tokio", @@ -7035,7 +7092,8 @@ dependencies = [ "serde_with", "strum", "thiserror", - "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc1)", + "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)", + "zk_evm 1.4.0", "zkevm_test_harness 1.3.3", "zksync_basic_types", "zksync_contracts", @@ -7050,7 +7108,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bigdecimal", - "futures 0.3.28", + "futures 0.3.29", "hex", "itertools 0.10.5", "metrics", @@ -7061,7 +7119,7 @@ dependencies = [ "tokio", "tracing", "vlog", - "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc1)", + "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)", "zksync_basic_types", ] @@ -7094,7 +7152,7 @@ dependencies = [ "circuit_definitions", "const-decoder", "ctrlc", - "futures 0.3.28", + "futures 0.3.29", "hex", "metrics", "multivm", @@ -7130,7 +7188,7 @@ dependencies = [ "async-trait", "bincode", "ctrlc", - "futures 0.3.28", + "futures 0.3.29", "metrics", "prometheus_exporter", "queues", diff --git a/prover/setup-data-cpu-keys.json b/prover/setup-data-cpu-keys.json index 2cee0f483638..110618052283 100644 --- a/prover/setup-data-cpu-keys.json +++ b/prover/setup-data-cpu-keys.json @@ -1,5 +1,5 @@ { - "us": "gs://matterlabs-setup-data-us/a649643/", - "europe": "gs://matterlabs-setup-data-europe/a649643/", - "asia": "gs://matterlabs-setup-data-asia/a649643/" + "us": "gs://matterlabs-setup-data-us/fb5e9fdd/", + "europe": "gs://matterlabs-setup-data-europe/fb5e9fdd/", + "asia": "gs://matterlabs-setup-data-asia/fb5e9fdd/" } diff --git a/prover/setup-data-gpu-keys.json b/prover/setup-data-gpu-keys.json index a016d127816e..dd705627e934 100644 --- a/prover/setup-data-gpu-keys.json +++ b/prover/setup-data-gpu-keys.json @@ -1,5 +1,5 @@ { - "us": "gs://matterlabs-setup-data-us/26ee1fb-gpu/", - "europe": "gs://matterlabs-setup-data-europe/26ee1fb-gpu/", - "asia": "gs://matterlabs-setup-data-asia/26ee1fb-gpu/" + "us": "gs://matterlabs-setup-data-us/fb5e9fdd-gpu/", + "europe": "gs://matterlabs-setup-data-europe/fb5e9fdd-gpu/", + "asia": "gs://matterlabs-setup-data-asia/fb5e9fdd-gpu/" } diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin index 473d8afbb503..be9b474bd0dc 100644 Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin differ diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin index de5e238dd912..2a35af3e7b28 100644 Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin differ diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin index de5e238dd912..2a35af3e7b28 100644 Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin differ diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin index 047cadfec080..13aa5efb76c6 100644 Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin differ diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin index a8f3489ae673..b4daf641fe58 100644 Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin differ diff --git a/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json b/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json index d792b2731536..5d33f98b183f 100644 --- a/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json @@ -6,121 +6,121 @@ "gate_setup_commitments": [ { "x": [ - 3134321788309977316, - 10573132553967014755, - 3001703164893106466, - 381414913732862840 + 4563648229522529090, + 12621273650309129924, + 6198549568814142266, + 2552508369834820982 ], "y": [ - 10023015411950883744, - 6896159948336889230, - 6414240783194755732, - 872372229201319096 + 6942986305285328922, + 13872369038900622115, + 16362071052994133467, + 804758705072609803 ], "infinity": false }, { "x": [ - 13120971644342103937, - 11793287663204294817, - 3883340854702399708, - 1610760885102732376 + 11488992528554025682, + 12016824828223971094, + 11942004360057333370, + 316831626296641307 ], "y": [ - 2272149790438908451, - 16362277919451948034, - 11222024348659324185, - 769204936692720831 + 304673622018339856, + 7139037552557818730, + 12475560967982555143, + 1055588351918295250 ], "infinity": false }, { "x": [ - 17731804648385463364, - 6957978511947926439, - 554530057858945391, - 1554116369209063151 + 2274984630539920017, + 5398167177582250136, + 16440396753384808945, + 1037682586893548769 ], "y": [ - 11068663668443960791, - 4165938511251890045, - 9157185920319394352, - 1356194940161196789 + 10168660308952593373, + 16526369642614237721, + 569062739734175056, + 155645558476901406 ], "infinity": false }, { "x": [ - 8019563329680255469, - 10443600923825661309, - 10066002756835006084, - 2404912031772130651 + 14005362797509427677, + 2662603874351919260, + 14261489165672308143, + 1470528288349794782 ], "y": [ - 11909280006603456147, - 5818438825251413345, - 15870199885834935123, - 2757108579883054631 + 11144229651170108862, + 11439490264313454962, + 114993091474760680, + 1037267173208738614 ], "infinity": false }, { "x": [ - 9723414060399071945, - 10180812700717519482, - 7936340440930941206, - 516257686460616129 + 10726125240955612787, + 1916320162213728495, + 1058608086768277905, + 1651114031905829493 ], "y": [ - 567977185774136652, - 4306281713268395827, - 18140207600873092049, - 3061955278209883828 + 13237242732587628574, + 4774776044666137690, + 14401013098807103799, + 2514139699916115771 ], "infinity": false }, { "x": [ - 18120818717781619238, - 16711368075993785449, - 16673817803744408050, - 700058928459046347 + 14434760601334248377, + 5316938318287831815, + 6221098547630910324, + 980422841280734466 ], "y": [ - 7622480271915550714, - 13902980411406060504, - 6164172017934139902, - 1836938876363296665 + 9201886393750447942, + 3840149540273146267, + 18179910191622136829, + 1563809864380914603 ], "infinity": false }, { "x": [ - 15818628187542915298, - 15402701417353228903, - 4645743436884029384, - 2409582523262225752 + 17877966991893524598, + 5994085157062523222, + 1757001537059388699, + 624319710399696047 ], "y": [ - 10225110015471016873, - 3480449575574012457, - 13646267911522236018, - 3070086728021966273 + 4763287561833789230, + 2005258298669826833, + 16972767076042430273, + 143191352994868054 ], "infinity": false }, { "x": [ - 15593293662666768812, - 17768691370516984644, - 17174288836059912543, - 2950415245130983093 + 11830690209042008764, + 11761396005838073769, + 18271188400274886574, + 2896734446482773484 ], "y": [ - 10405941745355450827, - 3865610534756768698, - 563805946543955734, - 1806918679491891699 + 1890606551566554401, + 10220931290312275762, + 3256711195869515344, + 2466626485328709457 ], "infinity": false } @@ -128,31 +128,31 @@ "gate_selectors_commitments": [ { "x": [ - 5354921692103962663, - 10597914855112022168, - 8283977291194706970, - 1254033438787241395 + 10865727529243127085, + 4083978853392244827, + 14303622309482785753, + 2263042021033673595 ], "y": [ - 17990692095059328463, - 7491895001046969405, - 17510882385599010078, - 1762527058736778745 + 3019601017411802529, + 880444282195426618, + 9998743525359587628, + 2891421025832200233 ], "infinity": false }, { "x": [ - 12328426125821267783, - 14677689403443047323, - 2357692814373165823, - 3268494923353713205 + 5208608554346323426, + 8575970970223832576, + 2966209169082345602, + 239576408267301488 ], "y": [ - 9394214569640955242, - 450630302635608118, - 1477019964334489453, - 1150908451828220680 + 17715084817752316452, + 2726293100894160682, + 17920596859559317135, + 3485576345363305439 ], "infinity": false } @@ -160,78 +160,78 @@ "permutation_commitments": [ { "x": [ - 11073033365046587506, - 17543366073703943346, - 2925375977998636107, - 411355966917613086 + 14761045450946573029, + 17157644513453531531, + 2555518804134782053, + 1415819224310783987 ], "y": [ - 4634938960149933815, - 10038620738808728516, - 5260176309304737799, - 14410327903164543 + 17265629196749977462, + 4128711855633066822, + 8435602817910411328, + 1408116296902303196 ], "infinity": false }, { "x": [ - 4505573069708166334, - 3514663015240928368, - 13885581324134225254, - 2759554901468343883 + 3307267823832528482, + 2406249680085831639, + 9091964031261402109, + 2846274000290842933 ], "y": [ - 14766134794032708062, - 3419963379718679828, - 14090109324006346322, - 2080971354192483161 + 17374905554931807856, + 6690578002079222163, + 11809376320193686210, + 2676076649992974574 ], "infinity": false }, { "x": [ - 10034756028637387237, - 13956897381252459181, - 17676764419229650887, - 1786540180828440303 + 3159118708748226574, + 5508845413629697013, + 13350869305506486049, + 689297560178790472 ], "y": [ - 16234833038341145650, - 1114974762353197748, - 16711158590984748387, - 961724704749485864 + 15696011303896469684, + 12551611148155235140, + 14438660833518031207, + 425021756161657108 ], "infinity": false }, { "x": [ - 13207237492056542947, - 9498840683026707597, - 13316073393799666368, - 2265958217127439582 + 18349397811516917436, + 4473982696343317918, + 13070312540813307819, + 2109468484629113245 ], "y": [ - 9080715171198565366, - 9520983963961194766, - 7885036753736171049, - 3318336507646038340 + 13254534552549721008, + 17388411854346636521, + 17875890960520499518, + 1062184221180884481 ], "infinity": false } ], - "total_lookup_entries_length": 1786644, + "total_lookup_entries_length": 1787472, "lookup_selector_commitment": { "x": [ - 9218954341000481996, - 1038591043397823945, - 2355917848722531772, - 1603833229224637991 + 9324906502432882695, + 14977861238256290580, + 12538013124354067293, + 3408438202312564138 ], "y": [ - 9294257929334679357, - 9665091690516467420, - 7057032139323633744, - 2846067557162208306 + 14942105932194201701, + 12210090881357612547, + 14774705021036784261, + 2531694948512337448 ], "infinity": false }, @@ -299,16 +299,16 @@ ], "lookup_table_type_commitment": { "x": [ - 2681380516794566972, - 967983640969946255, - 2727464508424142824, - 1972327038478390223 + 1732877442096985191, + 7537030715658833452, + 14073502080301311448, + 2178792007727681099 ], "y": [ - 7977458078956869600, - 12274734452276806231, - 29244742286950686, - 667948288229117220 + 8513095304113652904, + 6581396660744182779, + 13939755637576387431, + 2477157044961106453 ], "infinity": false }, diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json index bd030f4a3942..77bc59e7cc71 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json @@ -19,19 +19,19 @@ "public_inputs_locations": [ [ 0, - 531517 + 590816 ], [ 1, - 531517 + 590816 ], [ 2, - 531517 + 590816 ], [ 3, - 531517 + 590816 ] ], "extra_constant_polys_for_selectors": 3, @@ -157,100 +157,100 @@ }, "setup_merkle_tree_cap": [ [ - 769023300008107994, - 15035929950782434877, - 4767632476551610273, - 6003255068455690448 + 17255097312801917418, + 6752062397462185164, + 6945169344153100762, + 1027145090739443516 ], [ - 9026207300516234226, - 12638320530307573615, - 9548682324993884667, - 1669798832247316225 + 2706981353446505354, + 4400783282139197989, + 4746761039479195354, + 6917423648192975374 ], [ - 15771054686436993477, - 14867268062778845716, - 2755571000455103667, - 17012958053718147653 + 14359699678306853857, + 3874019407181236903, + 1702525096073880094, + 15447128604206124811 ], [ - 4796035851498319953, - 15578398003463831188, - 16487202842559859878, - 12241980977059723891 + 14919692895081414701, + 16198199658418046089, + 5300842507730285411, + 1354964360576854088 ], [ - 4905638728558119005, - 7863530509045382726, - 17089556944619165055, - 6881822366736890373 + 7893091991029104133, + 461623798339808974, + 8344344575050000699, + 6429248499764299709 ], [ - 5605698221760842562, - 15309408538060590842, - 7774687445824112675, - 1029523717262265273 + 3051345475339328025, + 7246741189903305632, + 8770646108314135249, + 11397594937127919638 ], [ - 4602145677202369894, - 10437641120626639391, - 16191157018649573359, - 2145181286557866215 + 17140261756755118484, + 14571132600312115844, + 16474851341660251601, + 3870486573224486069 ], [ - 8347044010387916224, - 7660057627892565262, - 4087655568250966187, - 4920987872151258558 + 14064921522483694638, + 5552772407678827457, + 8197485703462734816, + 4076425874266669579 ], [ - 4652946618899021165, - 10106017231231912813, - 3800120974014235756, - 6675575778477161887 + 2452070238664358269, + 13711378536375553237, + 11830939878396649638, + 7512481030146411108 ], [ - 4980892440155162443, - 6801648544364465294, - 2944365492323162449, - 6942743875951446975 + 7597612981457926316, + 11783666373503914223, + 11713451243725552313, + 5342379134170329134 ], [ - 17666291786065358473, - 11132525791177279380, - 1090211641846788491, - 18206157565187626653 + 12489669233178248038, + 17028844225279324645, + 8131691717219450889, + 14082797405972696667 ], [ - 11955322036584323772, - 9745237745974724322, - 7620783083675382303, - 6501674220304463161 + 11988879801285229237, + 17288180304460903679, + 13044117107479477053, + 12638813886386860955 ], [ - 14154028621322325960, - 12267966522963634693, - 16381614744195346959, - 10938579521199157178 + 3380229109281454972, + 4458248379364253884, + 7869182453045325845, + 9693126437712749358 ], [ - 5661196656360295299, - 16217006627182303897, - 15559803411312667053, - 14580126280029049348 + 2682064331957080503, + 17101005929710435580, + 11432367781015495002, + 13680190157837569463 ], [ - 9186970898669061808, - 692683705561232556, - 14664202853793025315, - 7113265307923171991 + 14655856026922822596, + 174798469470174167, + 1234552219530881028, + 14985953291656457572 ], [ - 256017097329808658, - 1298676672131862834, - 9342013003187223457, - 172944159302847111 + 4854808831884097811, + 9345617176959383563, + 3777549132507294766, + 5359660921592437143 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json index 15680c68c303..fbc39e70270f 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json @@ -19,19 +19,19 @@ "public_inputs_locations": [ [ 0, - 531517 + 590816 ], [ 1, - 531517 + 590816 ], [ 2, - 531517 + 590816 ], [ 3, - 531517 + 590816 ] ], "extra_constant_polys_for_selectors": 3, @@ -157,100 +157,100 @@ }, "setup_merkle_tree_cap": [ [ - 769023300008107994, - 15035929950782434877, - 4767632476551610273, - 6003255068455690448 + 17255097312801917418, + 6752062397462185164, + 6945169344153100762, + 1027145090739443516 ], [ - 9026207300516234226, - 12638320530307573615, - 9548682324993884667, - 1669798832247316225 + 2706981353446505354, + 4400783282139197989, + 4746761039479195354, + 6917423648192975374 ], [ - 15771054686436993477, - 14867268062778845716, - 2755571000455103667, - 17012958053718147653 + 14359699678306853857, + 3874019407181236903, + 1702525096073880094, + 15447128604206124811 ], [ - 4796035851498319953, - 15578398003463831188, - 16487202842559859878, - 12241980977059723891 + 14919692895081414701, + 16198199658418046089, + 5300842507730285411, + 1354964360576854088 ], [ - 4905638728558119005, - 7863530509045382726, - 17089556944619165055, - 6881822366736890373 + 7893091991029104133, + 461623798339808974, + 8344344575050000699, + 6429248499764299709 ], [ - 5605698221760842562, - 15309408538060590842, - 7774687445824112675, - 1029523717262265273 + 3051345475339328025, + 7246741189903305632, + 8770646108314135249, + 11397594937127919638 ], [ - 4602145677202369894, - 10437641120626639391, - 16191157018649573359, - 2145181286557866215 + 17140261756755118484, + 14571132600312115844, + 16474851341660251601, + 3870486573224486069 ], [ - 8347044010387916224, - 7660057627892565262, - 4087655568250966187, - 4920987872151258558 + 14064921522483694638, + 5552772407678827457, + 8197485703462734816, + 4076425874266669579 ], [ - 4652946618899021165, - 10106017231231912813, - 3800120974014235756, - 6675575778477161887 + 2452070238664358269, + 13711378536375553237, + 11830939878396649638, + 7512481030146411108 ], [ - 4980892440155162443, - 6801648544364465294, - 2944365492323162449, - 6942743875951446975 + 7597612981457926316, + 11783666373503914223, + 11713451243725552313, + 5342379134170329134 ], [ - 17666291786065358473, - 11132525791177279380, - 1090211641846788491, - 18206157565187626653 + 12489669233178248038, + 17028844225279324645, + 8131691717219450889, + 14082797405972696667 ], [ - 11955322036584323772, - 9745237745974724322, - 7620783083675382303, - 6501674220304463161 + 11988879801285229237, + 17288180304460903679, + 13044117107479477053, + 12638813886386860955 ], [ - 14154028621322325960, - 12267966522963634693, - 16381614744195346959, - 10938579521199157178 + 3380229109281454972, + 4458248379364253884, + 7869182453045325845, + 9693126437712749358 ], [ - 5661196656360295299, - 16217006627182303897, - 15559803411312667053, - 14580126280029049348 + 2682064331957080503, + 17101005929710435580, + 11432367781015495002, + 13680190157837569463 ], [ - 9186970898669061808, - 692683705561232556, - 14664202853793025315, - 7113265307923171991 + 14655856026922822596, + 174798469470174167, + 1234552219530881028, + 14985953291656457572 ], [ - 256017097329808658, - 1298676672131862834, - 9342013003187223457, - 172944159302847111 + 4854808831884097811, + 9345617176959383563, + 3777549132507294766, + 5359660921592437143 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json index 54cda61bfca1..dba61453753c 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json @@ -19,19 +19,19 @@ "public_inputs_locations": [ [ 0, - 1041180 + 1047658 ], [ 1, - 1041180 + 1047658 ], [ 2, - 1041180 + 1047658 ], [ 3, - 1041180 + 1047658 ] ], "extra_constant_polys_for_selectors": 3, @@ -183,100 +183,100 @@ }, "setup_merkle_tree_cap": [ [ - 11230239963091452912, - 13026461504664266360, - 16713169701215574185, - 12615976815403328075 + 14869022747991704186, + 17031358815991649117, + 4714282231372708414, + 6414019057952366663 ], [ - 3804170955286114995, - 17070428581913287652, - 16444458341617335831, - 12310477573463289452 + 6900602175855696430, + 6670794569935170089, + 10800109531102252604, + 17486750553116564567 ], [ - 15717060580753384291, - 5009332941172699339, - 5141249138356870627, - 14525082357218066066 + 17299361551409797093, + 11990751079425151913, + 6826444113393762570, + 10932118118889734350 ], [ - 5451473672302709994, - 14405751484257675144, - 6034423888032264287, - 14528639950002943854 + 6474368291910763152, + 7951437263957002667, + 16115489689031613949, + 7133133995520501271 ], [ - 11233253504932768792, - 9984746197426258635, - 4438596486612781127, - 17198259095221505968 + 10017359634641638081, + 5101743302584875322, + 5266371437134340172, + 6069099232595401770 ], [ - 5681291117413714556, - 18436270377115663121, - 11989211218541826903, - 2671135999160204746 + 17756274064208120672, + 3982804959467006511, + 10666837127743053144, + 5042305760262773346 ], [ - 963730224051018518, - 1293300388921029500, - 7261069736084660486, - 12414181044622900231 + 6276015788824777492, + 7548026914440268726, + 7686087580556345175, + 70678741505519130 ], [ - 17155210460432560694, - 920670927493907875, - 6658462737460123613, - 8253351903179999964 + 17054606409621314666, + 12181652464079780487, + 16509905652014130420, + 18326959307811580345 ], [ - 3039615529982926935, - 12254392109531368227, - 12274357209453453775, - 16608606384477787215 + 11297851890381778013, + 4519272151514850089, + 11187164861287540939, + 11860631544716366680 ], [ - 11218496188813210888, - 16107046895420213310, - 16285761395335573298, - 8624190103510841482 + 6694400911557434438, + 10320855386973467141, + 6409090468016993938, + 1691791456834022317 ], [ - 14835727297511074005, - 1164596723783439781, - 11276497358832644724, - 9219531475080512501 + 12631827227087810588, + 17420660366875362680, + 8998719038651802977, + 7868656510918289268 ], [ - 3715985935119482043, - 12185867206854340138, - 7900628271499451412, - 8891356055003024224 + 6457505234632244247, + 13541404564190215974, + 16187962154051613109, + 17552751586718992793 ], [ - 17763963322580587554, - 218146194744968367, - 16033549148238902530, - 1522529898878047239 + 16545123790363978986, + 5350362016628834362, + 18354051751822556975, + 6117654413762589372 ], [ - 8120794419871565322, - 18267867130143702317, - 17178857528695612575, - 14839022417830798252 + 489622670611184909, + 15319066911773803522, + 18442076011714885642, + 6096263545427509383 ], [ - 16480189677896973754, - 18441483621256548692, - 3982214183107947832, - 5099760740801601882 + 15489313913065919449, + 8423761693489524867, + 15818905453819585194, + 15653211152174043194 ], [ - 10335714458962187072, - 8498294096277334786, - 8574103413352512596, - 9714850528124914412 + 5640704920035577473, + 4663598453214139985, + 1172539769174279254, + 11923632706292759615 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json index 0cfb70f82924..d652999fd975 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json @@ -144,100 +144,100 @@ }, "setup_merkle_tree_cap": [ [ - 14477188964753033185, - 8969677320239131616, - 1511337688601558079, - 6903237435877294238 + 16853718657582601580, + 10631796575029415090, + 18320228973305892572, + 14797730232451517541 ], [ - 6879979662383013500, - 9972710512945599417, - 1141938191658961290, - 7985281381511529082 + 8890350565651877515, + 18243492738997130575, + 14415645732123903785, + 5918588518093720209 ], [ - 17209416762295781376, - 598939655522077579, - 6689912638469680235, - 4921519662278829132 + 10181334597721116044, + 6724908705777692969, + 3381343828527527193, + 14875430060807760986 ], [ - 2218810108211543567, - 17367409571577782381, - 4068453030111399481, - 2894111853945751344 + 7502398467067464454, + 9905493097836559685, + 12361835222511910182, + 11000451772972755930 ], [ - 9999042349572898395, - 7429179575907305306, - 10123408942776369379, - 3022715221462077728 + 15487040151928940075, + 1732755258635637519, + 7765552818029379119, + 16029488421415915448 ], [ - 10045842633239015513, - 4244812848324665170, - 12301343603596417356, - 11332920712778059030 + 7673980080645401873, + 2589760610624717441, + 18314964384057927348, + 16312980478347876430 ], [ - 15900139291770141663, - 8192446346506891091, - 10086891539583546802, - 7343942987745068197 + 1745632142555819697, + 14735550307794047856, + 15608876072126511259, + 13020735680333512494 ], [ - 6124221718954912549, - 13486682166896696529, - 15097291952143481844, - 16653894364467704495 + 14762061398864405466, + 56369901633898632, + 9780056675521590602, + 2711036215110716941 ], [ - 12766623698334678967, - 1729058559883227397, - 1411108054906351423, - 13278453333171202065 + 8782769174314801114, + 16217352387937544880, + 13297928256747533282, + 7604330818978538321 ], [ - 12233418151438626108, - 14016138745865492456, - 13255147568691004416, - 14998854132551828470 + 12045431238320335688, + 770190973971133012, + 375040007457860131, + 5140492573916768769 ], [ - 10323923076292169703, - 8158278707949376146, - 12845614783152862914, - 5914093648720582597 + 7350594700153755172, + 15873362945356384775, + 10414192080947646277, + 5224463180232301299 ], [ - 13520835009196520971, - 14417779140547238889, - 6862603050786324034, - 10245030009169430808 + 4778775045258044479, + 1545164339717930438, + 16529541861201429172, + 4452025033870328622 ], [ - 1835499986105723876, - 9973301486190772269, - 3431085138170097359, - 16617926458565371046 + 641897723978358243, + 8244503427756659669, + 13727946234009813807, + 13452166153217826497 ], [ - 6995430833584764582, - 10186803315798237521, - 13404931797112939412, - 17530795913574984460 + 5380752577242048920, + 11612900278659122859, + 8378205898168051297, + 7068017765922942164 ], [ - 10883424944588923206, - 13314595728239865895, - 3282096066350298749, - 3956046981299225896 + 11761816327595496430, + 10293378792450261712, + 16630398600011091671, + 13732635120970377145 ], [ - 12087054656445457911, - 7314398367646261307, - 7998118142061675046, - 11673364943123337175 + 16664762393580692433, + 6294821993221947092, + 945329094523862566, + 8663632361866204892 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json index 2823ffec627f..26a0c0c3e387 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json @@ -19,19 +19,19 @@ "public_inputs_locations": [ [ 0, - 1044628 + 1046317 ], [ 1, - 1044628 + 1046317 ], [ 2, - 1044628 + 1046317 ], [ 3, - 1044628 + 1046317 ] ], "extra_constant_polys_for_selectors": 3, @@ -157,100 +157,100 @@ }, "setup_merkle_tree_cap": [ [ - 15152415627491818135, - 7374237605577523933, - 4465184016028924212, - 2035234088595773309 + 11871327302077385347, + 16906876010300982827, + 1595439427548031919, + 8289977278285908320 ], [ - 5061557444963845839, - 12386849184623218277, - 13052284409578998174, - 2142376146067763313 + 1781098816832363622, + 3478218372991964399, + 7533433777158627341, + 14771106422370550145 ], [ - 14276061640225729061, - 3667833983304997823, - 15567500985315483409, - 10110252348727918570 + 2685684430663814546, + 12416630179340889407, + 2015102854033739219, + 5941892917351537077 ], [ - 12534291856385391774, - 4931691717277748218, - 10385184271370113628, - 10333556044049798387 + 11253028729705493819, + 14850400929314449282, + 8678044000034959641, + 17294624061384818276 ], [ - 3902530530481162544, - 11439177580828992768, - 2956353447880097447, - 2078779115341733037 + 14258883085276585451, + 6370442713006574674, + 14046750730761444155, + 17791869273332245871 ], [ - 14361126694241130224, - 4508476390465174580, - 14814630315120762635, - 17198376643024594512 + 7220276552024778410, + 8960130478379828559, + 16936405896975145419, + 5038663776382566512 ], [ - 15399867818681370342, - 17613339377988571860, - 17463021656624906492, - 18043402438787219822 + 13808097963622191673, + 11828988786702917270, + 2233362366627924, + 6612334601851706078 ], [ - 4721341021989730415, - 941889554702533152, - 4492052956383425703, - 11785343591616806540 + 7478203141391683139, + 224415780917265400, + 7567502678051235826, + 7851341697237293082 ], [ - 14835583452718692456, - 9747287794601877160, - 13285319018669943605, - 15566660322778346733 + 16539824364674252288, + 4519676258951332695, + 18049825257493226995, + 1267218050479719768 ], [ - 634069327924902339, - 7509671875950276664, - 17149763085975395897, - 17558106862399785122 + 3826454470928570687, + 1236146101240459873, + 6372203166973826150, + 6930153498226497616 ], [ - 6504570481933973182, - 9863954755773054818, - 4192802816900646319, - 11708054020605968244 + 3167281621364929622, + 2762481164640470670, + 8362276586345702073, + 14045722791397864122 ], [ - 5368022000476684675, - 11854447477637281190, - 773008757856055958, - 7428874382179860306 + 14365302546843858790, + 17322057150049918196, + 286070742254960491, + 8246670609891611634 ], [ - 820566450151427404, - 14487105988932071384, - 5168970873173217247, - 16840718205559266321 + 7988693957097790412, + 314963851507072118, + 17207369419682640756, + 412453697544464209 ], [ - 15018168499898445860, - 15893129254829262789, - 1267456796490088156, - 14049704864991807107 + 14890448417542266631, + 5963437462474119237, + 9763006742695214759, + 17659455413153344670 ], [ - 3678472314386256573, - 4482269767107891177, - 2891258367538769098, - 10249141358181035242 + 13083329023803443846, + 10870396255388184280, + 17412894322433867553, + 4879290934605969545 ], [ - 1175499750244297798, - 7441679809319866074, - 15706614384330332074, - 12399917843582101807 + 7034677264054074316, + 3672095934764717273, + 6174572782407460075, + 6718668524195598096 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json index 14b20e4f718f..0f7da00956e9 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json @@ -162,100 +162,100 @@ }, "setup_merkle_tree_cap": [ [ - 14038008090973880203, - 7437991399998284269, - 12502661164686015780, - 6154468052477899229 + 14636954476072242156, + 15460533889773250215, + 13571771735426812697, + 3674433289206621188 ], [ - 4890279821462461425, - 12267605659025997985, - 16220814561210675069, - 14958418982789304352 + 5146657904050067466, + 15179636906764028042, + 4458240644364816776, + 3854478545464054871 ], [ - 16239014851914932689, - 11626285279514581577, - 7827403995053907198, - 3320808129263057989 + 18114356051495337465, + 2460031033979438751, + 10614442720939881367, + 12631596809486251401 ], [ - 9987109148114223767, - 16027730699082584407, - 16226544327370131567, - 10505655809748447851 + 12670456753792795234, + 5734715418800406760, + 14379925078406668950, + 13920558905608078541 ], [ - 2426355028560688438, - 13015409833156179441, - 3357212938175132730, - 9924499217906835800 + 8585409707256083198, + 9661903002207573663, + 18296368903415427367, + 5395728364165581552 ], [ - 7264556678081366657, - 11014021481903289086, - 1185381295776166890, - 11220095453847753366 + 16716746225817039110, + 17900402509718418940, + 14561636355524215448, + 17647085418392185729 ], [ - 10738220050569983945, - 2071033793611953608, - 2836853848682426199, - 18280211532291996343 + 6544176620831004186, + 1066867491020495104, + 15237469647708744345, + 5582507734089272188 ], [ - 4622574899935206725, - 10283505057353003539, - 10924169390994336784, - 9267200805799259741 + 10826197699344780191, + 16774694807383071627, + 6970009266231747102, + 5073765786605743273 ], [ - 4991426063445236730, - 292198960832094512, - 6370230421874009175, - 2987533577516974457 + 7011598656305780589, + 3714641885720327142, + 1328844421504013402, + 5342418218023892912 ], [ - 15100014620403370288, - 17064710328307274600, - 13596338039199898149, - 7844302147920229272 + 16743826806479391431, + 2498441403006225365, + 3763460945063406337, + 10824849335763040339 ], [ - 6997319402399846472, - 5312486909661565204, - 8133503726683094273, - 14376435888676319871 + 4691094985878282097, + 12092365143928963864, + 11354288308150295023, + 7801550279003844226 ], [ - 16536431163453527335, - 8329243612205528007, - 10332326446350256878, - 6187024786825219302 + 3867527931432736886, + 4825207401996912760, + 1871792074982855854, + 4805413397744414116 ], [ - 15819705933365601754, - 17218893784817004570, - 7197154299986843671, - 11662127518680895562 + 1007283153254064086, + 4346738087015083191, + 18211975659016457728, + 8347640387139701541 ], [ - 12757050724806983838, - 14916998582501427105, - 2903621530266216761, - 12948020673936426635 + 17626869608107101194, + 7556477258963524520, + 16574783144364785925, + 14102989348947592441 ], [ - 14563493065638885359, - 6770003101729110728, - 11839394563403429402, - 1065983546047670743 + 4403861598770742076, + 15824184507597663960, + 8269588027067215509, + 4543643506155864177 ], [ - 2845847955135199124, - 16066115065717446946, - 4482870472147946913, - 8664518745998140088 + 15137518221717445610, + 7847704480884984294, + 13161324518981152688, + 2456338812539820012 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json index 9b8c7bca3296..eaee3b06647d 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json @@ -162,100 +162,100 @@ }, "setup_merkle_tree_cap": [ [ - 1107277819469948429, - 7779138633457495557, - 9933991506239962590, - 13247997120867942045 + 3978274454745058913, + 12908903924760647770, + 4270910004058851361, + 3677815340141128634 ], [ - 10020877950065961527, - 6525352303263078852, - 10601857031603992424, - 6699333963081308583 + 477248863584349992, + 4199713090442134162, + 10476927932679514044, + 6550650493365233590 ], [ - 8019436446207312706, - 17880026081547931046, - 14023459613581442883, - 12177363081042438182 + 9252199448552910886, + 8459898009630606014, + 3864999066073825396, + 14944179834367026039 ], [ - 17643512238638359026, - 2759065364120570462, - 1113452962298378930, - 9944550331137276877 + 10977758783465502348, + 7713219177097206913, + 12228558398275686886, + 10480119154088503428 ], [ - 6208699382898547395, - 9442366708032685349, - 9362620233586526034, - 6406469355002722194 + 9273439961549716452, + 10246234432612176135, + 4982997462593621821, + 4516717012198331462 ], [ - 17265154700194893264, - 11486849446382907011, - 1331827641678752332, - 13890193454573854721 + 18144937711490860988, + 14694112509055216400, + 16134043219639460323, + 2425972111094980455 ], [ - 7338198937132638061, - 9619578268260381257, - 16966504852427653624, - 5042032213830518832 + 5425965118251882310, + 17669067386319751032, + 10126167892858795705, + 10466052347434300102 ], [ - 9998014800451912206, - 2764915420573986646, - 12638108373731502079, - 13849566240043998295 + 14534053806590264308, + 3518770965759630571, + 4726036007868394446, + 16696028505915341621 ], [ - 18402224478111895268, - 10245397321907314013, - 15810832121998678624, - 16050833323870358750 + 8264335106986134121, + 15825870775679767543, + 3076864970052824913, + 8200621565610677226 ], [ - 5754119484130347551, - 1334330314055286585, - 1196783225751134982, - 13693638204576454858 + 2063078364663159403, + 4914041114586640143, + 14867805712490344367, + 2481297710374136148 ], [ - 7476283313073466871, - 3327838189135133206, - 7576584001149251522, - 4746763672176501097 + 10101036960572935469, + 2183820874228495561, + 10220241349428188678, + 11742399579040933416 ], [ - 8341294580974175099, - 6996214973372400649, - 2825261487886819108, - 17611476352036968111 + 3100922027489470396, + 8629350517378084661, + 18119328569493442750, + 16092741553212295334 ], [ - 6481216673139681707, - 12834349834818063790, - 14423475559705119809, - 15943814042360079510 + 10291418159809942864, + 7393684283716500797, + 3895249320626531353, + 12887669899740613131 ], [ - 7771500178827314392, - 5968639878444939173, - 18006309838458312166, - 368714734303788414 + 14557681338140954299, + 1420823298821743618, + 12037920502313470759, + 4285830277342439084 ], [ - 2137428658614683231, - 4604901863694850124, - 3581156028309568037, - 7485386108131533730 + 6214381477864785389, + 2373190810253981709, + 2350860011226500287, + 11625359538041748063 ], [ - 1078544443818230878, - 14117476483719501663, - 17985826373971579789, - 10600652728062682193 + 3552366579682625316, + 12087481157075128812, + 11051082475232859265, + 3877695090349884007 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json index e32be9870e7b..c454742f5348 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json @@ -162,100 +162,100 @@ }, "setup_merkle_tree_cap": [ [ - 1107277819469948429, - 7779138633457495557, - 9933991506239962590, - 13247997120867942045 + 3978274454745058913, + 12908903924760647770, + 4270910004058851361, + 3677815340141128634 ], [ - 10020877950065961527, - 6525352303263078852, - 10601857031603992424, - 6699333963081308583 + 477248863584349992, + 4199713090442134162, + 10476927932679514044, + 6550650493365233590 ], [ - 8019436446207312706, - 17880026081547931046, - 14023459613581442883, - 12177363081042438182 + 9252199448552910886, + 8459898009630606014, + 3864999066073825396, + 14944179834367026039 ], [ - 17643512238638359026, - 2759065364120570462, - 1113452962298378930, - 9944550331137276877 + 10977758783465502348, + 7713219177097206913, + 12228558398275686886, + 10480119154088503428 ], [ - 6208699382898547395, - 9442366708032685349, - 9362620233586526034, - 6406469355002722194 + 9273439961549716452, + 10246234432612176135, + 4982997462593621821, + 4516717012198331462 ], [ - 17265154700194893264, - 11486849446382907011, - 1331827641678752332, - 13890193454573854721 + 18144937711490860988, + 14694112509055216400, + 16134043219639460323, + 2425972111094980455 ], [ - 7338198937132638061, - 9619578268260381257, - 16966504852427653624, - 5042032213830518832 + 5425965118251882310, + 17669067386319751032, + 10126167892858795705, + 10466052347434300102 ], [ - 9998014800451912206, - 2764915420573986646, - 12638108373731502079, - 13849566240043998295 + 14534053806590264308, + 3518770965759630571, + 4726036007868394446, + 16696028505915341621 ], [ - 18402224478111895268, - 10245397321907314013, - 15810832121998678624, - 16050833323870358750 + 8264335106986134121, + 15825870775679767543, + 3076864970052824913, + 8200621565610677226 ], [ - 5754119484130347551, - 1334330314055286585, - 1196783225751134982, - 13693638204576454858 + 2063078364663159403, + 4914041114586640143, + 14867805712490344367, + 2481297710374136148 ], [ - 7476283313073466871, - 3327838189135133206, - 7576584001149251522, - 4746763672176501097 + 10101036960572935469, + 2183820874228495561, + 10220241349428188678, + 11742399579040933416 ], [ - 8341294580974175099, - 6996214973372400649, - 2825261487886819108, - 17611476352036968111 + 3100922027489470396, + 8629350517378084661, + 18119328569493442750, + 16092741553212295334 ], [ - 6481216673139681707, - 12834349834818063790, - 14423475559705119809, - 15943814042360079510 + 10291418159809942864, + 7393684283716500797, + 3895249320626531353, + 12887669899740613131 ], [ - 7771500178827314392, - 5968639878444939173, - 18006309838458312166, - 368714734303788414 + 14557681338140954299, + 1420823298821743618, + 12037920502313470759, + 4285830277342439084 ], [ - 2137428658614683231, - 4604901863694850124, - 3581156028309568037, - 7485386108131533730 + 6214381477864785389, + 2373190810253981709, + 2350860011226500287, + 11625359538041748063 ], [ - 1078544443818230878, - 14117476483719501663, - 17985826373971579789, - 10600652728062682193 + 3552366579682625316, + 12087481157075128812, + 11051082475232859265, + 3877695090349884007 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json index d117b3b0ade3..f03848a09751 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json @@ -162,100 +162,100 @@ }, "setup_merkle_tree_cap": [ [ - 2692117301910616223, - 11862373594405581684, - 12092750955553531256, - 5108545912057877223 + 1805040357731911032, + 12724391787715131487, + 16479521122472510699, + 16667703969508778391 ], [ - 13191057082261271313, - 13461898869001565340, - 3144977546711926190, - 12887787173850649640 + 12688435309079006504, + 14734642188927813728, + 11915884033454147184, + 17329321226955875183 ], [ - 8723842528870621436, - 9645915571392535116, - 6025366220407814286, - 4747467989456698429 + 16315437509239525068, + 14908436607574402415, + 2084428987844243846, + 15413041179037655921 ], [ - 7405718287975487752, - 15471426320802247554, - 8018397484818843188, - 1076292840128333912 + 2823702871692091034, + 6376153290603778949, + 10890272396514589925, + 8026713020686697748 ], [ - 15567092204640112640, - 13512378722158897717, - 16839350703341635379, - 6580006701757635256 + 17397137686907845637, + 2064022542849488262, + 3786405316970836609, + 5437499595967723836 ], [ - 478392572686859273, - 1879898158113218624, - 7956515309033309445, - 15667184770862761054 + 2550071694179416093, + 4897423300632444750, + 13062462915336389501, + 18372839862930961551 ], [ - 4738701842169478640, - 14432395387726327998, - 14827473518830139511, - 7026071202596813302 + 17088995408991024798, + 16316191327122804523, + 5528066820138050503, + 14599942305495755459 ], [ - 1832914181581899534, - 12309614119776336180, - 1786307750405330285, - 9394109377731731297 + 5958767730804376795, + 6660452824628491350, + 5783408552721592941, + 14088521578529200272 ], [ - 11330017822804908986, - 17965075245400465236, - 178921019209832245, - 9010774195056378656 + 2291071995718572256, + 907353728885268958, + 129782464141134801, + 9589777919267926845 ], [ - 10066603459136751242, - 16922354046552351580, - 1488715132336554574, - 2488902959064634539 + 16187707968438160509, + 11100373869445159993, + 5237804265105284075, + 9739986537750733952 ], [ - 12764025501053651238, - 10583029583148326399, - 10919956138611547307, - 193732647159610859 + 16892182605566285738, + 1703786579928301563, + 8812499024578960746, + 17823411878542653115 ], [ - 10812330075474661907, - 11023893070918609227, - 14153054852108697346, - 3310659191720741717 + 13683376511744176189, + 5433888418576498236, + 15343790216728546383, + 16285187192287214848 ], [ - 12566885554555589997, - 5264949142237538963, - 10357889278039077105, - 1693879812388879198 + 17452383859621845374, + 17719367598200163617, + 1419014138942951485, + 7011441981346002658 ], [ - 5143074524340781416, - 1340176837904332618, - 12593249647365922721, - 16619880365401544994 + 6400096584820601208, + 16235194395642444364, + 11311947162131944240, + 7598189765195297754 ], [ - 8116207797925146203, - 2436416957055038167, - 1598938366845903588, - 7153648406343743028 + 8933333390708774665, + 12091548374904536228, + 14131593419057989631, + 3687065922153051144 ], [ - 14400322751382246405, - 4576201222988375875, - 10482138496908129257, - 1696076921104575474 + 4357902627493767816, + 8081210589813839837, + 15890918119202411959, + 12214732213338934860 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json index f73530a2ca1a..198f0389a72c 100644 --- a/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json +++ b/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json @@ -19,19 +19,19 @@ "public_inputs_locations": [ [ 0, - 993345 + 1001025 ], [ 1, - 993345 + 1001025 ], [ 2, - 993345 + 1001025 ], [ 3, - 993345 + 1001025 ] ], "extra_constant_polys_for_selectors": 4, @@ -170,100 +170,100 @@ }, "setup_merkle_tree_cap": [ [ - 15230555879575926816, - 8670948681878777794, - 767116401361787080, - 13808751382541908272 + 4522138600368992679, + 9538550764574095149, + 12350165878820403151, + 17316455735707094331 ], [ - 1220486015450063297, - 9567900108378427313, - 18210974256257044632, - 18338726330920132716 + 5497320764894852275, + 1590480833349456203, + 6557309322687596584, + 15454422223540210306 ], [ - 7568154221767192295, - 11691578057855133612, - 9987210827513697170, - 17019942866370544662 + 5558505086540283030, + 13943227629024743939, + 10259100634144494257, + 5704170399326630549 ], [ - 14102673551475852761, - 3839757807646647049, - 8317169401280108378, - 14477318175428765566 + 2951435633176249116, + 9236611820854085075, + 7033504824356317789, + 6878637342940269074 ], [ - 10669246787368115713, - 11986124114638697341, - 373240888095551057, - 10600874540100090281 + 14892753504099420541, + 5719263246041693687, + 4025705708519747499, + 1086118372881038482 ], [ - 1967433817606548880, - 1252531621216687635, - 14092128528722989126, - 15316007954882781751 + 7732214748303870430, + 9037879918645611146, + 5795905425560049291, + 5456605407758692913 ], [ - 5731133612849813361, - 9439573956187051534, - 15220234372923263193, - 9871593147214385018 + 6947322728148447593, + 6382294998862546420, + 7884427302760020118, + 2212936554013177065 ], [ - 5432497552013782457, - 6217935098775351854, - 10788625265296640732, - 7626134139872594266 + 2343438613885863348, + 13493857712239522643, + 14424009770652266387, + 12969912574245991559 ], [ - 16209439837876908945, - 16958705495955599782, - 2620710932184338631, - 13207816187542048405 + 16858795808644713105, + 6129396520459104783, + 209477910023536873, + 13344925663188092269 ], [ - 11540918781414391435, - 13215620469361541671, - 7261198944216226328, - 14101141177393020403 + 14152833547677278430, + 12581387048991719122, + 15917744314847466427, + 14443470950772122977 ], [ - 10951103916546600353, - 16291916249083597787, - 8020395928888095904, - 14831509381332343931 + 10299081693196569961, + 350315107343268130, + 6173847887082203307, + 1849093595195412250 ], [ - 14614496581821229034, - 570029684825245175, - 11368483572681932607, - 17857699424461379920 + 9042415970339022369, + 11988457939756485920, + 10336433647276674537, + 1259669594789643496 ], [ - 10549396205597068517, - 16251363364669954894, - 5619914240250798106, - 15384760685177493623 + 14433184155184276283, + 13064790874012444560, + 14980870107816026210, + 2386527707606459321 ], [ - 6443594760777705854, - 4350415958090847717, - 7924647710631862693, - 1595589969968983394 + 15192505525596647383, + 7015684183971452334, + 11289275074222101729, + 15044015789923655184 ], [ - 1575322136978699734, - 1714883637605030004, - 1403876268493429570, - 5816075577953274504 + 9328083477760636394, + 9428251331620260633, + 11272001100772856, + 15622689851435689927 ], [ - 1910730620955478970, - 10199274156501303143, - 8240588740333284151, - 7977626984796160665 + 12073756266594964092, + 6962117934383929276, + 8722407149087296616, + 8660375341615685433 ] ] } diff --git a/prover/vk_setup_data_generator_server_fri/src/main.rs b/prover/vk_setup_data_generator_server_fri/src/main.rs index 503a4c322c3d..6d2e1d0712a5 100644 --- a/prover/vk_setup_data_generator_server_fri/src/main.rs +++ b/prover/vk_setup_data_generator_server_fri/src/main.rs @@ -1,19 +1,18 @@ #![feature(generic_const_exprs)] use anyhow::Context as _; -use circuit_definitions::circuit_definitions::recursion_layer::{ - ZkSyncRecursionLayerProof, ZkSyncRecursionLayerVerificationKey, -}; +use circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerVerificationKey; use zkevm_test_harness::compute_setups::{ generate_base_layer_vks_and_proofs, generate_recursive_layer_vks_and_proofs, }; use zkevm_test_harness::data_source::in_memory_data_source::InMemoryDataSource; use zkevm_test_harness::data_source::SetupDataSource; -use zkevm_test_harness::proof_wrapper_utils::{wrap_proof, WrapperConfig}; +use zkevm_test_harness::proof_wrapper_utils::{ + get_wrapper_setup_and_vk_from_scheduler_vk, WrapperConfig, +}; use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerStorageType; use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::aux::BaseLayerCircuitType; use zksync_prover_fri_types::ProverServiceDataKey; use zksync_types::proofs::AggregationRound; -use zksync_vk_setup_data_server_fri::utils::get_scheduler_proof_for_snark_vk_generation; use zksync_vk_setup_data_server_fri::{ get_round_for_recursive_circuit_type, save_base_layer_vk, save_finalization_hints, save_recursive_layer_vk, save_snark_vk, @@ -122,13 +121,12 @@ fn save_finalization_hints_using_source(source: &dyn SetupDataSource) -> anyhow: } fn generate_snark_vk( - proof: ZkSyncRecursionLayerProof, scheduler_vk: ZkSyncRecursionLayerVerificationKey, compression_mode: u8, ) -> anyhow::Result<()> { let config = WrapperConfig::new(compression_mode); - let (_, vk) = wrap_proof(proof, scheduler_vk, config); + let (_, vk) = get_wrapper_setup_and_vk_from_scheduler_vk(scheduler_vk, config); save_snark_vk(vk).context("save_snark_vk") } @@ -143,12 +141,10 @@ fn generate_vks() -> anyhow::Result<()> { save_vks(&in_memory_source).context("save_vks()")?; // Generate snark VK - let proof = get_scheduler_proof_for_snark_vk_generation() - .context("get_scheduler_proof_for_snark_vk_generation")?; let scheduler_vk = in_memory_source .get_recursion_layer_vk(ZkSyncRecursionLayerStorageType::SchedulerCircuit as u8) .map_err(|err| anyhow::anyhow!("Failed to get scheduler vk: {err}"))?; - generate_snark_vk(proof, scheduler_vk, 1).context("generate_snark_vk") + generate_snark_vk(scheduler_vk, 1).context("generate_snark_vk") } fn main() -> anyhow::Result<()> { diff --git a/prover/vk_setup_data_generator_server_fri/src/utils.rs b/prover/vk_setup_data_generator_server_fri/src/utils.rs index a7780edf7cd2..03c0fb4a2108 100644 --- a/prover/vk_setup_data_generator_server_fri/src/utils.rs +++ b/prover/vk_setup_data_generator_server_fri/src/utils.rs @@ -35,7 +35,6 @@ use anyhow::Context as _; use itertools::Itertools; use std::collections::{HashMap, VecDeque}; use std::fs; -use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerProof; use zkevm_test_harness::compute_setups::{ generate_base_layer_vks_and_proofs, generate_recursive_layer_vks_and_proofs, }; @@ -84,13 +83,6 @@ pub fn get_basic_circuits( .collect()) } -pub fn get_scheduler_proof_for_snark_vk_generation() -> anyhow::Result { - let path = format!("{}/scheduler_proof.bin", get_base_path()); - let proof_serialized = std::fs::read(path).context("Failed to read proof from file")?; - bincode::deserialize::(&proof_serialized) - .context("Failed to deserialize proof") -} - pub fn get_leaf_circuits() -> anyhow::Result> { let mut circuits = vec![]; for base_circuit_type in