chore: regenerate umbrella crate, fix feature propagation

2025-12-16 11:28:32 +03:00
parent dd6d48f528
commit 620b0e3aa0
1358 changed files with 9464 additions and 7656 deletions
@@ -32,8 +32,8 @@ use pezcumulus_client_consensus_proposer::ProposerInterface;
 use pezcumulus_primitives_core::{relay_chain::BlockId as RBlockId, CollectCollationInfo};
 use pezcumulus_relay_chain_interface::RelayChainInterface;

-use pezkuwi_pez_node_primitives::CollationResult;
 use pezkuwi_overseer::Handle as OverseerHandle;
+use pezkuwi_pez_node_primitives::CollationResult;
 use pezkuwi_primitives::{CollatorPair, Id as ParaId, ValidationCode};

 use futures::{channel::mpsc::Receiver, prelude::*};
@@ -40,9 +40,9 @@ use pezcumulus_primitives_aura::AuraUnincludedSegmentApi;
 use pezcumulus_primitives_core::{CollectCollationInfo, PersistedValidationData};
 use pezcumulus_relay_chain_interface::RelayChainInterface;

-use pezkuwi_pez_node_primitives::SubmitCollationParams;
 use pezkuwi_node_subsystem::messages::CollationGenerationMessage;
 use pezkuwi_overseer::Handle as OverseerHandle;
+use pezkuwi_pez_node_primitives::SubmitCollationParams;
 use pezkuwi_primitives::{CollatorPair, Id as ParaId, OccupiedCoreAssumption};

 use crate::{
@@ -323,6 +323,7 @@ mod tests {
 	use super::*;
 	use crate::collators::{can_build_upon, BackingGroupConnectionHelper};
 	use codec::Encode;
+	use futures::StreamExt;
 	use pezcumulus_primitives_aura::Slot;
 	use pezcumulus_primitives_core::BlockT;
 	use pezcumulus_relay_chain_interface::PHash;
@@ -332,7 +333,6 @@ mod tests {
 		TestClientBuilderExt,
 	};
 	use pezcumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
-	use futures::StreamExt;
 	use pezkuwi_overseer::{Event, Handle};
 	use pezkuwi_primitives::HeadData;
 	use pezsc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
@@ -30,6 +30,7 @@ use crate::{
 	},
 	LOG_TARGET,
 };
+use futures::prelude::*;
 use pezcumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
 use pezcumulus_client_consensus_common::{self as consensus_common, TeyrchainBlockImportMarker};
 use pezcumulus_client_consensus_proposer::ProposerInterface;
@@ -39,7 +40,6 @@ use pezcumulus_primitives_core::{
 	PersistedValidationData, RelayParentOffsetApi,
 };
 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,
 };
@@ -133,9 +133,9 @@ where
 				)));
 			}

-			params.state_action = StateAction::ApplyChanges(pezsc_consensus::StorageChanges::Changes(
-				gen_storage_changes,
-			));
+			params.state_action = StateAction::ApplyChanges(
+				pezsc_consensus::StorageChanges::Changes(gen_storage_changes),
+			);

 			let _ = self.sender.unbounded_send((block, storage_proof));
 		}
@@ -21,13 +21,13 @@ use std::path::PathBuf;
 use pezcumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
 use pezcumulus_relay_chain_interface::RelayChainInterface;

-use pezkuwi_pez_node_primitives::{MaybeCompressedPoV, SubmitCollationParams};
 use pezkuwi_node_subsystem::messages::CollationGenerationMessage;
 use pezkuwi_overseer::Handle as OverseerHandle;
+use pezkuwi_pez_node_primitives::{MaybeCompressedPoV, SubmitCollationParams};
 use pezkuwi_primitives::{CollatorPair, Id as ParaId};

-use pezcumulus_primitives_core::relay_chain::BlockId;
 use futures::prelude::*;
