adapt to interface 0.0.13

Author: Artemka374

Cargo.toml

@@ -57,8 +57,8 @@ keywords = ["blockchain", "zksync", "zk", "risc-v"]
 categories = ["cryptography"]
 
 [workspace.dependencies]
-zksync_os_evm_errors = { version = "0.0.10", default-features =  false }
-zksync_os_interface = { version = "0.0.10"}
+zksync_os_evm_errors = { version = "0.0.13", default-features =  false }
+zksync_os_interface = { version = "0.0.13"}
 
 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

@@ -4,7 +4,7 @@ use crate::run::output::TxResult;
 use crate::run::tracing_impl::TracerWrapped;
 use crate::run::{run_block, simulate_tx};
 use zk_ee::system::metadata::zk_metadata::BlockMetadataFromOracle;
-use zksync_os_interface::tracing::AnyTracer;
+use zksync_os_interface::tracing::{AnyTracer, AnyTxValidator};
 use zksync_os_interface::traits::{
     EncodedTx, PreimageSource, ReadStorage, RunBlock, SimulateTx, TxResultCallback, TxSource,
 };
@@ -27,6 +27,7 @@ impl RunBlock for RunBlockForward {
         TrSrc: TxSource,
         TrCallback: TxResultCallback,
         Tracer: AnyTracer,
+        Validator: AnyTxValidator,
     >(
         &self,
         _config: (),
@@ -36,6 +37,7 @@ impl RunBlock for RunBlockForward {
         tx_source: TrSrc,
         tx_result_callback: TrCallback,
         tracer: &mut Tracer,
+        _validator: &mut Validator,
     ) -> Result<BlockOutput, Self::Error> {
         let evm_tracer = tracer.as_evm().expect("only EVM tracers are supported");
         run_block(
@@ -53,14 +55,15 @@ impl SimulateTx for RunBlockForward {
     type Config = ();
     type Error = ForwardSubsystemError;
 
-    fn simulate_tx<Storage: ReadStorage, PreimgSrc: PreimageSource, Tracer: AnyTracer>(
+    fn simulate_tx<Storage: ReadStorage, PreimgSrc: PreimageSource, Tracer: AnyTracer, Validator: AnyTxValidator>(
         &self,
         _config: (),
         transaction: EncodedTx,
         block_context: BlockContext,
         storage: Storage,
         preimage_source: PreimgSrc,
         tracer: &mut Tracer,
+        _validator: &mut Validator,
     ) -> Result<TxResult, Self::Error> {
         let evm_tracer = tracer.as_evm().expect("only EVM tracers are supported");
         simulate_tx(

forward_system/src/run/output.rs

@@ -135,7 +135,7 @@ impl<TR: TxResultCallback> From<ForwardRunningResultKeeper<TR>> for BlockOutput
             account_diffs,
             published_preimages,
             pubdata,
-            computaional_native_used: block_computaional_native_used,
+            computational_native_used: block_computaional_native_used,
         }
     }
 }