Refactoring Checkpoint: (WIP)

2025-12-14 10:29:31 +03:00
parent 09735eb97a
commit c89d7cac55
1424 changed files with 6415 additions and 6064 deletions
@@ -73,7 +73,7 @@ pezkuwi-teyrchain-primitives = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-xcm-runtime-apis = { workspace = true }
+xcm-runtime-pezapis = { workspace = true }
 zagros-runtime-constants = { workspace = true }

 # Pezcumulus
@@ -168,7 +168,7 @@ runtime-benchmarks = [
  "teyrchains-runtimes-test-utils/runtime-benchmarks",
  "xcm-builder/runtime-benchmarks",
  "xcm-executor/runtime-benchmarks",
-  "xcm-runtime-apis/runtime-benchmarks",
+  "xcm-runtime-pezapis/runtime-benchmarks",
  "xcm/runtime-benchmarks",
  "zagros-runtime-constants/runtime-benchmarks",
 ]
@@ -282,7 +282,7 @@ std = [
  "tracing/std",
  "xcm-builder/std",
  "xcm-executor/std",
-  "xcm-runtime-apis/std",
+  "xcm-runtime-pezapis/std",
  "xcm/std",
  "zagros-runtime-constants/std",
 ]
@@ -53,7 +53,7 @@ pub use ambassador::pezpallet_ambassador_origins;

 use alloc::{vec, vec::Vec};
 use ambassador::AmbassadorCoreInstance;
-use pezcumulus_pallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
+use pezcumulus_pezpallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
 use fellowship::{pezpallet_fellowship_origins, Fellows, FellowshipCoreInstance};
 use impls::{AllianceProposalProvider, EqualOrGreatestRootCmp};
 use pezsp_api::impl_runtime_apis;
@@ -112,7 +112,7 @@ use pezkuwi_runtime_common::{
 	impls::VersionedLocatableAsset, BlockHashCount, SlowAdjustingFeeUpdate,
 };
 use xcm::{prelude::*, Version as XcmVersion};
