Skip to content

Commit

Permalink
Merge pull request #42 from taikoxyz/gwyneth-cecilia
Browse files Browse the repository at this point in the history
feat(node): place all gwyneth logic in the GwynethNode within Exex
  • Loading branch information
CeciliaZ030 authored Sep 14, 2024
2 parents 9c3c1cc + 51bd848 commit 7db84b7
Show file tree
Hide file tree
Showing 40 changed files with 1,288 additions and 940 deletions.
65 changes: 54 additions & 11 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ members = [
"examples/txpool-tracing/",
"examples/custom-rlpx-subprotocol",
"testing/ef-tests/",
"testing/testing-utils",
"testing/testing-utils", "crates/gwyneth",
]
default-members = ["bin/reth"]

Expand Down Expand Up @@ -263,6 +263,8 @@ lto = "fat"
codegen-units = 1

[workspace.dependencies]
gwyneth = { path = "crates/gwyneth" }

# reth
reth = { path = "bin/reth" }
reth-bench = { path = "bin/reth-bench" }
Expand Down
43 changes: 6 additions & 37 deletions bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ default-run = "reth"
workspace = true

[dependencies]

gwyneth.workspace = true

# reth
reth-chainspec.workspace = true
reth-config.workspace = true
Expand Down Expand Up @@ -113,44 +116,8 @@ foundry-blob-explorers = "0.5"
discv5.workspace = true

# alloy
#alloy-consensus = { version = "0.2", features = ["kzg"] }
alloy-consensus = { version = "0.2", features = ["kzg"] }
alloy-sol-types = { workspace = true, features = ["json"] }
alloy-signer.workspace = true
alloy-signer-local = { workspace = true, features = ["mnemonic"] }
alloy-rpc-types.workspace = true
alloy-network.workspace = true
alloy-consensus = { workspace = true, features = ["kzg"] }



#reth.workspace = true
#reth-chainspec.workspace = true
#reth-primitives.workspace = true
#reth-tracing.workspace = true
#reth-db = { workspace = true, features = ["test-utils"] }
#reth-rpc.workspace = true
reth-rpc-layer.workspace = true
#reth-payload-builder = { workspace = true, features = ["test-utils"] }
#reth-provider.workspace = true
#reth-node-builder = { workspace = true, features = ["test-utils"] }
reth-tokio-util.workspace = true
reth-stages-types.workspace = true
reth-network-peers.workspace = true
#reth-node-ethereum.workspace = true

jsonrpsee.workspace = true

futures-util.workspace = true
#eyre.workspace = true
#tokio.workspace = true
tokio-stream.workspace = true
#serde_json.workspace = true
#alloy-signer.workspace = true
#alloy-signer-local = { workspace = true, features = ["mnemonic"] }
#alloy-rpc-types.workspace = true
#alloy-network.workspace = true
#alloy-consensus = { workspace = true, features = ["kzg"] }
#tracing.workspace = true

[target.'cfg(unix)'.dependencies]
tikv-jemallocator = { version = "0.5.0", optional = true }
Expand Down Expand Up @@ -192,6 +159,8 @@ optimism = [
# no-op feature flag for switching between the `optimism` and default functionality in CI matrices
ethereum = []

gwyneth = ["reth-payload-primitives/gwyneth"]

[[bin]]
name = "reth"
path = "src/main.rs"
Expand Down
Loading

0 comments on commit 7db84b7

Please sign in to comment.