chore(blockifier): have limit_steps_by_resources flag represent charg…

…e_fee flag and enforce_fee return value

crates/blockifier/src/blockifier/stateful_validator.rs

@@ -115,7 +115,7 @@ impl<S: StateReader> StatefulValidator<S> {
         let mut execution_resources = ExecutionResources::default();
         let tx_context = Arc::new(self.tx_executor.block_context.to_tx_context(tx));
 
-        let limit_steps_by_resources = true;
+        let limit_steps_by_resources =  tx.create_tx_info().enforce_fee(); //aviv: was true;
         let validate_call_info = tx.validate_tx(
             self.tx_executor.block_state.as_mut().expect(BLOCK_STATE_ACCESS_ERR),
             &mut execution_resources,

crates/blockifier/src/concurrency/worker_logic.rs

@@ -27,6 +27,7 @@ use crate::transaction::objects::{
     TransactionExecutionResult,
     TransactionInfoCreator,
 };
+
 use crate::transaction::transaction_execution::Transaction;
 use crate::transaction::transactions::{ExecutableTransaction, ExecutionFlags};
 

crates/blockifier/src/execution/deprecated_syscalls/deprecated_syscalls_test.rs

@@ -488,7 +488,7 @@ fn test_tx_info(#[values(false, true)] only_query: bool) {
         },
         max_fee,
     });
-    let limit_steps_by_resources = true;
+    let limit_steps_by_resources = tx_info.enforce_fee(); //aviv: was true
     let result = entry_point_call
         .execute_directly_given_tx_info(&mut state, tx_info, limit_steps_by_resources)
         .unwrap();

crates/blockifier/src/execution/entry_point.rs

@@ -183,7 +183,8 @@ impl EntryPointExecutionContext {
                 .expect("Failed to convert invoke_tx_max_n_steps (u32) to usize."),
         };
 
-        if !limit_steps_by_resources || !tx_info.enforce_fee() {
+        if !limit_steps_by_resources {
+            // aviv: was with '|| !tx_info.enforce_fee()'
             return block_upper_bound;
         }
 

crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs

@@ -242,13 +242,13 @@ fn test_get_execution_info(
         ),
         ..trivial_external_entry_point_with_address(test_contract_address)
     };
-
+    // let limit_steps_by_resources = tx_info.enforce_fee(); // aviv: new
     let result = match execution_mode {
         ExecutionMode::Validate => {
-            entry_point_call.execute_directly_given_tx_info_in_validate_mode(state, tx_info, false)
+            entry_point_call.execute_directly_given_tx_info_in_validate_mode(state, tx_info, false) //aviv: was ',false)': not needed?
         }
         ExecutionMode::Execute => {
-            entry_point_call.execute_directly_given_tx_info(state, tx_info, false)
+            entry_point_call.execute_directly_given_tx_info(state, tx_info, false) //aviv: was ',false)': not needed?
         }
     };
 

crates/blockifier/src/test_utils/prices.rs

@@ -74,7 +74,7 @@ fn fee_transfer_resources(
             &mut EntryPointExecutionContext::new(
                 Arc::new(block_context.to_tx_context(&account_invoke_tx(InvokeTxArgs::default()))),
                 ExecutionMode::Execute,
-                false,
+                false, // aviv: limit_steps_by_resources: can be enforce_fee() instead of false.?
             ),
         )
         .unwrap()

crates/blockifier/src/test_utils/struct_impls.rs

