add syscall_counting

Author: FrancoGiachetta

crates/blockifier/Cargo.toml

@@ -12,6 +12,7 @@ workspace = true
 [features]
 cairo_native = ["dep:cairo-native", "starknet_sierra_multicompile/cairo_native", "dep:sierra-emu"]
 with-trace-dump = ["cairo_native", "cairo-native/with-trace-dump"]
+block-composition = []
 jemalloc = ["dep:tikv-jemallocator"]
 native_blockifier = []
 node_api = []

crates/blockifier/src/execution/call_info.rs

@@ -13,6 +13,7 @@ use starknet_types_core::felt::Felt;
 
 use crate::execution::contract_class::TrackedResource;
 use crate::execution::entry_point::CallEntryPoint;
+use crate::execution::native::syscall_handler::SyscallCounts;
 use crate::state::cached_state::StorageEntry;
 use crate::utils::u64_from_usize;
 use crate::versioned_constants::VersionedConstants;
@@ -200,6 +201,8 @@ impl AddAssign<&ChargedResources> for ChargedResources {
 #[cfg_attr(feature = "transaction_serde", derive(serde::Deserialize))]
 #[derive(Debug, Default, Eq, PartialEq, Serialize)]
 pub struct CallInfo {
+    #[cfg(feature = "block_composition")]
+    pub syscall_counts: SyscallCounts,
     pub call: CallEntryPoint,
     pub execution: CallExecution,
     pub inner_calls: Vec<CallInfo>,

crates/blockifier/src/execution/native/entry_point_execution.rs

@@ -10,7 +10,7 @@ use crate::execution::entry_point::{
 };
 use crate::execution::errors::{EntryPointExecutionError, PostExecutionError, PreExecutionError};
 use crate::execution::native::contract_class::NativeCompiledClassV1;
-use crate::execution::native::syscall_handler::NativeSyscallHandler;
+use crate::execution::native::syscall_handler::{NativeSyscallHandler, SYSCALL_COUNTER};
 use crate::state::state_api::State;
 
 // todo(rodrigo): add an `entry point not found` test for Native
@@ -85,8 +85,13 @@ fn create_callinfo(
 
     let gas_consumed = syscall_handler.base.call.initial_gas - remaining_gas;
     let vm_resources = CallInfo::summarize_vm_resources(syscall_handler.base.inner_calls.iter());
+    
+    #[cfg(feature = "block_composition")]
+    let syscalls_coutnts = *SYSCALL_COUNTER.lock().unwrap();
 
     Ok(CallInfo {
+        #[cfg(feature = "block_composition")]
+        syscall_counts,
         call: syscall_handler.base.call.into(),
         execution: CallExecution {
             retdata: Retdata(call_result.return_values),

crates/blockifier/src/execution/native/executor.rs

@@ -15,6 +15,8 @@ use itertools::Itertools;
 use sierra_emu::VirtualMachine;
 use starknet_types_core::felt::Felt;
 
+use crate::execution::native::syscall_handler::{SyscallCounts, SYSCALL_COUNTER};
+
 use super::syscall_handler::NativeSyscallHandler;
 
 #[derive(Debug)]
@@ -48,7 +50,12 @@ impl ContractExecutor {
     ) -> cairo_native::error::Result<ContractExecutionResult> {
         match self {
             ContractExecutor::Aot(aot_contract_executor) => {
-                aot_contract_executor.run(selector, args, gas, builtin_costs, syscall_handler)
+                let result = aot_contract_executor.run(selector, args, gas, builtin_costs, syscall_handler);
+                
+                #[cfg(feature = "block_composition")]
+                SYSCALL_COUNTER.set(SyscallCounts::default())?;
+
+                result
             }
             ContractExecutor::Emu((program, entrypoints, version)) => {
                 let mut virtual_machine =

crates/blockifier/src/execution/native/syscall_handler.rs

@@ -1,20 +1,12 @@
 use std::convert::From;
 use std::fmt;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock, Mutex};
 
 use ark_ec::short_weierstrass::{Affine, Projective, SWCurveConfig};
 use ark_ff::{BigInt, PrimeField};
 use cairo_native::starknet::{
-    BlockInfo,
-    ExecutionInfo,
-    ExecutionInfoV2,
-    Secp256k1Point,
-    Secp256r1Point,
-    StarknetSyscallHandler,
-    SyscallResult,
-    TxInfo,
-    TxV2Info,
-    U256,
+    BlockInfo, ExecutionInfo, ExecutionInfoV2, Secp256k1Point, Secp256r1Point,
+    StarknetSyscallHandler, SyscallResult, TxInfo, TxV2Info, U256,
 };
 use num_bigint::BigUint;
 use starknet_api::contract_class::EntryPointType;
@@ -28,15 +20,12 @@ use starknet_types_core::felt::Felt;
 use crate::execution::call_info::{MessageToL1, Retdata};
 use crate::execution::common_hints::ExecutionMode;
 use crate::execution::entry_point::{
-    CallEntryPoint,
-    CallType,
-    EntryPointExecutionContext,
-    ExecutableCallEntryPoint,
+    CallEntryPoint, CallType, EntryPointExecutionContext, ExecutableCallEntryPoint,
 };
 use crate::execution::errors::EntryPointExecutionError;
 use crate::execution::native::utils::{calculate_resource_bounds, default_tx_v2_info};
 use crate::execution::secp;
-use crate::execution::syscalls::hint_processor::{SyscallExecutionError, OUT_OF_GAS_ERROR};
+use crate::execution::syscalls::hint_processor::{OUT_OF_GAS_ERROR, SyscallExecutionError};
 use crate::execution::syscalls::syscall_base::SyscallHandlerBase;
 use crate::state::state_api::State;
 use crate::transaction::objects::TransactionInfo;
@@ -45,6 +34,38 @@ use crate::versioned_constants::GasCosts;
 
 pub const CALL_CONTRACT_SELECTOR_NAME: &str = "call_contract";
 pub const LIBRARY_CALL_SELECTOR_NAME: &str = "library_call";
+
+pub static SYSCALL_COUNTER: LazyLock<Mutex<SyscallCounts>> = LazyLock::new(|| Mutex::new(SyscallCounts::default()));
+
+#[derive(Default, Clone, Copy)]
+pub struct SyscallCounts {
+    pub get_block_hash: u64,
+    pub get_execution_info: u64,
+    pub get_execution_info_v2: u64,
+    pub deploy: u64,
+    pub replace_class: u64,
+    pub library_call: u64,
+    pub call_contract: u64,
+    pub storage_read: u64,
+    pub storage_write: u64,
+    pub emit_event: u64,
+    pub send_message_to_l1: u64,
+    pub keccak: u64,
+    pub secp256k1_new: u64,
+    pub secp256k1_add: u64,
+    pub secp256k1_mul: u64,
+    pub secp256k1_get_point_from_x: u64,
+    pub secp256k1_get_xy: u64,
+    pub secp256r1_new: u64,
+    pub secp256r1_add: u64,
+    pub secp256r1_mul: u64,
+    pub secp256r1_get_point_from_x: u64,
+    pub secp256r1_get_xy: u64,
+    pub sha256_process_block: u64,
+    pub get_class_hash_at: u64,
+    pub meta_tx_v0: u64,
+}
+
 pub struct NativeSyscallHandler<'state> {
     pub base: Box<SyscallHandlerBase<'state>>,
 
@@ -239,6 +260,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         block_number: u64,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Felt> {
+        SYSCALL_COUNTER.lock().unwrap().get_block_hash += 1;
+        
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.get_block_hash.base_syscall_cost(),
@@ -251,6 +274,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
     }
 
     fn get_execution_info(&mut self, remaining_gas: &mut u64) -> SyscallResult<ExecutionInfo> {
+        SYSCALL_COUNTER.lock().unwrap().get_execution_info += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.get_execution_info.base_syscall_cost(),
@@ -270,6 +295,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         contract_address: Felt,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Felt> {
+        SYSCALL_COUNTER.lock().unwrap().get_class_hash_at += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.get_class_hash_at.base_syscall_cost(),
@@ -285,6 +312,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
     }
 
     fn get_execution_info_v2(&mut self, remaining_gas: &mut u64) -> SyscallResult<ExecutionInfoV2> {
+        SYSCALL_COUNTER.lock().unwrap().get_execution_info_v2 += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.get_execution_info.base_syscall_cost(),
@@ -307,6 +336,7 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         deploy_from_zero: bool,
         remaining_gas: &mut u64,
     ) -> SyscallResult<(Felt, Vec<Felt>)> {
+        SYSCALL_COUNTER.lock().unwrap().deploy += 1;
         // The cost of deploying a contract is the base cost plus the linear cost of the calldata
         // len.
         let total_gas_cost =
@@ -330,6 +360,7 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         Ok((Felt::from(deployed_contract_address), constructor_retdata))
     }
     fn replace_class(&mut self, class_hash: Felt, remaining_gas: &mut u64) -> SyscallResult<()> {
+        SYSCALL_COUNTER.lock().unwrap().replace_class += 1;
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.replace_class.base_syscall_cost(),
@@ -348,6 +379,7 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         calldata: &[Felt],
         remaining_gas: &mut u64,
     ) -> SyscallResult<Vec<Felt>> {
+        SYSCALL_COUNTER.lock().unwrap().library_call += 1;
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.library_call.base_syscall_cost(),
@@ -392,6 +424,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         calldata: &[Felt],
         remaining_gas: &mut u64,
     ) -> SyscallResult<Vec<Felt>> {
+        SYSCALL_COUNTER.lock().unwrap().call_contract += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.call_contract.base_syscall_cost(),
@@ -448,6 +482,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         address: Felt,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Felt> {
+SYSCALL_COUNTER.lock().unwrap().storage_read += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.storage_read.base_syscall_cost(),
@@ -473,6 +509,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         value: Felt,
         remaining_gas: &mut u64,
     ) -> SyscallResult<()> {
+        SYSCALL_COUNTER.lock().unwrap().storage_write += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.storage_write.base_syscall_cost(),
@@ -497,6 +535,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         data: &[Felt],
         remaining_gas: &mut u64,
     ) -> SyscallResult<()> {
+        SYSCALL_COUNTER.lock().unwrap().emit_event += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.emit_event.base_syscall_cost(),
@@ -517,6 +557,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         payload: &[Felt],
         remaining_gas: &mut u64,
     ) -> SyscallResult<()> {
+        SYSCALL_COUNTER.lock().unwrap().send_message_to_l1 += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.send_message_to_l1.base_syscall_cost(),
@@ -530,6 +572,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
     }
 
     fn keccak(&mut self, input: &[u64], remaining_gas: &mut u64) -> SyscallResult<U256> {
+        SYSCALL_COUNTER.lock().unwrap().keccak += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.keccak.base_syscall_cost(),
@@ -550,6 +594,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         y: U256,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Option<Secp256k1Point>> {
+        SYSCALL_COUNTER.lock().unwrap().secp256k1_new += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256k1_new.base_syscall_cost(),
@@ -566,6 +612,7 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         p1: Secp256k1Point,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Secp256k1Point> {
+        SYSCALL_COUNTER.lock().unwrap().secp256k1_add += 1;
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256k1_add.base_syscall_cost(),
@@ -580,6 +627,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         m: U256,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Secp256k1Point> {
+        SYSCALL_COUNTER.lock().unwrap().secp256k1_mul += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256k1_mul.base_syscall_cost(),
@@ -594,6 +643,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         y_parity: bool,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Option<Secp256k1Point>> {
+        SYSCALL_COUNTER.lock().unwrap().secp256k1_get_point_from_x += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256k1_get_point_from_x.base_syscall_cost(),
@@ -609,6 +660,7 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         p: Secp256k1Point,
         remaining_gas: &mut u64,
     ) -> SyscallResult<(U256, U256)> {
+        SYSCALL_COUNTER.lock().unwrap().secp256k1_get_xy += 1;
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256k1_get_xy.base_syscall_cost(),
@@ -623,6 +675,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         y: U256,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Option<Secp256r1Point>> {
+        SYSCALL_COUNTER.lock().unwrap().secp256r1_new += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256r1_new.base_syscall_cost(),
@@ -639,6 +693,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         p1: Secp256r1Point,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Secp256r1Point> {
+        SYSCALL_COUNTER.lock().unwrap().secp256r1_add += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256r1_add.base_syscall_cost(),
@@ -652,6 +708,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         m: U256,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Secp256r1Point> {
+        SYSCALL_COUNTER.lock().unwrap().secp256r1_mul += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256r1_mul.base_syscall_cost(),
@@ -666,6 +724,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         y_parity: bool,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Option<Secp256r1Point>> {
+        SYSCALL_COUNTER.lock().unwrap().secp256r1_get_point_from_x += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256r1_get_point_from_x.base_syscall_cost(),
@@ -681,6 +741,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         p: Secp256r1Point,
         remaining_gas: &mut u64,
     ) -> SyscallResult<(U256, U256)> {
+        SYSCALL_COUNTER.lock().unwrap().secp256r1_get_xy += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.secp256r1_get_xy.base_syscall_cost(),
@@ -695,6 +757,8 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         current_block: &[u32; 16],
         remaining_gas: &mut u64,
     ) -> SyscallResult<()> {
+        SYSCALL_COUNTER.lock().unwrap().sha256_process_block += 1;
+
         self.pre_execute_syscall(
             remaining_gas,
             self.gas_costs().syscalls.sha256_process_block.base_syscall_cost(),
@@ -720,6 +784,7 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         signature: &[Felt],
         remaining_gas: &mut u64,
     ) -> SyscallResult<Vec<Felt>> {
+        SYSCALL_COUNTER.lock().unwrap().meta_tx_v0 += 1;
         todo!(
             "implement meta_tx_v0 {:?}",
             (address, entry_point_selector, calldata, signature, remaining_gas)