mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 11:41:02 +00:00
nit: diff minimisation between asset hub runtimes (#2951)
* diff minimisation between runtimes * another nit * Update parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Update parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Upgrade english * Removed unused `CheckedExtrinsic` (#2972) --------- Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Co-authored-by: Branislav Kontur <bkontur@gmail.com>
This commit is contained in:
@@ -110,9 +110,6 @@ pub type SignedExtra = (
|
|||||||
pub type UncheckedExtrinsic =
|
pub type UncheckedExtrinsic =
|
||||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
||||||
|
|
||||||
/// Extrinsic type that has already been checked.
|
|
||||||
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
|
|
||||||
|
|
||||||
/// Executive: handles dispatch to the various modules.
|
/// Executive: handles dispatch to the various modules.
|
||||||
pub type Executive = frame_executive::Executive<
|
pub type Executive = frame_executive::Executive<
|
||||||
Runtime,
|
Runtime,
|
||||||
|
|||||||
@@ -602,7 +602,7 @@ parameter_types! {
|
|||||||
pub const StakingAdminBodyId: BodyId = BodyId::Defense;
|
pub const StakingAdminBodyId: BodyId = BodyId::Defense;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// We allow root the StakingAdmin to execute privileged collator selection operations.
|
/// We allow root and the `StakingAdmin` to execute privileged collator selection operations.
|
||||||
pub type CollatorSelectionUpdateOrigin = EitherOfDiverse<
|
pub type CollatorSelectionUpdateOrigin = EitherOfDiverse<
|
||||||
EnsureRoot<AccountId>,
|
EnsureRoot<AccountId>,
|
||||||
EnsureXcm<IsVoiceOfBody<GovernanceLocation, StakingAdminBodyId>>,
|
EnsureXcm<IsVoiceOfBody<GovernanceLocation, StakingAdminBodyId>>,
|
||||||
@@ -803,8 +803,6 @@ pub type SignedExtra = (
|
|||||||
/// Unchecked extrinsic type as expected by this runtime.
|
/// Unchecked extrinsic type as expected by this runtime.
|
||||||
pub type UncheckedExtrinsic =
|
pub type UncheckedExtrinsic =
|
||||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
||||||
/// Extrinsic type that has already been checked.
|
|
||||||
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
|
|
||||||
/// Migrations to apply on runtime upgrade.
|
/// Migrations to apply on runtime upgrade.
|
||||||
pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
|
pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
|
||||||
|
|
||||||
|
|||||||
@@ -470,7 +470,6 @@ impl pallet_xcm::Config for Runtime {
|
|||||||
RuntimeCall,
|
RuntimeCall,
|
||||||
MaxInstructions,
|
MaxInstructions,
|
||||||
>;
|
>;
|
||||||
|
|
||||||
type UniversalLocation = UniversalLocation;
|
type UniversalLocation = UniversalLocation;
|
||||||
type RuntimeOrigin = RuntimeOrigin;
|
type RuntimeOrigin = RuntimeOrigin;
|
||||||
type RuntimeCall = RuntimeCall;
|
type RuntimeCall = RuntimeCall;
|
||||||
|
|||||||
@@ -408,6 +408,7 @@ impl Default for ProxyType {
|
|||||||
Self::Any
|
Self::Any
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl InstanceFilter<RuntimeCall> for ProxyType {
|
impl InstanceFilter<RuntimeCall> for ProxyType {
|
||||||
fn filter(&self, c: &RuntimeCall) -> bool {
|
fn filter(&self, c: &RuntimeCall) -> bool {
|
||||||
match self {
|
match self {
|
||||||
@@ -786,8 +787,6 @@ pub type SignedExtra = (
|
|||||||
/// Unchecked extrinsic type as expected by this runtime.
|
/// Unchecked extrinsic type as expected by this runtime.
|
||||||
pub type UncheckedExtrinsic =
|
pub type UncheckedExtrinsic =
|
||||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
||||||
/// Extrinsic type that has already been checked.
|
|
||||||
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
|
|
||||||
/// Migrations to apply on runtime upgrade.
|
/// Migrations to apply on runtime upgrade.
|
||||||
pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
|
pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
|
||||||
|
|
||||||
@@ -1032,7 +1031,6 @@ impl_runtime_apis! {
|
|||||||
Vec<frame_benchmarking::BenchmarkList>,
|
Vec<frame_benchmarking::BenchmarkList>,
|
||||||
Vec<frame_support::traits::StorageInfo>,
|
Vec<frame_support::traits::StorageInfo>,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
use frame_benchmarking::{Benchmarking, BenchmarkList};
|
use frame_benchmarking::{Benchmarking, BenchmarkList};
|
||||||
use frame_support::traits::StorageInfoTrait;
|
use frame_support::traits::StorageInfoTrait;
|
||||||
use frame_system_benchmarking::Pallet as SystemBench;
|
use frame_system_benchmarking::Pallet as SystemBench;
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ pub type CurrencyTransactor = CurrencyAdapter<
|
|||||||
(),
|
(),
|
||||||
>;
|
>;
|
||||||
|
|
||||||
/// `AssetId/Balance` converter for `TrustBackedAssets``
|
/// `AssetId`/`Balance` converter for `TrustBackedAssets`.
|
||||||
pub type TrustBackedAssetsConvertedConcreteId =
|
pub type TrustBackedAssetsConvertedConcreteId =
|
||||||
assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
|
assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
|
||||||
|
|
||||||
@@ -346,7 +346,7 @@ impl Contains<RuntimeCall> for SafeCallFilter {
|
|||||||
pallet_uniques::Call::set_accept_ownership { .. } |
|
pallet_uniques::Call::set_accept_ownership { .. } |
|
||||||
pallet_uniques::Call::set_collection_max_supply { .. } |
|
pallet_uniques::Call::set_collection_max_supply { .. } |
|
||||||
pallet_uniques::Call::set_price { .. } |
|
pallet_uniques::Call::set_price { .. } |
|
||||||
pallet_uniques::Call::buy_item { .. },
|
pallet_uniques::Call::buy_item { .. }
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -321,15 +321,11 @@ impl pallet_asset_conversion::Config for Runtime {
|
|||||||
type PalletId = AssetConversionPalletId;
|
type PalletId = AssetConversionPalletId;
|
||||||
type AllowMultiAssetPools = AllowMultiAssetPools;
|
type AllowMultiAssetPools = AllowMultiAssetPools;
|
||||||
type MaxSwapPathLength = ConstU32<4>;
|
type MaxSwapPathLength = ConstU32<4>;
|
||||||
|
|
||||||
type MultiAssetId = Box<MultiLocation>;
|
type MultiAssetId = Box<MultiLocation>;
|
||||||
type MultiAssetIdConverter =
|
type MultiAssetIdConverter =
|
||||||
MultiLocationConverter<WestendLocation, LocalAndForeignAssetsMultiLocationMatcher>;
|
MultiLocationConverter<WestendLocation, LocalAndForeignAssetsMultiLocationMatcher>;
|
||||||
|
|
||||||
type MintMinLiquidity = ConstU128<100>;
|
type MintMinLiquidity = ConstU128<100>;
|
||||||
|
|
||||||
type WeightInfo = weights::pallet_asset_conversion::WeightInfo<Runtime>;
|
type WeightInfo = weights::pallet_asset_conversion::WeightInfo<Runtime>;
|
||||||
|
|
||||||
#[cfg(feature = "runtime-benchmarks")]
|
#[cfg(feature = "runtime-benchmarks")]
|
||||||
type BenchmarkHelper =
|
type BenchmarkHelper =
|
||||||
crate::xcm_config::BenchmarkMultiLocationConverter<parachain_info::Pallet<Runtime>>;
|
crate::xcm_config::BenchmarkMultiLocationConverter<parachain_info::Pallet<Runtime>>;
|
||||||
@@ -588,9 +584,9 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
|
|||||||
type RuntimeEvent = RuntimeEvent;
|
type RuntimeEvent = RuntimeEvent;
|
||||||
type OnSystemEvent = ();
|
type OnSystemEvent = ();
|
||||||
type SelfParaId = parachain_info::Pallet<Runtime>;
|
type SelfParaId = parachain_info::Pallet<Runtime>;
|
||||||
type OutboundXcmpMessageSource = XcmpQueue;
|
|
||||||
type DmpMessageHandler = DmpQueue;
|
type DmpMessageHandler = DmpQueue;
|
||||||
type ReservedDmpWeight = ReservedDmpWeight;
|
type ReservedDmpWeight = ReservedDmpWeight;
|
||||||
|
type OutboundXcmpMessageSource = XcmpQueue;
|
||||||
type XcmpMessageHandler = XcmpQueue;
|
type XcmpMessageHandler = XcmpQueue;
|
||||||
type ReservedXcmpWeight = ReservedXcmpWeight;
|
type ReservedXcmpWeight = ReservedXcmpWeight;
|
||||||
type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
|
type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ use {cumulus_primitives_core::ParaId, sp_core::Get};
|
|||||||
|
|
||||||
parameter_types! {
|
parameter_types! {
|
||||||
pub const WestendLocation: MultiLocation = MultiLocation::parent();
|
pub const WestendLocation: MultiLocation = MultiLocation::parent();
|
||||||
pub RelayNetwork: Option<NetworkId> = Some(NetworkId::Westend);
|
pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::Westend);
|
||||||
pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
|
pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
|
||||||
pub UniversalLocation: InteriorMultiLocation =
|
pub UniversalLocation: InteriorMultiLocation =
|
||||||
X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
|
X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
|
||||||
|
|||||||
@@ -105,9 +105,6 @@ pub type SignedExtra = (
|
|||||||
pub type UncheckedExtrinsic =
|
pub type UncheckedExtrinsic =
|
||||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
||||||
|
|
||||||
/// Extrinsic type that has already been checked.
|
|
||||||
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
|
|
||||||
|
|
||||||
/// Migrations to apply on runtime upgrade.
|
/// Migrations to apply on runtime upgrade.
|
||||||
pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
|
pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
|
||||||
|
|
||||||
|
|||||||
@@ -105,9 +105,6 @@ pub type SignedExtra = (
|
|||||||
pub type UncheckedExtrinsic =
|
pub type UncheckedExtrinsic =
|
||||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
||||||
|
|
||||||
/// Extrinsic type that has already been checked.
|
|
||||||
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
|
|
||||||
|
|
||||||
/// Migrations to apply on runtime upgrade.
|
/// Migrations to apply on runtime upgrade.
|
||||||
pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
|
pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
|
||||||
|
|
||||||
|
|||||||
@@ -623,10 +623,8 @@ pub type SignedExtra = (
|
|||||||
/// Unchecked extrinsic type as expected by this runtime.
|
/// Unchecked extrinsic type as expected by this runtime.
|
||||||
pub type UncheckedExtrinsic =
|
pub type UncheckedExtrinsic =
|
||||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
||||||
/// Extrinsic type that has already been checked.
|
/// All migrations executed on runtime upgrade as a nested tuple of types implementing
|
||||||
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
|
/// `OnRuntimeUpgrade`. Included migrations must be idempotent.
|
||||||
// All migrations executed on runtime upgrade as a nested tuple of types implementing
|
|
||||||
// `OnRuntimeUpgrade`. Included migrations must be idempotent.
|
|
||||||
type Migrations = (
|
type Migrations = (
|
||||||
// v9420
|
// v9420
|
||||||
import_kusama_fellowship::Migration<Runtime, FellowshipCollectiveInstance>,
|
import_kusama_fellowship::Migration<Runtime, FellowshipCollectiveInstance>,
|
||||||
|
|||||||
@@ -244,8 +244,6 @@ pub type SignedExtra = (
|
|||||||
/// Unchecked extrinsic type as expected by this runtime.
|
/// Unchecked extrinsic type as expected by this runtime.
|
||||||
pub type UncheckedExtrinsic =
|
pub type UncheckedExtrinsic =
|
||||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
||||||
/// Extrinsic type that has already been checked.
|
|
||||||
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
|
|
||||||
/// Executive: handles dispatch to the various modules.
|
/// Executive: handles dispatch to the various modules.
|
||||||
pub type Executive = frame_executive::Executive<
|
pub type Executive = frame_executive::Executive<
|
||||||
Runtime,
|
Runtime,
|
||||||
|
|||||||
@@ -344,8 +344,6 @@ pub type SignedExtra = (
|
|||||||
/// Unchecked extrinsic type as expected by this runtime.
|
/// Unchecked extrinsic type as expected by this runtime.
|
||||||
pub type UncheckedExtrinsic =
|
pub type UncheckedExtrinsic =
|
||||||
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
|
||||||
/// Extrinsic type that has already been checked.
|
|
||||||
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
|
|
||||||
/// Executive: handles dispatch to the various modules.
|
/// Executive: handles dispatch to the various modules.
|
||||||
pub type Executive = frame_executive::Executive<
|
pub type Executive = frame_executive::Executive<
|
||||||
Runtime,
|
Runtime,
|
||||||
|
|||||||
Reference in New Issue
Block a user