@@ -54,11 +54,9 @@ impl CallEntryPoint {
     /// Executes the call directly, without account context. Limits the number of steps by resource
     /// bounds.
     pub fn execute_directly(self, state: &mut dyn State) -> EntryPointExecutionResult<CallInfo> {
-        self.execute_directly_given_tx_info(
-            state,
-            TransactionInfo::Deprecated(DeprecatedTransactionInfo::default()),
-            true,
-        )
+        let tx_info = TransactionInfo::Deprecated(DeprecatedTransactionInfo::default());
+        let limit_steps_by_resources = tx_info.enforce_fee(); // aviv: new
+        self.execute_directly_given_tx_info(state, tx_info, limit_steps_by_resources)
     }
 
     pub fn execute_directly_given_tx_info(
@@ -80,10 +78,12 @@ impl CallEntryPoint {
         self,
         state: &mut dyn State,
     ) -> EntryPointExecutionResult<CallInfo> {
+        let tx_info = TransactionInfo::Deprecated(DeprecatedTransactionInfo::default());
+        let limit_steps_by_resources = tx_info.enforce_fee(); // aviv: new
         self.execute_directly_given_tx_info_in_validate_mode(
             state,
-            TransactionInfo::Deprecated(DeprecatedTransactionInfo::default()),
-            true,
+            tx_info,
+            limit_steps_by_resources,
         )
     }
 
@@ -93,6 +93,7 @@ impl CallEntryPoint {
         tx_info: TransactionInfo,
         limit_steps_by_resources: bool,
     ) -> EntryPointExecutionResult<CallInfo> {
+        // aviv: let limit_steps = limit_steps_by_resources && tx_info.enforce_fee();
         let tx_context =
             TransactionContext { block_context: BlockContext::create_for_testing(), tx_info };
         let mut context = EntryPointExecutionContext::new_validate(

crates/blockifier/src/transaction/account_transaction.rs

@@ -404,8 +404,9 @@ impl AccountTransaction {
             // The fee-token contract is a Cairo 0 contract, hence the initial gas is irrelevant.
             initial_gas: block_context.versioned_constants.os_constants.gas_costs.initial_gas_cost,
         };
-
-        let mut context = EntryPointExecutionContext::new_invoke(tx_context, true);
+        let limit_steps_by_resources = tx_info.enforce_fee(); //aviv: new
+        let mut context =
+            EntryPointExecutionContext::new_invoke(tx_context, limit_steps_by_resources);
 
         Ok(fee_transfer_call
             .execute(state, &mut ExecutionResources::default(), &mut context)

crates/blockifier/src/transaction/transaction_execution.rs

@@ -113,12 +113,13 @@ impl<U: UpdatableState> ExecutableTransaction<U> for L1HandlerTransaction {
         &self,
         state: &mut TransactionalState<'_, U>,
         block_context: &BlockContext,
-        _execution_flags: ExecutionFlags,
+        execution_flags: ExecutionFlags,
     ) -> TransactionExecutionResult<TransactionExecutionInfo> {
         let tx_context = Arc::new(block_context.to_tx_context(self));
-
+        let limit_steps_by_resources = execution_flags.charge_fee; // aviv: new
         let mut execution_resources = ExecutionResources::default();
-        let mut context = EntryPointExecutionContext::new_invoke(tx_context.clone(), true);
+        let mut context =
+            EntryPointExecutionContext::new_invoke(tx_context.clone(), limit_steps_by_resources);
         let mut remaining_gas = block_context.versioned_constants.tx_initial_gas();
         let execute_call_info =
             self.run_execute(state, &mut execution_resources, &mut context, &mut remaining_gas)?;

crates/papyrus_execution/src/lib.rs

@@ -247,14 +247,13 @@ pub fn execute_call(
         execution_config,
         override_kzg_da_to_false,
     )?;
+    // TODO(yair): fix when supporting v3 transactions
+    let tx_info = TransactionInfo::Deprecated(DeprecatedTransactionInfo::default()); // aviv: new
+    let limit_steps_by_resources = tx_info.enforce_fee(); // aviv: new
 
     let mut context = EntryPointExecutionContext::new_invoke(
-        // TODO(yair): fix when supporting v3 transactions
-        Arc::new(TransactionContext {
-            block_context,
-            tx_info: TransactionInfo::Deprecated(DeprecatedTransactionInfo::default()),
-        }),
-        true, // limit_steps_by_resources
+        Arc::new(TransactionContext { block_context, tx_info }),
+        limit_steps_by_resources,
     );
 
     let res = call_entry_point