diff --git a/pallets/xcmp-queue/src/tests.rs b/pallets/xcmp-queue/src/tests.rs index 2e12855f295..9d5288ce439 100644 --- a/pallets/xcmp-queue/src/tests.rs +++ b/pallets/xcmp-queue/src/tests.rs @@ -121,7 +121,8 @@ fn suspend_xcm_execution_works() { QueueSuspended::::put(true); let xcm = - VersionedXcm::from(Xcm::(vec![Instruction::::ClearOrigin])).encode(); + VersionedXcm::from(Xcm::(vec![Instruction::::ClearOrigin])) + .encode(); let mut message_format = XcmpMessageFormat::ConcatenatedVersionedXcm.encode(); message_format.extend(xcm.clone()); let messages = vec![(ParaId::from(999), 1u32.into(), message_format.as_slice())]; diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs index b043e5e341b..165bd7f2a64 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/statemine/src/lib.rs @@ -354,15 +354,12 @@ impl InstanceFilter for ProxyType { RuntimeCall::Uniques(pallet_uniques::Call::set_team { .. }) | RuntimeCall::Uniques(pallet_uniques::Call::set_metadata { .. }) | RuntimeCall::Uniques(pallet_uniques::Call::set_attribute { .. }) | - RuntimeCall::Uniques( - pallet_uniques::Call::set_collection_metadata { .. } - ) | RuntimeCall::Uniques(pallet_uniques::Call::clear_metadata { .. }) | + RuntimeCall::Uniques(pallet_uniques::Call::set_collection_metadata { .. }) | + RuntimeCall::Uniques(pallet_uniques::Call::clear_metadata { .. }) | RuntimeCall::Uniques(pallet_uniques::Call::clear_attribute { .. }) | - RuntimeCall::Uniques( - pallet_uniques::Call::clear_collection_metadata { .. } - ) | RuntimeCall::Uniques( - pallet_uniques::Call::set_collection_max_supply { .. } - ) | RuntimeCall::Utility { .. } | + RuntimeCall::Uniques(pallet_uniques::Call::clear_collection_metadata { .. }) | + RuntimeCall::Uniques(pallet_uniques::Call::set_collection_max_supply { .. }) | + RuntimeCall::Utility { .. } | RuntimeCall::Multisig { .. } ), ProxyType::AssetManager => matches!( diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs index 1c4ce17592d..5036b889c1c 100644 --- a/parachains/runtimes/assets/statemine/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemine/src/xcm_config.rs @@ -170,8 +170,11 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of KSM type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = - WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = WeightInfoBounds< + crate::weights::xcm::StatemineXcmWeight, + RuntimeCall, + MaxInstructions, + >; type Trader = ( UsingComponents>, cumulus_primitives_utility::TakeFirstAssetTrader< @@ -226,8 +229,11 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = - WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = WeightInfoBounds< + crate::weights::xcm::StatemineXcmWeight, + RuntimeCall, + MaxInstructions, + >; type LocationInverter = LocationInverter; type Origin = Origin; diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs index 3f2811bb2f7..a7932e69dea 100644 --- a/parachains/runtimes/assets/statemint/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemint/src/xcm_config.rs @@ -167,8 +167,11 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of DOT type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = - WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = WeightInfoBounds< + crate::weights::xcm::StatemintXcmWeight, + RuntimeCall, + MaxInstructions, + >; type Trader = UsingComponents>; type ResponseHandler = PolkadotXcm; @@ -202,8 +205,11 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = - WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = WeightInfoBounds< + crate::weights::xcm::StatemintXcmWeight, + RuntimeCall, + MaxInstructions, + >; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs index c859b7fc4a9..bd869c977b8 100644 --- a/parachains/runtimes/assets/westmint/src/xcm_config.rs +++ b/parachains/runtimes/assets/westmint/src/xcm_config.rs @@ -167,8 +167,11 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of WND type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = - WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = WeightInfoBounds< + crate::weights::xcm::WestmintXcmWeight, + RuntimeCall, + MaxInstructions, + >; type Trader = ( UsingComponents>, cumulus_primitives_utility::TakeFirstAssetTrader< @@ -219,8 +222,11 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = - WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = WeightInfoBounds< + crate::weights::xcm::WestmintXcmWeight, + RuntimeCall, + MaxInstructions, + >; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/parachains/runtimes/starters/shell/src/xcm_config.rs b/parachains/runtimes/starters/shell/src/xcm_config.rs index 909cc7aa69c..8e754299aba 100644 --- a/parachains/runtimes/starters/shell/src/xcm_config.rs +++ b/parachains/runtimes/starters/shell/src/xcm_config.rs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use super::{AccountId, RuntimeCall, RuntimeEvent, Origin, ParachainInfo, Runtime}; +use super::{AccountId, Origin, ParachainInfo, Runtime, RuntimeCall, RuntimeEvent}; use frame_support::{match_types, parameter_types}; use xcm::latest::prelude::*; use xcm_builder::{