fix: remove unnecessary recomputation of total gas field (#1971)

starkware-libs · Jun 9, 2024 · c5ee585 · c5ee585
1 parent d179561
commit c5ee585
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/crates/blockifier/src/transaction/account_transaction.rs b/crates/blockifier/src/transaction/account_transaction.rs
@@ -659,7 +659,7 @@ impl<U: UpdatableState> ExecutableTransaction<U> for AccountTransaction {
                     fee: final_fee,
                     da_gas: final_da_gas,
                     resources: final_resources,
-                    ..
+                    gas: total_gas,
                 },
         } = self.run_or_revert(
             state,
@@ -670,11 +670,6 @@ impl<U: UpdatableState> ExecutableTransaction<U> for AccountTransaction {
         )?;
         let fee_transfer_call_info = self.handle_fee(state, tx_context, final_fee, charge_fee)?;
 
-        let total_gas = final_resources.to_gas_vector(
-            &block_context.versioned_constants,
-            block_context.block_info.use_kzg_da,
-        )?;
-
         let tx_execution_info = TransactionExecutionInfo {
             validate_call_info,
             execute_call_info,

diff --git a/crates/blockifier/src/transaction/transaction_execution.rs b/crates/blockifier/src/transaction/transaction_execution.rs
@@ -116,14 +116,18 @@ impl<U: UpdatableState> ExecutableTransaction<U> for L1HandlerTransaction {
             self.run_execute(state, &mut execution_resources, &mut context, &mut remaining_gas)?;
         let l1_handler_payload_size = self.payload_size();
 
-        let TransactionReceipt { fee: actual_fee, da_gas, resources: actual_resources, .. } =
-            TransactionReceipt::from_l1_handler(
-                &tx_context,
-                l1_handler_payload_size,
-                execute_call_info.iter(),
-                &state.get_actual_state_changes()?,
-                &execution_resources,
-            )?;
+        let TransactionReceipt {
+            fee: actual_fee,
+            da_gas,
+            resources: actual_resources,
+            gas: total_gas,
+        } = TransactionReceipt::from_l1_handler(
+            &tx_context,
+            l1_handler_payload_size,
+            execute_call_info.iter(),
+            &state.get_actual_state_changes()?,
+            &execution_resources,
+        )?;
 
         let paid_fee = self.paid_fee_on_l1;
         // For now, assert only that any amount of fee was paid.
@@ -132,11 +136,6 @@ impl<U: UpdatableState> ExecutableTransaction<U> for L1HandlerTransaction {
             return Err(TransactionFeeError::InsufficientL1Fee { paid_fee, actual_fee })?;
         }
 
-        let total_gas = actual_resources.to_gas_vector(
-            &block_context.versioned_constants,
-            block_context.block_info.use_kzg_da,
-        )?;
-
         Ok(TransactionExecutionInfo {
             validate_call_info: None,
             execute_call_info,