> + Member + Codec,
+ GOH: RetrieveAuthoritiesFromOrchestrator<
+ Block,
+ (PHash, PersistedValidationData),
+ OrchestratorAuraWorkerAuxData,
+ >
+ + 'static
+ + Sync
+ + Send,
+{
+ // This is an arbitrary value which is likely guaranteed to exceed any reasonable
+ // limit, as it would correspond to 10 non-included blocks.
+ //
+ // Since we only search for parent blocks which have already been imported,
+ // we can guarantee that all imported blocks respect the unincluded segment
+ // rules specified by the parachain's runtime and thus will never be too deep.
+ const PARENT_SEARCH_DEPTH: usize = 10;
+
+ log::info!("LOOKAHEAD COLLATOR RUNNING...");
+
+ async move {
+ cumulus_client_collator::initialize_collator_subsystems(
+ &mut params.overseer_handle,
+ params.collator_key,
+ params.para_id,
+ )
+ .await;
+
+ let mut import_notifications = match params.relay_client.import_notification_stream().await
+ {
+ Ok(s) => s,
+ Err(err) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?err,
+ "Failed to initialize consensus: no relay chain import notification stream"
+ );
+
+ return;
+ }
+ };
+
+ let mut collator = {
+ let params = collator_util::Params {
+ create_inherent_data_providers: params.create_inherent_data_providers.clone(),
+ block_import: params.block_import,
+ relay_client: params.relay_client.clone(),
+ keystore: params.keystore.clone(),
+ para_id: params.para_id,
+ proposer: params.proposer,
+ collator_service: params.collator_service,
+ };
+
+ collator_util::Collator::::new(params)
+ };
+
+ // If we move forward without marking the value as unchanged,
+ // the channel will assume that the value has already changed
+ // in a different step than the one we want (inside containerChainSpawner)
+ // and will not kill the lookahead collator properly if it was already running.
+ if let Some(end_lookahead_receiver) = &mut params.end_lookahead_receiver {
+ end_lookahead_receiver.mark_unchanged();
+ }
+
+ while let Some(relay_parent_header) = import_notifications.next().await {
+ if let Some(end_lookahead_receiver) = &mut params.end_lookahead_receiver {
+ // If the value of the channel has changed, it means that
+ // containerChainSpawner has informed that we need to tear down
+ // this consensus task, meaning that we don't need to spawn the
+ // lookahead collator twice.
+ if let Ok(true) = end_lookahead_receiver.has_changed() {
+ log::info!("Lookahead collator was already running! Exiting...");
+ return;
+ }
+ }
+
+ let relay_parent = relay_parent_header.hash();
+
+ if !is_para_scheduled(relay_parent, params.para_id, &mut params.overseer_handle).await {
+ tracing::trace!(
+ target: crate::LOG_TARGET,
+ ?relay_parent,
+ ?params.para_id,
+ "Para is not scheduled on any core, skipping import notification",
+ );
+
+ continue;
+ }
+
+ let max_pov_size = match params
+ .relay_client
+ .persisted_validation_data(
+ relay_parent,
+ params.para_id,
+ OccupiedCoreAssumption::Included,
+ )
+ .await
+ {
+ Ok(None) => continue,
+ Ok(Some(pvd)) => pvd.max_pov_size,
+ Err(err) => {
+ tracing::error!(target: crate::LOG_TARGET, ?err, "Failed to gather information from relay-client");
+ continue;
+ }
+ };
+
+ let parent_search_params = ParentSearchParams {
+ relay_parent,
+ para_id: params.para_id,
+ ancestry_lookback: max_ancestry_lookback(relay_parent, ¶ms.relay_client).await,
+ max_depth: PARENT_SEARCH_DEPTH,
+ ignore_alternative_branches: true,
+ };
+
+ let potential_parents =
+ cumulus_client_consensus_common::find_potential_parents::(
+ parent_search_params,
+ &*params.para_backend,
+ ¶ms.relay_client,
+ )
+ .await;
+
+ let mut potential_parents = match potential_parents {
+ Err(e) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?relay_parent,
+ err = ?e,
+ "Could not fetch potential parents to build upon"
+ );
+
+ continue;
+ }
+ Ok(x) => x,
+ };
+
+ let included_block = match potential_parents.iter().find(|x| x.depth == 0) {
+ None => continue, // also serves as an `is_empty` check.
+ Some(b) => b.hash,
+ };
+
+ let para_client = &*params.para_client;
+ let keystore = ¶ms.keystore;
+ let can_build_upon = |slot_now, block_hash, aux_data| {
+ can_build_upon::<_, _, P>(
+ slot_now,
+ aux_data,
+ block_hash,
+ included_block,
+ params.force_authoring,
+ para_client,
+ &keystore,
+ )
+ };
+
+ // Sort by depth, ascending, to choose the longest chain.
+ //
+ // If the longest chain has space, build upon that. Otherwise, don't
+ // build at all.
+ potential_parents.sort_by_key(|a| a.depth);
+ let initial_parent = match potential_parents.pop() {
+ None => continue,
+ Some(p) => p,
+ };
+
+ // Build in a loop until not allowed. Note that the authorities can change
+ // at any block, so we need to re-claim our slot every time.
+ let mut parent_hash = initial_parent.hash;
+ let mut parent_header = initial_parent.header;
+ let overseer_handle = &mut params.overseer_handle;
+
+ // This needs to change to support elastic scaling, but for continuously
+ // scheduled chains this ensures that the backlog will grow steadily.
+ for n_built in 0..2 {
+ let validation_data = PersistedValidationData {
+ parent_head: parent_header.encode().into(),
+ relay_parent_number: *relay_parent_header.number(),
+ relay_parent_storage_root: *relay_parent_header.state_root(),
+ max_pov_size,
+ };
+
+ // Retrieve authorities that are able to produce the block
+ let aux_data = match params
+ .get_orchestrator_aux_data
+ .retrieve_authorities_from_orchestrator(
+ parent_hash,
+ (relay_parent_header.hash(), validation_data.clone()),
+ )
+ .await
+ {
+ Err(e) => {
+ tracing::error!(target: crate::LOG_TARGET, ?e);
+ break;
+ }
+ Ok(h) => h,
+ };
+
+ let inherent_providers = match params
+ .create_inherent_data_providers
+ .create_inherent_data_providers(
+ parent_hash,
+ (relay_parent_header.hash(), validation_data.clone()),
+ )
+ .await
+ {
+ Err(e) => {
+ tracing::error!(target: crate::LOG_TARGET, ?e);
+ break;
+ }
+ Ok(h) => h,
+ };
+
+ let mut slot_claim = match can_build_upon(
+ inherent_providers.slot(),
+ parent_header.clone(),
+ aux_data,
+ )
+ .await
+ {
+ Ok(None) => break,
+ Err(e) => {
+ tracing::error!(target: crate::LOG_TARGET, ?e);
+ break;
+ }
+ Ok(Some(c)) => c,
+ };
+
+ tracing::debug!(
+ target: crate::LOG_TARGET,
+ ?relay_parent,
+ unincluded_segment_len = initial_parent.depth + n_built,
+ "Slot claimed. Building"
+ );
+
+ // Build and announce collations recursively until
+ // `can_build_upon` fails or building a collation fails.
+ let (parachain_inherent_data, other_inherent_data) = match collator
+ .create_inherent_data(relay_parent, &validation_data, parent_hash, None)
+ .await
+ {
+ Err(err) => {
+ tracing::error!(target: crate::LOG_TARGET, ?err);
+ break;
+ }
+ Ok(x) => x,
+ };
+
+ let validation_code_hash = match params.code_hash_provider.code_hash_at(parent_hash)
+ {
+ None => {
+ tracing::error!(target: crate::LOG_TARGET, ?parent_hash, "Could not fetch validation code hash");
+ break;
+ }
+ Some(v) => v,
+ };
+
+ match collator
+ .collate(
+ &parent_header,
+ &mut slot_claim,
+ None,
+ (parachain_inherent_data, other_inherent_data),
+ params.authoring_duration,
+ // Set the block limit to 50% of the maximum PoV size.
+ //
+ // TODO: If we got benchmarking that includes the proof size,
+ // we should be able to use the maximum pov size.
+ (validation_data.max_pov_size / 2) as usize,
+ )
+ .await
+ {
+ Ok(Some((collation, block_data, new_block_hash))) => {
+ // Here we are assuming that the import logic protects against equivocations
+ // and provides sybil-resistance, as it should.
+ collator
+ .collator_service()
+ .announce_block(new_block_hash, None);
+
+ // Send a submit-collation message to the collation generation subsystem,
+ // which then distributes this to validators.
+ //
+ // Here we are assuming that the leaf is imported, as we've gotten an
+ // import notification.
+ overseer_handle
+ .send_msg(
+ CollationGenerationMessage::SubmitCollation(
+ SubmitCollationParams {
+ relay_parent,
+ collation,
+ parent_head: parent_header.encode().into(),
+ validation_code_hash,
+ result_sender: None,
+ },
+ ),
+ "SubmitCollation",
+ )
+ .await;
+
+ parent_hash = new_block_hash;
+ parent_header = block_data.into_header();
+ }
+ Ok(None) => {
+ tracing::debug!(target: crate::LOG_TARGET, "Lookahead collator: No block proposal");
+ }
+ Err(err) => {
+ tracing::error!(target: crate::LOG_TARGET, ?err);
+ break;
+ }
+ }
+ }
+ }
+ }
+}
+
+// Checks if we own the slot at the given block and whether there
+// is space in the unincluded segment.
+async fn can_build_upon(
+ slot: Slot,
+ aux_data: OrchestratorAuraWorkerAuxData,
+ parent_header: Block::Header,
+ included_block: Block::Hash,
+ force_authoring: bool,
+ client: &Client,
+ keystore: &KeystorePtr,
+) -> Result>, Box>
+where
+ Client: ProvideRuntimeApi,
+ Client::Api: UnincludedSegmentApi,
+ P: Pair + Send + Sync + 'static,
+ P::Public: Codec + std::fmt::Debug,
+ P::Signature: Codec,
+{
+ let runtime_api = client.runtime_api();
+ let slot_claim =
+ tanssi_claim_slot::(aux_data, &parent_header, slot, force_authoring, keystore);
+
+ // Here we lean on the property that building on an empty unincluded segment must always
+ // be legal. Skipping the runtime API query here allows us to seamlessly run this
+ // collator against chains which have not yet upgraded their runtime.
+ if parent_header.hash() != included_block {
+ if !runtime_api.can_build_upon(parent_header.hash(), included_block, slot)? {
+ return Ok(None);
+ }
+ }
+
+ slot_claim
+}
+
+/// Reads allowed ancestry length parameter from the relay chain storage at the given relay parent.
+///
+/// Falls back to 0 in case of an error.
+async fn max_ancestry_lookback(
+ relay_parent: PHash,
+ relay_client: &impl RelayChainInterface,
+) -> usize {
+ match load_abridged_host_configuration(relay_parent, relay_client).await {
+ Ok(Some(config)) => config.async_backing_params.allowed_ancestry_len as usize,
+ Ok(None) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ "Active config is missing in relay chain storage",
+ );
+ 0
+ }
+ Err(err) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?err,
+ ?relay_parent,
+ "Failed to read active config from relay chain client",
+ );
+ 0
+ }
+ }
+}
+
+// Checks if there exists a scheduled core for the para at the provided relay parent.
+//
+// Falls back to `false` in case of an error.
+async fn is_para_scheduled(
+ relay_parent: PHash,
+ para_id: ParaId,
+ overseer_handle: &mut OverseerHandle,
+) -> bool {
+ let (tx, rx) = oneshot::channel();
+ let request = RuntimeApiRequest::AvailabilityCores(tx);
+ overseer_handle
+ .send_msg(
+ RuntimeApiMessage::Request(relay_parent, request),
+ "LookaheadCollator",
+ )
+ .await;
+
+ let cores = match rx.await {
+ Ok(Ok(cores)) => cores,
+ Ok(Err(error)) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?error,
+ ?relay_parent,
+ "Failed to query availability cores runtime API",
+ );
+ return false;
+ }
+ Err(oneshot::Canceled) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?relay_parent,
+ "Sender for availability cores runtime request dropped",
+ );
+ return false;
+ }
+ };
+
+ cores.iter().any(|core| core.para_id() == Some(para_id))
+}
diff --git a/container-chains/templates/frontier/node/src/service.rs b/container-chains/templates/frontier/node/src/service.rs
index 7f7de8fce..d8dea4196 100644
--- a/container-chains/templates/frontier/node/src/service.rs
+++ b/container-chains/templates/frontier/node/src/service.rs
@@ -412,7 +412,7 @@ pub async fn start_dev_node(
timestamp.into(),
SlotDuration::from_millis(slot_duration),
);
- let relay_slot = u64::from(*relay_slot).saturating_mul(2);
+ let relay_slot = u64::from(*relay_slot);
let downward_xcm_receiver = downward_xcm_receiver.clone();
let hrmp_xcm_receiver = hrmp_xcm_receiver.clone();
diff --git a/container-chains/templates/frontier/runtime/Cargo.toml b/container-chains/templates/frontier/runtime/Cargo.toml
index 38bfbbf21..4df5cc96e 100644
--- a/container-chains/templates/frontier/runtime/Cargo.toml
+++ b/container-chains/templates/frontier/runtime/Cargo.toml
@@ -29,6 +29,7 @@ pallet-cc-authorities-noting = { workspace = true }
runtime-common = { workspace = true }
# Moonkit
+async-backing-primitives = { workspace = true }
nimbus-primitives = { workspace = true }
pallet-async-backing = { workspace = true }
pallet-author-inherent = { workspace = true }
@@ -127,6 +128,7 @@ substrate-wasm-builder = { workspace = true }
[features]
default = [ "std" ]
std = [
+ "async-backing-primitives/std",
"ccp-xcm/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
diff --git a/container-chains/templates/frontier/runtime/src/lib.rs b/container-chains/templates/frontier/runtime/src/lib.rs
index 8076adad4..906aafce4 100644
--- a/container-chains/templates/frontier/runtime/src/lib.rs
+++ b/container-chains/templates/frontier/runtime/src/lib.rs
@@ -22,6 +22,7 @@
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
+use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
#[cfg(feature = "std")]
use sp_version::NativeVersion;
@@ -34,7 +35,6 @@ pub mod xcm_config;
use {
crate::precompiles::TemplatePrecompiles,
- cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases,
cumulus_primitives_core::AggregateMessageOrigin,
dp_impl_tanssi_pallets_config::impl_tanssi_pallets_config,
fp_account::EthereumSignature,
@@ -333,7 +333,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
/// up by `pallet_aura` to implement `fn slot_duration()`.
///
/// Change this to adjust the block time.
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 6000;
// NOTE: Currently it is not possible to change the slot duration after the chain has started.
// Attempting to do so will brick block production.
@@ -511,7 +511,7 @@ parameter_types! {
}
pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 2;
+pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 3;
pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
type ConsensusHook = pallet_async_backing::consensus_hook::FixedVelocityConsensusHook<
@@ -530,7 +530,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
type ReservedDmpWeight = ReservedDmpWeight;
type XcmpMessageHandler = XcmpQueue;
type ReservedXcmpWeight = ReservedXcmpWeight;
- type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+ type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
type ConsensusHook = ConsensusHook;
}
@@ -547,7 +547,7 @@ parameter_types! {
}
impl pallet_async_backing::Config for Runtime {
- type AllowMultipleBlocksPerSlot = ConstBool;
+ type AllowMultipleBlocksPerSlot = ConstBool;
type GetAndVerifySlot =
pallet_async_backing::ParaSlot;
type ExpectedBlockTime = ExpectedBlockTime;
@@ -1076,6 +1076,15 @@ impl_runtime_apis! {
}
}
+ impl async_backing_primitives::UnincludedSegmentApi for Runtime {
+ fn can_build_upon(
+ included_hash: ::Hash,
+ slot: async_backing_primitives::Slot,
+ ) -> bool {
+ ConsensusHook::can_build_upon(included_hash, slot)
+ }
+ }
+
impl sp_genesis_builder::GenesisBuilder for Runtime {
fn create_default_config() -> Vec {
create_default_config::()
diff --git a/container-chains/templates/simple/node/src/service.rs b/container-chains/templates/simple/node/src/service.rs
index b3b6edfdd..b39a44fe8 100644
--- a/container-chains/templates/simple/node/src/service.rs
+++ b/container-chains/templates/simple/node/src/service.rs
@@ -272,7 +272,7 @@ pub async fn start_dev_node(
timestamp.into(),
SlotDuration::from_millis(slot_duration),
);
- let relay_slot = u64::from(*relay_slot).saturating_mul(2);
+ let relay_slot = u64::from(*relay_slot);
let downward_xcm_receiver = downward_xcm_receiver.clone();
let hrmp_xcm_receiver = hrmp_xcm_receiver.clone();
diff --git a/container-chains/templates/simple/runtime/Cargo.toml b/container-chains/templates/simple/runtime/Cargo.toml
index 0a5579905..ba2d1f7e9 100644
--- a/container-chains/templates/simple/runtime/Cargo.toml
+++ b/container-chains/templates/simple/runtime/Cargo.toml
@@ -27,6 +27,7 @@ pallet-cc-authorities-noting = { workspace = true }
runtime-common = { workspace = true }
# Moonkit
+async-backing-primitives = { workspace = true }
nimbus-primitives = { workspace = true }
pallet-async-backing = { workspace = true }
pallet-author-inherent = { workspace = true }
@@ -105,6 +106,7 @@ substrate-wasm-builder = { workspace = true }
[features]
default = [ "std" ]
std = [
+ "async-backing-primitives/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-session-benchmarking/std",
diff --git a/container-chains/templates/simple/runtime/src/lib.rs b/container-chains/templates/simple/runtime/src/lib.rs
index fd6f0897a..d6dc6cf84 100644
--- a/container-chains/templates/simple/runtime/src/lib.rs
+++ b/container-chains/templates/simple/runtime/src/lib.rs
@@ -22,6 +22,7 @@
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
+use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
#[cfg(feature = "std")]
use sp_version::NativeVersion;
@@ -32,7 +33,6 @@ pub mod migrations;
pub use sp_runtime::{MultiAddress, Perbill, Permill};
use {
- cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases,
cumulus_primitives_core::AggregateMessageOrigin,
dp_impl_tanssi_pallets_config::impl_tanssi_pallets_config,
frame_support::{
@@ -225,7 +225,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
/// up by `pallet_aura` to implement `fn slot_duration()`.
///
/// Change this to adjust the block time.
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 6000;
// NOTE: Currently it is not possible to change the slot duration after the chain has started.
// Attempting to do so will brick block production.
@@ -401,7 +401,7 @@ parameter_types! {
}
pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 2;
+pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 3;
pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
type ConsensusHook = pallet_async_backing::consensus_hook::FixedVelocityConsensusHook<
@@ -420,7 +420,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
type ReservedDmpWeight = ReservedDmpWeight;
type XcmpMessageHandler = XcmpQueue;
type ReservedXcmpWeight = ReservedXcmpWeight;
- type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+ type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
type ConsensusHook = ConsensusHook;
}
@@ -437,7 +437,7 @@ parameter_types! {
}
impl pallet_async_backing::Config for Runtime {
- type AllowMultipleBlocksPerSlot = ConstBool;
+ type AllowMultipleBlocksPerSlot = ConstBool;
type GetAndVerifySlot =
pallet_async_backing::ParaSlot;
type ExpectedBlockTime = ExpectedBlockTime;
@@ -798,6 +798,15 @@ impl_runtime_apis! {
}
}
+ impl async_backing_primitives::UnincludedSegmentApi for Runtime {
+ fn can_build_upon(
+ included_hash: ::Hash,
+ slot: async_backing_primitives::Slot,
+ ) -> bool {
+ ConsensusHook::can_build_upon(included_hash, slot)
+ }
+ }
+
impl sp_genesis_builder::GenesisBuilder for Runtime {
fn create_default_config() -> Vec {
create_default_config::()
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 058090d3d..1299e92fb 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -52,6 +52,7 @@ sc-chain-spec = { workspace = true }
sc-cli = { workspace = true }
sc-client-api = { workspace = true }
sc-consensus = { workspace = true }
+sc-consensus-aura = { workspace = true }
sc-consensus-manual-seal = { workspace = true }
sc-executor = { workspace = true }
sc-network = { workspace = true }
diff --git a/node/src/container_chain_spawner.rs b/node/src/container_chain_spawner.rs
index b1c9eae63..e266a4d65 100644
--- a/node/src/container_chain_spawner.rs
+++ b/node/src/container_chain_spawner.rs
@@ -51,7 +51,7 @@ use {
time::Instant,
},
tokio::{
- sync::{mpsc, oneshot},
+ sync::{mpsc, oneshot, watch},
time::{sleep, Duration},
},
};
@@ -411,11 +411,16 @@ impl ContainerChainSpawner {
}
/// Receive and process `CcSpawnMsg`s indefinitely
- pub async fn rx_loop(self, mut rx: mpsc::UnboundedReceiver) {
+ pub async fn rx_loop(
+ self,
+ mut rx: mpsc::UnboundedReceiver,
+ end_lookahead_sender: watch::Sender<()>,
+ ) {
while let Some(msg) = rx.recv().await {
match msg {
CcSpawnMsg::UpdateAssignment { current, next } => {
- self.handle_update_assignment(current, next).await;
+ self.handle_update_assignment(current, next, &end_lookahead_sender)
+ .await;
}
}
}
@@ -427,7 +432,12 @@ impl ContainerChainSpawner {
}
/// Handle `CcSpawnMsg::UpdateAssignment`
- async fn handle_update_assignment(&self, current: Option, next: Option) {
+ async fn handle_update_assignment(
+ &self,
+ current: Option,
+ next: Option,
+ end_lookahead_sender: &watch::Sender<()>,
+ ) {
let HandleUpdateAssignmentResult {
call_collate_on,
chains_to_stop,
@@ -443,6 +453,8 @@ impl ContainerChainSpawner {
// Call collate_on, to start collation on a chain that was already running before
if let Some(f) = call_collate_on {
+ // End previous tanssi-aura job
+ let _ = end_lookahead_sender.send(());
f();
}
diff --git a/node/src/service.rs b/node/src/service.rs
index a7c3cafb3..51c39a2c5 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -73,10 +73,15 @@ use {
std::{pin::Pin, sync::Arc, time::Duration},
substrate_prometheus_endpoint::Registry,
tc_consensus::{
- collators::basic::{self as basic_tanssi_aura, Params as BasicTanssiAuraParams},
+ collators::lookahead::{
+ self as lookahead_tanssi_aura, Params as LookaheadTanssiAuraParams,
+ },
OrchestratorAuraWorkerAuxData,
},
- tokio::sync::mpsc::{unbounded_channel, UnboundedSender},
+ tokio::sync::{
+ mpsc::{unbounded_channel, UnboundedSender},
+ watch,
+ },
};
type FullBackend = TFullBackend;
@@ -398,6 +403,10 @@ async fn start_node_impl(
sync_service: node_builder.network.sync_service.clone(),
})?;
+ // This channel allows us to notify the lookahead collator when it should stop.
+ // Useful when rotating containers.
+ let (end_lookahead_sender, end_lookahead_receiver) = tokio::sync::watch::channel(());
+
if validator {
let collator_key = collator_key
.clone()
@@ -421,6 +430,7 @@ async fn start_node_impl(
let node_keystore = node_builder.keystore_container.keystore().clone();
let node_telemetry_handle = node_builder.telemetry.as_ref().map(|t| t.handle()).clone();
let node_client = node_builder.client.clone();
+ let node_backend = node_builder.backend.clone();
let relay_interface = relay_chain_interface.clone();
let node_sync_service = node_builder.network.sync_service.clone();
let overseer = overseer_handle.clone();
@@ -435,6 +445,7 @@ async fn start_node_impl(
move || {
start_consensus_orchestrator(
node_client.clone(),
+ node_backend.clone(),
block_import.clone(),
node_spawn_handle.clone(),
relay_interface.clone(),
@@ -447,6 +458,7 @@ async fn start_node_impl(
overseer.clone(),
announce_block.clone(),
proposer_factory.clone(),
+ Some(end_lookahead_receiver.clone()),
)
}
};
@@ -506,7 +518,7 @@ async fn start_node_impl(
node_builder.task_manager.spawn_essential_handle().spawn(
"container-chain-spawner-rx-loop",
None,
- container_chain_spawner.rx_loop(cc_spawn_rx),
+ container_chain_spawner.rx_loop(cc_spawn_rx, end_lookahead_sender),
);
node_builder.task_manager.spawn_essential_handle().spawn(
@@ -622,8 +634,10 @@ pub async fn start_node_impl_container(
let node_spawn_handle = node_builder.task_manager.spawn_handle().clone();
let node_client = node_builder.client.clone();
+ let node_backend = node_builder.backend.clone();
start_consensus_container(
node_client.clone(),
+ node_backend.clone(),
orchestrator_client.clone(),
block_import.clone(),
prometheus_registry.clone(),
@@ -671,6 +685,7 @@ fn build_manual_seal_import_queue(
#[sc_tracing::logging::prefix_logs_with(container_log_str(para_id))]
fn start_consensus_container(
client: Arc,
+ backend: Arc,
orchestrator_client: Arc,
block_import: ContainerChainBlockImport,
prometheus_registry: Option,
@@ -713,7 +728,17 @@ fn start_consensus_container(
let relay_chain_interace_for_orch = relay_chain_interface.clone();
let orchestrator_client_for_cidp = orchestrator_client;
- let params = BasicTanssiAuraParams {
+ let client_for_hash_provider = client.clone();
+
+ let code_hash_provider = move |block_hash| {
+ client_for_hash_provider
+ .code_at(block_hash)
+ .ok()
+ .map(polkadot_primitives::ValidationCode)
+ .map(|c| c.hash())
+ };
+
+ let params = LookaheadTanssiAuraParams {
create_inherent_data_providers: move |_block_hash, (relay_parent, _validation_data)| {
let relay_chain_interface = relay_chain_interace_for_cidp.clone();
let orchestrator_chain_interface = orchestrator_chain_interface.clone();
@@ -812,15 +837,18 @@ fn start_consensus_container(
collator_service,
// Very limited proposal time.
authoring_duration: Duration::from_millis(500),
- collation_request_receiver: None,
+ para_backend: backend,
+ code_hash_provider,
+ end_lookahead_receiver: None,
};
- let fut = basic_tanssi_aura::run::(params);
+ let fut = lookahead_tanssi_aura::run::(params);
spawner.spawn("tanssi-aura-container", None, fut);
}
fn start_consensus_orchestrator(
client: Arc,
+ backend: Arc,
block_import: ParachainBlockImport,
spawner: SpawnTaskHandle,
relay_chain_interface: Arc,
@@ -833,6 +861,7 @@ fn start_consensus_orchestrator(
overseer_handle: OverseerHandle,
announce_block: Arc>) + Send + Sync>,
proposer_factory: ParachainProposerFactory,
+ end_lookahead_receiver: Option>,
) {
let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)
.expect("start_consensus_orchestrator: slot duration should exist");
@@ -849,8 +878,17 @@ fn start_consensus_orchestrator(
let relay_chain_interace_for_cidp = relay_chain_interface.clone();
let client_set_aside_for_cidp = client.clone();
let client_set_aside_for_orch = client.clone();
+ let client_for_hash_provider = client.clone();
+
+ let code_hash_provider = move |block_hash| {
+ client_for_hash_provider
+ .code_at(block_hash)
+ .ok()
+ .map(polkadot_primitives::ValidationCode)
+ .map(|c| c.hash())
+ };
- let params = BasicTanssiAuraParams {
+ let params = LookaheadTanssiAuraParams {
create_inherent_data_providers: move |block_hash, (relay_parent, _validation_data)| {
let relay_chain_interface = relay_chain_interace_for_cidp.clone();
let client_set_aside_for_cidp = client_set_aside_for_cidp.clone();
@@ -867,6 +905,13 @@ fn start_consensus_orchestrator(
)
.await;
+ // Fetch duration every block to avoid downtime when passing from 12 to 6s
+ let slot_duration = sc_consensus_aura::standalone::slot_duration_at(
+ &*client_set_aside_for_cidp.clone(),
+ block_hash,
+ )
+ .expect("Slot duration should be set");
+
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
let slot =
@@ -930,10 +975,12 @@ fn start_consensus_orchestrator(
collator_service,
// Very limited proposal time.
authoring_duration: Duration::from_millis(500),
- collation_request_receiver: None,
+ code_hash_provider,
+ para_backend: backend,
+ end_lookahead_receiver,
};
- let fut = basic_tanssi_aura::run::(params);
+ let fut = lookahead_tanssi_aura::run::(params);
spawner.spawn("tanssi-aura", None, fut);
}
@@ -1040,7 +1087,10 @@ pub fn start_dev_node(
let para_head_key = RelayWellKnownKeys::para_head(para_id);
let relay_slot_key = RelayWellKnownKeys::CURRENT_SLOT.to_vec();
- let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client.clone()).expect("Slot duration should be set");
+ let slot_duration = sc_consensus_aura::standalone::slot_duration_at(
+ &*client.clone(),
+ block,
+ ).expect("Slot duration should be set");
let mut timestamp = 0u64;
TIMESTAMP.with(|x| {
@@ -1052,7 +1102,7 @@ pub fn start_dev_node(
timestamp.into(),
slot_duration,
);
- let relay_slot = u64::from(*relay_slot).saturating_mul(2);
+ let relay_slot = u64::from(*relay_slot);
let downward_xcm_receiver = downward_xcm_receiver.clone();
let hrmp_xcm_receiver = hrmp_xcm_receiver.clone();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 681d305df..759bce0e1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,15 @@ settings:
importers:
+ .:
+ dependencies:
+ api-augment:0.400.0:
+ specifier: link:@tanssi/api-augment:0.400.0
+ version: link:@tanssi/api-augment:0.400.0
+ api-augment:latest:
+ specifier: link:@tanssi/api-augment:latest
+ version: link:@tanssi/api-augment:latest
+
test:
dependencies:
'@zombienet/orchestrator':
@@ -19,14 +28,23 @@ importers:
version: 0.1.6
devDependencies:
'@acala-network/chopsticks':
- specifier: 0.9.9-1
- version: 0.9.9-1(debug@4.3.4)
+ specifier: npm:@tanssi/chopsticks@^0.9.10-b
+ version: /@tanssi/chopsticks@0.9.10-b(debug@4.3.4)
+ '@acala-network/chopsticks-core':
+ specifier: npm:@tanssi/chopsticks-core@^0.9.10-b
+ version: /@tanssi/chopsticks-core@0.9.10-b
+ '@acala-network/chopsticks-db':
+ specifier: npm:@tanssi/chopsticks-db@^0.9.10-b
+ version: /@tanssi/chopsticks-db@0.9.10-b
+ '@acala-network/chopsticks-executor':
+ specifier: npm:@tanssi/chopsticks-executor@^0.9.10-b
+ version: /@tanssi/chopsticks-executor@0.9.10
'@moonbeam-network/api-augment':
specifier: 0.2600.0
version: 0.2600.0
'@moonwall/cli':
specifier: 5.0.3
- version: 5.0.3(@acala-network/chopsticks@0.9.9-1)(@polkadot/api@10.11.2)(@types/node@20.10.5)(@vitest/ui@1.1.0)(typescript@5.3.3)(vitest@1.1.0)
+ version: 5.0.3(@polkadot/api@10.11.2)(@tanssi/chopsticks@0.9.10-b)(@types/node@20.10.5)(@vitest/ui@1.1.0)(typescript@5.3.3)(vitest@1.1.0)
'@moonwall/util':
specifier: 5.0.3
version: 5.0.3(@polkadot/api@10.11.2)(typescript@5.3.3)(vitest@1.1.0)
@@ -189,112 +207,6 @@ packages:
engines: {node: '>=0.10.0'}
dev: true
- /@acala-network/chopsticks-core@0.9.9-1:
- resolution: {integrity: sha512-MYcAt9VdDNYgS4XHv2yB8XKSUfBxFbxjEQqg2eITqv3x2eu9p1xTDTeOVDLozjutJXdzfWqEYOGy+3AQehQzEA==}
- dependencies:
- '@acala-network/chopsticks-executor': 0.9.9-1
- '@polkadot/rpc-provider': 10.11.2
- '@polkadot/types': 10.11.2
- '@polkadot/types-codec': 10.11.2
- '@polkadot/types-known': 10.11.2
- '@polkadot/util': 12.6.2
- '@polkadot/util-crypto': 12.6.2(@polkadot/util@12.6.2)
- comlink: 4.4.1
- eventemitter3: 5.0.1
- lodash: 4.17.21
- lru-cache: 10.1.0
- pino: 8.18.0
- pino-pretty: 10.3.1
- rxjs: 7.8.1
- zod: 3.22.4
- transitivePeerDependencies:
- - bufferutil
- - supports-color
- - utf-8-validate
- dev: true
-
- /@acala-network/chopsticks-db@0.9.9-1:
- resolution: {integrity: sha512-c/a+LduCyF6GZGVY39dnbjiFaAKOoF9MJ22LJqnyAGh7jDmJpasFnUsxBTgwm5rVxBEjDk2CXpBulBf+IebXvw==}
- dependencies:
- '@acala-network/chopsticks-core': 0.9.9-1
- '@polkadot/util': 12.6.2
- idb: 8.0.0
- sqlite3: 5.1.7
- typeorm: 0.3.20(sqlite3@5.1.7)
- transitivePeerDependencies:
- - '@google-cloud/spanner'
- - '@sap/hana-client'
- - better-sqlite3
- - bluebird
- - bufferutil
- - hdb-pool
- - ioredis
- - mongodb
- - mssql
- - mysql2
- - oracledb
- - pg
- - pg-native
- - pg-query-stream
- - redis
- - sql.js
- - supports-color
- - ts-node
- - typeorm-aurora-data-api-driver
- - utf-8-validate
- dev: true
-
- /@acala-network/chopsticks-executor@0.9.9-1:
- resolution: {integrity: sha512-uuAfvvyknDUuAp3WpvaPXDcIdD0K98c/UdP0sh3AicYp6VCH17INVLLnOdiPq+/TMHDSJ599J6FZYGBcN27QBA==}
- dependencies:
- '@polkadot/util': 12.6.2
- '@polkadot/wasm-util': 7.3.2(@polkadot/util@12.6.2)
- dev: true
-
- /@acala-network/chopsticks@0.9.9-1(debug@4.3.4):
- resolution: {integrity: sha512-7Ejpv0DEj8go9zhxxkWKAKQArMHqkdryjRJdaSXZ5beDbrMlTOqvzOTLSp2EnP+tjyoG0f+L6bxEqN+6R3mmKg==}
- hasBin: true
- dependencies:
- '@acala-network/chopsticks-core': 0.9.9-1
- '@acala-network/chopsticks-db': 0.9.9-1
- '@pnpm/npm-conf': 2.2.2
- '@polkadot/api-augment': 10.11.2
- '@polkadot/types': 10.11.2
- '@polkadot/util': 12.6.2
- '@polkadot/util-crypto': 12.6.2(@polkadot/util@12.6.2)
- axios: 1.6.7(debug@4.3.4)
- dotenv: 16.4.1
- global-agent: 3.0.0
- js-yaml: 4.1.0
- jsondiffpatch: 0.5.0
- lodash: 4.17.21
- ws: 8.16.0
- yargs: 17.7.2
- zod: 3.22.4
- transitivePeerDependencies:
- - '@google-cloud/spanner'
- - '@sap/hana-client'
- - better-sqlite3
- - bluebird
- - bufferutil
- - debug
- - hdb-pool
- - ioredis
- - mongodb
- - mssql
- - mysql2
- - oracledb
- - pg
- - pg-native
- - pg-query-stream
- - redis
- - sql.js
- - supports-color
- - ts-node
- - typeorm-aurora-data-api-driver
- - utf-8-validate
- dev: true
-
/@adraffy/ens-normalize@1.10.0:
resolution: {integrity: sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==}
dev: true
@@ -818,7 +730,7 @@ packages:
engines: {node: '>=14.0.0'}
dev: true
- /@moonwall/cli@5.0.3(@acala-network/chopsticks@0.9.9-1)(@polkadot/api@10.11.2)(@types/node@20.10.5)(@vitest/ui@1.1.0)(typescript@5.3.3)(vitest@1.1.0):
+ /@moonwall/cli@5.0.3(@polkadot/api@10.11.2)(@tanssi/chopsticks@0.9.10-b)(@types/node@20.10.5)(@vitest/ui@1.1.0)(typescript@5.3.3)(vitest@1.1.0):
resolution: {integrity: sha512-n9j6Er3ysUa1RgJlktZYCi7DiJpEdGmG/nhOAB0b3w/k9S4qDs53c29Bk6brXR9uLocROmH3qVAufR7iy9jlnQ==}
engines: {node: '>=20', pnpm: '>=7'}
hasBin: true
@@ -828,7 +740,7 @@ packages:
'@vitest/ui': 1.2.2
vitest: 1.2.2
dependencies:
- '@acala-network/chopsticks': 0.9.9-1(debug@4.3.4)
+ '@acala-network/chopsticks': /@tanssi/chopsticks@0.9.10-b(debug@4.3.4)
'@moonbeam-network/api-augment': 0.2700.0
'@moonwall/types': 5.0.3(@polkadot/api@10.11.2)(typescript@5.3.3)
'@moonwall/util': 5.0.3(@polkadot/api@10.11.2)(typescript@5.3.3)(vitest@1.1.0)
@@ -1035,7 +947,7 @@ packages:
requiresBuild: true
dependencies:
'@gar/promisify': 1.1.3
- semver: 7.5.4
+ semver: 7.6.0
dev: true
optional: true
@@ -1784,6 +1696,112 @@ packages:
/@substrate/ss58-registry@1.44.0:
resolution: {integrity: sha512-7lQ/7mMCzVNSEfDS4BCqnRnKCFKpcOaPrxMeGTXHX1YQzM/m2BBHjbK2C3dJvjv7GYxMiaTq/HdWQj1xS6ss+A==}
+ /@tanssi/chopsticks-core@0.9.10-b:
+ resolution: {integrity: sha512-5sBlEpdwqz+rNkgoOQTeZGrWK5zRl9oBJagomPf1YF7x/eRdFvRLBnTdiZse46kcF6J+zFH3m3tfT9FDjOcexg==}
+ dependencies:
+ '@polkadot/rpc-provider': 10.11.2
+ '@polkadot/types': 10.11.2
+ '@polkadot/types-codec': 10.11.2
+ '@polkadot/types-known': 10.11.2
+ '@polkadot/util': 12.6.2
+ '@polkadot/util-crypto': 12.6.2(@polkadot/util@12.6.2)
+ '@tanssi/chopsticks-executor': 0.9.10
+ comlink: 4.4.1
+ eventemitter3: 5.0.1
+ lodash: 4.17.21
+ lru-cache: 10.1.0
+ pino: 8.18.0
+ pino-pretty: 10.3.1
+ rxjs: 7.8.1
+ zod: 3.22.4
+ transitivePeerDependencies:
+ - bufferutil
+ - supports-color
+ - utf-8-validate
+ dev: true
+
+ /@tanssi/chopsticks-db@0.9.10-b:
+ resolution: {integrity: sha512-z58nJJxmUnRO6gzFm3HaQfEtv5g3eXp9Dv7z0bkwfJ8tSjip21NKByMOKOuTEAXwq/HMj7uBTa9f6NZ2P9po/w==}
+ dependencies:
+ '@polkadot/util': 12.6.2
+ '@tanssi/chopsticks-core': 0.9.10-b
+ idb: 8.0.0
+ sqlite3: 5.1.7
+ typeorm: 0.3.20(sqlite3@5.1.7)
+ transitivePeerDependencies:
+ - '@google-cloud/spanner'
+ - '@sap/hana-client'
+ - better-sqlite3
+ - bluebird
+ - bufferutil
+ - hdb-pool
+ - ioredis
+ - mongodb
+ - mssql
+ - mysql2
+ - oracledb
+ - pg
+ - pg-native
+ - pg-query-stream
+ - redis
+ - sql.js
+ - supports-color
+ - ts-node
+ - typeorm-aurora-data-api-driver
+ - utf-8-validate
+ dev: true
+
+ /@tanssi/chopsticks-executor@0.9.10:
+ resolution: {integrity: sha512-bLrWgiS8ARhA337Jl1Qx+KRca7r30GurGi85ZtO11QZB9TDw+ZTLmF2VQ92Eo9aQPXQoEeo4w0+buq3Jbd9VyA==}
+ dependencies:
+ '@polkadot/util': 12.6.2
+ '@polkadot/wasm-util': 7.3.2(@polkadot/util@12.6.2)
+ dev: true
+
+ /@tanssi/chopsticks@0.9.10-b(debug@4.3.4):
+ resolution: {integrity: sha512-7uWWwCLg5uvJq34UXUgj2sWDLgEUr6OaKhJ2ZnTPqV0A8Tf1zB+t1QwS0uzpAgUIV2l60LMYzoDex2fp2sgUDA==}
+ hasBin: true
+ dependencies:
+ '@pnpm/npm-conf': 2.2.2
+ '@polkadot/api-augment': 10.11.2
+ '@polkadot/types': 10.11.2
+ '@polkadot/util': 12.6.2
+ '@polkadot/util-crypto': 12.6.2(@polkadot/util@12.6.2)
+ '@tanssi/chopsticks-core': 0.9.10-b
+ '@tanssi/chopsticks-db': 0.9.10-b
+ axios: 1.6.7(debug@4.3.4)
+ dotenv: 16.4.4
+ global-agent: 3.0.0
+ js-yaml: 4.1.0
+ jsondiffpatch: 0.5.0
+ lodash: 4.17.21
+ ws: 8.16.0
+ yargs: 17.7.2
+ zod: 3.22.4
+ transitivePeerDependencies:
+ - '@google-cloud/spanner'
+ - '@sap/hana-client'
+ - better-sqlite3
+ - bluebird
+ - bufferutil
+ - debug
+ - hdb-pool
+ - ioredis
+ - mongodb
+ - mssql
+ - mysql2
+ - oracledb
+ - pg
+ - pg-native
+ - pg-query-stream
+ - redis
+ - sql.js
+ - supports-color
+ - ts-node
+ - typeorm-aurora-data-api-driver
+ - utf-8-validate
+ dev: true
+
/@tootallnate/once@1.1.2:
resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
engines: {node: '>= 6'}
@@ -2975,11 +2993,6 @@ packages:
esutils: 2.0.3
dev: true
- /dotenv@16.4.1:
- resolution: {integrity: sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==}
- engines: {node: '>=12'}
- dev: true
-
/dotenv@16.4.4:
resolution: {integrity: sha512-XvPXc8XAQThSjAbY6cQ/9PcBXmFoWuw1sQ3b8HqUCR6ziGXjkTi//kB9SWa2UwqlgdAIuRqAa/9hVljzPehbYg==}
engines: {node: '>=12'}
@@ -3656,7 +3669,7 @@ packages:
es6-error: 4.1.1
matcher: 3.0.0
roarr: 2.15.4
- semver: 7.5.4
+ semver: 7.6.0
serialize-error: 7.0.1
dev: true
@@ -4337,7 +4350,6 @@ packages:
chalk: 3.0.0
diff-match-patch: 1.0.5
dev: true
- bundledDependencies: []
/jsonfile@6.1.0:
resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
@@ -5009,7 +5021,7 @@ packages:
resolution: {integrity: sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA==}
engines: {node: '>=10'}
dependencies:
- semver: 7.5.4
+ semver: 7.6.0
dev: true
/node-addon-api@7.1.0:
@@ -5058,7 +5070,7 @@ packages:
nopt: 5.0.0
npmlog: 6.0.2
rimraf: 3.0.2
- semver: 7.5.4
+ semver: 7.6.0
tar: 6.1.15
which: 2.0.2
transitivePeerDependencies:
@@ -6385,7 +6397,7 @@ packages:
cli-highlight: 2.1.11
dayjs: 1.11.10
debug: 4.3.4(supports-color@8.1.1)
- dotenv: 16.4.1
+ dotenv: 16.4.4
glob: 10.3.10
mkdirp: 2.1.6
reflect-metadata: 0.2.1
diff --git a/runtime/dancebox/Cargo.toml b/runtime/dancebox/Cargo.toml
index 9205d7951..3a8db58c2 100644
--- a/runtime/dancebox/Cargo.toml
+++ b/runtime/dancebox/Cargo.toml
@@ -43,6 +43,7 @@ pallet-stream-payment = { workspace = true }
runtime-common = { workspace = true }
# Moonkit
+async-backing-primitives = { workspace = true }
nimbus-primitives = { workspace = true }
pallet-async-backing = { workspace = true }
pallet-author-inherent = { workspace = true }
@@ -149,6 +150,7 @@ default = [
"std",
]
std = [
+ "async-backing-primitives/std",
"container-chain-template-frontier-runtime/std",
"container-chain-template-simple-runtime/std",
"cumulus-pallet-dmp-queue/std",
diff --git a/runtime/dancebox/src/lib.rs b/runtime/dancebox/src/lib.rs
index 46c5a551b..382e9ae3e 100644
--- a/runtime/dancebox/src/lib.rs
+++ b/runtime/dancebox/src/lib.rs
@@ -33,7 +33,7 @@ pub use sp_runtime::BuildStorage;
pub mod weights;
use {
- cumulus_pallet_parachain_system::{RelayChainStateProof, RelayNumberStrictlyIncreases},
+ cumulus_pallet_parachain_system::{RelayChainStateProof, RelayNumberMonotonicallyIncreases},
cumulus_primitives_core::{
relay_chain::{self, SessionIndex},
AggregateMessageOrigin, BodyId, ParaId,
@@ -234,7 +234,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
/// up by `pallet_aura` to implement `fn slot_duration()`.
///
/// Change this to adjust the block time.
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 6000;
// NOTE: Currently it is not possible to change the slot duration after the chain has started.
// Attempting to do so will brick block production.
@@ -482,7 +482,7 @@ parameter_types! {
}
pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 2;
+pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 3;
pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
type ConsensusHook = pallet_async_backing::consensus_hook::FixedVelocityConsensusHook<
@@ -501,7 +501,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
type ReservedDmpWeight = ReservedDmpWeight;
type XcmpMessageHandler = XcmpQueue;
type ReservedXcmpWeight = ReservedXcmpWeight;
- type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+ type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
type ConsensusHook = ConsensusHook;
}
pub struct ParaSlotProvider;
@@ -517,7 +517,7 @@ parameter_types! {
}
impl pallet_async_backing::Config for Runtime {
- type AllowMultipleBlocksPerSlot = ConstBool;
+ type AllowMultipleBlocksPerSlot = ConstBool;
type GetAndVerifySlot =
pallet_async_backing::ParaSlot;
type ExpectedBlockTime = ExpectedBlockTime;
@@ -1325,12 +1325,12 @@ parameter_types! {
pub ParachainBondAccount: AccountId32 = PalletId(*b"ParaBond").into_account_truncating();
pub PendingRewardsAccount: AccountId32 = PalletId(*b"PENDREWD").into_account_truncating();
// The equation to solve is:
- // initial_supply * (1.05) = initial_supply * (1+x)^2_629_800
- // we should solve for x = (1.05)^(1/2_629_800) -1 -> 0.000000019 per block or 19/1_000_000_000
+ // initial_supply * (1.05) = initial_supply * (1+x)^5_259_600
+ // we should solve for x = (1.05)^(1/5_259_600) -1 -> 0.000000009 per block or 9/1_000_000_000
// 1% in the case of dev mode
// TODO: check if we can put the prod inflation for tests too
// TODO: better calculus for going from annual to block inflation (if it can be done)
- pub const InflationRate: Perbill = prod_or_fast!(Perbill::from_parts(19), Perbill::from_percent(1));
+ pub const InflationRate: Perbill = prod_or_fast!(Perbill::from_parts(9), Perbill::from_percent(1));
// 30% for parachain bond, so 70% for staking
pub const RewardsPortion: Perbill = Perbill::from_percent(70);
@@ -1811,6 +1811,15 @@ impl_runtime_apis! {
}
}
+ impl async_backing_primitives::UnincludedSegmentApi for Runtime {
+ fn can_build_upon(
+ included_hash: ::Hash,
+ slot: async_backing_primitives::Slot,
+ ) -> bool {
+ ConsensusHook::can_build_upon(included_hash, slot)
+ }
+ }
+
impl sp_genesis_builder::GenesisBuilder for Runtime {
fn create_default_config() -> Vec {
create_default_config::()
diff --git a/runtime/dancebox/tests/common/mod.rs b/runtime/dancebox/tests/common/mod.rs
index 7b09891b3..f0f861d33 100644
--- a/runtime/dancebox/tests/common/mod.rs
+++ b/runtime/dancebox/tests/common/mod.rs
@@ -150,7 +150,7 @@ pub fn set_parachain_inherent_data() {
let relay_sproof = RelayStateSproofBuilder {
para_id: 100u32.into(),
included_para_head: Some(HeadData(vec![1, 2, 3])),
- current_slot: (current_slot() * 2).into(),
+ current_slot: (current_slot()).into(),
..Default::default()
};
@@ -192,7 +192,7 @@ pub fn set_parachain_inherent_data_random_seed(random_seed: [u8; 32]) {
sproof.para_id = 100u32.into();
sproof.included_para_head = Some(HeadData(vec![1, 2, 3]));
- sproof.current_slot = (slot * 2).into();
+ sproof.current_slot = (slot).into();
sproof.into_state_root_and_proof()
};
diff --git a/runtime/flashbox/src/lib.rs b/runtime/flashbox/src/lib.rs
index 8857fbc77..494b6feaf 100644
--- a/runtime/flashbox/src/lib.rs
+++ b/runtime/flashbox/src/lib.rs
@@ -220,7 +220,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
/// up by `pallet_aura` to implement `fn slot_duration()`.
///
/// Change this to adjust the block time.
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 6000;
// NOTE: Currently it is not possible to change the slot duration after the chain has started.
// Attempting to do so will brick block production.
@@ -457,7 +457,7 @@ impl pallet_transaction_payment::Config for Runtime {
}
pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 2;
+pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 3;
pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
type ConsensusHook = pallet_async_backing::consensus_hook::FixedVelocityConsensusHook<
@@ -1085,12 +1085,12 @@ parameter_types! {
pub ParachainBondAccount: AccountId32 = PalletId(*b"ParaBond").into_account_truncating();
pub PendingRewardsAccount: AccountId32 = PalletId(*b"PENDREWD").into_account_truncating();
// The equation to solve is:
- // initial_supply * (1.05) = initial_supply * (1+x)^2_629_800
- // we should solve for x = (1.05)^(1/2_629_800) -1 -> 0.000000019 per block or 19/1_000_000_000
+ // initial_supply * (1.05) = initial_supply * (1+x)^5_259_600
+ // we should solve for x = (1.05)^(1/5_259_600) -1 -> 0.000000009 per block or 9/1_000_000_000
// 1% in the case of dev mode
// TODO: check if we can put the prod inflation for tests too
// TODO: better calculus for going from annual to block inflation (if it can be done)
- pub const InflationRate: Perbill = prod_or_fast!(Perbill::from_parts(19), Perbill::from_percent(1));
+ pub const InflationRate: Perbill = prod_or_fast!(Perbill::from_parts(9), Perbill::from_percent(1));
// 30% for parachain bond, so 70% for staking
pub const RewardsPortion: Perbill = Perbill::from_percent(70);
diff --git a/test/configs/zombieDanceboxUpgrade.json b/test/configs/zombieDanceboxUpgrade.json
index 617fc5d03..0ac13d6db 100644
--- a/test/configs/zombieDanceboxUpgrade.json
+++ b/test/configs/zombieDanceboxUpgrade.json
@@ -7,6 +7,21 @@
"chain": "rococo-local",
"default_command": "tmp/polkadot",
"default_args": ["--no-hardware-benchmarks", "-lparachain=debug", "--database=paritydb", "--no-beefy"],
+ "genesis": {
+ "runtimeGenesis": {
+ "patch": {
+ "configuration": {
+ "config": {
+ "async_backing_params": {
+ "allowed_ancestry_len": 2,
+ "max_candidate_depth": 3
+ },
+ "scheduling_lookahead": 2
+ }
+ }
+ }
+ }
+ },
"nodes": [
{
"name": "alice",
diff --git a/test/configs/zombieTanssi.json b/test/configs/zombieTanssi.json
index 1f680af76..aabcf89df 100644
--- a/test/configs/zombieTanssi.json
+++ b/test/configs/zombieTanssi.json
@@ -7,6 +7,21 @@
"chain": "rococo-local",
"default_command": "tmp/polkadot",
"default_args": ["--no-hardware-benchmarks", "-lparachain=debug", "--database=paritydb", "--no-beefy"],
+ "genesis": {
+ "runtimeGenesis": {
+ "patch": {
+ "configuration": {
+ "config": {
+ "async_backing_params": {
+ "allowed_ancestry_len": 2,
+ "max_candidate_depth": 3
+ },
+ "scheduling_lookahead": 2
+ }
+ }
+ }
+ }
+ },
"nodes": [
{
"name": "alice",
diff --git a/test/configs/zombieTanssiKeepDb.json b/test/configs/zombieTanssiKeepDb.json
index 734ce8412..0e7e5e980 100644
--- a/test/configs/zombieTanssiKeepDb.json
+++ b/test/configs/zombieTanssiKeepDb.json
@@ -7,6 +7,21 @@
"chain": "rococo-local",
"default_command": "tmp/polkadot",
"default_args": ["--no-hardware-benchmarks", "-lparachain=debug", "--database=paritydb", "--no-beefy"],
+ "genesis": {
+ "runtimeGenesis": {
+ "patch": {
+ "configuration": {
+ "config": {
+ "async_backing_params": {
+ "allowed_ancestry_len": 2,
+ "max_candidate_depth": 3
+ },
+ "scheduling_lookahead": 2
+ }
+ }
+ }
+ }
+ },
"nodes": [
{
"name": "alice",
diff --git a/test/configs/zombieTanssiMetrics.json b/test/configs/zombieTanssiMetrics.json
index 4f3406abf..c332f6e39 100644
--- a/test/configs/zombieTanssiMetrics.json
+++ b/test/configs/zombieTanssiMetrics.json
@@ -7,6 +7,21 @@
"chain": "rococo-local",
"default_command": "tmp/polkadot",
"default_args": ["--no-hardware-benchmarks", "-lparachain=debug", "--database=paritydb", "--no-beefy"],
+ "genesis": {
+ "runtimeGenesis": {
+ "patch": {
+ "configuration": {
+ "config": {
+ "async_backing_params": {
+ "allowed_ancestry_len": 2,
+ "max_candidate_depth": 3
+ },
+ "scheduling_lookahead": 2
+ }
+ }
+ }
+ }
+ },
"nodes": [
{
"name": "alice",
diff --git a/test/configs/zombieTanssiParathreads.json b/test/configs/zombieTanssiParathreads.json
index 8fad8a630..b7b159b2f 100644
--- a/test/configs/zombieTanssiParathreads.json
+++ b/test/configs/zombieTanssiParathreads.json
@@ -7,6 +7,21 @@
"chain": "rococo-local",
"default_command": "tmp/polkadot",
"default_args": ["--no-hardware-benchmarks", "-lparachain=debug", "--database=paritydb", "--no-beefy"],
+ "genesis": {
+ "runtimeGenesis": {
+ "patch": {
+ "configuration": {
+ "config": {
+ "async_backing_params": {
+ "allowed_ancestry_len": 2,
+ "max_candidate_depth": 3
+ },
+ "scheduling_lookahead": 2
+ }
+ }
+ }
+ }
+ },
"nodes": [
{
"name": "alice",
diff --git a/test/configs/zombieTanssiRotation.json b/test/configs/zombieTanssiRotation.json
index f5f4af5b5..3b92182da 100644
--- a/test/configs/zombieTanssiRotation.json
+++ b/test/configs/zombieTanssiRotation.json
@@ -7,6 +7,21 @@
"chain": "rococo-local",
"default_command": "tmp/polkadot",
"default_args": ["--no-hardware-benchmarks", "-lparachain=debug", "--database=paritydb", "--no-beefy"],
+ "genesis": {
+ "runtimeGenesis": {
+ "patch": {
+ "configuration": {
+ "config": {
+ "async_backing_params": {
+ "allowed_ancestry_len": 2,
+ "max_candidate_depth": 3
+ },
+ "scheduling_lookahead": 2
+ }
+ }
+ }
+ }
+ },
"nodes": [
{
"name": "alice",
diff --git a/test/configs/zombieTanssiWarpSync.json b/test/configs/zombieTanssiWarpSync.json
index 1857ac66a..1b6d94cfd 100644
--- a/test/configs/zombieTanssiWarpSync.json
+++ b/test/configs/zombieTanssiWarpSync.json
@@ -7,6 +7,21 @@
"chain": "rococo-local",
"default_command": "tmp/polkadot",
"default_args": ["--no-hardware-benchmarks", "-lparachain=debug", "--database=paritydb", "--no-beefy"],
+ "genesis": {
+ "runtimeGenesis": {
+ "patch": {
+ "configuration": {
+ "config": {
+ "async_backing_params": {
+ "allowed_ancestry_len": 2,
+ "max_candidate_depth": 3
+ },
+ "scheduling_lookahead": 2
+ }
+ }
+ }
+ }
+ },
"nodes": [
{
"name": "alice",
diff --git a/test/package.json b/test/package.json
index 301565156..5f8bbce54 100644
--- a/test/package.json
+++ b/test/package.json
@@ -23,7 +23,10 @@
"author": "",
"license": "ISC",
"devDependencies": {
- "@acala-network/chopsticks": "0.9.9-1",
+ "@acala-network/chopsticks": "npm:@tanssi/chopsticks@^0.9.10-b",
+ "@acala-network/chopsticks-core": "npm:@tanssi/chopsticks-core@^0.9.10-b",
+ "@acala-network/chopsticks-db": "npm:@tanssi/chopsticks-db@^0.9.10-b",
+ "@acala-network/chopsticks-executor": "npm:@tanssi/chopsticks-executor@^0.9.10-b",
"@moonbeam-network/api-augment": "0.2600.0",
"@moonwall/cli": "5.0.3",
"@moonwall/util": "5.0.3",
diff --git a/test/suites/common-tanssi/services-payment/test_service_payment_removes_tank_money_and_burns.ts b/test/suites/common-tanssi/services-payment/test_service_payment_removes_tank_money_and_burns.ts
index e04d69006..3a609bbad 100644
--- a/test/suites/common-tanssi/services-payment/test_service_payment_removes_tank_money_and_burns.ts
+++ b/test/suites/common-tanssi/services-payment/test_service_payment_removes_tank_money_and_burns.ts
@@ -12,7 +12,7 @@ describeSuite({
testCases: ({ it, context }) => {
let polkadotJs: ApiPromise;
let alice: KeyringPair;
- const blocksPerSession = 5n;
+ const blocksPerSession = 10n;
const paraId2001 = 2001n;
const costPerBlock = 1_000_000n;
let balanceTankBefore;
diff --git a/test/suites/common-tanssi/services-payment/test_service_payment_removes_tank_money_and_refunds.ts b/test/suites/common-tanssi/services-payment/test_service_payment_removes_tank_money_and_refunds.ts
index dc6748686..e22b27ae2 100644
--- a/test/suites/common-tanssi/services-payment/test_service_payment_removes_tank_money_and_refunds.ts
+++ b/test/suites/common-tanssi/services-payment/test_service_payment_removes_tank_money_and_refunds.ts
@@ -12,7 +12,7 @@ describeSuite({
testCases: ({ it, context }) => {
let polkadotJs: ApiPromise;
let alice: KeyringPair;
- const blocksPerSession = 5n;
+ const blocksPerSession = 10n;
const paraId2001 = 2001n;
const costPerBlock = 1_000_000n;
let refundAddress;
diff --git a/test/suites/common-tanssi/services-payment/test_services_payment_block_credit_buying_free_combined.ts b/test/suites/common-tanssi/services-payment/test_services_payment_block_credit_buying_free_combined.ts
index 00695ed49..e927de756 100644
--- a/test/suites/common-tanssi/services-payment/test_services_payment_block_credit_buying_free_combined.ts
+++ b/test/suites/common-tanssi/services-payment/test_services_payment_block_credit_buying_free_combined.ts
@@ -11,7 +11,7 @@ describeSuite({
testCases: ({ it, context }) => {
let polkadotJs: ApiPromise;
let alice: KeyringPair;
- const blocksPerSession = 5n;
+ const blocksPerSession = 10n;
const paraId2000 = 2000n;
const paraId2001 = 2001n;
const costPerBlock = 1_000_000n;
diff --git a/test/suites/common-tanssi/services-payment/test_services_payment_block_credits.ts b/test/suites/common-tanssi/services-payment/test_services_payment_block_credits.ts
index 39aac86aa..a7172e40b 100644
--- a/test/suites/common-tanssi/services-payment/test_services_payment_block_credits.ts
+++ b/test/suites/common-tanssi/services-payment/test_services_payment_block_credits.ts
@@ -12,7 +12,7 @@ describeSuite({
testCases: ({ it, context }) => {
let polkadotJs: ApiPromise;
let alice: KeyringPair;
- const blocksPerSession = 5n;
+ const blocksPerSession = 10n;
beforeAll(async () => {
polkadotJs = context.polkadotJs();
diff --git a/test/suites/common-tanssi/services-payment/test_services_payment_no_free_credits.ts b/test/suites/common-tanssi/services-payment/test_services_payment_no_free_credits.ts
index 711d61316..700b3c945 100644
--- a/test/suites/common-tanssi/services-payment/test_services_payment_no_free_credits.ts
+++ b/test/suites/common-tanssi/services-payment/test_services_payment_no_free_credits.ts
@@ -15,7 +15,7 @@ describeSuite({
const paraId2001 = 2001n;
const costPerSession = 100_000_000n;
const costPerBlock = 1_000_000n;
- const blocksPerSession = 5n;
+ const blocksPerSession = 10n;
beforeAll(async () => {
polkadotJs = context.polkadotJs();
alice = context.keyring.alice;
diff --git a/test/suites/dev-tanssi/staking/test_staking_join.ts b/test/suites/dev-tanssi/staking/test_staking_join.ts
index fd343ba22..3d919a357 100644
--- a/test/suites/dev-tanssi/staking/test_staking_join.ts
+++ b/test/suites/dev-tanssi/staking/test_staking_join.ts
@@ -14,7 +14,7 @@ describeSuite({
let alice: KeyringPair;
let bob: KeyringPair;
// TODO: don't hardcode the period here
- const sessionPeriod = 5;
+ const sessionPeriod = 10;
beforeAll(async () => {
alice = context.keyring.alice;
diff --git a/test/suites/dev-tanssi/staking/test_staking_rewards_balanced.ts b/test/suites/dev-tanssi/staking/test_staking_rewards_balanced.ts
index 07d80f50b..b7bb4c127 100644
--- a/test/suites/dev-tanssi/staking/test_staking_rewards_balanced.ts
+++ b/test/suites/dev-tanssi/staking/test_staking_rewards_balanced.ts
@@ -63,7 +63,7 @@ describeSuite({
const events = await polkadotJs.query.system.events();
const issuance = await fetchIssuance(events).amount.toBigInt();
const chainRewards = (issuance * 7n) / 10n;
- const expectedOrchestratorReward = chainRewards / 3n;
+ const expectedOrchestratorReward = chainRewards - (chainRewards * 2n) / 3n;
const reward = await fetchRewardAuthorOrchestrator(events);
const stakingRewardedCollator = await filterRewardStakingCollator(events, reward.accountId.toString());
const stakingRewardedDelegators = await filterRewardStakingDelegators(
diff --git a/test/suites/dev-tanssi/staking/test_staking_rewards_non_balanced.ts b/test/suites/dev-tanssi/staking/test_staking_rewards_non_balanced.ts
index 7b57ee5c5..12efeaf3e 100644
--- a/test/suites/dev-tanssi/staking/test_staking_rewards_non_balanced.ts
+++ b/test/suites/dev-tanssi/staking/test_staking_rewards_non_balanced.ts
@@ -63,7 +63,7 @@ describeSuite({
const events = await polkadotJs.query.system.events();
const issuance = await fetchIssuance(events).amount.toBigInt();
const chainRewards = (issuance * 7n) / 10n;
- const expectedOrchestratorReward = chainRewards / 3n;
+ const expectedOrchestratorReward = chainRewards - (chainRewards * 2n) / 3n;
const reward = await fetchRewardAuthorOrchestrator(events);
const stakingRewardedCollator = await filterRewardStakingCollator(events, reward.accountId.toString());
const stakingRewardedDelegators = await filterRewardStakingDelegators(
diff --git a/test/suites/dev-tanssi/staking/test_staking_session.ts b/test/suites/dev-tanssi/staking/test_staking_session.ts
index 8ba6fb5f2..b61736d05 100644
--- a/test/suites/dev-tanssi/staking/test_staking_session.ts
+++ b/test/suites/dev-tanssi/staking/test_staking_session.ts
@@ -13,7 +13,7 @@ describeSuite({
let polkadotJs: ApiPromise;
let alice: KeyringPair;
// TODO: don't hardcode the period here
- const sessionPeriod = 5;
+ const sessionPeriod = 10;
beforeAll(async () => {
alice = context.keyring.alice;
diff --git a/test/suites/dev-tanssi/staking/test_staking_swap.ts b/test/suites/dev-tanssi/staking/test_staking_swap.ts
index ae52124b9..c0303dee1 100644
--- a/test/suites/dev-tanssi/staking/test_staking_swap.ts
+++ b/test/suites/dev-tanssi/staking/test_staking_swap.ts
@@ -14,7 +14,7 @@ describeSuite({
let alice: KeyringPair;
let bob: KeyringPair;
// TODO: don't hardcode the period here
- const sessionPeriod = 5;
+ const sessionPeriod = 10;
beforeAll(async () => {
alice = context.keyring.alice;
diff --git a/test/suites/para/test_tanssi_containers.ts b/test/suites/para/test_tanssi_containers.ts
index 700cefef2..fb2251dce 100644
--- a/test/suites/para/test_tanssi_containers.ts
+++ b/test/suites/para/test_tanssi_containers.ts
@@ -346,7 +346,7 @@ describeSuite({
test: async function () {
// This test depends on T12 and T15 to set blockNumber2002Start and blockNumber2002End
// TODO: don't hardcode the period here
- const sessionPeriod = 5;
+ const sessionPeriod = 10;
// The block range must start and end on session boundaries
expect(blockNumber2002Start % sessionPeriod).to.be.equal(0);
expect(blockNumber2002End % sessionPeriod).to.be.equal(0);
@@ -363,7 +363,7 @@ describeSuite({
// While 2002 is live: 2 authors (the other 2 went to container chain 2002)
// We take from the first block that rotates, otherwise rotation kicks in
- await countUniqueBlockAuthors(paraApi, sessionPeriod * 5, blockNumber2002End - 1, 2);
+ await countUniqueBlockAuthors(paraApi, sessionPeriod * 10, blockNumber2002End - 1, 2);
// Need to wait one session because the following blocks don't exist yet
await waitSessions(context, paraApi, 1);
diff --git a/test/suites/rotation-para/test_rotation.ts b/test/suites/rotation-para/test_rotation.ts
index 2ef6a5f75..5507830c2 100644
--- a/test/suites/rotation-para/test_rotation.ts
+++ b/test/suites/rotation-para/test_rotation.ts
@@ -275,7 +275,7 @@ describeSuite({
// The node detects assignment when the block is finalized, but "waitSessions" ignores finality.
// So wait a few blocks more hoping that the current block will be finalized by then.
- await context.waitBlock(3, "Tanssi");
+ await context.waitBlock(6, "Tanssi");
const futureAssignment = await paraApi.query.collatorAssignment.pendingCollatorContainerChain();
// The assignment is random, so there is a small chance that it will be the same,
// and in that case this test shouldn't fail
@@ -333,7 +333,7 @@ describeSuite({
// The node detects assignment when the block is finalized, but "waitSessions" ignores finality.
// So wait a few blocks more hoping that the current block will be finalized by then.
// This also serves to check that Tanssi is producing blocks after the rotation
- await context.waitBlock(3, "Tanssi");
+ await context.waitBlock(6, "Tanssi");
// First, check that nodes have stopped in their previously assigned chain
const oldC2000 = collatorName[assignment3.containerChains[2000][0]];