fix(blockifier): enforce fee for allresourcebounds when l1 gas is 0

starkware-libs · Sep 16, 2024 · 808d19d · 808d19d
1 parent 38cefc8
commit 808d19d
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/crates/blockifier/src/transaction/objects.rs b/crates/blockifier/src/transaction/objects.rs
@@ -103,11 +103,22 @@ impl TransactionInfo {
 
     pub fn enforce_fee(&self) -> bool {
         match self {
-            TransactionInfo::Current(context) => {
-                let l1_bounds = context.l1_resource_bounds();
-                let max_amount: u128 = l1_bounds.max_amount.into();
-                max_amount * l1_bounds.max_price_per_unit > 0
-            }
+            TransactionInfo::Current(context) => match &context.resource_bounds {
+                ValidResourceBounds::L1Gas(l1_bounds) => {
+                    let max_amount: u128 = l1_bounds.max_amount.into();
+                    max_amount * l1_bounds.max_price_per_unit > 0
+                }
+                ValidResourceBounds::AllResources(AllResourceBounds {
+                    l1_gas,
+                    l2_gas,
+                    l1_data_gas,
+                }) => {
+                    u128::from(l1_gas.max_amount) * l1_gas.max_price_per_unit
+                        + u128::from(l2_gas.max_amount) * l2_gas.max_price_per_unit
+                        + u128::from(l1_data_gas.max_amount) * l1_data_gas.max_price_per_unit
+                        > 0
+                }
+            },
             TransactionInfo::Deprecated(context) => context.max_fee != Fee(0),
         }
     }