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

Upgrade libp2p to enable yamux gains #1

Merged
merged 2 commits into from
Dec 12, 2023

Conversation

pawanjay176
Copy link

Issue Addressed

N/A

Proposed Changes

Upgrade to a libp2p sigp branch which contains the yamux improvements. The libp2p branch is essentially the commit being used in @jxs 's PR merged with libp2p master.
Also upgrades to a discv5 branch that uses the updated libp2p commit.

Libp2p branch: https://github.com/sigp/rust-libp2p/tree/lighthouse-gossipsub-yamux
Discv5 branch: https://github.com/sigp/discv5/tree/lighthouse-with-yamux

Related sigp#4996

@@ -105,7 +105,7 @@ criterion = "0.3"
delay_map = "0.3"
derivative = "2"
dirs = "3"
discv5 = { git="https://github.com/sigp/discv5", rev="87a0260db8a27595d01999ea5850848c43cc1bf0", features = ["libp2p"] }
discv5 = { git="https://github.com/sigp/discv5", rev="1b5218d01015023f32e12c0a9ac6780759a550bf", features = ["libp2p"] }
Copy link
Owner

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

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


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

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

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.

@jxs jxs merged commit 99669b5 into jxs:switch-libp2p-sigp-fork Dec 12, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants