Attempt

Author: infrmtcs

vm/rust/src/execution.rs

@@ -17,7 +17,7 @@ use starknet_api::transaction::{DeclareTransaction, DeployAccountTransaction, In
 
 pub fn process_transaction(
     txn: &mut Transaction,
-    txn_state: &mut TransactionalState<'_, CachedState<JunoStateReader>>,
+    txn_state: &mut TransactionalState<'_, JunoStateReader>,
     block_context: &BlockContext,
     error_on_revert: bool,
 ) -> Result<TransactionExecutionInfo, ExecutionError> {
@@ -71,7 +71,7 @@ where
 /// This function checks whether the sender contract meets this requirement.
 pub fn is_l2_gas_accounting_enabled(
     transaction: &Transaction,
-    state: &mut TransactionalState<'_, CachedState<JunoStateReader>>,
+    state: &mut TransactionalState<'_, JunoStateReader>,
     block_context: &BlockContext,
     gas_computation_mode: &GasVectorComputationMode,
 ) -> StateResult<bool> {

vm/rust/src/jsonrpc.rs

@@ -1,7 +1,6 @@
 use blockifier;
 use blockifier::execution::call_info::OrderedL2ToL1Message;
 use blockifier::execution::entry_point::CallType;
-use blockifier::state::cached_state::CachedState;
 use blockifier::state::cached_state::{CommitmentStateDiff, TransactionalState};
 use blockifier::state::errors::StateError;
 use blockifier::state::state_api::StateReader;
@@ -105,7 +104,7 @@ type BlockifierTxInfo = blockifier::transaction::objects::TransactionExecutionIn
 pub fn new_transaction_trace(
     tx: &StarknetApiTransaction,
     info: BlockifierTxInfo,
-    state: &mut TransactionalState<CachedState<JunoStateReader>>,
+    state: &mut TransactionalState<JunoStateReader>,
 ) -> Result<TransactionTrace, StateError> {
     let mut trace = TransactionTrace::default();
     let mut deprecated_declared_class_hash: Option<ClassHash> = None;
@@ -327,7 +326,7 @@ impl From<OrderedL2ToL1Message> for OrderedMessage {
 pub struct Retdata(pub Vec<StarkFelt>);
 
 fn make_state_diff(
-    state: &mut TransactionalState<CachedState<JunoStateReader>>,
+    state: &mut TransactionalState<JunoStateReader>,
     deprecated_declared_class_hash: Option<ClassHash>,
 ) -> Result<StateDiff, StateError> {
     let diff: CommitmentStateDiff = state.to_state_diff()?.state_maps.into();

vm/rust/src/lib.rs

@@ -247,7 +247,7 @@ pub extern "C" fn cairoVMExecute(
     err_stack: c_uchar,
 ) {
     let block_info = unsafe { *block_info_ptr };
-    let reader = JunoStateReader::new(reader_handle, block_info.block_number);
+    let mut reader = JunoStateReader::new(reader_handle, block_info.block_number);
     let chain_id_str = unsafe { CStr::from_ptr(chain_id) }.to_str().unwrap();
     let txn_json_str = unsafe { CStr::from_ptr(txns_json) }.to_str().unwrap();
     let txns_and_query_bits: Result<Vec<TxnAndQueryBit>, serde_json::Error> =
@@ -278,7 +278,7 @@ pub extern "C" fn cairoVMExecute(
         }
     };
 
-    let mut state = CachedState::new(reader);
+    let mut state = CachedState::create_transactional(&mut reader);
     let txns_and_query_bits = txns_and_query_bits.unwrap();
     let mut classes = classes.unwrap();
     let concurrency_mode = concurrency_mode == 1;
@@ -350,7 +350,6 @@ pub extern "C" fn cairoVMExecute(
             return;
         }
 
-        let mut txn_state = CachedState::create_transactional(&mut state);
         let mut txn = txn.unwrap();
         let gas_vector_computation_mode = determine_gas_vector_mode(&txn);
 
@@ -366,7 +365,7 @@ pub extern "C" fn cairoVMExecute(
             Transaction::L1Handler(t) => (None, t.fee_type()),
         };
 
-        match process_transaction(&mut txn, &mut txn_state, &block_context, err_on_revert) {
+        match process_transaction(&mut txn, &mut state, &block_context, err_on_revert) {
             Err(e) => match e {
                 ExecutionError::ExecutionError { error, error_stack } => {
                     let err_string = if err_stack {
@@ -434,7 +433,7 @@ pub extern "C" fn cairoVMExecute(
                 let trace = jsonrpc::new_transaction_trace(
                     &txn_and_query_bit.txn,
                     tx_execution_info,
-                    &mut txn_state,
+                    &mut state,
                 );
                 if let Err(e) = trace {
                     report_error(
@@ -464,8 +463,8 @@ pub extern "C" fn cairoVMExecute(
                 append_trace(reader_handle, trace.as_ref().unwrap(), &mut trace_buffer);
             }
         }
-        txn_state.commit();
     }
+    state.abort();
 }
 
 fn determine_gas_vector_mode(transaction: &Transaction) -> GasVectorComputationMode {