diff --git a/Cargo.lock b/Cargo.lock index 717e6f4c21cc..78eda45e97ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6435,7 +6435,6 @@ dependencies = [ "reth-node-ethereum", "reth-node-events", "reth-node-optimism", - "reth-node-taiko", "reth-optimism-primitives", "reth-payload-builder", "reth-payload-primitives", @@ -7249,6 +7248,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-evm-taiko" +version = "1.0.0" +dependencies = [ + "alloy-eips", + "alloy-sol-types", + "reth-chainspec", + "reth-ethereum-consensus", + "reth-evm", + "reth-execution-types", + "reth-primitives", + "reth-prune-types", + "reth-revm", + "reth-testing-utils", + "revm-primitives", + "secp256k1", + "serde_json", +] + [[package]] name = "reth-execution-errors" version = "1.0.0" @@ -7795,21 +7813,33 @@ dependencies = [ name = "reth-node-taiko" version = "1.0.0" dependencies = [ + "alloy-genesis", + "alloy-primitives", "eyre", + "futures", + "futures-util", + "reth", + "reth-auto-seal-consensus", "reth-basic-payload-builder", + "reth-beacon-consensus", "reth-chainspec", + "reth-consensus", "reth-db", + "reth-e2e-test-utils", + "reth-ethereum-engine-primitives", + "reth-ethereum-payload-builder", + "reth-evm-ethereum", + "reth-exex", "reth-network", "reth-node-api", "reth-node-builder", + "reth-node-core", "reth-payload-builder", - "reth-primitives", "reth-provider", - "reth-rpc-types", - "reth-taiko-payload-builder", "reth-tracing", "reth-transaction-pool", - "serde", + "serde_json", + "tokio", ] [[package]] @@ -8466,18 +8496,49 @@ dependencies = [ "thiserror-no-std", ] +[[package]] +name = "reth-taiko-consensus" +version = "1.0.0" +dependencies = [ + "reth-chainspec", + "reth-consensus", + "reth-consensus-common", + "reth-primitives", + "tracing", +] + +[[package]] +name = "reth-taiko-engine-primitives" +version = "1.0.0" +dependencies = [ + "alloy-rlp", + "reth-chainspec", + "reth-engine-primitives", + "reth-payload-primitives", + "reth-primitives", + "reth-rpc-types", + "reth-rpc-types-compat", + "revm-primitives", + "serde", + "serde_json", + "sha2 0.10.8", +] + [[package]] name = "reth-taiko-payload-builder" version = "1.0.0" dependencies = [ "reth-basic-payload-builder", + "reth-errors", + "reth-evm", + "reth-evm-ethereum", + "reth-execution-types", "reth-payload-builder", "reth-primitives", "reth-provider", "reth-revm", "reth-transaction-pool", "revm", - "thiserror", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index 0af9e87e2eca..aa4baf5a89d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,11 @@ members = [ "crates/ethereum/evm", "crates/ethereum/node", "crates/ethereum/payload/", + "crates/taiko/consensus/", + "crates/taiko/engine-primitives/", + "crates/taiko/evm", + "crates/taiko/node", + "crates/taiko/payload/", "crates/etl/", "crates/evm/", "crates/evm/execution-errors", @@ -57,7 +62,6 @@ members = [ "crates/node/api/", "crates/node/builder/", "crates/node/events/", - "crates/node-taiko/", "crates/optimism/consensus", "crates/optimism/evm/", "crates/optimism/node/", @@ -68,7 +72,6 @@ members = [ "crates/payload/primitives", "crates/ethereum/payload", "crates/optimism/payload", - "crates/payload/taiko/", "crates/payload/validator/", "crates/primitives/", "crates/primitives-traits/", @@ -309,7 +312,6 @@ 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" } @@ -338,7 +340,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-taiko-payload-builder = { path = "crates/taiko/payload" } reth-tasks = { path = "crates/tasks" } reth-testing-utils = { path = "testing/testing-utils" } reth-tokio-util = { path = "crates/tokio-util" } diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index 31b2f8b95aff..435529f14405 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -61,7 +61,7 @@ reth-node-ethereum.workspace = true reth-node-optimism = { workspace = true, optional = true, features = [ "optimism", ] } -reth-node-taiko = { workspace = true, optional = true } +# reth-node-taiko = { workspace = true, optional = true } reth-node-core.workspace = true reth-db-common.workspace = true reth-node-builder.workspace = true @@ -166,7 +166,7 @@ taiko = [ "reth-payload-builder/taiko", "reth-node-core/taiko", "dep:reth-taiko-payload-builder", - "dep:reth-node-taiko", + # "dep:reth-node-taiko", ] # no-op feature flag for switching between the `optimism` and default functionality in CI matrices diff --git a/crates/taiko/consensus/Cargo.toml b/crates/taiko/consensus/Cargo.toml index 25c865a2bc18..c745f19c8c66 100644 --- a/crates/taiko/consensus/Cargo.toml +++ b/crates/taiko/consensus/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "reth-ethereum-consensus" +name = "reth-taiko-consensus" version.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/crates/taiko/engine-primitives/Cargo.toml b/crates/taiko/engine-primitives/Cargo.toml index 231c7f640b39..7b32ae4f05e2 100644 --- a/crates/taiko/engine-primitives/Cargo.toml +++ b/crates/taiko/engine-primitives/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "reth-ethereum-engine-primitives" +name = "reth-taiko-engine-primitives" version.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/crates/taiko/evm/Cargo.toml b/crates/taiko/evm/Cargo.toml index 1d996e5d3995..1ce1f9b63182 100644 --- a/crates/taiko/evm/Cargo.toml +++ b/crates/taiko/evm/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "reth-evm-ethereum" +name = "reth-evm-taiko" version.workspace = true edition.workspace = true rust-version.workspace = true @@ -35,4 +35,4 @@ serde_json.workspace = true [features] default = ["std"] -std = [] \ No newline at end of file +std = [] diff --git a/crates/taiko/node/Cargo.toml b/crates/taiko/node/Cargo.toml index 54e54a0ebb76..4c43e8a6dd51 100644 --- a/crates/taiko/node/Cargo.toml +++ b/crates/taiko/node/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "reth-node-ethereum" +name = "reth-node-taiko" version.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/crates/taiko/payload/Cargo.toml b/crates/taiko/payload/Cargo.toml index e41c8a407c33..a495593985b8 100644 --- a/crates/taiko/payload/Cargo.toml +++ b/crates/taiko/payload/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "reth-ethereum-payload-builder" +name = "reth-taiko-payload-builder" version.workspace = true edition.workspace = true rust-version.workspace = true