use interface 0.0.9

Author: perekopskiy

Cargo.toml

@@ -53,8 +53,8 @@ keywords = ["blockchain", "zksync", "zk", "risc-v"]
 categories = ["cryptography"]
 
 [workspace.dependencies]
-zksync_os_evm_errors = { version = "=0.0.7", default-features = false }
-zksync_os_interface = { version = "=0.0.7" }
+zksync_os_evm_errors = { version = "=0.0.9", default-features = false }
+zksync_os_interface = { version = "=0.0.9" }
 
 risc_v_simulator = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.4.3"}
 blake2s_u32 = { git = "https://github.com/matter-labs/zksync-airbender", tag = "v0.4.3"}

forward_system/src/run/interface_impl.rs

@@ -5,9 +5,7 @@ use crate::run::tracing_impl::TracerWrapped;
 use crate::run::{run_block, simulate_tx};
 use zk_ee::system::metadata::BlockMetadataFromOracle;
 use zksync_os_interface::tracing::AnyTracer;
-use zksync_os_interface::traits::{
-    PreimageSource, ReadStorage, RunBlock, SimulateTx, TxResultCallback, TxSource,
-};
+use zksync_os_interface::traits::{EncodedTx, PreimageSource, ReadStorage, RunBlock, SimulateTx, TxResultCallback, TxSource};
 use zksync_os_interface::types::BlockContext;
 use zksync_os_interface::types::BlockOutput;
 
@@ -56,15 +54,19 @@ impl SimulateTx for RunBlockForward {
     fn simulate_tx<Storage: ReadStorage, PreimgSrc: PreimageSource, Tracer: AnyTracer>(
         &self,
         _config: (),
-        transaction: Vec<u8>,
+        transaction: EncodedTx,
         block_context: BlockContext,
         storage: Storage,
         preimage_source: PreimgSrc,
         tracer: &mut Tracer,
     ) -> Result<TxResult, Self::Error> {
         let evm_tracer = tracer.as_evm().expect("only EVM tracers are supported");
+        let abi_tx = match transaction {
+            EncodedTx::Abi(b) => b,
+            _ => panic!("only ABI-encoded transactions are supported"),
+        };
         simulate_tx(
-            transaction,
+            abi_tx,
             BlockMetadataFromOracle::from_interface(block_context),
             storage,
             preimage_source,

forward_system/src/run/oracle.rs

@@ -1,6 +1,7 @@
 use crate::run::{NextTxResponse, PreimageSource, ReadStorageTree, TxSource};
 use basic_system::system_implementation::flat_storage_model::*;
 use serde::{Deserialize, Serialize};
+use zksync_os_interface::traits::EncodedTx;
 use zk_ee::common_structs::derive_flat_storage_key;
 use zk_ee::common_structs::ProofData;
 use zk_ee::internal_error;
@@ -56,7 +57,11 @@ impl<T: ReadStorageTree, PS: PreimageSource, TS: TxSource> ForwardRunningOracle<
                                 let next_tx_len = next_tx.len();
                                 // `0` interpreted as seal batch
                                 assert_ne!(next_tx_len, 0);
-                                self.next_tx = Some(next_tx);
+                                let abi_tx = match next_tx {
+                                    EncodedTx::Abi(b) => b,
+                                    _ => panic!("only ABI-encoded transactions are supported"),
+                                };
+                                self.next_tx = Some(abi_tx);
                                 next_tx_len
                             }
                         }
@@ -228,7 +233,11 @@ impl<S: ReadStorage, PS: PreimageSource, TS: TxSource> CallSimulationOracle<S, P
                                 let next_tx_len = next_tx.len();
                                 // `0` interpreted as seal batch
                                 assert_ne!(next_tx_len, 0);
-                                self.next_tx = Some(next_tx);
+                                let abi_tx = match next_tx {
+                                    EncodedTx::Abi(b) => b,
+                                    _ => panic!("only ABI-encoded transactions are supported"),
+                                };
+                                self.next_tx = Some(abi_tx);
                                 next_tx_len
                             }
                         }

forward_system/src/run/test_impl/tx_source.rs

@@ -1,5 +1,6 @@
 use crate::run::{NextTxResponse, TxSource};
 use std::collections::VecDeque;
+use zksync_os_interface::traits::EncodedTx;
 
 #[derive(Clone, serde::Serialize, serde::Deserialize)]
 pub struct TxListSource {
@@ -9,7 +10,7 @@ pub struct TxListSource {
 impl TxSource for TxListSource {
     fn get_next_tx(&mut self) -> NextTxResponse {
         match self.transactions.pop_front() {
-            Some(tx) => NextTxResponse::Tx(tx),
+            Some(tx) => NextTxResponse::Tx(EncodedTx::Abi(tx)),
             None => NextTxResponse::SealBlock,
         }
     }