diff --git a/Cargo.lock b/Cargo.lock
index 18eb00a13c1e943e2ee1364d769aa1931bbaaa5f..54fa7c6485bb5e4c6823793a637b7e3afb1227dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4198,6 +4198,7 @@ dependencies = [
"polkadot-core-primitives",
"polkadot-network-bridge",
"polkadot-node-collation-generation",
+ "polkadot-node-core-prospective-parachains",
"polkadot-node-core-runtime-api",
"polkadot-node-network-protocol",
"polkadot-node-subsystem-util",
diff --git a/cumulus/client/relay-chain-minimal-node/Cargo.toml b/cumulus/client/relay-chain-minimal-node/Cargo.toml
index 6518e09cbb532b64534998cb58fb6f5dba48da3a..8c196f66b72aeac4a136280f5f057279c85b56e1 100644
--- a/cumulus/client/relay-chain-minimal-node/Cargo.toml
+++ b/cumulus/client/relay-chain-minimal-node/Cargo.toml
@@ -18,6 +18,7 @@ polkadot-collator-protocol = { path = "../../../polkadot/node/network/collator-p
polkadot-network-bridge = { path = "../../../polkadot/node/network/bridge" }
polkadot-node-collation-generation = { path = "../../../polkadot/node/collation-generation" }
polkadot-node-core-runtime-api = { path = "../../../polkadot/node/core/runtime-api" }
+polkadot-node-core-prospective-parachains = { path = "../../../polkadot/node/core/prospective-parachains" }
# substrate deps
sc-authority-discovery = { path = "../../../substrate/client/authority-discovery" }
diff --git a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
index 216ca0d39658a908f5710e87d224a47c9e8909fb..379217e4a638e625d5b3a70400ae28792a1a7318 100644
--- a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
@@ -24,6 +24,7 @@ use polkadot_network_bridge::{
NetworkBridgeTx as NetworkBridgeTxSubsystem,
};
use polkadot_node_collation_generation::CollationGenerationSubsystem;
+use polkadot_node_core_prospective_parachains::ProspectiveParachainsSubsystem;
use polkadot_node_core_runtime_api::RuntimeApiSubsystem;
use polkadot_node_network_protocol::{
peer_set::PeerSetProtocolNames,
@@ -144,7 +145,7 @@ fn build_overseer(
spawner.clone(),
))
.statement_distribution(DummySubsystem)
- .prospective_parachains(DummySubsystem)
+ .prospective_parachains(ProspectiveParachainsSubsystem::new(Metrics::register(registry)?))
.approval_distribution(DummySubsystem)
.approval_voting(DummySubsystem)
.gossip_support(DummySubsystem)
diff --git a/cumulus/client/relay-chain-minimal-node/src/lib.rs b/cumulus/client/relay-chain-minimal-node/src/lib.rs
index c8fba923ddebe93b43466048dc05e51da35acb56..8801f93640c181cbf27084656d9d7f28cabff1d7 100644
--- a/cumulus/client/relay-chain-minimal-node/src/lib.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/lib.rs
@@ -171,12 +171,7 @@ async fn new_minimal_relay_chain(
);
}
- let genesis_hash = relay_chain_rpc_client
- .block_get_hash(Some(0))
- .await
- .expect("Genesis block hash is always available; qed")
- .unwrap_or_default();
-
+ let genesis_hash = relay_chain_rpc_client.block_get_hash(Some(0)).await?.unwrap_or_default();
let peer_set_protocol_names =
PeerSetProtocolNames::new(genesis_hash, config.chain_spec.fork_id());
let is_authority = if role.is_authority() { IsAuthority::Yes } else { IsAuthority::No };
diff --git a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
index 5924716adcb41d8b4c93b525ea4e1ae8093b413b..90af334e1334fe03323f8c4124e6590daa69ba09 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
@@ -201,7 +201,7 @@ impl RelayChainRpcClient {
let value = rx.await.map_err(|err| {
RelayChainError::WorkerCommunicationError(format!(
- "Unexpected channel close on RPC worker side: {}",
+ "RPC worker channel closed. This can hint and connectivity issues with the supplied RPC endpoints. Message: {}",
err
))
})??;
diff --git a/cumulus/client/service/src/lib.rs b/cumulus/client/service/src/lib.rs
index 82890666ebae3f197e291019d215ea9d446ef71f..f8ebca11c8c1fbc05c290b436e3e8abd99771eb3 100644
--- a/cumulus/client/service/src/lib.rs
+++ b/cumulus/client/service/src/lib.rs
@@ -49,7 +49,7 @@ use sc_utils::mpsc::TracingUnboundedSender;
use sp_api::ProvideRuntimeApi;
use sp_blockchain::{HeaderBackend, HeaderMetadata};
use sp_core::{traits::SpawnNamed, Decode};
-use sp_runtime::traits::{Block as BlockT, BlockIdTo};
+use sp_runtime::traits::{Block as BlockT, BlockIdTo, Header};
use std::{sync::Arc, time::Duration};
// Given the sporadic nature of the explicit recovery operation and the
@@ -505,11 +505,11 @@ where
None,
async move {
log::debug!(
- target: "cumulus-network",
+ target: LOG_TARGET_SYNC,
"waiting for announce block in a background task...",
);
- let _ = wait_for_target_block::<B, _>(sender, para_id, relay_chain_interface)
+ let _ = wait_for_finalized_para_head::<B, _>(sender, para_id, relay_chain_interface)
.await
.map_err(|e| {
log::error!(
@@ -527,7 +527,7 @@ where
/// Waits for the relay chain to have finished syncing and then gets the parachain header that
/// corresponds to the last finalized relay chain block.
-async fn wait_for_target_block<B, RCInterface>(
+async fn wait_for_finalized_para_head<B, RCInterface>(
sender: oneshot::Sender<<B as BlockT>::Header>,
para_id: ParaId,
relay_chain_interface: RCInterface,
@@ -560,11 +560,15 @@ where
.map_err(|e| format!("{e:?}"))?
.ok_or("Could not find parachain head in relay chain")?;
- let target_block = B::Header::decode(&mut &validation_data.parent_head.0[..])
+ let finalized_header = B::Header::decode(&mut &validation_data.parent_head.0[..])
.map_err(|e| format!("Failed to decode parachain head: {e}"))?;
- log::debug!(target: LOG_TARGET_SYNC, "Target block reached {:?}", target_block);
- let _ = sender.send(target_block);
+ log::info!(
+ "🎉 Received target parachain header #{} ({}) from the relay chain.",
+ finalized_header.number(),
+ finalized_header.hash()
+ );
+ let _ = sender.send(finalized_header);
return Ok(())
}
}