Move generic CLI logic to different crate (#2885)

* Move generic CLI logic to separate crate

* Move and rename `CliChain` trait definition

Move it to `relay-substrate-client`

* Move generic cli logic to substrate-relay-helper

* Fix docs warnings

Cargo.toml

@@ -53,7 +53,7 @@ members = [
 	"relays/lib-substrate-relay",
 	"relays/messages",
 	"relays/parachains",
-	"relays/utils",
+	"relays/utils"
 ]
 
 # Setup clippy lints as `polkadot-sdk`,

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

@@ -16,10 +16,13 @@
 
 //! BridgeHubKusama-to-BridgeHubPolkadot messages sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
 use relay_bridge_hub_kusama_client::BridgeHubKusama;
 use relay_bridge_hub_polkadot_client::BridgeHubPolkadot;
-use substrate_relay_helper::{messages_lane::SubstrateMessageLane, UtilityPalletBatchCallBuilder};
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge},
+	messages_lane::SubstrateMessageLane,
+	UtilityPalletBatchCallBuilder,
+};
 
 /// BridgeHubKusama-to-BridgeHubPolkadot messages bridge.
 pub struct BridgeHubKusamaToBridgeHubPolkadotMessagesCliBridge {}

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

@@ -16,10 +16,13 @@
 
 //! BridgeHubPolkadot-to-BridgeHubKusama messages sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
 use relay_bridge_hub_kusama_client::BridgeHubKusama;
 use relay_bridge_hub_polkadot_client::BridgeHubPolkadot;
-use substrate_relay_helper::{messages_lane::SubstrateMessageLane, UtilityPalletBatchCallBuilder};
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge},
+	messages_lane::SubstrateMessageLane,
+	UtilityPalletBatchCallBuilder,
+};
 
 /// BridgeHubPolkadot-to-BridgeHubKusama messages bridge.
 pub struct BridgeHubPolkadotToBridgeHubKusamaMessagesCliBridge {}

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

@@ -16,7 +16,7 @@
 
 //! Kusama-to-BridgeHubPolkadot headers sync entrypoint.
 
-use crate::cli::bridge::{
+use substrate_relay_helper::cli::bridge::{
 	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
 };
 

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

@@ -16,11 +16,11 @@
 
 //! Kusama-to-BridgeHubPolkadot parachains sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
 use bp_polkadot_core::parachains::{ParaHash, ParaHeadsProof, ParaId};
 use relay_substrate_client::{CallOf, HeaderIdOf};
-use substrate_relay_helper::parachains::{
-	SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline,
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge},
+	parachains::{SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline},
 };
 
 /// Kusama-to-BridgeHubPolkadot parachain sync description.

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

@@ -16,7 +16,7 @@
 
 //! Polkadot-to-KusamaBridgeHub headers sync entrypoint.
 
-use crate::cli::bridge::{
+use substrate_relay_helper::cli::bridge::{
 	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
 };
 

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

@@ -16,11 +16,11 @@
 
 //! Polkadot-to-BridgeHubKusama parachains sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
 use bp_polkadot_core::parachains::{ParaHash, ParaHeadsProof, ParaId};
 use relay_substrate_client::{CallOf, HeaderIdOf};
-use substrate_relay_helper::parachains::{
-	SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline,
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge},
+	parachains::{SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline},
 };
 
 /// Polkadot-to-BridgeHubKusama parachain sync description.

relays/bin-substrate/src/bridges/polkadot_bulletin/bridge_hub_polkadot_messages_to_polkadot_bulletin.rs

@@ -16,10 +16,13 @@
 
 //! BridgeHubPolkadot-to-PolkadotBulletin messages sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
 use relay_bridge_hub_polkadot_client::BridgeHubPolkadot;
 use relay_polkadot_bulletin_client::PolkadotBulletin;
-use substrate_relay_helper::{messages_lane::SubstrateMessageLane, UtilityPalletBatchCallBuilder};
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge},
+	messages_lane::SubstrateMessageLane,
+	UtilityPalletBatchCallBuilder,
+};
 
 /// BridgeHubPolkadot-to-PolkadotBulletin messages bridge.
 pub struct BridgeHubPolkadotToPolkadotBulletinMessagesCliBridge {}

relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_bulletin_headers_to_bridge_hub_polkadot.rs

@@ -16,18 +16,18 @@
 
 //! PolkadotBulletin-to-BridgeHubPolkadot headers sync entrypoint.
 
-use crate::cli::bridge::{
-	CliBridgeBase, MessagesCliBridge, RelayToRelayEquivocationDetectionCliBridge,
-	RelayToRelayHeadersCliBridge,
-};
-
 use async_trait::async_trait;
 use substrate_relay_helper::{
 	equivocation::SubstrateEquivocationDetectionPipeline,
 	finality::SubstrateFinalitySyncPipeline,
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 };
 
+use substrate_relay_helper::cli::bridge::{
+	CliBridgeBase, MessagesCliBridge, RelayToRelayEquivocationDetectionCliBridge,
+	RelayToRelayHeadersCliBridge,
+};
+
 /// Description of `PolkadotBulletin` -> `PolkadotBridgeHub` finalized headers bridge.
 #[derive(Clone, Debug)]
 pub struct PolkadotBulletinFinalityToBridgeHubPolkadot;

relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_bulletin_messages_to_bridge_hub_polkadot.rs

@@ -16,10 +16,13 @@
 
 //! PolkadotBulletin-to-BridgeHubPolkadot messages sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
 use relay_bridge_hub_polkadot_client::BridgeHubPolkadot;
 use relay_polkadot_bulletin_client::PolkadotBulletin;
-use substrate_relay_helper::{messages_lane::SubstrateMessageLane, UtilityPalletBatchCallBuilder};
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge},
+	messages_lane::SubstrateMessageLane,
+	UtilityPalletBatchCallBuilder,
+};
 
 /// PolkadotBulletin-to-BridgeHubPolkadot messages bridge.
 pub struct PolkadotBulletinToBridgeHubPolkadotMessagesCliBridge {}

relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_headers_to_polkadot_bulletin.rs

@@ -16,17 +16,17 @@
 
 //! Polkadot-to-PolkadotBulletin headers sync entrypoint.
 
-use crate::cli::bridge::{
-	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
-};
-
 use async_trait::async_trait;
 use substrate_relay_helper::{
 	equivocation::SubstrateEquivocationDetectionPipeline,
 	finality::SubstrateFinalitySyncPipeline,
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 };
 
+use substrate_relay_helper::cli::bridge::{
+	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
+};
+
 /// Description of Polkadot -> `PolkadotBulletin` finalized headers bridge.
 #[derive(Clone, Debug)]
 pub struct PolkadotFinalityToPolkadotBulletin;

relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_parachains_to_polkadot_bulletin.rs

@@ -16,7 +16,9 @@
 
 //! Polkadot-to-PolkadotBulletin parachains sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
+use substrate_relay_helper::cli::bridge::{
+	CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge,
+};
 
 use bp_polkadot_core::parachains::{ParaHash, ParaHeadsProof, ParaId};
 use bp_runtime::Chain;

relays/bin-substrate/src/bridges/rococo_bulletin/bridge_hub_rococo_messages_to_rococo_bulletin.rs

@@ -17,9 +17,12 @@
 //! BridgeHubRococo-to-RococoBulletin messages sync entrypoint.
 
 use super::BridgeHubRococoAsBridgeHubPolkadot;
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
 use relay_polkadot_bulletin_client::PolkadotBulletin as RococoBulletin;
-use substrate_relay_helper::{messages_lane::SubstrateMessageLane, UtilityPalletBatchCallBuilder};
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge},
+	messages_lane::SubstrateMessageLane,
+	UtilityPalletBatchCallBuilder,
+};
 
 /// BridgeHubRococo-to-RococoBulletin messages bridge.
 pub struct BridgeHubRococoToRococoBulletinMessagesCliBridge {}

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

@@ -16,16 +16,15 @@
 
 //! Declaration of all bridges between Rococo Bulletin Chain and Rococo Bridge Hub.
 
