Working state

Cargo.toml

@@ -214,6 +214,7 @@ polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "r
 bp-header-chain = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0", default-features = false }
 bp-messages = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0", default-features = false }
 bp-evochain = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0", default-features = false }
+bp-millau = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0", default-features = false }
 bp-relayers = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0", default-features = false }
 bp-runtime = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0", default-features = false }
 bp-ownership-parachain = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0", default-features = false }

bridge/bin-substrate/src/chains/evochain.rs

@@ -22,45 +22,44 @@ use bridge_runtime_common::CustomNetworkId;
 use node_template_runtime as evochain_runtime;
 use relay_evochain_client::Evochain;
 use relay_substrate_client::SimpleRuntimeVersion;
-use xcm_executor::traits::ExportXcm;
 
-impl CliEncodeMessage for Evochain {
-	fn encode_wire_message(
-		target: xcm::v3::NetworkId,
-		at_target_xcm: xcm::v3::Xcm<()>,
-	) -> anyhow::Result<Vec<u8>> {
-		anyhow::ensure!(
-			[
-				CustomNetworkId::Rococo.as_network_id(),
-				CustomNetworkId::OwnershipParachain.as_network_id()
-			]
-			.contains(&target),
-			anyhow::format_err!("Unsupported target chain: {:?}", target)
-		);
+// impl CliEncodeMessage for Evochain {
+// 	fn encode_wire_message(
+// 		target: xcm::v3::NetworkId,
+// 		at_target_xcm: xcm::v3::Xcm<()>,
+// 	) -> anyhow::Result<Vec<u8>> {
+// 		anyhow::ensure!(
+// 			[
+// 				CustomNetworkId::Rococo.as_network_id(),
+// 				CustomNetworkId::OwnershipParachain.as_network_id()
+// 			]
+// 			.contains(&target),
+// 			anyhow::format_err!("Unsupported target chain: {:?}", target)
+// 		);
 
-		Ok(evochain_runtime::xcm_config::ToRialtoOrOwnershipParachainSwitchExporter::validate(
-			target,
-			0,
-			&mut Some(Self::dummy_universal_source()?),
-			&mut Some(target.into()),
-			&mut Some(at_target_xcm),
-		)
-		.map_err(|e| anyhow::format_err!("Failed to prepare outbound message: {:?}", e))?
-		.0
-		 .1
-		 .0)
-	}
+// 		Ok(evochain_runtime::xcm_config::ToRialtoOrOwnershipParachainSwitchExporter::validate(
+// 			target,
+// 			0,
+// 			&mut Some(Self::dummy_universal_source()?),
+// 			&mut Some(target.into()),
+// 			&mut Some(at_target_xcm),
+// 		)
+// 		.map_err(|e| anyhow::format_err!("Failed to prepare outbound message: {:?}", e))?
+// 		.0
+// 		 .1
+// 		 .0)
+// 	}
 
-	fn encode_execute_xcm(
-		message: xcm::VersionedXcm<Self::Call>,
-	) -> anyhow::Result<EncodedOrDecodedCall<Self::Call>> {
-		Ok(evochain_runtime::RuntimeCall::XcmPallet(evochain_runtime::XcmCall::execute {
-			message: Box::new(message),
-			max_weight: Self::estimate_execute_xcm_weight(),
-		})
-		.into())
-	}
-}
+// 	fn encode_execute_xcm(
+// 		message: xcm::VersionedXcm<Self::Call>,
+// 	) -> anyhow::Result<EncodedOrDecodedCall<Self::Call>> {
+// 		Ok(evochain_runtime::RuntimeCall::XcmPallet(evochain_runtime::XcmCall::execute {
+// 			message: Box::new(message),
+// 			max_weight: Self::estimate_execute_xcm_weight(),
+// 		})
+// 		.into())
+// 	}
+// }
 
 impl CliChain for Evochain {
 	const RUNTIME_VERSION: Option<SimpleRuntimeVersion> =

bridge/bin-substrate/src/cli/init_bridge.rs

@@ -23,7 +23,10 @@ use crate::{
 			kusama_headers_to_bridge_hub_polkadot::KusamaToBridgeHubPolkadotCliBridge,
 			polkadot_headers_to_bridge_hub_kusama::PolkadotToBridgeHubKusamaCliBridge,
 		},
-		ownership_parachain_evochain::evochain_headers_to_ownership_parachain::EvochainToOwnershipParachainCliBridge,
+		ownership_parachain_evochain::{
+			evochain_headers_to_ownership_parachain::EvochainToOwnershipParachainCliBridge,
+			millau_headers_to_ownership_parachain::MillauToOwnershipParachainCliBridge,
+		},
 		rialto_millau::{
 			millau_headers_to_rialto::MillauToRialtoCliBridge,
 			rialto_headers_to_millau::RialtoToMillauCliBridge,
@@ -74,6 +77,8 @@ pub enum InitBridgeName {
 	KusamaToBridgeHubPolkadot,
 	PolkadotToBridgeHubKusama,
 	EvochainToOwnershipParachain,
+	MillauToOwnershipParachain,
+	// EvochainToRialtoParachain,
 }
 
 #[async_trait]
@@ -145,6 +150,22 @@ impl BridgeInitializer for MillauToRialtoParachainCliBridge {
 		RuntimeCall::Sudo(SudoCall::sudo { call: Box::new(initialize_call) })
 	}
 }
+// impl BridgeInitializer for EvochainToRialtoParachainCliBridge {
+// 	type Engine = GrandpaFinalityEngine<Self::Source>;
+
+// 	fn encode_init_bridge(
+// 		init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
+// 	) -> <Self::Target as Chain>::Call {
+// 		type RuntimeCall = relay_rialto_parachain_client::RuntimeCall;
+// 		type BridgeGrandpaCall = relay_rialto_parachain_client::BridgeGrandpaEvochainCall;
+// 		type SudoCall = relay_rialto_parachain_client::SudoCall;
+
+// 		let initialize_call: relay_rialto_parachain_client::runtime_types::rialto_parachain_runtime::RuntimeCall =
+// 			RuntimeCall::BridgeEvochainGrandpa(BridgeGrandpaCall::initialize { init_data });
+
+// 		RuntimeCall::Sudo(SudoCall::sudo { call: Box::new(initialize_call) })
+// 	}
+// }
 
 impl BridgeInitializer for RialtoToMillauCliBridge {
 	type Engine = GrandpaFinalityEngine<Self::Source>;
@@ -251,6 +272,23 @@ impl BridgeInitializer for EvochainToOwnershipParachainCliBridge {
 	}
 }
 
+impl BridgeInitializer for MillauToOwnershipParachainCliBridge {
+	type Engine = GrandpaFinalityEngine<Self::Source>;
+
+	fn encode_init_bridge(
+		init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
+	) -> <Self::Target as Chain>::Call {
+		type RuntimeCall = relay_ownership_parachain_client::RuntimeCall;
+		type BridgeGrandpaCall = relay_ownership_parachain_client::BridgeGrandpaCallMillau;
+		type SudoCall = relay_ownership_parachain_client::SudoCall;
+
+		let initialize_call: RuntimeCall =
+			RuntimeCall::BridgeMillauGrandpa(BridgeGrandpaCall::initialize { init_data });
+
+		RuntimeCall::Sudo(SudoCall::sudo { call: Box::new(initialize_call) })
+	}
+}
+
 impl InitBridge {
 	/// Run the command.
 	pub async fn run(self) -> anyhow::Result<()> {
@@ -276,6 +314,12 @@ impl InitBridge {
 			InitBridgeName::EvochainToOwnershipParachain => {
 				EvochainToOwnershipParachainCliBridge::init_bridge(self)
 			},
+			InitBridgeName::MillauToOwnershipParachain => {
+				MillauToOwnershipParachainCliBridge::init_bridge(self)
+			},
+			// InitBridgeName::EvochainToRialtoParachain => {
+			// 	EvochainToRialtoParachainCliBridge::init_bridge(self)
+			// },
 		}
 		.await
 	}

bridge/bin-substrate/src/cli/mod.rs

@@ -102,10 +102,10 @@ impl Command {
 		use relay_utils::initialize::{initialize_logger, initialize_relay};
 
 		match self {
-			Self::RelayHeaders(_) |
-			Self::RelayMessages(_) |
-			Self::RelayHeadersAndMessages(_) |
-			Self::InitBridge(_) => {
+			Self::RelayHeaders(_)
+			| Self::RelayMessages(_)
+			| Self::RelayHeadersAndMessages(_)
+			| Self::InitBridge(_) => {
 				initialize_relay();
 			},
 			_ => {
@@ -137,7 +137,7 @@ impl Command {
 			Ok(signals) => signals,
 			Err(e) => {
 				log::error!(target: LOG_TARGET, "Could not register exit signals: {}", e);
-				return
+				return;
 			},
 		};
 		let run = self.do_run().fuse();
@@ -320,7 +320,7 @@ where
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		if s.to_lowercase() == "max" {
-			return Ok(ExplicitOrMaximal::Maximal)
+			return Ok(ExplicitOrMaximal::Maximal);
 		}
 
 		V::from_str(s)

bridge/bin-substrate/src/cli/relay_headers.rs

@@ -25,7 +25,10 @@ use crate::bridges::{
 		kusama_headers_to_bridge_hub_polkadot::KusamaToBridgeHubPolkadotCliBridge,
 		polkadot_headers_to_bridge_hub_kusama::PolkadotToBridgeHubKusamaCliBridge,
 	},
-	ownership_parachain_evochain::evochain_headers_to_ownership_parachain::EvochainToOwnershipParachainCliBridge,
+	ownership_parachain_evochain::{
+		evochain_headers_to_ownership_parachain::EvochainToOwnershipParachainCliBridge,
+		millau_headers_to_ownership_parachain::MillauToOwnershipParachainCliBridge,
+	},
 	rialto_millau::{
 		millau_headers_to_rialto::MillauToRialtoCliBridge,
 		rialto_headers_to_millau::RialtoToMillauCliBridge,
@@ -76,6 +79,8 @@ pub enum RelayHeadersBridge {
 	KusamaToBridgeHubPolkadot,
 	PolkadotToBridgeHubKusama,
 	EvochainToOwnershipParachain,
+	MillauToOwnershipParachain,
+	// EvochainToRialtoParachain,
 }
 
 #[async_trait]
@@ -125,6 +130,8 @@ impl HeadersRelayer for WococoToBridgeHubRococoCliBridge {}
 impl HeadersRelayer for KusamaToBridgeHubPolkadotCliBridge {}
 impl HeadersRelayer for PolkadotToBridgeHubKusamaCliBridge {}
 impl HeadersRelayer for EvochainToOwnershipParachainCliBridge {}
+impl HeadersRelayer for MillauToOwnershipParachainCliBridge {}
+// impl HeadersRelayer for EvochainToRialtoParachainCliBridge {}
 
 impl RelayHeaders {
 	/// Run the command.
@@ -151,6 +158,12 @@ impl RelayHeaders {
 			RelayHeadersBridge::EvochainToOwnershipParachain => {
 				EvochainToOwnershipParachainCliBridge::relay_headers(self)
 			},
+			RelayHeadersBridge::MillauToOwnershipParachain => {
+				MillauToOwnershipParachainCliBridge::relay_headers(self)
+			}
+			// RelayHeadersBridge::EvochainToRialtoParachain => {
+			// 	EvochainToRialtoParachainCliBridge::relay_headers(self)
+			// },
 		}
 		.await
 	}

bridge/client-evochain/src/lib.rs

@@ -94,8 +94,6 @@ impl ChainWithTransactions for Evochain {
 				frame_system::CheckNonce::<evochain_runtime::Runtime>::from(unsigned.nonce),
 				frame_system::CheckWeight::<evochain_runtime::Runtime>::new(),
 				pallet_transaction_payment::ChargeTransactionPayment::<evochain_runtime::Runtime>::from(unsigned.tip),
-				evochain_runtime::BridgeRejectObsoleteHeadersAndMessages,
-				evochain_runtime::BridgeRefundOwnershipParachainMessages::default(),
 			),
 			(
 				(),
@@ -106,8 +104,6 @@ impl ChainWithTransactions for Evochain {
 				(),
 				(),
 				(),
-				(),
-				()
 			),
 		);
 		let signature = raw_payload.using_encoded(|payload| param.signer.sign(payload));

bridge/client-ownership-parachain/Cargo.toml

@@ -18,7 +18,7 @@ bp-messages = { git = "https://github.com/freeverseio/parity-bridges-common.git"
 bp-evochain = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
 bp-polkadot-core = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
 bp-ownership-parachain = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
-
+bp-millau = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
 bridge-runtime-common = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
 relay-substrate-client = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
 

bridge/client-ownership-parachain/src/lib.rs

@@ -33,6 +33,7 @@ pub use codegen_runtime::api::runtime_types;
 pub type RuntimeCall = runtime_types::laos_runtime::RuntimeCall;
 pub type SudoCall = runtime_types::pallet_sudo::pallet::Call;
 pub type BridgeGrandpaCall = runtime_types::pallet_bridge_grandpa::pallet::Call;
+pub type BridgeGrandpaCallMillau = runtime_types::pallet_bridge_grandpa_millau::pallet::Call;
 pub type BridgeMessagesCall = runtime_types::pallet_bridge_messages::pallet::Call;
 
 /// The address format for describing accounts.

bridge/light-bridge/Cargo.toml

@@ -0,0 +1,70 @@
+[package]
+name = "laos-relay"
+version = "1.0.1"
+authors = ["Parity Technologies <[email protected]>"]
+edition = "2021"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+
+[dependencies]
+anyhow = "1.0"
+async-std = "1.9.0"
+async-trait = "0.1"
+codec = { package = "parity-scale-codec", version = "3.1.5" }
+futures = "0.3.28"
+hex = "0.4"
+log = "0.4.19"
+num-format = "0.4"
+num-traits = "0.2"
+rbtag = "0.3"
+rustc-hex = "2.1"
+structopt = "0.3"
+signal-hook = "0.3.16"
+signal-hook-async-std = "0.2.2"
+strum = { version = "0.25.0", features = ["derive"] }
+
+# Bridge dependencies
+bp-evochain = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+bp-header-chain = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+bp-messages = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+bp-parachains = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+bp-millau = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+bp-polkadot-core = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+bp-runtime = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+bridge-runtime-common = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+millau-runtime = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+pallet-bridge-parachains = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+pallet-bridge-messages = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+parachains-relay = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+relay-millau-client = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+relay-evochain-client = { path = "../client-evochain" }
+relay-ownership-parachain-client = { path = "../client-ownership-parachain" }
+relay-substrate-client = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+relay-utils = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+# we are not using this runtime to craft call or transactions, but we still need it
+# to prepare large XCM messages
+rialto-parachain-runtime = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+substrate-relay-helper = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+
+node-template-runtime = { git = "https://github.com/freeverseio/laos-evolution-node.git", branch = "feat/relayer-updates" }
+laos-runtime = { path = "../../runtime" }
+
+# Substrate Dependencies
+
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+
+# Polkadot Dependencies
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
+
+[dev-dependencies]
+bp-test-utils = { git = "https://github.com/freeverseio/parity-bridges-common.git", branch = "polkadot-v1.0.0" }
+hex-literal = "0.4"
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+tempfile = "3.7"
+finality-grandpa = { version = "0.16.2" }

bridge/light-bridge/src/bridges/mod.rs

@@ -0,0 +1,19 @@
+// 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/>.
+
+//! Declaration of all bridges that the relay is able to serve.
+
+pub mod ownership_parachain_evochain;