Rework bitswap client and server

Cargo.toml

@@ -292,6 +292,7 @@ members = [
 	"substrate/client/mixnet",
 	"substrate/client/network",
 	"substrate/client/network-gossip",
+	"substrate/client/network/bitswap",
 	"substrate/client/network/common",
 	"substrate/client/network/light",
 	"substrate/client/network/statement",
@@ -1268,6 +1269,7 @@ sc-informant = { path = "substrate/client/informant", default-features = false }
 sc-keystore = { path = "substrate/client/keystore", default-features = false }
 sc-mixnet = { path = "substrate/client/mixnet", default-features = false }
 sc-network = { path = "substrate/client/network", default-features = false }
+sc-network-bitswap = { path = "substrate/client/network/bitswap", default-features = false }
 sc-network-common = { path = "substrate/client/network/common", default-features = false }
 sc-network-gossip = { path = "substrate/client/network-gossip", default-features = false }
 sc-network-light = { path = "substrate/client/network/light", default-features = false }

cumulus/client/service/Cargo.toml

@@ -21,6 +21,7 @@ prometheus = { workspace = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+sc-network-bitswap = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-transactions = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }

cumulus/client/service/src/lib.rs

@@ -323,6 +323,7 @@ pub async fn build_network<'a, Block, Client, RCInterface, IQ, Network>(
 	TracingUnboundedSender<sc_rpc::system::Request<Block>>,
 	TransactionsHandlerController<Block::Hash>,
 	Arc<SyncingService<Block>>,
+	Option<sc_network_bitswap::BitswapHandle>,
 )>
 where
 	Block: BlockT,

cumulus/polkadot-omni-node/lib/src/common/spec.rs

@@ -52,7 +52,7 @@ use sc_network::{
 use sc_service::{Configuration, ImportQueue, PartialComponents, TaskManager};
 use sc_statement_store::Store;
 use sc_storage_chain_sync::{
-	IndexedTransactionFetcher, NetworkHandle, StorageChainBlockImport, SyncingHandle,
+	BitswapHandleSlot, IndexedTransactionFetcher, StorageChainBlockImport,
 };
 use sc_sysinfo::HwBench;
 use sc_telemetry::{TelemetryHandle, TelemetryWorker};
@@ -298,13 +298,9 @@ pub(crate) trait BaseNodeSpec {
 			.build(),
 		);
 
-		let network_handle: NetworkHandle = Arc::new(OnceLock::new());
-		let syncing_handle: SyncingHandle = Arc::new(OnceLock::new());
+		let bitswap_slot: BitswapHandleSlot = Arc::new(OnceLock::new());
 
-		let fetcher = IndexedTransactionFetcher::new(
-			Arc::clone(&network_handle),
-			Arc::clone(&syncing_handle),
-		);
+		let fetcher = IndexedTransactionFetcher::new(Arc::clone(&bitswap_slot));
 
 		let storage_chain_block_import =
 			StorageChainBlockImport::new(client.clone(), client.clone(), fetcher);
@@ -335,8 +331,7 @@ pub(crate) trait BaseNodeSpec {
 				telemetry,
 				telemetry_worker_handle,
 				block_import_auxiliary_data,
-				network_handle,
-				syncing_handle,
+				bitswap_slot,
 			),
 		})
 	}
@@ -404,8 +399,7 @@ pub(crate) trait NodeSpec: BaseNodeSpec {
 				mut telemetry,
 				telemetry_worker_handle,
 				block_import_auxiliary_data,
-				network_handle,
-				syncing_handle,
+				bitswap_slot,
 			) = params.other;
 			let client = params.client.clone();
 			let backend = params.backend.clone();
@@ -450,7 +444,7 @@ pub(crate) trait NodeSpec: BaseNodeSpec {
 				(proto, config)
 			});
 
-			let (network, system_rpc_tx, tx_handler_controller, sync_service) =
+			let (network, system_rpc_tx, tx_handler_controller, sync_service, bitswap_handle) =
 				build_network(BuildNetworkParams {
 					parachain_config: &parachain_config,
 					net_config,
@@ -466,10 +460,9 @@ pub(crate) trait NodeSpec: BaseNodeSpec {
 				})
 				.await?;
 
-			let _ = network_handle
-				.set(network.clone() as Arc<dyn sc_network::NetworkRequest + Send + Sync>);
-			let _ = syncing_handle.set(sync_service.clone()
-				as Arc<dyn sc_storage_chain_sync::BitswapPeerSource + Send + Sync>);
+			if let Some(handle) = bitswap_handle {
+				let _ = bitswap_slot.set(Arc::new(handle));
+			}
 
 			let peer_id = relay_chain_network.local_peer_id();
 

cumulus/polkadot-omni-node/lib/src/common/types.rs

@@ -60,7 +60,6 @@ pub type ParachainService<Block, RuntimeApi, BI, BIExtraReturnValue> = PartialCo
 		Option<Telemetry>,
 		Option<TelemetryWorkerHandle>,
 		BIExtraReturnValue,
-		sc_storage_chain_sync::NetworkHandle,
-		sc_storage_chain_sync::SyncingHandle,
+		sc_storage_chain_sync::BitswapHandleSlot,
 	),
 >;

