feat: remove unused dependencies and enhance taiko engine support

taikoxyz · Dec 24, 2024 · 652a469 · 652a469
1 parent 9f1ec2e
commit 652a469
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -69,7 +69,6 @@ reth-prune.workspace = true
 
 # taiko
 reth-taiko-chainspec.workspace = true
-reth-taiko-forks.workspace = true
 reth-taiko-node.workspace = true
 reth-taiko-cli.workspace = true
 

diff --git a/crates/consensus/beacon/Cargo.toml b/crates/consensus/beacon/Cargo.toml
@@ -32,7 +32,7 @@ reth-tokio-util.workspace = true
 reth-engine-primitives.workspace = true
 reth-network-p2p.workspace = true
 reth-node-types.workspace = true
-reth-chainspec = { workspace = true, optional = true }
+reth-chainspec = { workspace = true }
 
 # taiko
 reth-taiko-engine-types.workspace = true
@@ -88,7 +88,6 @@ assert_matches.workspace = true
 optimism = [
     "reth-blockchain-tree/optimism",
     "reth-codecs/op",
-    "reth-chainspec",
     "reth-db-api/optimism",
     "reth-db/optimism",
     "reth-downloaders/optimism",

diff --git a/crates/consensus/beacon/src/engine/mod.rs b/crates/consensus/beacon/src/engine/mod.rs
@@ -489,6 +489,16 @@ where
             return true
         }
 
+        if reth_chainspec::EthChainSpec::is_taiko(&self.blockchain.chain_spec()) {
+            debug!(
+                target: "consensus::engine",
+                fcu_head_num=?header.number,
+                current_head_num=?head.number,
+                "[Taiko] Allowing beacon reorg to old head"
+            );
+            return true;
+        }
+
         // 2. Client software MAY skip an update of the forkchoice state and MUST NOT begin a
         //    payload build process if `forkchoiceState.headBlockHash` references a `VALID` ancestor
         //    of the head of canonical chain, i.e. the ancestor passed payload validation process

diff --git a/crates/taiko/node/Cargo.toml b/crates/taiko/node/Cargo.toml
@@ -22,7 +22,6 @@ reth-network.workspace = true
 reth-consensus.workspace = true
 reth-trie-db.workspace = true
 reth-primitives.workspace = true
-reth-ethereum-payload-builder.workspace = true
 reth-node-ethereum.workspace = true
 reth-rpc.workspace = true
 reth-payload-primitives.workspace = true

diff --git a/crates/taiko/node/src/engine.rs b/crates/taiko/node/src/engine.rs
@@ -1,3 +1,5 @@
+//! Engine support
+
 use std::sync::Arc;
 
 use alloy_rpc_types_engine::{ExecutionPayloadSidecar, PayloadError};