Skip to content

Commit f23f984

Browse files
authored
switch to upstream gossipsub (#7057)
We forked `gossipsub` into the lighthouse repo sometime ago so that we could iterate quicker on implementing back pressure and IDONTWANT. Meanwhile we have pushed all our changes upstream and we are now the main maintainers of `rust-libp2p` this allows us to use upstream `gossipsub` again. Nonetheless we still use our forked repo to give us freedom to experiment with features before submitting them upstream
1 parent 1a08e6f commit f23f984

35 files changed

+459
-19073
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ members = [
1313
"beacon_node/http_api",
1414
"beacon_node/http_metrics",
1515
"beacon_node/lighthouse_network",
16-
"beacon_node/lighthouse_network/gossipsub",
1716
"beacon_node/network",
1817
"beacon_node/operation_pool",
1918
"beacon_node/store",
@@ -246,7 +245,6 @@ fixed_bytes = { path = "consensus/fixed_bytes" }
246245
filesystem = { path = "common/filesystem" }
247246
fork_choice = { path = "consensus/fork_choice" }
248247
genesis = { path = "beacon_node/genesis" }
249-
gossipsub = { path = "beacon_node/lighthouse_network/gossipsub/" }
250248
health_metrics = { path = "common/health_metrics" }
251249
http_api = { path = "beacon_node/http_api" }
252250
initialized_validators = { path = "validator_client/initialized_validators" }

beacon_node/lighthouse_network/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ethereum_ssz = { workspace = true }
1717
ethereum_ssz_derive = { workspace = true }
1818
fnv = { workspace = true }
1919
futures = { workspace = true }
20-
gossipsub = { workspace = true }
20+
gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", tag = "sigp-gossipsub-0.1" }
2121
hex = { workspace = true }
2222
itertools = { workspace = true }
2323
libp2p-mplex = "0.43"
@@ -47,9 +47,6 @@ types = { workspace = true }
4747
unsigned-varint = { version = "0.8", features = ["codec"] }
4848
unused_port = { workspace = true }
4949

50-
# Local dependencies
51-
void = "1.0.2"
52-
5350
[dependencies.libp2p]
5451
version = "0.55"
5552
default-features = false

0 commit comments

Comments
 (0)