From 893c9a60ed7984319a8cc7e85613c80cd6ed2e2d Mon Sep 17 00:00:00 2001
From: Shaun Wang <spxwang@gmail.com>
Date: Tue, 23 Feb 2021 11:21:17 +1300
Subject: [PATCH] Fix XCM encoding in HRMP pallet. (#2491)

---
 polkadot/runtime/parachains/src/hrmp.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/polkadot/runtime/parachains/src/hrmp.rs b/polkadot/runtime/parachains/src/hrmp.rs
index 2c74a2315e..117c1e066d 100644
--- a/polkadot/runtime/parachains/src/hrmp.rs
+++ b/polkadot/runtime/parachains/src/hrmp.rs
@@ -934,14 +934,14 @@ impl<T: Config> Module<T> {
 		<Self as Store>::HrmpOpenChannelRequestsList::append(channel_id);
 
 		let notification_bytes = {
-			use xcm::v0::Xcm;
+			use xcm::{v0::Xcm, VersionedXcm};
 			use parity_scale_codec::Encode as _;
 
-			Xcm::HrmpNewChannelOpenRequest {
+			VersionedXcm::from(Xcm::HrmpNewChannelOpenRequest {
 				sender: u32::from(origin),
 				max_capacity: proposed_max_capacity,
 				max_message_size: proposed_max_message_size,
-			}
+			})
 			.encode()
 		};
 		if let Err(dmp::QueueDownwardMessageError::ExceedsMaxMessageSize) =
@@ -1000,11 +1000,11 @@ impl<T: Config> Module<T> {
 
 		let notification_bytes = {
 			use parity_scale_codec::Encode as _;
-			use xcm::v0::Xcm;
+			use xcm::{v0::Xcm, VersionedXcm};
 
-			Xcm::HrmpChannelAccepted {
+			VersionedXcm::from(Xcm::HrmpChannelAccepted {
 				recipient: u32::from(origin),
-			}
+			})
 			.encode()
 		};
 		if let Err(dmp::QueueDownwardMessageError::ExceedsMaxMessageSize) =
@@ -1043,13 +1043,13 @@ impl<T: Config> Module<T> {
 		let config = <configuration::Module<T>>::config();
 		let notification_bytes = {
 			use parity_scale_codec::Encode as _;
-			use xcm::v0::Xcm;
+			use xcm::{v0::Xcm, VersionedXcm};
 
-			Xcm::HrmpChannelClosing {
+			VersionedXcm::from(Xcm::HrmpChannelClosing {
 				initiator: u32::from(origin),
 				sender: u32::from(channel_id.sender),
 				recipient: u32::from(channel_id.recipient),
-			}
+			})
 			.encode()
 		};
 		let opposite_party = if origin == channel_id.sender {