Skip to content

Upgrade libp2p to enable yamux gains #1

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.

Sign up for GitHub

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

Merged
jxs merged 2 commits into from
Dec 12, 2023
Merged

Upgrade libp2p to enable yamux gains #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b1d7b5
Upgrade libp2p to enable yamux gains
pawanjay176 Dec 12, 2023
3941f8d
Add a comment specifying the branch being used
pawanjay176 Dec 12, 2023
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
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ criterion = "0.3"
delay_map = "0.3"
derivative = "2"
dirs = "3"
discv5 = { git="https://github.com/sigp/discv5", rev="87a0260db8a27595d01999ea5850848c43cc1bf0", features = ["libp2p"] }
# Branch https://github.com/sigp/discv5/tree/lighthouse-with-yamux
discv5 = { git="https://github.com/sigp/discv5", rev="1b5218d01015023f32e12c0a9ac6780759a550bf", features = ["libp2p"] }
Copy link
Owner

@jxs jxs Dec 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
discv5 = { git="https://github.com/sigp/discv5", rev="1b5218d01015023f32e12c0a9ac6780759a550bf", features = ["libp2p"] }
discv5 = { version = "0.4.0", features = ["libp2p"] }

age released a new version Pawan

Copy link
Author

@pawanjay176 pawanjay176 Dec 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discv5 has the libp2p feature for using PeerIds, so we need to update the libp2p version in discv5's Cargo.toml as well
We were using the lighthouse branch.
I upgraded it to use the branch I made (https://github.com/sigp/discv5/tree/lighthouse-with-yamux), this branch builds upon version 0.4.0

env_logger = "0.9"
error-chain = "0.12"
ethereum-types = "0.14"
Expand Down
5 changes: 3 additions & 2 deletions beacon_node/lighthouse_network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ prometheus-client = "0.22.0"
unused_port = { workspace = true }
delay_map = { workspace = true }
void = "1"
libp2p-mplex = { git = "https://github.com/sigp/rust-libp2p/", rev = "a70bef04c0c3e1dc35b812a597bb66ca89788e36"}
libp2p-mplex = { git = "https://github.com/sigp/rust-libp2p/", rev = "c5430243501075eba4429b33c427bc0ed13d0ff6"}

[dependencies.libp2p]
git = "https://github.com/sigp/rust-libp2p/"
rev = "a70bef04c0c3e1dc35b812a597bb66ca89788e36"
Copy link
Owner

@jxs jxs Dec 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we depend on the branch instead for better clarity Pawan? The Cargo.lock file will still have the revision

Copy link
Author

@pawanjay176 pawanjay176 Dec 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little unsure about how branch works cached dependencies vs fresh install. This is my ignorance, so I'll do some reading on how dependency management works with cargo.
For now, I'll just add a comment specifying the branch used with the rev since we want to deploy this to our nodes asap.

# Branch https://github.com/sigp/rust-libp2p/tree/lighthouse-gossipsub-yamux
rev = "c5430243501075eba4429b33c427bc0ed13d0ff6"
default-features = false
features = ["identify", "yamux", "noise", "gossipsub", "dns", "tcp", "tokio", "plaintext", "secp256k1", "macros", "ecdsa", "metrics", "quic"]

Expand Down