XCM v3 Companion

pallets/dmp-queue/src/lib.rs

@@ -473,7 +473,7 @@ mod tests {
 
 	fn msg(weight: Weight) -> Xcm {
 		Xcm(vec![Transact {
-			origin_type: OriginKind::Native,
+			origin_kind: OriginKind::Native,
 			require_weight_at_most: weight,
 			call: vec![].into(),
 		}])

pallets/parachain-system/src/lib.rs

@@ -660,7 +660,7 @@ impl<T: Config> GetChannelInfo for Pallet<T> {
 		// None then it must be that this is an edge-case where a message is attempted to be
 		// sent at the first block. It should be safe to assume that there are no channels
 		// opened at all so early. At least, relying on this assumption seems to be a better
-		// tradeoff, compared to introducing an error variant that the clients should be
+		// trade-off, compared to introducing an error variant that the clients should be
 		// prepared to handle.
 		let index = match channels.binary_search_by_key(&id, |item| item.0) {
 			Err(_) => return ChannelStatus::Closed,

pallets/xcmp-queue/src/mock.rs

@@ -110,6 +110,7 @@ parameter_types! {
 	pub Ancestry: MultiLocation = X1(Parachain(1u32.into())).into();
 	pub UnitWeightCost: Weight = 1_000_000;
 	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
 /// Means for transacting assets on this chain.
@@ -145,6 +146,8 @@ impl xcm_executor::Config for XcmConfig {
 	type AssetTrap = ();
 	type AssetClaims = ();
 	type SubscriptionService = ();
+	type PalletInstancesInfo = AllPallets;
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 }
 
 pub type XcmRouter = (

parachain-template/runtime/src/lib.rs

@@ -457,6 +457,7 @@ parameter_types! {
 	// One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate.
 	pub UnitWeightCost: Weight = 1_000_000_000;
 	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
 match_type! {
@@ -490,6 +491,8 @@ impl Config for XcmConfig {
 	type AssetTrap = PolkadotXcm;
 	type AssetClaims = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
+	type PalletInstancesInfo = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 }
 
 parameter_types! {

polkadot-parachains/pallets/ping/src/lib.rs

@@ -91,7 +91,7 @@ pub mod pallet {
 				match T::XcmSender::send_xcm(
 					(1, Junction::Parachain(para.into())),
 					Xcm(vec![Transact {
-						origin_type: OriginKind::Native,
+						origin_kind: OriginKind::Native,
 						require_weight_at_most: 1_000,
 						call: <T as Config>::Call::from(Call::<T>::ping {
 							seq,
@@ -167,7 +167,7 @@ pub mod pallet {
 			match T::XcmSender::send_xcm(
 				(1, Junction::Parachain(para.into())),
 				Xcm(vec![Transact {
-					origin_type: OriginKind::Native,
+					origin_kind: OriginKind::Native,
 					require_weight_at_most: 1_000,
 					call: <T as Config>::Call::from(Call::<T>::pong {
 						seq,

polkadot-parachains/rococo/src/lib.rs

@@ -380,6 +380,7 @@ pub type Barrier = (
 
 parameter_types! {
 	pub StatemintLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000)));
+	pub MaxAssetsIntoHolding: u32 = 64;
 }
 
 pub type Reserves = (NativeAsset, AssetsFrom<StatemintLocation>);
@@ -401,6 +402,8 @@ impl Config for XcmConfig {
 	type AssetTrap = PolkadotXcm;
 	type AssetClaims = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
+	type PalletInstancesInfo = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 }
 
 /// Local origins on this chain are allowed to dispatch XCM sends/executions.

polkadot-parachains/shell/src/lib.rs

@@ -197,6 +197,7 @@ parameter_types! {
 	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.
 	pub UnitWeightCost: Weight = 1_000_000;
 	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
 pub struct XcmConfig;
@@ -215,6 +216,8 @@ impl Config for XcmConfig {
 	type AssetTrap = (); // don't trap for now
 	type AssetClaims = (); // don't claim for now
 	type SubscriptionService = (); // don't handle subscriptions for now
+	type PalletInstancesInfo = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {

polkadot-parachains/statemine/src/lib.rs

@@ -549,6 +549,7 @@ parameter_types! {
 	// One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate.
 	pub UnitWeightCost: Weight = 1_000_000_000;
 	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
 match_type! {
@@ -582,6 +583,8 @@ impl Config for XcmConfig {
 	type AssetTrap = PolkadotXcm;
 	type AssetClaims = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
+	type PalletInstancesInfo = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 }
 
 parameter_types! {

polkadot-parachains/statemint/src/lib.rs

@@ -526,6 +526,7 @@ parameter_types! {
 	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.
 	pub UnitWeightCost: Weight = 1_000_000;
 	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
 match_type! {
@@ -558,6 +559,8 @@ impl Config for XcmConfig {
 	type AssetTrap = PolkadotXcm;
 	type AssetClaims = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
+	type PalletInstancesInfo = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 }
 
 parameter_types! {

polkadot-parachains/westmint/src/lib.rs

@@ -512,6 +512,7 @@ pub type XcmOriginToTransactDispatchOrigin = (
 parameter_types! {
 	pub UnitWeightCost: Weight = 1_000;
 	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
 match_type! {
@@ -544,6 +545,8 @@ impl Config for XcmConfig {
 	type AssetTrap = PolkadotXcm;
 	type AssetClaims = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
+	type PalletInstancesInfo = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 }
 
 parameter_types! {