Merge pull request #3503 from autonomys/xdm_v1

vedhavyas · web-flow · commit 3dc71ad8a915 · 2025-05-01T02:21:58.000Z
Migrate to V1 XDm message format
diff --git a/crates/subspace-runtime/src/lib.rs b/crates/subspace-runtime/src/lib.rs
@@ -724,7 +724,7 @@ parameter_types! {
     // TODO update the fee model
     pub const ChannelFeeModel: FeeModel<Balance> = FeeModel{relay_fee: SSC};
     pub const MaxOutgoingMessages: u32 = MAX_OUTGOING_MESSAGES;
-    pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V0;
+    pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V1;
 }
 
 // ensure the max outgoing messages is not 0.
diff --git a/domains/pallets/messenger/src/mock.rs b/domains/pallets/messenger/src/mock.rs
@@ -64,7 +64,7 @@ macro_rules! impl_runtime {
             pub const ChannelFeeModel: FeeModel<Balance> = FeeModel{relay_fee: 1};
             pub const MaxOutgoingMessages: u32 = 25;
             pub const FeeMultiplier: u32 = 1;
-            pub const MessageVersion: crate::MessageVersion = crate::MessageVersion::V0;
+            pub const MessageVersion: crate::MessageVersion = crate::MessageVersion::V1;
         }
 
         #[derive(
diff --git a/domains/pallets/messenger/src/tests.rs b/domains/pallets/messenger/src/tests.rs
@@ -22,8 +22,8 @@ use sp_domains::proof_provider_and_verifier::{StorageProofVerifier, Verification
 use sp_domains::DomainAllowlistUpdates;
 use sp_messenger::endpoint::{Endpoint, EndpointPayload, EndpointRequest, Sender};
 use sp_messenger::messages::{
-    ChainId, ChannelOpenParams, CrossDomainMessage, MessageWeightTag, Payload, Proof,
-    ProtocolMessageRequest, RequestResponse, VersionedPayload,
+    ChainId, ChannelOpenParams, ChannelOpenParamsV1, CrossDomainMessage, MessageWeightTag,
+    PayloadV1, Proof, ProtocolMessageRequest, RequestResponse, VersionedPayload,
 };
 use sp_mmr_primitives::{EncodableOpaqueLeaf, LeafProof as MmrProof};
 use sp_runtime::traits::{Convert, Zero};
@@ -64,10 +64,9 @@ fn create_channel(chain_id: ChainId, channel_id: ChannelId) {
     assert_eq!(msg.channel_id, channel_id);
     assert_eq!(
         msg.payload,
-        VersionedPayload::V0(Payload::Protocol(RequestResponse::Request(
-            ProtocolMessageRequest::ChannelOpen(ChannelOpenParams {
+        VersionedPayload::V1(PayloadV1::Protocol(RequestResponse::Request(
+            ProtocolMessageRequest::ChannelOpen(ChannelOpenParamsV1 {
                 max_outgoing_messages: 25,
-                fee_model: <chain_a::Runtime as crate::Config>::ChannelFeeModel::get()
             })
         )))
     );
@@ -127,7 +126,7 @@ fn close_channel(chain_id: ChainId, channel_id: ChannelId, last_delivered_nonce:
     );
     assert_eq!(
         msg.payload,
-        VersionedPayload::V0(Payload::Protocol(RequestResponse::Request(
+        VersionedPayload::V1(PayloadV1::Protocol(RequestResponse::Request(
             ProtocolMessageRequest::ChannelClose
         )))
     );
diff --git a/domains/pallets/transporter/src/mock.rs b/domains/pallets/transporter/src/mock.rs
@@ -58,7 +58,7 @@ parameter_types! {
     pub TransactionWeightFee: Balance = 100_000;
     pub const MaxOutgoingMessages: u32 = 25;
     pub const FeeMultiplier: u32 = 1;
-    pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V0;
+    pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V1;
 }
 
 #[derive(
diff --git a/domains/runtime/auto-id/src/lib.rs b/domains/runtime/auto-id/src/lib.rs
@@ -411,7 +411,7 @@ parameter_types! {
     // TODO update the fee model
     pub const ChannelFeeModel: FeeModel<Balance> = FeeModel{relay_fee: SSC};
     pub const MaxOutgoingMessages: u32 = MAX_OUTGOING_MESSAGES;
-    pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V0;
+    pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V1;
 }
 
 // ensure the max outgoing messages is not 0.
diff --git a/domains/runtime/evm/src/lib.rs b/domains/runtime/evm/src/lib.rs
@@ -558,7 +558,7 @@ parameter_types! {
     // TODO update the fee model
     pub const ChannelFeeModel: FeeModel<Balance> = FeeModel{relay_fee: SSC};
     pub const MaxOutgoingMessages: u32 = MAX_OUTGOING_MESSAGES;
-    pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V0;
+    pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V1;
 }
 
 // ensure the max outgoing messages is not 0.

Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ parameter_types! {`
`724`	`724`	`// TODO update the fee model`
`725`	`725`	`pub const ChannelFeeModel: FeeModel<Balance> = FeeModel{relay_fee: SSC};`
`726`	`726`	`pub const MaxOutgoingMessages: u32 = MAX_OUTGOING_MESSAGES;`
`727`		`- pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V0;`
	`727`	`+ pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V1;`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`// ensure the max outgoing messages is not 0.`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ macro_rules! impl_runtime {`
`64`	`64`	`pub const ChannelFeeModel: FeeModel<Balance> = FeeModel{relay_fee: 1};`
`65`	`65`	`pub const MaxOutgoingMessages: u32 = 25;`
`66`	`66`	`pub const FeeMultiplier: u32 = 1;`
`67`		`- pub const MessageVersion: crate::MessageVersion = crate::MessageVersion::V0;`
	`67`	`+ pub const MessageVersion: crate::MessageVersion = crate::MessageVersion::V1;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`#[derive(`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ parameter_types! {`
`58`	`58`	`pub TransactionWeightFee: Balance = 100_000;`
`59`	`59`	`pub const MaxOutgoingMessages: u32 = 25;`
`60`	`60`	`pub const FeeMultiplier: u32 = 1;`
`61`		`- pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V0;`
	`61`	`+ pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V1;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`#[derive(`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ parameter_types! {`
`411`	`411`	`// TODO update the fee model`
`412`	`412`	`pub const ChannelFeeModel: FeeModel<Balance> = FeeModel{relay_fee: SSC};`
`413`	`413`	`pub const MaxOutgoingMessages: u32 = MAX_OUTGOING_MESSAGES;`
`414`		`- pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V0;`
	`414`	`+ pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V1;`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`// ensure the max outgoing messages is not 0.`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ parameter_types! {`
`558`	`558`	`// TODO update the fee model`
`559`	`559`	`pub const ChannelFeeModel: FeeModel<Balance> = FeeModel{relay_fee: SSC};`
`560`	`560`	`pub const MaxOutgoingMessages: u32 = MAX_OUTGOING_MESSAGES;`
`561`		`- pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V0;`
	`561`	`+ pub const MessageVersion: pallet_messenger::MessageVersion = pallet_messenger::MessageVersion::V1;`
`562`	`562`	`}`
`563`	`563`
`564`	`564`	`// ensure the max outgoing messages is not 0.`