FAZ 1 Complete: Workspace compile fixes, warning cleanup, version bumps

- Fixed is_using_frame_crate() macro to check for pezframe/pezkuwi_sdk - Removed disable_pezframe_system_supertrait_check temporary bypasses - Feature-gated storage-benchmark and teyrchain-benchmarks code - Fixed dead_code warnings with underscore prefix (_Header) - Removed unused imports and shadowing use statements - Version bumps: procedural-tools 10.0.1, benchmarking-cli 32.0.1, docs 0.0.2, minimal-runtime 0.0.1, yet-another-teyrchain 0.6.1, umbrella 0.1.2 - Updated MAINNET_ROADMAP.md with FAZ 1 completion status
2026-01-02 11:41:09 +03:00
parent 76ba7dbf2f
commit cf463fe8ee
520 changed files with 4113 additions and 4524 deletions
@@ -26,8 +26,8 @@ use crate::{
 	bridge_to_ethereum_config::InboundQueueV2Location, xcm_config::XcmConfig, RuntimeCall,
 	XcmRouter,
 };
-use bp_messages::LegacyLaneId;
-use bp_relayers::RewardsAccountParams;
+use pezbp_messages::LegacyLaneId;
+use pezbp_relayers::RewardsAccountParams;
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use pezframe_support::parameter_types;
 use scale_info::TypeInfo;
@@ -86,9 +86,9 @@ impl From<pezsp_runtime::AccountId32> for BridgeRewardBeneficiaries {
 	}
 }

-/// Implementation of `bp_relayers::PaymentProcedure` as a pay/claim rewards scheme.
+/// Implementation of `pezbp_relayers::PaymentProcedure` as a pay/claim rewards scheme.
 pub struct BridgeRewardPayer;
