Skip to content

Commit

Permalink
feat: Add reth-chainspec and reth-rpc-types-compat as optional depend…
Browse files Browse the repository at this point in the history
…encies
  • Loading branch information
johntaiko committed Jul 4, 2024
1 parent 816207f commit d34e437
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 18 deletions.
73 changes: 67 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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/",
Expand All @@ -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/",
Expand Down Expand Up @@ -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" }
Expand Down Expand Up @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/taiko/consensus/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "reth-ethereum-consensus"
name = "reth-taiko-consensus"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/taiko/engine-primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions crates/taiko/evm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "reth-evm-ethereum"
name = "reth-evm-taiko"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
Expand Down Expand Up @@ -35,4 +35,4 @@ serde_json.workspace = true

[features]
default = ["std"]
std = []
std = []
2 changes: 1 addition & 1 deletion crates/taiko/node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "reth-node-ethereum"
name = "reth-node-taiko"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/taiko/payload/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit d34e437

Please sign in to comment.