blockifier: box TransactionFeeError in TransactionPreValidationError

dorimedini-starkware · dorimedini-starkware · commit 0b1815b9cc68 · 2025-06-30T15:13:44.000+03:00
diff --git a/crates/apollo_gateway/src/stateful_transaction_validator_test.rs b/crates/apollo_gateway/src/stateful_transaction_validator_test.rs
@@ -6,10 +6,7 @@ use apollo_gateway_types::deprecated_gateway_error::{
     StarknetErrorCode,
 };
 use apollo_mempool_types::communication::MockMempoolClient;
-use blockifier::blockifier::stateful_validator::{
-    StatefulValidatorError as BlockifierStatefulValidatorError,
-    StatefulValidatorResult as BlockifierStatefulValidatorResult,
-};
+use blockifier::blockifier::stateful_validator::StatefulValidatorError as BlockifierStatefulValidatorError;
 use blockifier::context::ChainInfo;
 use blockifier::test_utils::contracts::FeatureContractTrait;
 use blockifier::transaction::errors::{TransactionFeeError, TransactionPreValidationError};
@@ -43,39 +40,35 @@ use crate::stateful_transaction_validator::{
     StatefulTransactionValidator,
 };
 
-pub const STATEFUL_VALIDATOR_FEE_ERROR: BlockifierStatefulValidatorError =
-    BlockifierStatefulValidatorError::TransactionPreValidationError(
-        TransactionPreValidationError::TransactionFeeError(
-            TransactionFeeError::GasBoundsExceedBalance {
-                resource: Resource::L1DataGas,
-                max_amount: GasAmount(VALID_L1_GAS_MAX_AMOUNT),
-                max_price: GasPrice(VALID_L1_GAS_MAX_PRICE_PER_UNIT),
-                balance: BigUint::ZERO,
-            },
-        ),
-    );
-
 #[fixture]
 fn stateful_validator() -> StatefulTransactionValidator {
     StatefulTransactionValidator { config: StatefulTransactionValidatorConfig::default() }
 }
 
 // TODO(Arni): consider testing declare and deploy account.
 #[rstest]
-#[case::valid_tx(
-    create_executable_invoke_tx(CairoVersion::Cairo1(RunnableCairo1::Casm)),
-    Ok(())
-)]
-#[case::invalid_tx(
-    create_executable_invoke_tx(CairoVersion::Cairo1(RunnableCairo1::Casm)),
-    Err(STATEFUL_VALIDATOR_FEE_ERROR)
-)]
+#[case::valid_tx(create_executable_invoke_tx(CairoVersion::Cairo1(RunnableCairo1::Casm)), true)]
+#[case::invalid_tx(create_executable_invoke_tx(CairoVersion::Cairo1(RunnableCairo1::Casm)), false)]
 #[tokio::test]
 async fn test_stateful_tx_validator(
     #[case] executable_tx: AccountTransaction,
-    #[case] expected_result: BlockifierStatefulValidatorResult<()>,
+    #[case] expect_ok: bool,
     stateful_validator: StatefulTransactionValidator,
 ) {
+    let expected_result = if expect_ok {
+        Ok(())
+    } else {
+        Err(BlockifierStatefulValidatorError::TransactionPreValidationError(
+            TransactionPreValidationError::TransactionFeeError(Box::new(
+                TransactionFeeError::GasBoundsExceedBalance {
+                    resource: Resource::L1DataGas,
+                    max_amount: GasAmount(VALID_L1_GAS_MAX_AMOUNT),
+                    max_price: GasPrice(VALID_L1_GAS_MAX_PRICE_PER_UNIT),
+                    balance: BigUint::ZERO,
+                },
+            )),
+        ))
+    };
     let expected_result_as_stateful_transaction_result = expected_result
         .as_ref()
         .map(|validate_result| *validate_result)
diff --git a/crates/blockifier/src/transaction/account_transaction.rs b/crates/blockifier/src/transaction/account_transaction.rs
@@ -258,7 +258,7 @@ impl AccountTransaction {
         if self.execution_flags.charge_fee {
             self.check_fee_bounds(tx_context)?;
 
-            verify_can_pay_committed_bounds(state, tx_context)?;
+            verify_can_pay_committed_bounds(state, tx_context).map_err(Box::new)?;
         }
 
         Ok(())
@@ -345,9 +345,9 @@ impl AccountTransaction {
                     )
                     .collect::<Vec<_>>();
                 if !insufficiencies.is_empty() {
-                    return Err(TransactionFeeError::InsufficientResourceBounds {
+                    return Err(Box::new(TransactionFeeError::InsufficientResourceBounds {
                         errors: insufficiencies,
-                    })?;
+                    }))?;
                 }
             }
             TransactionInfo::Deprecated(context) => {
@@ -359,9 +359,9 @@ impl AccountTransaction {
                     tx_context.effective_tip(),
                 );
                 if max_fee < min_fee {
-                    return Err(TransactionPreValidationError::TransactionFeeError(
+                    return Err(TransactionPreValidationError::TransactionFeeError(Box::new(
                         TransactionFeeError::MaxFeeTooLow { min_fee, max_fee },
-                    ));
+                    )));
                 }
             }
         };