-impl bp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewardPayer {
+impl pezbp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewardPayer {
 	type Error = pezsp_runtime::DispatchError;
 	type Beneficiary = BridgeRewardBeneficiaries;

@@ -102,7 +102,7 @@ impl bp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewa
 			BridgeReward::PezkuwichainZagros(lane_params) => {
 				match beneficiary {
 					BridgeRewardBeneficiaries::LocalAccount(account) => {
-						bp_relayers::PayRewardFromAccount::<
+						pezbp_relayers::PayRewardFromAccount::<
 							Balances,
 							AccountId,
 							LegacyLaneId,
@@ -22,8 +22,8 @@ use crate::{
 	EthereumOutboundQueue, EthereumOutboundQueueV2, EthereumSystem, EthereumSystemV2, MessageQueue,
 	Runtime, RuntimeEvent, TransactionByteFee,
 };
-use bp_asset_hub_zagros::CreateForeignAssetDeposit;
-use bridge_hub_common::AggregateMessageOrigin;
+use pezbp_asset_hub_zagros::CreateForeignAssetDeposit;
+use pezbridge_hub_common::AggregateMessageOrigin;
 use hex_literal::hex;
 use pezframe_support::{parameter_types, traits::Contains, weights::ConstantMultiplier};
 use pezframe_system::EnsureRootWithSuccess;
@@ -21,12 +21,12 @@ use crate::{
 	AccountId, Balance, Balances, BridgePezkuwichainMessages, PezkuwiXcm, Runtime, RuntimeEvent,
 	RuntimeHoldReason, XcmOverBridgeHubPezkuwichain, XcmRouter, XcmpQueue,
 };
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, LegacyLaneId,
 };
-use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
-use bridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
+use pezbp_teyrchains::SingleParaStoredHeaderDataBuilder;
+use pezbridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
 use pezpallet_xcm_bridge_hub::{BridgeId, XcmAsPlainPayload};

 use pezframe_support::{
@@ -52,7 +52,7 @@ parameter_types! {
 	pub const TeyrchainHeadsToKeep: u32 = 64;

 	pub const PezkuwichainBridgeTeyrchainPalletName: &'static str = "Paras";
-	pub const MaxPezkuwichainParaHeadDataSize: u32 = bp_pezkuwichain::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
+	pub const MaxPezkuwichainParaHeadDataSize: u32 = pezbp_pezkuwichain::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;

 	pub BridgeZagrosToPezkuwichainMessagesPalletInstance: InteriorLocation = [PalletInstance(<BridgePezkuwichainMessages as PalletInfoAccess>::index() as u8)].into();
 	pub PezkuwichainGlobalConsensusNetwork: NetworkId = NetworkId::ByGenesis(PEZKUWICHAIN_GENESIS_HASH);
@@ -71,7 +71,7 @@ parameter_types! {
 		2,
 		[
 			GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()),
-			Teyrchain(<bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
+			Teyrchain(<pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
 		]
 	);

@@ -81,10 +81,10 @@ parameter_types! {

 /// Proof of messages, coming from Pezkuwichain.
 pub type FromPezkuwichainBridgeHubMessagesProof<MI> =
-	FromBridgedChainMessagesProof<bp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
+	FromBridgedChainMessagesProof<pezbp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
 /// Messages delivery proof for Pezkuwichain Bridge Hub -> Zagros Bridge Hub messages.
 pub type ToPezkuwichainBridgeHubMessagesDeliveryProof<MI> =
-	FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
+	FromBridgedChainMessagesDeliveryProof<pezbp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;

 /// Dispatches received XCM messages from other bridge
 type FromPezkuwichainMessageBlobDispatcher = BridgeBlobDispatcher<
@@ -111,7 +111,7 @@ pezbp_runtime::generate_static_str_provider!(OnBridgeHubZagrosRefundBridgeHubPez
 pub type BridgeGrandpaPezkuwichainInstance = pezpallet_bridge_grandpa::Instance1;
 impl pezpallet_bridge_grandpa::Config<BridgeGrandpaPezkuwichainInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type BridgedChain = bp_pezkuwichain::Pezkuwichain;
+	type BridgedChain = pezbp_pezkuwichain::Pezkuwichain;
 	type MaxFreeHeadersPerBlock = ConstU32<4>;
 	type FreeHeadersInterval = ConstU32<5>;
 	type HeadersToKeep = RelayChainHeadersToKeep;
@@ -126,7 +126,7 @@ impl pezpallet_bridge_teyrchains::Config<BridgeTeyrchainPezkuwichainInstance> fo
 	type BridgesGrandpaPalletInstance = BridgeGrandpaPezkuwichainInstance;
 	type ParasPalletName = PezkuwichainBridgeTeyrchainPalletName;
 	type ParaStoredHeaderDataBuilder =
-		SingleParaStoredHeaderDataBuilder<bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain>;
+		SingleParaStoredHeaderDataBuilder<pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain>;
 	type HeadsToKeep = TeyrchainHeadsToKeep;
 	type MaxParaHeadDataSize = MaxPezkuwichainParaHeadDataSize;
 	type OnNewHead = ();
@@ -138,12 +138,12 @@ impl pezpallet_bridge_messages::Config<WithBridgeHubPezkuwichainMessagesInstance
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pezpallet_bridge_messages::WeightInfo<Runtime>;

-	type ThisChain = bp_bridge_hub_zagros::BridgeHubZagros;
-	type BridgedChain = bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
+	type ThisChain = pezbp_bridge_hub_zagros::BridgeHubZagros;
+	type BridgedChain = pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
 	type BridgedHeaderChain = pezpallet_bridge_teyrchains::TeyrchainHeaders<
 		Runtime,
 		BridgeTeyrchainPezkuwichainInstance,
-		bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+		pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 	>;

 	type OutboundPayload = XcmAsPlainPayload;
@@ -194,7 +194,7 @@ impl pezpallet_xcm_bridge_hub::Config<XcmOverBridgeHubPezkuwichainInstance> for
 	type BlobDispatcher = FromPezkuwichainMessageBlobDispatcher;
 }

-/// Implementation of `bp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
+/// Implementation of `pezbp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
 pub struct CongestionManager;
 impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 	type Error = SendError;
@@ -203,7 +203,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// This is used to check the inbound bridge queue/messages to determine if they can be
 		// dispatched and sent to the sibling teyrchain. Therefore, checking outbound `XcmpQueue`
 		// is sufficient here.
-		use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
+		use pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider;
 		pezcumulus_pezpallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider::<Runtime>::is_congested(
 			with,
 		)
@@ -214,7 +214,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// so `local_origin` is expected to represent only the local AH.
 		send_xcm::<XcmpQueue>(
 			local_origin.clone(),
-			bp_asset_hub_zagros::build_congestion_message(bridge.inner(), true).into(),
+			pezbp_asset_hub_zagros::build_congestion_message(bridge.inner(), true).into(),
 		)
 		.map(|_| ())
 	}
@@ -224,7 +224,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// so `local_origin` is expected to represent only the local AH.
 		send_xcm::<XcmpQueue>(
 			local_origin.clone(),
-			bp_asset_hub_zagros::build_congestion_message(bridge.inner(), false).into(),
+			pezbp_asset_hub_zagros::build_congestion_message(bridge.inner(), false).into(),
 		)
 		.map(|_| ())
 	}
@@ -309,13 +309,13 @@ mod tests {
 	#[test]
 	fn ensure_bridge_hub_zagros_message_lane_weights_are_correct() {
 		check_message_lane_weights::<
-			bp_bridge_hub_zagros::BridgeHubZagros,
+			pezbp_bridge_hub_zagros::BridgeHubZagros,
 			Runtime,
 			WithBridgeHubPezkuwichainMessagesInstance,
 		>(
-			bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE,
-			bp_bridge_hub_zagros::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
-			bp_bridge_hub_zagros::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
+			pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE,
+			pezbp_bridge_hub_zagros::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
+			pezbp_bridge_hub_zagros::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
 			true,
 		);
 	}
@@ -325,8 +325,8 @@ mod tests {
 		assert_complete_bridge_types!(
 			runtime: Runtime,
 			with_bridged_chain_messages_instance: WithBridgeHubPezkuwichainMessagesInstance,
-			this_chain: bp_bridge_hub_zagros::BridgeHubZagros,
-			bridged_chain: bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+			this_chain: pezbp_bridge_hub_zagros::BridgeHubZagros,
+			bridged_chain: pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 			expected_payload_type: XcmAsPlainPayload,
 		);

@@ -336,8 +336,8 @@ mod tests {
 			WithBridgeHubPezkuwichainMessagesInstance,
 		>(AssertCompleteBridgeConstants {
 			this_chain_constants: AssertChainConstants {
-				block_length: bp_bridge_hub_zagros::BlockLength::get(),
-				block_weights: bp_bridge_hub_zagros::BlockWeightsForAsyncBacking::get(),
+				block_length: pezbp_bridge_hub_zagros::BlockLength::get(),
+				block_weights: pezbp_bridge_hub_zagros::BlockWeightsForAsyncBacking::get(),
 			},
 		});

@@ -350,7 +350,7 @@ mod tests {
 		pezpallet_bridge_relayers::extension::per_teyrchain_header::ensure_priority_boost_is_sane::<
 			Runtime,
 			WithBridgeHubPezkuwichainMessagesInstance,
-			bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+			pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 			PriorityBoostPerTeyrchainHeader,
 		>(FEE_BOOST_PER_TEYRCHAIN_HEADER);

@@ -363,7 +363,7 @@ mod tests {
 		assert_eq!(
 			BridgeZagrosToPezkuwichainMessagesPalletInstance::get(),
 			[PalletInstance(
-				bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX
+				pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX
 			)]
 		);
 	}
@@ -372,16 +372,16 @@ mod tests {
 /// Contains the migration for the AssetHubZagros<>AssetHubPezkuwichain bridge.
 pub mod migration {
 	use super::*;
-	use bp_messages::LegacyLaneId;
+	use pezbp_messages::LegacyLaneId;

 	parameter_types! {
 		pub AssetHubZagrosToAssetHubPezkuwichainMessagesLane: LegacyLaneId = LegacyLaneId([0, 0, 0, 2]);
-		pub AssetHubZagrosLocation: Location = Location::new(1, [Teyrchain(bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)]);
-		pub AssetHubPezkuwichainUniversalLocation: InteriorLocation = [GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()), Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)].into();
+		pub AssetHubZagrosLocation: Location = Location::new(1, [Teyrchain(pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)]);
+		pub AssetHubPezkuwichainUniversalLocation: InteriorLocation = [GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()), Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)].into();
 	}

 	mod v1_wrong {
-		use bp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
+		use pezbp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
 		use codec::{Decode, Encode};
 		use pezbp_runtime::AccountIdOf;
 		use pezpallet_bridge_messages::BridgedChainOf;
@@ -407,7 +407,7 @@ pub mod migration {
 	}

 	mod v1 {
-		pub use bp_messages::{InboundLaneData, LaneState, OutboundLaneData};
+		pub use pezbp_messages::{InboundLaneData, LaneState, OutboundLaneData};
 		pub use pezpallet_bridge_messages::{InboundLanes, OutboundLanes, StoredInboundLaneData};
 	}

@@ -33,7 +33,7 @@ fn bridge_hub_zagros_genesis(
 	id: ParaId,
 	bridges_pallet_owner: Option<AccountId>,
 	asset_hub_para_id: ParaId,
-	opened_bridges: Vec<(Location, InteriorLocation, Option<bp_messages::LegacyLaneId>)>,
+	opened_bridges: Vec<(Location, InteriorLocation, Option<pezbp_messages::LegacyLaneId>)>,
 ) -> serde_json::Value {
 	build_struct_json_patch!(RuntimeGenesisConfig {
 		balances: BalancesConfig {
@@ -91,7 +91,7 @@ pub fn get_preset(id: &pezsp_genesis_builder::PresetId) -> Option<pezsp_std::vec
 					NetworkId::ByGenesis(PEZKUWICHAIN_GENESIS_HASH).into(),
 					Teyrchain(1000),
 				]),
-				Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
+				Some(pezbp_messages::LegacyLaneId([0, 0, 0, 2])),
 			)],
 		),
 		pezsp_genesis_builder::DEV_RUNTIME_PRESET => bridge_hub_zagros_genesis(
@@ -54,7 +54,7 @@ use pezsp_runtime::{
 use pezsp_version::NativeVersion;
 use pezsp_version::RuntimeVersion;

-use bridge_hub_common::{
+use pezbridge_hub_common::{
 	message_queue::{NarrowOriginToSibling, ParaIdToSibling},
 	AggregateMessageOrigin,
 };
@@ -165,12 +165,12 @@ pub type Migrations = (
 	pezpallet_bridge_relayers::migration::v1::MigrationToV1<
 		Runtime,
 		bridge_common_config::BridgeRelayersInstance,
-		bp_messages::LegacyLaneId,
+		pezbp_messages::LegacyLaneId,
 	>,
 	pezpallet_bridge_relayers::migration::v2::MigrationToV2<
 		Runtime,
 		bridge_common_config::BridgeRelayersInstance,
-		bp_messages::LegacyLaneId,
+		pezbp_messages::LegacyLaneId,
 	>,
 	pezsnowbridge_pezpallet_system::migration::v0::InitializeOnUpgrade<
 		Runtime,
@@ -416,7 +416,7 @@ impl pezpallet_message_queue::Config for Runtime {
 	type MessageProcessor =
 		pezpallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
 	#[cfg(any(feature = "std", not(feature = "runtime-benchmarks")))]
-	type MessageProcessor = bridge_hub_common::BridgeHubDualMessageRouter<
+	type MessageProcessor = pezbridge_hub_common::BridgeHubDualMessageRouter<
 		xcm_builder::ProcessXcmMessage<
 			AggregateMessageOrigin,
 			xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
@@ -619,7 +619,7 @@ pezbridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages!
 	CheckAndBoostBridgeTeyrchainsTransactions<
 		Runtime,
 		bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance,
-		bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+		pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 		bridge_to_pezkuwichain_config::PriorityBoostPerTeyrchainHeader,
 		xcm_config::TreasuryAccount,
 	>,
@@ -892,38 +892,38 @@ impl_runtime_apis! {
 		}
 	}

-	impl bp_pezkuwichain::PezkuwichainFinalityApi<Block> for Runtime {
-		fn best_finalized() -> Option<HeaderId<bp_pezkuwichain::Hash, bp_pezkuwichain::BlockNumber>> {
+	impl pezbp_pezkuwichain::PezkuwichainFinalityApi<Block> for Runtime {
+		fn best_finalized() -> Option<HeaderId<pezbp_pezkuwichain::Hash, pezbp_pezkuwichain::BlockNumber>> {
 			BridgePezkuwichainGrandpa::best_finalized()
 		}
-		fn free_headers_interval() -> Option<bp_pezkuwichain::BlockNumber> {
+		fn free_headers_interval() -> Option<pezbp_pezkuwichain::BlockNumber> {
 			<Runtime as pezpallet_bridge_grandpa::Config<
 				bridge_to_pezkuwichain_config::BridgeGrandpaPezkuwichainInstance
 			>>::FreeHeadersInterval::get()
 		}
 		fn synced_headers_grandpa_info(
-		) -> Vec<bp_header_pez_chain::StoredHeaderGrandpaInfo<bp_pezkuwichain::Header>> {
+		) -> Vec<pezbp_header_pez_chain::StoredHeaderGrandpaInfo<pezbp_pezkuwichain::Header>> {
 			BridgePezkuwichainGrandpa::synced_headers_grandpa_info()
 		}
 	}

-	impl bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainFinalityApi<Block> for Runtime {
+	impl pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<HeaderId<Hash, BlockNumber>> {
 			BridgePezkuwichainTeyrchains::best_teyrchain_head_id::<
-				bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain
+				pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain
 			>().unwrap_or(None)
 		}
-		fn free_headers_interval() -> Option<bp_bridge_hub_pezkuwichain::BlockNumber> {
+		fn free_headers_interval() -> Option<pezbp_bridge_hub_pezkuwichain::BlockNumber> {
 			// "free interval" is not currently used for teyrchains
 			None
 		}
 	}

-	impl bp_bridge_hub_pezkuwichain::FromBridgeHubPezkuwichainInboundLaneApi<Block> for Runtime {
+	impl pezbp_bridge_hub_pezkuwichain::FromBridgeHubPezkuwichainInboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: LaneIdOf<Runtime, bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>,
-			messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
-		) -> Vec<bp_messages::InboundMessageDetails> {
+			messages: Vec<(pezbp_messages::MessagePayload, pezbp_messages::OutboundMessageDetails)>,
+		) -> Vec<pezbp_messages::InboundMessageDetails> {
 			pezbridge_runtime_common::messages_api::inbound_message_details::<
 				Runtime,
 				bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
@@ -931,12 +931,12 @@ impl_runtime_apis! {
 		}
 	}

-	impl bp_bridge_hub_pezkuwichain::ToBridgeHubPezkuwichainOutboundLaneApi<Block> for Runtime {
+	impl pezbp_bridge_hub_pezkuwichain::ToBridgeHubPezkuwichainOutboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: LaneIdOf<Runtime, bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>,
-			begin: bp_messages::MessageNonce,
-			end: bp_messages::MessageNonce,
-		) -> Vec<bp_messages::OutboundMessageDetails> {
+			begin: pezbp_messages::MessageNonce,
+			end: pezbp_messages::MessageNonce,
+		) -> Vec<pezbp_messages::OutboundMessageDetails> {
 			pezbridge_runtime_common::messages_api::outbound_message_details::<
 				Runtime,
 				bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
@@ -1240,7 +1240,7 @@ impl_runtime_apis! {
 					)?;
 					XcmOverBridgeHubPezkuwichain::do_open_bridge(
 						locations,
-						bp_messages::LegacyLaneId([1, 2, 3, 4]),
+						pezbp_messages::LegacyLaneId([1, 2, 3, 4]),
 						true,
 					).map_err(|e| {
 						tracing::error!(
@@ -1297,10 +1297,10 @@ impl_runtime_apis! {
 					pezpallet_bridge_relayers::Pezpallet::<Runtime, bridge_common_config::BridgeRelayersInstance>::relayer_reward(
 						relayer,
 						bridge_common_config::BridgeReward::PezkuwichainZagros(
-							bp_relayers::RewardsAccountParams::new(
+							pezbp_relayers::RewardsAccountParams::new(
 								bench_lane_id,
 								bridged_chain_id,
-								bp_relayers::RewardsAccountOwner::BridgedChain
+								pezbp_relayers::RewardsAccountOwner::BridgedChain
 							)
 						)
 					).is_some()
@@ -1339,7 +1339,7 @@ impl_runtime_apis! {
 					>(params)
 				}

-				fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
+				fn is_message_successfully_dispatched(_nonce: pezbp_messages::MessageNonce) -> bool {
 					use pezcumulus_primitives_core::XcmpMessageSource;
 					!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
 				}
@@ -1353,20 +1353,20 @@ impl_runtime_apis! {
 			};

 			impl BridgeTeyrchainsConfig<bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance> for Runtime {
-				fn teyrchains() -> Vec<bp_pezkuwi_core::teyrchains::ParaId> {
+				fn teyrchains() -> Vec<pezbp_pezkuwi_core::teyrchains::ParaId> {
 					use pezbp_runtime::Teyrchain;
-					vec![bp_pezkuwi_core::teyrchains::ParaId(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain::TEYRCHAIN_ID)]
+					vec![pezbp_pezkuwi_core::teyrchains::ParaId(pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain::TEYRCHAIN_ID)]
 				}

 				fn prepare_teyrchain_heads_proof(
-					teyrchains: &[bp_pezkuwi_core::teyrchains::ParaId],
+					teyrchains: &[pezbp_pezkuwi_core::teyrchains::ParaId],
 					teyrchain_head_size: u32,
 					proof_params: pezbp_runtime::UnverifiedStorageProofParams,
 				) -> (
-					bp_teyrchains::RelayBlockNumber,
-					bp_teyrchains::RelayBlockHash,
-					bp_pezkuwi_core::teyrchains::ParaHeadsProof,
-					Vec<(bp_pezkuwi_core::teyrchains::ParaId, bp_pezkuwi_core::teyrchains::ParaHash)>,
+					pezbp_teyrchains::RelayBlockNumber,
+					pezbp_teyrchains::RelayBlockHash,
+					pezbp_pezkuwi_core::teyrchains::ParaHeadsProof,
+					Vec<(pezbp_pezkuwi_core::teyrchains::ParaId, pezbp_pezkuwi_core::teyrchains::ParaHash)>,
 				) {
 					prepare_teyrchain_heads_proof::<Runtime, bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance>(
 						teyrchains,
@@ -1378,10 +1378,10 @@ impl_runtime_apis! {

 			impl BridgeRelayersConfig<bridge_common_config::BridgeRelayersInstance> for Runtime {
 				fn bench_reward() -> Self::Reward {
-					bp_relayers::RewardsAccountParams::new(
-						bp_messages::LegacyLaneId::default(),
+					pezbp_relayers::RewardsAccountParams::new(
+						pezbp_messages::LegacyLaneId::default(),
 						*b"test",
-						bp_relayers::RewardsAccountOwner::ThisChain
+						pezbp_relayers::RewardsAccountOwner::ThisChain
 					).into()
 				}

@@ -1392,10 +1392,10 @@ impl_runtime_apis! {
 					let bridge_common_config::BridgeReward::PezkuwichainZagros(reward_kind) = reward_kind else {
 						panic!("Unexpected reward_kind: {:?} - not compatible with `bench_reward`!", reward_kind);
 					};
-					let rewards_account = bp_relayers::PayRewardFromAccount::<
+					let rewards_account = pezbp_relayers::PayRewardFromAccount::<
 						Balances,
 						AccountId,
-						bp_messages::LegacyLaneId,
+						pezbp_messages::LegacyLaneId,
 						u128,
 					>::rewards_account(reward_kind);
 					Self::deposit_account(rewards_account, reward);
@@ -1463,7 +1463,7 @@ mod tests {

 	#[test]
 	fn ensure_transaction_extension_definition_is_compatible_with_relay() {
-		use bp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
+		use pezbp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;

 		pezsp_io::TestExternalities::default().execute_with(|| {
 			pezframe_system::BlockHash::<Runtime>::insert(BlockNumber::zero(), Hash::default());
@@ -1487,7 +1487,7 @@ mod tests {
 			).into();

 			{
-				let bh_indirect_payload = bp_bridge_hub_zagros::TransactionExtension::from_params(
+				let bh_indirect_payload = pezbp_bridge_hub_zagros::TransactionExtension::from_params(
 					VERSION.spec_version,
 					VERSION.transaction_version,
 					pezbp_runtime::TransactionEra::Immortal,
@@ -76,7 +76,7 @@ impl GrandpaWeightInfoExt for pezpallet_bridge_grandpa::WeightInfo<crate::Runtim

 impl MessagesWeightInfoExt for pezpallet_bridge_messages::WeightInfo<crate::Runtime> {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
+		pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
 	}

 	fn receive_messages_proof_overhead_from_runtime() -> Weight {
@@ -91,7 +91,7 @@ impl MessagesWeightInfoExt for pezpallet_bridge_messages::WeightInfo<crate::Runt

 impl TeyrchainsWeightInfoExt for pezpallet_bridge_teyrchains::WeightInfo<crate::Runtime> {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
+		pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
 	}

 	fn submit_teyrchain_heads_overhead_from_runtime() -> Weight {
@@ -20,7 +20,7 @@ use super::{
 	TeyrchainSystem, TransactionByteFee, WeightToFee, XcmOverBridgeHubPezkuwichain, XcmpQueue,
 };
 use crate::bridge_to_ethereum_config::SnowbridgeFrontendLocation;
-use bridge_hub_common::DenyExportMessageFrom;
+use pezbridge_hub_common::DenyExportMessageFrom;
 use pezframe_support::{
 	parameter_types,
 	traits::{