Skip to content

Commit ca2a7cd

Browse files
committed
Re-pin ethp2p-rs to the merged main (PR #20)
PR #20 landed the spec-conformant transport on ethp2p-rs main (squash-merged as d852f23). Move the pin off the pre-merge branch commit (3d23411) to that main commit, which additionally brings in the hardening added after the Slice-7 bump: reconstruct-reset, per-peer bounded queues with backpressure, opt-in peer-id pinning, and — importantly — the fix for a load-dependent livelock where a backpressured chunk send spun drain_session without yielding. Pinning to a commit on main (rather than a branch that may be deleted) also gives the git dependency stable provenance. No adapter changes: the new transport APIs are additive, so bind/connect/Net::send/events are unchanged. The in-crate round-trip test and the default feature-off build both pass.
1 parent 5b96e80 commit ca2a7cd

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/net/p2p/Cargo.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ libssz-types.workspace = true
4646
sha2 = "0.10"
4747

4848
# ethp2p-rs erasure-coded broadcast (experimental, off by default).
49-
# Pinned to a github.com/lambdaclass/ethp2p-rs commit. The repo is public, so
50-
# resolution needs no credentials; building with the `ethp2p` feature also
51-
# needs `protoc` on the build host (ethp2p-broadcast compiles its .proto via
52-
# prost-build). The default (feature-off) build compiles neither crate.
53-
ethp2p-broadcast = { git = "https://github.com/lambdaclass/ethp2p-rs", rev = "3d234116e852b85be7bf8e6b9272ed66772cd98c", optional = true }
54-
ethp2p-transport = { git = "https://github.com/lambdaclass/ethp2p-rs", rev = "3d234116e852b85be7bf8e6b9272ed66772cd98c", optional = true }
49+
# Pinned to the merged main commit of github.com/lambdaclass/ethp2p-rs (PR #20:
50+
# spec-conformant transport + reconstruct-reset + bounded-queue backpressure +
51+
# peer-id pinning). The repo is public, so resolution needs no credentials;
52+
# building with the `ethp2p` feature also needs `protoc` on the build host
53+
# (ethp2p-broadcast compiles its .proto via prost-build). The default
54+
# (feature-off) build compiles neither crate.
55+
ethp2p-broadcast = { git = "https://github.com/lambdaclass/ethp2p-rs", rev = "d852f23544cd9b7d0634474d54dbf3f417a16140", optional = true }
56+
ethp2p-transport = { git = "https://github.com/lambdaclass/ethp2p-rs", rev = "d852f23544cd9b7d0634474d54dbf3f417a16140", optional = true }
5557
# Needed to serialize the RS preamble (a prost message) before publishing.
5658
# Version-matched to ethp2p-broadcast's prost so cargo unifies them.
5759
prost = { version = "0.13", optional = true }

0 commit comments

Comments
 (0)