Modify RelayEncoder precompile to accept HRMP Cancel variant (moonbea…

…m-foundation#2179) * changed Cancel variant name * added Cancel variant to RelayEncoder * fixed parachain files within runtimes xcm_mock
AvaProtocol · May 16, 2023 · 74e049b · 74e049b
1 parent 6061042
commit 74e049b
Show file tree

Hide file tree

Showing 15 changed files with 2,810 additions and 2,443 deletions.
diff --git a/pallets/xcm-transactor/src/lib.rs b/pallets/xcm-transactor/src/lib.rs
@@ -779,7 +779,7 @@ pub mod pallet {
 				HrmpOperation::Cancel {
 					channel_id,
 					open_requests,
-				} => T::HrmpEncoder::hrmp_encode_call(HrmpAvailableCalls::CancelOpenChannel(
+				} => T::HrmpEncoder::hrmp_encode_call(HrmpAvailableCalls::CancelOpenRequest(
 					channel_id,
 					open_requests,
 				)),

diff --git a/pallets/xcm-transactor/src/mock.rs b/pallets/xcm-transactor/src/mock.rs
@@ -279,7 +279,7 @@ impl HrmpEncodeCall for MockHrmpEncoder {
 				Ok(RelayCall::Hrmp(HrmpCall::Accept()).encode())
 			}
 			HrmpAvailableCalls::CloseChannel(_) => Ok(RelayCall::Hrmp(HrmpCall::Close()).encode()),
-			HrmpAvailableCalls::CancelOpenChannel(_, _) => {
+			HrmpAvailableCalls::CancelOpenRequest(_, _) => {
 				Ok(RelayCall::Hrmp(HrmpCall::Cancel()).encode())
 			}
 		}

diff --git a/precompiles/relay-encoder/RelayEncoder.sol b/precompiles/relay-encoder/RelayEncoder.sol
@@ -133,4 +133,14 @@ interface RelayEncoder {
         external
         pure
         returns (bytes memory result);
+
+    /// @dev Encode 'hrmp.cancel_open_request' relay call
+    /// @custom:selector 8fd5ce49
+    /// @param sender: The paraId of the sender
+    /// @param recipient: The paraId of the recipient
+    /// @param openRequests: The number of open requests
+    function encodeHrmpCancelOpenRequest(uint32 sender, uint32 recipient, uint32 openRequests) 
+        external 
+        pure 
+        returns (bytes memory result);
 }
diff --git a/precompiles/relay-encoder/src/lib.rs b/precompiles/relay-encoder/src/lib.rs
@@ -339,6 +339,33 @@ where
 		.into();
 		Ok(encoded)
 	}
+
+	#[precompile::public("encodeHrmpCancelOpenRequest(uint32,uint32,uint32)")]
+	#[precompile::public("encode_hrmp_cancel_open_request(uint32,uint32,uint32)")]
+	#[precompile::view]
+	fn encode_hrmp_cancel_open_request(
+		handle: &mut impl PrecompileHandle,
+		sender: u32,
+		recipient: u32,
+		open_requests: u32,
+	) -> EvmResult<UnboundedBytes> {
+		handle.record_cost(RuntimeHelper::<Runtime>::db_read_gas_cost())?;
+
+		let encoded = RelayRuntime::hrmp_encode_call(HrmpAvailableCalls::CancelOpenRequest(
+			relay_chain::v2::HrmpChannelId {
+				sender: sender.into(),
+				recipient: recipient.into(),
+			},
+			open_requests,
+		))
+		.map_err(|_| {
+			RevertReason::custom("Non-implemented hrmp encoding for transactor")
+				.in_field("transactor")
+		})?
+		.as_slice()
+		.into();
+		Ok(encoded)
+	}
 }
 
 pub fn u256_to_relay_amount(value: U256) -> EvmResult<relay_chain::Balance> {

diff --git a/precompiles/relay-encoder/src/test_relay_runtime.rs b/precompiles/relay-encoder/src/test_relay_runtime.rs
@@ -130,7 +130,7 @@ impl xcm_primitives::HrmpEncodeCall for TestEncoder {
 			xcm_primitives::HrmpAvailableCalls::CloseChannel(a) => {
 				Ok(RelayCall::Hrmp(HrmpCall::CloseChannel(a.clone())).encode())
 			}
-			xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(a, b) => {
+			xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(a, b) => {
 				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenChannel(a.clone(), b.clone())).encode())
 			}
 		}

diff --git a/primitives/xcm/src/transactor_traits.rs b/primitives/xcm/src/transactor_traits.rs
@@ -31,7 +31,7 @@ pub enum HrmpAvailableCalls {
 	InitOpenChannel(ParaId, u32, u32),
 	AcceptOpenChannel(ParaId),
 	CloseChannel(HrmpChannelId),
-	CancelOpenChannel(HrmpChannelId, u32),
+	CancelOpenRequest(HrmpChannelId, u32),
 }
 
 // Trait that the ensures we can encode a call with utility functions.

diff --git a/runtime/moonbase/tests/xcm_mock/parachain.rs b/runtime/moonbase/tests/xcm_mock/parachain.rs
@@ -963,7 +963,7 @@ pub enum HrmpCall {
 	#[codec(index = 2u8)]
 	CloseChannel(HrmpChannelId),
 	#[codec(index = 6u8)]
-	CancelOpenChannel(HrmpChannelId, u32),
+	CancelOpenRequest(HrmpChannelId, u32),
 }
 
 #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
@@ -1010,8 +1010,8 @@ impl xcm_primitives::HrmpEncodeCall for MockHrmpEncoder {
 			xcm_primitives::HrmpAvailableCalls::CloseChannel(a) => {
 				Ok(RelayCall::Hrmp(HrmpCall::CloseChannel(a.clone())).encode())
 			}
-			xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(a, b) => {
-				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenChannel(a.clone(), b.clone())).encode())
+			xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(a, b) => {
+				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenRequest(a.clone(), b.clone())).encode())
 			}
 		}
 	}