+use pezcumulus_primitives_core::relay_chain::BlockId;

 use crate::export_pov_to_path;
 use pezsc_utils::mpsc::TracingUnboundedReceiver;
@@ -29,8 +29,8 @@
 //!
 //! 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][pezcumulus_client_consensus_common::find_potential_parents] for parent
-//!    selection criteria)
+//!    [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
 //!    - No block has been previously built on the target core
@@ -70,13 +70,13 @@ 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 futures::FutureExt;
 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,
 };
@@ -397,8 +397,8 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use rstest::rstest;
 	use pezsc_consensus_aura::SlotDuration;
+	use rstest::rstest;
 	const RELAY_CHAIN_SLOT_DURATION: u64 = 6000;

 	#[rstest]
@@ -21,21 +21,21 @@ use super::{
 };
 use async_trait::async_trait;
 use codec::Encode;
+use futures::Stream;
 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::{
 	CandidateEvent, CommittedCandidateReceiptV2, CoreIndex, Hash as RelayHash,
 	Header as RelayHeader, Id as ParaId,
 };
-use rstest::rstest;
 use pezsc_consensus_babe::{
 	AuthorityId, ConsensusLog as BabeConsensusLog, NextEpochDescriptor, BABE_ENGINE_ID,
 };
 use pezsp_core::sr25519;
 use pezsp_runtime::{generic::BlockId, testing::Header as TestHeader, traits::Header};
 use pezsp_version::RuntimeVersion;
