XCM v2: Scripting, Query responses, Exception handling and Error reporting

runtime/common/src/xcm_sender.rs

@@ -19,30 +19,30 @@
 use parity_scale_codec::Encode;
 use runtime_parachains::{configuration, dmp};
 use sp_std::marker::PhantomData;
-use xcm::opaque::latest::*;
+use xcm::latest::prelude::*;
 
 /// XCM sender for relay chain. It only sends downward message.
 pub struct ChildParachainRouter<T, W>(PhantomData<(T, W)>);
 
 impl<T: configuration::Config + dmp::Config, W: xcm::WrapVersion> SendXcm
 	for ChildParachainRouter<T, W>
 {
-	fn send_xcm(dest: MultiLocation, msg: Xcm) -> Result {
+	fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> SendResult {
 		match dest {
-			MultiLocation { parents: 0, interior: Junctions::X1(Junction::Parachain(id)) } => {
+			MultiLocation { parents: 0, interior: X1(Parachain(id)) } => {
 				// Downward message passing.
 				let versioned_xcm =
-					W::wrap_version(&dest, msg).map_err(|()| Error::DestinationUnsupported)?;
+					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::<Error>::into)?;
+				.map_err(Into::<SendError>::into)?;
 				Ok(())
 			},
-			dest => Err(Error::CannotReachDestination(dest, msg)),
+			dest => Err(SendError::CannotReachDestination(dest, msg)),
 		}
 	}
 }

runtime/kusama/src/lib.rs

@@ -1325,6 +1325,8 @@ impl pallet_xcm::Config for Runtime {
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
+	type Origin = Origin;
+	type Call = Call;
 }
 
 parameter_types! {

runtime/parachains/src/dmp.rs

@@ -22,7 +22,7 @@ use frame_support::pallet_prelude::*;
 use primitives::v1::{DownwardMessage, Hash, Id as ParaId, InboundDownwardMessage};
 use sp_runtime::traits::{BlakeTwo256, Hash as HashT, SaturatedConversion};
 use sp_std::{fmt, prelude::*};
-use xcm::latest::Error as XcmError;
+use xcm::latest::SendError;
 
 pub use pallet::*;
 
@@ -33,10 +33,10 @@ pub enum QueueDownwardMessageError {
 	ExceedsMaxMessageSize,
 }
 
-impl From<QueueDownwardMessageError> for XcmError {
+impl From<QueueDownwardMessageError> for SendError {
 	fn from(err: QueueDownwardMessageError) -> Self {
 		match err {
-			QueueDownwardMessageError::ExceedsMaxMessageSize => XcmError::ExceedsMaxMessageSize,
+			QueueDownwardMessageError::ExceedsMaxMessageSize => SendError::ExceedsMaxMessageSize,
 		}
 	}
 }

runtime/parachains/src/hrmp.rs

@@ -1007,13 +1007,13 @@ impl<T: Config> Pallet<T> {
 
 		let notification_bytes = {
 			use parity_scale_codec::Encode as _;
-			use xcm::opaque::{v1::Xcm, VersionedXcm};
+			use xcm::opaque::{latest::prelude::*, VersionedXcm};
 
-			VersionedXcm::from(Xcm::HrmpNewChannelOpenRequest {
+			VersionedXcm::from(Xcm(vec![HrmpNewChannelOpenRequest {
 				sender: u32::from(origin),
 				max_capacity: proposed_max_capacity,
 				max_message_size: proposed_max_message_size,
-			})
+			}]))
 			.encode()
 		};
 		if let Err(dmp::QueueDownwardMessageError::ExceedsMaxMessageSize) =
@@ -1066,9 +1066,9 @@ impl<T: Config> Pallet<T> {
 
 		let notification_bytes = {
 			use parity_scale_codec::Encode as _;
-			use xcm::opaque::{v1::Xcm, VersionedXcm};
-
-			VersionedXcm::from(Xcm::HrmpChannelAccepted { recipient: u32::from(origin) }).encode()
+			use xcm::opaque::{latest::prelude::*, VersionedXcm};
+			let xcm = Xcm(vec![HrmpChannelAccepted { recipient: u32::from(origin) }]);
+			VersionedXcm::from(xcm).encode()
 		};
 		if let Err(dmp::QueueDownwardMessageError::ExceedsMaxMessageSize) =
 			<dmp::Pallet<T>>::queue_downward_message(&config, sender, notification_bytes)
@@ -1106,13 +1106,13 @@ impl<T: Config> Pallet<T> {
 		let config = <configuration::Pallet<T>>::config();
 		let notification_bytes = {
 			use parity_scale_codec::Encode as _;
-			use xcm::opaque::{v1::Xcm, VersionedXcm};
+			use xcm::opaque::{latest::prelude::*, VersionedXcm};
 
-			VersionedXcm::from(Xcm::HrmpChannelClosing {
+			VersionedXcm::from(Xcm(vec![HrmpChannelClosing {
 				initiator: u32::from(origin),
 				sender: u32::from(channel_id.sender),
 				recipient: u32::from(channel_id.recipient),
-			})
+			}]))
 			.encode()
 		};
 		let opposite_party =

runtime/rococo/src/lib.rs

@@ -696,6 +696,8 @@ impl pallet_xcm::Config for Runtime {
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
+	type Origin = Origin;
+	type Call = Call;
 }
 
 impl parachains_session_info::Config for Runtime {}

runtime/test-runtime/src/lib.rs

@@ -512,6 +512,8 @@ impl pallet_xcm::Config for Runtime {
 	type XcmExecutor = xcm_executor::XcmExecutor<xcm_config::XcmConfig>;
 	type XcmTeleportFilter = Everything;
 	type XcmReserveTransferFilter = Everything;
+	type Origin = Origin;
+	type Call = Call;
 }
 
 impl parachains_hrmp::Config for Runtime {

runtime/test-runtime/src/xcm_config.rs

@@ -15,10 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{parameter_types, traits::Everything, weights::Weight};
-use xcm::latest::{
-	Error as XcmError, Junctions::Here, MultiAsset, MultiLocation, NetworkId, Parent,
-	Result as XcmResult, SendXcm, Xcm,
-};
+use xcm::latest::prelude::*;
 use xcm_builder::{AllowUnpaidExecutionFrom, FixedWeightBounds, SignedToAccountId32};
 use xcm_executor::{
 	traits::{InvertLocation, TransactAsset, WeightTrader},
@@ -38,7 +35,7 @@ pub type LocalOriginToLocation = (
 
 pub struct DoNothingRouter;
 impl SendXcm for DoNothingRouter {
-	fn send_xcm(_dest: MultiLocation, _msg: Xcm<()>) -> XcmResult {
+	fn send_xcm(_dest: MultiLocation, _msg: Xcm<()>) -> SendResult {
 		Ok(())
 	}
 }

runtime/westend/src/lib.rs

@@ -957,6 +957,8 @@ impl pallet_xcm::Config for Runtime {
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, Call>;
 	type LocationInverter = LocationInverter<Ancestry>;
+	type Origin = Origin;
+	type Call = Call;
 }
 
 construct_runtime! {

scripts/gitlab/lingua.dic

@@ -108,6 +108,7 @@ inverter/MS
 io
 IP/S
 isn
+isolatable
 isolate/BG
 iterable
 jaeger/MS
@@ -200,6 +201,7 @@ responder/SM
 retriability
 reverify
 roundtrip/MS
+routable
 rpc
 RPC/MS
 runtime/MS
@@ -231,6 +233,7 @@ taskmanager/MS
 TCP
 teleport/D
 teleport/RG
+teleports
 teleportation/SM
 teleporter/SM
 teleporters
@@ -251,6 +254,7 @@ unordered
 unreceived
 unreserve
 unreserving
+unroutable
 unservable/B
 untrusted
 untyped