XCM v3: Context & ID hash

runtime/common/src/xcm_sender.rs

@@ -27,21 +27,23 @@ 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: impl Into<MultiLocation>, msg: Xcm<()>) -> SendResult {
+	fn send_xcm(dest: impl Into<MultiLocation>, msg: Xcm<()>, _context: XcmContext) -> 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();
+				let encoded = versioned_xcm.encode();
+				let hash = sp_io::hashing::blake2_256(&encoded[..]);
 				<dmp::Pallet<T>>::queue_downward_message(
 					&config,
 					id.into(),
 					versioned_xcm.encode(),
 				)
 				.map_err(Into::<SendError>::into)?;
-				Ok(())
+				Ok(hash)
 			},
 			dest => Err(SendError::CannotReachDestination(dest, msg)),
 		}

runtime/test-runtime/src/xcm_config.rs

@@ -15,7 +15,8 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{parameter_types, traits::Everything, weights::Weight};
-use xcm::latest::prelude::*;
+use parity_scale_codec::Encode;
+use xcm::prelude::*;
 use xcm_builder::{AllowUnpaidExecutionFrom, FixedWeightBounds, SignedToAccountId32};
 use xcm_executor::{
 	traits::{InvertLocation, TransactAsset, WeightTrader},
@@ -37,8 +38,8 @@ pub type LocalOriginToLocation = (
 
 pub struct DoNothingRouter;
 impl SendXcm for DoNothingRouter {
-	fn send_xcm(_dest: impl Into<MultiLocation>, _msg: Xcm<()>) -> SendResult {
-		Ok(())
+	fn send_xcm(_dest: impl Into<MultiLocation>, msg: Xcm<()>, _context: XcmContext) -> SendResult {
+		Ok(VersionedXcm::from(msg).using_encoded(sp_io::hashing::blake2_256))
 	}
 }
 

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

@@ -217,4 +217,10 @@ impl<Call> XcmWeightInfo<Call> for WestendXcmWeight<Call> {
 	fn clear_transact_status() -> Weight {
 		XcmGeneric::<Runtime>::clear_transact_status()
 	}
+	fn set_topic(_topic: &[u8; 32]) -> Weight {
+		XcmGeneric::<Runtime>::set_topic()
+	}
+	fn clear_topic() -> Weight {
+		XcmGeneric::<Runtime>::clear_topic()
+	}
 }

runtime/westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs

@@ -167,4 +167,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	pub(crate) fn clear_transact_status() -> Weight {
 		(5_100_000 as Weight)
 	}
+	pub(crate) fn set_topic() -> Weight {
+		(1_000 as Weight)
+	}
+	pub(crate) fn clear_topic() -> Weight {
+		(1_000 as Weight)
+	}
 }

xcm/Cargo.toml

@@ -13,6 +13,9 @@ derivative = {version = "2.2.0", default-features = false, features = [ "use_cor
 log = { version = "0.4.14", default-features = false }
 xcm-procedural = { path = "procedural" }
 
+[dev-dependencies]
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
+
 [features]
 default = ["std"]
 wasm-api = []

xcm/pallet-xcm-benchmarks/src/mock.rs

@@ -16,13 +16,14 @@
 
 use crate::*;
 use frame_support::{parameter_types, weights::Weight};
+use xcm::VersionedXcm;
 use xcm_executor::traits::FilterAssetLocation;
 
 // An xcm sender/receiver akin to > /dev/null
 pub struct DevNull;
 impl xcm::opaque::latest::SendXcm for DevNull {
-	fn send_xcm(_: impl Into<MultiLocation>, _: Xcm<()>) -> SendResult {
-		Ok(())
+	fn send_xcm(_: impl Into<MultiLocation>, msg: Xcm<()>) -> SendResult {
+		Ok(VersionedXcm::from(msg).using_encoded(sp_io::hashing::blake2_256))
 	}
 }
 

xcm/pallet-xcm/Cargo.toml

@@ -10,19 +10,19 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"]
 serde = { version = "1.0.132", optional = true, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
 
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 
 xcm = { path = "..", default-features = false }
 xcm-executor = { path = "../xcm-executor", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }
 polkadot-runtime-parachains = { path = "../../runtime/parachains" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 xcm-builder = { path = "../xcm-builder" }
 polkadot-parachain = { path = "../../parachain" }
 

xcm/pallet-xcm/src/lib.rs

@@ -26,6 +26,7 @@ mod tests;
 use codec::{Decode, Encode, EncodeLike};
 use frame_support::traits::{Contains, EnsureOrigin, Get, OriginTrait};
 use scale_info::TypeInfo;
+use sp_io::hashing::blake2_256;
 use sp_runtime::{
 	traits::{BadOrigin, Saturating},
 	RuntimeDebug,
@@ -1046,8 +1047,10 @@ pub mod pallet {
 					let response = Response::Version(xcm_version);
 					let message =
 						Xcm(vec![QueryResponse { query_id, response, max_weight, querier: None }]);
-					let event = match T::XcmRouter::send_xcm(new_key.clone(), message) {
-						Ok(()) => {
+					let message_hash = message.using_encoded(blake2_256);
+					let context = XcmContext::with_message_hash(message_hash);
+					let event = match T::XcmRouter::send_xcm(new_key.clone(), message, context) {
+						Ok(_) => {
 							let value = (query_id, max_weight, xcm_version);
 							VersionNotifyTargets::<T>::insert(XCM_VERSION, key, value);
 							Event::VersionChangeNotified(new_key, xcm_version)
@@ -1097,17 +1100,21 @@ pub mod pallet {
 								max_weight,
 								querier: None,
 							}]);
-							let event = match T::XcmRouter::send_xcm(new_key.clone(), message) {
-								Ok(()) => {
-									VersionNotifyTargets::<T>::insert(
-										XCM_VERSION,
-										versioned_key,
-										(query_id, max_weight, xcm_version),
-									);
-									Event::VersionChangeNotified(new_key, xcm_version)
-								},
-								Err(e) => Event::NotifyTargetSendFail(new_key, query_id, e.into()),
-							};
+							let message_hash = message.using_encoded(blake2_256);
+							let context = XcmContext::with_message_hash(message_hash);
+							let event =
+								match T::XcmRouter::send_xcm(new_key.clone(), message, context) {
+									Ok(_) => {
+										VersionNotifyTargets::<T>::insert(
+											XCM_VERSION,
+											versioned_key,
+											(query_id, max_weight, xcm_version),
+										);
+										Event::VersionChangeNotified(new_key, xcm_version)
+									},
+									Err(e) =>
+										Event::NotifyTargetSendFail(new_key, query_id, e.into()),
+								};
 							Self::deposit_event(event);
 							weight_used.saturating_accrue(todo_vnt_notify_migrate_weight);
 						}
@@ -1133,7 +1140,10 @@ pub mod pallet {
 			});
 			// TODO #3735: Correct weight.
 			let instruction = SubscribeVersion { query_id, max_response_weight: 0 };
-			T::XcmRouter::send_xcm(dest, Xcm(vec![instruction]))?;
+			let message = Xcm(vec![instruction]);
+			let message_hash = message.using_encoded(blake2_256);
+			let context = XcmContext::with_message_hash(message_hash);
+			T::XcmRouter::send_xcm(dest, message, context)?;
 			VersionNotifiers::<T>::insert(XCM_VERSION, &versioned_dest, query_id);
 			let query_status =
 				QueryStatus::VersionNotifier { origin: versioned_dest, is_active: false };
@@ -1147,7 +1157,10 @@ pub mod pallet {
 			let versioned_dest = LatestVersionedMultiLocation(&dest);
 			let query_id = VersionNotifiers::<T>::take(XCM_VERSION, versioned_dest)
 				.ok_or(XcmError::InvalidLocation)?;
-			T::XcmRouter::send_xcm(dest.clone(), Xcm(vec![UnsubscribeVersion]))?;
+			let message = Xcm(vec![UnsubscribeVersion]);
+			let message_hash = message.using_encoded(blake2_256);
+			let context = XcmContext::with_message_hash(message_hash);
+			T::XcmRouter::send_xcm(dest.clone(), message, context)?;
 			Queries::<T>::remove(query_id);
 			Ok(())
 		}
@@ -1158,14 +1171,16 @@ pub mod pallet {
 			interior: impl Into<Junctions>,
 			dest: impl Into<MultiLocation>,
 			mut message: Xcm<()>,
-		) -> Result<(), SendError> {
+		) -> SendResult {
 			let interior = interior.into();
 			let dest = dest.into();
 			if interior != Junctions::Here {
 				message.0.insert(0, DescendOrigin(interior))
 			};
 			log::trace!(target: "xcm::send_xcm", "dest: {:?}, message: {:?}", &dest, &message);
-			T::XcmRouter::send_xcm(dest, message)
+			let message_hash = message.using_encoded(blake2_256);
+			let context = XcmContext::with_message_hash(message_hash);
+			T::XcmRouter::send_xcm(dest, message, context)
 		}
 
 		pub fn check_account() -> T::AccountId {
@@ -1354,15 +1369,23 @@ pub mod pallet {
 		///
 		/// If the `location` has an ongoing notification and when this function is called, then an
 		/// error should be returned.
-		fn start(dest: &MultiLocation, query_id: QueryId, max_weight: u64) -> XcmResult {
+		fn start(
+			dest: &MultiLocation,
+			query_id: QueryId,
+			max_weight: u64,
+			_context: XcmContext,
+		) -> XcmResult {
 			let versioned_dest = LatestVersionedMultiLocation(dest);
 			let already = VersionNotifyTargets::<T>::contains_key(XCM_VERSION, versioned_dest);
 			ensure!(!already, XcmError::InvalidLocation);
 
 			let xcm_version = T::AdvertisedXcmVersion::get();
 			let response = Response::Version(xcm_version);
 			let instruction = QueryResponse { query_id, response, max_weight, querier: None };
-			T::XcmRouter::send_xcm(dest.clone(), Xcm(vec![instruction]))?;
+			let message = Xcm(vec![instruction]);
+			let message_hash = message.using_encoded(blake2_256);
+			let context = XcmContext::with_message_hash(message_hash);
+			T::XcmRouter::send_xcm(dest.clone(), message, context)?;
 
 			let value = (query_id, max_weight, xcm_version);
 			VersionNotifyTargets::<T>::insert(XCM_VERSION, versioned_dest, value);
@@ -1371,7 +1394,7 @@ pub mod pallet {
 
 		/// Stop notifying `location` should the XCM change. This is a no-op if there was never a
 		/// subscription.
-		fn stop(dest: &MultiLocation) -> XcmResult {
+		fn stop(dest: &MultiLocation, _context: XcmContext) -> XcmResult {
 			VersionNotifyTargets::<T>::remove(XCM_VERSION, LatestVersionedMultiLocation(dest));
 			Ok(())
 		}
@@ -1384,7 +1407,7 @@ pub mod pallet {
 	}
 
 	impl<T: Config> DropAssets for Pallet<T> {
-		fn drop_assets(origin: &MultiLocation, assets: Assets) -> Weight {
+		fn drop_assets(origin: &MultiLocation, assets: Assets, _context: XcmContext) -> Weight {
 			if assets.is_empty() {
 				return 0
 			}
@@ -1402,6 +1425,7 @@ pub mod pallet {
 			origin: &MultiLocation,
 			ticket: &MultiLocation,
 			assets: &MultiAssets,
+			_context: XcmContext,
 		) -> bool {
 			let mut versioned = VersionedMultiAssets::from(assets.clone());
 			match (ticket.parents, &ticket.interior) {
@@ -1449,6 +1473,7 @@ pub mod pallet {
 			querier: Option<&MultiLocation>,
 			response: Response,
 			max_weight: Weight,
+			_context: XcmContext,
 		) -> Weight {
 			match (response, Queries::<T>::get(query_id)) {
 				(
@@ -1704,6 +1729,7 @@ impl<Origin: From<crate::Origin>> ConvertOrigin<Origin> for XcmPassthrough<Origi
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
+		_context: XcmContext,
 	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		match kind {

xcm/pallet-xcm/src/mock.rs

@@ -14,13 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+use codec::Encode;
 use frame_support::{construct_runtime, parameter_types, traits::Everything, weights::Weight};
 use polkadot_parachain::primitives::Id as ParaId;
 use polkadot_runtime_parachains::origin;
 use sp_core::H256;
 use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
 pub use sp_std::{cell::RefCell, fmt::Debug, marker::PhantomData};
-use xcm::latest::prelude::*;
+use xcm::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom,
 	AllowTopLevelPaidExecutionFrom, Case, ChildParachainAsNative, ChildParachainConvertsVia,
@@ -153,8 +154,8 @@ pub(crate) fn take_sent_xcm() -> Vec<(MultiLocation, Xcm<()>)> {
 pub struct TestSendXcm;
 impl SendXcm for TestSendXcm {
 	fn send_xcm(dest: impl Into<MultiLocation>, msg: Xcm<()>) -> SendResult {
-		SENT_XCM.with(|q| q.borrow_mut().push((dest.into(), msg)));
-		Ok(())
+		SENT_XCM.with(|q| q.borrow_mut().push((dest.into(), msg.clone())));
+		Ok(VersionedXcm::from(msg).using_encoded(sp_io::hashing::blake2_256))
 	}
 }
 /// Sender that returns error if `X8` junction and stops routing
@@ -165,8 +166,8 @@ impl SendXcm for TestSendXcmErrX8 {
 		if dest.len() == 8 {
 			Err(SendError::Transport("Destination location full"))
 		} else {
-			SENT_XCM.with(|q| q.borrow_mut().push((dest, msg)));
-			Ok(())
+			SENT_XCM.with(|q| q.borrow_mut().push((dest, msg.clone())));
+			Ok(VersionedXcm::from(msg).using_encoded(sp_io::hashing::blake2_256))
 		}
 	}
 }