-use xcm_runtime_apis::{
+use xcm_runtime_pezapis::{
 	dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
 	fees::Error as XcmPaymentApiError,
 };
@@ -191,13 +191,13 @@ impl pezframe_system::Config for Runtime {
 	type SystemWeightInfo = weights::pezframe_system::WeightInfo<Runtime>;
 	type ExtensionsWeightInfo = weights::pezframe_system_extensions::WeightInfo<Runtime>;
 	type SS58Prefix = SS58Prefix;
-	type OnSetCode = pezcumulus_pallet_teyrchain_system::TeyrchainSetCode<Self>;
+	type OnSetCode = pezcumulus_pezpallet_teyrchain_system::TeyrchainSetCode<Self>;
 	type MaxConsumers = pezframe_support::traits::ConstU32<16>;
 	type SingleBlockMigrations = Migrations;
 }

-impl pezcumulus_pallet_weight_reclaim::Config for Runtime {
-	type WeightInfo = weights::pezcumulus_pallet_weight_reclaim::WeightInfo<Runtime>;
+impl pezcumulus_pezpallet_weight_reclaim::Config for Runtime {
+	type WeightInfo = weights::pezcumulus_pezpallet_weight_reclaim::WeightInfo<Runtime>;
 }

 impl pezpallet_timestamp::Config for Runtime {
@@ -410,8 +410,8 @@ parameter_types! {
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 }

-impl pezcumulus_pallet_teyrchain_system::Config for Runtime {
-	type WeightInfo = weights::pezcumulus_pallet_teyrchain_system::WeightInfo<Runtime>;
+impl pezcumulus_pezpallet_teyrchain_system::Config for Runtime {
+	type WeightInfo = weights::pezcumulus_pezpallet_teyrchain_system::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = teyrchain_info::Pallet<Runtime>;
@@ -425,7 +425,7 @@ impl pezcumulus_pallet_teyrchain_system::Config for Runtime {
 	type RelayParentOffset = ConstU32<0>;
 }

-type ConsensusHook = pezcumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+type ConsensusHook = pezcumulus_pezpallet_aura_ext::FixedVelocityConsensusHook<
 	Runtime,
 	RELAY_CHAIN_SLOT_DURATION_MILLIS,
 	BLOCK_PROCESSING_VELOCITY,
@@ -461,7 +461,7 @@ impl pezpallet_message_queue::Config for Runtime {
 	type IdleMaxServiceWeight = MessageQueueServiceWeight;
 }

-impl pezcumulus_pallet_aura_ext::Config for Runtime {}
+impl pezcumulus_pezpallet_aura_ext::Config for Runtime {}

 parameter_types! {
 	/// The asset ID for the asset that we use to pay for message delivery fees.
@@ -477,7 +477,7 @@ pub type PriceForSiblingTeyrchainDelivery = pezkuwi_runtime_common::xcm_sender::
 	XcmpQueue,
 >;

-impl pezcumulus_pallet_xcmp_queue::Config for Runtime {
+impl pezcumulus_pezpallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ChannelInfo = TeyrchainSystem;
 	type VersionWrapper = PezkuwiXcm;
@@ -490,11 +490,11 @@ impl pezcumulus_pallet_xcmp_queue::Config for Runtime {
 	type MaxPageSize = ConstU32<{ 103 * 1024 }>;
 	type ControllerOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Fellows>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
-	type WeightInfo = weights::pezcumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
+	type WeightInfo = weights::pezcumulus_pezpallet_xcmp_queue::WeightInfo<Runtime>;
 	type PriceForSiblingDelivery = PriceForSiblingTeyrchainDelivery;
 }

-impl pezcumulus_pallet_xcmp_queue::migration::v5::V5Config for Runtime {
+impl pezcumulus_pezpallet_xcmp_queue::migration::v5::V5Config for Runtime {
 	// This must be the same as the `ChannelInfo` from the `Config`:
 	type ChannelList = TeyrchainSystem;
 }
@@ -689,10 +689,10 @@ construct_runtime!(
 	{
 		// System support stuff.
 		System: pezframe_system = 0,
-		TeyrchainSystem: pezcumulus_pallet_teyrchain_system = 1,
+		TeyrchainSystem: pezcumulus_pezpallet_teyrchain_system = 1,
 		Timestamp: pezpallet_timestamp = 2,
 		TeyrchainInfo: teyrchain_info = 3,
-		WeightReclaim: pezcumulus_pallet_weight_reclaim = 4,
+		WeightReclaim: pezcumulus_pezpallet_weight_reclaim = 4,

 		// Monetary stuff.
 		Balances: pezpallet_balances = 10,
@@ -703,12 +703,12 @@ construct_runtime!(
 		CollatorSelection: pezpallet_collator_selection = 21,
 		Session: pezpallet_session = 22,
 		Aura: pezpallet_aura = 23,
-		AuraExt: pezcumulus_pallet_aura_ext = 24,
+		AuraExt: pezcumulus_pezpallet_aura_ext = 24,

 		// XCM helpers.
-		XcmpQueue: pezcumulus_pallet_xcmp_queue = 30,
+		XcmpQueue: pezcumulus_pezpallet_xcmp_queue = 30,
 		PezkuwiXcm: pezpallet_xcm = 31,
-		CumulusXcm: pezcumulus_pallet_xcm = 32,
+		CumulusXcm: pezcumulus_pezpallet_xcm = 32,
 		MessageQueue: pezpallet_message_queue = 34,

 		// Handy utilities.
@@ -765,7 +765,7 @@ pub type SignedBlock = generic::SignedBlock<Block>;
 /// BlockId type as expected by this runtime.
 pub type BlockId = generic::BlockId<Block>;
 /// The extension to the basic transaction logic.
-pub type TxExtension = pezcumulus_pallet_weight_reclaim::StorageWeightReclaim<
+pub type TxExtension = pezcumulus_pezpallet_weight_reclaim::StorageWeightReclaim<
 	Runtime,
 	(
 		pezframe_system::AuthorizeCall<Runtime>,
@@ -789,15 +789,15 @@ type Migrations = (
 	// unreleased
 	pezpallet_collator_selection::migration::v2::MigrationToV2<Runtime>,
 	// unreleased
-	pezcumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
-	pezcumulus_pallet_xcmp_queue::migration::v5::MigrateV4ToV5<Runtime>,
+	pezcumulus_pezpallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	pezcumulus_pezpallet_xcmp_queue::migration::v5::MigrateV4ToV5<Runtime>,
 	// permanent
 	pezpallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 	// unreleased
 	pezpallet_core_fellowship::migration::MigrateV0ToV1<Runtime, FellowshipCoreInstance>,
 	// unreleased
 	pezpallet_core_fellowship::migration::MigrateV0ToV1<Runtime, AmbassadorCoreInstance>,
-	pezcumulus_pallet_aura_ext::migration::MigrateV0ToV1<Runtime>,
+	pezcumulus_pezpallet_aura_ext::migration::MigrateV0ToV1<Runtime>,
 	pezpallet_session::migrations::v1::MigrateV0ToV1<
 		Runtime,
 		pezpallet_session::migrations::v1::InitOffenceSeverity<Runtime>,
@@ -827,8 +827,8 @@ mod benches {
 		[pezpallet_timestamp, Timestamp]
 		[pezpallet_transaction_payment, TransactionPayment]
 		[pezpallet_collator_selection, CollatorSelection]
-		[pezcumulus_pallet_teyrchain_system, TeyrchainSystem]
-		[pezcumulus_pallet_xcmp_queue, XcmpQueue]
+		[pezcumulus_pezpallet_teyrchain_system, TeyrchainSystem]
+		[pezcumulus_pezpallet_xcmp_queue, XcmpQueue]
 		[pezpallet_alliance, Alliance]
 		[pezpallet_collective, AllianceMotion]
 		[pezpallet_preimage, Preimage]
@@ -846,7 +846,7 @@ mod benches {
 		[pezpallet_ranked_collective, SecretaryCollective]
 		[pezpallet_salary, SecretarySalary]
 		[pezpallet_asset_rate, AssetRate]
-		[pezcumulus_pallet_weight_reclaim, WeightReclaim]
+		[pezcumulus_pezpallet_weight_reclaim, WeightReclaim]
 		// XCM
 		[pezpallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		// NOTE: Make sure you point to the individual modules below.
@@ -1008,7 +1008,7 @@ impl_runtime_apis! {
 		}
 	}

-	impl xcm_runtime_apis::fees::XcmPaymentApi<Block> for Runtime {
+	impl xcm_runtime_pezapis::fees::XcmPaymentApi<Block> for Runtime {
 		fn query_acceptable_payment_assets(xcm_version: xcm::Version) -> Result<Vec<VersionedAssetId>, XcmPaymentApiError> {
 			let acceptable_assets = vec![AssetId(xcm_config::WndLocation::get())];
 			PezkuwiXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
@@ -1029,7 +1029,7 @@ impl_runtime_apis! {
 		}
 	}

-	impl xcm_runtime_apis::dry_run::DryRunApi<Block, RuntimeCall, RuntimeEvent, OriginCaller> for Runtime {
+	impl xcm_runtime_pezapis::dry_run::DryRunApi<Block, RuntimeCall, RuntimeEvent, OriginCaller> for Runtime {
 		fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result<CallDryRunEffects<RuntimeEvent>, XcmDryRunApiError> {
 			PezkuwiXcm::dry_run_call::<Runtime, xcm_config::XcmRouter, OriginCaller, RuntimeCall>(origin, call, result_xcms_version)
 		}
@@ -1039,37 +1039,37 @@ impl_runtime_apis! {
 		}
 	}

-	impl xcm_runtime_apis::conversions::LocationToAccountApi<Block, AccountId> for Runtime {
+	impl xcm_runtime_pezapis::conversions::LocationToAccountApi<Block, AccountId> for Runtime {
 		fn convert_location(location: VersionedLocation) -> Result<
 			AccountId,
-			xcm_runtime_apis::conversions::Error
+			xcm_runtime_pezapis::conversions::Error
 		> {
-			xcm_runtime_apis::conversions::LocationToAccountHelper::<
+			xcm_runtime_pezapis::conversions::LocationToAccountHelper::<
 				AccountId,
 				LocationToAccountId,
 			>::convert_location(location)
 		}
 	}

-	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
+	impl xcm_runtime_pezapis::trusted_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_pezapis::trusted_query::XcmTrustedQueryResult {
 			PezkuwiXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_pezapis::trusted_query::XcmTrustedQueryResult {
 			PezkuwiXcm::is_trusted_teleporter(asset, location)
 		}
 	}

-	impl xcm_runtime_apis::authorized_aliases::AuthorizedAliasersApi<Block> for Runtime {
+	impl xcm_runtime_pezapis::authorized_aliases::AuthorizedAliasersApi<Block> for Runtime {
 		fn authorized_aliasers(target: VersionedLocation) -> Result<
-			Vec<xcm_runtime_apis::authorized_aliases::OriginAliaser>,
-			xcm_runtime_apis::authorized_aliases::Error
+			Vec<xcm_runtime_pezapis::authorized_aliases::OriginAliaser>,
+			xcm_runtime_pezapis::authorized_aliases::Error
 		> {
 			PezkuwiXcm::authorized_aliasers(target)
 		}
 		fn is_authorized_alias(origin: VersionedLocation, target: VersionedLocation) -> Result<
 			bool,
-			xcm_runtime_apis::authorized_aliases::Error
+			xcm_runtime_pezapis::authorized_aliases::Error
 		> {
 			PezkuwiXcm::is_authorized_alias(origin, target)
 		}
@@ -1110,7 +1110,7 @@ impl_runtime_apis! {
 			use pezframe_support::traits::StorageInfoTrait;
 			use pezframe_system_benchmarking::Pallet as SystemBench;
 			use pezframe_system_benchmarking::extensions::Pallet as SystemExtensionsBench;
-			use pezcumulus_pallet_session_benchmarking::Pallet as SessionBench;
+			use pezcumulus_pezpallet_session_benchmarking::Pallet as SessionBench;
 			use pezpallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;

 			// This is defined once again in dispatch_benchmark, because list_benchmarks!
@@ -1142,12 +1142,12 @@ impl_runtime_apis! {
 				}

 				fn verify_set_code() {
-					System::assert_last_event(pezcumulus_pallet_teyrchain_system::Event::<Runtime>::ValidationFunctionStored.into());
+					System::assert_last_event(pezcumulus_pezpallet_teyrchain_system::Event::<Runtime>::ValidationFunctionStored.into());
 				}
 			}

-			use pezcumulus_pallet_session_benchmarking::Pallet as SessionBench;
-			impl pezcumulus_pallet_session_benchmarking::Config for Runtime {}
+			use pezcumulus_pezpallet_session_benchmarking::Pallet as SessionBench;
+			impl pezcumulus_pezpallet_session_benchmarking::Config for Runtime {}
 			use xcm_config::WndLocation;
 			use testnet_teyrchains_constants::zagros::locations::{AssetHubParaId, AssetHubLocation};

@@ -1354,9 +1354,9 @@ impl_runtime_apis! {
 	}
 }

-pezcumulus_pallet_teyrchain_system::register_validate_block! {
+pezcumulus_pezpallet_teyrchain_system::register_validate_block! {
 	Runtime = Runtime,
-	BlockExecutor = pezcumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	BlockExecutor = pezcumulus_pezpallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 }

 parameter_types! {
@@ -14,9 +14,9 @@
 // limitations under the License.

 pub mod block_weights;
-pub mod pezcumulus_pallet_teyrchain_system;
-pub mod pezcumulus_pallet_weight_reclaim;
-pub mod pezcumulus_pallet_xcmp_queue;
+pub mod pezcumulus_pezpallet_teyrchain_system;
+pub mod pezcumulus_pezpallet_weight_reclaim;
+pub mod pezcumulus_pezpallet_xcmp_queue;
 pub mod extrinsic_weights;
 pub mod pezframe_system;
 pub mod pezframe_system_extensions;
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `pezcumulus_pallet_teyrchain_system`
+//! Autogenerated weights for `pezcumulus_pezpallet_teyrchain_system`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -28,7 +28,7 @@
 // pallet
 // --extrinsic=*
 // --runtime=target/production/wbuild/collectives-zagros-runtime/collectives_zagros_runtime.wasm
-// --pallet=pezcumulus_pallet_teyrchain_system
+// --pallet=pezcumulus_pezpallet_teyrchain_system
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/collectives/collectives-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `pezcumulus_pallet_teyrchain_system`.
+/// Weight functions for `pezcumulus_pezpallet_teyrchain_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> pezcumulus_pallet_teyrchain_system::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> pezcumulus_pezpallet_teyrchain_system::WeightInfo for WeightInfo<T> {
 	/// Storage: `TeyrchainSystem::LastDmqMqcHead` (r:1 w:1)
 	/// Proof: `TeyrchainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `pezcumulus_pallet_weight_reclaim`
+//! Autogenerated weights for `pezcumulus_pezpallet_weight_reclaim`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -28,7 +28,7 @@
 // pallet
 // --extrinsic=*
 // --runtime=target/production/wbuild/collectives-zagros-runtime/collectives_zagros_runtime.wasm
-// --pallet=pezcumulus_pallet_weight_reclaim
+// --pallet=pezcumulus_pezpallet_weight_reclaim
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/collectives/collectives-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `pezcumulus_pallet_weight_reclaim`.
+/// Weight functions for `pezcumulus_pezpallet_weight_reclaim`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> pezcumulus_pallet_weight_reclaim::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> pezcumulus_pezpallet_weight_reclaim::WeightInfo for WeightInfo<T> {
 	fn storage_weight_reclaim() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `pezcumulus_pallet_xcmp_queue`
+//! Autogenerated weights for `pezcumulus_pezpallet_xcmp_queue`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-09-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -28,7 +28,7 @@
 // pallet
 // --extrinsic=*
 // --runtime=target/production/wbuild/collectives-zagros-runtime/collectives_zagros_runtime.wasm
-// --pallet=pezcumulus_pallet_xcmp_queue
+// --pallet=pezcumulus_pezpallet_xcmp_queue
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/collectives/collectives-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `pezcumulus_pallet_xcmp_queue`.
+/// Weight functions for `pezcumulus_pezpallet_xcmp_queue`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> pezcumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> pezcumulus_pezpallet_xcmp_queue::WeightInfo for WeightInfo<T> {
 	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
 	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: Some(12), added: 507, mode: `MaxEncodedLen`)
 	fn set_config_with_u32() -> Weight {
@@ -59,7 +59,7 @@ parameter_types! {
 	pub const RootLocation: Location = Location::here();
 	pub const WndLocation: Location = Location::parent();
 	pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::ByGenesis(ZAGROS_GENESIS_HASH));
-	pub RelayChainOrigin: RuntimeOrigin = pezcumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = pezcumulus_pezpallet_xcm::Origin::Relay.into();
 	pub UniversalLocation: InteriorLocation =
 		[GlobalConsensus(RelayNetwork::get().unwrap()), Teyrchain(TeyrchainInfo::teyrchain_id().into())].into();
 	pub RelayTreasuryLocation: Location = (Parent, PalletInstance(zagros_runtime_constants::TREASURY_PALLET_ID)).into();
@@ -121,7 +121,7 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Teyrchains; will convert to a `SiblingPara` origin when
 	// recognised.
-	SiblingTeyrchainAsNative<pezcumulus_pallet_xcm::Origin, RuntimeOrigin>,
+	SiblingTeyrchainAsNative<pezcumulus_pezpallet_xcm::Origin, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
 	ParentAsSuperuser<RuntimeOrigin>,
@@ -329,7 +329,7 @@ impl pezpallet_xcm::Config for Runtime {
 	>;
 }

-impl pezcumulus_pallet_xcm::Config for Runtime {
+impl pezcumulus_pezpallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }
@@ -27,7 +27,7 @@ use testnet_teyrchains_constants::zagros::fee::WeightToFee;
 use teyrchains_common::AccountId;
 use teyrchains_runtimes_test_utils::GovernanceOrigin;
 use xcm::latest::prelude::*;
-use xcm_runtime_apis::conversions::LocationToAccountHelper;
+use xcm_runtime_pezapis::conversions::LocationToAccountHelper;

 const ALICE: [u8; 32] = [1u8; 32];