Merge pull request #3544 from autonomys/relay_messages

XDM Relayer: Optimized XDM processing

Author: vedhavyas

Cargo.lock

@@ -16,7 +16,8 @@ use sp_domains::{
 use sp_domains_fraud_proof::fraud_proof::FraudProof;
 use sp_domains_fraud_proof::storage_proof::FraudProofStorageKeyRequest;
 use sp_messenger::messages::{
-    BlockMessagesWithStorageKey, ChainId, ChannelId, CrossDomainMessage, MessageId, MessageKey,
+    BlockMessagesQuery, BlockMessagesWithStorageKey, ChainId, ChannelId, ChannelStateWithNonce,
+    CrossDomainMessage, MessageId, MessageKey, MessagesWithStorageKey, Nonce as XdmNonce,
 };
 use sp_messenger::{ChannelNonce, XdmId};
 use sp_runtime::traits::NumberFor;
@@ -412,6 +413,22 @@ sp_api::impl_runtime_apis! {
         fn open_channels() -> BTreeSet<(ChainId, ChannelId)> {
             unreachable!()
         }
+
+        fn block_messages_with_query(_: BlockMessagesQuery) -> MessagesWithStorageKey {
+            unreachable!()
+        }
+
+        fn channels_and_state() -> Vec<(ChainId, ChannelId, ChannelStateWithNonce)> {
+            unreachable!()
+        }
+
+        fn first_outbox_message_nonce_to_relay(_: ChainId, _: ChannelId, _: XdmNonce) -> Option<XdmNonce> {
+            unreachable!()
+        }
+
+        fn first_inbox_message_response_nonce_to_relay(_: ChainId, _: ChannelId, _: XdmNonce) -> Option<XdmNonce> {
+            unreachable!()
+        }
     }
 
     impl sp_domains_fraud_proof::FraudProofApi<Block, DomainHeader> for Runtime {

crates/subspace-fake-runtime-api/src/lib.rs

@@ -71,7 +71,8 @@ use sp_domains_fraud_proof::storage_proof::{
 };
 use sp_messenger::endpoint::{Endpoint, EndpointHandler as EndpointHandlerT, EndpointId};
 use sp_messenger::messages::{
-    BlockMessagesWithStorageKey, ChainId, CrossDomainMessage, MessageId, MessageKey,
+    BlockMessagesQuery, BlockMessagesWithStorageKey, ChainId, ChannelStateWithNonce,
+    CrossDomainMessage, MessageId, MessageKey, MessagesWithStorageKey, Nonce as XdmNonce,
 };
 use sp_messenger::{ChannelNonce, XdmId};
 use sp_messenger_host_functions::{get_storage_key, StorageKeyRequest};
@@ -1672,7 +1673,7 @@ impl_runtime_apis! {
 
     impl sp_messenger::RelayerApi<Block, BlockNumber, BlockNumber, BlockHashFor<Block>> for Runtime {
         fn block_messages() -> BlockMessagesWithStorageKey {
-            Messenger::get_block_messages()
+            BlockMessagesWithStorageKey::default()
         }
 
         fn outbox_message_unsigned(msg: CrossDomainMessage<NumberFor<Block>, BlockHashFor<Block>, BlockHashFor<Block>>) -> Option<ExtrinsicFor<Block>> {
@@ -1683,12 +1684,12 @@ impl_runtime_apis! {
             Messenger::inbox_response_message_unsigned(msg)
         }
 
-        fn should_relay_outbox_message(dst_chain_id: ChainId, msg_id: MessageId) -> bool {
-            Messenger::should_relay_outbox_message(dst_chain_id, msg_id)
+        fn should_relay_outbox_message(_: ChainId, _: MessageId) -> bool {
+            false
         }
 
-        fn should_relay_inbox_message_response(dst_chain_id: ChainId, msg_id: MessageId) -> bool {
-            Messenger::should_relay_inbox_message_response(dst_chain_id, msg_id)
+        fn should_relay_inbox_message_response(_: ChainId, _: MessageId) -> bool {
+            false
         }
 
         fn updated_channels() -> BTreeSet<(ChainId, ChannelId)> {
@@ -1702,6 +1703,22 @@ impl_runtime_apis! {
         fn open_channels() -> BTreeSet<(ChainId, ChannelId)> {
             Messenger::open_channels()
         }
+
+        fn block_messages_with_query(query: BlockMessagesQuery) -> MessagesWithStorageKey {
+            Messenger::get_block_messages(query)
+        }
+
+        fn channels_and_state() -> Vec<(ChainId, ChannelId, ChannelStateWithNonce)> {
+            Messenger::channels_and_states()
+        }
+
+        fn first_outbox_message_nonce_to_relay(dst_chain_id: ChainId, channel_id: ChannelId, from_nonce: XdmNonce) -> Option<XdmNonce> {
+            Messenger::first_outbox_message_nonce_to_relay(dst_chain_id, channel_id, from_nonce)
+        }
+
+        fn first_inbox_message_response_nonce_to_relay(dst_chain_id: ChainId, channel_id: ChannelId, from_nonce: XdmNonce) -> Option<XdmNonce> {
+            Messenger::first_inbox_message_response_nonce_to_relay(dst_chain_id, channel_id, from_nonce)
+        }
     }
 
     impl sp_domains_fraud_proof::FraudProofApi<Block, DomainHeader> for Runtime {

crates/subspace-runtime/src/lib.rs

@@ -1,6 +1,5 @@
 //! Schema for channel update storage.
 
-use crate::RELAYER_PREFIX;
 use parity_scale_codec::{Decode, Encode};
 use sc_client_api::backend::AuxStore;
 use sp_blockchain::{Error as ClientError, Info, Result as ClientResult};
@@ -89,19 +88,6 @@ where
             channel_detail.encode().as_slice(),
         )],
         vec![],
-    )?;
-
-    let channel_nonce = ChannelNonce {
-        relay_msg_nonce: Some(channel_detail.next_inbox_nonce),
-        relay_response_msg_nonce: channel_detail.latest_response_received_message_nonce,
-    };
-    let prefix = (RELAYER_PREFIX, src_chain_id, self_chain_id).encode();
-    cleanup_chain_channel_storages(
-        backend,
-        &prefix,
-        src_chain_id,
-        channel_detail.channel_id,
-        channel_nonce,
     )
 }
 

domains/client/cross-domain-message-gossip/src/aux_schema.rs

@@ -13,6 +13,4 @@ pub use gossip_worker::{
     xdm_gossip_peers_set_config, ChainMsg, ChainSink, ChannelUpdate, GossipWorker,
     GossipWorkerBuilder, Message, MessageData,
 };
-pub use message_listener::{
-    can_allow_xdm_submission, start_cross_chain_message_listener, RELAYER_PREFIX,
-};
+pub use message_listener::{can_allow_xdm_submission, start_cross_chain_message_listener};

domains/client/cross-domain-message-gossip/src/lib.rs

@@ -33,7 +33,6 @@ use thiserror::Error;
 
 pub(crate) const LOG_TARGET: &str = "domain_message_listener";
 const TX_POOL_PREFIX: &[u8] = b"xdm_tx_pool_listener";
-pub const RELAYER_PREFIX: &[u8] = b"xdm_relayer";
 
 /// Number of blocks an already submitted XDM is not accepted since last submission.
 const XDM_ACCEPT_BLOCK_LIMIT: u32 = 15;

domains/client/cross-domain-message-gossip/src/message_listener.rs

@@ -5346,7 +5346,6 @@ async fn existing_bundle_can_be_resubmitted_to_new_fork() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_domain_sudo_calls() {
     let (_directory, mut ferdie, mut alice, account_infos) =
         setup_evm_test_accounts(Sr25519Alice, true, Sr25519Alice).await;
@@ -5764,7 +5763,6 @@ async fn test_public_evm_rejects_allow_list_domain_owner_calls() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_xdm_between_consensus_and_domain_should_work() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -5923,7 +5921,6 @@ async fn test_xdm_between_consensus_and_domain_should_work() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_xdm_between_domains_should_work() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -6047,7 +6044,6 @@ async fn test_xdm_between_domains_should_work() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_unordered_cross_domains_message_should_work() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -7143,7 +7139,6 @@ async fn test_equivocated_bundle_check() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_xdm_false_invalid_fraud_proof() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -7617,7 +7612,6 @@ async fn test_custom_api_storage_root_match_upstream_root() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_xdm_channel_allowlist_removed_after_xdm_initiated() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -7695,7 +7689,6 @@ async fn test_xdm_channel_allowlist_removed_after_xdm_initiated() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_xdm_channel_allowlist_removed_after_xdm_req_relaying() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -7802,7 +7795,6 @@ async fn test_xdm_channel_allowlist_removed_after_xdm_req_relaying() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_xdm_channel_allowlist_removed_after_xdm_resp_relaying() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -7907,7 +7899,6 @@ async fn test_xdm_channel_allowlist_removed_after_xdm_resp_relaying() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_xdm_transfer_below_existential_deposit() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -7983,7 +7974,6 @@ async fn test_xdm_transfer_below_existential_deposit() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_xdm_transfer_to_wrong_format_address() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 
@@ -8432,7 +8422,6 @@ async fn test_invalid_chain_reward_receipt() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-#[ignore]
 async fn test_domain_total_issuance_match_consensus_chain_bookkeeping_with_xdm() {
     let directory = TempDir::new().expect("Must be able to create temporary directory");
 

domains/client/domain-operator/src/tests.rs

@@ -16,6 +16,7 @@ async-channel.workspace = true
 cross-domain-message-gossip.workspace = true
 futures.workspace = true
 parity-scale-codec = { workspace = true, features = ["derive"] }
+rand.workspace = true
 sc-client-api.workspace = true
 sc-state-db.workspace = true
 sc-utils.workspace = true