feat(blockifier): get revert receipt only in case of revert (#2471)

starkware-libs · Dec 5, 2024 · bceb1d7 · bceb1d7
1 parent 61340f7
commit bceb1d7
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/crates/blockifier/src/transaction/account_transaction.rs b/crates/blockifier/src/transaction/account_transaction.rs
@@ -588,16 +588,19 @@ impl AccountTransaction {
         // TODO(tzahi): add reverted_l2_gas to the receipt.
         let execution_steps_consumed =
             n_allotted_execution_steps - execution_context.n_remaining_steps();
-        let revert_receipt = TransactionReceipt::from_account_tx(
-            self,
-            &tx_context,
-            &validate_state_cache.to_state_diff(),
-            CallInfo::summarize_many(
-                validate_call_info.iter(),
-                &tx_context.block_context.versioned_constants,
-            ),
-            execution_steps_consumed,
-        );
+        // Get the receipt only in case of revert.
+        let get_revert_receipt = || {
+            TransactionReceipt::from_account_tx(
+                self,
+                &tx_context,
+                &validate_state_cache.to_state_diff(),
+                CallInfo::summarize_many(
+                    validate_call_info.iter(),
+                    &tx_context.block_context.versioned_constants,
+                ),
+                execution_steps_consumed,
+            )
+        };
 
         match execution_result {
             Ok(execute_call_info) => {
@@ -633,13 +636,14 @@ impl AccountTransaction {
                         // revert case, compute resources by adding consumed execution steps to
                         // validation resources).
                         execution_state.abort();
+                        let tx_receipt = TransactionReceipt {
+                            fee: post_execution_report.recommended_fee(),
+                            ..get_revert_receipt()
+                        };
                         Ok(ValidateExecuteCallInfo::new_reverted(
                             validate_call_info,
                             post_execution_error.into(),
-                            TransactionReceipt {
-                                fee: post_execution_report.recommended_fee(),
-                                ..revert_receipt
-                            },
+                            tx_receipt,
                         ))
                     }
                     None => {
@@ -654,6 +658,7 @@ impl AccountTransaction {
                 }
             }
             Err(execution_error) => {
+                let revert_receipt = get_revert_receipt();
                 // Error during execution. Revert, even if the error is sequencer-related.
                 execution_state.abort();
                 let post_execution_report =