Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: pin git dependencies to specific revs #4552

Merged
merged 3 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 49 additions & 31 deletions Cargo.lock

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

37 changes: 25 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ rust-version = "1.70" # Remember to update .clippy.toml and README.md
license = "MIT OR Apache-2.0"
homepage = "https://paradigmxyz.github.io/reth"
repository = "https://github.com/paradigmxyz/reth"
exclude = [
".github/",
]
exclude = [".github/"]

# Like release, but with full debug symbols. Useful for e.g. `perf`.
[profile.debug-fast]
Expand All @@ -78,14 +76,8 @@ lto = "fat"
codegen-units = 1
incremental = false

[patch.crates-io]
revm = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }
revm-primitives = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }

[workspace.dependencies]
## reth
revm = { version = "3" }
revm-primitives = "1.1"
reth = { path = "./bin/reth" }
reth-primitives = { path = "./crates/primitives" }
reth-interfaces = { path = "./crates/interfaces" }
Expand All @@ -103,15 +95,26 @@ reth-transaction-pool = { path = "./crates/transaction-pool" }
reth-tasks = { path = "./crates/tasks" }
reth-network = { path = "./crates/net/network" }
reth-network-api = { path = "./crates/net/network-api" }
reth-rpc-types-compat = { path = "./crates/rpc/rpc-types-compat"}
reth-rpc-types-compat = { path = "./crates/rpc/rpc-types-compat" }

revm = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
revm-interpreter = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
revm-precompile = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }

## eth
ethers-core = { version = "2.0", default-features = false }
ethers-providers = { version = "2.0", default-features = false }
ethers-signers = { version = "2.0", default-features = false }
ethers-middleware = { version = "2.0", default-features = false }

discv5 = { git = "https://github.com/sigp/discv5", rev = "d2e30e04ee62418b9e57278cee907c02b99d5bd1" }
igd = { git = "https://github.com/stevefan1999-personal/rust-igd", rev = "c2d1f83eb1612a462962453cb0703bc93258b173" }

## js
boa_engine = "0.17"
boa_gc = "0.17"

## misc
aquamarine = "0.3"
bytes = "1.4"
Expand Down Expand Up @@ -149,10 +152,14 @@ jsonrpsee-core = { version = "0.20" }
jsonrpsee-types = { version = "0.20" }

## crypto
secp256k1 = { version = "0.27.0", default-features = false, features = ["global-context", "rand-std", "recovery"] }
secp256k1 = { version = "0.27.0", default-features = false, features = [
"global-context",
"rand-std",
"recovery",
] }
enr = { version = "0.9", default-features = false, features = ["k256"] }
# for eip-4844
c-kzg = { git = "https://github.com/ethereum/c-kzg-4844" }
c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", rev = "f5f6f863d475847876a2bd5ee252058d37c3a15d" }

## config
confy = "0.5"
Expand All @@ -162,3 +169,9 @@ toml = "0.7"
proptest = "1.0"
arbitrary = "1.1"
assert_matches = "1.5.0"

[patch.crates-io]
revm = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
revm-interpreter = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
revm-precompile = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
2 changes: 1 addition & 1 deletion crates/net/discv4/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ reth-net-common = { path = "../common" }
reth-net-nat = { path = "../nat" }

# ethereum
discv5 = { git = "https://github.com/sigp/discv5" }
discv5.workspace = true
secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery", "serde"] }
enr = { workspace = true, default-features = false, features = ["rust-secp256k1"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/net/nat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Helpers for working around NAT
# nat
public-ip = "0.2"
## fork of rust-igd with ipv6 support: https://github.com/sbstp/rust-igd/issues/47
igd = { git = "https://github.com/stevefan1999-personal/rust-igd", features = ["aio", "tokio1"] }
igd = { workspace = true, features = ["aio", "tokio1"] }

# misc
tracing.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions crates/revm/revm-inspectors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ thiserror = { workspace = true, optional = true }
serde_json = { workspace = true, optional = true }

# js-tracing-inspector
boa_engine = { git = "https://github.com/boa-dev/boa", optional = true }
boa_gc = { git = "https://github.com/boa-dev/boa", optional = true }
boa_engine = { workspace = true, optional = true }
boa_gc = { workspace = true, optional = true }
tokio = { version = "1", features = ["sync"], optional = true }

[features]
default = ["js-tracer"]
js-tracer = ["boa_engine", "boa_gc", "tokio","thiserror", "serde_json"]
js-tracer = ["boa_engine", "boa_gc", "tokio", "thiserror", "serde_json"]
9 changes: 8 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,11 @@ license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
unknown-registry = "warn"
# Lint level for what to happen when a crate from a git repository that is not
# in the allow list is encountered
unknown-git = "allow"
unknown-git = "deny"
allow-git = [
"https://github.com/bluealloy/revm",
"https://github.com/boa-dev/boa",
"https://github.com/ethereum/c-kzg-4844",
"https://github.com/sigp/discv5",
"https://github.com/stevefan1999-personal/rust-igd",
]