Merge branch 'main' into syscall_response_doc

Author: matias-gonz

bench/internals.rs

@@ -17,7 +17,7 @@ use starknet_in_rust::{
     transaction::{declare::Declare, Deploy, DeployAccount, InvokeFunction},
     utils::Address,
 };
-use std::hint::black_box;
+use std::{hint::black_box, sync::Arc};
 
 lazy_static! {
     // include_str! doesn't seem to work in CI
@@ -60,7 +60,7 @@ fn main() {
 fn deploy_account() {
     const RUNS: usize = 500;
 
-    let state_reader = InMemoryStateReader::default();
+    let state_reader = Arc::new(InMemoryStateReader::default());
     let mut state = CachedState::new(state_reader, Some(Default::default()), None);
 
     state
@@ -96,7 +96,7 @@ fn deploy_account() {
 fn declare() {
     const RUNS: usize = 5;
 
-    let state_reader = InMemoryStateReader::default();
+    let state_reader = Arc::new(InMemoryStateReader::default());
     let state = CachedState::new(state_reader, Some(Default::default()), None);
 
     let block_context = &Default::default();
@@ -128,7 +128,7 @@ fn declare() {
 fn deploy() {
     const RUNS: usize = 8;
 
-    let state_reader = InMemoryStateReader::default();
+    let state_reader = Arc::new(InMemoryStateReader::default());
     let mut state = CachedState::new(state_reader, Some(Default::default()), None);
 
     state
@@ -163,7 +163,7 @@ fn deploy() {
 fn invoke() {
     const RUNS: usize = 100;
 
-    let state_reader = InMemoryStateReader::default();
+    let state_reader = Arc::new(InMemoryStateReader::default());
     let mut state = CachedState::new(state_reader, Some(Default::default()), None);
 
     state

cli/src/main.rs

@@ -16,20 +16,24 @@ use starknet_in_rust::{
         block_context::BlockContext,
         constants::{DECLARE_VERSION, TRANSACTION_VERSION},
     },
-    execution::{execution_entry_point::ExecutionEntryPoint, TransactionExecutionContext},
+    execution::{
+        execution_entry_point::{ExecutionEntryPoint, ExecutionResult},
+        TransactionExecutionContext,
+    },
     hash_utils::calculate_contract_address,
     parser_errors::ParserError,
     serde_structs::read_abi,
     services::api::contract_classes::deprecated_contract_class::ContractClass,
-    state::{
-        cached_state::CachedState,
-        state_api::{State, StateReader},
-    },
+    state::{cached_state::CachedState, state_api::State},
     state::{in_memory_state_reader::InMemoryStateReader, ExecutionResourcesManager},
-    transaction::InvokeFunction,
+    transaction::{error::TransactionError, InvokeFunction},
     utils::{felt_to_hash, string_to_hash, Address},
 };
-use std::{collections::HashMap, path::PathBuf, sync::Mutex};
+use std::{
+    collections::HashMap,
+    path::PathBuf,
+    sync::{Arc, Mutex},
+};
 
 #[derive(Parser)]
 struct Cli {
@@ -248,13 +252,18 @@ fn call_parser(
         None,
         0,
     );
-    let call_info = execution_entry_point.execute(
+    let block_context = BlockContext::default();
+    let ExecutionResult { call_info, .. } = execution_entry_point.execute(
         cached_state,
-        &BlockContext::default(),
+        &block_context,
         &mut ExecutionResourcesManager::default(),
         &mut TransactionExecutionContext::default(),
         false,
+        block_context.invoke_tx_max_n_steps(),
     )?;
+
+    let call_info = call_info.ok_or(TransactionError::CallInfoIsNone)?;
+
     Ok(call_info.retdata)
 }
 
@@ -303,7 +312,7 @@ async fn call_req(data: web::Data<AppState>, args: web::Json<CallArgs>) -> HttpR
 pub async fn start_devnet(port: u16) -> Result<(), std::io::Error> {
     let cached_state = web::Data::new(AppState {
         cached_state: Mutex::new(CachedState::<InMemoryStateReader>::new(
-            InMemoryStateReader::default(),
+            Arc::new(InMemoryStateReader::default()),
             Some(HashMap::new()),
             None,
         )),

fuzzer/src/main.rs

@@ -6,6 +6,7 @@ extern crate honggfuzz;
 use cairo_vm::felt::Felt252;
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use num_traits::Zero;
+use starknet_in_rust::execution::execution_entry_point::ExecutionResult;
 use starknet_in_rust::EntryPointType;
 use starknet_in_rust::{
     definitions::{block_context::BlockContext, constants::TRANSACTION_VERSION},
@@ -18,6 +19,7 @@ use starknet_in_rust::{
     utils::{calculate_sn_keccak, Address},
 };
 
+use std::sync::Arc;
 use std::{
     collections::{HashMap, HashSet},
     path::PathBuf,
@@ -124,7 +126,8 @@ fn main() {
             //*    Create state with previous data
             //* ---------------------------------------
 
-            let mut state = CachedState::new(state_reader, Some(contract_class_cache), None);
+            let mut state =
+                CachedState::new(Arc::new(state_reader), Some(contract_class_cache), None);
 
             //* ------------------------------------
             //*    Create execution entry point
@@ -180,18 +183,17 @@ fn main() {
                 ..Default::default()
             };
 
-            assert_eq!(
-                exec_entry_point
-                    .execute(
-                        &mut state,
-                        &block_context,
-                        &mut resources_manager,
-                        &mut tx_execution_context,
-                        false,
-                    )
-                    .unwrap(),
-                expected_call_info
-            );
+            let ExecutionResult { call_info, .. } = exec_entry_point
+                .execute(
+                    &mut state,
+                    &block_context,
+                    &mut resources_manager,
+                    &mut tx_execution_context,
+                    false,
+                    block_context.invoke_tx_max_n_steps(),
+                )
+                .unwrap();
+            assert_eq!(call_info.unwrap(), expected_call_info);
 
             assert!(!state.cache().storage_writes().is_empty());
             assert_eq!(

src/bin/fibonacci.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, path::PathBuf};
+use std::{collections::HashMap, path::PathBuf, sync::Arc};
 
 use cairo_vm::felt::{felt_str, Felt252};
 use num_traits::Zero;
@@ -85,7 +85,7 @@ fn create_initial_state() -> CachedState<InMemoryStateReader> {
             state_reader
                 .address_to_storage_mut()
                 .insert((CONTRACT_ADDRESS.clone(), [0; 32]), Felt252::zero());
-            state_reader
+            Arc::new(state_reader)
         },
         Some(HashMap::new()),
         None,

src/bin/invoke.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, path::PathBuf};
+use std::{collections::HashMap, path::PathBuf, sync::Arc};
 
 use cairo_vm::felt::{felt_str, Felt252};
 use num_traits::Zero;
@@ -99,7 +99,7 @@ fn create_initial_state() -> CachedState<InMemoryStateReader> {
             state_reader
                 .address_to_storage_mut()
                 .insert((CONTRACT_ADDRESS.clone(), [0; 32]), Felt252::zero());
-            state_reader
+            Arc::new(state_reader)
         },
         Some(HashMap::new()),
         None,

src/bin/invoke_with_cachedstate.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, path::PathBuf};
+use std::{collections::HashMap, path::PathBuf, sync::Arc};
 
 use cairo_vm::felt::{felt_str, Felt252};
 use num_traits::Zero;
@@ -106,7 +106,7 @@ fn create_initial_state() -> CachedState<InMemoryStateReader> {
             state_reader
                 .address_to_storage_mut()
                 .insert((CONTRACT_ADDRESS.clone(), [0; 32]), Felt252::zero());
-            state_reader
+            Arc::new(state_reader)
         },
         Some(HashMap::new()),
         None,

src/definitions/constants.rs

@@ -22,6 +22,10 @@ lazy_static! {
 pub(crate) const LOG_MSG_TO_L1_ENCODED_DATA_SIZE: usize =
     (L2_TO_L1_MSG_HEADER_SIZE + 1) - LOG_MSG_TO_L1_N_TOPICS;
 
+/// Fee factor used for the final fee calculation:
+/// actual_fee = min(max_fee, consumed_resources) * FEE_FACTOR
+pub(crate) const FEE_FACTOR: u128 = 1;
+
 /// The (empirical) L1 gas cost of each Cairo step.
 pub(crate) const N_STEPS_FEE_WEIGHT: f64 = 0.01;