Glue sort_storage_access_queries to latest sequencer API

Cargo.toml

@@ -229,15 +229,15 @@ 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.7" }
-crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.30.1" }
-kzg = { package = "zksync_kzg", version = "=0.150.7" }
+circuit_sequencer_api_1_5_0 = { package = "circuit_sequencer_api", version = "=0.150.9", path = "../zksync-protocol/crates/circuit_sequencer_api" }
+crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.30.3" }
+kzg = { package = "zksync_kzg", version = "=0.150.9", path = "../zksync-protocol/crates/kzg" }
 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" }
 zk_evm_1_4_0 = { package = "zk_evm", version = "0.140" }
 zk_evm_1_4_1 = { package = "zk_evm", version = "0.141" }
-zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.7" }
+zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.9", path = "../zksync-protocol/crates/zk_evm" }
 
 # New VM; pinned to a specific commit because of instability
 zksync_vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "df5bec3d04d64d434f9b0ccb285ba4681008f7b3" }

core/lib/multivm/src/glue/types/vm/vm_block_result.rs

@@ -1,6 +1,4 @@
-use circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries as sort_storage_access_queries_1_3_3;
-use itertools::Itertools;
-use zk_evm_1_3_1::aux_structures::LogQuery as LogQuery_1_3_1;
+use circuit_sequencer_api_1_5_0::sort_storage_access::sort_storage_access_queries;
 use zksync_types::l2_to_l1_log::UserL2ToL1Log;
 
 use crate::{
@@ -9,6 +7,7 @@ use crate::{
         CurrentExecutionState, ExecutionResult, Refunds, VmExecutionLogs, VmExecutionResultAndLogs,
         VmExecutionStatistics,
     },
+    utils::glue_log_query,
 };
 
 // Note: In version after vm `VmVirtualBlocks` the bootloader memory knowledge is encapsulated into the VM.
@@ -19,18 +18,12 @@ use crate::{
 impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::FinishedL1Batch {
     fn glue_from(value: crate::vm_m5::vm_instance::VmBlockResult) -> Self {
         let storage_log_queries = value.full_result.storage_log_queries.clone();
-        let deduplicated_storage_logs: Vec<LogQuery_1_3_1> = sort_storage_access_queries_1_3_3(
-            &storage_log_queries
+        let deduplicated_storage_logs = sort_storage_access_queries(
+            storage_log_queries
                 .iter()
-                .map(|log| {
-                    GlueInto::<zk_evm_1_3_3::aux_structures::LogQuery>::glue_into(log.log_query)
-                })
-                .collect_vec(),
+                .map(|log| glue_log_query(log.log_query)),
         )
-        .1
-        .into_iter()
-        .map(GlueInto::<LogQuery_1_3_1>::glue_into)
-        .collect();
+        .1;
 
         crate::interface::FinishedL1Batch {
             block_tip_execution_result: VmExecutionResultAndLogs {
@@ -76,18 +69,12 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::Fi
 impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::FinishedL1Batch {
     fn glue_from(value: crate::vm_m6::vm_instance::VmBlockResult) -> Self {
         let storage_log_queries = value.full_result.storage_log_queries.clone();
-        let deduplicated_storage_logs: Vec<LogQuery_1_3_1> = sort_storage_access_queries_1_3_3(
-            &storage_log_queries
+        let deduplicated_storage_logs = sort_storage_access_queries(
+            storage_log_queries
                 .iter()
-                .map(|log| {
-                    GlueInto::<zk_evm_1_3_3::aux_structures::LogQuery>::glue_into(log.log_query)
-                })
-                .collect_vec(),
+                .map(|log| glue_log_query(log.log_query)),
         )
-        .1
-        .into_iter()
-        .map(GlueInto::<LogQuery_1_3_1>::glue_into)
-        .collect();
+        .1;
 
         crate::interface::FinishedL1Batch {
             block_tip_execution_result: VmExecutionResultAndLogs {