Merge commit '114f487fd9daef4b4cd791446372a9a690c137ac' into update-bridges-subtree-r/w

polkadot/bridges/relays/messages/Cargo.toml

@@ -19,3 +19,5 @@ parking_lot = "0.11.0"
 bp-messages = { path = "../../primitives/messages" }
 bp-runtime = { path = "../../primitives/runtime" }
 relay-utils = { path = "../utils" }
+
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" }

polkadot/bridges/relays/messages/src/message_lane.rs

@@ -21,6 +21,7 @@
 
 use num_traits::{SaturatingAdd, Zero};
 use relay_utils::{BlockNumberBase, HeaderId};
+use sp_arithmetic::traits::AtLeast32BitUnsigned;
 use std::{fmt::Debug, ops::Sub};
 
 /// One-way message lane.
@@ -40,7 +41,8 @@ pub trait MessageLane: 'static + Clone + Send + Sync {
 	/// 1) pay transaction fees;
 	/// 2) pay message delivery and dispatch fee;
 	/// 3) pay relayer rewards.
-	type SourceChainBalance: Clone
+	type SourceChainBalance: AtLeast32BitUnsigned
+		+ Clone
 		+ Copy
 		+ Debug
 		+ PartialOrd

polkadot/bridges/relays/messages/src/message_lane_loop.rs

@@ -32,10 +32,7 @@ use futures::{channel::mpsc::unbounded, future::FutureExt, stream::StreamExt};
 use bp_messages::{LaneId, MessageNonce, UnrewardedRelayersState, Weight};
 use bp_runtime::messages::DispatchFeePayment;
 use relay_utils::{
-	interval,
-	metrics::{GlobalMetrics, MetricsParams},
-	process_future_result,
-	relay_loop::Client as RelayClient,
+	interval, metrics::MetricsParams, process_future_result, relay_loop::Client as RelayClient,
 	retry_backoff, FailedClient,
 };
 