-use crate::cli::CliChain;
-
 use bp_messages::MessageNonce;
 use bp_runtime::{
 	AccountIdOf, BalanceOf, BlockNumberOf, ChainId, HashOf, HasherOf, HeaderOf, NonceOf,
 	SignatureOf,
 };
 use frame_support::pallet_prelude::Weight;
 use relay_substrate_client::{
-	Error as SubstrateError, SignParam, SimpleRuntimeVersion, UnsignedTransaction,
+	ChainWithRuntimeVersion, Error as SubstrateError, SignParam, SimpleRuntimeVersion,
+	UnsignedTransaction,
 };
 use sp_core::storage::StorageKey;
 use std::time::Duration;
@@ -127,7 +126,7 @@ impl relay_substrate_client::ChainWithTransactions for RococoAsPolkadot {
 	}
 }
 
-impl CliChain for RococoAsPolkadot {
+impl ChainWithRuntimeVersion for RococoAsPolkadot {
 	const RUNTIME_VERSION: Option<SimpleRuntimeVersion> = None;
 }
 
@@ -232,7 +231,7 @@ impl relay_substrate_client::ChainWithMessages for BridgeHubRococoAsBridgeHubPol
 		relay_bridge_hub_polkadot_client::BridgeHubPolkadot::FROM_CHAIN_MESSAGE_DETAILS_METHOD;
 }
 
-impl CliChain for BridgeHubRococoAsBridgeHubPolkadot {
+impl ChainWithRuntimeVersion for BridgeHubRococoAsBridgeHubPolkadot {
 	const RUNTIME_VERSION: Option<SimpleRuntimeVersion> =
 		Some(SimpleRuntimeVersion { spec_version: 1_003_000, transaction_version: 3 });
 }

relays/bin-substrate/src/bridges/rococo_bulletin/rococo_bulletin_headers_to_bridge_hub_rococo.rs

@@ -17,10 +17,6 @@
 //! RococoBulletin-to-BridgeHubRococo headers sync entrypoint.
 
 use super::BridgeHubRococoAsBridgeHubPolkadot;
-use crate::cli::bridge::{
-	CliBridgeBase, MessagesCliBridge, RelayToRelayEquivocationDetectionCliBridge,
-	RelayToRelayHeadersCliBridge,
-};
 
 use async_trait::async_trait;
 use substrate_relay_helper::{
@@ -29,6 +25,11 @@ use substrate_relay_helper::{
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 };
 
+use substrate_relay_helper::cli::bridge::{
+	CliBridgeBase, MessagesCliBridge, RelayToRelayEquivocationDetectionCliBridge,
+	RelayToRelayHeadersCliBridge,
+};
+
 /// Description of `RococoBulletin` -> `RococoBridgeHub` finalized headers bridge.
 #[derive(Clone, Debug)]
 pub struct RococoBulletinFinalityToBridgeHubRococo;

relays/bin-substrate/src/bridges/rococo_bulletin/rococo_bulletin_messages_to_bridge_hub_rococo.rs

@@ -17,9 +17,12 @@
 //! RococoBulletin-to-BridgeHubRococo messages sync entrypoint.
 
 use super::BridgeHubRococoAsBridgeHubPolkadot;
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
 use relay_polkadot_bulletin_client::PolkadotBulletin as RococoBulletin;
-use substrate_relay_helper::{messages_lane::SubstrateMessageLane, UtilityPalletBatchCallBuilder};
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge},
+	messages_lane::SubstrateMessageLane,
+	UtilityPalletBatchCallBuilder,
+};
 
 /// RococoBulletin-to-BridgeHubRococo messages bridge.
 pub struct RococoBulletinToBridgeHubRococoMessagesCliBridge {}

relays/bin-substrate/src/bridges/rococo_bulletin/rococo_headers_to_rococo_bulletin.rs

@@ -17,9 +17,6 @@
 //! Rococo-to-RococoBulletin headers sync entrypoint.
 
 use super::RococoAsPolkadot;
