XCM v3

node/core/pvf/src/host.rs

@@ -340,7 +340,7 @@ async fn run(
 		futures::select_biased! {
 			() = cleanup_pulse.select_next_some() => {
 				// `select_next_some` because we don't expect this to fail, but if it does, we
-				// still don't fail. The tradeoff is that the compiled cache will start growing
+				// still don't fail. The trade-off is that the compiled cache will start growing
 				// in size. That is, however, rather a slow process and hopefully the operator
 				// will notice it.
 

node/network/protocol/src/request_response/mod.rs

@@ -104,7 +104,7 @@ const STATEMENTS_TIMEOUT: Duration = Duration::from_secs(1);
 
 /// We don't want a slow peer to slow down all the others, at the same time we want to get out the
 /// data quickly in full to at least some peers (as this will reduce load on us as they then can
-/// start serving the data). So this value is a tradeoff. 3 seems to be sensible. So we would need
+/// start serving the data). So this value is a trade-off. 3 seems to be sensible. So we would need
 /// to have 3 slow nodes connected, to delay transfer for others by `STATEMENTS_TIMEOUT`.
 pub const MAX_PARALLEL_STATEMENT_REQUESTS: u32 = 3;
 

runtime/common/src/xcm_sender.rs

@@ -16,34 +16,71 @@
 
 //! XCM sender for relay chain.
 
+use frame_support::traits::Get;
 use parity_scale_codec::Encode;
-use runtime_parachains::{configuration, dmp};
-use sp_std::marker::PhantomData;
-use xcm::latest::prelude::*;
+use primitives::v2::Id as ParaId;
+use runtime_parachains::{
+	configuration::{self, HostConfiguration},
+	dmp,
+};
+use sp_std::{marker::PhantomData, prelude::*};
+use xcm::prelude::*;
+use SendError::*;
+
+pub trait PriceForParachainDelivery {
+	fn price_for_parachain_delivery(para: ParaId, message: &Xcm<()>) -> MultiAssets;
+}
+impl PriceForParachainDelivery for () {
+	fn price_for_parachain_delivery(_: ParaId, _: &Xcm<()>) -> MultiAssets {
+		MultiAssets::new()
+	}
+}
+
+pub struct ConstantPrice<T>(sp_std::marker::PhantomData<T>);
+impl<T: Get<MultiAssets>> PriceForParachainDelivery for ConstantPrice<T> {
+	fn price_for_parachain_delivery(_: ParaId, _: &Xcm<()>) -> MultiAssets {
+		T::get()
+	}
+}
 
 /// XCM sender for relay chain. It only sends downward message.
-pub struct ChildParachainRouter<T, W>(PhantomData<(T, W)>);
+pub struct ChildParachainRouter<T, W, P>(PhantomData<(T, W, P)>);
 
-impl<T: configuration::Config + dmp::Config, W: xcm::WrapVersion> SendXcm
-	for ChildParachainRouter<T, W>
+impl<T: configuration::Config + dmp::Config, W: xcm::WrapVersion, P: PriceForParachainDelivery>
+	SendXcm for ChildParachainRouter<T, W, P>
 {
-	fn send_xcm(dest: impl Into<MultiLocation>, msg: Xcm<()>) -> SendResult {
-		let dest = dest.into();
-		match dest {
-			MultiLocation { parents: 0, interior: X1(Parachain(id)) } => {
-				// Downward message passing.
-				let versioned_xcm =
-					W::wrap_version(&dest, msg).map_err(|()| SendError::DestinationUnsupported)?;
-				let config = <configuration::Pallet<T>>::config();
-				<dmp::Pallet<T>>::queue_downward_message(
-					&config,
-					id.into(),
-					versioned_xcm.encode(),
-				)
-				.map_err(Into::<SendError>::into)?;
-				Ok(())
-			},
-			dest => Err(SendError::CannotReachDestination(dest, msg)),
-		}
+	type Ticket = (HostConfiguration<T::BlockNumber>, ParaId, Vec<u8>);
+
+	fn validate(
+		dest: &mut Option<MultiLocation>,
+		msg: &mut Option<Xcm<()>>,
+	) -> SendResult<(HostConfiguration<T::BlockNumber>, ParaId, Vec<u8>)> {
+		let d = dest.take().ok_or(MissingArgument)?;
+		let id = if let MultiLocation { parents: 0, interior: X1(Parachain(id)) } = &d {
+			*id
+		} else {
+			*dest = Some(d);
+			return Err(NotApplicable)
+		};
+
+		// Downward message passing.
+		let xcm = msg.take().ok_or(MissingArgument)?;
+		let config = <configuration::Pallet<T>>::config();
+		let para = id.into();
+		let price = P::price_for_parachain_delivery(para, &xcm);
+		let blob = W::wrap_version(&d, xcm).map_err(|()| DestinationUnsupported)?.encode();
+		<dmp::Pallet<T>>::can_queue_downward_message(&config, &para, &blob)
+			.map_err(Into::<SendError>::into)?;
+
+		Ok(((config, para, blob), price))
+	}
+
+	fn deliver(
+		(config, para, blob): (HostConfiguration<T::BlockNumber>, ParaId, Vec<u8>),
+	) -> Result<XcmHash, SendError> {
+		let hash = sp_io::hashing::blake2_256(&blob[..]);
+		<dmp::Pallet<T>>::queue_downward_message(&config, para, blob)
+			.map(|()| hash)
+			.map_err(|_| SendError::Transport(&"Error placing into DMP queue"))
 	}
 }

runtime/kusama/src/lib.rs

@@ -1969,7 +1969,7 @@ sp_api::impl_runtime_apis! {
 			use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench;
 			use frame_benchmarking::baseline::Pallet as Baseline;
 			use xcm::latest::prelude::*;
-			use xcm_config::{CheckAccount, KsmLocation, SovereignAccountOf, Statemine, XcmConfig};
+			use xcm_config::{CheckAccount, SovereignAccountOf, Statemine, TokenLocation, XcmConfig};
 
 			impl pallet_session_benchmarking::Config for Runtime {}
 			impl pallet_offences_benchmarking::Config for Runtime {}
@@ -1984,10 +1984,10 @@ sp_api::impl_runtime_apis! {
 				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
 					Ok(Statemine::get())
 				}
-				fn worst_case_holding() -> MultiAssets {
+				fn worst_case_holding(_depositable_count: u32) -> MultiAssets {
 					// Kusama only knows about KSM.
 					vec![MultiAsset{
-						id: Concrete(KsmLocation::get()),
+						id: Concrete(TokenLocation::get()),
 						fun: Fungible(1_000_000 * UNITS),
 					}].into()
 				}
@@ -1996,11 +1996,7 @@ sp_api::impl_runtime_apis! {
 			parameter_types! {
 				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
 					Statemine::get(),
-					MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(KsmLocation::get()) },
-				));
-				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = Some((
-					Statemine::get(),
-					MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(KsmLocation::get()) },
+					MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(TokenLocation::get()) },
 				));
 			}
 
@@ -2009,11 +2005,10 @@ sp_api::impl_runtime_apis! {
 
 				type CheckedAccount = CheckAccount;
 				type TrustedTeleporter = TrustedTeleporter;
-				type TrustedReserve = TrustedReserve;
 
 				fn get_multi_asset() -> MultiAsset {
 					MultiAsset {
-						id: Concrete(KsmLocation::get()),
+						id: Concrete(TokenLocation::get()),
 						fun: Fungible(1 * UNITS),
 					}
 				}
@@ -2026,6 +2021,16 @@ sp_api::impl_runtime_apis! {
 					(0u64, Response::Version(Default::default()))
 				}
 
+				fn worst_case_asset_exchange() -> Result<(MultiAssets, MultiAssets), BenchmarkError> {
+					// Kusama doesn't support asset exchanges
+					Err(BenchmarkError::Skip)
+				}
+
+				fn universal_alias() -> Result<Junction, BenchmarkError> {
+					// The XCM executor of Kusama doesn't have a configured `UniversalAliases`
+					Err(BenchmarkError::Skip)
+				}
+
 				fn transact_origin() -> Result<MultiLocation, BenchmarkError> {
 					Ok(Statemine::get())
 				}
@@ -2036,10 +2041,15 @@ sp_api::impl_runtime_apis! {
 
 				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
 					let origin = Statemine::get();
-					let assets: MultiAssets = (Concrete(KsmLocation::get()), 1_000 * UNITS).into();
+					let assets: MultiAssets = (Concrete(TokenLocation::get()), 1_000 * UNITS).into();
 					let ticket = MultiLocation { parents: 0, interior: Here };
 					Ok((origin, ticket, assets))
 				}
+
+				fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
+					// Kusama doesn't support asset locking
+					Err(BenchmarkError::Skip)
+				}
 			}
 
 			let whitelist: Vec<TrackedStorageKey> = vec![

runtime/kusama/src/weights/xcm/mod.rs

@@ -49,7 +49,9 @@ impl WeighMultiAssets for MultiAssetFilter {
 					AssetTypes::Unknown => Weight::MAX,
 				})
 				.fold(Weight::zero(), |acc, x| acc.saturating_add(x)),
-			Self::Wild(_) => balances_weight.saturating_mul(MAX_ASSETS as u64),
+			Self::Wild(AllOf { .. } | AllOfCounted { .. }) => balances_weight,
+			Self::Wild(AllCounted(count)) => balances_weight.saturating_mul(*count as u64),
+			Self::Wild(All) => balances_weight.saturating_mul(MAX_ASSETS as u64),
 		};
 
 		weight.ref_time()
