feat: port taiko-geth

Cargo.toml

@@ -57,14 +57,18 @@ members = [
     "crates/node/api/",
     "crates/node/builder/",
     "crates/node/events/",
+    "crates/node-taiko/",
     "crates/optimism/consensus",
     "crates/optimism/evm/",
     "crates/optimism/node/",
     "crates/optimism/payload/",
     "crates/optimism/primitives/",
     "crates/payload/basic/",
     "crates/payload/builder/",
-    "crates/payload/primitives/",
+    "crates/payload/primitives",
+    "crates/ethereum/payload",
+    "crates/optimism/payload",
+    "crates/payload/taiko/",
     "crates/payload/validator/",
     "crates/primitives/",
     "crates/primitives-traits/",
@@ -300,6 +304,7 @@ reth-node-core = { path = "crates/node-core" }
 reth-node-ethereum = { path = "crates/ethereum/node" }
 reth-node-events = { path = "crates/node/events" }
 reth-node-optimism = { path = "crates/optimism/node" }
+reth-node-taiko = { path = "crates/node-taiko" }
 reth-optimism-consensus = { path = "crates/optimism/consensus" }
 reth-optimism-payload-builder = { path = "crates/optimism/payload" }
 reth-optimism-primitives = { path = "crates/optimism/primitives" }
@@ -328,6 +333,7 @@ reth-static-file = { path = "crates/static-file/static-file" }
 reth-static-file-types = { path = "crates/static-file/types" }
 reth-storage-api = { path = "crates/storage/storage-api" }
 reth-storage-errors = { path = "crates/storage/errors" }
+reth-taiko-payload-builder = { path = "crates/payload/taiko" }
 reth-tasks = { path = "crates/tasks" }
 reth-testing-utils = { path = "testing/testing-utils" }
 reth-tokio-util = { path = "crates/tokio-util" }

bin/reth/Cargo.toml

@@ -44,6 +44,7 @@ reth-downloaders.workspace = true
 reth-tracing.workspace = true
 reth-tasks.workspace = true
 reth-ethereum-payload-builder.workspace = true
+reth-taiko-payload-builder = { workspace = true, optional = true }
 reth-payload-builder.workspace = true
 reth-payload-primitives.workspace = true
 reth-payload-validator.workspace = true
@@ -59,6 +60,7 @@ reth-node-ethereum.workspace = true
 reth-node-optimism = { workspace = true, optional = true, features = [
     "optimism",
 ] }
+reth-node-taiko = { workspace = true, optional = true }
 reth-node-core.workspace = true
 reth-db-common.workspace = true
 reth-node-builder.workspace = true
@@ -69,6 +71,9 @@ reth-prune-types.workspace = true
 
 # crypto
 alloy-rlp.workspace = true
+rlp = "0.5"
+alloy-chains.workspace = true
+secp256k1.workspace = true
 
 # tracing
 tracing.workspace = true
@@ -110,6 +115,7 @@ eyre.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
 tempfile.workspace = true
 backon.workspace = true
+thiserror.workspace = true
 similar-asserts.workspace = true
 itertools.workspace = true
 rayon.workspace = true
@@ -151,6 +157,15 @@ optimism = [
     "reth-node-core/optimism",
 ]
 
+taiko = [
+    "reth-primitives/taiko",
+    "reth-beacon-consensus/taiko",
+    "reth-payload-builder/taiko",
+    "reth-node-core/taiko",
+    "dep:reth-taiko-payload-builder",
+    "dep:reth-node-taiko",
+]
+
 # no-op feature flag for switching between the `optimism` and default functionality in CI matrices
 ethereum = []
 
@@ -162,3 +177,8 @@ path = "src/main.rs"
 name = "op-reth"
 path = "src/optimism.rs"
 required-features = ["optimism"]
+
+[[bin]]
+name = "taiko-reth"
+path = "src/taiko.rs"
+required-features = ["taiko"]

bin/reth/src/cli/mod.rs

@@ -8,7 +8,7 @@ use crate::{
     commands::{
         config_cmd, db, debug_cmd, dump_genesis, import, init_cmd, init_state,
         node::{self, NoArgs},
-        p2p, recover, stage, test_vectors,
+        p2p, recover, stage, t8n, test_vectors,
     },
     version::{LONG_VERSION, SHORT_VERSION},
 };
@@ -160,6 +160,7 @@ impl<Ext: clap::Args + fmt::Debug> Cli<Ext> {
             Commands::Db(command) => runner.run_blocking_until_ctrl_c(command.execute()),
             Commands::Stage(command) => runner.run_command_until_exit(|ctx| command.execute(ctx)),
             Commands::P2P(command) => runner.run_until_ctrl_c(command.execute()),
+            Commands::T8n(command) => runner.run_until_ctrl_c(command.execute()),
             Commands::TestVectors(command) => runner.run_until_ctrl_c(command.execute()),
             Commands::Config(command) => runner.run_until_ctrl_c(command.execute()),
             Commands::Debug(command) => runner.run_command_until_exit(|ctx| command.execute(ctx)),
@@ -211,6 +212,12 @@ pub enum Commands<Ext: clap::Args + fmt::Debug = NoArgs> {
     /// P2P Debugging utilities
     #[command(name = "p2p")]
     P2P(p2p::Command),
+    /// Runs an EVM state transition using the provided JSON pre-state files.
+    ///
+    /// Equivalent of Geth's `./evm t8n` utility, and should be used to confirm
+    /// equivalence of behavior between Geth and Reth executors.
+    #[command(name = "t8n")]
+    T8n(t8n::Command),
     /// Generate Test Vectors
     #[command(name = "test-vectors")]
     TestVectors(test_vectors::Command),

bin/reth/src/commands/db/diff.rs

@@ -298,12 +298,12 @@ where
     ) {
         // do not bother comparing if the key is already in the discrepancies map
         if self.discrepancies.contains_key(&key) {
-            return
+            return;
         }
 
         // do not bother comparing if the key is already in the extra elements map
         if self.extra_elements.contains_key(&key) {
-            return
+            return;
         }
 
         match (first, second) {

bin/reth/src/commands/mod.rs

@@ -15,6 +15,7 @@ pub mod node;
 pub mod p2p;
 pub mod recover;
 pub mod stage;
+pub mod t8n;
 pub mod test_vectors;
 
 pub mod common;