Custom relay strategy

relays/bin-substrate/src/chains/kusama_messages_to_polkadot.rs

@@ -24,7 +24,7 @@ use sp_core::{Bytes, Pair};
 use bp_messages::MessageNonce;
 use bridge_runtime_common::messages::target::FromBridgedChainMessagesProof;
 use frame_support::weights::Weight;
-use messages_relay::message_lane::MessageLane;
+use messages_relay::{message_lane::MessageLane, relayer_strategy::DefaultRelayerStrategy};
 use relay_kusama_client::{
 	HeaderId as KusamaHeaderId, Kusama, SigningParams as KusamaSigningParams,
 };
@@ -45,8 +45,13 @@ use substrate_relay_helper::{
 };
 
 /// Kusama-to-Polkadot message lane.
-pub type MessageLaneKusamaMessagesToPolkadot =
-	SubstrateMessageLaneToSubstrate<Kusama, KusamaSigningParams, Polkadot, PolkadotSigningParams>;
+pub type MessageLaneKusamaMessagesToPolkadot = SubstrateMessageLaneToSubstrate<
+	Kusama,
+	KusamaSigningParams,
+	Polkadot,
+	PolkadotSigningParams,
+	DefaultRelayerStrategy,
+>;
 
 #[derive(Clone)]
 pub struct KusamaMessagesToPolkadot {
@@ -199,6 +204,7 @@ pub async fn run(
 			target_sign: params.target_sign,
 			target_transactions_mortality: params.target_transactions_mortality,
 			relayer_id_at_source: relayer_id_at_kusama,
+			_marker: Default::default(),
 		},
 	};
 

relays/bin-substrate/src/chains/millau_messages_to_rialto.rs

@@ -25,7 +25,7 @@ use sp_core::{Bytes, Pair};
 use bp_messages::MessageNonce;
 use bridge_runtime_common::messages::target::FromBridgedChainMessagesProof;
 use frame_support::weights::Weight;
-use messages_relay::message_lane::MessageLane;
+use messages_relay::{message_lane::MessageLane, relayer_strategy::DefaultRelayerStrategy};
 use relay_millau_client::{
 	HeaderId as MillauHeaderId, Millau, SigningParams as MillauSigningParams,
 };
@@ -45,8 +45,13 @@ use substrate_relay_helper::{
 };
 
 /// Millau-to-Rialto message lane.
-pub type MessageLaneMillauMessagesToRialto =
-	SubstrateMessageLaneToSubstrate<Millau, MillauSigningParams, Rialto, RialtoSigningParams>;
+pub type MessageLaneMillauMessagesToRialto = SubstrateMessageLaneToSubstrate<
+	Millau,
+	MillauSigningParams,
+	Rialto,
+	RialtoSigningParams,
+	DefaultRelayerStrategy,
+>;
 
 #[derive(Clone)]
 pub struct MillauMessagesToRialto {
@@ -196,6 +201,7 @@ pub async fn run(
 			target_sign: params.target_sign,
 			target_transactions_mortality: params.target_transactions_mortality,
 			relayer_id_at_source: relayer_id_at_millau,
+			_marker: Default::default(),
 		},
 	};
 

relays/bin-substrate/src/chains/polkadot_messages_to_kusama.rs

@@ -24,7 +24,7 @@ use sp_core::{Bytes, Pair};
 use bp_messages::MessageNonce;
 use bridge_runtime_common::messages::target::FromBridgedChainMessagesProof;
 use frame_support::weights::Weight;
-use messages_relay::message_lane::MessageLane;
+use messages_relay::{message_lane::MessageLane, relayer_strategy::DefaultRelayerStrategy};
 use relay_kusama_client::{
 	HeaderId as KusamaHeaderId, Kusama, SigningParams as KusamaSigningParams,
 };
@@ -45,8 +45,13 @@ use substrate_relay_helper::{
 };
 
 /// Polkadot-to-Kusama message lane.
-pub type MessageLanePolkadotMessagesToKusama =
-	SubstrateMessageLaneToSubstrate<Polkadot, PolkadotSigningParams, Kusama, KusamaSigningParams>;
+pub type MessageLanePolkadotMessagesToKusama = SubstrateMessageLaneToSubstrate<
+	Polkadot,
+	PolkadotSigningParams,
+	Kusama,
+	KusamaSigningParams,
+	DefaultRelayerStrategy,
+>;
 
 #[derive(Clone)]
 pub struct PolkadotMessagesToKusama {
@@ -198,6 +203,7 @@ pub async fn run(
 			target_sign: params.target_sign,
 			target_transactions_mortality: params.target_transactions_mortality,
 			relayer_id_at_source: relayer_id_at_polkadot,
+			_marker: Default::default(),
 		},
 	};
 

relays/bin-substrate/src/chains/rialto_messages_to_millau.rs

@@ -25,7 +25,7 @@ use sp_core::{Bytes, Pair};
 use bp_messages::MessageNonce;
 use bridge_runtime_common::messages::target::FromBridgedChainMessagesProof;
 use frame_support::weights::Weight;
