From 2a7d566ffeb63dc0a038d6b38cbda6bef7c7b105 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Tue, 13 Aug 2024 10:23:23 +0400 Subject: [PATCH] feat: Bump harness & gpu deps (#2634) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ - Bumps harness. It has changes needed to speed up proving. No changes for the sequencer. - Bumps crypto deps. They've been updated to use the modern harness. ## Why ❔ Optimizations & dependency graph improvements. ## Checklist - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. --- Cargo.lock | 28 ++++----- Cargo.toml | 4 +- prover/Cargo.lock | 145 ++++++++++++++-------------------------------- prover/Cargo.toml | 10 ++-- 4 files changed, 64 insertions(+), 123 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce20580b3856..87b85224c54f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1045,14 +1045,14 @@ dependencies = [ [[package]] name = "circuit_encodings" -version = "0.150.2-rc.3" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c928cad0aeeb35e86f8605376fdbb27b506cfcec14af1f532459a47e34d8b6f9" +checksum = "2ba840a74f8d0b8b1334e93e4c87514a27c9be83d42d9f78d0c577572bb5f435" dependencies = [ "derivative", "serde", "zk_evm 0.150.0", - "zkevm_circuits 0.150.2", + "zkevm_circuits 0.150.3", ] [[package]] @@ -1112,12 +1112,12 @@ dependencies = [ [[package]] name = "circuit_sequencer_api" -version = "0.150.2-rc.3" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d8ca58b9bb7c63a75813c96a5a80314fd70013d7929f61fc0e9e69b0e440a7" +checksum = "79f3177b2bcd4ef5da9d2ca6916f6de31fb1973dfece27907a8dc7c69233494d" dependencies = [ "bellman_ce", - "circuit_encodings 0.150.2-rc.3", + "circuit_encodings 0.150.2", "derivative", "rayon", "serde", @@ -7970,9 +7970,9 @@ dependencies = [ [[package]] name = "zkevm_circuits" -version = "0.150.2" +version = "0.150.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d97632ba26e4e6a77a680d6b2bfbcc6f7b9b722976ee31afb922d16a675d45" +checksum = "f2d64bda28dec766324d2e5095a46fb141540d86a232106760dfb20ab4ae6e5c" dependencies = [ "arrayvec 0.7.4", "boojum", @@ -8128,7 +8128,7 @@ dependencies = [ "anyhow", "circuit_sequencer_api 0.140.0", "circuit_sequencer_api 0.141.1", - "circuit_sequencer_api 0.150.2-rc.3", + "circuit_sequencer_api 0.150.2", "futures 0.3.28", "itertools 0.10.5", "num_cpus", @@ -8797,9 +8797,9 @@ dependencies = [ [[package]] name = "zksync_kzg" -version = "0.150.2-rc.3" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9235fbdaa98f27b9aacaa861bcb850b6b0dbf37e59477ce3f08c64555a25d00d" +checksum = "b76d0e08b3e0970565f7a9a611278547f4f1dbd6184a250c8c5e743aed61c525" dependencies = [ "boojum", "derivative", @@ -8809,7 +8809,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "zkevm_circuits 0.150.2", + "zkevm_circuits 0.150.3", ] [[package]] @@ -8921,7 +8921,7 @@ dependencies = [ "circuit_sequencer_api 0.140.0", "circuit_sequencer_api 0.141.1", "circuit_sequencer_api 0.142.0", - "circuit_sequencer_api 0.150.2-rc.3", + "circuit_sequencer_api 0.150.2", "ethabi", "hex", "itertools 0.10.5", @@ -9365,7 +9365,7 @@ version = "0.1.0" dependencies = [ "bincode", "chrono", - "circuit_sequencer_api 0.150.2-rc.3", + "circuit_sequencer_api 0.150.2", "serde", "serde_json", "serde_with", diff --git a/Cargo.toml b/Cargo.toml index 06bd6669b679..22c2f670f147 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -205,9 +205,9 @@ circuit_sequencer_api_1_3_3 = { package = "circuit_sequencer_api", version = "0. circuit_sequencer_api_1_4_0 = { package = "circuit_sequencer_api", version = "0.140" } circuit_sequencer_api_1_4_1 = { package = "circuit_sequencer_api", version = "0.141" } circuit_sequencer_api_1_4_2 = { package = "circuit_sequencer_api", version = "0.142" } -circuit_sequencer_api_1_5_0 = { package = "circuit_sequencer_api", version = "=0.150.2-rc.3" } +circuit_sequencer_api_1_5_0 = { package = "circuit_sequencer_api", version = "=0.150.2" } crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.1.0" } -kzg = { package = "zksync_kzg", version = "=0.150.2-rc.3" } +kzg = { package = "zksync_kzg", version = "=0.150.2" } zk_evm = { version = "=0.133.0" } zk_evm_1_3_1 = { package = "zk_evm", version = "0.131.0-rc.2" } zk_evm_1_3_3 = { package = "zk_evm", version = "0.133.0" } diff --git a/prover/Cargo.lock b/prover/Cargo.lock index e6ef7fd95f83..7d968c189959 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -921,26 +921,11 @@ dependencies = [ [[package]] name = "circuit_definitions" -version = "0.140.1-gpu-wrapper.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54965c22dfd81bca2a8abd53f140c1907304b7aad0fd69679389a96202129003" -dependencies = [ - "crossbeam 0.8.4", - "derivative", - "seq-macro", - "serde", - "snark_wrapper", - "zk_evm 0.140.0", - "zkevm_circuits 0.140.2", -] - -[[package]] -name = "circuit_definitions" -version = "0.150.2-rc.3" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c5da9d10ee04601445afac76591f838b4f64f4f8fb8c3d1b3414a260d51b6c" +checksum = "382960e9ff16705f95157bac88d2b0b556181229019eb57db6c990e3a0fff35f" dependencies = [ - "circuit_encodings 0.150.2-rc.3", + "circuit_encodings 0.150.2", "crossbeam 0.8.4", "derivative", "seq-macro", @@ -986,14 +971,14 @@ dependencies = [ [[package]] name = "circuit_encodings" -version = "0.150.2-rc.3" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c928cad0aeeb35e86f8605376fdbb27b506cfcec14af1f532459a47e34d8b6f9" +checksum = "2ba840a74f8d0b8b1334e93e4c87514a27c9be83d42d9f78d0c577572bb5f435" dependencies = [ "derivative", "serde", "zk_evm 0.150.0", - "zkevm_circuits 0.150.2", + "zkevm_circuits 0.150.3", ] [[package]] @@ -1053,12 +1038,12 @@ dependencies = [ [[package]] name = "circuit_sequencer_api" -version = "0.150.2-rc.3" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d8ca58b9bb7c63a75813c96a5a80314fd70013d7929f61fc0e9e69b0e440a7" +checksum = "79f3177b2bcd4ef5da9d2ca6916f6de31fb1973dfece27907a8dc7c69233494d" dependencies = [ "bellman_ce 0.7.0", - "circuit_encodings 0.150.2-rc.3", + "circuit_encodings 0.150.2", "derivative", "rayon", "serde", @@ -4524,7 +4509,7 @@ dependencies = [ "anyhow", "bincode", "chrono", - "circuit_definitions 0.150.2-rc.3", + "circuit_definitions", "clap 4.5.4", "colored", "dialoguer", @@ -4535,7 +4520,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "zkevm_test_harness 0.150.2-rc.3", + "zkevm_test_harness", "zksync_basic_types", "zksync_config", "zksync_contracts", @@ -5622,15 +5607,15 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shivini" -version = "0.150.2-rc3" +version = "0.150.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110bb1fe4020af4f1be74f467b69bace76a98a3ecedc4c654ed90cc7c6a9aaba" +checksum = "ee96349e7395922586c312936b259cb80b3d0a27f227dc3adee480a79d52a4e6" dependencies = [ "bincode", "blake2 0.10.6", "boojum", "boojum-cuda", - "circuit_definitions 0.150.2-rc.3", + "circuit_definitions", "derivative", "era_cudart", "era_cudart_sys", @@ -6890,7 +6875,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", - "circuit_definitions 0.150.2-rc.3", + "circuit_definitions", "clap 4.5.4", "hex", "indicatif", @@ -6907,7 +6892,7 @@ dependencies = [ "toml_edit 0.14.4", "tracing", "tracing-subscriber", - "zkevm_test_harness 0.150.2-rc.3", + "zkevm_test_harness", "zksync_config", "zksync_env_config", "zksync_prover_fri_types", @@ -7480,26 +7465,6 @@ dependencies = [ "zkevm_opcode_defs 0.150.0", ] -[[package]] -name = "zkevm-assembly" -version = "0.132.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde7992c5cdb4edac74f6bb9cecfd5150f83eb1a7b5b27eb86aceb2b08b8d8de" -dependencies = [ - "env_logger 0.9.3", - "hex", - "lazy_static", - "log", - "nom", - "num-bigint 0.4.5", - "num-traits", - "sha3 0.10.8", - "smallvec", - "structopt", - "thiserror", - "zkevm_opcode_defs 0.132.0", -] - [[package]] name = "zkevm-assembly" version = "0.150.0" @@ -7566,9 +7531,9 @@ dependencies = [ [[package]] name = "zkevm_circuits" -version = "0.150.2" +version = "0.150.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d97632ba26e4e6a77a680d6b2bfbcc6f7b9b722976ee31afb922d16a675d45" +checksum = "f2d64bda28dec766324d2e5095a46fb141540d86a232106760dfb20ab4ae6e5c" dependencies = [ "arrayvec 0.7.4", "boojum", @@ -7645,37 +7610,13 @@ dependencies = [ [[package]] name = "zkevm_test_harness" -version = "0.140.1-gpu-wrapper.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6b9ca7e42aa17d9bda1209faf166f7c999b583a637a0ce8cefaf3e18e381a3" -dependencies = [ - "bincode", - "circuit_definitions 0.140.1-gpu-wrapper.1", - "codegen", - "crossbeam 0.8.4", - "derivative", - "env_logger 0.9.3", - "hex", - "rand 0.4.6", - "rayon", - "serde", - "serde_json", - "smallvec", - "structopt", - "test-log", - "tracing", - "zkevm-assembly 0.132.0", -] - -[[package]] -name = "zkevm_test_harness" -version = "0.150.2-rc.3" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d584283b3a574f76f7854a7edac51ace2e19596aefd72ebd516264415b798c13" +checksum = "be67d84d0ac41145a4daed8333feac0936ade29feda6448f46d80ae80285911d" dependencies = [ "bincode", - "circuit_definitions 0.150.2-rc.3", - "circuit_sequencer_api 0.150.2-rc.3", + "circuit_definitions", + "circuit_sequencer_api 0.150.2", "codegen", "crossbeam 0.8.4", "derivative", @@ -7690,15 +7631,15 @@ dependencies = [ "structopt", "test-log", "tracing", - "zkevm-assembly 0.150.0", + "zkevm-assembly", "zksync_kzg", ] [[package]] name = "zksync-gpu-ffi" -version = "0.140.1-gpu-wrapper.1" +version = "0.150.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5f8b16cc9cafee49f5cdab6d4f13ebf80bdd1c587b6e7d0b9d30c1944e6246" +checksum = "3143200cfbf1dd8e2e14c2bf2a2b89da8fa5628c7192a4739f13269b9707656e" dependencies = [ "bindgen 0.59.2", "crossbeam 0.8.4", @@ -7710,9 +7651,9 @@ dependencies = [ [[package]] name = "zksync-gpu-prover" -version = "0.140.1-gpu-wrapper.1" +version = "0.150.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1d3928ffae19c41263a5efcea810075282c01c996fa5b5c2bf310b8bca6c45" +checksum = "1aeacd406321241ecbcedf9f3025af23511a83e666ecdec2c971935225ea5b98" dependencies = [ "bit-vec", "cfg-if 1.0.0", @@ -7727,12 +7668,12 @@ dependencies = [ [[package]] name = "zksync-wrapper-prover" -version = "0.140.1-gpu-wrapper.1" +version = "0.150.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93d0d66ca7f3b095123a8bf528c3d3353e8d8f2fcc49a889969832b1f149b55" +checksum = "bdf646f359c7275451c218dcf3cd99c06afb0d21da9cc518a1aa5222ee44ee8c" dependencies = [ - "circuit_definitions 0.140.1-gpu-wrapper.1", - "zkevm_test_harness 0.140.1-gpu-wrapper.1", + "circuit_definitions", + "zkevm_test_harness", "zksync-gpu-prover", ] @@ -8016,9 +7957,9 @@ dependencies = [ [[package]] name = "zksync_kzg" -version = "0.150.2-rc.3" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9235fbdaa98f27b9aacaa861bcb850b6b0dbf37e59477ce3f08c64555a25d00d" +checksum = "b76d0e08b3e0970565f7a9a611278547f4f1dbd6184a250c8c5e743aed61c525" dependencies = [ "boojum", "derivative", @@ -8028,7 +7969,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "zkevm_circuits 0.150.2", + "zkevm_circuits 0.150.3", ] [[package]] @@ -8068,7 +8009,7 @@ dependencies = [ "circuit_sequencer_api 0.140.0", "circuit_sequencer_api 0.141.1", "circuit_sequencer_api 0.142.0", - "circuit_sequencer_api 0.150.2-rc.3", + "circuit_sequencer_api 0.150.2", "hex", "itertools 0.10.5", "once_cell", @@ -8141,7 +8082,7 @@ dependencies = [ "anyhow", "async-trait", "bincode", - "circuit_sequencer_api 0.150.2-rc.3", + "circuit_sequencer_api 0.150.2", "clap 4.5.4", "ctrlc", "futures 0.3.30", @@ -8153,7 +8094,7 @@ dependencies = [ "tracing", "vise", "vk_setup_data_generator_server_fri", - "zkevm_test_harness 0.150.2-rc.3", + "zkevm_test_harness", "zksync-wrapper-prover", "zksync_config", "zksync_core_leftovers", @@ -8241,7 +8182,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "circuit_definitions 0.150.2-rc.3", + "circuit_definitions", "clap 4.5.4", "ctrlc", "futures 0.3.30", @@ -8254,7 +8195,7 @@ dependencies = [ "tracing", "vise", "vk_setup_data_generator_server_fri", - "zkevm_test_harness 0.150.2-rc.3", + "zkevm_test_harness", "zksync_config", "zksync_core_leftovers", "zksync_env_config", @@ -8298,7 +8239,7 @@ dependencies = [ name = "zksync_prover_fri_types" version = "0.1.0" dependencies = [ - "circuit_definitions 0.150.2-rc.3", + "circuit_definitions", "serde", "zksync_object_store", "zksync_types", @@ -8327,7 +8268,7 @@ name = "zksync_prover_interface" version = "0.1.0" dependencies = [ "chrono", - "circuit_sequencer_api 0.150.2-rc.3", + "circuit_sequencer_api 0.150.2", "serde", "serde_with", "strum", @@ -8510,7 +8451,7 @@ dependencies = [ "anyhow", "async-trait", "bincode", - "circuit_definitions 0.150.2-rc.3", + "circuit_definitions", "const-decoder", "ctrlc", "futures 0.3.30", @@ -8524,7 +8465,7 @@ dependencies = [ "tracing", "vise", "vk_setup_data_generator_server_fri", - "zkevm_test_harness 0.150.2-rc.3", + "zkevm_test_harness", "zksync_config", "zksync_core_leftovers", "zksync_env_config", diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 7ab6dd16b99b..8e808f63d83c 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -56,13 +56,13 @@ tracing-subscriber = { version = "0.3" } vise = "0.2.0" # Proving dependencies -circuit_definitions = "=0.150.2-rc.3" -circuit_sequencer_api = "=0.150.2-rc.3" -zkevm_test_harness = "=0.150.2-rc.3" +circuit_definitions = "=0.150.2" +circuit_sequencer_api = "=0.150.2" +zkevm_test_harness = "=0.150.2" # GPU proving dependencies -wrapper_prover = { package = "zksync-wrapper-prover", version = "=0.140.1-gpu-wrapper.1" } -shivini = "=0.150.2-rc3" +wrapper_prover = { package = "zksync-wrapper-prover", version = "=0.150.0" } +shivini = "=0.150.3" # Core workspace dependencies zksync_multivm = { path = "../core/lib/multivm", version = "0.1.0" }