Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(interpreter): remove SPEC generic from gas calculation functions #1243

Merged
merged 7 commits into from
Apr 3, 2024
Merged

feat(interpreter): remove SPEC generic from gas calculation functions #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35df6e0
feat(interpreter): remove SPEC generic from gas calculation functions
DaniPopes Mar 28, 2024
607b452
feat(interpreter): make most gas cost calculation functions `const`
DaniPopes Mar 28, 2024
52ad84a
set_final_refund
DaniPopes Mar 28, 2024
0a31855
unused
DaniPopes Mar 28, 2024
065042e
fix: optimism
DaniPopes Mar 29, 2024
e9b9b96
chore: use `is_london: bool` instead of `SpecId` in `Gas::set_final_r…
DaniPopes Apr 3, 2024
781d122
Merge branch 'main' into gas-specs
DaniPopes Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions crates/interpreter/src/gas.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ mod constants;

pub use calc::*;
pub use constants::*;
use revm_primitives::{Spec, SpecId::LONDON};

/// Represents the state of gas during execution.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
Expand Down Expand Up @@ -94,8 +93,8 @@ impl Gas {
///
/// Related to EIP-3529: Reduction in refunds
#[inline]
pub fn set_final_refund<SPEC: Spec>(&mut self) {
let max_refund_quotient = if SPEC::enabled(LONDON) { 5 } else { 2 };
pub fn set_final_refund(&mut self, is_london: bool) {
let max_refund_quotient = if is_london { 5 } else { 2 };
self.refunded = (self.refunded() as u64).min(self.spent() / max_refund_quotient) as i64;
}

Expand Down
Loading
Loading