Skip to content

Commit

Permalink
feat(blockifier): add syscall counting logic for native
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigo-pino committed Oct 30, 2024
1 parent 75e935f commit 43f4d6e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 4 deletions.
10 changes: 7 additions & 3 deletions crates/blockifier/src/execution/native/entry_point_execution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ fn create_callinfo(

let gas_consumed = syscall_handler.call.initial_gas - remaining_gas;

// todo(rodrigo): execution resources for native execution are still wip until future
// development on both Cairo lang and the Native compiler
let versioned_constants = syscall_handler.context.versioned_constants();
*syscall_handler.resources +=
&versioned_constants.get_additional_os_syscall_resources(&syscall_handler.syscall_counter);

Ok(CallInfo {
call: syscall_handler.call,
execution: CallExecution {
Expand All @@ -70,9 +76,7 @@ fn create_callinfo(
failed: call_result.failure_flag,
gas_consumed,
},
// todo(rodrigo): execution resources rely heavily on how the VM work, therefore
// the dummy values
resources: ExecutionResources::default(),
resources: syscall_handler.resources.clone(),
inner_calls: syscall_handler.inner_calls,
storage_read_values: syscall_handler.read_values,
accessed_storage_keys: syscall_handler.accessed_keys,
Expand Down
18 changes: 17 additions & 1 deletion crates/blockifier/src/execution/native/syscall_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ use starknet_types_core::felt::Felt;
use crate::execution::call_info::{CallInfo, OrderedEvent, OrderedL2ToL1Message, Retdata};
use crate::execution::entry_point::{CallEntryPoint, EntryPointExecutionContext};
use crate::execution::native::utils::encode_str_as_felts;
use crate::execution::syscalls::hint_processor::OUT_OF_GAS_ERROR;
use crate::execution::syscalls::hint_processor::{SyscallCounter, OUT_OF_GAS_ERROR};
use crate::execution::syscalls::SyscallSelector;
use crate::state::state_api::State;

pub struct NativeSyscallHandler<'state> {
Expand All @@ -32,6 +33,8 @@ pub struct NativeSyscallHandler<'state> {
pub l2_to_l1_messages: Vec<OrderedL2ToL1Message>,
pub inner_calls: Vec<CallInfo>,

pub syscall_counter: SyscallCounter,

// Additional information gathered during execution.
pub read_values: Vec<Felt>,
pub accessed_keys: HashSet<StorageKey, RandomState>,
Expand All @@ -52,11 +55,18 @@ impl<'state> NativeSyscallHandler<'state> {
events: Vec::new(),
l2_to_l1_messages: Vec::new(),
inner_calls: Vec::new(),
syscall_counter: SyscallCounter::new(),
read_values: Vec::new(),
accessed_keys: HashSet::new(),
}
}

#[allow(dead_code)]
fn increment_syscall_count_by(&mut self, selector: &SyscallSelector, n: usize) {
let syscall_count = self.syscall_counter.entry(*selector).or_default();
*syscall_count += n
}

#[allow(dead_code)]
fn execute_inner_call(
&mut self,
Expand Down Expand Up @@ -91,8 +101,14 @@ impl<'state> NativeSyscallHandler<'state> {
fn substract_syscall_gas_cost(
&mut self,
remaining_gas: &mut u128,
syscall_selector: SyscallSelector,
syscall_gas_cost: u64,
) -> SyscallResult<()> {
// Syscall count for Keccak is done differently
if syscall_selector != SyscallSelector::Keccak {
self.increment_syscall_count_by(&syscall_selector, 1);
}

// Refund `SYSCALL_BASE_GAS_COST` as it was pre-charged.
let required_gas =
u128::from(syscall_gas_cost - self.context.gas_costs().syscall_base_gas_cost);
Expand Down

0 comments on commit 43f4d6e

Please sign in to comment.