+use rstest::rstest;
 use std::{
 	collections::{BTreeMap, HashMap, VecDeque},
 	pin::Pin,
@@ -21,9 +21,9 @@
 /// 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 parking_lot::Mutex;
 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::{
 	import_queue::{BasicQueue, Verifier as VerifierT},
@@ -31,7 +31,6 @@ use pezsc_consensus::{
 };
 use pezsc_consensus_aura::{standalone as aura_internal, AuthoritiesTracker};
 use pezsc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_TRACE};
-use schnellru::{ByLength, LruMap};
 use pezsp_api::ProvideRuntimeApi;
 use pezsp_block_builder::BlockBuilder as BlockBuilderApi;
 use pezsp_blockchain::{HeaderBackend, HeaderMetadata};
@@ -40,6 +39,7 @@ use pezsp_consensus_aura::{AuraApi, Slot, SlotDuration};
 use pezsp_core::crypto::Pair;
 use pezsp_inherents::CreateInherentDataProviders;
 use pezsp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
+use schnellru::{ByLength, LruMap};
 use std::{fmt::Debug, sync::Arc};

 const LRU_WINDOW: u32 = 512;
@@ -305,12 +305,12 @@ where
 mod test {
 	use super::*;
 	use codec::Encode;
+	use futures::FutureExt;
 	use pezcumulus_test_client::{
 		runtime::Block, seal_block, Client, InitBlockBuilder, TestClientBuilder,
 		TestClientBuilderExt,
 	};
 	use pezcumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
-	use futures::FutureExt;
 	use pezkuwi_primitives::{HeadData, PersistedValidationData};
 	use pezsc_client_api::HeaderBackend;
 	use pezsp_consensus_aura::sr25519;
@@ -19,7 +19,6 @@

 use codec::Codec;
 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};
 use pezsc_consensus_aura::{AuraVerifier, CompatibilityMode};
@@ -33,6 +32,7 @@ use pezsp_consensus_aura::AuraApi;
 use pezsp_core::crypto::Pair;
 use pezsp_inherents::CreateInherentDataProviders;
 use pezsp_runtime::traits::Block as BlockT;
+use prometheus_endpoint::Registry;
 use std::{fmt::Debug, sync::Arc};

 /// Parameters for [`import_queue`].
@@ -86,17 +86,19 @@ where
 	CIDP: CreateInherentDataProviders<Block, ()> + Sync + Send + 'static,
 	CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
 {
-	pezsc_consensus_aura::import_queue::<P, _, _, _, _, _>(pezsc_consensus_aura::ImportQueueParams {
-		block_import,
-		justification_import: None,
-		client,
-		create_inherent_data_providers,
-		spawner,
-		registry,
-		check_for_equivocation: pezsc_consensus_aura::CheckForEquivocation::No,
-		telemetry,
-		compatibility_mode: CompatibilityMode::None,
-	})
+	pezsc_consensus_aura::import_queue::<P, _, _, _, _, _>(
+		pezsc_consensus_aura::ImportQueueParams {
+			block_import,
+			justification_import: None,
+			client,
+			create_inherent_data_providers,
+			spawner,
+			registry,
+			check_for_equivocation: pezsc_consensus_aura::CheckForEquivocation::No,
+			telemetry,
+			compatibility_mode: CompatibilityMode::None,
+		},
+	)
 }

 /// Parameters of [`build_verifier`].
@@ -17,7 +17,9 @@

 use pezsc_client_api::{blockchain::Backend as _, Backend, HeaderBackend as _};
 use pezsp_blockchain::{HashAndNumber, HeaderMetadata, TreeRoute};
-use pezsp_runtime::traits::{Block as BlockT, NumberFor, One, Saturating, UniqueSaturatedInto, Zero};
+use pezsp_runtime::traits::{
+	Block as BlockT, NumberFor, One, Saturating, UniqueSaturatedInto, Zero,
+};
 use std::{
 	collections::{HashMap, HashSet},
 	sync::Arc,
@@ -360,8 +360,9 @@ 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 = pezcumulus_primitives_core::extract_relay_parent(digest)
-				.map_or(false, is_hash_in_ancestry);
+			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 =
 				pezcumulus_primitives_core::rpsr_digest::extract_relay_parent_storage_root(digest)
 					.map(|(r, _n)| r)
@@ -20,6 +20,8 @@ use crate::*;
 use crate::teyrchain_consensus::run_teyrchain_consensus;
 use async_trait::async_trait;
 use codec::Encode;
+use futures::{channel::mpsc, executor::block_on, select, FutureExt, Stream, StreamExt};
+use futures_timer::Delay;
 use pezcumulus_client_pov_recovery::RecoveryKind;
 use pezcumulus_primitives_core::{
 	relay_chain::{BlockId, BlockNumber, CoreState},
@@ -34,8 +36,6 @@ use pezcumulus_test_client::{
 	Backend, Client, InitBlockBuilder, TestClientBuilder, TestClientBuilderExt,
 };
 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};
 use pezsc_client_api::{Backend as _, UsageProvider};
 use pezsc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
@@ -20,10 +20,10 @@ use pezsc_client_api::{
 	Backend, BlockBackend, BlockImportNotification, BlockchainEvents, Finalizer, UsageProvider,
 };
 use pezsc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
-use schnellru::{ByLength, LruMap};
 use pezsp_blockchain::Error as ClientError;
 use pezsp_consensus::{BlockOrigin, BlockStatus};
 use pezsp_runtime::traits::{Block as BlockT, Header as HeaderT};
+use schnellru::{ByLength, LruMap};

 use pezcumulus_client_pov_recovery::{RecoveryKind, RecoveryRequest};
 use pezcumulus_relay_chain_interface::RelayChainInterface;
@@ -64,7 +64,8 @@ pub trait ProposerInterface<Block: BlockT> {
 	///
 	/// Also specify any required inherent digests, the maximum proposal duration,
 	/// and the block size limit in bytes. See the documentation on
-	/// [`pezsp_consensus::Proposer::propose`] for more details on how to interpret these parameters.
+	/// [`pezsp_consensus::Proposer::propose`] for more details on how to interpret these
+	/// parameters.
 	///
 	/// The `InherentData` and `Digest` are left deliberately general in order to accommodate
 	/// all possible collator selection algorithms or inherent creation mechanisms,