Merge pull request #87 from bnb-chain/develop

release: prepare for v1.0.3
bnb-chain · Nov 12, 2024 · a9752c9 · a9752c9
2 parents 0978bcb + d73417e
commit a9752c9
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/crates/revm/src/optimism/handler_register.rs b/crates/revm/src/optimism/handler_register.rs
@@ -234,17 +234,18 @@ pub fn deduct_caller<SPEC: Spec, EXT, DB: Database>(
             ));
         };
 
-        let tx_l1_cost = if context.evm.inner.env.tx.gas_price.is_zero() && SPEC::enabled(WRIGHT) {
-            U256::ZERO
-        } else {
-            context
-                .evm
-                .inner
-                .l1_block_info
-                .as_ref()
-                .expect("L1BlockInfo should be loaded")
-                .calculate_tx_l1_cost(enveloped_tx, SPEC::SPEC_ID)
-        };
+        let tx_l1_cost =
+            if context.evm.inner.env.effective_gas_price().is_zero() && SPEC::enabled(WRIGHT) {
+                U256::ZERO
+            } else {
+                context
+                    .evm
+                    .inner
+                    .l1_block_info
+                    .as_ref()
+                    .expect("L1BlockInfo should be loaded")
+                    .calculate_tx_l1_cost(enveloped_tx, SPEC::SPEC_ID)
+            };
 
         if tx_l1_cost.gt(&caller_account.info.balance) {
             return Err(EVMError::Transaction(
@@ -287,11 +288,12 @@ pub fn reward_beneficiary<SPEC: Spec, EXT, DB: Database>(
             ));
         };
 
-        let l1_cost = if context.evm.inner.env.tx.gas_price.is_zero() && SPEC::enabled(WRIGHT) {
-            U256::ZERO
-        } else {
-            l1_block_info.calculate_tx_l1_cost(enveloped_tx, SPEC::SPEC_ID)
-        };
+        let l1_cost =
+            if context.evm.inner.env.effective_gas_price().is_zero() && SPEC::enabled(WRIGHT) {
+                U256::ZERO
+            } else {
+                l1_block_info.calculate_tx_l1_cost(enveloped_tx, SPEC::SPEC_ID)
+            };
 
         // Send the L1 cost of the transaction to the L1 Fee Vault.
         let mut l1_fee_vault_account = context