Skip to content

Commit

Permalink
refactor: create separate binary crates and move TrinConfig to trin c…
Browse files Browse the repository at this point in the history
…rate (#1614)
  • Loading branch information
KolbyML authored Jan 7, 2025
1 parent 1a684e9 commit c5de5a5
Show file tree
Hide file tree
Showing 38 changed files with 409 additions and 1,695 deletions.
56 changes: 6 additions & 50 deletions Cargo.lock

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

84 changes: 17 additions & 67 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,62 +1,6 @@
[package]
name = "trin"
default-run = "trin"
description = "A Rust implementation of the Ethereum Portal Network"
authors.workspace = true
categories.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[dependencies]
alloy = { workspace = true, features = ["eips", "provider-ipc", "provider-ws", "pubsub", "reqwest", "rpc-types"] }
anyhow.workspace = true
clap.workspace = true
dirs = "5.0.1"
discv5.workspace = true
e2store.workspace = true
ethereum_ssz.workspace = true
ethportal-api.workspace = true
futures.workspace = true
jsonrpsee.workspace = true
lazy_static.workspace = true
parking_lot.workspace = true
portal-bridge.workspace = true
portalnet.workspace = true
prometheus_exporter.workspace = true
rand.workspace = true
regex = "1.10.2"
reqwest.workspace = true
reth-ipc.workspace = true
rpc.workspace = true
serde_json = { workspace = true, features = ["preserve_order"]}
sha3.workspace = true
tempfile.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
tree_hash.workspace = true
trin-beacon.workspace = true
trin-history.workspace = true
trin-state.workspace = true
trin-storage.workspace = true
trin-utils.workspace = true
trin-validation.workspace = true
url.workspace = true
utp-rs.workspace = true

[dev-dependencies]
ethportal-peertest = { path = "ethportal-peertest" }
serde_yaml.workspace = true
serial_test.workspace = true
ureq.workspace = true

[workspace]
members = [
"bin/trin",
"ethportal-api",
"ethportal-peertest",
"e2store",
Expand All @@ -75,6 +19,9 @@ members = [
"utp-testing",
]

default-members = ["bin/trin"]
resolver = "2"

[workspace.package]
authors = ["https://github.com/ethereum/trin/graphs/contributors"]
categories = ["cryptography::cryptocurrencies"]
Expand All @@ -97,12 +44,10 @@ clap = { version = "4.2.1", features = ["derive"] }
delay_map = "0.4.0"
directories = "3.0"
discv5 = { version = "0.4.1", features = ["serde"] }
e2store = { path = "e2store" }
env_logger = "0.9.0"
eth_trie = "0.5.0"
ethereum_ssz = "0.7.1"
ethereum_ssz_derive = "0.7.1"
ethportal-api = { path = "ethportal-api" }
futures = "0.3.23"
futures-util = "0.3.23"
hex = "0.4.3"
Expand All @@ -111,10 +56,7 @@ itertools = "0.13.0"
jsonrpsee = "0.24.4"
keccak-hash = "0.10.0"
lazy_static = "1.4.0"
light-client = { path = "light-client" }
parking_lot = "0.11.2"
portal-bridge = { path = "portal-bridge" }
portalnet = { path = "portalnet" }
prometheus_exporter = "0.8.4"
quickcheck = "1.0.3"
r2d2 = "0.8.9"
Expand All @@ -124,7 +66,6 @@ reqwest = { version = "0.12.7", features = ["native-tls-vendored", "json"] }
reth-ipc = { tag = "v1.0.8", git = "https://github.com/paradigmxyz/reth.git"}
revm = { version = "14.0.3", default-features = false, features = ["std", "secp256k1", "serde-json", "c-kzg"] }
revm-primitives = { version = "10.0.0", default-features = false, features = ["std", "serde"] }
rpc = { path = "rpc"}
rstest = "0.18.2"
rusqlite = { version = "0.31.0", features = ["bundled"] }
scraper = "0.18.1"
Expand All @@ -147,6 +88,19 @@ tracing-subscriber = "0.3.15"
tracing-test = "0.1"
tree_hash = "0.8.0"
tree_hash_derive = "0.8.0"
uds_windows = "1.0.1"
ureq = { version = "2.5.0", features = ["json"] }
url = "2.3.1"
utp-rs = { tag = "v0.1.0-alpha.14", git = "https://github.com/ethereum/utp" }

# Trin workspace crates
e2store = { path = "e2store" }
ethportal-api = { path = "ethportal-api" }
light-client = { path = "light-client" }
portal-bridge = { path = "portal-bridge" }
portalnet = { path = "portalnet" }
rpc = { path = "rpc"}
trin = { path = "bin/trin"}
trin-beacon = { path = "trin-beacon" }
trin-evm = { path = "trin-evm" }
trin-execution = { path = "trin-execution" }
Expand All @@ -156,7 +110,3 @@ trin-state = { path = "trin-state" }
trin-storage = { path = "trin-storage" }
trin-utils = { path = "trin-utils" }
trin-validation = { path = "trin-validation" }
uds_windows = "1.0.1"
ureq = { version = "2.5.0", features = ["json"] }
url = "2.3.1"
utp-rs = { tag = "v0.1.0-alpha.14", git = "https://github.com/ethereum/utp" }
37 changes: 37 additions & 0 deletions bin/trin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[package]
name = "trin"
description = "A Rust implementation of the Ethereum Portal Network"
authors.workspace = true
categories.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[dependencies]
alloy = { workspace = true, features = ["eips", "provider-ipc", "provider-ws", "pubsub", "reqwest", "rpc-types"] }
anyhow.workspace = true
clap.workspace = true
discv5.workspace = true
ethportal-api.workspace = true
portalnet.workspace = true
prometheus_exporter.workspace = true
rpc.workspace = true
tokio.workspace = true
tracing.workspace = true
tree_hash.workspace = true
trin-beacon.workspace = true
trin-history.workspace = true
trin-state.workspace = true
trin-storage.workspace = true
trin-utils.workspace = true
trin-validation.workspace = true
utp-rs.workspace = true
url.workspace = true

[dev-dependencies]
test-log.workspace = true
rstest.workspace = true
Loading

0 comments on commit c5de5a5

Please sign in to comment.