messages bridge between RialtoParachain and Millau (#1218)

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

@@ -0,0 +1,57 @@
+// Copyright 2019-2021 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/>.
+
+//! Millau-to-RialtoParachain headers sync entrypoint.
+
+// Copyright 2019-2021 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/>.
+
+//! Millau-to-RialtoParachain headers sync entrypoint.
+
+use substrate_relay_helper::finality::{
+	engine::Grandpa as GrandpaFinalityEngine, DirectSubmitGrandpaFinalityProofCallBuilder,
+	SubstrateFinalitySyncPipeline,
+};
+
+/// Description of Millau -> Rialto finalized headers bridge.
+#[derive(Clone, Debug)]
+pub struct MillauFinalityToRialtoParachain;
+
+impl SubstrateFinalitySyncPipeline for MillauFinalityToRialtoParachain {
+	type SourceChain = relay_millau_client::Millau;
+	type TargetChain = relay_rialto_parachain_client::RialtoParachain;
+
+	type FinalityEngine = GrandpaFinalityEngine<Self::SourceChain>;
+	type SubmitFinalityProofCallBuilder = DirectSubmitGrandpaFinalityProofCallBuilder<
+		Self,
+		rialto_parachain_runtime::Runtime,
+		rialto_parachain_runtime::MillauGrandpaInstance,
+	>;
+	type TransactionSignScheme = relay_rialto_parachain_client::RialtoParachain;
+}

bridges/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs

@@ -0,0 +1,62 @@
+// Copyright 2019-2021 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/>.
+
+//! Millau-to-RialtoParachain messages sync entrypoint.
+
+use messages_relay::relay_strategy::MixStrategy;
+use relay_millau_client::Millau;
+use relay_rialto_parachain_client::RialtoParachain;
+use substrate_relay_helper::messages_lane::{
+	DirectReceiveMessagesDeliveryProofCallBuilder, DirectReceiveMessagesProofCallBuilder,
+	SubstrateMessageLane,
+};
+
+/// Description of Millau -> RialtoParachain messages bridge.
+#[derive(Clone, Debug)]
+pub struct MillauMessagesToRialtoParachain;
+
+impl SubstrateMessageLane for MillauMessagesToRialtoParachain {
+	const SOURCE_TO_TARGET_CONVERSION_RATE_PARAMETER_NAME: Option<&'static str> =
+		Some(bp_rialto_parachain::MILLAU_TO_RIALTO_CONVERSION_RATE_PARAMETER_NAME);
+	const TARGET_TO_SOURCE_CONVERSION_RATE_PARAMETER_NAME: Option<&'static str> =
+		Some(bp_millau::RIALTO_TO_MILLAU_CONVERSION_RATE_PARAMETER_NAME);
+
+	const SOURCE_FEE_MULTIPLIER_PARAMETER_NAME: Option<&'static str> = None;
+	const TARGET_FEE_MULTIPLIER_PARAMETER_NAME: Option<&'static str> = None;
+	const AT_SOURCE_TRANSACTION_PAYMENT_PALLET_NAME: Option<&'static str> = None;
+	const AT_TARGET_TRANSACTION_PAYMENT_PALLET_NAME: Option<&'static str> = None;
+
+	type SourceChain = Millau;
+	type TargetChain = RialtoParachain;
+
+	type SourceTransactionSignScheme = Millau;
+	type TargetTransactionSignScheme = RialtoParachain;
+
+	type ReceiveMessagesProofCallBuilder = DirectReceiveMessagesProofCallBuilder<
+		Self,
+		rialto_parachain_runtime::Runtime,
+		rialto_parachain_runtime::WithMillauMessagesInstance,
+	>;
+	type ReceiveMessagesDeliveryProofCallBuilder = DirectReceiveMessagesDeliveryProofCallBuilder<
+		Self,
+		millau_runtime::Runtime,
+		millau_runtime::WithRialtoParachainMessagesInstance,
+	>;
+
+	type TargetToSourceChainConversionRateUpdateBuilder = ();
+
+	type RelayStrategy = MixStrategy;
+}

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

@@ -19,11 +19,14 @@
 pub mod kusama_headers_to_polkadot;
 pub mod kusama_messages_to_polkadot;
 pub mod millau_headers_to_rialto;
+pub mod millau_headers_to_rialto_parachain;
 pub mod millau_messages_to_rialto;
+pub mod millau_messages_to_rialto_parachain;
 pub mod polkadot_headers_to_kusama;
 pub mod polkadot_messages_to_kusama;
 pub mod rialto_headers_to_millau;
 pub mod rialto_messages_to_millau;
+pub mod rialto_parachain_messages_to_millau;
 pub mod rialto_parachains_to_millau;
 pub mod rococo_headers_to_wococo;
 pub mod rococo_messages_to_wococo;

bridges/relays/bin-substrate/src/chains/rialto_parachain.rs

@@ -16,10 +16,42 @@
 
 //! Rialto parachain specification for CLI.
 
-use crate::cli::CliChain;
+use crate::cli::{
+	bridge,
+	encode_message::{CliEncodeMessage, RawMessage},
+	CliChain,
+};
+use bp_messages::LaneId;
+use bp_runtime::EncodedOrDecodedCall;
 use relay_rialto_parachain_client::RialtoParachain;
+use relay_substrate_client::BalanceOf;
 use sp_version::RuntimeVersion;
 
+impl CliEncodeMessage for RialtoParachain {
+	fn encode_send_message_call(
+		lane: LaneId,
+		payload: RawMessage,
+		fee: BalanceOf<Self>,
+		bridge_instance_index: u8,
+	) -> anyhow::Result<EncodedOrDecodedCall<Self::Call>> {
+		Ok(match bridge_instance_index {
+			bridge::RIALTO_PARACHAIN_TO_MILLAU_INDEX =>
+				rialto_parachain_runtime::Call::BridgeMillauMessages(
+					rialto_parachain_runtime::MessagesCall::send_message {
+						lane_id: lane,
+						payload,
+						delivery_and_dispatch_fee: fee,
+					},
+				)
+				.into(),
+			_ => anyhow::bail!(
+				"Unsupported target bridge pallet with instance index: {}",
+				bridge_instance_index
+			),
+		})
+	}
+}
+
 impl CliChain for RialtoParachain {
 	const RUNTIME_VERSION: RuntimeVersion = rialto_parachain_runtime::VERSION;
 

bridges/relays/bin-substrate/src/chains/rialto_parachain_messages_to_millau.rs

@@ -0,0 +1,62 @@
+// Copyright 2019-2021 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/>.
+
+//! RialtoParachain-to-Millau messages sync entrypoint.
+
+use messages_relay::relay_strategy::MixStrategy;
+use relay_millau_client::Millau;
+use relay_rialto_parachain_client::RialtoParachain;
+use substrate_relay_helper::messages_lane::{
+	DirectReceiveMessagesDeliveryProofCallBuilder, DirectReceiveMessagesProofCallBuilder,
+	SubstrateMessageLane,
+};
+
+/// Description of RialtoParachain -> Millau messages bridge.
+#[derive(Clone, Debug)]
+pub struct RialtoParachainMessagesToMillau;
+
+impl SubstrateMessageLane for RialtoParachainMessagesToMillau {
+	const SOURCE_TO_TARGET_CONVERSION_RATE_PARAMETER_NAME: Option<&'static str> =
+		Some(bp_millau::RIALTO_TO_MILLAU_CONVERSION_RATE_PARAMETER_NAME);
+	const TARGET_TO_SOURCE_CONVERSION_RATE_PARAMETER_NAME: Option<&'static str> =
+		Some(bp_rialto_parachain::MILLAU_TO_RIALTO_CONVERSION_RATE_PARAMETER_NAME);
+
+	const SOURCE_FEE_MULTIPLIER_PARAMETER_NAME: Option<&'static str> = None;
+	const TARGET_FEE_MULTIPLIER_PARAMETER_NAME: Option<&'static str> = None;
+	const AT_SOURCE_TRANSACTION_PAYMENT_PALLET_NAME: Option<&'static str> = None;
+	const AT_TARGET_TRANSACTION_PAYMENT_PALLET_NAME: Option<&'static str> = None;
+
+	type SourceChain = RialtoParachain;
+	type TargetChain = Millau;
+
+	type SourceTransactionSignScheme = RialtoParachain;
+	type TargetTransactionSignScheme = Millau;
+
+	type ReceiveMessagesProofCallBuilder = DirectReceiveMessagesProofCallBuilder<
+		Self,
+		millau_runtime::Runtime,
+		millau_runtime::WithRialtoParachainMessagesInstance,
+	>;
+	type ReceiveMessagesDeliveryProofCallBuilder = DirectReceiveMessagesDeliveryProofCallBuilder<
+		Self,
+		rialto_parachain_runtime::Runtime,
+		rialto_parachain_runtime::WithMillauMessagesInstance,
+	>;
+
+	type TargetToSourceChainConversionRateUpdateBuilder = ();
+
+	type RelayStrategy = MixStrategy;
+}

bridges/relays/bin-substrate/src/chains/rialto_parachains_to_millau.rs

@@ -23,17 +23,17 @@ use substrate_relay_helper::parachains_target::DirectSubmitParachainHeadsCallBui
 
 /// Rialto-to-Millau parachains sync description.
 #[derive(Clone, Debug)]
-pub struct RialtoToMillauParachains;
+pub struct RialtoParachainsToMillau;
 
-impl ParachainsPipeline for RialtoToMillauParachains {
+impl ParachainsPipeline for RialtoParachainsToMillau {
 	type SourceChain = Rialto;
 	type TargetChain = Millau;
 }
 
 /// `submit_parachain_heads` call builder for Rialto-to-Millau parachains sync pipeline.
-pub type RialtoToMillauParachainsSubmitParachainHeadsCallBuilder =
+pub type RialtoParachainsToMillauSubmitParachainHeadsCallBuilder =
 	DirectSubmitParachainHeadsCallBuilder<
-		RialtoToMillauParachains,
+		RialtoParachainsToMillau,
 		millau_runtime::Runtime,
 		millau_runtime::WitRialtoParachainsInstance,
 	>;

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

@@ -26,6 +26,8 @@ pub enum FullBridge {
 	WococoToRococo,
 	KusamaToPolkadot,
 	PolkadotToKusama,
+	MillauToRialtoParachain,
+	RialtoParachainToMillau,
 }
 
 impl FullBridge {
@@ -38,6 +40,8 @@ impl FullBridge {
 			Self::WococoToRococo => WOCOCO_TO_ROCOCO_INDEX,
 			Self::KusamaToPolkadot => KUSAMA_TO_POLKADOT_INDEX,
 			Self::PolkadotToKusama => POLKADOT_TO_KUSAMA_INDEX,
+			Self::MillauToRialtoParachain => MILLAU_TO_RIALTO_PARACHAIN_INDEX,
+			Self::RialtoParachainToMillau => RIALTO_PARACHAIN_TO_MILLAU_INDEX,
 		}
 	}
 }
@@ -48,6 +52,8 @@ pub const ROCOCO_TO_WOCOCO_INDEX: u8 = 0;
 pub const WOCOCO_TO_ROCOCO_INDEX: u8 = 0;
 pub const KUSAMA_TO_POLKADOT_INDEX: u8 = 0;
 pub const POLKADOT_TO_KUSAMA_INDEX: u8 = 0;
+pub const MILLAU_TO_RIALTO_PARACHAIN_INDEX: u8 = 1;
+pub const RIALTO_PARACHAIN_TO_MILLAU_INDEX: u8 = 0;
 
 /// The macro allows executing bridge-specific code without going fully generic.
 ///
@@ -171,6 +177,44 @@ macro_rules! select_full_bridge {
 
 				$generic
 			},
+			FullBridge::MillauToRialtoParachain => {
+				type Source = relay_millau_client::Millau;
+				#[allow(dead_code)]
+				type Target = relay_rialto_parachain_client::RialtoParachain;
+
+				// Derive-account
+				#[allow(unused_imports)]
+				use bp_rialto_parachain::derive_account_from_millau_id as derive_account;
+
+				// Relay-messages
+				#[allow(unused_imports)]
+				use crate::chains::millau_messages_to_rialto_parachain::MillauMessagesToRialtoParachain as MessagesLane;
+
+				// Send-message / Estimate-fee
+				#[allow(unused_imports)]
+				use bp_rialto_parachain::TO_RIALTO_PARACHAIN_ESTIMATE_MESSAGE_FEE_METHOD as ESTIMATE_MESSAGE_FEE_METHOD;
+
+				$generic
+			}
+			FullBridge::RialtoParachainToMillau => {
+				type Source = relay_rialto_parachain_client::RialtoParachain;
+				#[allow(dead_code)]
+				type Target = relay_millau_client::Millau;
+
+				// Derive-account
+				#[allow(unused_imports)]
+				use bp_millau::derive_account_from_rialto_parachain_id as derive_account;
+
+				// Relay-messages
+				#[allow(unused_imports)]
+				use crate::chains::rialto_parachain_messages_to_millau::RialtoParachainMessagesToMillau as MessagesLane;
+
+				// Send-message / Estimate-fee
+				#[allow(unused_imports)]
+				use bp_millau::TO_MILLAU_ESTIMATE_MESSAGE_FEE_METHOD as ESTIMATE_MESSAGE_FEE_METHOD;
+
+				$generic
+			}
 		}
 	};
 }

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