diff --git a/runtime/moonbeam/tests/xcm_mock/parachain.rs b/runtime/moonbeam/tests/xcm_mock/parachain.rs
@@ -933,7 +933,7 @@ pub enum HrmpCall {
 	#[codec(index = 2u8)]
 	CloseChannel(HrmpChannelId),
 	#[codec(index = 6u8)]
-	CancelOpenChannel(HrmpChannelId, u32),
+	CancelOpenRequest(HrmpChannelId, u32),
 }
 
 #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
@@ -980,8 +980,8 @@ impl xcm_primitives::HrmpEncodeCall for MockHrmpEncoder {
 			xcm_primitives::HrmpAvailableCalls::CloseChannel(a) => {
 				Ok(RelayCall::Hrmp(HrmpCall::CloseChannel(a.clone())).encode())
 			}
-			xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(a, b) => {
-				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenChannel(a.clone(), b.clone())).encode())
+			xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(a, b) => {
+				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenRequest(a.clone(), b.clone())).encode())
 			}
 		}
 	}

diff --git a/runtime/moonriver/tests/xcm_mock/parachain.rs b/runtime/moonriver/tests/xcm_mock/parachain.rs
@@ -941,7 +941,7 @@ pub enum HrmpCall {
 	#[codec(index = 2u8)]
 	CloseChannel(HrmpChannelId),
 	#[codec(index = 6u8)]
-	CancelOpenChannel(HrmpChannelId, u32),
+	CancelOpenRequest(HrmpChannelId, u32),
 }
 
 #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
@@ -988,8 +988,8 @@ impl xcm_primitives::HrmpEncodeCall for MockHrmpEncoder {
 			xcm_primitives::HrmpAvailableCalls::CloseChannel(a) => {
 				Ok(RelayCall::Hrmp(HrmpCall::CloseChannel(a.clone())).encode())
 			}
-			xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(a, b) => {
-				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenChannel(a.clone(), b.clone())).encode())
+			xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(a, b) => {
+				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenRequest(a.clone(), b.clone())).encode())
 			}
 		}
 	}

