From 8123d6bd3bb12fc64381d400700027eea30a8b30 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Sat, 15 Feb 2025 14:08:52 +0100
Subject: [PATCH] feat: reexport reth-trie with trie feature (#14513)

---
 Cargo.lock                      | 2 ++
 crates/ethereum/reth/Cargo.toml | 7 +++++--
 crates/ethereum/reth/src/lib.rs | 7 +++++++
 crates/optimism/reth/Cargo.toml | 7 +++++--
 crates/optimism/reth/src/lib.rs | 7 +++++++
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d6befb71ca..be47e4b661 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7523,6 +7523,7 @@ dependencies = [
  "reth-rpc-builder",
  "reth-rpc-eth-types",
  "reth-storage-api",
+ "reth-trie",
 ]
 
 [[package]]
@@ -8368,6 +8369,7 @@ dependencies = [
  "reth-rpc-builder",
  "reth-rpc-eth-types",
  "reth-storage-api",
+ "reth-trie",
 ]
 
 [[package]]
diff --git a/crates/ethereum/reth/Cargo.toml b/crates/ethereum/reth/Cargo.toml
index c6651f6936..ce3587260e 100644
--- a/crates/ethereum/reth/Cargo.toml
+++ b/crates/ethereum/reth/Cargo.toml
@@ -27,6 +27,7 @@ reth-rpc-api = { workspace = true, optional = true }
 reth-rpc-eth-types = { workspace = true, optional = true }
 reth-rpc-builder = { workspace = true, optional = true }
 reth-exex = { workspace = true, optional = true }
+reth-trie = { workspace = true, optional = true }
 
 # reth-ethereum
 reth-ethereum-primitives.workspace = true
@@ -68,9 +69,10 @@ test-utils = [
     "reth-node-ethereum?/test-utils",
     "reth-primitives-traits/test-utils",
     "reth-provider?/test-utils",
+    "reth-trie?/test-utils",
 ]
 
-full = ["consensus", "evm", "node", "provider", "rpc", "exex"]
+full = ["consensus", "evm", "node", "provider", "rpc", "exex", "trie"]
 
 alloy-compat = ["reth-ethereum-primitives/alloy-compat"]
 cli = ["dep:reth-ethereum-cli"]
@@ -78,9 +80,10 @@ consensus = ["dep:reth-consensus", "dep:reth-consensus-common", "dep:reth-ethere
 evm = ["dep:reth-evm", "dep:reth-evm-ethereum"]
 exex = ["provider", "dep:reth-exex"]
 node-api = ["dep:reth-node-api"]
-node = ["provider", "consensus", "evm", "node-api", "dep:reth-node-ethereum", "rpc"]
+node = ["provider", "consensus", "evm", "node-api", "dep:reth-node-ethereum", "rpc", "trie"]
 rpc = ["dep:reth-rpc", "dep:reth-rpc-builder", "dep:reth-rpc-api", "dep:reth-rpc-eth-types", "dep:alloy-rpc-types-eth"]
 js-tracer = ["rpc", "reth-rpc/js-tracer"]
 network = ["dep:reth-network"]
 provider = ["storage-api", "dep:reth-provider", "dep:reth-db"]
 storage-api = ["dep:reth-storage-api"]
+trie = ["dep:reth-trie"]
diff --git a/crates/ethereum/reth/src/lib.rs b/crates/ethereum/reth/src/lib.rs
index d33e80ebc1..3250a140f6 100644
--- a/crates/ethereum/reth/src/lib.rs
+++ b/crates/ethereum/reth/src/lib.rs
@@ -85,6 +85,13 @@ pub mod node {
     pub use reth_node_ethereum::*;
 }
 
+/// Re-exported reth trie types
+#[cfg(feature = "trie")]
+pub mod trie {
+    #[doc(inline)]
+    pub use reth_trie::*;
+}
+
 /// Re-exported rpc types
 #[cfg(feature = "rpc")]
 pub mod rpc {
diff --git a/crates/optimism/reth/Cargo.toml b/crates/optimism/reth/Cargo.toml
index e98b67c47b..ed54f42c94 100644
--- a/crates/optimism/reth/Cargo.toml
+++ b/crates/optimism/reth/Cargo.toml
@@ -26,6 +26,7 @@ reth-rpc = { workspace = true, optional = true }
 reth-rpc-api = { workspace = true, optional = true }
 reth-rpc-eth-types = { workspace = true, optional = true }
 reth-rpc-builder = { workspace = true, optional = true }
+reth-trie = { workspace = true, optional = true }
 
 # reth-op
 reth-optimism-primitives.workspace = true
@@ -65,20 +66,22 @@ test-utils = [
     "reth-optimism-node?/test-utils",
     "reth-primitives-traits/test-utils",
     "reth-provider?/test-utils",
+    "reth-trie?/test-utils",
 ]
 
-full = ["consensus", "evm", "node", "provider", "rpc"]
+full = ["consensus", "evm", "node", "provider", "rpc", "trie"]
 
 alloy-compat = []
 consensus = ["dep:reth-consensus", "dep:reth-consensus-common", "dep:reth-optimism-consensus"]
 evm = ["dep:reth-evm", "dep:reth-optimism-evm"]
 node-api = ["dep:reth-node-api"]
-node = ["provider", "consensus", "evm", "node-api", "dep:reth-optimism-node", "rpc"]
+node = ["provider", "consensus", "evm", "node-api", "dep:reth-optimism-node", "rpc", "trie"]
 rpc = ["dep:reth-rpc", "dep:reth-rpc-builder", "dep:reth-rpc-api", "dep:reth-rpc-eth-types", "dep:reth-optimism-rpc"]
 js-tracer = ["rpc", "reth-rpc/js-tracer"]
 network = ["dep:reth-network"]
 provider = ["storage-api", "dep:reth-provider", "dep:reth-db"]
 storage-api = ["dep:reth-storage-api"]
+trie = ["dep:reth-trie"]
 optimism = [
     "reth-db?/optimism",
     "reth-optimism-consensus?/optimism",
diff --git a/crates/optimism/reth/src/lib.rs b/crates/optimism/reth/src/lib.rs
index 4f5cfb3f3e..3d75b0e19e 100644
--- a/crates/optimism/reth/src/lib.rs
+++ b/crates/optimism/reth/src/lib.rs
@@ -87,6 +87,13 @@ pub mod node {
     pub use reth_optimism_node::*;
 }
 
+/// Re-exported reth trie types
+#[cfg(feature = "trie")]
+pub mod trie {
+    #[doc(inline)]
+    pub use reth_trie::*;
+}
+
 /// Re-exported rpc types
 #[cfg(feature = "rpc")]
 pub mod rpc {