-use crate::cli::bridge::{
-	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
-};
 
 use async_trait::async_trait;
 use substrate_relay_helper::{
@@ -28,6 +25,10 @@ use substrate_relay_helper::{
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 };
 
+use substrate_relay_helper::cli::bridge::{
+	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
+};
+
 /// Description of Rococo -> `RococoBulletin` finalized headers bridge.
 #[derive(Clone, Debug)]
 pub struct RococoFinalityToRococoBulletin;

relays/bin-substrate/src/bridges/rococo_bulletin/rococo_parachains_to_rococo_bulletin.rs

@@ -17,12 +17,12 @@
 //! Rococo-to-RococoBulletin parachains sync entrypoint.
 
 use super::{BridgeHubRococoAsBridgeHubPolkadot, RococoAsPolkadot};
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
 
 use bp_polkadot_core::parachains::{ParaHash, ParaHeadsProof, ParaId};
 use bp_runtime::Chain;
 use relay_substrate_client::{CallOf, HeaderIdOf};
 use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge},
 	messages_lane::MessagesRelayLimits,
 	parachains::{SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline},
 };

relays/bin-substrate/src/bridges/rococo_westend/bridge_hub_rococo_messages_to_bridge_hub_westend.rs

@@ -16,10 +16,13 @@
 
 //! BridgeHubRococo-to-BridgeHubWestend messages sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
 use relay_bridge_hub_rococo_client::BridgeHubRococo;
 use relay_bridge_hub_westend_client::BridgeHubWestend;
-use substrate_relay_helper::{messages_lane::SubstrateMessageLane, UtilityPalletBatchCallBuilder};
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge},
+	messages_lane::SubstrateMessageLane,
+	UtilityPalletBatchCallBuilder,
+};
 
 pub struct BridgeHubRococoToBridgeHubWestendMessagesCliBridge {}
 

relays/bin-substrate/src/bridges/rococo_westend/bridge_hub_westend_messages_to_bridge_hub_rococo.rs

@@ -16,10 +16,13 @@
 
 //! BridgeHubWestend-to-BridgeHubRococo messages sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
 use relay_bridge_hub_rococo_client::BridgeHubRococo;
 use relay_bridge_hub_westend_client::BridgeHubWestend;
-use substrate_relay_helper::{messages_lane::SubstrateMessageLane, UtilityPalletBatchCallBuilder};
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge},
+	messages_lane::SubstrateMessageLane,
+	UtilityPalletBatchCallBuilder,
+};
 
 pub struct BridgeHubWestendToBridgeHubRococoMessagesCliBridge {}
 

relays/bin-substrate/src/bridges/rococo_westend/rococo_headers_to_bridge_hub_westend.rs

@@ -16,17 +16,17 @@
 
 //! Rococo-to-Westend bridge hubs headers sync entrypoint.
 
-use crate::cli::bridge::{
-	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
-};
-
 use async_trait::async_trait;
 use substrate_relay_helper::{
 	equivocation::SubstrateEquivocationDetectionPipeline,
 	finality::SubstrateFinalitySyncPipeline,
 	finality_base::{engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalityPipeline},
 };
 
+use substrate_relay_helper::cli::bridge::{
+	CliBridgeBase, RelayToRelayEquivocationDetectionCliBridge, RelayToRelayHeadersCliBridge,
+};
+
 /// Description of Rococo -> Westend finalized headers bridge.
 #[derive(Clone, Debug)]
 pub struct RococoFinalityToBridgeHubWestend;

relays/bin-substrate/src/bridges/rococo_westend/rococo_parachains_to_bridge_hub_westend.rs

@@ -16,11 +16,11 @@
 
 //! Westend-to-Rococo parachains sync entrypoint.
 
-use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
 use bp_polkadot_core::parachains::{ParaHash, ParaHeadsProof, ParaId};
 use relay_substrate_client::{CallOf, HeaderIdOf};
-use substrate_relay_helper::parachains::{
-	SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline,
+use substrate_relay_helper::{
+	cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge},
+	parachains::{SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline},
 };
 
 /// BridgeHub-to-BridgeHub parachain sync description.