-use messages_relay::message_lane::MessageLane;
+use messages_relay::{message_lane::MessageLane, relayer_strategy::DefaultRelayerStrategy};
 use relay_millau_client::{
 	HeaderId as MillauHeaderId, Millau, SigningParams as MillauSigningParams,
 };
@@ -45,8 +45,13 @@ use substrate_relay_helper::{
 };
 
 /// Rialto-to-Millau message lane.
-pub type MessageLaneRialtoMessagesToMillau =
-	SubstrateMessageLaneToSubstrate<Rialto, RialtoSigningParams, Millau, MillauSigningParams>;
+pub type MessageLaneRialtoMessagesToMillau = SubstrateMessageLaneToSubstrate<
+	Rialto,
+	RialtoSigningParams,
+	Millau,
+	MillauSigningParams,
+	DefaultRelayerStrategy,
+>;
 
 #[derive(Clone)]
 pub struct RialtoMessagesToMillau {
@@ -196,6 +201,7 @@ pub async fn run(
 			target_sign: params.target_sign,
 			target_transactions_mortality: params.target_transactions_mortality,
 			relayer_id_at_source: relayer_id_at_rialto,
+			_marker: Default::default(),
 		},
 	};
 

relays/bin-substrate/src/chains/rococo_messages_to_wococo.rs

@@ -24,7 +24,7 @@ use sp_core::{Bytes, Pair};
 use bp_messages::MessageNonce;
 use bridge_runtime_common::messages::target::FromBridgedChainMessagesProof;
 use frame_support::weights::Weight;
-use messages_relay::message_lane::MessageLane;
+use messages_relay::{message_lane::MessageLane, relayer_strategy::DefaultRelayerStrategy};
 use relay_rococo_client::{
 	HeaderId as RococoHeaderId, Rococo, SigningParams as RococoSigningParams,
 };
@@ -44,8 +44,13 @@ use substrate_relay_helper::{
 };
 
 /// Rococo-to-Wococo message lane.
-pub type MessageLaneRococoMessagesToWococo =
-	SubstrateMessageLaneToSubstrate<Rococo, RococoSigningParams, Wococo, WococoSigningParams>;
+pub type MessageLaneRococoMessagesToWococo = SubstrateMessageLaneToSubstrate<
+	Rococo,
+	RococoSigningParams,
+	Wococo,
+	WococoSigningParams,
+	DefaultRelayerStrategy,
+>;
 
 #[derive(Clone)]
 pub struct RococoMessagesToWococo {
@@ -196,6 +201,7 @@ pub async fn run(
 			target_sign: params.target_sign,
 			target_transactions_mortality: params.target_transactions_mortality,
 			relayer_id_at_source: relayer_id_at_rococo,
+			_marker: Default::default(),
 		},
 	};
 

relays/bin-substrate/src/chains/wococo_messages_to_rococo.rs

@@ -24,7 +24,7 @@ use sp_core::{Bytes, Pair};
 use bp_messages::MessageNonce;
 use bridge_runtime_common::messages::target::FromBridgedChainMessagesProof;
 use frame_support::weights::Weight;
-use messages_relay::message_lane::MessageLane;
+use messages_relay::{message_lane::MessageLane, relayer_strategy::DefaultRelayerStrategy};
 use relay_rococo_client::{
 	HeaderId as RococoHeaderId, Rococo, SigningParams as RococoSigningParams,
 };
@@ -44,8 +44,13 @@ use substrate_relay_helper::{
 };
 
 /// Wococo-to-Rococo message lane.
-pub type MessageLaneWococoMessagesToRococo =
-	SubstrateMessageLaneToSubstrate<Wococo, WococoSigningParams, Rococo, RococoSigningParams>;
+pub type MessageLaneWococoMessagesToRococo = SubstrateMessageLaneToSubstrate<
+	Wococo,
+	WococoSigningParams,
+	Rococo,
+	RococoSigningParams,
+	DefaultRelayerStrategy,
+>;
 
 #[derive(Clone)]
 pub struct WococoMessagesToRococo {
@@ -195,6 +200,7 @@ pub async fn run(
 			target_sign: params.target_sign,
 			target_transactions_mortality: params.target_transactions_mortality,
 			relayer_id_at_source: relayer_id_at_wococo,
+			_marker: Default::default(),
 		},
 	};
 

relays/lib-substrate-relay/src/messages_lane.rs

@@ -20,12 +20,16 @@ use crate::{
 	messages_source::SubstrateMessagesProof, messages_target::SubstrateMessagesReceivingProof,
 	on_demand_headers::OnDemandHeadersRelay,
 };
+use std::marker::PhantomData;
 
 use async_trait::async_trait;
 use bp_messages::{LaneId, MessageNonce};
 use bp_runtime::{AccountIdOf, IndexOf};
 use frame_support::weights::Weight;
