"]
description = "Cumulus-specific networking protocol"
-edition = "2018"
+edition = "2021"
[dependencies]
# Substrate deps
@@ -13,20 +13,23 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
# Polkadot deps
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
+
# other deps
codec = { package = "parity-scale-codec", version = "2.3.0", features = [ "derive" ] }
futures = { version = "0.3.1", features = ["compat"] }
futures-timer = "3.0.2"
tracing = "0.1.22"
-parking_lot = "0.10.2"
+parking_lot = "0.11.1"
derive_more = "0.99.2"
+async-trait = "0.1.52"
[dev-dependencies]
tokio = { version = "1.10", features = ["macros"] }
@@ -34,9 +37,12 @@ tokio = { version = "1.10", features = ["macros"] }
# Cumulus deps
cumulus-test-service = { path = "../../test/service" }
cumulus-primitives-core = { path = "../../primitives/core" }
+cumulus-relay-chain-local = { path = "../relay-chain-local" }
# Polkadot deps
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
# substrate deps
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index e183fcd461..79e4f7c1b7 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -20,12 +20,8 @@
//! that use the relay chain provided consensus. See [`BlockAnnounceValidator`]
//! and [`WaitToAnnounce`] for more information about this implementation.
-use sc_client_api::{Backend, BlockchainEvents};
-use sp_api::ProvideRuntimeApi;
-use sp_blockchain::HeaderBackend;
-use sp_consensus::{
- block_validation::{BlockAnnounceValidator as BlockAnnounceValidatorT, Validation},
- SyncOracle,
+use sp_consensus::block_validation::{
+ BlockAnnounceValidator as BlockAnnounceValidatorT, Validation,
};
use sp_core::traits::SpawnNamed;
use sp_runtime::{
@@ -33,12 +29,12 @@ use sp_runtime::{
traits::{Block as BlockT, Header as HeaderT},
};
-use polkadot_client::ClientHandle;
+use cumulus_relay_chain_interface::RelayChainInterface;
use polkadot_node_primitives::{CollationSecondedSignal, Statement};
use polkadot_parachain::primitives::HeadData;
use polkadot_primitives::v1::{
Block as PBlock, CandidateReceipt, CompactStatement, Hash as PHash, Id as ParaId,
- OccupiedCoreAssumption, ParachainHost, SigningContext, UncheckedSigned,
+ OccupiedCoreAssumption, SigningContext, UncheckedSigned,
};
use codec::{Decode, DecodeAll, Encode};
@@ -50,11 +46,8 @@ use futures::{
use std::{convert::TryFrom, fmt, marker::PhantomData, pin::Pin, sync::Arc};
-use wait_on_relay_chain_block::WaitOnRelayChainBlock;
-
#[cfg(test)]
mod tests;
-mod wait_on_relay_chain_block;
const LOG_TARGET: &str = "sync::cumulus";
@@ -135,19 +128,18 @@ impl BlockAnnounceData {
/// Check the signature of the statement.
///
/// Returns an `Err(_)` if it failed.
- fn check_signature(
+ fn check_signature(
self,
- relay_chain_client: &Arc,
+ relay_chain_client: &RCInterface,
) -> Result
where
- P: ProvideRuntimeApi + Send + Sync + 'static,
- P::Api: ParachainHost,
+ RCInterface: RelayChainInterface + 'static,
{
- let runtime_api = relay_chain_client.runtime_api();
let validator_index = self.statement.unchecked_validator_index();
let runtime_api_block_id = BlockId::Hash(self.relay_parent);
- let session_index = match runtime_api.session_index_for_child(&runtime_api_block_id) {
+ let session_index = match relay_chain_client.session_index_for_child(&runtime_api_block_id)
+ {
Ok(r) => r,
Err(e) => return Err(BlockAnnounceError(format!("{:?}", e))),
};
@@ -155,7 +147,7 @@ impl BlockAnnounceData {
let signing_context = SigningContext { parent_hash: self.relay_parent, session_index };
// Check that the signer is a legit validator.
- let authorities = match runtime_api.validators(&runtime_api_block_id) {
+ let authorities = match relay_chain_client.validators(&runtime_api_block_id) {
Ok(r) => r,
Err(e) => return Err(BlockAnnounceError(format!("{:?}", e))),
};
@@ -230,52 +222,37 @@ impl TryFrom<&'_ CollationSecondedSignal> for BlockAnnounceData {
/// chain. If it is at the tip, it is required to provide a justification or otherwise we reject
/// it. However, if the announcement is for a block below the tip the announcement is accepted
/// as it probably comes from a node that is currently syncing the chain.
-pub struct BlockAnnounceValidator {
+pub struct BlockAnnounceValidator {
phantom: PhantomData,
- relay_chain_client: Arc,
- relay_chain_backend: Arc,
+ relay_chain_interface: RCInterface,
para_id: ParaId,
- relay_chain_sync_oracle: Box,
- wait_on_relay_chain_block: WaitOnRelayChainBlock,
}
-impl BlockAnnounceValidator {
+impl BlockAnnounceValidator
+where
+ RCInterface: Clone,
+{
/// Create a new [`BlockAnnounceValidator`].
- pub fn new(
- relay_chain_client: Arc,
- para_id: ParaId,
- relay_chain_sync_oracle: Box,
- relay_chain_backend: Arc,
- relay_chain_blockchain_events: Arc,
- ) -> Self {
+ pub fn new(relay_chain_interface: RCInterface, para_id: ParaId) -> Self {
Self {
phantom: Default::default(),
- relay_chain_client,
+ relay_chain_interface: relay_chain_interface.clone(),
para_id,
- relay_chain_sync_oracle,
- relay_chain_backend: relay_chain_backend.clone(),
- wait_on_relay_chain_block: WaitOnRelayChainBlock::new(
- relay_chain_backend,
- relay_chain_blockchain_events,
- ),
}
}
}
-impl BlockAnnounceValidator
+impl BlockAnnounceValidator
where
- R: ProvideRuntimeApi + Send + Sync + 'static,
- R::Api: ParachainHost,
- B: Backend + 'static,
+ RCInterface: RelayChainInterface + Clone,
{
/// Get the included block of the given parachain in the relay chain.
fn included_block(
- relay_chain_client: &R,
+ relay_chain_interface: &RCInterface,
block_id: &BlockId,
para_id: ParaId,
) -> Result {
- let validation_data = relay_chain_client
- .runtime_api()
+ let validation_data = relay_chain_interface
.persisted_validation_data(block_id, para_id, OccupiedCoreAssumption::TimedOut)
.map_err(|e| Box::new(BlockAnnounceError(format!("{:?}", e))) as Box<_>)?
.ok_or_else(|| {
@@ -293,12 +270,11 @@ where
/// Get the backed block hash of the given parachain in the relay chain.
fn backed_block_hash(
- relay_chain_client: &R,
+ relay_chain_interface: &RCInterface,
block_id: &BlockId