diff --git a/Cargo.lock b/Cargo.lock index d5fa605649df..fc0c68a22eb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -722,9 +722,9 @@ dependencies = [ [[package]] name = "boojum" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cf10f4b3980dc82dc31709dfa8193b7d6106a3a7ce9f9a9f8872bfb8719aa2d" +checksum = "df88daa33db46d683967ca09a4f04817c38950483f2501a771d497669a8a4bb1" dependencies = [ "arrayvec 0.7.4", "bincode", @@ -1045,14 +1045,14 @@ dependencies = [ [[package]] name = "circuit_encodings" -version = "0.150.2-rc.2" +version = "0.150.2-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e59747066b9a0d1a15d45f5837658aec5d53744fb643954f9dcc412f76c0d346" +checksum = "c928cad0aeeb35e86f8605376fdbb27b506cfcec14af1f532459a47e34d8b6f9" dependencies = [ "derivative", "serde", "zk_evm 0.150.0", - "zkevm_circuits 0.150.1", + "zkevm_circuits 0.150.2", ] [[package]] @@ -1112,12 +1112,12 @@ dependencies = [ [[package]] name = "circuit_sequencer_api" -version = "0.150.2-rc.2" +version = "0.150.2-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfeb50910b20c4f05cc51700b2396a655cef9e6f0c84debd71cb02ce4853902" +checksum = "18d8ca58b9bb7c63a75813c96a5a80314fd70013d7929f61fc0e9e69b0e440a7" dependencies = [ "bellman_ce", - "circuit_encodings 0.150.2-rc.2", + "circuit_encodings 0.150.2-rc.3", "derivative", "rayon", "serde", @@ -1578,9 +1578,9 @@ dependencies = [ [[package]] name = "cs_derive" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab1f510bfddd1fc643a1d1bf8a405e279ffc818ee7ac86ed658e667a44958178" +checksum = "24cf603ca4299c6e20e644da88897f7b81d688510f4887e818b0bfe0b792081b" dependencies = [ "proc-macro-error", "proc-macro2 1.0.86", @@ -1588,6 +1588,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote 1.0.36", + "syn 2.0.72", +] + [[package]] name = "ctr" version = "0.9.2" @@ -3499,26 +3509,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linkme" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608" -dependencies = [ - "linkme-impl", -] - -[[package]] -name = "linkme-impl" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", -] - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -7238,13 +7228,13 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vise" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229baafe01d5177b63c6ee1def80d8e39a2365e64caf69ddb05a57594b15647c" +checksum = "90ade36f3548b1524396f4de7b36f4f210c8a01dfab568eb2bff466af64eb6e5" dependencies = [ "compile-fmt", + "ctor", "elsa", - "linkme", "once_cell", "prometheus-client", "vise-macros", @@ -7252,9 +7242,9 @@ dependencies = [ [[package]] name = "vise-exporter" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23981b18d697026f5430249ab01ba739ef2edc463e400042394331cb2bb63494" +checksum = "671d3b894d5d0849f0a597f56bf071f42d4f2a1cbcf2f78ca21f870ab7c0cc2b" dependencies = [ "hyper 0.14.29", "once_cell", @@ -7265,9 +7255,9 @@ dependencies = [ [[package]] name = "vise-macros" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb19c33cd5f04dcf4e767635e058a998edbc2b7fca32ade0a4a1cea0f8e9b34" +checksum = "6a511871dc5de990a3b2a0e715facfbc5da848c0c0395597a1415029fb7c250a" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.36", @@ -7957,9 +7947,9 @@ dependencies = [ [[package]] name = "zkevm_circuits" -version = "0.150.1" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a85c1987a1e7e89f1f8c39ca19bffb61521e719050086372aaea8817f403fc" +checksum = "94d97632ba26e4e6a77a680d6b2bfbcc6f7b9b722976ee31afb922d16a675d45" dependencies = [ "arrayvec 0.7.4", "boojum", @@ -8115,7 +8105,7 @@ dependencies = [ "anyhow", "circuit_sequencer_api 0.140.0", "circuit_sequencer_api 0.141.1", - "circuit_sequencer_api 0.150.2-rc.2", + "circuit_sequencer_api 0.150.2-rc.3", "futures 0.3.28", "itertools 0.10.5", "num_cpus", @@ -8142,9 +8132,9 @@ dependencies = [ [[package]] name = "zksync_concurrency" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b83578357184ab72af4d4cb2eca76f85e5f2f35d739a47e3fd5931eb9252d" +checksum = "a9f9a4352244ccd5e5fd34fb0d029861a5f57b05c80fe7944a7b532f54c58f89" dependencies = [ "anyhow", "once_cell", @@ -8177,9 +8167,9 @@ dependencies = [ [[package]] name = "zksync_consensus_bft" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c7f1613bdb9d02b21d66ab60bdf6523456dcc5006290cd67702d3f729f549e" +checksum = "f69309c1c9e2c730b8858af2301cc8762280dab8b838b571524e4d43107aa7ff" dependencies = [ "anyhow", "async-trait", @@ -8199,9 +8189,9 @@ dependencies = [ [[package]] name = "zksync_consensus_crypto" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1abf1f3d9c8109da32a6d5e61a2a64a61b0bff90fdd355992522a4e8a57e69" +checksum = "f8c91270540e8db9479e1eaedaf0e600de468f71ccd5dc7c0258072e743830e6" dependencies = [ "anyhow", "blst", @@ -8223,9 +8213,9 @@ dependencies = [ [[package]] name = "zksync_consensus_executor" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8495b9056a895ee4e720b803d3e26ffad18776ae374805bab34a5ff5b648be6e" +checksum = "a05b45ae9c0bf45f4acc6833dca34907404d1ddd9041a5cd554751c2c5710764" dependencies = [ "anyhow", "async-trait", @@ -8244,9 +8234,9 @@ dependencies = [ [[package]] name = "zksync_consensus_network" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ec4a076c63c76599711a7dc28cdf3a7923b6bc7720bc572ea11e92fb2b526f" +checksum = "477abd01af60faa5afffbff651cbdf9d108bcae4f1326b508bc84063126d34f9" dependencies = [ "anyhow", "async-trait", @@ -8279,9 +8269,9 @@ dependencies = [ [[package]] name = "zksync_consensus_roles" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e0b04d43a542a3bb1af0ac4c0a17acf6b743607c3cb9028192df0c7d2f5b24" +checksum = "87e79025fd678ec2733add1697645827e9daed3f120c8cebf43513ac17e65b63" dependencies = [ "anyhow", "bit-vec", @@ -8301,9 +8291,9 @@ dependencies = [ [[package]] name = "zksync_consensus_storage" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c39f79628bd6685f7ec5561874c007f5d26693d6ba7e5595dfa260981e8f006" +checksum = "470991a42d5f9a3f2385ebe52889e63742d95d141b80b95a1eabe9f51e18cb7e" dependencies = [ "anyhow", "async-trait", @@ -8321,9 +8311,9 @@ dependencies = [ [[package]] name = "zksync_consensus_utils" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4514629a34abdf943ef911c16228dfec656edb02d8412db4febd4df5ccf3f91" +checksum = "6c43283b5813fd887e0e7ccaee73c6e41907b1de311a3a01b2fa5f2e3f2ba503" dependencies = [ "anyhow", "rand 0.8.5", @@ -8767,9 +8757,9 @@ dependencies = [ [[package]] name = "zksync_kzg" -version = "0.150.2-rc.2" +version = "0.150.2-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44edd3a3316dcab45aab7e190c96150f2586d4a92fa21f93dcc20178308313a" +checksum = "9235fbdaa98f27b9aacaa861bcb850b6b0dbf37e59477ce3f08c64555a25d00d" dependencies = [ "boojum", "derivative", @@ -8779,7 +8769,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "zkevm_circuits 0.150.1", + "zkevm_circuits 0.150.2", ] [[package]] @@ -8891,7 +8881,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.2", + "circuit_sequencer_api 0.150.2-rc.3", "ethabi", "hex", "itertools 0.10.5", @@ -9261,9 +9251,9 @@ dependencies = [ [[package]] name = "zksync_protobuf" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53128384270314bfbd4e044c15138af63cb3a505ab95bb3339f3b866ccbe211c" +checksum = "b5db598a518958b244aed5e3f925c763808429a5ea022bb50957b98e68540495" dependencies = [ "anyhow", "bit-vec", @@ -9282,9 +9272,9 @@ dependencies = [ [[package]] name = "zksync_protobuf_build" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d7dfb4dcdd48ab5fa1ccff25f585d73b58cf95e0fb74e96618dd666f198a005" +checksum = "4047ed624c7a19e206125f8259f7e175ad70020beeb66e1975e068af060d2fb5" dependencies = [ "anyhow", "heck 0.5.0", @@ -9332,7 +9322,7 @@ version = "0.1.0" dependencies = [ "bincode", "chrono", - "circuit_sequencer_api 0.150.2-rc.2", + "circuit_sequencer_api 0.150.2-rc.3", "serde", "serde_json", "serde_with", diff --git a/Cargo.toml b/Cargo.toml index 4210911a2596..691ce1c4c3ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -194,8 +194,8 @@ proc-macro2 = "1.0" trybuild = "1.0" # "Internal" dependencies -vise = "0.1.0" -vise-exporter = "0.1.0" +vise = "0.2.0" +vise-exporter = "0.2.0" # Here and below: # We *always* pin the latest version of protocol to disallow accidental changes in the execution logic. @@ -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.2" } +circuit_sequencer_api_1_5_0 = { package = "circuit_sequencer_api", version = "=0.150.2-rc.3" } crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.1.0" } -kzg = { package = "zksync_kzg", version = "=0.150.2-rc.2" } +kzg = { package = "zksync_kzg", version = "=0.150.2-rc.3" } 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" } @@ -216,16 +216,16 @@ zk_evm_1_4_1 = { package = "zk_evm", version = "0.141.0" } zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.0" } # Consensus dependencies. -zksync_concurrency = "=0.1.0-rc.8" -zksync_consensus_bft = "=0.1.0-rc.8" -zksync_consensus_crypto = "=0.1.0-rc.8" -zksync_consensus_executor = "=0.1.0-rc.8" -zksync_consensus_network = "=0.1.0-rc.8" -zksync_consensus_roles = "=0.1.0-rc.8" -zksync_consensus_storage = "=0.1.0-rc.8" -zksync_consensus_utils = "=0.1.0-rc.8" -zksync_protobuf = "=0.1.0-rc.8" -zksync_protobuf_build = "=0.1.0-rc.8" +zksync_concurrency = "=0.1.0-rc.9" +zksync_consensus_bft = "=0.1.0-rc.9" +zksync_consensus_crypto = "=0.1.0-rc.9" +zksync_consensus_executor = "=0.1.0-rc.9" +zksync_consensus_network = "=0.1.0-rc.9" +zksync_consensus_roles = "=0.1.0-rc.9" +zksync_consensus_storage = "=0.1.0-rc.9" +zksync_consensus_utils = "=0.1.0-rc.9" +zksync_protobuf = "=0.1.0-rc.9" +zksync_protobuf_build = "=0.1.0-rc.9" # "Local" dependencies zksync_multivm = { version = "0.1.0", path = "core/lib/multivm" } diff --git a/core/bin/external_node/src/config/mod.rs b/core/bin/external_node/src/config/mod.rs index b0f0fa794fa1..80cfde02e5c6 100644 --- a/core/bin/external_node/src/config/mod.rs +++ b/core/bin/external_node/src/config/mod.rs @@ -223,12 +223,6 @@ impl RemoteENConfig { } } -#[derive(Debug, Deserialize)] -pub(crate) enum BlockFetcher { - ServerAPI, - Consensus, -} - /// This part of the external node config is completely optional to provide. /// It can tweak limits of the API, delay intervals of certain components, etc. /// If any of the fields are not provided, the default values will be used. diff --git a/core/bin/verified_sources_fetcher/src/main.rs b/core/bin/verified_sources_fetcher/src/main.rs index 51ec8e9de7d6..981eebf4a706 100644 --- a/core/bin/verified_sources_fetcher/src/main.rs +++ b/core/bin/verified_sources_fetcher/src/main.rs @@ -52,14 +52,14 @@ async fn main() { file.write_all(content.as_bytes()).unwrap(); } SourceCodeData::StandardJsonInput(input) => { - let sources = input.get(&"sources".to_string()).unwrap().clone(); + let sources = input.get("sources").unwrap().clone(); for (key, val) in sources.as_object().unwrap() { let p = format!("{}/{}", &dir, key); let path = std::path::Path::new(p.as_str()); let prefix = path.parent().unwrap(); std::fs::create_dir_all(prefix).unwrap(); let mut file = std::fs::File::create(path).unwrap(); - let content = val.get(&"content".to_string()).unwrap().as_str().unwrap(); + let content = val.get("content").unwrap().as_str().unwrap(); file.write_all(content.as_bytes()).unwrap(); } } diff --git a/core/lib/basic_types/src/basic_fri_types.rs b/core/lib/basic_types/src/basic_fri_types.rs index a1563ff7e590..9765435f0973 100644 --- a/core/lib/basic_types/src/basic_fri_types.rs +++ b/core/lib/basic_types/src/basic_fri_types.rs @@ -27,6 +27,7 @@ type Eip4844BlobsInner = [Option; MAX_4844_BLOBS_PER_BLOCK]; /// - there are between [1, 16] blobs /// - all blobs are of the same size [`EIP_4844_BLOB_SIZE`] /// - there may be no blobs in case of Validium +/// /// Creating a structure violating these constraints will panic. /// /// Note: blobs are padded to fit the correct size. diff --git a/core/lib/config/src/configs/chain.rs b/core/lib/config/src/configs/chain.rs index 53884c4a7227..6ac70b27b84a 100644 --- a/core/lib/config/src/configs/chain.rs +++ b/core/lib/config/src/configs/chain.rs @@ -30,11 +30,11 @@ impl NetworkConfig { /// An enum that represents the version of the fee model to use. /// - `V1`, the first model that was used in ZKsync Era. In this fee model, the pubdata price must be pegged to the L1 gas price. -/// Also, the fair L2 gas price is expected to only include the proving/computation price for the operator and not the costs that come from -/// processing the batch on L1. +/// Also, the fair L2 gas price is expected to only include the proving/computation price for the operator and not the costs that come from +/// processing the batch on L1. /// - `V2`, the second model that was used in ZKsync Era. There the pubdata price might be independent from the L1 gas price. Also, -/// The fair L2 gas price is expected to both the proving/computation price for the operator and the costs that come from -/// processing the batch on L1. +/// The fair L2 gas price is expected to both the proving/computation price for the operator and the costs that come from +/// processing the batch on L1. #[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq)] pub enum FeeModelVersion { V1, diff --git a/core/lib/crypto_primitives/src/packed_eth_signature.rs b/core/lib/crypto_primitives/src/packed_eth_signature.rs index 7e5efc07bb92..3d76de73560e 100644 --- a/core/lib/crypto_primitives/src/packed_eth_signature.rs +++ b/core/lib/crypto_primitives/src/packed_eth_signature.rs @@ -22,7 +22,7 @@ use crate::{ /// /// That is why: /// 1) when we create this structure by deserialization of message produced by user -/// we subtract 27 from v in `ETHSignature` if necessary and store it in the `ETHSignature` structure this way. +/// we subtract 27 from v in `ETHSignature` if necessary and store it in the `ETHSignature` structure this way. /// 2) When we serialize/create this structure we add 27 to v in `ETHSignature`. /// /// This way when we have methods that consumes &self we can be sure that ETHSignature::recover_signer works diff --git a/core/lib/dal/src/tee_proof_generation_dal.rs b/core/lib/dal/src/tee_proof_generation_dal.rs index 0ddf36abdbed..43e86116092b 100644 --- a/core/lib/dal/src/tee_proof_generation_dal.rs +++ b/core/lib/dal/src/tee_proof_generation_dal.rs @@ -1,6 +1,5 @@ use std::time::Duration; -use strum::{Display, EnumString}; use zksync_db_connection::{ connection::Connection, error::DalResult, @@ -16,18 +15,6 @@ pub struct TeeProofGenerationDal<'a, 'c> { pub(crate) storage: &'a mut Connection<'c, Core>, } -#[derive(Debug, EnumString, Display)] -enum TeeProofGenerationJobStatus { - #[strum(serialize = "ready_to_be_proven")] - ReadyToBeProven, - #[strum(serialize = "picked_by_prover")] - PickedByProver, - #[strum(serialize = "generated")] - Generated, - #[strum(serialize = "skipped")] - Skipped, -} - impl TeeProofGenerationDal<'_, '_> { pub async fn get_next_block_to_be_proven( &mut self, diff --git a/core/lib/dal/src/tee_verifier_input_producer_dal.rs b/core/lib/dal/src/tee_verifier_input_producer_dal.rs index bdf899fa36f8..4adee62e7aa6 100644 --- a/core/lib/dal/src/tee_verifier_input_producer_dal.rs +++ b/core/lib/dal/src/tee_verifier_input_producer_dal.rs @@ -33,7 +33,7 @@ pub enum TeeVerifierInputProducerJobStatus { /// It is expected to be used if some jobs should be skipped like: /// - testing purposes (want to check a specific L1 Batch, I can mark everything before it skipped) /// - trim down costs on some environments (if I've done breaking changes, - /// makes no sense to wait for everything to be processed, I can just skip them and save resources) + /// makes no sense to wait for everything to be processed, I can just skip them and save resources) ManuallySkipped, /// Currently being processed by one of the jobs. Transitory state, will transition to either /// [`TeeVerifierInputProducerStatus::Successful`] or [`TeeVerifierInputProducerStatus::Failed`]. diff --git a/core/lib/merkle_tree/src/recovery/mod.rs b/core/lib/merkle_tree/src/recovery/mod.rs index c208c12795a2..51dc87e16d3e 100644 --- a/core/lib/merkle_tree/src/recovery/mod.rs +++ b/core/lib/merkle_tree/src/recovery/mod.rs @@ -15,11 +15,11 @@ //! Recovery process proceeds as follows: //! //! 1. Initialize a tree in the recovery mode. Until recovery is finished, the tree cannot be accessed -//! using ordinary [`MerkleTree`] APIs. +//! using ordinary [`MerkleTree`] APIs. //! 2. Update the tree from a snapshot, which [is fed to the tree](MerkleTreeRecovery::extend()) -//! as [`RecoveryEntry`] chunks. Recovery entries must be ordered by increasing key. +//! as [`RecoveryEntry`] chunks. Recovery entries must be ordered by increasing key. //! 3. Finalize recovery using [`MerkleTreeRecovery::finalize()`]. To check integrity, you may compare -//! [`MerkleTreeRecovery::root_hash()`] to the reference value. +//! [`MerkleTreeRecovery::root_hash()`] to the reference value. //! //! The recovery process is tolerant to crashes and may be resumed from the middle. To find the latest //! recovered key, you may use [`MerkleTreeRecovery::last_processed_key()`]. diff --git a/core/lib/merkle_tree/src/storage/mod.rs b/core/lib/merkle_tree/src/storage/mod.rs index b70485b93188..dfc99f9be7cb 100644 --- a/core/lib/merkle_tree/src/storage/mod.rs +++ b/core/lib/merkle_tree/src/storage/mod.rs @@ -118,13 +118,13 @@ impl TreeUpdater { /// /// 1. Walk from the root of the tree along the inserted `key` while we can. /// 2. If the node we've stopped at is an internal node, it means it doesn't have - /// a child at the corresponding nibble from `key`. Create a new leaf node with `key` and - /// `value_hash` and insert it as a new child of the found internal node. + /// a child at the corresponding nibble from `key`. Create a new leaf node with `key` and + /// `value_hash` and insert it as a new child of the found internal node. /// 3. Else the node we've stopped is a leaf. If the full key stored in this leaf is `key`, - /// we just need to update `value_hash` stored in the leaf. + /// we just need to update `value_hash` stored in the leaf. /// 4. Else (the node we've stopped is a leaf with `other_key != key`) we need to create - /// one or more internal nodes that would contain the common prefix between `key` - /// and `other_key` and a "fork" where these keys differ. + /// one or more internal nodes that would contain the common prefix between `key` + /// and `other_key` and a "fork" where these keys differ. /// /// We change step 1 by starting not from the root, but rather from the node ancestor /// we've found in [`Self::load_ancestors()`] for a (moderate) performance boost. Note that diff --git a/core/lib/multivm/src/glue/tracers/mod.rs b/core/lib/multivm/src/glue/tracers/mod.rs index 8a138d9461fd..7aa792ef1f71 100644 --- a/core/lib/multivm/src/glue/tracers/mod.rs +++ b/core/lib/multivm/src/glue/tracers/mod.rs @@ -8,16 +8,16 @@ //! this module defines one primary trait: //! //! - `MultiVMTracer`: This trait represents a tracer that can be converted into a tracer for -//! a specific VM version. +//! a specific VM version. //! //! Specific traits for each VM version, which support Custom Tracers: //! - `IntoLatestTracer`: This trait is responsible for converting a tracer -//! into a form compatible with the latest VM version. -//! It defines a method `latest` for obtaining a boxed tracer. +//! into a form compatible with the latest VM version. +//! It defines a method `latest` for obtaining a boxed tracer. //! //! - `IntoVmVirtualBlocksTracer`: This trait is responsible for converting a tracer -//! into a form compatible with the vm_virtual_blocks version. -//! It defines a method `vm_virtual_blocks` for obtaining a boxed tracer. +//! into a form compatible with the vm_virtual_blocks version. +//! It defines a method `vm_virtual_blocks` for obtaining a boxed tracer. //! //! For `MultiVMTracer` to be implemented, the Tracer must implement all N currently //! existing sub-traits. diff --git a/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs b/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs index 22503ce9881c..075660ad58aa 100644 --- a/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs +++ b/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs @@ -37,9 +37,9 @@ use crate::{ /// We employ the following rules for cold/warm storage rules: /// - We price a single "I/O" access as 2k ergs. This means that reading a single storage slot -/// would cost 2k ergs, while writing to it would 4k ergs (since it involves both reading during execution and writing at the end of it). +/// would cost 2k ergs, while writing to it would 4k ergs (since it involves both reading during execution and writing at the end of it). /// - Thereafter, "warm" reads cost 30 ergs, while "warm" writes cost 60 ergs. Warm writes to account cost more for the fact that they may be reverted -/// and so require more RAM to store them. +/// and so require more RAM to store them. const WARM_READ_REFUND: u32 = STORAGE_ACCESS_COLD_READ_COST - STORAGE_ACCESS_WARM_READ_COST; const WARM_WRITE_REFUND: u32 = STORAGE_ACCESS_COLD_WRITE_COST - STORAGE_ACCESS_WARM_WRITE_COST; diff --git a/core/lib/types/src/fee_model.rs b/core/lib/types/src/fee_model.rs index 6f5985d46108..b59aa65b04e0 100644 --- a/core/lib/types/src/fee_model.rs +++ b/core/lib/types/src/fee_model.rs @@ -9,9 +9,10 @@ use crate::ProtocolVersionId; /// Fee input to be provided into the VM. It contains two options: /// - `L1Pegged`: L1 gas price is provided to the VM, and the pubdata price is derived from it. Using this option is required for the -/// versions of Era prior to 1.4.1 integration. +/// versions of Era prior to 1.4.1 integration. /// - `PubdataIndependent`: L1 gas price and pubdata price are not necessarily dependent on one another. This options is more suitable for the -/// versions of Era after the 1.4.1 integration. It is expected that if a VM supports `PubdataIndependent` version, then it should also support `L1Pegged` version, but converting it into `PubdataIndependentBatchFeeModelInput` in-place. +/// versions of Era after the 1.4.1 integration. It is expected that if a VM supports `PubdataIndependent` version, then it should also support +/// `L1Pegged` version, but converting it into `PubdataIndependentBatchFeeModelInput` in-place. #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] pub enum BatchFeeInput { L1Pegged(L1PeggedBatchFeeModelInput), @@ -161,11 +162,11 @@ pub struct PubdataIndependentBatchFeeModelInput { /// The enum which represents the version of the fee model. It is used to determine which fee model should be used for the batch. /// - `V1`, the first model that was used in ZKsync Era. In this fee model, the pubdata price must be pegged to the L1 gas price. -/// Also, the fair L2 gas price is expected to only include the proving/computation price for the operator and not the costs that come from -/// processing the batch on L1. +/// Also, the fair L2 gas price is expected to only include the proving/computation price for the operator and not the costs that come from +/// processing the batch on L1. /// - `V2`, the second model that was used in ZKsync Era. There the pubdata price might be independent from the L1 gas price. Also, -/// The fair L2 gas price is expected to both the proving/computation price for the operator and the costs that come from -/// processing the batch on L1. +/// The fair L2 gas price is expected to both the proving/computation price for the operator and the costs that come from +/// processing the batch on L1. #[derive(Debug, Clone, Copy, Serialize, Deserialize)] pub enum FeeModelConfig { V1(FeeModelConfigV1), diff --git a/core/lib/types/src/storage/writes/mod.rs b/core/lib/types/src/storage/writes/mod.rs index ef19eeffed02..88f032db1924 100644 --- a/core/lib/types/src/storage/writes/mod.rs +++ b/core/lib/types/src/storage/writes/mod.rs @@ -122,10 +122,11 @@ impl StateDiffRecord { /// entry <- enumeration_index || compressed value /// 2. if initial write: /// entry <- blake2(bytes32(address), key) || compressed value + /// /// size: - /// initial: max of 65 bytes - /// repeated: max of 38 bytes - /// before: 156 bytes for each + /// - initial: max of 65 bytes + /// - repeated: max of 38 bytes + /// - before: 156 bytes for each pub fn compress(&self) -> Vec { let mut comp_state_diff = match self.enumeration_index { 0 => self.derived_key.to_vec(), diff --git a/core/lib/vlog/src/logs/mod.rs b/core/lib/vlog/src/logs/mod.rs index 0ecf1c6d9f0b..2379119ddffc 100644 --- a/core/lib/vlog/src/logs/mod.rs +++ b/core/lib/vlog/src/logs/mod.rs @@ -1,4 +1,4 @@ -use std::{backtrace::Backtrace, panic::PanicInfo, str::FromStr}; +use std::{backtrace::Backtrace, str::FromStr}; use serde::Deserialize; use tracing_subscriber::{fmt, registry::LookupSpan, EnvFilter, Layer}; @@ -129,7 +129,8 @@ impl Logs { } } -fn json_panic_handler(panic_info: &PanicInfo) { +#[allow(deprecated)] // Not available yet on stable, so we can't switch right now. +fn json_panic_handler(panic_info: &std::panic::PanicInfo) { let backtrace = Backtrace::force_capture(); let timestamp = chrono::Utc::now(); let panic_message = if let Some(s) = panic_info.payload().downcast_ref::() { diff --git a/core/node/api_server/src/tx_sender/master_pool_sink.rs b/core/node/api_server/src/tx_sender/master_pool_sink.rs index b7478b9c9711..cb4e73e3bb79 100644 --- a/core/node/api_server/src/tx_sender/master_pool_sink.rs +++ b/core/node/api_server/src/tx_sender/master_pool_sink.rs @@ -56,9 +56,8 @@ impl TxSink for MasterPoolSink { .transactions_dal() .insert_transaction_l2(tx, execution_metrics) .await - .map(|submission_res_handle| { - APP_METRICS.processed_txs[&TxStage::Mempool(submission_res_handle)].inc(); - submission_res_handle + .inspect(|submission_res_handle| { + APP_METRICS.processed_txs[&TxStage::Mempool(*submission_res_handle)].inc(); }) .map_err(|err| err.generalize().into()), Err(err) => Err(err.generalize().into()), diff --git a/core/node/vm_runner/src/storage.rs b/core/node/vm_runner/src/storage.rs index 75ed4cb57a9c..1c83b6525c7b 100644 --- a/core/node/vm_runner/src/storage.rs +++ b/core/node/vm_runner/src/storage.rs @@ -57,8 +57,8 @@ struct BatchData { /// Abstraction for VM runner's storage layer that provides two main features: /// /// 1. A [`ReadStorageFactory`] implementation backed by either Postgres or RocksDB (if it's -/// caught up). Always initialized as a `Postgres` variant and is then mutated into `Rocksdb` -/// once RocksDB cache is caught up. +/// caught up). Always initialized as a `Postgres` variant and is then mutated into `Rocksdb` +/// once RocksDB cache is caught up. /// 2. Loads data needed to re-execute the next unprocessed L1 batch. /// /// Users of `VmRunnerStorage` are not supposed to retain storage access to batches that are less diff --git a/docker/build-base/Dockerfile b/docker/build-base/Dockerfile index 68ea7ce001c7..be3c6ddb452e 100644 --- a/docker/build-base/Dockerfile +++ b/docker/build-base/Dockerfile @@ -9,7 +9,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ PATH=/usr/local/cargo/bin:$PATH RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \ - rustup install nightly-2024-05-07 && \ - rustup default nightly-2024-05-07 + rustup install nightly-2024-08-01 && \ + rustup default nightly-2024-08-01 RUN cargo install sqlx-cli --version 0.8.0 diff --git a/docker/proof-fri-gpu-compressor/Dockerfile b/docker/proof-fri-gpu-compressor/Dockerfile index e6d2e0f11627..02ca4a3b77b0 100644 --- a/docker/proof-fri-gpu-compressor/Dockerfile +++ b/docker/proof-fri-gpu-compressor/Dockerfile @@ -15,8 +15,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \ PATH=/usr/local/cargo/bin:$PATH RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \ - rustup install nightly-2024-05-07 && \ - rustup default nightly-2024-05-07 + rustup install nightly-2024-08-01 && \ + rustup default nightly-2024-08-01 RUN curl -Lo cmake-3.24.2-linux-x86_64.sh https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \ chmod +x cmake-3.24.2-linux-x86_64.sh && \ diff --git a/docker/prover-gpu-fri/Dockerfile b/docker/prover-gpu-fri/Dockerfile index 0894c1c0c47d..1f1aaa447f22 100644 --- a/docker/prover-gpu-fri/Dockerfile +++ b/docker/prover-gpu-fri/Dockerfile @@ -14,8 +14,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \ PATH=/usr/local/cargo/bin:$PATH RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \ - rustup install nightly-2024-05-07 && \ - rustup default nightly-2024-05-07 + rustup install nightly-2024-08-01 && \ + rustup default nightly-2024-08-01 RUN curl -Lo cmake-3.24.2-linux-x86_64.sh https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \ chmod +x cmake-3.24.2-linux-x86_64.sh && \ diff --git a/docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile b/docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile index 645111a4f0a6..0c0fd7a9bb3d 100644 --- a/docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile +++ b/docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile @@ -78,7 +78,7 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/so gcloud config set metrics/environment github_docker_image RUN wget -c -O - https://sh.rustup.rs | bash -s -- -y -RUN rustup install nightly-2024-05-07 +RUN rustup install nightly-2024-08-01 RUN rustup default stable RUN cargo install --version=0.8.0 sqlx-cli RUN cargo install cargo-nextest diff --git a/docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile b/docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile index c7af93ce906a..5bd569b7d20b 100644 --- a/docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile +++ b/docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile @@ -76,7 +76,7 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/so gcloud config set metrics/environment github_docker_image RUN wget -c -O - https://sh.rustup.rs | bash -s -- -y -RUN rustup install nightly-2024-05-07 +RUN rustup install nightly-2024-08-01 RUN rustup default stable RUN cargo install --version=0.8.0 sqlx-cli RUN cargo install cargo-nextest diff --git a/docker/zk-environment/Dockerfile b/docker/zk-environment/Dockerfile index 9dc7aa1a13b4..db9fb0ce5971 100644 --- a/docker/zk-environment/Dockerfile +++ b/docker/zk-environment/Dockerfile @@ -142,5 +142,5 @@ ENV RUSTC_WRAPPER=/usr/local/cargo/bin/sccache FROM rust-lightweight as rust-lightweight-nightly -RUN rustup install nightly-2024-05-07 && \ - rustup default nightly-2024-05-07 +RUN rustup install nightly-2024-08-01 && \ + rustup default nightly-2024-08-01 diff --git a/flake.lock b/flake.lock index fe16e2254b51..e217d37664cd 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1720226507, - "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719956923, - "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=", + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "706eef542dec88cc0ed25b9075d3037564b2d164", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", "type": "github" }, "original": { @@ -341,11 +341,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1719923509, - "narHash": "sha256-3buuJSKCVT0o42jpreoflYA+Rlp/4eQKATEAY+pPeh8=", + "lastModified": 1721741092, + "narHash": "sha256-ghFoP5gZpc1i4I4PiVCH00QNZ6s6ipGUcA0P1TsSSC8=", "owner": "matter-labs", "repo": "nixsgx", - "rev": "520ad6227523c5720468726f9e945cecdb7a37aa", + "rev": "be2c19592d0d5601184c52c07ab6d88dec07ffd6", "type": "github" }, "original": { @@ -407,11 +407,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1720059535, - "narHash": "sha256-h/O3PoV3KvQG4tC5UpANBZOsptAZCzEGiwyi+3oSpYc=", + "lastModified": 1722997267, + "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8deeed2dfa21837c7792b46b6a9b2e73f97b472b", + "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", "type": "github" }, "original": { @@ -623,11 +623,11 @@ "vault-auth-tee-flake": "vault-auth-tee-flake" }, "locked": { - "lastModified": 1720011517, - "narHash": "sha256-1oo9Z47CNdqDgtGNE1LC+6CQ+VXcy7TtFFnvifBnVLE=", + "lastModified": 1723034739, + "narHash": "sha256-bu4XvqwsPUzfMzk5t10wyHliItfH7FOk42V0CIwl4lg=", "owner": "matter-labs", "repo": "teepot", - "rev": "8dadc1f76b7dd8a98be7781e8206fed5268dd0e6", + "rev": "4ed311a16a72521f79418216ad29e6eed8db347d", "type": "github" }, "original": { diff --git a/prover/Cargo.lock b/prover/Cargo.lock index a88155be9024..a7400fc2490e 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -524,7 +524,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -567,9 +567,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -698,9 +698,9 @@ dependencies = [ [[package]] name = "boojum" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cf10f4b3980dc82dc31709dfa8193b7d6106a3a7ce9f9a9f8872bfb8719aa2d" +checksum = "df88daa33db46d683967ca09a4f04817c38950483f2501a771d497669a8a4bb1" dependencies = [ "arrayvec 0.7.4", "bincode", @@ -730,9 +730,9 @@ dependencies = [ [[package]] name = "boojum-cuda" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf1cadeaf29fa0f076c230a08f57932619b2ba46a1977c72bb42160574400f54" +checksum = "407123a79308091866f0199d510ee2fb930727204dd77d6805b3437d6cb859eb" dependencies = [ "boojum", "cmake", @@ -921,9 +921,9 @@ dependencies = [ [[package]] name = "circuit_definitions" -version = "0.140.0-gpu-wrapper.1" +version = "0.140.1-gpu-wrapper.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f38b36c1cbc5e53bb016eebbaa0740f939bec9154100e9e31d28035faed202" +checksum = "54965c22dfd81bca2a8abd53f140c1907304b7aad0fd69679389a96202129003" dependencies = [ "crossbeam 0.8.4", "derivative", @@ -931,16 +931,16 @@ dependencies = [ "serde", "snark_wrapper", "zk_evm 0.140.0", - "zkevm_circuits 0.140.1", + "zkevm_circuits 0.140.2", ] [[package]] name = "circuit_definitions" -version = "0.150.2-rc.2" +version = "0.150.2-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98221101f42cceafa9baf8ec320ef78aa02bf7c2be5c398bf90e7acf1709bfa" +checksum = "68c5da9d10ee04601445afac76591f838b4f64f4f8fb8c3d1b3414a260d51b6c" dependencies = [ - "circuit_encodings 0.150.2-rc.2", + "circuit_encodings 0.150.2-rc.3", "crossbeam 0.8.4", "derivative", "seq-macro", @@ -957,7 +957,7 @@ dependencies = [ "derivative", "serde", "zk_evm 0.140.0", - "zkevm_circuits 0.140.1", + "zkevm_circuits 0.140.2", ] [[package]] @@ -986,14 +986,14 @@ dependencies = [ [[package]] name = "circuit_encodings" -version = "0.150.2-rc.2" +version = "0.150.2-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e59747066b9a0d1a15d45f5837658aec5d53744fb643954f9dcc412f76c0d346" +checksum = "c928cad0aeeb35e86f8605376fdbb27b506cfcec14af1f532459a47e34d8b6f9" dependencies = [ "derivative", "serde", "zk_evm 0.150.0", - "zkevm_circuits 0.150.1", + "zkevm_circuits 0.150.2", ] [[package]] @@ -1053,12 +1053,12 @@ dependencies = [ [[package]] name = "circuit_sequencer_api" -version = "0.150.2-rc.2" +version = "0.150.2-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfeb50910b20c4f05cc51700b2396a655cef9e6f0c84debd71cb02ce4853902" +checksum = "18d8ca58b9bb7c63a75813c96a5a80314fd70013d7929f61fc0e9e69b0e440a7" dependencies = [ "bellman_ce 0.7.0", - "circuit_encodings 0.150.2-rc.2", + "circuit_encodings 0.150.2-rc.3", "derivative", "rayon", "serde", @@ -1478,9 +1478,9 @@ dependencies = [ [[package]] name = "cs_derive" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab1f510bfddd1fc643a1d1bf8a405e279ffc818ee7ac86ed658e667a44958178" +checksum = "24cf603ca4299c6e20e644da88897f7b81d688510f4887e818b0bfe0b792081b" dependencies = [ "proc-macro-error", "proc-macro2 1.0.85", @@ -1488,6 +1488,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote 1.0.36", + "syn 2.0.66", +] + [[package]] name = "ctrlc" version = "3.4.4" @@ -1873,22 +1883,21 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "era_cudart" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1725b17e5e41b89f566ace3900f119fdc87f04e2daa8e253b668573ad67a454f" +checksum = "6592e1277ac1ab0f3925151784a3809f4f973b1a63a0244b6d44e3872b413199" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "era_cudart_sys", "paste", ] [[package]] name = "era_cudart_sys" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d46683f8a9a5364874f95b00073f6dc93d33e9a019f150b0d6ce09ffc13251" +checksum = "21767c452b418a7fb2bb9ffb07c744e4616da8d14176db4dcab76649c3206ece" dependencies = [ - "bindgen 0.69.4", "serde_json", ] @@ -2126,9 +2135,9 @@ dependencies = [ [[package]] name = "franklin-crypto" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35c05c35290529cf4704bf667777bda5d1b757d63445591cd19163ee0909df8" +checksum = "05eab544ba915269919b5f158a061b540a4e3a04150c1346481f4f7b80eb6311" dependencies = [ "arr_macro", "bellman_ce 0.8.0", @@ -3317,26 +3326,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linkme" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5" -dependencies = [ - "linkme-impl", -] - -[[package]] -name = "linkme-impl" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda" -dependencies = [ - "proc-macro2 1.0.85", - "quote 1.0.36", - "syn 2.0.66", -] - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -3611,7 +3600,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "cfg_aliases", "libc", @@ -3860,7 +3849,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4369,7 +4358,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand 0.8.5", @@ -4507,7 +4496,7 @@ dependencies = [ "anyhow", "bincode", "chrono", - "circuit_definitions 0.150.2-rc.2", + "circuit_definitions 0.150.2-rc.3", "clap 4.5.4", "colored", "dialoguer", @@ -4518,7 +4507,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "zkevm_test_harness 0.150.2-rc.2", + "zkevm_test_harness 0.150.2-rc.3", "zksync_basic_types", "zksync_config", "zksync_contracts", @@ -4566,7 +4555,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "unicase", ] @@ -4721,14 +4710,14 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -4881,9 +4870,9 @@ dependencies = [ [[package]] name = "rescue_poseidon" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf8f3aca783485c92639215977a2219cf25ba26836d088d75a088e7cba842bf" +checksum = "f27fbc6ba44baf99a0ca8387b1fa1cf90d3d7062860c1afedbbb64454829acc5" dependencies = [ "addchain", "arrayvec 0.7.4", @@ -5058,7 +5047,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5273,7 +5262,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -5605,15 +5594,15 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shivini" -version = "0.150.2-rc.2" +version = "0.150.2-rc3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c35f41f876fc986d18e02d97a20a6980ca108c28f77cc844406d1c9c1f6ed9" +checksum = "110bb1fe4020af4f1be74f467b69bace76a98a3ecedc4c654ed90cc7c6a9aaba" dependencies = [ "bincode", "blake2 0.10.6", "boojum", "boojum-cuda", - "circuit_definitions 0.150.2-rc.2", + "circuit_definitions 0.150.2-rc.3", "derivative", "era_cudart", "era_cudart_sys", @@ -5712,9 +5701,9 @@ dependencies = [ [[package]] name = "snark_wrapper" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7dd2b167b67a0ec5b2727519bf7c03fcbd43edaa3ebf05a6013fb6fbfed20f6" +checksum = "71aa5bffe5e7daca634bf2fedf0bf566273cb7eae01711d1aa6e5223d36d987d" dependencies = [ "derivative", "rand 0.4.6", @@ -5897,7 +5886,7 @@ dependencies = [ "atoi", "base64 0.22.1", "bigdecimal", - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "bytes", "chrono", @@ -5942,7 +5931,7 @@ dependencies = [ "atoi", "base64 0.22.1", "bigdecimal", - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "chrono", "crc", @@ -6831,13 +6820,13 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vise" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229baafe01d5177b63c6ee1def80d8e39a2365e64caf69ddb05a57594b15647c" +checksum = "90ade36f3548b1524396f4de7b36f4f210c8a01dfab568eb2bff466af64eb6e5" dependencies = [ "compile-fmt", + "ctor", "elsa", - "linkme", "once_cell", "prometheus-client", "vise-macros", @@ -6845,9 +6834,9 @@ dependencies = [ [[package]] name = "vise-exporter" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23981b18d697026f5430249ab01ba739ef2edc463e400042394331cb2bb63494" +checksum = "671d3b894d5d0849f0a597f56bf071f42d4f2a1cbcf2f78ca21f870ab7c0cc2b" dependencies = [ "hyper 0.14.29", "once_cell", @@ -6858,9 +6847,9 @@ dependencies = [ [[package]] name = "vise-macros" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb19c33cd5f04dcf4e767635e058a998edbc2b7fca32ade0a4a1cea0f8e9b34" +checksum = "6a511871dc5de990a3b2a0e715facfbc5da848c0c0395597a1415029fb7c250a" dependencies = [ "proc-macro2 1.0.85", "quote 1.0.36", @@ -6873,7 +6862,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", - "circuit_definitions 0.150.2-rc.2", + "circuit_definitions 0.150.2-rc.3", "clap 4.5.4", "hex", "indicatif", @@ -6890,7 +6879,7 @@ dependencies = [ "toml_edit 0.14.4", "tracing", "tracing-subscriber", - "zkevm_test_harness 0.150.2-rc.2", + "zkevm_test_harness 0.150.2-rc.3", "zksync_config", "zksync_env_config", "zksync_prover_fri_types", @@ -7488,9 +7477,9 @@ dependencies = [ [[package]] name = "zkevm_circuits" -version = "0.140.1" +version = "0.140.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806caf4ccbe34ac68193f7d0dd591d1d866d95a740fe45a358eaefd61c357d8e" +checksum = "8beed4cc1ab1f9d99a694506d18705e10059534b30742832be49637c4775e1f8" dependencies = [ "arrayvec 0.7.4", "bincode", @@ -7532,9 +7521,9 @@ dependencies = [ [[package]] name = "zkevm_circuits" -version = "0.150.1" +version = "0.150.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a85c1987a1e7e89f1f8c39ca19bffb61521e719050086372aaea8817f403fc" +checksum = "94d97632ba26e4e6a77a680d6b2bfbcc6f7b9b722976ee31afb922d16a675d45" dependencies = [ "arrayvec 0.7.4", "boojum", @@ -7568,7 +7557,7 @@ version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0769f7b27d8fb06e715da3290c575cac5d04d10a557faef180e847afce50ac4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "blake2 0.10.6", "ethereum-types", "k256 0.11.6", @@ -7583,7 +7572,7 @@ version = "0.141.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6be7bd5f0e0b61211f544147289640b4712715589d7f2fe5229d92a7a3ac64c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "blake2 0.10.6", "ethereum-types", "k256 0.13.3", @@ -7598,7 +7587,7 @@ version = "0.150.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3328c012d444bdbfadb754a72c01a56879eb66584efc71eac457e89e7843608" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "blake2 0.10.6", "ethereum-types", "k256 0.13.3", @@ -7611,12 +7600,12 @@ dependencies = [ [[package]] name = "zkevm_test_harness" -version = "0.140.0-gpu-wrapper.1" +version = "0.140.1-gpu-wrapper.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dbcf39f7cdd57174c572f227ae46513d2111faed7dc754e300465200e9b791a" +checksum = "bb6b9ca7e42aa17d9bda1209faf166f7c999b583a637a0ce8cefaf3e18e381a3" dependencies = [ "bincode", - "circuit_definitions 0.140.0-gpu-wrapper.1", + "circuit_definitions 0.140.1-gpu-wrapper.1", "codegen", "crossbeam 0.8.4", "derivative", @@ -7635,13 +7624,13 @@ dependencies = [ [[package]] name = "zkevm_test_harness" -version = "0.150.2-rc.2" +version = "0.150.2-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2ca25fe64b0dee537ba226983a1f8ca7f8bd4ce82e5d58eb4522252fbe40a6" +checksum = "d584283b3a574f76f7854a7edac51ace2e19596aefd72ebd516264415b798c13" dependencies = [ "bincode", - "circuit_definitions 0.150.2-rc.2", - "circuit_sequencer_api 0.150.2-rc.2", + "circuit_definitions 0.150.2-rc.3", + "circuit_sequencer_api 0.150.2-rc.3", "codegen", "crossbeam 0.8.4", "derivative", @@ -7662,9 +7651,9 @@ dependencies = [ [[package]] name = "zksync-gpu-ffi" -version = "0.140.0-gpu-wrapper.1" +version = "0.140.1-gpu-wrapper.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cebf6d2f7102b2b4f3bf14d6dfd8c520f95621b180bc4bbfd07ee53093336205" +checksum = "5b5f8b16cc9cafee49f5cdab6d4f13ebf80bdd1c587b6e7d0b9d30c1944e6246" dependencies = [ "bindgen 0.59.2", "crossbeam 0.8.4", @@ -7676,9 +7665,9 @@ dependencies = [ [[package]] name = "zksync-gpu-prover" -version = "0.140.0-gpu-wrapper.1" +version = "0.140.1-gpu-wrapper.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502acf81d04b5fad616e01ff7c913285da21ce88d17cd1a083a0d3f25cc27b27" +checksum = "2a1d3928ffae19c41263a5efcea810075282c01c996fa5b5c2bf310b8bca6c45" dependencies = [ "bit-vec", "cfg-if 1.0.0", @@ -7693,12 +7682,12 @@ dependencies = [ [[package]] name = "zksync-wrapper-prover" -version = "0.140.0-gpu-wrapper.1" +version = "0.140.1-gpu-wrapper.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99746d1164f60d788f9701b7146ad2878c92f1ffd463ea5b6d72f9979ac464b7" +checksum = "a93d0d66ca7f3b095123a8bf528c3d3353e8d8f2fcc49a889969832b1f149b55" dependencies = [ - "circuit_definitions 0.140.0-gpu-wrapper.1", - "zkevm_test_harness 0.140.0-gpu-wrapper.1", + "circuit_definitions 0.140.1-gpu-wrapper.1", + "zkevm_test_harness 0.140.1-gpu-wrapper.1", "zksync-gpu-prover", ] @@ -7722,9 +7711,9 @@ dependencies = [ [[package]] name = "zksync_concurrency" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b83578357184ab72af4d4cb2eca76f85e5f2f35d739a47e3fd5931eb9252d" +checksum = "a9f9a4352244ccd5e5fd34fb0d029861a5f57b05c80fe7944a7b532f54c58f89" dependencies = [ "anyhow", "once_cell", @@ -7757,9 +7746,9 @@ dependencies = [ [[package]] name = "zksync_consensus_crypto" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1abf1f3d9c8109da32a6d5e61a2a64a61b0bff90fdd355992522a4e8a57e69" +checksum = "f8c91270540e8db9479e1eaedaf0e600de468f71ccd5dc7c0258072e743830e6" dependencies = [ "anyhow", "blst", @@ -7781,9 +7770,9 @@ dependencies = [ [[package]] name = "zksync_consensus_roles" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e0b04d43a542a3bb1af0ac4c0a17acf6b743607c3cb9028192df0c7d2f5b24" +checksum = "87e79025fd678ec2733add1697645827e9daed3f120c8cebf43513ac17e65b63" dependencies = [ "anyhow", "bit-vec", @@ -7803,9 +7792,9 @@ dependencies = [ [[package]] name = "zksync_consensus_storage" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c39f79628bd6685f7ec5561874c007f5d26693d6ba7e5595dfa260981e8f006" +checksum = "470991a42d5f9a3f2385ebe52889e63742d95d141b80b95a1eabe9f51e18cb7e" dependencies = [ "anyhow", "async-trait", @@ -7823,9 +7812,9 @@ dependencies = [ [[package]] name = "zksync_consensus_utils" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4514629a34abdf943ef911c16228dfec656edb02d8412db4febd4df5ccf3f91" +checksum = "6c43283b5813fd887e0e7ccaee73c6e41907b1de311a3a01b2fa5f2e3f2ba503" dependencies = [ "anyhow", "rand 0.8.5", @@ -7981,9 +7970,9 @@ dependencies = [ [[package]] name = "zksync_kzg" -version = "0.150.2-rc.2" +version = "0.150.2-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44edd3a3316dcab45aab7e190c96150f2586d4a92fa21f93dcc20178308313a" +checksum = "9235fbdaa98f27b9aacaa861bcb850b6b0dbf37e59477ce3f08c64555a25d00d" dependencies = [ "boojum", "derivative", @@ -7993,7 +7982,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "zkevm_circuits 0.150.1", + "zkevm_circuits 0.150.2", ] [[package]] @@ -8033,7 +8022,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.2", + "circuit_sequencer_api 0.150.2-rc.3", "hex", "itertools 0.10.5", "once_cell", @@ -8104,7 +8093,7 @@ dependencies = [ "anyhow", "async-trait", "bincode", - "circuit_sequencer_api 0.150.2-rc.2", + "circuit_sequencer_api 0.150.2-rc.3", "clap 4.5.4", "ctrlc", "futures 0.3.30", @@ -8116,7 +8105,7 @@ dependencies = [ "tracing", "vise", "vk_setup_data_generator_server_fri", - "zkevm_test_harness 0.150.2-rc.2", + "zkevm_test_harness 0.150.2-rc.3", "zksync-wrapper-prover", "zksync_config", "zksync_core_leftovers", @@ -8133,9 +8122,9 @@ dependencies = [ [[package]] name = "zksync_protobuf" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53128384270314bfbd4e044c15138af63cb3a505ab95bb3339f3b866ccbe211c" +checksum = "b5db598a518958b244aed5e3f925c763808429a5ea022bb50957b98e68540495" dependencies = [ "anyhow", "bit-vec", @@ -8154,9 +8143,9 @@ dependencies = [ [[package]] name = "zksync_protobuf_build" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d7dfb4dcdd48ab5fa1ccff25f585d73b58cf95e0fb74e96618dd666f198a005" +checksum = "4047ed624c7a19e206125f8259f7e175ad70020beeb66e1975e068af060d2fb5" dependencies = [ "anyhow", "heck 0.5.0", @@ -8204,7 +8193,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "circuit_definitions 0.150.2-rc.2", + "circuit_definitions 0.150.2-rc.3", "clap 4.5.4", "ctrlc", "futures 0.3.30", @@ -8217,7 +8206,7 @@ dependencies = [ "tracing", "vise", "vk_setup_data_generator_server_fri", - "zkevm_test_harness 0.150.2-rc.2", + "zkevm_test_harness 0.150.2-rc.3", "zksync_config", "zksync_core_leftovers", "zksync_env_config", @@ -8261,7 +8250,7 @@ dependencies = [ name = "zksync_prover_fri_types" version = "0.1.0" dependencies = [ - "circuit_definitions 0.150.2-rc.2", + "circuit_definitions 0.150.2-rc.3", "serde", "zksync_object_store", "zksync_types", @@ -8290,7 +8279,7 @@ name = "zksync_prover_interface" version = "0.1.0" dependencies = [ "chrono", - "circuit_sequencer_api 0.150.2-rc.2", + "circuit_sequencer_api 0.150.2-rc.3", "serde", "serde_with", "strum", @@ -8473,7 +8462,7 @@ dependencies = [ "anyhow", "async-trait", "bincode", - "circuit_definitions 0.150.2-rc.2", + "circuit_definitions 0.150.2-rc.3", "const-decoder", "ctrlc", "futures 0.3.30", @@ -8487,7 +8476,7 @@ dependencies = [ "tracing", "vise", "vk_setup_data_generator_server_fri", - "zkevm_test_harness 0.150.2-rc.2", + "zkevm_test_harness 0.150.2-rc.3", "zksync_config", "zksync_core_leftovers", "zksync_env_config", diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 4dfc77432979..7ab6dd16b99b 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -53,16 +53,16 @@ tokio = "1" toml_edit = "0.14.4" tracing = "0.1" tracing-subscriber = { version = "0.3" } -vise = "0.1.0" +vise = "0.2.0" # Proving dependencies -circuit_definitions = "=0.150.2-rc.2" -circuit_sequencer_api = "=0.150.2-rc.2" -zkevm_test_harness = "=0.150.2-rc.2" +circuit_definitions = "=0.150.2-rc.3" +circuit_sequencer_api = "=0.150.2-rc.3" +zkevm_test_harness = "=0.150.2-rc.3" # GPU proving dependencies -wrapper_prover = { package = "zksync-wrapper-prover", version = "=0.140.0-gpu-wrapper.1" } -shivini = "=0.150.2-rc.2" +wrapper_prover = { package = "zksync-wrapper-prover", version = "=0.140.1-gpu-wrapper.1" } +shivini = "=0.150.2-rc3" # Core workspace dependencies zksync_multivm = { path = "../core/lib/multivm", version = "0.1.0" } diff --git a/prover/crates/bin/proof_fri_compressor/README.md b/prover/crates/bin/proof_fri_compressor/README.md index 097a59e5d09b..c3d5729f40c9 100644 --- a/prover/crates/bin/proof_fri_compressor/README.md +++ b/prover/crates/bin/proof_fri_compressor/README.md @@ -4,4 +4,4 @@ Used to compress FRI proof to Bellman proof that gets sent to L1. ## running -`zk f cargo +nightly-2024-05-07 run --release --bin zksync_proof_fri_compressor` +`zk f cargo +nightly-2024-08-01 run --release --bin zksync_proof_fri_compressor` diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/src/utils.rs b/prover/crates/bin/vk_setup_data_generator_server_fri/src/utils.rs index 6f4946af5b21..1ac6c4f4230d 100644 --- a/prover/crates/bin/vk_setup_data_generator_server_fri/src/utils.rs +++ b/prover/crates/bin/vk_setup_data_generator_server_fri/src/utils.rs @@ -136,7 +136,7 @@ mod tests { for entry in std::fs::read_dir(path_to_input.clone()).unwrap().flatten() { if entry.metadata().unwrap().is_dir() { - let basepath = path_to_input.join(&entry.file_name().into_string().unwrap()); + let basepath = path_to_input.join(entry.file_name()); let keystore = Keystore::new_with_optional_setup_path(basepath.clone(), None); let expected = diff --git a/prover/crates/bin/witness_vector_generator/README.md b/prover/crates/bin/witness_vector_generator/README.md index dde192533db3..3348b294324a 100644 --- a/prover/crates/bin/witness_vector_generator/README.md +++ b/prover/crates/bin/witness_vector_generator/README.md @@ -4,4 +4,4 @@ Used to generate witness vectors using circuit and sending them to prover over T ## running -`zk f cargo +nightly-2024-05-07 run --release --bin zksync_witness_vector_generator` +`zk f cargo +nightly-2024-08-01 run --release --bin zksync_witness_vector_generator` diff --git a/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs b/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs index bc9cde72fde2..488d5b3a5ec9 100644 --- a/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs +++ b/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs @@ -304,6 +304,7 @@ impl FriWitnessGeneratorDal<'_, '_> { /// - all node aggregation jobs at depth 0 for the batch /// - the recursion tip witness job /// - the scheduler witness job + /// /// NOTE: Not all batches have all circuits, so it's possible we'll be missing some aggregation jobs (for circuits not present in the batch). pub async fn create_aggregation_jobs( &mut self, diff --git a/prover/rust-toolchain b/prover/rust-toolchain index 5aaef38cd79d..03c040b91f1f 100644 --- a/prover/rust-toolchain +++ b/prover/rust-toolchain @@ -1 +1 @@ -nightly-2024-05-07 +nightly-2024-08-01 diff --git a/rust-toolchain b/rust-toolchain index 5aaef38cd79d..03c040b91f1f 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2024-05-07 +nightly-2024-08-01 diff --git a/zk_toolbox/Cargo.lock b/zk_toolbox/Cargo.lock index 51d6af249f71..71ac44361179 100644 --- a/zk_toolbox/Cargo.lock +++ b/zk_toolbox/Cargo.lock @@ -883,6 +883,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.68", +] + [[package]] name = "ctr" version = "0.9.2" @@ -2571,26 +2581,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linkme" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5" -dependencies = [ - "linkme-impl", -] - -[[package]] -name = "linkme-impl" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -5742,13 +5732,13 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vise" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229baafe01d5177b63c6ee1def80d8e39a2365e64caf69ddb05a57594b15647c" +checksum = "90ade36f3548b1524396f4de7b36f4f210c8a01dfab568eb2bff466af64eb6e5" dependencies = [ "compile-fmt", + "ctor", "elsa", - "linkme", "once_cell", "prometheus-client", "vise-macros", @@ -5756,9 +5746,9 @@ dependencies = [ [[package]] name = "vise-exporter" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23981b18d697026f5430249ab01ba739ef2edc463e400042394331cb2bb63494" +checksum = "671d3b894d5d0849f0a597f56bf071f42d4f2a1cbcf2f78ca21f870ab7c0cc2b" dependencies = [ "hyper 0.14.29", "once_cell", @@ -5769,9 +5759,9 @@ dependencies = [ [[package]] name = "vise-macros" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb19c33cd5f04dcf4e767635e058a998edbc2b7fca32ade0a4a1cea0f8e9b34" +checksum = "6a511871dc5de990a3b2a0e715facfbc5da848c0c0395597a1415029fb7c250a" dependencies = [ "proc-macro2", "quote", @@ -6347,9 +6337,9 @@ dependencies = [ [[package]] name = "zksync_concurrency" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b83578357184ab72af4d4cb2eca76f85e5f2f35d739a47e3fd5931eb9252d" +checksum = "a9f9a4352244ccd5e5fd34fb0d029861a5f57b05c80fe7944a7b532f54c58f89" dependencies = [ "anyhow", "once_cell", @@ -6381,9 +6371,9 @@ dependencies = [ [[package]] name = "zksync_consensus_utils" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4514629a34abdf943ef911c16228dfec656edb02d8412db4febd4df5ccf3f91" +checksum = "6c43283b5813fd887e0e7ccaee73c6e41907b1de311a3a01b2fa5f2e3f2ba503" dependencies = [ "anyhow", "rand", @@ -6432,9 +6422,9 @@ dependencies = [ [[package]] name = "zksync_protobuf" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53128384270314bfbd4e044c15138af63cb3a505ab95bb3339f3b866ccbe211c" +checksum = "b5db598a518958b244aed5e3f925c763808429a5ea022bb50957b98e68540495" dependencies = [ "anyhow", "bit-vec", @@ -6453,9 +6443,9 @@ dependencies = [ [[package]] name = "zksync_protobuf_build" -version = "0.1.0-rc.8" +version = "0.1.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d7dfb4dcdd48ab5fa1ccff25f585d73b58cf95e0fb74e96618dd666f198a005" +checksum = "4047ed624c7a19e206125f8259f7e175ad70020beeb66e1975e068af060d2fb5" dependencies = [ "anyhow", "heck", diff --git a/zk_toolbox/Cargo.toml b/zk_toolbox/Cargo.toml index 5a08b56cce7d..a8b6633e0360 100644 --- a/zk_toolbox/Cargo.toml +++ b/zk_toolbox/Cargo.toml @@ -30,7 +30,7 @@ types = { path = "crates/types" } zksync_config = { path = "../core/lib/config" } zksync_protobuf_config = { path = "../core/lib/protobuf_config" } zksync_basic_types = { path = "../core/lib/basic_types" } -zksync_protobuf = "=0.1.0-rc.8" +zksync_protobuf = "=0.1.0-rc.9" # External dependencies anyhow = "1.0.82"