@@ -270,9 +267,8 @@ pub async fn run<P: MessageLane, Strategy: RelayStrategy>(
 	let exit_signal = exit_signal.shared();
 	relay_utils::relay_loop(source_client, target_client)
 		.reconnect_delay(params.reconnect_delay)
-		.with_metrics(Some(metrics_prefix::<P>(&params.lane)), metrics_params)
-		.loop_metric(MessageLaneLoopMetrics::new)?
-		.standalone_metric(GlobalMetrics::new)?
+		.with_metrics(metrics_params)
+		.loop_metric(MessageLaneLoopMetrics::new(Some(&metrics_prefix::<P>(&params.lane)))?)?
 		.expose()
 		.await?
 		.run(metrics_prefix::<P>(&params.lane), move |source_client, target_client, metrics| {

polkadot/bridges/relays/messages/src/message_race_delivery.rs

@@ -521,7 +521,7 @@ where
 			nonces_queue_range: 0..maximal_source_queue_index + 1,
 		};
 
-		let strategy = EnforcementStrategy::new(self.relay_strategy.clone());
+		let mut strategy = EnforcementStrategy::new(self.relay_strategy.clone());
 		let range_end = strategy.decide(reference).await?;
 
 		let range_begin = source_queue[0].1.begin();

polkadot/bridges/relays/messages/src/metrics.rs

@@ -22,7 +22,9 @@ use crate::{
 };
 
 use bp_messages::MessageNonce;
-use relay_utils::metrics::{metric_name, register, GaugeVec, Opts, PrometheusError, Registry, U64};
+use relay_utils::metrics::{
+	metric_name, register, GaugeVec, Metric, Opts, PrometheusError, Registry, U64,
+};
 
 /// Message lane relay metrics.
 ///
@@ -38,30 +40,22 @@ pub struct MessageLaneLoopMetrics {
 
 impl MessageLaneLoopMetrics {
 	/// Create and register messages loop metrics.
-	pub fn new(registry: &Registry, prefix: Option<&str>) -> Result<Self, PrometheusError> {
+	pub fn new(prefix: Option<&str>) -> Result<Self, PrometheusError> {
 		Ok(MessageLaneLoopMetrics {
-			best_block_numbers: register(
-				GaugeVec::new(
-					Opts::new(
-						metric_name(prefix, "best_block_numbers"),
-						"Best finalized block numbers",
-					),
-					&["type"],
-				)?,
-				registry,
+			best_block_numbers: GaugeVec::new(
+				Opts::new(
+					metric_name(prefix, "best_block_numbers"),
+					"Best finalized block numbers",
+				),
+				&["type"],
 			)?,
-			lane_state_nonces: register(
-				GaugeVec::new(
-					Opts::new(metric_name(prefix, "lane_state_nonces"), "Nonces of the lane state"),
-					&["type"],
-				)?,
-				registry,
+			lane_state_nonces: GaugeVec::new(
+				Opts::new(metric_name(prefix, "lane_state_nonces"), "Nonces of the lane state"),
+				&["type"],
 			)?,
 		})
 	}
-}
 
-impl MessageLaneLoopMetrics {
 	/// Update source client state metrics.
 	pub fn update_source_state<P: MessageLane>(&self, source_client_state: SourceClientState<P>) {
 		self.best_block_numbers
@@ -122,3 +116,11 @@ impl MessageLaneLoopMetrics {
 			.set(target_latest_confirmed_nonce);
 	}
 }
+
+impl Metric for MessageLaneLoopMetrics {
+	fn register(&self, registry: &Registry) -> Result<(), PrometheusError> {
+		register(self.best_block_numbers.clone(), registry)?;
+		register(self.lane_state_nonces.clone(), registry)?;
+		Ok(())
+	}
+}

polkadot/bridges/relays/messages/src/relay_strategy/altruistic_strategy.rs

@@ -37,7 +37,7 @@ impl RelayStrategy for AltruisticStrategy {
 		SourceClient: MessageLaneSourceClient<P>,
 		TargetClient: MessageLaneTargetClient<P>,
 	>(
-		&self,
+		&mut self,
 		_reference: &mut RelayReference<P, SourceClient, TargetClient>,
 	) -> bool {
 		true

polkadot/bridges/relays/messages/src/relay_strategy/enforcement_strategy.rs

@@ -49,7 +49,7 @@ impl<Strategy: RelayStrategy> EnforcementStrategy<Strategy> {
 		SourceClient: MessageLaneSourceClient<P>,
 		TargetClient: MessageLaneTargetClient<P>,
 	>(
-		&self,
+		&mut self,
 		reference: RelayMessagesBatchReference<P, SourceClient, TargetClient>,
 	) -> Option<MessageNonce> {
 		let mut hard_selected_count = 0;

polkadot/bridges/relays/messages/src/relay_strategy/mix_strategy.rs

@@ -47,7 +47,7 @@ impl RelayStrategy for MixStrategy {
 		SourceClient: MessageLaneSourceClient<P>,
 		TargetClient: MessageLaneTargetClient<P>,
 	>(
-		&self,
+		&mut self,
 		reference: &mut RelayReference<P, SourceClient, TargetClient>,
 	) -> bool {
 		match self.relayer_mode {

polkadot/bridges/relays/messages/src/relay_strategy/mod.rs

@@ -52,7 +52,7 @@ pub trait RelayStrategy: 'static + Clone + Send + Sync {
 		SourceClient: MessageLaneSourceClient<P>,
 		TargetClient: MessageLaneTargetClient<P>,
 	>(
-		&self,
+		&mut self,
 		reference: &mut RelayReference<P, SourceClient, TargetClient>,
 	) -> bool;
 }

polkadot/bridges/relays/messages/src/relay_strategy/rational_strategy.rs

@@ -41,7 +41,7 @@ impl RelayStrategy for RationalStrategy {
 		SourceClient: MessageLaneSourceClient<P>,
 		TargetClient: MessageLaneTargetClient<P>,
 	>(
-		&self,
+		&mut self,
 		reference: &mut RelayReference<P, SourceClient, TargetClient>,
 	) -> bool {
 		// technically, multiple confirmations will be delivered in a single transaction,