feat(vm): Extract oneshot VM executor interface

core/lib/multivm/src/tracers/mod.rs

@@ -3,7 +3,9 @@ pub use self::{
     multivm_dispatcher::TracerDispatcher,
     prestate_tracer::PrestateTracer,
     storage_invocation::StorageInvocations,
-    validator::{ValidationError, ValidationTracer, ValidationTracerParams},
+    validator::{
+        ValidationError, ValidationTracer, ValidationTracerParams, ViolatedValidationRule,
+    },
 };
 
 mod call_tracer;

core/lib/multivm/src/tracers/validator/mod.rs

@@ -10,13 +10,11 @@ use zksync_types::{
 };
 use zksync_utils::{be_bytes_to_safe_address, u256_to_account_address, u256_to_h256};
 
-pub use crate::tracers::validator::types::{ValidationError, ValidationTracerParams};
+use self::types::{NewTrustedValidationItems, ValidationTracerMode};
+pub use self::types::{ValidationError, ValidationTracerParams, ViolatedValidationRule};
 use crate::{
     glue::tracers::IntoOldVmTracer,
     interface::storage::{StoragePtr, WriteStorage},
-    tracers::validator::types::{
-        NewTrustedValidationItems, ValidationTracerMode, ViolatedValidationRule,
-    },
 };
 
 mod types;

core/lib/vm_interface/src/lib.rs

@@ -23,7 +23,10 @@ pub use crate::{
             BytecodeCompressionError, Halt, TxRevertReason, VmRevertReason,
             VmRevertReasonParsingError,
         },
-        inputs::{L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode, VmExecutionMode},
+        inputs::{
+            L1BatchEnv, L2BlockEnv, OneshotEnv, StoredL2BlockEnv, SystemEnv, TxExecutionMode,
+            VmExecutionMode,
+        },
         outputs::{
             BootloaderMemory, Call, CallType, CircuitStatistic, CompressedBytecodeInfo,
             CurrentExecutionState, DeduplicatedWritesMetrics, ExecutionResult, FinishedL1Batch,

core/lib/vm_interface/src/types/inputs/l2_block.rs

@@ -10,12 +10,21 @@ pub struct L2BlockEnv {
 }
 
 impl L2BlockEnv {
-    pub fn from_l2_block_data(miniblock_execution_data: &L2BlockExecutionData) -> Self {
+    pub fn from_l2_block_data(execution_data: &L2BlockExecutionData) -> Self {
         Self {
-            number: miniblock_execution_data.number.0,
-            timestamp: miniblock_execution_data.timestamp,
-            prev_block_hash: miniblock_execution_data.prev_block_hash,
-            max_virtual_blocks_to_create: miniblock_execution_data.virtual_blocks,
+            number: execution_data.number.0,
+            timestamp: execution_data.timestamp,
+            prev_block_hash: execution_data.prev_block_hash,
+            max_virtual_blocks_to_create: execution_data.virtual_blocks,
         }
     }
 }
+
+/// Current block information stored in the system context contract. Can be used to set up
+/// oneshot transaction / call execution.
+#[derive(Debug, Clone, Copy)]
+pub struct StoredL2BlockEnv {
+    pub number: u32,
+    pub timestamp: u64,
+    pub txs_rolling_hash: H256,
+}

core/lib/vm_interface/src/types/inputs/mod.rs

@@ -1,11 +1,23 @@
 pub use self::{
     execution_mode::VmExecutionMode,
     l1_batch_env::L1BatchEnv,
-    l2_block::L2BlockEnv,
+    l2_block::{L2BlockEnv, StoredL2BlockEnv},
     system_env::{SystemEnv, TxExecutionMode},
 };
 
 mod execution_mode;
 mod l1_batch_env;
 mod l2_block;
 mod system_env;
+
+/// Full environment for oneshot transaction / call execution.
+#[derive(Debug)]
+pub struct OneshotEnv {
+    /// System environment.
+    pub system: SystemEnv,
+    /// Part of the environment specific to an L1 batch.
+    pub l1_batch: L1BatchEnv,
+    /// Part of the environment representing the current L2 block. Can be used to override storage slots
+    /// in the system context contract, which are set from `L1BatchEnv.first_l2_block` by default.
+    pub current_block: Option<StoredL2BlockEnv>,
+}