diff --git a/crates/blockifier/src/transaction/errors.rs b/crates/blockifier/src/transaction/errors.rs
@@ -141,7 +141,7 @@ pub enum TransactionPreValidationError {
     #[error(transparent)]
     StateError(#[from] StateError),
     #[error(transparent)]
-    TransactionFeeError(#[from] TransactionFeeError),
+    TransactionFeeError(#[from] Box<TransactionFeeError>),
 }
 
 #[derive(Debug, Error)]
diff --git a/crates/blockifier/src/transaction/execution_flavors_test.rs b/crates/blockifier/src/transaction/execution_flavors_test.rs
@@ -280,11 +280,10 @@ fn test_simulate_validate_pre_validate_with_charge_fee(
         assert_matches!(
             err,
             TransactionExecutionError::TransactionPreValidationError(boxed_error)
-            if matches!(
+            => assert_matches!(
                 *boxed_error,
-                TransactionPreValidationError::TransactionFeeError(
-                    TransactionFeeError::MaxFeeTooLow { .. }
-                )
+                TransactionPreValidationError::TransactionFeeError(boxed_fee_error)
+                if matches!(*boxed_fee_error, TransactionFeeError::MaxFeeTooLow { .. })
             )
         );
     } else {
@@ -293,13 +292,15 @@ fn test_simulate_validate_pre_validate_with_charge_fee(
             TransactionExecutionError::TransactionPreValidationError(boxed_error)
             => assert_matches!(
                 *boxed_error,
-                TransactionPreValidationError::TransactionFeeError(
-                    TransactionFeeError::InsufficientResourceBounds { errors }
-                )
+                TransactionPreValidationError::TransactionFeeError(boxed_fee_error)
                 => assert_matches!(
-                    errors[0],
-                    ResourceBoundsError::MaxGasAmountTooLow { resource , .. }
-                    if resource == Resource::L1Gas
+                    *boxed_fee_error,
+                    TransactionFeeError::InsufficientResourceBounds { errors }
+                    => assert_matches!(
+                        errors[0],
+                        ResourceBoundsError::MaxGasAmountTooLow { resource , .. }
+                        if resource == Resource::L1Gas
+                    )
                 )
             )
         );
@@ -334,9 +335,11 @@ fn test_simulate_validate_pre_validate_with_charge_fee(
         assert_matches!(
             result.unwrap_err(),
             TransactionExecutionError::TransactionPreValidationError(boxed_error)
-            if matches!(
+            => assert_matches!(
                 *boxed_error,
-                TransactionPreValidationError::TransactionFeeError(
+                TransactionPreValidationError::TransactionFeeError(boxed_fee_error)
+                => assert_matches!(
+                    *boxed_fee_error,
                     TransactionFeeError::MaxFeeExceedsBalance { .. }
                 )
             )
@@ -345,12 +348,14 @@ fn test_simulate_validate_pre_validate_with_charge_fee(
         assert_matches!(
             result.unwrap_err(),
             TransactionExecutionError::TransactionPreValidationError(boxed_error)
-            if matches!(
+            => assert_matches!(
                 *boxed_error,
-                TransactionPreValidationError::TransactionFeeError(
+                TransactionPreValidationError::TransactionFeeError(boxed_fee_error)
+                => assert_matches!(
+                    *boxed_fee_error,
                     TransactionFeeError::GasBoundsExceedBalance {resource, .. }
+                    if resource == Resource::L1Gas
                 )
-                if resource == Resource::L1Gas
             )
         );
     }
@@ -380,13 +385,15 @@ fn test_simulate_validate_pre_validate_with_charge_fee(
             TransactionExecutionError::TransactionPreValidationError(boxed_error)
             => assert_matches!(
                 *boxed_error,
-                TransactionPreValidationError::TransactionFeeError(
-                    TransactionFeeError::InsufficientResourceBounds{ errors }
-                )
+                TransactionPreValidationError::TransactionFeeError(boxed_fee_error)
                 => assert_matches!(
-                    errors[0],
-                    ResourceBoundsError::MaxGasPriceTooLow { resource, .. }
-                    if resource == Resource::L1Gas
+                    *boxed_fee_error,
+                    TransactionFeeError::InsufficientResourceBounds{ errors }
+                    => assert_matches!(
+                        errors[0],
+                        ResourceBoundsError::MaxGasPriceTooLow { resource, .. }
+                        if resource == Resource::L1Gas
+                    )
                 )
             )
         );
diff --git a/crates/blockifier/src/transaction/transactions_test.rs b/crates/blockifier/src/transaction/transactions_test.rs

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ impl AccountTransaction {`
`258`	`258`	`if self.execution_flags.charge_fee {`
`259`	`259`	`self.check_fee_bounds(tx_context)?;`
`260`	`260`
`261`		`- verify_can_pay_committed_bounds(state, tx_context)?;`
	`261`	`+ verify_can_pay_committed_bounds(state, tx_context).map_err(Box::new)?;`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`Ok(())`
`@@ -345,9 +345,9 @@ impl AccountTransaction {`
`345`	`345`	`)`
`346`	`346`	`.collect::<Vec<_>>();`
`347`	`347`	`if !insufficiencies.is_empty() {`
`348`		`- return Err(TransactionFeeError::InsufficientResourceBounds {`
	`348`	`+ return Err(Box::new(TransactionFeeError::InsufficientResourceBounds {`
`349`	`349`	`errors: insufficiencies,`
`350`		`- })?;`
	`350`	`+ }))?;`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`	`TransactionInfo::Deprecated(context) => {`
`@@ -359,9 +359,9 @@ impl AccountTransaction {`
`359`	`359`	`tx_context.effective_tip(),`
`360`	`360`	`);`
`361`	`361`	`if max_fee < min_fee {`
`362`		`- return Err(TransactionPreValidationError::TransactionFeeError(`
	`362`	`+ return Err(TransactionPreValidationError::TransactionFeeError(Box::new(`
`363`	`363`	`TransactionFeeError::MaxFeeTooLow { min_fee, max_fee },`
`364`		`- ));`
	`364`	`+ )));`
`365`	`365`	`}`
`366`	`366`	`}`
`367`	`367`	`};`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ pub enum TransactionPreValidationError {`
`141`	`141`	`#[error(transparent)]`
`142`	`142`	`StateError(#[from] StateError),`
`143`	`143`	`#[error(transparent)]`
`144`		`- TransactionFeeError(#[from] TransactionFeeError),`
	`144`	`+ TransactionFeeError(#[from] Box<TransactionFeeError>),`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`#[derive(Debug, Error)]`