@@ -49,6 +49,7 @@ pub enum InitBridgeName {
 	WococoToRococo,
 	KusamaToPolkadot,
 	PolkadotToKusama,
+	MillauToRialtoParachain,
 }
 
 macro_rules! select_bridge {
@@ -181,6 +182,28 @@ macro_rules! select_bridge {
 					)
 				}
 
+				$generic
+			},
+			InitBridgeName::MillauToRialtoParachain => {
+				type Source = relay_millau_client::Millau;
+				type Target = relay_rialto_parachain_client::RialtoParachain;
+				type Engine = GrandpaFinalityEngine<Source>;
+
+				fn encode_init_bridge(
+					init_data: InitializationData<<Source as ChainBase>::Header>,
+				) -> <Target as Chain>::Call {
+					let initialize_call = rialto_parachain_runtime::BridgeGrandpaCall::<
+						rialto_parachain_runtime::Runtime,
+						rialto_parachain_runtime::MillauGrandpaInstance,
+					>::initialize {
+						init_data,
+					};
+					rialto_parachain_runtime::SudoCall::sudo {
+						call: Box::new(initialize_call.into()),
+					}
+					.into()
+				}
+
 				$generic
 			},
 		}

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

@@ -55,6 +55,7 @@ pub enum RelayHeadersBridge {
 	WococoToRococo,
 	KusamaToPolkadot,
 	PolkadotToKusama,
+	MillauToRialtoParachain,
 }
 
 macro_rules! select_bridge {
@@ -109,6 +110,14 @@ macro_rules! select_bridge {
 
 				$generic
 			},
+			RelayHeadersBridge::MillauToRialtoParachain => {
+				type Source = relay_millau_client::Millau;
+				type Target = relay_rialto_parachain_client::RialtoParachain;
+				type Finality = crate::chains::millau_headers_to_rialto_parachain::MillauFinalityToRialtoParachain;
+
+				$generic
+
+			},
 		}
 	};
 }

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

@@ -480,7 +480,6 @@ impl RelayHeadersAndMessages {
 				right_to_left_transaction_params,
 				params.shared.only_mandatory_headers,
 			);
-
 			// Need 2x capacity since we consider both directions for each lane
 			let mut message_relays = Vec::with_capacity(lanes.len() * 2);
 			for lane in lanes {

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

@@ -55,8 +55,8 @@ macro_rules! select_bridge {
 		match $bridge {
 			RelayParachainsBridge::RialtoToMillau => {
 				use crate::chains::rialto_parachains_to_millau::{
-					RialtoToMillauParachains as Pipeline,
-					RialtoToMillauParachainsSubmitParachainHeadsCallBuilder as SubmitParachainHeadsCallBuilder,
+					RialtoParachainsToMillau as Pipeline,
+					RialtoParachainsToMillauSubmitParachainHeadsCallBuilder as SubmitParachainHeadsCallBuilder,
 				};
 
 				use bp_millau::BRIDGE_PARAS_PALLET_NAME as BRIDGE_PARAS_PALLET_NAME_AT_TARGET;