blockifier: remove fee builtins duplicacy in get_tx_weights

Author: avivg-starkware

crates/blockifier/src/bouncer.rs

@@ -786,8 +786,6 @@ pub fn get_tx_weights<S: StateReader>(
     add_maps(&mut builtin_counters_without_casm_hash_computation, tx_builtin_counters);
     // The transaction builtin counters does not include the transaction overhead ('additional')
     // resources.
-    // TODO(AvivG): Builtins from `fee_transfer_call_info` are counted twice - in `os_vm_resources`
-    // and again in `tx_builtin_counters`. Remove the duplication.
     add_maps(
         &mut builtin_counters_without_casm_hash_computation,
         &tx_resources.computation.os_vm_resources.prover_builtins(),

crates/blockifier/src/transaction/objects.rs

@@ -22,7 +22,12 @@ use starknet_api::transaction::{
 
 use crate::abi::constants as abi_constants;
 use crate::blockifier_versioned_constants::VersionedConstants;
-use crate::execution::call_info::{BuiltinCounterMap, CallInfo, SummaryWithBuiltins};
+use crate::execution::call_info::{
+    BuiltinCounterMap,
+    CallInfo,
+    ExecutionSummary,
+    SummaryWithBuiltins,
+};
 use crate::execution::stack_trace::ErrorStack;
 use crate::fee::fee_checks::FeeCheckError;
 use crate::fee::fee_utils::get_fee_by_gas_vector;
@@ -208,6 +213,10 @@ 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()
     }
@@ -222,7 +231,9 @@ impl TransactionExecutionInfo {
     }
 
     pub fn summarize_builtins(&self) -> BuiltinCounterMap {
-        CallInfo::summarize_many_builtins(self.non_optional_call_infos())
+        // Remove fee transfer builtins to avoid double-counting in `get_tx_weights`
+        // in bouncer.rs (already included in os_vm_resources).
+        CallInfo::summarize_many_builtins(self.non_optional_call_infos_no_fee_transfer())
     }
 }
 pub trait ExecutionResourcesTraits {