Refactoring Checkpoint: (WIP)
This commit is contained in:
@@ -44,7 +44,7 @@ use assets_common::{
|
||||
AssetIdForPoolAssets, AssetIdForPoolAssetsConvert, AssetIdForTrustBackedAssetsConvert,
|
||||
};
|
||||
use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
|
||||
use pezcumulus_pallet_teyrchain_system::{RelayNumberMonotonicallyIncreases, RelaychainDataProvider};
|
||||
use pezcumulus_pezpallet_teyrchain_system::{RelayNumberMonotonicallyIncreases, RelaychainDataProvider};
|
||||
use pezcumulus_primitives_core::{AggregateMessageOrigin, ParaId};
|
||||
use pezframe_support::{
|
||||
construct_runtime, derive_impl,
|
||||
@@ -113,7 +113,7 @@ use xcm::latest::prelude::{
|
||||
NetworkId, NonFungible, Parent, ParentThen, Response, XCM_VERSION,
|
||||
};
|
||||
|
||||
use xcm_runtime_apis::{
|
||||
use xcm_runtime_pezapis::{
|
||||
dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
|
||||
fees::Error as XcmPaymentApiError,
|
||||
};
|
||||
@@ -185,14 +185,14 @@ 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 MultiBlockMigrator = MultiBlockMigrations;
|
||||
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 {
|
||||
@@ -801,8 +801,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>;
|
||||
@@ -816,7 +816,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,
|
||||
@@ -855,7 +855,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.
|
||||
@@ -871,7 +871,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;
|
||||
@@ -884,11 +884,11 @@ impl pezcumulus_pallet_xcmp_queue::Config for Runtime {
|
||||
type MaxPageSize = ConstU32<{ 103 * 1024 }>;
|
||||
type ControllerOrigin = EnsureRoot<AccountId>;
|
||||
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;
|
||||
}
|
||||
@@ -1083,7 +1083,7 @@ impl pezpallet_xcm_bridge_hub_router::Config<ToPezkuwichainXcmRouterInstance> fo
|
||||
>;
|
||||
type ToBridgeHubSender = XcmpQueue;
|
||||
type LocalXcmChannelManager =
|
||||
pezcumulus_pallet_xcmp_queue::bridging::InAndOutXcmpChannelStatusProvider<Runtime>;
|
||||
pezcumulus_pezpallet_xcmp_queue::bridging::InAndOutXcmpChannelStatusProvider<Runtime>;
|
||||
|
||||
type ByteFee = xcm_config::bridging::XcmBridgeHubRouterByteFee;
|
||||
type FeeAsset = xcm_config::bridging::XcmBridgeHubRouterFeeAssetId;
|
||||
@@ -1122,11 +1122,11 @@ construct_runtime!(
|
||||
{
|
||||
// System support stuff.
|
||||
System: pezframe_system = 0,
|
||||
TeyrchainSystem: pezcumulus_pallet_teyrchain_system = 1,
|
||||
TeyrchainSystem: pezcumulus_pezpallet_teyrchain_system = 1,
|
||||
// RandomnessCollectiveFlip = 2 removed
|
||||
Timestamp: pezpallet_timestamp = 3,
|
||||
TeyrchainInfo: teyrchain_info = 4,
|
||||
WeightReclaim: pezcumulus_pallet_weight_reclaim = 5,
|
||||
WeightReclaim: pezcumulus_pezpallet_weight_reclaim = 5,
|
||||
MultiBlockMigrations: pezpallet_migrations = 6,
|
||||
|
||||
// Monetary stuff.
|
||||
@@ -1140,12 +1140,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,
|
||||
// Bridge utilities.
|
||||
ToPezkuwichainXcmRouter: pezpallet_xcm_bridge_hub_router::<Instance1> = 34,
|
||||
MessageQueue: pezpallet_message_queue = 35,
|
||||
@@ -1218,7 +1218,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::CheckNonZeroSender<Runtime>,
|
||||
@@ -1356,8 +1356,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_treasury, Treasury]
|
||||
[pezpallet_vesting, Vesting]
|
||||
[pezpallet_whitelist, Whitelist]
|
||||
@@ -1368,7 +1368,7 @@ mod benches {
|
||||
// NOTE: Make sure you point to the individual modules below.
|
||||
[pezpallet_xcm_benchmarks::fungible, XcmBalances]
|
||||
[pezpallet_xcm_benchmarks::generic, XcmGeneric]
|
||||
[pezcumulus_pallet_weight_reclaim, WeightReclaim]
|
||||
[pezcumulus_pezpallet_weight_reclaim, WeightReclaim]
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1565,7 +1565,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 native_token = xcm_config::ZagrosLocation::get();
|
||||
// We accept the native token to pay fees.
|
||||
@@ -1597,12 +1597,12 @@ impl_runtime_apis! {
|
||||
) {
|
||||
Ok(swapped_in_native)
|
||||
} else {
|
||||
log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - unhandled asset_id: {asset_id:?}!");
|
||||
log::trace!(target: "xcm::xcm_runtime_pezapis", "query_weight_to_asset_fee - unhandled asset_id: {asset_id:?}!");
|
||||
Err(XcmPaymentApiError::AssetNotFound)
|
||||
}
|
||||
},
|
||||
Err(_) => {
|
||||
log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - failed to convert asset: {asset:?}!");
|
||||
log::trace!(target: "xcm::xcm_runtime_pezapis", "query_weight_to_asset_fee - failed to convert asset: {asset:?}!");
|
||||
Err(XcmPaymentApiError::VersionedConversionFailed)
|
||||
}
|
||||
}
|
||||
@@ -1618,7 +1618,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: xcm::prelude::XcmVersion) -> Result<CallDryRunEffects<RuntimeEvent>, XcmDryRunApiError> {
|
||||
PezkuwiXcm::dry_run_call::<Runtime, xcm_config::XcmRouter, OriginCaller, RuntimeCall>(origin, call, result_xcms_version)
|
||||
}
|
||||
@@ -1628,12 +1628,12 @@ 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,
|
||||
xcm_config::LocationToAccountId,
|
||||
>::convert_location(location)
|
||||
@@ -1805,7 +1805,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;
|
||||
use pezpallet_xcm_bridge_hub_router::benchmarking::Pallet as XcmBridgeHubRouterBench;
|
||||
|
||||
@@ -1865,12 +1865,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 {}
|
||||
|
||||
parameter_types! {
|
||||
pub ExistentialDepositAsset: Option<Asset> = Some((
|
||||
@@ -1986,7 +1986,7 @@ impl_runtime_apis! {
|
||||
|
||||
impl XcmBridgeHubRouterConfig<ToPezkuwichainXcmRouterInstance> for Runtime {
|
||||
fn make_congested() {
|
||||
pezcumulus_pallet_xcmp_queue::bridging::suspend_channel_for_benchmarks::<Runtime>(
|
||||
pezcumulus_pezpallet_xcmp_queue::bridging::suspend_channel_for_benchmarks::<Runtime>(
|
||||
xcm_config::bridging::SiblingBridgeHubParaId::get().into()
|
||||
);
|
||||
}
|
||||
@@ -2202,11 +2202,11 @@ impl_runtime_apis! {
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
@@ -2218,9 +2218,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! {
|
||||
|
||||
Reference in New Issue
Block a user