Skip to content

Init evm64 feature #320

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.

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

Merged
merged 1 commit into from
May 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ members = [
"jsontests",
"precompile",
"tracer",

"features/evm64",
]
resolver = "2"

Expand Down
12 changes: 12 additions & 0 deletions features/evm64/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[package]
name = "evm-feature-evm64"
version = "0.0.0-dev"
edition = { workspace = true }
rust-version = { workspace = true }
license = { workspace = true }
authors = { workspace = true }
repository = { workspace = true }
keywords = { workspace = true }

[dependencies]
evm = { path = "../.." }
9 changes: 9 additions & 0 deletions features/evm64/src/eval.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
use evm::interpreter::{etable::Control, machine::Machine};

pub fn eval_add<S, H, Tr>(
_machine: &mut Machine<S>,
_handle: &mut H,
_position: usize,
) -> Control<Tr> {
todo!()
}
15 changes: 15 additions & 0 deletions features/evm64/src/gasometer.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
use evm::{
interpreter::{etable::Control, machine::Machine},
standard::GasometerState,
};

pub fn eval<'config, S, H, Tr>(
_machine: &mut Machine<S>,
_handler: &mut H,
_position: usize,
) -> Control<Tr>
where
S: AsRef<GasometerState<'config>> + AsMut<GasometerState<'config>>,
{
todo!()
}
38 changes: 38 additions & 0 deletions features/evm64/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
//! # The EVM64 feature
//!
//! See [EIP-7937](https://eips.ethereum.org/EIPS/eip-7937).

pub mod eval;
mod gasometer;

pub use crate::gasometer::eval as eval_gasometer;

use evm::{
interpreter::{
etable::{Etable, MultiEfn, MultiEtable, Single},
opcode::Opcode,
},
standard::GasometerState,
};

pub const OPCODE_EVM64_MODE: Opcode = Opcode(0xc0);

/// Append a normal `(gasometer, runtime)` etable with EVM64 gasometer and
/// opcodes.
pub fn etable<'config, S, H, Tr>(
orig: (Single<S, H, Tr>, Etable<S, H, Tr>),
) -> (Etable<S, H, Tr>, MultiEtable<S, H, Tr>)
where
S: AsRef<GasometerState<'config>> + AsMut<GasometerState<'config>>,
{
let mut gasometer_etable = Etable::from(orig.0);
let mut eval_etable = MultiEtable::from(orig.1);

let mut mode_etable = Etable::none();
mode_etable[Opcode::ADD.as_usize()] = eval::eval_add;

gasometer_etable[OPCODE_EVM64_MODE.as_usize()] = eval_gasometer;
eval_etable[OPCODE_EVM64_MODE.as_usize()] = MultiEfn::Node(Box::new(mode_etable.into()));

(gasometer_etable, eval_etable)
}