cumulus/polkadot-omni-node/lib/src/nodes/aura.rs

@@ -252,7 +252,7 @@ where
 			keystore_container,
 			select_chain: _,
 			transaction_pool,
-			other: (_, mut telemetry, _, _, _, _),
+			other: (_, mut telemetry, _, _, _),
 		} = Self::new_partial(&config)?;
 
 		// Since this is a dev node, prevent it from connecting to peers.
@@ -276,7 +276,7 @@ where
 			(proto, *ss_config)
 		});
 
-		let (network, system_rpc_tx, tx_handler_controller, sync_service) =
+		let (network, system_rpc_tx, tx_handler_controller, sync_service, _bitswap_handle) =
 			sc_service::build_network(sc_service::BuildNetworkParams {
 				config: &config,
 				client: client.clone(),

cumulus/test/service/src/lib.rs

@@ -361,7 +361,7 @@ where
 		.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
 	tracing::info!("Parachain id: {:?}", para_id);
 
-	let (network, system_rpc_tx, tx_handler_controller, sync_service) =
+	let (network, system_rpc_tx, tx_handler_controller, sync_service, _bitswap_handle) =
 		build_network(BuildNetworkParams {
 			parachain_config: &parachain_config,
 			net_config,

polkadot/node/service/src/builder/mod.rs

@@ -468,7 +468,7 @@ where
 			})
 		};
 
-		let (network, system_rpc_tx, tx_handler_controller, sync_service) =
+		let (network, system_rpc_tx, tx_handler_controller, sync_service, _bitswap_handle) =
 			sc_service::build_network(sc_service::BuildNetworkParams {
 				config: &config,
 				net_config,

prdoc/pr_12686.prdoc

@@ -0,0 +1,31 @@
+title: Extract and refactor the Bitswap service
+doc:
+- audience: Node Dev
+  description: |-
+    Moves the Bitswap client and server from `sc-network` into the new
+    `sc-network-bitswap` crate. The new actor exposes a streaming `BitswapHandle` and
+    centralizes CID deduplication, peer selection, retries, response handling, and
+    backpressure. Storage-chain sync and node service wiring now use this handle.
+
+    The backend-specific Bitswap shims and local protobuf plumbing are removed. Bitswap
+    is now supported through Litep2p only; starting a node with `--ipfs-server` and a
+    different network backend returns an error.
+crates:
+- name: sc-network-bitswap
+  bump: patch
+- name: sc-network
+  bump: major
+- name: sc-service
+  bump: major
+  validate: false
+- name: sc-storage-chain-sync
+  bump: major
+- name: cumulus-client-service
+  bump: major
+  validate: false
+- name: polkadot-service
+  bump: patch
+- name: polkadot-omni-node-lib
+  bump: major
+- name: polkadot-sdk
+  bump: minor

substrate/bin/node/cli/src/service.rs

@@ -534,7 +534,7 @@ pub fn new_full_base<N: NetworkBackend<Block, <Block as BlockT>::Hash>>(
 		Vec::default(),
 	));
 
-	let (network, system_rpc_tx, tx_handler_controller, sync_service) =
+	let (network, system_rpc_tx, tx_handler_controller, sync_service, _bitswap_handle) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
 			net_config,

substrate/client/network/Cargo.toml

@@ -46,7 +46,6 @@ parking_lot = { workspace = true, default-features = true }
 partial_sort = { workspace = true }
 pin-project = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
-prost = { workspace = true }
 rand = { workspace = true, default-features = true }
 rustls = { workspace = true }
 sc-client-api = { workspace = true, default-features = true }
@@ -60,7 +59,6 @@ smallvec = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 tokio = { features = ["macros", "sync"], workspace = true, default-features = true }
@@ -72,7 +70,6 @@ zeroize = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-multihash-codetable = { workspace = true }
 multistream-select = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
@@ -85,8 +82,5 @@ tokio-util = { features = ["compat"], workspace = true }
 
 criterion = { workspace = true, default-features = true, features = ["async_tokio"] }
 
-[build-dependencies]
-prost-build = { workspace = true }
-
 [features]
 default = []

substrate/client/network/bitswap/Cargo.toml

@@ -0,0 +1,46 @@
+[package]
+description = "Substrate Bitswap client/server service"
+name = "sc-network-bitswap"
+version = "0.1.0"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+documentation = "https://docs.rs/sc-network-bitswap"
+
+[lints]
+workspace = true
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+async-trait = { workspace = true }
+cid = { workspace = true }
+futures = { workspace = true }
+litep2p = { workspace = true }
+log = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-network-common = { workspace = true, default-features = true }
+sc-network-sync = { workspace = true, default-features = true }
+slotmap = { workspace = true }
+smallvec = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+tokio = { features = ["macros", "rt", "sync", "time"], workspace = true, default-features = true }
+
+[dev-dependencies]
+proptest = { workspace = true }
+rstest = { workspace = true }
+sc-block-builder = { workspace = true, default-features = true }
+sc-network-types = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
+substrate-test-runtime = { workspace = true }
+substrate-test-runtime-client = { workspace = true }
+tokio = { features = ["macros", "rt-multi-thread", "test-util"], workspace = true, default-features = true }
+tokio-stream = { workspace = true }