Push clean changes

Author: fmoletta

src/definitions/constants.rs

@@ -14,13 +14,6 @@ pub(crate) const N_DEFAULT_TOPICS: usize = 1; // Events have one default topic.
 pub(crate) const CONSUMED_MSG_TO_L2_ENCODED_DATA_SIZE: usize =
     (L1_TO_L2_MSG_HEADER_SIZE + 1) - CONSUMED_MSG_TO_L2_N_TOPICS;
 
-/// Sender and sequencer balance updates.
-pub(crate) const FEE_TRANSFER_N_STORAGE_CHANGES: usize = 2;
-
-/// Exclude the sequencer balance update, since it's charged once throught the batch.
-pub(crate) const FEE_TRANSFER_N_STORAGE_CHANGES_TO_CHARGE: usize =
-    FEE_TRANSFER_N_STORAGE_CHANGES - 1;
-
 lazy_static! {
     pub(crate) static ref QUERY_VERSION_BASE: Felt252 =
         felt_str!("340282366920938463463374607431768211456");

src/state/cached_state.rs

@@ -265,7 +265,6 @@ impl<T: StateReader> State for CachedState<T> {
             self.cache.storage_initial_values.clone(),
         );
 
-        let n_modified_contracts = {
             let storage_unique_updates = storage_updates.keys().map(|k| k.0.clone());
 
             let class_hash_updates: Vec<_> = subtract_mappings(
@@ -289,8 +288,6 @@ impl<T: StateReader> State for CachedState<T> {
             modified_contracts.extend(class_hash_updates);
             modified_contracts.extend(nonce_updates);
 
-            modified_contracts.len()
-        };
 
         // Add fee transfer storage update before actually charging it, as it needs to be included in the
         // calculation of the final fee.
@@ -300,9 +297,10 @@ impl<T: StateReader> State for CachedState<T> {
                 (fee_token_address.clone(), sender_low_key),
                 Felt252::default(),
             );
+            modified_contracts.remove(fee_token_address);
         }
 
-        Ok((n_modified_contracts, storage_updates.len()))
+        Ok((modified_contracts.len(), storage_updates.len()))
     }
 
     fn get_class_hash_at(&mut self, contract_address: &Address) -> Result<ClassHash, StateError> {

src/utils.rs

@@ -1,5 +1,4 @@
 use crate::core::errors::hash_errors::HashError;
-use crate::definitions::constants::FEE_TRANSFER_N_STORAGE_CHANGES_TO_CHARGE;
 use crate::services::api::contract_classes::deprecated_contract_class::EntryPointType;
 use crate::state::state_api::State;
 use crate::{
@@ -188,7 +187,7 @@ pub fn calculate_tx_resources(
     let l1_gas_usage = calculate_tx_gas_usage(
         l2_to_l1_messages,
         n_modified_contracts,
-        n_storage_changes + FEE_TRANSFER_N_STORAGE_CHANGES_TO_CHARGE,
+        n_storage_changes,
         l1_handler_payload_size,
         n_deployments,
     );