blockifier: split execution summary to tx & builtins

Author: avivg-starkware

crates/blockifier/src/bouncer.rs

@@ -13,7 +13,7 @@ use crate::blockifier::transaction_executor::{
     TransactionExecutorResult,
 };
 use crate::blockifier_versioned_constants::VersionedConstants;
-use crate::execution::call_info::{BuiltinCounterMap, ExecutionSummary};
+use crate::execution::call_info::{BuiltinCounterMap, ExecutionSummary, SummaryWithBuiltins};
 use crate::fee::gas_usage::get_onchain_data_segment_length;
 use crate::fee::resources::TransactionResources;
 use crate::state::cached_state::{StateChangesKeys, StorageEntry};
@@ -502,12 +502,13 @@ impl Bouncer {
         &mut self,
         state_reader: &S,
         tx_state_changes_keys: &StateChangesKeys,
-        tx_execution_summary: &ExecutionSummary,
+        summary: &SummaryWithBuiltins,
         tx_resources: &TransactionResources,
         versioned_constants: &VersionedConstants,
     ) -> TransactionExecutorResult<()> {
         // The countings here should be linear in the transactional state changes and execution info
         // rather than the cumulative state attributes.
+        let (tx_execution_summary, tx_builtin_counters) = summary;
         let marginal_state_changes_keys =
             tx_state_changes_keys.difference(&self.state_changes_keys);
         let marginal_executed_class_hashes = tx_execution_summary
@@ -526,7 +527,7 @@ impl Bouncer {
             tx_resources,
             &marginal_state_changes_keys,
             versioned_constants,
-            &tx_execution_summary.builtin_counters,
+            &tx_builtin_counters,
             &self.bouncer_config.builtin_weights,
         )?;
 
@@ -861,20 +862,21 @@ pub fn get_particia_update_resources(n_visited_storage_entries: usize) -> Execut
 #[allow(clippy::result_large_err)]
 pub fn verify_tx_weights_within_max_capacity<S: StateReader>(
     state_reader: &S,
-    tx_execution_summary: &ExecutionSummary,
+    summary: &SummaryWithBuiltins,
     tx_resources: &TransactionResources,
     tx_state_changes_keys: &StateChangesKeys,
     bouncer_config: &BouncerConfig,
     versioned_constants: &VersionedConstants,
 ) -> TransactionExecutionResult<()> {
+    let (tx_execution_summary, tx_builtin_counters) = summary;
     let tx_weights = get_tx_weights(
         state_reader,
         &tx_execution_summary.executed_class_hashes,
         tx_execution_summary.visited_storage_entries.len(),
         tx_resources,
         tx_state_changes_keys,
         versioned_constants,
-        &tx_execution_summary.builtin_counters,
+        tx_builtin_counters,
         &bouncer_config.builtin_weights,
     )?
     .bouncer_weights;

crates/blockifier/src/bouncer_test.rs

@@ -217,6 +217,8 @@ fn test_bouncer_try_update_sierra_gas(
 
     // Prepare the resources to be added to the bouncer.
     let execution_summary = ExecutionSummary::default();
+    let builtin_counters = BuiltinCounterMap::default();
+    let summary = (execution_summary, builtin_counters);
     let tx_resources = TransactionResources {
         // Only the `sierra_gas` field is varied.
         computation: ComputationResources { sierra_gas: added_gas, ..Default::default() },
@@ -230,7 +232,7 @@ fn test_bouncer_try_update_sierra_gas(
     // Check that the transaction is not too large.
     let mut result = verify_tx_weights_within_max_capacity(
         &transactional_state,
-        &execution_summary,
+        &summary,
         &tx_resources,
         &tx_state_changes_keys,
         &bouncer.bouncer_config,
@@ -249,7 +251,7 @@ fn test_bouncer_try_update_sierra_gas(
         result = bouncer.try_update(
             &transactional_state,
             &tx_state_changes_keys,
-            &execution_summary,
+            &summary,
             &tx_resources,
             &block_context.versioned_constants,
         );
@@ -294,7 +296,7 @@ fn test_bouncer_try_update_n_txs(
     let mut result = bouncer.try_update(
         &first_transactional_state,
         &first_tx_state_changes_keys,
-        &ExecutionSummary::default(),
+        &(ExecutionSummary::default(), BuiltinCounterMap::default()),
         &TransactionResources::default(),
         &block_context.versioned_constants,
     );
@@ -309,7 +311,7 @@ fn test_bouncer_try_update_n_txs(
     result = bouncer.try_update(
         &second_transactional_state,
         &second_tx_state_changes_keys,
-        &ExecutionSummary::default(),
+        &(ExecutionSummary::default(), BuiltinCounterMap::default()),
         &TransactionResources::default(),
         &block_context.versioned_constants,
     );

crates/blockifier/src/execution/call_info.rs

@@ -97,14 +97,15 @@ impl EventSummary {
 
 pub type BuiltinCounterMap = HashMap<BuiltinName, usize>;
 
+pub type SummaryWithBuiltins = (ExecutionSummary, BuiltinCounterMap);
+
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct ExecutionSummary {
     pub charged_resources: ChargedResources,
     pub executed_class_hashes: HashSet<ClassHash>,
     pub visited_storage_entries: HashSet<StorageEntry>,
     pub l2_to_l1_payload_lengths: Vec<usize>,
     pub event_summary: EventSummary,
-    pub builtin_counters: BuiltinCounterMap,
 }
 
 impl Add for ExecutionSummary {
@@ -115,7 +116,6 @@ impl Add for ExecutionSummary {
         self.executed_class_hashes.extend(other.executed_class_hashes);
         self.visited_storage_entries.extend(other.visited_storage_entries);
         self.l2_to_l1_payload_lengths.extend(other.l2_to_l1_payload_lengths);
-        add_maps(&mut self.builtin_counters, &other.builtin_counters);
         self.event_summary += other.event_summary;
         self
     }
@@ -257,7 +257,6 @@ impl CallInfo {
         let mut visited_storage_entries: HashSet<StorageEntry> = HashSet::new();
         let mut event_summary = EventSummary::default();
         let mut l2_to_l1_payload_lengths = Vec::new();
-        let mut builtin_counters = BuiltinCounterMap::new();
 
         for call_info in self.iter() {
             // Class hashes.
@@ -282,8 +281,6 @@ impl CallInfo {
                     .map(|message| message.message.payload.0.len()),
             );
 
-            add_maps(&mut builtin_counters, &call_info.builtin_counters);
-
             // Events: all event resources in the execution tree, unless executing a 0.13.1 block.
             if !versioned_constants.ignore_inner_event_resources {
                 event_summary += call_info.specific_event_summary();
@@ -307,10 +304,19 @@ impl CallInfo {
             visited_storage_entries,
             l2_to_l1_payload_lengths,
             event_summary,
-            builtin_counters,
         }
     }
 
+
+    pub fn summarize_many_builtins<'a>(
+        call_infos: impl Iterator<Item = &'a CallInfo>,
+    ) -> BuiltinCounterMap {
+        call_infos.fold(BuiltinCounterMap::new(), |mut acc, call_info| {
+            add_maps(&mut acc, &call_info.builtin_counters);
+            acc
+        })
+    }
+
     pub fn summarize_many<'a>(
         call_infos: impl Iterator<Item = &'a CallInfo>,
         versioned_constants: &VersionedConstants,

crates/blockifier/src/transaction/objects.rs

@@ -22,7 +22,7 @@ use starknet_api::transaction::{
 
 use crate::abi::constants as abi_constants;
 use crate::blockifier_versioned_constants::VersionedConstants;
-use crate::execution::call_info::{BuiltinCounterMap, CallInfo, ExecutionSummary};
+use crate::execution::call_info::{BuiltinCounterMap, CallInfo, SummaryWithBuiltins};
 use crate::execution::stack_trace::ErrorStack;
 use crate::fee::fee_checks::FeeCheckError;
 use crate::fee::fee_utils::get_fee_by_gas_vector;
@@ -208,14 +208,25 @@ impl TransactionExecutionInfo {
             .chain(self.fee_transfer_call_info.iter())
     }
 
+    pub fn non_optional_call_infos_no_fee_transfer(&self) -> impl Iterator<Item = &CallInfo> {
+        self.validate_call_info.iter().chain(self.execute_call_info.iter())
+    }
+
     pub fn is_reverted(&self) -> bool {
         self.revert_error.is_some()
     }
 
     /// Returns a summary of transaction execution, including executed class hashes, visited storage
     /// entries, L2-to-L1_payload_lengths, and the number of emitted events.
-    pub fn summarize(&self, versioned_constants: &VersionedConstants) -> ExecutionSummary {
-        CallInfo::summarize_many(self.non_optional_call_infos(), versioned_constants)
+    pub fn summarize(&self, versioned_constants: &VersionedConstants) -> SummaryWithBuiltins {
+        let summary = CallInfo::summarize_many(self.non_optional_call_infos(), versioned_constants);
+        let builtins = self.summarize_builtins();
+
+        (summary, builtins)
+    }
+
+    pub fn summarize_builtins(&self) -> BuiltinCounterMap {
+        CallInfo::summarize_many_builtins(self.non_optional_call_infos_no_fee_transfer())
     }
 }
 pub trait ExecutionResourcesTraits {

crates/blockifier/src/transaction/objects_test.rs

@@ -142,7 +142,11 @@ fn test_events_counter_in_tx_execution_info(
     };
 
     assert_eq!(
-        tx_execution_info.summarize(VersionedConstants::latest_constants()).event_summary.n_events,
+        tx_execution_info
+            .summarize(VersionedConstants::latest_constants())
+            .0
+            .event_summary
+            .n_events,
         n_validate_events + n_execute_events + n_fee_transfer_events + n_inner_calls
     );
 }
@@ -171,7 +175,11 @@ fn test_events_counter_in_tx_execution_info_with_inner_call_info(#[case] n_execu
     };
 
     assert_eq!(
-        tx_execution_info.summarize(VersionedConstants::latest_constants()).event_summary.n_events,
+        tx_execution_info
+            .summarize(VersionedConstants::latest_constants())
+            .0
+            .event_summary
+            .n_events,
         n_execute_events
             + n_fee_transfer_events
             + n_execution_events
@@ -236,13 +244,14 @@ fn test_summarize(
             total_event_keys: 0,
             total_event_data_size: 0,
         },
-        // TODO(Meshi): Change it to a relevant value for this test.
-        builtin_counters: HashMap::new(),
     };
+    // TODO(Meshi): Change it to a relevant value for this test.
+    let expected_builtins = HashMap::new();
+    let expected_summary_with_builtins = (expected_summary, expected_builtins);
 
     // Call the summarize method.
     let actual_summary = tx_execution_info.summarize(VersionedConstants::latest_constants());
 
     // Compare the actual result with the expected result.
-    assert_eq!(actual_summary, expected_summary);
+    assert_eq!(actual_summary, expected_summary_with_builtins);
 }