jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: pull reth/common/rlp up to reth/rlp (#1146)

Browse Source
This commit is contained in:
Georgios Konstantopoulos
2023-02-02 13:54:13 -08:00
committed by GitHub
parent 16b3f1677c
commit 1f64d8e9d7
31 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -2,8 +2,8 @@
members = [
"bin/reth",
"crate-template",
"crates/common/rlp",
"crates/common/rlp-derive",
"crates/rlp",
"crates/rlp/rlp-derive",
"crates/consensus",
"crates/executor",
"crates/interfaces",

2
bin/reth/Cargo.toml
View File

@ -19,7 +19,7 @@ reth-transaction-pool = { path = "../../crates/transaction-pool" }
reth-consensus = { path = "../../crates/consensus" }
reth-executor = { path = "../../crates/executor" }
# reth-rpc = {path = "../../crates/net/rpc"}
reth-rlp = { path = "../../crates/common/rlp" }
reth-rlp = { path = "../../crates/rlp" }
reth-network = {path = "../../crates/net/network", features = ["serde"] }
reth-network-api = {path = "../../crates/net/network-api" }
reth-downloaders = {path = "../../crates/net/downloaders" }

2
crates/executor/Cargo.toml
View File

@ -10,7 +10,7 @@ readme = "README.md"
# reth
reth-primitives = { path = "../primitives" }
reth-interfaces = { path = "../interfaces" }
reth-rlp = { path = "../common/rlp" }
reth-rlp = { path = "../rlp" }
reth-db = { path = "../storage/db" }
reth-provider = { path = "../storage/provider" }

4
crates/net/discv4/Cargo.toml
View File

@ -12,8 +12,8 @@ Ethereum network discovery
[dependencies]
# reth
reth-primitives = { path = "../../primitives" }
reth-rlp = { path = "../../common/rlp", features = ["enr"] }
reth-rlp-derive = { path = "../../common/rlp-derive" }
reth-rlp = { path = "../../rlp", features = ["enr"] }
reth-rlp-derive = { path = "../../rlp/rlp-derive" }
reth-net-common = { path = "../common" }
reth-net-nat = { path = "../nat" }

2
crates/net/dns/Cargo.toml
View File

@ -11,7 +11,7 @@ description = "Support for EIP-1459 Node Discovery via DNS"
# reth
reth-primitives = { path = "../../primitives" }
reth-net-common = { path = "../common" }
reth-rlp = { path = "../../common/rlp" }
reth-rlp = { path = "../../rlp" }
# ethereum
secp256k1 = { version = "0.24", features = [

4
crates/net/downloaders/Cargo.toml
View File

@ -27,7 +27,7 @@ tracing = "0.1.37"
metrics = "0.20.1"
thiserror = { version = "1", optional = true }
reth-rlp = { path = "../../common/rlp", optional = true }
reth-rlp = { path = "../../rlp", optional = true }
[dev-dependencies]
reth-db = { path = "../../storage/db", features = ["test-utils"] }
@ -36,7 +36,7 @@ reth-tracing = { path = "../../tracing" }
assert_matches = "1.5.0"
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
reth-rlp = { path = "../../common/rlp" }
reth-rlp = { path = "../../rlp" }
thiserror = "1"
tempfile = "3.3"

2
crates/net/ecies/Cargo.toml
View File

@ -7,7 +7,7 @@ repository = "https://github.com/paradigmxyz/reth"
readme = "README.md"
[dependencies]
reth-rlp = { path = "../../common/rlp", features = ["derive", "ethereum-types", "std"] }
reth-rlp = { path = "../../rlp", features = ["derive", "ethereum-types", "std"] }
reth-primitives = { path = "../../primitives" }
reth-net-common = { path = "../common" }

2
crates/net/eth-wire/Cargo.toml
View File

@ -16,7 +16,7 @@ serde = "1"
# reth
reth-codecs = { path = "../../storage/codecs" }
reth-primitives = { path = "../../primitives" }
reth-rlp = { path = "../../common/rlp", features = ["alloc", "derive", "std", "ethereum-types", "smol_str"] }
reth-rlp = { path = "../../rlp", features = ["alloc", "derive", "std", "ethereum-types", "smol_str"] }
# used for Chain and builders
ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false }

4
crates/net/network/Cargo.toml
View File

@ -25,8 +25,8 @@ reth-discv4 = { path = "../discv4" }
reth-dns-discovery = { path = "../dns" }
reth-eth-wire = { path = "../eth-wire" }
reth-ecies = { path = "../ecies" }
reth-rlp = { path = "../../common/rlp" }
reth-rlp-derive = { path = "../../common/rlp-derive" }
reth-rlp = { path = "../../rlp" }
reth-rlp-derive = { path = "../../rlp/rlp-derive" }
reth-tasks = { path = "../../tasks" }
reth-transaction-pool = { path = "../../transaction-pool" }
reth-provider = { path = "../../storage/provider"}

2
crates/net/rpc-engine-api/Cargo.toml
View File

@ -11,7 +11,7 @@ description = "Implementation of Engine API"
reth-primitives = { path = "../../primitives" }
reth-interfaces = { path = "../../interfaces" }
reth-provider = { path = "../../storage/provider" }
reth-rlp = { path = "../../common/rlp" }
reth-rlp = { path = "../../rlp" }
reth-executor = { path = "../../executor" }
reth-rpc-types = { path = "../rpc-types" }

2
crates/net/rpc-types/Cargo.toml
View File

@ -11,7 +11,7 @@ Reth RPC types
[dependencies]
# reth
reth-primitives = { path = "../../primitives" }
reth-rlp = { path = "../../common/rlp" }
reth-rlp = { path = "../../rlp" }
reth-network-api = { path = "../network-api"}
# misc

2
crates/net/rpc/Cargo.toml
View File

@ -13,7 +13,7 @@ Reth RPC implementation
reth-interfaces = { path = "../../interfaces" }
reth-primitives = { path = "../../primitives" }
reth-rpc-api = { path = "../rpc-api" }
reth-rlp = { path = "../../common/rlp" }
reth-rlp = { path = "../../rlp" }
reth-rpc-types = { path = "../rpc-types" }
reth-provider = { path = "../../storage/provider" }
reth-transaction-pool = { path = "../../transaction-pool" }

4
crates/primitives/Cargo.toml
View File

@ -9,12 +9,12 @@ description = "Commonly used types in reth."
[dependencies]
# reth
reth-rlp = { path = "../common/rlp", features = [
reth-rlp = { path = "../rlp", features = [
"std",
"derive",
"ethereum-types",
] }
reth-rlp-derive = { path = "../common/rlp-derive" }
reth-rlp-derive = { path = "../rlp/rlp-derive" }
reth-codecs = { version = "0.1.0", path = "../storage/codecs" }
revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "a05fb262d87c78ee52d400e6c0f4708d4c527f32", features = [

2
crates/primitives/src/hardfork.rs
View File

@ -48,7 +48,7 @@ impl Hardfork {
curr_block_number = b;
}
} else {
return Some(ForkId { hash: curr_forkhash, next: b })
return Some(ForkId { hash: curr_forkhash, next: b });
}
}
Some(ForkId { hash: curr_forkhash, next: 0 })

2
crates/common/rlp/Cargo.toml → crates/rlp/Cargo.toml
View File

@ -15,7 +15,7 @@ smol_str = { version = "0.1", default-features = false, optional = true }
enr = { version = "0.7", default-features = false, optional = true }
rlp = { version = "0.5.2", default-features = false, optional = true }
ethereum-types = { version = "0.14", features = ["codec"], optional = true }
reth-rlp-derive = { version = "0.1", path = "../rlp-derive", optional = true }
reth-rlp-derive = { version = "0.1", path = "./rlp-derive", optional = true }
revm-interpreter = { git = "https://github.com/bluealloy/revm", rev = "a05fb262d87c78ee52d400e6c0f4708d4c527f32", features = ["serde"] }
[dev-dependencies]

0
crates/common/rlp-derive/LICENCE → crates/rlp/LICENCE
View File

0
crates/common/rlp/README.md → crates/rlp/README.md
View File

0
crates/common/rlp/benches/bench.rs → crates/rlp/benches/bench.rs
View File

0
crates/common/rlp-derive/Cargo.toml → crates/rlp/rlp-derive/Cargo.toml
View File

0
crates/common/rlp/LICENCE → crates/rlp/rlp-derive/LICENCE
View File

0
crates/common/rlp-derive/README.md → crates/rlp/rlp-derive/README.md
View File

0
crates/common/rlp-derive/src/de.rs → crates/rlp/rlp-derive/src/de.rs
View File

0
crates/common/rlp-derive/src/en.rs → crates/rlp/rlp-derive/src/en.rs
View File

0
crates/common/rlp-derive/src/lib.rs → crates/rlp/rlp-derive/src/lib.rs
View File

0
crates/common/rlp-derive/src/utils.rs → crates/rlp/rlp-derive/src/utils.rs
View File

0
crates/common/rlp/src/decode.rs → crates/rlp/src/decode.rs
View File

0
crates/common/rlp/src/encode.rs → crates/rlp/src/encode.rs
View File

0
crates/common/rlp/src/lib.rs → crates/rlp/src/lib.rs
View File

0
crates/common/rlp/src/types.rs → crates/rlp/src/types.rs
View File

0
crates/common/rlp/tests/rlp.rs → crates/rlp/tests/rlp.rs
View File

2
crates/stages/Cargo.toml
View File

@ -18,7 +18,7 @@ normal = [
reth-primitives = { path = "../primitives" }
reth-interfaces = { path = "../interfaces" }
reth-executor = { path = "../executor" }
reth-rlp = { path = "../common/rlp" }
reth-rlp = { path = "../rlp" }
reth-db = { path = "../storage/db" }
reth-provider = { path = "../storage/provider" }