diff --git a/crates/context/Cargo.toml b/crates/context/Cargo.toml index acde464078..1844f5b096 100644 --- a/crates/context/Cargo.toml +++ b/crates/context/Cargo.toml @@ -57,12 +57,10 @@ dev = [ "optional_balance_check", "optional_block_gas_limit", "optional_eip3607", - "optional_gas_refund", "optional_no_base_fee", ] memory_limit = [] optional_balance_check = [] optional_block_gas_limit = [] optional_eip3607 = [] -optional_gas_refund = [] optional_no_base_fee = [] diff --git a/crates/context/interface/src/cfg.rs b/crates/context/interface/src/cfg.rs index 84382c1352..69141f72de 100644 --- a/crates/context/interface/src/cfg.rs +++ b/crates/context/interface/src/cfg.rs @@ -24,8 +24,6 @@ pub trait Cfg { fn is_balance_check_disabled(&self) -> bool; - fn is_gas_refund_disabled(&self) -> bool; - fn is_block_gas_limit_disabled(&self) -> bool; fn is_nonce_check_disabled(&self) -> bool; diff --git a/crates/context/src/cfg.rs b/crates/context/src/cfg.rs index 7d9275d9fe..4624b977f5 100644 --- a/crates/context/src/cfg.rs +++ b/crates/context/src/cfg.rs @@ -59,15 +59,6 @@ pub struct CfgEnv { /// By default, it is set to `false`. #[cfg(feature = "optional_eip3607")] pub disable_eip3607: bool, - /// Disables all gas refunds - /// - /// This is useful when using chains that have gas refunds disabled, e.g. Avalanche. - /// - /// Reasoning behind removing gas refunds can be found in EIP-3298. - /// - /// By default, it is set to `false`. - #[cfg(feature = "optional_gas_refund")] - pub disable_gas_refund: bool, /// Disables base fee checks for EIP-1559 transactions /// /// This is useful for testing method calls with zero gas price. @@ -105,8 +96,6 @@ impl CfgEnv { disable_block_gas_limit: self.disable_block_gas_limit, #[cfg(feature = "optional_eip3607")] disable_eip3607: self.disable_eip3607, - #[cfg(feature = "optional_gas_refund")] - disable_gas_refund: self.disable_gas_refund, #[cfg(feature = "optional_no_base_fee")] disable_base_fee: self.disable_base_fee, } @@ -168,16 +157,6 @@ impl + Copy> Cfg for CfgEnv { } } - fn is_gas_refund_disabled(&self) -> bool { - cfg_if::cfg_if! { - if #[cfg(feature = "optional_gas_refund")] { - self.disable_gas_refund - } else { - false - } - } - } - fn is_block_gas_limit_disabled(&self) -> bool { cfg_if::cfg_if! { if #[cfg(feature = "optional_block_gas_limit")] { @@ -219,8 +198,6 @@ impl Default for CfgEnv { disable_block_gas_limit: false, #[cfg(feature = "optional_eip3607")] disable_eip3607: false, - #[cfg(feature = "optional_gas_refund")] - disable_gas_refund: false, #[cfg(feature = "optional_no_base_fee")] disable_base_fee: false, } diff --git a/crates/optimism/Cargo.toml b/crates/optimism/Cargo.toml index fb6b39bdd1..48b7e8dcac 100644 --- a/crates/optimism/Cargo.toml +++ b/crates/optimism/Cargo.toml @@ -53,14 +53,12 @@ dev = [ "optional_balance_check", "optional_block_gas_limit", "optional_eip3607", - "optional_gas_refund", "optional_no_base_fee", ] memory_limit = ["revm/memory_limit"] optional_balance_check = ["revm/optional_balance_check"] optional_block_gas_limit = ["revm/optional_block_gas_limit"] optional_eip3607 = ["revm/optional_eip3607"] -optional_gas_refund = ["revm/optional_gas_refund"] optional_no_base_fee = ["revm/optional_no_base_fee"] # See comments in `revm-precompile` diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml index c3142658f8..134395fd81 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -76,14 +76,12 @@ dev = [ "optional_balance_check", "optional_block_gas_limit", "optional_eip3607", - "optional_gas_refund", "optional_no_base_fee", ] memory_limit = ["context/memory_limit", "interpreter/memory_limit"] optional_balance_check = ["context/optional_balance_check"] optional_block_gas_limit = ["context/optional_block_gas_limit"] optional_eip3607 = ["context/optional_eip3607"] -optional_gas_refund = ["context/optional_gas_refund"] optional_no_base_fee = ["context/optional_no_base_fee"] # See comments in `precompile`