Merge of #7057

Author: mergify[bot]

Cargo.lock

@@ -13,7 +13,6 @@ members = [
     "beacon_node/http_api",
     "beacon_node/http_metrics",
     "beacon_node/lighthouse_network",
-    "beacon_node/lighthouse_network/gossipsub",
     "beacon_node/network",
     "beacon_node/operation_pool",
     "beacon_node/store",
@@ -246,7 +245,6 @@ fixed_bytes = { path = "consensus/fixed_bytes" }
 filesystem = { path = "common/filesystem" }
 fork_choice = { path = "consensus/fork_choice" }
 genesis = { path = "beacon_node/genesis" }
-gossipsub = { path = "beacon_node/lighthouse_network/gossipsub/" }
 health_metrics = { path = "common/health_metrics" }
 http_api = { path = "beacon_node/http_api" }
 initialized_validators = { path = "validator_client/initialized_validators" }

Cargo.toml

@@ -17,7 +17,7 @@ ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
 fnv = { workspace = true }
 futures = { workspace = true }
-gossipsub = { workspace = true }
+gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", tag = "sigp-gossipsub-0.1" }
 hex = { workspace = true }
 itertools = { workspace = true }
 libp2p-mplex = "0.43"
@@ -47,9 +47,6 @@ types = { workspace = true }
 unsigned-varint = { version = "0.8", features = ["codec"] }
 unused_port = { workspace = true }
 
-# Local dependencies
-void = "1.0.2"
-
 [dependencies.libp2p]
 version = "0.55"
 default-features = false