Merge remote-tracking branch 'origin/v1.5.0' into vv-oracle-paralleli…

…zation2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zkevm_test_harness"
-version = "0.150.1"
+version = "0.150.2-rc.3"
 edition = "2021"
 authors = ["Alex Vlasov <[email protected]>", "Konstantin Panarin <[email protected]>"]
 homepage = "https://zksync.io/"
@@ -25,9 +25,9 @@ name = "geometry_config_generator"
 path = "src/geometry_config_generator/main.rs"
 
 [dependencies]
-circuit_definitions = { version = "=0.150.1", path = "./circuit_definitions"}
-circuit_sequencer_api = { version = "=0.150.1", path = "./circuit_sequencer_api"}
-kzg = { package = "zksync_kzg", version = "=0.150.1", path = "./kzg"}
+circuit_definitions = { version = "=0.150.2-rc.3", path = "./circuit_definitions"}
+circuit_sequencer_api = { version = "=0.150.2-rc.3", path = "./circuit_sequencer_api"}
+kzg = { package = "zksync_kzg", version = "=0.150.2-rc.3", path = "./kzg"}
 
 zkevm-assembly = "=0.150.0"
 
@@ -45,7 +45,7 @@ env_logger = "0.9"
 smallvec = "1.13"
 structopt = "0.3.26"
 codegen = "0.2.0"
-regex = { version = "1.10.4", features = ["pattern"] }
+regex = { version = "1.10.6", features = ["pattern"] }
 
 [dev-dependencies]
 rand = "0.4"

circuit_definitions/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "circuit_definitions"
-version = "0.150.1"
+version = "0.150.2-rc.3"
 edition = "2021"
 authors = ["The Matter Labs Team <[email protected]>"]
 homepage = "https://zksync.io/"
@@ -13,10 +13,10 @@ description = "ZKsync Era circuits definitions"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-snark_wrapper = "=0.1.0"
+snark_wrapper = "=0.1.2"
 # snark_wrapper = {path = "../../snark_wrapper"}
 
-circuit_encodings = { version = "0.150.0", path = "../circuit_encodings" }
+circuit_encodings = { version = "0.150.2-rc.3", path = "../circuit_encodings" }
 
 derivative = "2.2"
 serde = {version = "1", features = ["derive"]}

circuit_definitions/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-02-01"
+channel = "nightly-2024-08-01"

circuit_encodings/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "circuit_encodings"
-version = "0.150.1"
+version = "0.150.2-rc.3"
 edition = "2021"
 authors = ["The Matter Labs Team <[email protected]>"]
 homepage = "https://zksync.io/"
@@ -13,7 +13,7 @@ description = "ZKsync Era circuits encodings"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-zkevm_circuits = "=0.150.0"
+zkevm_circuits = "=0.150.2"
 zk_evm = "=0.150.0"
 
 derivative = "2.2"

circuit_sequencer_api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "circuit_sequencer_api"
-version = "0.150.1"
+version = "0.150.2-rc.3"
 edition = "2021"
 authors = ["The Matter Labs Team <[email protected]>"]
 homepage = "https://zksync.io/"
@@ -14,7 +14,7 @@ description = "ZKsync Era circuit API for sequencer"
 
 [dependencies]
 
-circuit_encodings = { version = "=0.150.1", path = "../circuit_encodings"}
+circuit_encodings = { version = "=0.150.2-rc.3", path = "../circuit_encodings"}
 bellman = { package = "bellman_ce", version = "=0.7.0" }
 
 

kzg/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zksync_kzg"
-version = "0.150.1"
+version = "0.150.2-rc.3"
 edition = "2021"
 authors = ["The Matter Labs Team <[email protected]>"]
 homepage = "https://zksync.io/"
@@ -22,8 +22,8 @@ hex = "0.4"
 once_cell = "1"
 serde_with = {version = "1", features = ["hex"]}
 
-boojum = "=0.2.0"
-zkevm_circuits = "=0.150.0"
+boojum = "=0.2.2"
+zkevm_circuits = "=0.150.2"
 
 [dev-dependencies]
 rand = "0.4"

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
 # channel = "nightly"
-channel = "nightly-2024-02-01"
+channel = "nightly-2024-08-01"

src/tests/complex_tests/mod.rs

@@ -636,8 +636,10 @@ fn run_and_try_create_witness_inner(
             .find(|el| el.0 == subset.0 as u8)
             .cloned()
             .unwrap();
-        let (aggregations, _closed_form_inputs) = create_leaf_witnesses(subset, proofs, vk, param);
-        all_leaf_aggregations.push(aggregations);
+
+        let (aggregations, recursive_circuits, _closed_form_inputs) =
+            create_leaf_witnesses(subset, proofs, vk, param);
+        all_leaf_aggregations.push((aggregations, recursive_circuits));
         all_closed_form_inputs_for_scheduler.extend(_closed_form_inputs);
     }
 
@@ -647,14 +649,14 @@ fn run_and_try_create_witness_inner(
 
     use circuit_definitions::circuit_definitions::recursion_layer::*;
 
-    for aggregations_for_circuit_type in all_leaf_aggregations.iter() {
+    for (aggregations_for_circuit_type, recursive_circuits) in all_leaf_aggregations.iter() {
         if aggregations_for_circuit_type.is_empty() {
             continue;
         }
 
         let mut instance_idx = 0;
         let mut setup_data = None;
-        for (idx, (_, _, el)) in aggregations_for_circuit_type.iter().enumerate() {
+        for (idx, el) in recursive_circuits.iter().enumerate() {
             let descr = el.short_description();
             println!("Doing {}: {}", idx, descr);
 
@@ -898,7 +900,7 @@ fn run_and_try_create_witness_inner(
     let node_vk_commitment = compute_node_vk_commitment(node_vk);
 
     println!("Continuing into nodes leaf aggregation circuits");
-    for per_circuit_subtree in all_leaf_aggregations.into_iter() {
+    for (per_circuit_subtree, _) in all_leaf_aggregations.into_iter() {
         let mut depth = 0;
         let mut next_aggregations = per_circuit_subtree;
 
@@ -944,15 +946,16 @@ fn run_and_try_create_witness_inner(
 
                 proofs.push(proof);
             }
-            next_aggregations = create_node_witnesses(
+            let (new_aggregations, recursive_circuits) = create_node_witnesses(
                 next_aggregations,
                 proofs,
                 vk.clone(),
                 node_vk_commitment,
                 &leaf_vk_commits,
             );
+            next_aggregations = new_aggregations;
 
-            for (idx, (_, _, el)) in next_aggregations.iter().enumerate() {
+            for (idx, el) in recursive_circuits.iter().enumerate() {
                 // test_recursive_circuit(el.clone());
                 // println!("Circuit is satisfied");