snapshot before rebranding

This commit is contained in:
2025-12-14 07:37:21 +03:00
parent 5520d491a5
commit 09735eb97a
1752 changed files with 58116 additions and 15986 deletions
+32 -31
View File
@@ -7,6 +7,7 @@ edition.workspace = true
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
homepage.workspace = true
repository.workspace = true
documentation = "https://docs.rs/pezcumulus-client-consensus-aura"
[lints]
workspace = true
@@ -70,35 +71,35 @@ pezsp-version = { workspace = true }
[features]
runtime-benchmarks = [
"pezcumulus-client-collator/runtime-benchmarks",
"pezcumulus-client-consensus-common/runtime-benchmarks",
"pezcumulus-client-consensus-proposer/runtime-benchmarks",
"pezcumulus-client-teyrchain-inherent/runtime-benchmarks",
"pezcumulus-primitives-aura/runtime-benchmarks",
"pezcumulus-primitives-core/runtime-benchmarks",
"pezcumulus-relay-chain-interface/runtime-benchmarks",
"pezcumulus-test-client/runtime-benchmarks",
"pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
"pezkuwi-overseer/runtime-benchmarks",
"pezkuwi-primitives/runtime-benchmarks",
"pezsc-client-api/runtime-benchmarks",
"pezsc-consensus-aura/runtime-benchmarks",
"pezsc-consensus-babe/runtime-benchmarks",
"pezsc-consensus-slots/runtime-benchmarks",
"pezsc-consensus/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
"pezsp-block-builder/runtime-benchmarks",
"pezsp-blockchain/runtime-benchmarks",
"pezsp-consensus-aura/runtime-benchmarks",
"pezsp-consensus/runtime-benchmarks",
"pezsp-inherents/runtime-benchmarks",
"pezsp-keyring/runtime-benchmarks",
"pezsp-runtime/runtime-benchmarks",
"pezsp-state-machine/runtime-benchmarks",
"pezsp-timestamp/runtime-benchmarks",
"pezsp-trie/runtime-benchmarks",
"pezsp-version/runtime-benchmarks",
"pezcumulus-client-collator/runtime-benchmarks",
"pezcumulus-client-consensus-common/runtime-benchmarks",
"pezcumulus-client-consensus-proposer/runtime-benchmarks",
"pezcumulus-client-teyrchain-inherent/runtime-benchmarks",
"pezcumulus-primitives-aura/runtime-benchmarks",
"pezcumulus-primitives-core/runtime-benchmarks",
"pezcumulus-relay-chain-interface/runtime-benchmarks",
"pezcumulus-test-client/runtime-benchmarks",
"pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
"pezkuwi-node-primitives/runtime-benchmarks",
"pezkuwi-node-subsystem-util/runtime-benchmarks",
"pezkuwi-node-subsystem/runtime-benchmarks",
"pezkuwi-overseer/runtime-benchmarks",
"pezkuwi-primitives/runtime-benchmarks",
"pezsc-client-api/runtime-benchmarks",
"pezsc-consensus-aura/runtime-benchmarks",
"pezsc-consensus-babe/runtime-benchmarks",
"pezsc-consensus-slots/runtime-benchmarks",
"pezsc-consensus/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
"pezsp-block-builder/runtime-benchmarks",
"pezsp-blockchain/runtime-benchmarks",
"pezsp-consensus-aura/runtime-benchmarks",
"pezsp-consensus/runtime-benchmarks",
"pezsp-inherents/runtime-benchmarks",
"pezsp-keyring/runtime-benchmarks",
"pezsp-runtime/runtime-benchmarks",
"pezsp-state-machine/runtime-benchmarks",
"pezsp-timestamp/runtime-benchmarks",
"pezsp-trie/runtime-benchmarks",
"pezsp-version/runtime-benchmarks",
]
@@ -26,16 +26,16 @@
//! aura-based collators.
use codec::Codec;
use cumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use cumulus_client_consensus_common::{
use pezcumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use pezcumulus_client_consensus_common::{
self as consensus_common, TeyrchainBlockImportMarker, TeyrchainCandidate,
};
use cumulus_client_consensus_proposer::ProposerInterface;
use cumulus_client_teyrchain_inherent::{TeyrchainInherentData, TeyrchainInherentDataProvider};
use cumulus_primitives_core::{
use pezcumulus_client_consensus_proposer::ProposerInterface;
use pezcumulus_client_teyrchain_inherent::{TeyrchainInherentData, TeyrchainInherentDataProvider};
use pezcumulus_primitives_core::{
relay_chain::Hash as PHash, DigestItem, PersistedValidationData, TeyrchainBlockData,
};
use cumulus_relay_chain_interface::RelayChainInterface;
use pezcumulus_relay_chain_interface::RelayChainInterface;
use pezkuwi_node_primitives::{Collation, MaybeCompressedPoV};
use pezkuwi_primitives::{Header as PHeader, Id as ParaId};
@@ -24,13 +24,13 @@
//! For more information about AuRa, the Bizinikiwi crate should be checked.
use codec::{Codec, Decode};
use cumulus_client_collator::{
use pezcumulus_client_collator::{
relay_chain_driven::CollationRequest, service::ServiceInterface as CollatorServiceInterface,
};
use cumulus_client_consensus_common::TeyrchainBlockImportMarker;
use cumulus_client_consensus_proposer::ProposerInterface;
use cumulus_primitives_core::{relay_chain::BlockId as RBlockId, CollectCollationInfo};
use cumulus_relay_chain_interface::RelayChainInterface;
use pezcumulus_client_consensus_common::TeyrchainBlockImportMarker;
use pezcumulus_client_consensus_proposer::ProposerInterface;
use pezcumulus_primitives_core::{relay_chain::BlockId as RBlockId, CollectCollationInfo};
use pezcumulus_relay_chain_interface::RelayChainInterface;
use pezkuwi_node_primitives::CollationResult;
use pezkuwi_overseer::Handle as OverseerHandle;
@@ -119,7 +119,7 @@ where
let mut collation_requests = match params.collation_request_receiver {
Some(receiver) => receiver,
None =>
cumulus_client_collator::relay_chain_driven::init(
pezcumulus_client_collator::relay_chain_driven::init(
params.collator_key,
params.para_id,
params.overseer_handle,
@@ -33,12 +33,12 @@
//! must be propagated to the next author before their turn.
use codec::{Codec, Encode};
use cumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use cumulus_client_consensus_common::{self as consensus_common, TeyrchainBlockImportMarker};
use cumulus_client_consensus_proposer::ProposerInterface;
use cumulus_primitives_aura::AuraUnincludedSegmentApi;
use cumulus_primitives_core::{CollectCollationInfo, PersistedValidationData};
use cumulus_relay_chain_interface::RelayChainInterface;
use pezcumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use pezcumulus_client_consensus_common::{self as consensus_common, TeyrchainBlockImportMarker};
use pezcumulus_client_consensus_proposer::ProposerInterface;
use pezcumulus_primitives_aura::AuraUnincludedSegmentApi;
use pezcumulus_primitives_core::{CollectCollationInfo, PersistedValidationData};
use pezcumulus_relay_chain_interface::RelayChainInterface;
use pezkuwi_node_primitives::SubmitCollationParams;
use pezkuwi_node_subsystem::messages::CollationGenerationMessage;
@@ -231,7 +231,7 @@ where
P::Signature: TryFrom<Vec<u8>> + Member + Codec,
{
async move {
cumulus_client_collator::initialize_collator_subsystems(
pezcumulus_client_collator::initialize_collator_subsystems(
&mut params.overseer_handle,
params.collator_key,
params.para_id,
@@ -23,10 +23,10 @@
use crate::collator::SlotClaim;
use codec::Codec;
use cumulus_client_consensus_common::{self as consensus_common, ParentSearchParams};
use cumulus_primitives_aura::{AuraUnincludedSegmentApi, Slot};
use cumulus_primitives_core::{relay_chain::Header as RelayHeader, BlockT};
use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
use pezcumulus_client_consensus_common::{self as consensus_common, ParentSearchParams};
use pezcumulus_primitives_aura::{AuraUnincludedSegmentApi, Slot};
use pezcumulus_primitives_core::{relay_chain::Header as RelayHeader, BlockT};
use pezcumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
use pezkuwi_node_subsystem::messages::{CollatorProtocolMessage, RuntimeApiRequest};
use pezkuwi_node_subsystem_util::runtime::ClaimQueueSnapshot;
use pezkuwi_primitives::{
@@ -267,7 +267,7 @@ where
.then(|| SlotClaim::unchecked::<P>(author_pub, para_slot, timestamp))
}
/// Use [`cumulus_client_consensus_common::find_potential_parents`] to find teyrchain blocks that
/// Use [`pezcumulus_client_consensus_common::find_potential_parents`] to find teyrchain blocks that
/// we can build on. Once a list of potential parents is retrieved, return the last one of the
/// longest chain.
async fn find_parent<Block>(
@@ -290,7 +290,7 @@ where
ignore_alternative_branches: true,
};
let potential_parents = cumulus_client_consensus_common::find_potential_parents::<Block>(
let potential_parents = pezcumulus_client_consensus_common::find_potential_parents::<Block>(
parent_search_params,
para_backend,
relay_client,
@@ -323,15 +323,15 @@ mod tests {
use super::*;
use crate::collators::{can_build_upon, BackingGroupConnectionHelper};
use codec::Encode;
use cumulus_primitives_aura::Slot;
use cumulus_primitives_core::BlockT;
use cumulus_relay_chain_interface::PHash;
use cumulus_test_client::{
use pezcumulus_primitives_aura::Slot;
use pezcumulus_primitives_core::BlockT;
use pezcumulus_relay_chain_interface::PHash;
use pezcumulus_test_client::{
runtime::{Block, Hash},
Client, DefaultTestClientBuilderExt, InitBlockBuilder, TestClientBuilder,
TestClientBuilderExt,
};
use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
use pezcumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
use futures::StreamExt;
use pezkuwi_overseer::{Event, Handle};
use pezkuwi_primitives::HeadData;
@@ -359,7 +359,7 @@ mod tests {
let header = client.header(hash).ok().flatten().expect("No header for parent block");
let included = HeadData(header.encode());
let mut builder = RelayStateSproofBuilder::default();
builder.para_id = cumulus_test_client::runtime::TEYRCHAIN_ID.into();
builder.para_id = pezcumulus_test_client::runtime::TEYRCHAIN_ID.into();
builder.included_para_head = Some(included);
builder
@@ -30,15 +30,15 @@ use crate::{
},
LOG_TARGET,
};
use cumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use cumulus_client_consensus_common::{self as consensus_common, TeyrchainBlockImportMarker};
use cumulus_client_consensus_proposer::ProposerInterface;
use cumulus_primitives_aura::{AuraUnincludedSegmentApi, Slot};
use cumulus_primitives_core::{
use pezcumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use pezcumulus_client_consensus_common::{self as consensus_common, TeyrchainBlockImportMarker};
use pezcumulus_client_consensus_proposer::ProposerInterface;
use pezcumulus_primitives_aura::{AuraUnincludedSegmentApi, Slot};
use pezcumulus_primitives_core::{
extract_relay_parent, rpsr_digest, ClaimQueueOffset, CoreInfo, CoreSelector, CumulusDigestItem,
PersistedValidationData, RelayParentOffsetApi,
};
use cumulus_relay_chain_interface::RelayChainInterface;
use pezcumulus_relay_chain_interface::RelayChainInterface;
use futures::prelude::*;
use pezkuwi_primitives::{
Block as RelayBlock, CoreIndex, Hash as RelayHash, Header as RelayHeader, Id as ParaId,
@@ -18,15 +18,15 @@
use codec::Encode;
use std::path::PathBuf;
use cumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use cumulus_relay_chain_interface::RelayChainInterface;
use pezcumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use pezcumulus_relay_chain_interface::RelayChainInterface;
use pezkuwi_node_primitives::{MaybeCompressedPoV, SubmitCollationParams};
use pezkuwi_node_subsystem::messages::CollationGenerationMessage;
use pezkuwi_overseer::Handle as OverseerHandle;
use pezkuwi_primitives::{CollatorPair, Id as ParaId};
use cumulus_primitives_core::relay_chain::BlockId;
use pezcumulus_primitives_core::relay_chain::BlockId;
use futures::prelude::*;
use crate::export_pov_to_path;
@@ -84,7 +84,7 @@ pub async fn run_collation_task<Block, RClient, CS>(
return;
};
cumulus_client_collator::initialize_collator_subsystems(
pezcumulus_client_collator::initialize_collator_subsystems(
&mut overseer_handle,
collator_key,
para_id,
@@ -29,7 +29,7 @@
//!
//! 1. Awaits the next production signal from the internal timer
//! 2. Retrieves the current best relay chain block and identifies a valid parent block (see
//! [find_potential_parents][cumulus_client_consensus_common::find_potential_parents] for parent
//! [find_potential_parents][pezcumulus_client_consensus_common::find_potential_parents] for parent
//! selection criteria)
//! 3. Validates that:
//! - The teyrchain has an assigned core on the relay chain
@@ -70,12 +70,12 @@ use self::{block_builder_task::run_block_builder, collation_task::run_collation_
pub use block_import::{SlotBasedBlockImport, SlotBasedBlockImportHandle};
use codec::Codec;
use consensus_common::TeyrchainCandidate;
use cumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use cumulus_client_consensus_common::{self as consensus_common, TeyrchainBlockImportMarker};
use cumulus_client_consensus_proposer::ProposerInterface;
use cumulus_primitives_aura::AuraUnincludedSegmentApi;
use cumulus_primitives_core::RelayParentOffsetApi;
use cumulus_relay_chain_interface::RelayChainInterface;
use pezcumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
use pezcumulus_client_consensus_common::{self as consensus_common, TeyrchainBlockImportMarker};
use pezcumulus_client_consensus_proposer::ProposerInterface;
use pezcumulus_primitives_aura::AuraUnincludedSegmentApi;
use pezcumulus_primitives_core::RelayParentOffsetApi;
use pezcumulus_relay_chain_interface::RelayChainInterface;
use futures::FutureExt;
use pezkuwi_primitives::{
CollatorPair, CoreIndex, Hash as RelayHash, Id as ParaId, ValidationCodeHash,
@@ -18,8 +18,8 @@
//! Utility for caching [`RelayChainData`] for different relay blocks.
use crate::collators::claim_queue_at;
use cumulus_primitives_core::CoreSelector;
use cumulus_relay_chain_interface::RelayChainInterface;
use pezcumulus_primitives_core::CoreSelector;
use pezcumulus_relay_chain_interface::RelayChainInterface;
use pezkuwi_node_subsystem_util::runtime::ClaimQueueSnapshot;
use pezkuwi_primitives::{
Hash as RelayHash, Header as RelayHeader, Id as ParaId, OccupiedCoreAssumption,
@@ -17,8 +17,8 @@
use crate::LOG_TARGET;
use codec::Codec;
use cumulus_primitives_aura::Slot;
use cumulus_primitives_core::BlockT;
use pezcumulus_primitives_aura::Slot;
use pezcumulus_primitives_core::BlockT;
use pezsc_client_api::UsageProvider;
use pezsc_consensus_aura::SlotDuration;
use pezsp_api::ProvideRuntimeApi;
@@ -21,8 +21,8 @@ use super::{
};
use async_trait::async_trait;
use codec::Encode;
use cumulus_primitives_core::{ClaimQueueOffset, CoreInfo, CoreSelector, CumulusDigestItem};
use cumulus_relay_chain_interface::*;
use pezcumulus_primitives_core::{ClaimQueueOffset, CoreInfo, CoreSelector, CumulusDigestItem};
use pezcumulus_relay_chain_interface::*;
use futures::Stream;
use pezkuwi_node_subsystem_util::runtime::ClaimQueueSnapshot;
use pezkuwi_primitives::{
@@ -191,7 +191,7 @@ async fn determine_core_with_core_info() {
let mut digest = pezsp_runtime::generic::Digest::default();
digest.push(CumulusDigestItem::CoreInfo(core_info).to_digest_item());
// Add relay parent storage root to make it a non-new relay parent
digest.push(cumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
digest.push(pezcumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
*relay_parent.state_root(),
*relay_parent.number(),
));
@@ -270,7 +270,7 @@ async fn determine_core_selector_overflow() {
let mut digest = pezsp_runtime::generic::Digest::default();
digest.push(CumulusDigestItem::CoreInfo(core_info).to_digest_item());
// Add relay parent storage root to make it a non-new relay parent
digest.push(cumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
digest.push(pezcumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
*relay_parent.state_root(),
*relay_parent.number(),
));
@@ -310,7 +310,7 @@ async fn determine_core_uses_last_claimed_core_selector() {
// Create a para parent header without core info in digest (non-genesis)
// Need to add relay parent storage root to digest to make it a non-new relay parent
let mut digest = pezsp_runtime::generic::Digest::default();
digest.push(cumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
digest.push(pezcumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
*relay_parent.state_root(),
*relay_parent.number(),
));
@@ -362,7 +362,7 @@ async fn determine_core_uses_last_claimed_core_selector_wraps_around() {
// Create a para parent header without core info in digest (non-genesis)
// Need to add relay parent storage root to digest to make it a non-new relay parent
let mut digest = pezsp_runtime::generic::Digest::default();
digest.push(cumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
digest.push(pezcumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
*relay_parent.state_root(),
*relay_parent.number(),
));
@@ -412,7 +412,7 @@ async fn determine_core_no_last_claimed_core_selector() {
// Create a para parent header without core info in digest (non-genesis)
// Need to add relay parent storage root to digest to make it a non-new relay parent
let mut digest = pezsp_runtime::generic::Digest::default();
digest.push(cumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
digest.push(pezcumulus_primitives_core::rpsr_digest::relay_parent_storage_root_item(
*relay_parent.state_root(),
*relay_parent.number(),
));
@@ -492,7 +492,7 @@ impl RelayChainInterface for TestRelayClient {
_: ParaId,
_: OccupiedCoreAssumption,
) -> RelayChainResult<Option<PersistedValidationData>> {
use cumulus_primitives_core::PersistedValidationData;
use pezcumulus_primitives_core::PersistedValidationData;
Ok(Some(PersistedValidationData {
parent_head: Default::default(),
relay_parent_number: 100,
@@ -21,8 +21,8 @@
/// may see equivocations in a different order, and therefore may not agree on which blocks
/// should be thrown out and which ones should be kept.
use codec::Codec;
use cumulus_client_consensus_common::TeyrchainBlockImportMarker;
use cumulus_primitives_core::{CumulusDigestItem, RelayBlockIdentifier};
use pezcumulus_client_consensus_common::TeyrchainBlockImportMarker;
use pezcumulus_primitives_core::{CumulusDigestItem, RelayBlockIdentifier};
use parking_lot::Mutex;
use pezkuwi_primitives::Hash as RHash;
use pezsc_consensus::{
@@ -305,11 +305,11 @@ where
mod test {
use super::*;
use codec::Encode;
use cumulus_test_client::{
use pezcumulus_test_client::{
runtime::Block, seal_block, Client, InitBlockBuilder, TestClientBuilder,
TestClientBuilderExt,
};
use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
use pezcumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
use futures::FutureExt;
use pezkuwi_primitives::{HeadData, PersistedValidationData};
use pezsc_client_api::HeaderBackend;
@@ -336,7 +336,7 @@ mod test {
let genesis = client.info().best_hash;
let mut sproof = RelayStateSproofBuilder::default();
sproof.included_para_head = Some(HeadData(client.header(genesis).unwrap().encode()));
sproof.para_id = cumulus_test_client::runtime::TEYRCHAIN_ID.into();
sproof.para_id = pezcumulus_test_client::runtime::TEYRCHAIN_ID.into();
let validation_data = PersistedValidationData {
relay_parent_number: 1,
@@ -18,7 +18,7 @@
//! Teyrchain specific wrapper for the AuRa import queue.
use codec::Codec;
use cumulus_client_consensus_common::TeyrchainBlockImportMarker;
use pezcumulus_client_consensus_common::TeyrchainBlockImportMarker;
use prometheus_endpoint::Registry;
use pezsc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
use pezsc_consensus::{import_queue::DefaultImportQueue, BlockImport};
+2 -2
View File
@@ -23,9 +23,9 @@
//! For more information about AuRa, the Bizinikiwi crate should be checked.
use codec::Encode;
use cumulus_primitives_core::PersistedValidationData;
use pezcumulus_primitives_core::PersistedValidationData;
use cumulus_primitives_core::relay_chain::HeadData;
use pezcumulus_primitives_core::relay_chain::HeadData;
use pezkuwi_primitives::{BlockNumber as RBlockNumber, Hash as RHash};
use pezsp_runtime::traits::{Block as BlockT, NumberFor};
use std::{fs, fs::File, path::PathBuf};
+19 -18
View File
@@ -7,6 +7,7 @@ edition.workspace = true
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
homepage.workspace = true
repository.workspace = true
documentation = "https://docs.rs/pezcumulus-client-consensus-common"
[lints]
workspace = true
@@ -57,22 +58,22 @@ pezcumulus-test-relay-sproof-builder = { workspace = true, default-features = tr
[features]
runtime-benchmarks = [
"pezcumulus-client-pov-recovery/runtime-benchmarks",
"pezcumulus-primitives-core/runtime-benchmarks",
"pezcumulus-relay-chain-interface/runtime-benchmarks",
"pezcumulus-relay-chain-streams/runtime-benchmarks",
"pezcumulus-test-client/runtime-benchmarks",
"pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
"pezkuwi-primitives/runtime-benchmarks",
"pezsc-client-api/runtime-benchmarks",
"pezsc-consensus-babe/runtime-benchmarks",
"pezsc-consensus/runtime-benchmarks",
"pezsc-network/runtime-benchmarks",
"pezsp-blockchain/runtime-benchmarks",
"pezsp-consensus-slots/runtime-benchmarks",
"pezsp-consensus/runtime-benchmarks",
"pezsp-runtime/runtime-benchmarks",
"pezsp-timestamp/runtime-benchmarks",
"pezsp-trie/runtime-benchmarks",
"pezsp-version/runtime-benchmarks",
"pezcumulus-client-pov-recovery/runtime-benchmarks",
"pezcumulus-primitives-core/runtime-benchmarks",
"pezcumulus-relay-chain-interface/runtime-benchmarks",
"pezcumulus-relay-chain-streams/runtime-benchmarks",
"pezcumulus-test-client/runtime-benchmarks",
"pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
"pezkuwi-primitives/runtime-benchmarks",
"pezsc-client-api/runtime-benchmarks",
"pezsc-consensus-babe/runtime-benchmarks",
"pezsc-consensus/runtime-benchmarks",
"pezsc-network/runtime-benchmarks",
"pezsp-blockchain/runtime-benchmarks",
"pezsp-consensus-slots/runtime-benchmarks",
"pezsp-consensus/runtime-benchmarks",
"pezsp-runtime/runtime-benchmarks",
"pezsp-timestamp/runtime-benchmarks",
"pezsp-trie/runtime-benchmarks",
"pezsp-version/runtime-benchmarks",
]
@@ -18,8 +18,8 @@
use codec::Decode;
use pezkuwi_primitives::{Block as PBlock, Hash as PHash, Header as PHeader, ValidationCodeHash};
use cumulus_primitives_core::{relay_chain, AbridgedHostConfiguration};
use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface};
use pezcumulus_primitives_core::{relay_chain, AbridgedHostConfiguration};
use pezcumulus_relay_chain_interface::{RelayChainError, RelayChainInterface};
use pezsc_client_api::Backend;
use pezsc_consensus::{shared_data::SharedData, BlockImport, ImportResult};
@@ -38,7 +38,7 @@ mod teyrchain_consensus;
pub use parent_search::*;
pub use cumulus_relay_chain_streams::finalized_heads;
pub use pezcumulus_relay_chain_streams::finalized_heads;
pub use teyrchain_consensus::spawn_teyrchain_consensus_tasks;
use level_monitor::LevelMonitor;
@@ -18,11 +18,11 @@
use codec::Decode;
use pezkuwi_primitives::Hash as RelayHash;
use cumulus_primitives_core::{
use pezcumulus_primitives_core::{
relay_chain::{BlockId as RBlockId, OccupiedCoreAssumption},
ParaId,
};
use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface};
use pezcumulus_relay_chain_interface::{RelayChainError, RelayChainInterface};
use pezsc_client_api::{Backend, HeaderBackend};
@@ -360,10 +360,10 @@ pub fn search_child_branches_for_parents<Block: BlockT>(
// because they have already been posted on chain.
let is_potential = is_pending || is_included || {
let digest = entry.header.digest();
let is_hash_in_ancestry_check = cumulus_primitives_core::extract_relay_parent(digest)
let is_hash_in_ancestry_check = pezcumulus_primitives_core::extract_relay_parent(digest)
.map_or(false, is_hash_in_ancestry);
let is_root_in_ancestry_check =
cumulus_primitives_core::rpsr_digest::extract_relay_parent_storage_root(digest)
pezcumulus_primitives_core::rpsr_digest::extract_relay_parent_storage_root(digest)
.map(|(r, _n)| r)
.map_or(false, is_root_in_ancestry);
@@ -20,20 +20,20 @@ use crate::*;
use crate::teyrchain_consensus::run_teyrchain_consensus;
use async_trait::async_trait;
use codec::Encode;
use cumulus_client_pov_recovery::RecoveryKind;
use cumulus_primitives_core::{
use pezcumulus_client_pov_recovery::RecoveryKind;
use pezcumulus_primitives_core::{
relay_chain::{BlockId, BlockNumber, CoreState},
CumulusDigestItem, InboundDownwardMessage, InboundHrmpMessage, PersistedValidationData,
};
use cumulus_relay_chain_interface::{
use pezcumulus_relay_chain_interface::{
CommittedCandidateReceipt, CoreIndex, OccupiedCoreAssumption, OverseerHandle, PHeader, ParaId,
RelayChainInterface, RelayChainResult, SessionIndex, StorageValue, ValidatorId,
};
use cumulus_test_client::{
use pezcumulus_test_client::{
runtime::{Block, Hash, Header},
Backend, Client, InitBlockBuilder, TestClientBuilder, TestClientBuilderExt,
};
use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
use pezcumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
use futures::{channel::mpsc, executor::block_on, select, FutureExt, Stream, StreamExt};
use futures_timer::Delay;
use pezkuwi_primitives::{CandidateEvent, HeadData};
@@ -308,7 +308,7 @@ fn sproof_with_parent_by_hash(client: &Client, hash: PHash) -> RelayStateSproofB
fn sproof_with_parent(parent: HeadData) -> RelayStateSproofBuilder {
let mut x = RelayStateSproofBuilder::default();
x.para_id = cumulus_test_client::runtime::TEYRCHAIN_ID.into();
x.para_id = pezcumulus_test_client::runtime::TEYRCHAIN_ID.into();
x.included_para_head = Some(parent);
x
@@ -321,7 +321,7 @@ fn build_block<B: InitBlockBuilder>(
timestamp: Option<u64>,
relay_parent: Option<PHash>,
) -> Block {
let cumulus_test_client::BlockBuilderAndSupportData { block_builder, .. } = match at {
let pezcumulus_test_client::BlockBuilderAndSupportData { block_builder, .. } = match at {
Some(at) => match timestamp {
Some(ts) => builder.init_block_builder_with_timestamp(at, None, sproof, ts),
None => builder.init_block_builder_at(at, None, sproof),
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with Pezcumulus. If not, see <https://www.gnu.org/licenses/>.
use cumulus_relay_chain_streams::{finalized_heads, new_best_heads};
use pezcumulus_relay_chain_streams::{finalized_heads, new_best_heads};
use pezsc_client_api::{
Backend, BlockBackend, BlockImportNotification, BlockchainEvents, Finalizer, UsageProvider,
};
@@ -25,8 +25,8 @@ use pezsp_blockchain::Error as ClientError;
use pezsp_consensus::{BlockOrigin, BlockStatus};
use pezsp_runtime::traits::{Block as BlockT, Header as HeaderT};
use cumulus_client_pov_recovery::{RecoveryKind, RecoveryRequest};
use cumulus_relay_chain_interface::RelayChainInterface;
use pezcumulus_client_pov_recovery::{RecoveryKind, RecoveryRequest};
use pezcumulus_relay_chain_interface::RelayChainInterface;
use pezkuwi_primitives::Id as ParaId;
+11 -10
View File
@@ -7,6 +7,7 @@ edition.workspace = true
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
homepage.workspace = true
repository.workspace = true
documentation = "https://docs.rs/pezcumulus-client-consensus-proposer"
[lints]
workspace = true
@@ -32,14 +33,14 @@ pezcumulus-primitives-teyrchain-inherent = { workspace = true, default-features
[features]
runtime-benchmarks = [
"pezcumulus-primitives-teyrchain-inherent/runtime-benchmarks",
"pezsc-basic-authorship/runtime-benchmarks",
"pezsc-block-builder/runtime-benchmarks",
"pezsc-transaction-pool-api/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
"pezsp-blockchain/runtime-benchmarks",
"pezsp-consensus/runtime-benchmarks",
"pezsp-inherents/runtime-benchmarks",
"pezsp-runtime/runtime-benchmarks",
"pezsp-state-machine/runtime-benchmarks",
"pezcumulus-primitives-teyrchain-inherent/runtime-benchmarks",
"pezsc-basic-authorship/runtime-benchmarks",
"pezsc-block-builder/runtime-benchmarks",
"pezsc-transaction-pool-api/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
"pezsp-blockchain/runtime-benchmarks",
"pezsp-consensus/runtime-benchmarks",
"pezsp-inherents/runtime-benchmarks",
"pezsp-runtime/runtime-benchmarks",
"pezsp-state-machine/runtime-benchmarks",
]
@@ -21,7 +21,7 @@
//! This utility is designed to be composed within any collator consensus algorithm.
use async_trait::async_trait;
use cumulus_primitives_teyrchain_inherent::TeyrchainInherentData;
use pezcumulus_primitives_teyrchain_inherent::TeyrchainInherentData;
use pezsc_basic_authorship::{ProposeArgs, ProposerFactory};
use pezsc_block_builder::BlockBuilderApi;
use pezsc_transaction_pool_api::TransactionPool;
@@ -7,6 +7,7 @@ edition.workspace = true
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
homepage.workspace = true
repository.workspace = true
documentation = "https://docs.rs/pezcumulus-client-consensus-relay-chain"
[lints]
workspace = true
@@ -35,14 +36,14 @@ pezcumulus-relay-chain-interface = { workspace = true, default-features = true }
[features]
runtime-benchmarks = [
"pezcumulus-client-consensus-common/runtime-benchmarks",
"pezcumulus-primitives-core/runtime-benchmarks",
"pezcumulus-relay-chain-interface/runtime-benchmarks",
"pezsc-consensus/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
"pezsp-block-builder/runtime-benchmarks",
"pezsp-blockchain/runtime-benchmarks",
"pezsp-consensus/runtime-benchmarks",
"pezsp-inherents/runtime-benchmarks",
"pezsp-runtime/runtime-benchmarks",
"pezcumulus-client-consensus-common/runtime-benchmarks",
"pezcumulus-primitives-core/runtime-benchmarks",
"pezcumulus-relay-chain-interface/runtime-benchmarks",
"pezsc-consensus/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
"pezsp-block-builder/runtime-benchmarks",
"pezsp-blockchain/runtime-benchmarks",
"pezsp-consensus/runtime-benchmarks",
"pezsp-inherents/runtime-benchmarks",
"pezsp-runtime/runtime-benchmarks",
]