Supercede 'Propagate Substrate#4284 to Polkadot' (#695)

* Propagate Substrate#4284 to Polkadot

* Fix tests

* Fixes

* Use hash part of fund id as child unique id.

* Add comma

* Switch branch

* run cargo update

* Update polkadot-master only

* Fix collator

polkadot/service/src/lib.rs

@@ -238,6 +238,7 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
 	let mut gossip_validator = network_gossip::register_validator(
 		service.network(),
 		(is_known, client.clone()),
+		&service.spawn_task_handle(),
 	);
 
 	if participates_in_consensus {
@@ -247,7 +248,7 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
 			let mut path = PathBuf::from(db_path);
 			path.push("availability");
 
-			let gossip = polkadot_network::AvailabilityNetworkShim(service.network());
+			let gossip = polkadot_network::AvailabilityNetworkShim(gossip_validator.clone());
 
 			#[cfg(not(target_os = "unknown"))]
 			{
@@ -275,9 +276,8 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
 
 		// collator connections and validation network both fulfilled by this
 		let validation_network = ValidationNetwork::new(
-			service.network(),
-			service.on_exit(),
 			gossip_validator,
+			service.on_exit(),
 			service.client(),
 			WrappedExecutor(service.spawn_task_handle()),
 		);
@@ -374,6 +374,7 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
 			on_exit: service.on_exit(),
 			telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 			voting_rule: grandpa::VotingRulesBuilder::default().build(),
+			executor: service.spawn_task_handle(),
 		};
 		service.spawn_essential_task(grandpa::run_grandpa_voter(grandpa_config)?);
 	} else {