@@ -83,7 +85,12 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for KusamaXcmWeight<RuntimeCall> {
 	fn receive_teleported_asset(assets: &MultiAssets) -> XCMWeight {
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::receive_teleported_asset())
 	}
-	fn query_response(_query_id: &u64, _response: &Response, _max_weight: &u64) -> XCMWeight {
+	fn query_response(
+		_query_id: &u64,
+		_response: &Response,
+		_max_weight: &u64,
+		_querier: &Option<MultiLocation>,
+	) -> XCMWeight {
 		XcmGeneric::<Runtime>::query_response().ref_time()
 	}
 	fn transfer_asset(assets: &MultiAssets, _dest: &MultiLocation) -> XCMWeight {
@@ -125,31 +132,27 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for KusamaXcmWeight<RuntimeCall> {
 	fn descend_origin(_who: &InteriorMultiLocation) -> XCMWeight {
 		XcmGeneric::<Runtime>::descend_origin().ref_time()
 	}
-	fn report_error(
-		_query_id: &QueryId,
-		_dest: &MultiLocation,
-		_max_response_weight: &u64,
-	) -> XCMWeight {
+	fn report_error(_query_response_info: &QueryResponseInfo) -> XCMWeight {
 		XcmGeneric::<Runtime>::report_error().ref_time()
 	}
 
-	fn deposit_asset(
-		assets: &MultiAssetFilter,
-		_max_assets: &u32, // TODO use max assets?
-		_dest: &MultiLocation,
-	) -> XCMWeight {
+	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> XCMWeight {
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::deposit_asset())
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
-		_max_assets: &u32, // TODO use max assets?
 		_dest: &MultiLocation,
 		_xcm: &Xcm<()>,
 	) -> XCMWeight {
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::deposit_reserve_asset())
 	}
-	fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets) -> XCMWeight {
-		Weight::MAX.ref_time() // todo fix
+	fn exchange_asset(
+		_give: &MultiAssetFilter,
+		_receive: &MultiAssets,
+		_maximal: &bool,
+	) -> XCMWeight {
+		// Kusama does not currently support exchange asset operations
+		Weight::MAX.ref_time()
 	}
 	fn initiate_reserve_withdraw(
 		assets: &MultiAssetFilter,
@@ -165,13 +168,8 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for KusamaXcmWeight<RuntimeCall> {
 	) -> XCMWeight {
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::initiate_teleport())
 	}
-	fn query_holding(
-		_query_id: &u64,
-		_dest: &MultiLocation,
-		_assets: &MultiAssetFilter,
-		_max_response_weight: &u64,
-	) -> XCMWeight {
-		XcmGeneric::<Runtime>::query_holding().ref_time()
+	fn report_holding(_response_info: &QueryResponseInfo, _assets: &MultiAssetFilter) -> XCMWeight {
+		XcmGeneric::<Runtime>::report_holding().ref_time()
 	}
 	fn buy_execution(_fees: &MultiAsset, _weight_limit: &WeightLimit) -> XCMWeight {
 		XcmGeneric::<Runtime>::buy_execution().ref_time()
@@ -200,4 +198,73 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for KusamaXcmWeight<RuntimeCall> {
 	fn unsubscribe_version() -> XCMWeight {
 		XcmGeneric::<Runtime>::unsubscribe_version().ref_time()
 	}
+	fn burn_asset(assets: &MultiAssets) -> XCMWeight {
+		assets.weigh_multi_assets(XcmGeneric::<Runtime>::burn_asset())
+	}
+	fn expect_asset(assets: &MultiAssets) -> XCMWeight {
+		assets.weigh_multi_assets(XcmGeneric::<Runtime>::expect_asset())
+	}
+	fn expect_origin(_origin: &Option<MultiLocation>) -> XCMWeight {
+		XcmGeneric::<Runtime>::expect_origin().ref_time()
+	}
+	fn expect_error(_error: &Option<(u32, XcmError)>) -> XCMWeight {
+		XcmGeneric::<Runtime>::expect_error().ref_time()
+	}
+	fn query_pallet(_module_name: &Vec<u8>, _response_info: &QueryResponseInfo) -> XCMWeight {
+		XcmGeneric::<Runtime>::query_pallet().ref_time()
+	}
+	fn expect_pallet(
+		_index: &u32,
+		_name: &Vec<u8>,
+		_module_name: &Vec<u8>,
+		_crate_major: &u32,
+		_min_crate_minor: &u32,
+	) -> XCMWeight {
+		XcmGeneric::<Runtime>::expect_pallet().ref_time()
+	}
+	fn report_transact_status(_response_info: &QueryResponseInfo) -> XCMWeight {
+		XcmGeneric::<Runtime>::report_transact_status().ref_time()
+	}
+	fn clear_transact_status() -> XCMWeight {
+		XcmGeneric::<Runtime>::clear_transact_status().ref_time()
+	}
+	fn universal_origin(_: &Junction) -> XCMWeight {
+		// Kusama does not currently support universal origin operations
+		Weight::MAX.ref_time()
+	}
+	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> XCMWeight {
+		Weight::MAX.ref_time() // todo fix
+	}
+	fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> XCMWeight {
+		// Kusama does not currently support asset locking operations
+		Weight::MAX.ref_time()
+	}
+	fn unlock_asset(_: &MultiAsset, _: &MultiLocation) -> XCMWeight {
+		// Kusama does not currently support asset locking operations
+		Weight::MAX.ref_time()
+	}
+	fn note_unlockable(_: &MultiAsset, _: &MultiLocation) -> XCMWeight {
+		// Kusama does not currently support asset locking operations
+		Weight::MAX.ref_time()
+	}
+	fn request_unlock(_: &MultiAsset, _: &MultiLocation) -> XCMWeight {
+		// Kusama does not currently support asset locking operations
+		Weight::MAX.ref_time()
+	}
+	fn set_fees_mode(_: &bool) -> XCMWeight {
+		XcmGeneric::<Runtime>::set_fees_mode().ref_time()
+	}
+	fn set_topic(_topic: &[u8; 32]) -> XCMWeight {
+		XcmGeneric::<Runtime>::set_topic().ref_time()
+	}
+	fn clear_topic() -> XCMWeight {
+		XcmGeneric::<Runtime>::clear_topic().ref_time()
+	}
+	fn alias_origin(_: &MultiLocation) -> XCMWeight {
+		// XCM Executor does not currently support alias origin operations
+		Weight::MAX.ref_time()
+	}
+	fn unpaid_execution(_: &WeightLimit, _: &Option<MultiLocation>) -> XCMWeight {
+		XcmGeneric::<Runtime>::unpaid_execution().ref_time()
+	}
 }