-use messages_relay::message_lane::{MessageLane, SourceHeaderIdOf, TargetHeaderIdOf};
+use messages_relay::{
+	message_lane::{MessageLane, SourceHeaderIdOf, TargetHeaderIdOf},
+	relayer_strategy::RelayerStrategy,
+};
 use relay_substrate_client::{
 	metrics::{FloatStorageValueMetric, StorageProofOverheadMetric},
 	BlockNumberOf, Chain, Client, HashOf,
@@ -145,6 +149,7 @@ pub struct SubstrateMessageLaneToSubstrate<
 	SourceSignParams,
 	Target: Chain,
 	TargetSignParams,
+	Strategy: RelayerStrategy,
 > {
 	/// Client for the source Substrate chain.
 	pub source_client: Client<Source>,
@@ -160,10 +165,18 @@ pub struct SubstrateMessageLaneToSubstrate<
 	pub target_transactions_mortality: Option<u32>,
 	/// Account id of relayer at the source chain.
 	pub relayer_id_at_source: Source::AccountId,
+	/// marker
+	pub _marker: PhantomData<Strategy>,
 }
 
-impl<Source: Chain, SourceSignParams: Clone, Target: Chain, TargetSignParams: Clone> Clone
-	for SubstrateMessageLaneToSubstrate<Source, SourceSignParams, Target, TargetSignParams>
+impl<
+		Source: Chain,
+		SourceSignParams: Clone,
+		Target: Chain,
+		TargetSignParams: Clone,
+		Strategy: RelayerStrategy,
+	> Clone
+	for SubstrateMessageLaneToSubstrate<Source, SourceSignParams, Target, TargetSignParams, Strategy>
 {
 	fn clone(&self) -> Self {
 		Self {
@@ -174,12 +187,19 @@ impl<Source: Chain, SourceSignParams: Clone, Target: Chain, TargetSignParams: Cl
 			target_sign: self.target_sign.clone(),
 			target_transactions_mortality: self.target_transactions_mortality,
 			relayer_id_at_source: self.relayer_id_at_source.clone(),
+			_marker: self._marker.clone(),
 		}
 	}
 }
 
-impl<Source: Chain, SourceSignParams, Target: Chain, TargetSignParams> MessageLane
-	for SubstrateMessageLaneToSubstrate<Source, SourceSignParams, Target, TargetSignParams>
+impl<
+		Source: Chain,
+		SourceSignParams,
+		Target: Chain,
+		TargetSignParams,
+		Strategy: RelayerStrategy,
+	> MessageLane
+	for SubstrateMessageLaneToSubstrate<Source, SourceSignParams, Target, TargetSignParams, Strategy>
 where
 	SourceSignParams: Clone + Send + Sync + 'static,
 	TargetSignParams: Clone + Send + Sync + 'static,
@@ -198,6 +218,7 @@ where
 
 	type TargetHeaderNumber = BlockNumberOf<Target>;
 	type TargetHeaderHash = HashOf<Target>;
+	type RelayerStrategy = Strategy;
 }
 
 /// Returns maximal number of messages and their maximal cumulative dispatch weight, based

relays/lib-substrate-relay/src/messages_target.rs

@@ -202,12 +202,8 @@ where
 			P::MESSAGE_PALLET_NAME_AT_TARGET,
 			&self.lane_id,
 		);
-		let proof = self
-			.client
-			.prove_storage(vec![inbound_data_key], id.1)
-			.await?
-			.iter_nodes()
-			.collect();
+		let proof =
+			self.client.prove_storage(vec![inbound_data_key], id.1).await?.iter_nodes().collect();
 		let proof = FromBridgedChainMessagesDeliveryProof {
 			bridged_header_hash: id.1,
 			storage_proof: proof,
@@ -437,6 +433,7 @@ fn compute_prepaid_messages_refund<P: SubstrateMessageLane>(
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use messages_relay::relayer_strategy::DefaultRelayerStrategy;
 	use relay_rococo_client::{Rococo, SigningParams as RococoSigningParams};
 	use relay_wococo_client::{SigningParams as WococoSigningParams, Wococo};
 
@@ -449,6 +446,7 @@ mod tests {
 			RococoSigningParams,
 			Wococo,
 			WococoSigningParams,
+			DefaultRelayerStrategy,
 		>;
 
 		const OUTBOUND_LANE_MESSAGE_DETAILS_METHOD: &'static str = "";

relays/messages/src/lib.rs

@@ -29,6 +29,7 @@ mod metrics;
 
 pub mod message_lane;
 pub mod message_lane_loop;
+pub mod relayer_strategy;
 
 mod message_race_delivery;
 mod message_race_loop;

relays/messages/src/message_lane.rs

@@ -19,6 +19,7 @@
 //! 1) relay new messages from source to target node;
 //! 2) relay proof-of-delivery from target to source node.
 
+use crate::relayer_strategy::RelayerStrategy;
 use num_traits::{SaturatingAdd, Zero};
 use relay_utils::{BlockNumberBase, HeaderId};
 use std::{fmt::Debug, ops::Sub};
@@ -58,6 +59,8 @@ pub trait MessageLane: 'static + Clone + Send + Sync {
 	type TargetHeaderNumber: BlockNumberBase;
 	/// Hash of the target header.
 	type TargetHeaderHash: Clone + Debug + Default + PartialEq + Send + Sync;
+	/// Relayer strategy
+	type RelayerStrategy: RelayerStrategy;
 }
 
 /// Source header id within given one-way message lane.