Start the equivocation detection loop from the complex relayer (#2507) (#2512)

* Impl SubstrateEquivocationDetectionPipeline for Millau

* Impl SubstrateEquivocationDetectionPipeline for Rialto

* Make BridgeHubSignedExtension more generic

* Define generate_report_equivocation_call_builder!() macro

* Impl SubstrateEquivocationDetectionPipeline for Rococo

* Impl SubstrateEquivocationDetectionPipeline for Wococo

* Impl SubstrateEquivocationDetectionPipeline for Kusama

* Impl SubstrateEquivocationDetectionPipeline for Polkadot

* Complex relayer simplification

- remove `signer` and `transactions_mortality` and add `tx_params`
- change the order of some fields

* Add equivocation detection CLI traits

* Complex relayer: start equivocation detectin loop

* Update runtimes regeneration script

* Equivocation loop: Fix infinite loop

* Revert "Complex relayer: start equivocation detectin loop"

This reverts commit b518ef85679d73654f9f0e2add38cd3839552057.

* Add subcommand for starting the equivocation detection loop

* Fixes

* Initialize empty metrics for the equivocations detector loop

bridges/relays/bin-substrate/src/bridges/kusama_polkadot/kusama_headers_to_bridge_hub_polkadot.rs

@@ -16,11 +16,14 @@
 
 //! Kusama-to-BridgeHubPolkadot headers sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, RelayToRelayHeadersCliBridge};
+use crate::cli::bridge::{
+	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
+};
 
 use async_trait::async_trait;
 use relay_substrate_client::{AccountKeyPairOf, Client};
 use substrate_relay_helper::{
+	equivocation::SubstrateEquivocationDetectionPipeline,
 	finality::SubstrateFinalitySyncPipeline,
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 	TransactionParams,
@@ -32,11 +35,18 @@ pub struct KusamaFinalityToBridgeHubPolkadot;
 
 substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	KusamaFinalityToBridgeHubPolkadot,
-	KusamaFinalityToBridgeHubPolkadotCallBuilder,
+	SubmitFinalityProofCallBuilder,
 	relay_bridge_hub_polkadot_client::runtime::Call::BridgeKusamaGrandpa,
 	relay_bridge_hub_polkadot_client::runtime::BridgeKusamaGrandpaCall::submit_finality_proof
 );
 
+substrate_relay_helper::generate_report_equivocation_call_builder!(
+	KusamaFinalityToBridgeHubPolkadot,
+	ReportEquivocationCallBuilder,
+	relay_kusama_client::RuntimeCall::Grandpa,
+	relay_kusama_client::GrandpaCall::report_equivocation
+);
+
 #[async_trait]
 impl SubstrateFinalityPipeline for KusamaFinalityToBridgeHubPolkadot {
 	type SourceChain = relay_kusama_client::Kusama;
@@ -47,7 +57,7 @@ impl SubstrateFinalityPipeline for KusamaFinalityToBridgeHubPolkadot {
 
 #[async_trait]
 impl SubstrateFinalitySyncPipeline for KusamaFinalityToBridgeHubPolkadot {
-	type SubmitFinalityProofCallBuilder = KusamaFinalityToBridgeHubPolkadotCallBuilder;
+	type SubmitFinalityProofCallBuilder = SubmitFinalityProofCallBuilder;
 
 	async fn start_relay_guards(
 		target_client: &Client<Self::TargetChain>,
@@ -64,6 +74,11 @@ impl SubstrateFinalitySyncPipeline for KusamaFinalityToBridgeHubPolkadot {
 	}
 }
 
+#[async_trait]
+impl SubstrateEquivocationDetectionPipeline for KusamaFinalityToBridgeHubPolkadot {
+	type ReportEquivocationCallBuilder = ReportEquivocationCallBuilder;
+}
+
 /// `Kusama` to BridgeHub `Polkadot` bridge definition.
 pub struct KusamaToBridgeHubPolkadotCliBridge {}
 
@@ -75,3 +90,7 @@ impl CliBridgeBase for KusamaToBridgeHubPolkadotCliBridge {
 impl RelayToRelayHeadersCliBridge for KusamaToBridgeHubPolkadotCliBridge {
 	type Finality = KusamaFinalityToBridgeHubPolkadot;
 }
+
+impl RelayToRelayEquivocationDetectionCliBridge for KusamaToBridgeHubPolkadotCliBridge {
+	type Equivocation = KusamaFinalityToBridgeHubPolkadot;
+}

bridges/relays/bin-substrate/src/bridges/kusama_polkadot/polkadot_headers_to_bridge_hub_kusama.rs

@@ -16,11 +16,14 @@
 
 //! Polkadot-to-KusamaBridgeHub headers sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, RelayToRelayHeadersCliBridge};
+use crate::cli::bridge::{
+	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
+};
 
 use async_trait::async_trait;
 use relay_substrate_client::{AccountKeyPairOf, Client};
 use substrate_relay_helper::{
+	equivocation::SubstrateEquivocationDetectionPipeline,
 	finality::SubstrateFinalitySyncPipeline,
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 	TransactionParams,
@@ -32,11 +35,18 @@ pub struct PolkadotFinalityToBridgeHubKusama;
 
 substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	PolkadotFinalityToBridgeHubKusama,
-	PolkadotFinalityToBridgeHubKusamaCallBuilder,
+	SubmitFinalityProofCallBuilder,
 	relay_bridge_hub_kusama_client::runtime::Call::BridgePolkadotGrandpa,
 	relay_bridge_hub_kusama_client::runtime::BridgePolkadotGrandpaCall::submit_finality_proof
 );
 
+substrate_relay_helper::generate_report_equivocation_call_builder!(
+	PolkadotFinalityToBridgeHubKusama,
+	ReportEquivocationCallBuilder,
+	relay_polkadot_client::RuntimeCall::Grandpa,
+	relay_polkadot_client::GrandpaCall::report_equivocation
+);
+
 #[async_trait]
 impl SubstrateFinalityPipeline for PolkadotFinalityToBridgeHubKusama {
 	type SourceChain = relay_polkadot_client::Polkadot;
@@ -47,7 +57,7 @@ impl SubstrateFinalityPipeline for PolkadotFinalityToBridgeHubKusama {
 
 #[async_trait]
 impl SubstrateFinalitySyncPipeline for PolkadotFinalityToBridgeHubKusama {
-	type SubmitFinalityProofCallBuilder = PolkadotFinalityToBridgeHubKusamaCallBuilder;
+	type SubmitFinalityProofCallBuilder = SubmitFinalityProofCallBuilder;
 
 	async fn start_relay_guards(
 		target_client: &Client<Self::TargetChain>,
@@ -64,6 +74,11 @@ impl SubstrateFinalitySyncPipeline for PolkadotFinalityToBridgeHubKusama {
 	}
 }
 
+#[async_trait]
+impl SubstrateEquivocationDetectionPipeline for PolkadotFinalityToBridgeHubKusama {
+	type ReportEquivocationCallBuilder = ReportEquivocationCallBuilder;
+}
+
 /// `Polkadot` to BridgeHub `Kusama` bridge definition.
 pub struct PolkadotToBridgeHubKusamaCliBridge {}
 
@@ -75,3 +90,7 @@ impl CliBridgeBase for PolkadotToBridgeHubKusamaCliBridge {
 impl RelayToRelayHeadersCliBridge for PolkadotToBridgeHubKusamaCliBridge {
 	type Finality = PolkadotFinalityToBridgeHubKusama;
 }
+
+impl RelayToRelayEquivocationDetectionCliBridge for PolkadotToBridgeHubKusamaCliBridge {
+	type Equivocation = PolkadotFinalityToBridgeHubKusama;
+}

bridges/relays/bin-substrate/src/bridges/rialto_millau/millau_headers_to_rialto.rs

@@ -16,8 +16,14 @@
 
 //! Millau-to-Rialto headers sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, RelayToRelayHeadersCliBridge};
+use crate::cli::bridge::{
+	CliBridgeBase, MessagesCliBridge, RelayToRelayEquivocationDetectionCliBridge,
+	RelayToRelayHeadersCliBridge,
+};
 use substrate_relay_helper::{
+	equivocation::{
+		DirectReportGrandpaEquivocationCallBuilder, SubstrateEquivocationDetectionPipeline,
+	},
 	finality::{DirectSubmitGrandpaFinalityProofCallBuilder, SubstrateFinalitySyncPipeline},
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 };
@@ -41,6 +47,11 @@ impl SubstrateFinalitySyncPipeline for MillauFinalityToRialto {
 	>;
 }
 
+impl SubstrateEquivocationDetectionPipeline for MillauFinalityToRialto {
+	type ReportEquivocationCallBuilder =
+		DirectReportGrandpaEquivocationCallBuilder<Self, millau_runtime::Runtime>;
+}
+
 /// `Millau` to `Rialto` bridge definition.
 pub struct MillauToRialtoCliBridge {}
 
@@ -53,6 +64,10 @@ impl RelayToRelayHeadersCliBridge for MillauToRialtoCliBridge {
 	type Finality = MillauFinalityToRialto;
 }
 
+impl RelayToRelayEquivocationDetectionCliBridge for MillauToRialtoCliBridge {
+	type Equivocation = MillauFinalityToRialto;
+}
+
 impl MessagesCliBridge for MillauToRialtoCliBridge {
 	type MessagesLane =
 		crate::bridges::rialto_millau::millau_messages_to_rialto::MillauMessagesToRialto;

bridges/relays/bin-substrate/src/bridges/rialto_millau/rialto_headers_to_millau.rs

@@ -16,8 +16,14 @@
 
 //! Rialto-to-Millau headers sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, RelayToRelayHeadersCliBridge};
+use crate::cli::bridge::{
+	CliBridgeBase, MessagesCliBridge, RelayToRelayEquivocationDetectionCliBridge,
+	RelayToRelayHeadersCliBridge,
+};
 use substrate_relay_helper::{
+	equivocation::{
+		DirectReportGrandpaEquivocationCallBuilder, SubstrateEquivocationDetectionPipeline,
+	},
 	finality::{DirectSubmitGrandpaFinalityProofCallBuilder, SubstrateFinalitySyncPipeline},
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 };
@@ -41,6 +47,11 @@ impl SubstrateFinalitySyncPipeline for RialtoFinalityToMillau {
 	>;
 }
 
+impl SubstrateEquivocationDetectionPipeline for RialtoFinalityToMillau {
+	type ReportEquivocationCallBuilder =
+		DirectReportGrandpaEquivocationCallBuilder<Self, rialto_runtime::Runtime>;
+}
+
 /// `Rialto` to `Millau` bridge definition.
 pub struct RialtoToMillauCliBridge {}
 
@@ -53,6 +64,10 @@ impl RelayToRelayHeadersCliBridge for RialtoToMillauCliBridge {
 	type Finality = RialtoFinalityToMillau;
 }
 
+impl RelayToRelayEquivocationDetectionCliBridge for RialtoToMillauCliBridge {
+	type Equivocation = RialtoFinalityToMillau;
+}
+
 impl MessagesCliBridge for RialtoToMillauCliBridge {
 	type MessagesLane =
 		crate::bridges::rialto_millau::rialto_messages_to_millau::RialtoMessagesToMillau;

bridges/relays/bin-substrate/src/bridges/rialto_parachain_millau/millau_headers_to_rialto_parachain.rs

@@ -34,8 +34,14 @@
 
 //! Millau-to-RialtoParachain headers sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, RelayToRelayHeadersCliBridge};
+use crate::cli::bridge::{
+	CliBridgeBase, MessagesCliBridge, RelayToRelayEquivocationDetectionCliBridge,
+	RelayToRelayHeadersCliBridge,
+};
 use substrate_relay_helper::{
+	equivocation::{
+		DirectReportGrandpaEquivocationCallBuilder, SubstrateEquivocationDetectionPipeline,
+	},
 	finality::SubstrateFinalitySyncPipeline,
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 };
@@ -62,6 +68,11 @@ impl SubstrateFinalitySyncPipeline for MillauFinalityToRialtoParachain {
 	type SubmitFinalityProofCallBuilder = MillauFinalityToRialtoParachainCallBuilder;
 }
 
+impl SubstrateEquivocationDetectionPipeline for MillauFinalityToRialtoParachain {
+	type ReportEquivocationCallBuilder =
+		DirectReportGrandpaEquivocationCallBuilder<Self, millau_runtime::Runtime>;
+}
+
 /// `Millau` to `RialtoParachain`  bridge definition.
 pub struct MillauToRialtoParachainCliBridge {}
 
@@ -74,6 +85,10 @@ impl RelayToRelayHeadersCliBridge for MillauToRialtoParachainCliBridge {
 	type Finality = MillauFinalityToRialtoParachain;
 }
 
+impl RelayToRelayEquivocationDetectionCliBridge for MillauToRialtoParachainCliBridge {
+	type Equivocation = MillauFinalityToRialtoParachain;
+}
+
 impl MessagesCliBridge for MillauToRialtoParachainCliBridge {
 	type MessagesLane =
 		crate::bridges::rialto_parachain_millau::millau_messages_to_rialto_parachain::MillauMessagesToRialtoParachain;

bridges/relays/bin-substrate/src/bridges/rococo_wococo/rococo_headers_to_bridge_hub_wococo.rs

@@ -16,11 +16,14 @@
 
 //! Rococo-to-Wococo bridge hubs headers sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, RelayToRelayHeadersCliBridge};
+use crate::cli::bridge::{
+	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
+};
 
 use async_trait::async_trait;
 use relay_substrate_client::{AccountKeyPairOf, Client};
 use substrate_relay_helper::{
+	equivocation::SubstrateEquivocationDetectionPipeline,
 	finality::SubstrateFinalitySyncPipeline,
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 	TransactionParams,
@@ -32,11 +35,18 @@ pub struct RococoFinalityToBridgeHubWococo;
 
 substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	RococoFinalityToBridgeHubWococo,
-	RococoFinalityToBridgeHubWococoCallBuilder,
+	SubmitFinalityProofCallBuilder,
 	relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoGrandpa,
 	relay_bridge_hub_wococo_client::BridgeGrandpaCall::submit_finality_proof
 );
 
+substrate_relay_helper::generate_report_equivocation_call_builder!(
+	RococoFinalityToBridgeHubWococo,
+	ReportEquivocationCallBuilder,
+	relay_rococo_client::RuntimeCall::Grandpa,
+	relay_rococo_client::GrandpaCall::report_equivocation
+);
+
 #[async_trait]
 impl SubstrateFinalityPipeline for RococoFinalityToBridgeHubWococo {
 	type SourceChain = relay_rococo_client::Rococo;
@@ -47,7 +57,7 @@ impl SubstrateFinalityPipeline for RococoFinalityToBridgeHubWococo {
 
 #[async_trait]
 impl SubstrateFinalitySyncPipeline for RococoFinalityToBridgeHubWococo {
-	type SubmitFinalityProofCallBuilder = RococoFinalityToBridgeHubWococoCallBuilder;
+	type SubmitFinalityProofCallBuilder = SubmitFinalityProofCallBuilder;
 
 	async fn start_relay_guards(
 		target_client: &Client<Self::TargetChain>,
@@ -64,6 +74,11 @@ impl SubstrateFinalitySyncPipeline for RococoFinalityToBridgeHubWococo {
 	}
 }
 
+#[async_trait]
+impl SubstrateEquivocationDetectionPipeline for RococoFinalityToBridgeHubWococo {
+	type ReportEquivocationCallBuilder = ReportEquivocationCallBuilder;
+}
+
 /// `Rococo` to BridgeHub `Wococo` bridge definition.
 pub struct RococoToBridgeHubWococoCliBridge {}
 
@@ -75,3 +90,7 @@ impl CliBridgeBase for RococoToBridgeHubWococoCliBridge {
 impl RelayToRelayHeadersCliBridge for RococoToBridgeHubWococoCliBridge {
 	type Finality = RococoFinalityToBridgeHubWococo;
 }
+
+impl RelayToRelayEquivocationDetectionCliBridge for RococoToBridgeHubWococoCliBridge {
+	type Equivocation = RococoFinalityToBridgeHubWococo;
+}

bridges/relays/bin-substrate/src/bridges/rococo_wococo/wococo_headers_to_bridge_hub_rococo.rs

@@ -16,11 +16,14 @@
 
 //! Wococo-to-Rococo bridge hubs headers sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, RelayToRelayHeadersCliBridge};
+use crate::cli::bridge::{
+	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
+};
 
 use async_trait::async_trait;
 use relay_substrate_client::{AccountKeyPairOf, Client};
 use substrate_relay_helper::{
+	equivocation::SubstrateEquivocationDetectionPipeline,
 	finality::SubstrateFinalitySyncPipeline,
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 	TransactionParams,
@@ -32,11 +35,18 @@ pub struct WococoFinalityToBridgeHubRococo;
 
 substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	WococoFinalityToBridgeHubRococo,
-	WococoFinalityToBridgeHubRococoCallBuilder,
+	SubmitFinalityProofCallBuilder,
 	relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoGrandpa,
 	relay_bridge_hub_rococo_client::BridgeGrandpaCall::submit_finality_proof
 );
 
+substrate_relay_helper::generate_report_equivocation_call_builder!(
+	WococoFinalityToBridgeHubRococo,
+	ReportEquivocationCallBuilder,
+	relay_wococo_client::RuntimeCall::Grandpa,
+	relay_wococo_client::GrandpaCall::report_equivocation
+);
+
 #[async_trait]
 impl SubstrateFinalityPipeline for WococoFinalityToBridgeHubRococo {
 	type SourceChain = relay_wococo_client::Wococo;
@@ -47,7 +57,7 @@ impl SubstrateFinalityPipeline for WococoFinalityToBridgeHubRococo {
 
 #[async_trait]
 impl SubstrateFinalitySyncPipeline for WococoFinalityToBridgeHubRococo {
-	type SubmitFinalityProofCallBuilder = WococoFinalityToBridgeHubRococoCallBuilder;
+	type SubmitFinalityProofCallBuilder = SubmitFinalityProofCallBuilder;
 
 	async fn start_relay_guards(
 		target_client: &Client<Self::TargetChain>,
@@ -64,6 +74,11 @@ impl SubstrateFinalitySyncPipeline for WococoFinalityToBridgeHubRococo {
 	}
 }
 
+#[async_trait]
+impl SubstrateEquivocationDetectionPipeline for WococoFinalityToBridgeHubRococo {
+	type ReportEquivocationCallBuilder = ReportEquivocationCallBuilder;
+}
+
 /// `Wococo` to BridgeHub `Rococo` bridge definition.
 pub struct WococoToBridgeHubRococoCliBridge {}
 
@@ -75,3 +90,7 @@ impl CliBridgeBase for WococoToBridgeHubRococoCliBridge {
 impl RelayToRelayHeadersCliBridge for WococoToBridgeHubRococoCliBridge {
 	type Finality = WococoFinalityToBridgeHubRococo;
 }
+
+impl RelayToRelayEquivocationDetectionCliBridge for WococoToBridgeHubRococoCliBridge {
+	type Equivocation = WococoFinalityToBridgeHubRococo;
+}

bridges/relays/bin-substrate/src/cli/bridge.rs

@@ -19,8 +19,8 @@ use pallet_bridge_parachains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumbe
 use relay_substrate_client::{Chain, ChainWithTransactions, Parachain, RelayChain};
 use strum::{EnumString, EnumVariantNames};
 use substrate_relay_helper::{
-	finality::SubstrateFinalitySyncPipeline, messages_lane::SubstrateMessageLane,
-	parachains::SubstrateParachainsPipeline,
+	equivocation::SubstrateEquivocationDetectionPipeline, finality::SubstrateFinalitySyncPipeline,
+	messages_lane::SubstrateMessageLane, parachains::SubstrateParachainsPipeline,
 };
 
 #[derive(Debug, PartialEq, Eq, EnumString, EnumVariantNames)]
@@ -56,6 +56,31 @@ pub trait RelayToRelayHeadersCliBridge: CliBridgeBase {
 	>;
 }
 
+/// Convenience trait that adds bounds to `CliBridgeBase`.
+pub trait RelayToRelayEquivocationDetectionCliBridgeBase: CliBridgeBase {
+	type BoundedSource: ChainWithTransactions;
+}
+
+impl<T> RelayToRelayEquivocationDetectionCliBridgeBase for T
+where
+	T: CliBridgeBase,
+	T::Source: ChainWithTransactions,
+{
+	type BoundedSource = T::Source;
+}
+
+/// Bridge representation that can be used from the CLI for detecting equivocations
+/// in the headers synchronized from a relay chain to a relay chain.
+pub trait RelayToRelayEquivocationDetectionCliBridge:
+	RelayToRelayEquivocationDetectionCliBridgeBase
+{
+	/// Equivocation detection pipeline.
+	type Equivocation: SubstrateEquivocationDetectionPipeline<
+		SourceChain = Self::Source,
+		TargetChain = Self::Target,
+	>;
+}
+
 /// Bridge representation that can be used from the CLI for relaying headers
 /// from a parachain to a relay chain.
 pub trait ParachainToRelayHeadersCliBridge: CliBridgeBase

bridges/relays/bin-substrate/src/cli/detect_equivocations.rs

@@ -0,0 +1,113 @@
+// Copyright 2019-2023 Parity Technologies (UK) Ltd.
+// This file is part of Parity Bridges Common.
+
+// Parity Bridges Common is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Bridges Common is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::{
+	bridges::{
+		kusama_polkadot::{
+			kusama_headers_to_bridge_hub_polkadot::KusamaToBridgeHubPolkadotCliBridge,
+			polkadot_headers_to_bridge_hub_kusama::PolkadotToBridgeHubKusamaCliBridge,
+		},
+		rialto_millau::{
+			millau_headers_to_rialto::MillauToRialtoCliBridge,
+			rialto_headers_to_millau::RialtoToMillauCliBridge,
+		},
+		rialto_parachain_millau::millau_headers_to_rialto_parachain::MillauToRialtoParachainCliBridge,
+		rococo_wococo::{
+			rococo_headers_to_bridge_hub_wococo::RococoToBridgeHubWococoCliBridge,
+			wococo_headers_to_bridge_hub_rococo::WococoToBridgeHubRococoCliBridge,
+		},
+	},
+	cli::{bridge::*, chain_schema::*, PrometheusParams},
+};
+
+use async_trait::async_trait;
+use relay_substrate_client::ChainWithTransactions;
+use structopt::StructOpt;
+use strum::{EnumString, EnumVariantNames, VariantNames};
+use substrate_relay_helper::equivocation;
+
+/// Start equivocation detection loop.
+#[derive(StructOpt)]
+pub struct DetectEquivocations {
+	#[structopt(possible_values = DetectEquivocationsBridge::VARIANTS, case_insensitive = true)]
+	bridge: DetectEquivocationsBridge,
+	#[structopt(flatten)]
+	source: SourceConnectionParams,
+	#[structopt(flatten)]
+	source_sign: SourceSigningParams,
+	#[structopt(flatten)]
+	target: TargetConnectionParams,
+	#[structopt(flatten)]
+	prometheus_params: PrometheusParams,
+}
+
+#[derive(Debug, EnumString, EnumVariantNames)]
+#[strum(serialize_all = "kebab_case")]
+/// Equivocations detection bridge.
+pub enum DetectEquivocationsBridge {
+	MillauToRialto,
+	RialtoToMillau,
+	MillauToRialtoParachain,
+	RococoToBridgeHubWococo,
+	WococoToBridgeHubRococo,
+	KusamaToBridgeHubPolkadot,
+	PolkadotToBridgeHubKusama,
+}
+
+#[async_trait]
+trait EquivocationsDetector: RelayToRelayEquivocationDetectionCliBridge
+where
+	Self::Source: ChainWithTransactions,
+{
+	async fn start(data: DetectEquivocations) -> anyhow::Result<()> {
+		equivocation::run::<Self::Equivocation>(
+			data.source.into_client::<Self::Source>().await?,
+			data.target.into_client::<Self::Target>().await?,
+			data.source_sign.transaction_params::<Self::Source>()?,
+			data.prometheus_params.into_metrics_params()?,
+		)
+		.await
+	}
+}
+
+impl EquivocationsDetector for MillauToRialtoCliBridge {}
+impl EquivocationsDetector for RialtoToMillauCliBridge {}
+impl EquivocationsDetector for MillauToRialtoParachainCliBridge {}
+impl EquivocationsDetector for RococoToBridgeHubWococoCliBridge {}
+impl EquivocationsDetector for WococoToBridgeHubRococoCliBridge {}
+impl EquivocationsDetector for KusamaToBridgeHubPolkadotCliBridge {}
+impl EquivocationsDetector for PolkadotToBridgeHubKusamaCliBridge {}
+
+impl DetectEquivocations {
+	/// Run the command.
+	pub async fn run(self) -> anyhow::Result<()> {
+		match self.bridge {
+			DetectEquivocationsBridge::MillauToRialto => MillauToRialtoCliBridge::start(self),
+			DetectEquivocationsBridge::RialtoToMillau => RialtoToMillauCliBridge::start(self),
+			DetectEquivocationsBridge::MillauToRialtoParachain =>
+				MillauToRialtoParachainCliBridge::start(self),
+			DetectEquivocationsBridge::RococoToBridgeHubWococo =>
+				RococoToBridgeHubWococoCliBridge::start(self),
+			DetectEquivocationsBridge::WococoToBridgeHubRococo =>
+				WococoToBridgeHubRococoCliBridge::start(self),
+			DetectEquivocationsBridge::KusamaToBridgeHubPolkadot =>
+				KusamaToBridgeHubPolkadotCliBridge::start(self),
+			DetectEquivocationsBridge::PolkadotToBridgeHubKusama =>
+				PolkadotToBridgeHubKusamaCliBridge::start(self),
+		}
+		.await
+	}
+}

bridges/relays/bin-substrate/src/cli/mod.rs

@@ -35,6 +35,7 @@ pub(crate) mod encode_message;
 pub(crate) mod send_message;
 
 mod chain_schema;
+mod detect_equivocations;
 mod init_bridge;
 mod register_parachain;
 mod relay_headers;
@@ -86,8 +87,13 @@ pub enum Command {
 	ResubmitTransactions(resubmit_transactions::ResubmitTransactions),
 	/// Register parachain.
 	RegisterParachain(register_parachain::RegisterParachain),
-	///
+	/// Relay parachain heads.
 	RelayParachains(relay_parachains::RelayParachains),
+	/// Detect and report equivocations.
+	///
+	/// Parses the source chain headers that were synchronized with the target chain looking for
+	/// equivocations. If any equivocation is found, it is reported to the source chain.
+	DetectEquivocations(detect_equivocations::DetectEquivocations),
 }
 
 impl Command {
@@ -119,6 +125,7 @@ impl Command {
 			Self::ResubmitTransactions(arg) => arg.run().await?,
 			Self::RegisterParachain(arg) => arg.run().await?,
 			Self::RelayParachains(arg) => arg.run().await?,
+			Self::DetectEquivocations(arg) => arg.run().await?,
 		}
 		Ok(())
 	}

bridges/relays/bin-substrate/src/cli/relay_headers_and_messages/mod.rs

@@ -131,10 +131,8 @@ impl<Left: ChainWithTransactions + CliChain, Right: ChainWithTransactions + CliC
 pub struct BridgeEndCommonParams<Chain: ChainWithTransactions + CliChain> {
 	/// Chain client.
 	pub client: Client<Chain>,
-	/// Transactions signer.
-	pub sign: AccountKeyPairOf<Chain>,
-	/// Transactions mortality.
-	pub transactions_mortality: Option<u32>,
+	/// Params used for sending transactions to the chain.
+	pub tx_params: TransactionParams<AccountKeyPairOf<Chain>>,
 	/// Accounts, which balances are exposed as metrics by the relay process.
 	pub accounts: Vec<TaggedAccount<AccountIdOf<Chain>>>,
 }
@@ -181,15 +179,9 @@ where
 	) -> MessagesRelayParams<Bridge::MessagesLane> {
 		MessagesRelayParams {
 			source_client: self.source.client.clone(),
-			source_transaction_params: TransactionParams {
-				signer: self.source.sign.clone(),
-				mortality: self.source.transactions_mortality,
-			},
+			source_transaction_params: self.source.tx_params.clone(),
 			target_client: self.target.client.clone(),
-			target_transaction_params: TransactionParams {
-				signer: self.target.sign.clone(),
-				mortality: self.target.transactions_mortality,
-			},
+			target_transaction_params: self.target.tx_params.clone(),
 			source_to_target_headers_relay: Some(source_to_target_headers_relay),
 			target_to_source_headers_relay: Some(target_to_source_headers_relay),
 			lane_id,
@@ -328,11 +320,11 @@ where
 		{
 			let common = self.mut_base().mut_common();
 			common.left.accounts.push(TaggedAccount::Messages {
-				id: common.left.sign.public().into(),
+				id: common.left.tx_params.signer.public().into(),
 				bridged_chain: Self::Right::NAME.to_string(),
 			});
 			common.right.accounts.push(TaggedAccount::Messages {
-				id: common.right.sign.public().into(),
+				id: common.right.tx_params.signer.public().into(),
 				bridged_chain: Self::Left::NAME.to_string(),
 			});
 		}

bridges/relays/bin-substrate/src/cli/relay_headers_and_messages/parachain_to_parachain.rs

@@ -58,13 +58,13 @@ pub struct ParachainToParachainBridge<
 	/// Override for right_relay->left headers signer.
 	pub right_headers_to_left_transaction_params:
 		TransactionParams<AccountKeyPairOf<<R2L as CliBridgeBase>::Target>>,
-	/// Override for left_relay->right headers signer.
-	pub left_headers_to_right_transaction_params:
-		TransactionParams<AccountKeyPairOf<<L2R as CliBridgeBase>::Target>>,
-
 	/// Override for right->left parachains signer.
 	pub right_parachains_to_left_transaction_params:
 		TransactionParams<AccountKeyPairOf<<R2L as CliBridgeBase>::Target>>,
+
+	/// Override for left_relay->right headers signer.
+	pub left_headers_to_right_transaction_params:
+		TransactionParams<AccountKeyPairOf<<L2R as CliBridgeBase>::Target>>,
 	/// Override for left->right parachains signer.
 	pub left_parachains_to_right_transaction_params:
 		TransactionParams<AccountKeyPairOf<<L2R as CliBridgeBase>::Target>>,
@@ -83,35 +83,33 @@ macro_rules! declare_parachain_to_parachain_bridge_schema {
 
 				#[structopt(flatten)]
 				left: [<$left_parachain ConnectionParams>],
-				#[structopt(flatten)]
-				left_relay: [<$left_chain ConnectionParams>],
-
 				// default signer, which is always used to sign messages relay transactions on the left chain
 				#[structopt(flatten)]
 				left_sign: [<$left_parachain SigningParams>],
-
-				#[structopt(flatten)]
-				right: [<$right_parachain ConnectionParams>],
-				#[structopt(flatten)]
-				right_relay: [<$right_chain ConnectionParams>],
-
-				// default signer, which is always used to sign messages relay transactions on the right chain
-				#[structopt(flatten)]
-				right_sign: [<$right_parachain SigningParams>],
-
 				// override for right_relay->left-parachain headers signer
 				#[structopt(flatten)]
 				right_relay_headers_to_left_sign_override: [<$right_chain HeadersTo $left_parachain SigningParams>],
-				// override for left_relay->right-parachain headers signer
-				#[structopt(flatten)]
-				left_relay_headers_to_right_sign_override: [<$left_chain HeadersTo $right_parachain SigningParams>],
-
 				// override for right->left parachains signer
 				#[structopt(flatten)]
 				right_parachains_to_left_sign_override: [<$right_chain ParachainsTo $left_parachain SigningParams>],
+
+				#[structopt(flatten)]
+				left_relay: [<$left_chain ConnectionParams>],
+
+				#[structopt(flatten)]
+				right: [<$right_parachain ConnectionParams>],
+				// default signer, which is always used to sign messages relay transactions on the right chain
+				#[structopt(flatten)]
+				right_sign: [<$right_parachain SigningParams>],
+				// override for left_relay->right-parachain headers signer
+				#[structopt(flatten)]
+				left_relay_headers_to_right_sign_override: [<$left_chain HeadersTo $right_parachain SigningParams>],
 				// override for left->right parachains signer
 				#[structopt(flatten)]
 				left_parachains_to_right_sign_override: [<$left_chain ParachainsTo $right_parachain SigningParams>],
+
+				#[structopt(flatten)]
+				right_relay: [<$right_chain ConnectionParams>],
 			}
 
 			impl [<$left_parachain $right_parachain HeadersAndMessages>] {
@@ -134,14 +132,12 @@ macro_rules! declare_parachain_to_parachain_bridge_schema {
 							self.shared,
 							BridgeEndCommonParams {
 								client: self.left.into_client::<Left>().await?,
-								sign: self.left_sign.to_keypair::<Left>()?,
-								transactions_mortality: self.left_sign.transactions_mortality()?,
+								tx_params: self.left_sign.transaction_params::<Left>()?,
 								accounts: vec![],
 							},
 							BridgeEndCommonParams {
 								client: self.right.into_client::<Right>().await?,
-								sign: self.right_sign.to_keypair::<Right>()?,
-								transactions_mortality: self.right_sign.transactions_mortality()?,
+								tx_params: self.right_sign.transaction_params::<Right>()?,
 								accounts: vec![],
 							},
 						)?,

bridges/relays/bin-substrate/src/cli/relay_headers_and_messages/relay_to_parachain.rs

@@ -61,6 +61,7 @@ pub struct RelayToParachainBridge<
 	/// Override for right->left parachains signer.
 	pub right_parachains_to_left_transaction_params:
 		TransactionParams<AccountKeyPairOf<<R2L as CliBridgeBase>::Target>>,
+
 	/// Override for left->right headers signer.
 	pub left_headers_to_right_transaction_params:
 		TransactionParams<AccountKeyPairOf<<L2R as CliBridgeBase>::Target>>,
@@ -79,30 +80,27 @@ macro_rules! declare_relay_to_parachain_bridge_schema {
 
 				#[structopt(flatten)]
 				left: [<$left_chain ConnectionParams>],
-
 				// default signer, which is always used to sign messages relay transactions on the left chain
 				#[structopt(flatten)]
 				left_sign: [<$left_chain SigningParams>],
-
-				#[structopt(flatten)]
-				right: [<$right_parachain ConnectionParams>],
-				#[structopt(flatten)]
-				right_relay: [<$right_chain ConnectionParams>],
-
-				// default signer, which is always used to sign messages relay transactions on the right chain
-				#[structopt(flatten)]
-				right_sign: [<$right_parachain SigningParams>],
-
 				// override for right_relay->left headers signer
 				#[structopt(flatten)]
 				right_relay_headers_to_left_sign_override: [<$right_chain HeadersTo $left_chain SigningParams>],
+				// override for right->left parachains signer
+				#[structopt(flatten)]
+				right_parachains_to_left_sign_override: [<$right_chain ParachainsTo $left_chain SigningParams>],
+
+				#[structopt(flatten)]
+				right: [<$right_parachain ConnectionParams>],
+				// default signer, which is always used to sign messages relay transactions on the right chain
+				#[structopt(flatten)]
+				right_sign: [<$right_parachain SigningParams>],
 				// override for left->right headers signer
 				#[structopt(flatten)]
 				left_headers_to_right_sign_override: [<$left_chain HeadersTo $right_parachain SigningParams>],
 
-				// override for right->left parachains signer
 				#[structopt(flatten)]
-				right_parachains_to_left_sign_override: [<$right_chain ParachainsTo $left_chain SigningParams>],
+				right_relay: [<$right_chain ConnectionParams>],
 			}
 
 			impl [<$left_chain $right_parachain HeadersAndMessages>] {
@@ -122,14 +120,12 @@ macro_rules! declare_relay_to_parachain_bridge_schema {
 							self.shared,
 							BridgeEndCommonParams {
 								client: self.left.into_client::<Left>().await?,
-								sign: self.left_sign.to_keypair::<Left>()?,
-								transactions_mortality: self.left_sign.transactions_mortality()?,
+								tx_params: self.left_sign.transaction_params::<Left>()?,
 								accounts: vec![],
 							},
 							BridgeEndCommonParams {
 								client: self.right.into_client::<Right>().await?,
-								sign: self.right_sign.to_keypair::<Right>()?,
-								transactions_mortality: self.right_sign.transactions_mortality()?,
+								tx_params: self.right_sign.transaction_params::<Right>()?,
 								accounts: vec![],
 							},
 						)?,

bridges/relays/bin-substrate/src/cli/relay_headers_and_messages/relay_to_relay.rs

@@ -56,22 +56,24 @@ macro_rules! declare_relay_to_relay_bridge_schema {
 			pub struct [<$left_chain $right_chain HeadersAndMessages>] {
 				#[structopt(flatten)]
 				shared: HeadersAndMessagesSharedParams,
-				// default signer, which is always used to sign messages relay transactions on the left chain
+
 				#[structopt(flatten)]
 				left: [<$left_chain ConnectionParams>],
+				// default signer, which is always used to sign messages relay transactions on the left chain
+				#[structopt(flatten)]
+				left_sign: [<$left_chain SigningParams>],
 				// override for right->left headers signer
 				#[structopt(flatten)]
 				right_headers_to_left_sign_override: [<$right_chain HeadersTo $left_chain SigningParams>],
-				#[structopt(flatten)]
-				left_sign: [<$left_chain SigningParams>],
-				// default signer, which is always used to sign messages relay transactions on the right chain
+
 				#[structopt(flatten)]
 				right: [<$right_chain ConnectionParams>],
+				#[structopt(flatten)]
+				// default signer, which is always used to sign messages relay transactions on the right chain
+				right_sign: [<$right_chain SigningParams>],
 				// override for left->right headers signer
 				#[structopt(flatten)]
 				left_headers_to_right_sign_override: [<$left_chain HeadersTo $right_chain SigningParams>],
-				#[structopt(flatten)]
-				right_sign: [<$right_chain SigningParams>],
 			}
 
 			impl [<$left_chain $right_chain HeadersAndMessages>] {
@@ -88,14 +90,12 @@ macro_rules! declare_relay_to_relay_bridge_schema {
 							self.shared,
 							BridgeEndCommonParams {
 								client: self.left.into_client::<Left>().await?,
-								sign: self.left_sign.to_keypair::<Left>()?,
-								transactions_mortality: self.left_sign.transactions_mortality()?,
+								tx_params: self.left_sign.transaction_params::<Left>()?,
 								accounts: vec![],
 							},
 							BridgeEndCommonParams {
 								client: self.right.into_client::<Right>().await?,
-								sign: self.right_sign.to_keypair::<Right>()?,
-								transactions_mortality: self.right_sign.transactions_mortality()?,
+								tx_params: self.right_sign.transaction_params::<Right>()?,
 								accounts: vec![],
 							},
 						)?,