chore(blockifier): have limit_steps_by_resources flag rep charge_fee …

…flag and enforce_fee ret val

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();
         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/versioned_state_test.rs

@@ -277,7 +277,7 @@ fn test_run_parallel_txs(max_resource_bounds: ValidResourceBounds) {
         });
         s.spawn(move || {
             let charge_fee_2 = account_tx_2.create_tx_info().enforce_fee();
-            account_tx_2.execute(&mut state_2, &block_context_2, charge_fee_2, true).unwrap(); 
+            account_tx_2.execute(&mut state_2, &block_context_2, charge_fee_2, true).unwrap();
             // Check that the constructor wrote ctor_arg to the storage.
             let storage_key = get_storage_var_address("ctor_arg", &[]);
             let deployed_contract_address = calculate_contract_address(

crates/blockifier/src/concurrency/worker_logic.rs

@@ -131,7 +131,7 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
     fn execute_tx(&self, tx_index: TxIndex) {
         let mut tx_versioned_state = self.state.pin_version(tx_index);
         let tx = &self.chunk[tx_index];
-        let tx_charge_fee = tx.create_tx_info().enforce_fee(); 
+        let tx_charge_fee = tx.create_tx_info().enforce_fee();
         let mut transactional_state =
             TransactionalState::create_transactional(&mut tx_versioned_state);
         let execution_flags =

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();
     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,7 @@ 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 {
             return block_upper_bound;
         }
 

crates/blockifier/src/execution/stack_trace_test.rs

@@ -622,7 +622,7 @@ Execution failed. Failure reason: 0x496e76616c6964207363656e6172696f ('Invalid s
     let re = Regex::new(r"pc=0:[0-9]+").unwrap();
     let cleaned_expected_error = &re.replace_all(&expected_error, "pc=0:*");
     let charge_fee = account_tx.create_tx_info().enforce_fee();
-    let actual_error = account_tx.execute(state, block_context, charge_fee, true).unwrap_err(); 
+    let actual_error = account_tx.execute(state, block_context, charge_fee, true).unwrap_err();
     let actual_error_str = actual_error.to_string();
     let cleaned_actual_error = &re.replace_all(&actual_error_str, "pc=0:*");
     // Compare actual trace to the expected trace (sans pc locations).

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

@@ -242,7 +242,6 @@ fn test_get_execution_info(
         ),
         ..trivial_external_entry_point_with_address(test_contract_address)
     };
-
     let result = match execution_mode {
         ExecutionMode::Validate => {
             entry_point_call.execute_directly_given_tx_info_in_validate_mode(state, tx_info, false)

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();
+        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();
         self.execute_directly_given_tx_info_in_validate_mode(
             state,
-            TransactionInfo::Deprecated(DeprecatedTransactionInfo::default()),
-            true,
+            tx_info,
+            limit_steps_by_resources,
         )
     }
 

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();
+        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/test_utils.rs

@@ -298,12 +298,7 @@ pub fn run_invoke_tx(
     let tx_context = Arc::new(block_context.to_tx_context(&tx));
     let charge_fee = tx_context.tx_info.enforce_fee();
 
-    account_invoke_tx(invoke_args).execute(
-        state,
-        block_context,
-        charge_fee,
-        true,
-    )
+    account_invoke_tx(invoke_args).execute(state, block_context, charge_fee, true)
 }
 
 /// Creates a `ResourceBoundsMapping` with the given `max_amount` and `max_price` for L1 gas limits.

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;
         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/blockifier/src/transaction/transactions_test.rs

@@ -1761,7 +1761,7 @@ fn test_validate_accounts_tx(
                 ..default_args
             },
         );
-        let result = account_tx.execute(state, block_context, default_charge_fee, true); 
+        let result = account_tx.execute(state, block_context, default_charge_fee, true);
         assert!(result.is_ok(), "Execution failed: {:?}", result.unwrap_err());
     }
 }

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());
+    let limit_steps_by_resources = tx_info.enforce_fee();
 
     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