Suggestion for adding bitswap to substrate

bin/node-template/node/Cargo.toml

@@ -17,6 +17,7 @@ name = "node-template"
 
 [dependencies]
 structopt = "0.3.8"
+tiny-multihash = "0.4.5"
 
 sc-cli = { version = "0.8.0", path = "../../../client/cli", features = ["wasmtime"] }
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }

bin/node-template/node/src/service.rs

@@ -10,6 +10,7 @@ use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
 use sc_finality_grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider, SharedVoterState};
+use tiny_multihash::Multihash;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -91,7 +92,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
-		sc_service::build_network(sc_service::BuildNetworkParams {
+		sc_service::BuildNetworkParams {
 			config: &config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
@@ -101,7 +102,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 			block_announce_validator_builder: None,
 			finality_proof_request_builder: None,
 			finality_proof_provider: Some(finality_proof_provider.clone()),
-		})?;
+		}.build_network::<Multihash>()?;
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
@@ -263,7 +264,7 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
-		sc_service::build_network(sc_service::BuildNetworkParams {
+		sc_service::BuildNetworkParams {
 			config: &config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
@@ -273,7 +274,7 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 			block_announce_validator_builder: None,
 			finality_proof_request_builder: Some(finality_proof_request_builder),
 			finality_proof_provider: Some(finality_proof_provider),
-		})?;
+		}.build_network::<Multihash>()?;
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(

bin/node/cli/Cargo.toml

@@ -43,6 +43,7 @@ rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
 tracing = "0.1.19"
 parking_lot = "0.10.0"
+tiny-multihash = "0.4.5"
 
 # primitives
 sp-authority-discovery = { version = "2.0.0",  path = "../../../primitives/authority-discovery" }

bin/node/cli/src/service.rs

@@ -36,6 +36,7 @@ use futures::prelude::*;
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use sp_core::traits::BareCryptoStorePtr;
 use node_executor::Executor;
+use tiny_multihash::Multihash;
 
 type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
 type FullBackend = sc_service::TFullBackend<Block>;
@@ -161,7 +162,7 @@ pub struct NewFullBase {
 	pub task_manager: TaskManager,
 	pub inherent_data_providers: InherentDataProviders,
 	pub client: Arc<FullClient>,
-	pub network: Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
+	pub network: Arc<NetworkService<Block, <Block as BlockT>::Hash, Multihash>>,
 	pub network_status_sinks: sc_service::NetworkStatusSinks<Block>,
 	pub transaction_pool: Arc<sc_transaction_pool::FullPool<Block, FullClient>>,
 }
@@ -183,7 +184,7 @@ pub fn new_full_base(
 	let (shared_voter_state, finality_proof_provider) = rpc_setup;
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
-		sc_service::build_network(sc_service::BuildNetworkParams {
+		sc_service::BuildNetworkParams {
 			config: &config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
@@ -193,7 +194,7 @@ pub fn new_full_base(
 			block_announce_validator_builder: None,
 			finality_proof_request_builder: None,
 			finality_proof_provider: Some(finality_proof_provider.clone()),
-		})?;
+		}.build_network::<Multihash>()?;
 
 	if config.offchain_worker.enabled {
 		sc_service::build_offchain_workers(
@@ -355,7 +356,7 @@ pub fn new_full(config: Configuration)
 
 pub fn new_light_base(config: Configuration) -> Result<(
 	TaskManager, RpcHandlers, Arc<LightClient>,
-	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
+	Arc<NetworkService<Block, <Block as BlockT>::Hash, Multihash>>,
 	Arc<sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>>
 ), ServiceError> {
 	let (client, backend, keystore, mut task_manager, on_demand) =
@@ -405,7 +406,7 @@ pub fn new_light_base(config: Configuration) -> Result<(
 		GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
-		sc_service::build_network(sc_service::BuildNetworkParams {
+		sc_service::BuildNetworkParams {
 			config: &config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
@@ -415,7 +416,7 @@ pub fn new_light_base(config: Configuration) -> Result<(
 			block_announce_validator_builder: None,
 			finality_proof_request_builder: Some(finality_proof_request_builder),
 			finality_proof_provider: Some(finality_proof_provider),
-		})?;
+		}.build_network::<Multihash>()?;
 	network_starter.start_network();
 
 	if config.offchain_worker.enabled {

client/authority-discovery/src/worker.rs

@@ -42,6 +42,7 @@ use sc_network::{
 	DhtEvent,
 	ExHashT,
 	Multiaddr,
+	MultihashDigest,
 	NetworkStateInfo,
 	PeerId,
 };
@@ -455,6 +456,7 @@ where
 						"Failed to put hash '{:?}' on Dht.", hash
 					)
 				},
+				Some(_) => {}
 				None => {
 					debug!(target: LOG_TARGET, "Dht event stream terminated.");
 					return Poll::Ready(());
@@ -707,10 +709,11 @@ pub trait NetworkProvider: NetworkStateInfo {
 	fn get_value(&self, key: &libp2p::kad::record::Key);
 }
 
-impl<B, H> NetworkProvider for sc_network::NetworkService<B, H>
+impl<B, H, M> NetworkProvider for sc_network::NetworkService<B, H, M>
 where
 	B: BlockT + 'static,
 	H: ExHashT,
+	M: MultihashDigest,
 {
 	fn set_priority_group(
 		&self,

client/finality-grandpa/src/communication/mod.rs

@@ -38,7 +38,7 @@ use std::{pin::Pin, sync::Arc, task::{Context, Poll}};
 use sp_core::traits::BareCryptoStorePtr;
 use finality_grandpa::Message::{Prevote, Precommit, PrimaryPropose};
 use finality_grandpa::{voter, voter_set::VoterSet};
-use sc_network::{NetworkService, ReputationChange};
+use sc_network::{MultihashDigest, NetworkService, ReputationChange};
 use sc_network_gossip::{GossipEngine, Network as GossipNetwork};
 use parity_scale_codec::{Encode, Decode};
 use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT, NumberFor};
@@ -152,9 +152,10 @@ pub trait Network<Block: BlockT>: GossipNetwork<Block> + Clone + Send + 'static
 	fn set_sync_fork_request(&self, peers: Vec<sc_network::PeerId>, hash: Block::Hash, number: NumberFor<Block>);
 }
 
-impl<B, H> Network<B> for Arc<NetworkService<B, H>> where
+impl<B, H, M> Network<B> for Arc<NetworkService<B, H, M>> where
 	B: BlockT,
 	H: sc_network::ExHashT,
+	M: MultihashDigest,
 {
 	fn set_sync_fork_request(&self, peers: Vec<sc_network::PeerId>, hash: B::Hash, number: NumberFor<B>) {
 		NetworkService::set_sync_fork_request(self, peers, hash, number)

client/network-gossip/src/bridge.rs

@@ -210,7 +210,8 @@ impl<B: BlockT> Future for GossipEngine<B> {
 
 								this.forwarding_state = ForwardingState::Busy(to_forward.into());
 							},
-							Event::Dht(_) => {}
+							Event::Dht(_) => {},
+							Event::Bitswap(_) => {},
 						}
 						// The network event stream closed. Do the same for [`GossipValidator`].
 						Poll::Ready(None) => return Poll::Ready(()),

client/network-gossip/src/lib.rs

@@ -59,7 +59,7 @@ pub use self::state_machine::TopicNotification;
 pub use self::validator::{DiscardAll, MessageIntent, Validator, ValidatorContext, ValidationResult};
 
 use futures::prelude::*;
-use sc_network::{Event, ExHashT, NetworkService, PeerId, ReputationChange};
+use sc_network::{Event, ExHashT, MultihashDigest, NetworkService, PeerId, ReputationChange};
 use sp_runtime::{traits::Block as BlockT, ConsensusEngineId};
 use std::{borrow::Cow, pin::Pin, sync::Arc};
 
@@ -97,7 +97,7 @@ pub trait Network<B: BlockT> {
 	fn announce(&self, block: B::Hash, associated_data: Vec<u8>);
 }
 
-impl<B: BlockT, H: ExHashT> Network<B> for Arc<NetworkService<B, H>> {
+impl<B: BlockT, H: ExHashT, M: MultihashDigest> Network<B> for Arc<NetworkService<B, H, M>> {
 	fn event_stream(&self) -> Pin<Box<dyn Stream<Item = Event> + Send>> {
 		Box::pin(NetworkService::event_stream(self, "network-gossip"))
 	}

client/network/Cargo.toml

@@ -62,6 +62,9 @@ unsigned-varint = { version = "0.4.0", features = ["futures", "futures-codec"] }
 void = "1.0.2"
 wasm-timer = "0.2"
 zeroize = "1.0.0"
+libp2p-bitswap = "0.7.0"
+tiny-cid = "0.2.5"
+tiny-multihash = { version = "0.4.5", default-features = false, features = ["std"] }
 
 [dependencies.libp2p]
 version = "0.28.1"