Merge remote-tracking branch 'origin/main' into restructure_p6

.github/workflows/ci.yml

@@ -104,6 +104,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: crate-ci/typos@v1.22.7
         with:
-          config: ./Typos.toml
+          config: ./typos.toml
           isolated: true
-

Cargo.toml

@@ -18,6 +18,7 @@ members = [
     "crates/wiring",
     "crates/wiring/transaction",
     "crates/specification",
+    "crates/statetest-types",
 
     # variants
     # "crates/optimism",
@@ -46,6 +47,7 @@ transaction = { path = "crates/wiring/transaction", package = "revm-transaction"
 interpreter = { path = "crates/interpreter", package = "revm-interpreter", version = "10.0.1", default-features = false }
 inspector = { path = "crates/inspector", package = "revm-inspector", version = "1.0.0", default-features = false }
 precompile = { path = "crates/precompile", package = "revm-precompile", version = "11.0.1", default-features = false }
+statetest-types = { path = "crates/statetest-types", package = "revm-statetest-types", version = "1.0.0", default-features = false }
 
 [workspace.package]
 license = "MIT"

bins/revme/Cargo.toml

@@ -12,12 +12,12 @@ repository.workspace = true
 # revm
 database.workspace = true
 revm = { workspace = true, features = ["std", "hashbrown", "c-kzg", "blst"] }
+statetest-types = { workspace = true }
 inspector = { workspace = true, features = ["std", "serde-json"] }
 # enable parse std and parse feature. 
 bytecode = { workspace = true, features = ["std", "parse"] }
 
 hash-db = "0.15"
-hex = "0.4"
 hashbrown = "0.14"
 indicatif = "0.17"
 microbench = "0.5"

bins/revme/src/cmd/bench/analysis.rs

@@ -1,7 +1,7 @@
 use database::{BenchmarkDB, EthereumBenchmarkWiring};
 use revm::{
     bytecode::Bytecode,
-    primitives::{address, bytes, Bytes, TxKind},
+    primitives::{address, bytes, hex, Bytes, TxKind},
     Evm,
 };
 use std::time::Instant;

bins/revme/src/cmd/bytecode.rs

@@ -1,8 +1,8 @@
 use clap::Parser;
 use revm::{
     bytecode::eof::{self, validate_eof_inner, CodeType, Eof, EofError},
-    primitives::Bytes,
-    specification::constantans::MAX_INITCODE_SIZE,
+    primitives::{hex, Bytes},
+    specification::constants::MAX_INITCODE_SIZE,
 };
 use std::io;
 

bins/revme/src/cmd/evmrunner.rs

@@ -3,7 +3,7 @@ use database::BenchmarkDB;
 use inspector::{inspector_handle_register, inspectors::TracerEip3155};
 use revm::{
     bytecode::{Bytecode, BytecodeDecodeError},
-    primitives::{address, Address, TxKind},
+    primitives::{address, hex, Address, TxKind},
     wiring::EthereumWiring,
     Database, Evm,
 };

bins/revme/src/cmd/statetest.rs

@@ -1,5 +1,4 @@
 pub mod merkle_trie;
-pub mod models;
 mod runner;
 pub mod utils;