diff --git a/runtime/relay-encoder/src/kusama.rs b/runtime/relay-encoder/src/kusama.rs
@@ -81,7 +81,7 @@ pub enum HrmpCall {
 	#[codec(index = 2u8)]
 	CloseChannel(HrmpChannelId),
 	#[codec(index = 6u8)]
-	CancelOpenChannel(HrmpChannelId, u32),
+	CancelOpenRequest(HrmpChannelId, u32),
 }
 
 pub struct KusamaEncoder;
@@ -115,8 +115,8 @@ impl xcm_primitives::HrmpEncodeCall for KusamaEncoder {
 			xcm_primitives::HrmpAvailableCalls::CloseChannel(a) => {
 				Ok(RelayCall::Hrmp(HrmpCall::CloseChannel(a.clone())).encode())
 			}
-			xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(a, b) => {
-				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenChannel(a.clone(), b.clone())).encode())
+			xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(a, b) => {
+				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenRequest(a.clone(), b.clone())).encode())
 			}
 		}
 	}
@@ -580,7 +580,7 @@ mod tests {
 
 		assert_eq!(
 			<KusamaEncoder as xcm_primitives::HrmpEncodeCall>::hrmp_encode_call(
-				xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(
+				xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(
 					channel_id.clone(),
 					open_requests
 				)

diff --git a/runtime/relay-encoder/src/polkadot.rs b/runtime/relay-encoder/src/polkadot.rs
@@ -83,7 +83,7 @@ pub enum HrmpCall {
 	#[codec(index = 2u8)]
 	CloseChannel(HrmpChannelId),
 	#[codec(index = 6u8)]
-	CancelOpenChannel(HrmpChannelId, u32),
+	CancelOpenRequest(HrmpChannelId, u32),
 }
 
 pub struct PolkadotEncoder;
@@ -117,8 +117,8 @@ impl xcm_primitives::HrmpEncodeCall for PolkadotEncoder {
 			xcm_primitives::HrmpAvailableCalls::CloseChannel(a) => {
 				Ok(RelayCall::Hrmp(HrmpCall::CloseChannel(a.clone())).encode())
 			}
-			xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(a, b) => {
-				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenChannel(a.clone(), b.clone())).encode())
+			xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(a, b) => {
+				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenRequest(a.clone(), b.clone())).encode())
 			}
 		}
 	}
@@ -582,7 +582,7 @@ mod tests {
 
 		assert_eq!(
 			<PolkadotEncoder as xcm_primitives::HrmpEncodeCall>::hrmp_encode_call(
-				xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(
+				xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(
 					channel_id.clone(),
 					open_requests
 				)

diff --git a/runtime/relay-encoder/src/westend.rs b/runtime/relay-encoder/src/westend.rs
@@ -82,7 +82,7 @@ pub enum HrmpCall {
 	#[codec(index = 2u8)]
 	CloseChannel(HrmpChannelId),
 	#[codec(index = 6u8)]
-	CancelOpenChannel(HrmpChannelId, u32),
+	CancelOpenRequest(HrmpChannelId, u32),
 }
 
 pub struct WestendEncoder;
@@ -116,8 +116,8 @@ impl xcm_primitives::HrmpEncodeCall for WestendEncoder {
 			xcm_primitives::HrmpAvailableCalls::CloseChannel(a) => {
 				Ok(RelayCall::Hrmp(HrmpCall::CloseChannel(a.clone())).encode())
 			}
-			xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(a, b) => {
-				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenChannel(a.clone(), b.clone())).encode())
+			xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(a, b) => {
+				Ok(RelayCall::Hrmp(HrmpCall::CancelOpenRequest(a.clone(), b.clone())).encode())
 			}
 		}
 	}
@@ -580,7 +580,7 @@ mod tests {
 
 		assert_eq!(
 			<WestendEncoder as xcm_primitives::HrmpEncodeCall>::hrmp_encode_call(
-				xcm_primitives::HrmpAvailableCalls::CancelOpenChannel(
+				xcm_primitives::HrmpAvailableCalls::CancelOpenRequest(
 					channel_id.clone(),
 					open_requests
 				)

diff --git a/tests/contracts/compiled/RelayEncoder.json b/tests/contracts/compiled/RelayEncoder.json