Use indirect runtime calls for RialtoParachain (paritytech#1753)

* Use indirect runtime calls for RialtoParachain

* Code review fixes

primitives/runtime/src/lib.rs

@@ -47,7 +47,6 @@ pub use storage_types::BoundedStorageValue;
 #[cfg(feature = "std")]
 pub use storage_proof::craft_valid_storage_proof;
 
-pub mod calls;
 pub mod messages;
 
 mod chain;

relays/bin-substrate/Cargo.toml

@@ -51,7 +51,6 @@ relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
 relay-westend-client = { path = "../client-westend" }
 relay-wococo-client = { path = "../client-wococo" }
-rialto-parachain-runtime = { path = "../../bin/rialto-parachain/runtime" }
 rialto-runtime = { path = "../../bin/rialto/runtime" }
 substrate-relay-helper = { path = "../lib-substrate-relay" }
 

relays/bin-substrate/src/chains/bridge_hub_rococo_messages_to_bridge_hub_wococo.rs

@@ -17,7 +17,6 @@
 //! BridgeHubRococo-to-BridgeHubWococo messages sync entrypoint.
 
 use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
-use bp_messages::Weight;
 use relay_bridge_hub_rococo_client::BridgeHubRococo;
 use relay_bridge_hub_wococo_client::BridgeHubWococo;
 use substrate_relay_helper::messages_lane::SubstrateMessageLane;

relays/bin-substrate/src/chains/bridge_hub_wococo_messages_to_bridge_hub_rococo.rs

@@ -17,7 +17,6 @@
 //! BridgeHubWococo-to-BridgeHubRococo messages sync entrypoint.
 
 use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge};
-use bp_messages::Weight;
 use relay_bridge_hub_rococo_client::BridgeHubRococo;
 use relay_bridge_hub_wococo_client::BridgeHubWococo;
 use substrate_relay_helper::messages_lane::SubstrateMessageLane;

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

@@ -36,10 +36,16 @@
 
 use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, RelayToRelayHeadersCliBridge};
 use substrate_relay_helper::finality::{
-	engine::Grandpa as GrandpaFinalityEngine, DirectSubmitGrandpaFinalityProofCallBuilder,
-	SubstrateFinalitySyncPipeline,
+	engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalitySyncPipeline,
 };
 
+substrate_relay_helper::generate_mocked_submit_finality_proof_call_builder!(
+	MillauFinalityToRialtoParachain,
+	MillauFinalityToRialtoParachainCallBuilder,
+	relay_rialto_parachain_client::runtime::Call::BridgeMillauGrandpa,
+	relay_rialto_parachain_client::runtime::BridgeMillauGrandpaCall::submit_finality_proof
+);
+
 /// Description of Millau -> Rialto finalized headers bridge.
 #[derive(Clone, Debug)]
 pub struct MillauFinalityToRialtoParachain;
@@ -49,11 +55,7 @@ impl SubstrateFinalitySyncPipeline for MillauFinalityToRialtoParachain {
 	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 SubmitFinalityProofCallBuilder = MillauFinalityToRialtoParachainCallBuilder;
 }
 
 //// `Millau` to `RialtoParachain`  bridge definition.

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

@@ -19,10 +19,16 @@
 use relay_millau_client::Millau;
 use relay_rialto_parachain_client::RialtoParachain;
 use substrate_relay_helper::messages_lane::{
-	DirectReceiveMessagesDeliveryProofCallBuilder, DirectReceiveMessagesProofCallBuilder,
-	SubstrateMessageLane,
+	DirectReceiveMessagesDeliveryProofCallBuilder, SubstrateMessageLane,
 };
 
+substrate_relay_helper::generate_mocked_receive_message_proof_call_builder!(
+	MillauMessagesToRialtoParachain,
+	MillauMessagesToRialtoParachainReceiveMessagesProofCallBuilder,
+	relay_rialto_parachain_client::runtime::Call::BridgeMillauMessages,
+	relay_rialto_parachain_client::runtime::BridgeMillauMessagesCall::receive_messages_proof
+);
+
 /// Description of Millau -> RialtoParachain messages bridge.
 #[derive(Clone, Debug)]
 pub struct MillauMessagesToRialtoParachain;
@@ -31,11 +37,8 @@ impl SubstrateMessageLane for MillauMessagesToRialtoParachain {
 	type SourceChain = Millau;
 	type TargetChain = RialtoParachain;
 
-	type ReceiveMessagesProofCallBuilder = DirectReceiveMessagesProofCallBuilder<
-		Self,
-		rialto_parachain_runtime::Runtime,
-		rialto_parachain_runtime::WithMillauMessagesInstance,
-	>;
+	type ReceiveMessagesProofCallBuilder =
+		MillauMessagesToRialtoParachainReceiveMessagesProofCallBuilder;
 	type ReceiveMessagesDeliveryProofCallBuilder = DirectReceiveMessagesDeliveryProofCallBuilder<
 		Self,
 		millau_runtime::Runtime,

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

@@ -18,7 +18,9 @@
 
 use crate::cli::{bridge, encode_message::CliEncodeMessage, CliChain};
 use bp_runtime::EncodedOrDecodedCall;
+use bridge_runtime_common::CustomNetworkId;
 use relay_rialto_parachain_client::RialtoParachain;
+use relay_substrate_client::calls::XcmCall;
 use sp_version::RuntimeVersion;
 use xcm::latest::prelude::*;
 
@@ -29,23 +31,19 @@ impl CliEncodeMessage for RialtoParachain {
 	) -> anyhow::Result<EncodedOrDecodedCall<Self::Call>> {
 		let dest = match bridge_instance_index {
 			bridge::RIALTO_PARACHAIN_TO_MILLAU_INDEX =>
-				(Parent, X1(GlobalConsensus(rialto_parachain_runtime::MillauNetwork::get()))),
+				(Parent, X1(GlobalConsensus(CustomNetworkId::Millau.as_network_id()))),
 			_ => anyhow::bail!(
 				"Unsupported target bridge pallet with instance index: {}",
 				bridge_instance_index
 			),
 		};
 
-		Ok(rialto_parachain_runtime::RuntimeCall::PolkadotXcm(
-			rialto_parachain_runtime::XcmCall::send {
-				dest: Box::new(dest.into()),
-				message: Box::new(message),
-			},
-		)
-		.into())
+		let xcm_call = XcmCall::send(Box::new(dest.into()), Box::new(message));
+
+		Ok(relay_rialto_parachain_client::runtime::Call::PolkadotXcm(xcm_call).into())
 	}
 }
 
 impl CliChain for RialtoParachain {
-	const RUNTIME_VERSION: Option<RuntimeVersion> = Some(rialto_parachain_runtime::VERSION);
+	const RUNTIME_VERSION: Option<RuntimeVersion> = None;
 }

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

@@ -19,13 +19,17 @@
 use relay_millau_client::Millau;
 use relay_rialto_parachain_client::RialtoParachain;
 use substrate_relay_helper::{
-	messages_lane::{
-		DirectReceiveMessagesDeliveryProofCallBuilder, DirectReceiveMessagesProofCallBuilder,
-		SubstrateMessageLane,
-	},
+	messages_lane::{DirectReceiveMessagesProofCallBuilder, SubstrateMessageLane},
 	UtilityPalletBatchCallBuilder,
 };
 
+substrate_relay_helper::generate_mocked_receive_message_delivery_proof_call_builder!(
+	RialtoParachainMessagesToMillau,
+	RialtoParachainMessagesToMillauReceiveMessagesDeliveryProofCallBuilder,
+	relay_rialto_parachain_client::runtime::Call::BridgeMillauMessages,
+	relay_rialto_parachain_client::runtime::BridgeMillauMessagesCall::receive_messages_delivery_proof
+);
+
 /// Description of RialtoParachain -> Millau messages bridge.
 #[derive(Clone, Debug)]
 pub struct RialtoParachainMessagesToMillau;
@@ -39,11 +43,8 @@ impl SubstrateMessageLane for RialtoParachainMessagesToMillau {
 		millau_runtime::Runtime,
 		millau_runtime::WithRialtoParachainMessagesInstance,
 	>;
-	type ReceiveMessagesDeliveryProofCallBuilder = DirectReceiveMessagesDeliveryProofCallBuilder<
-		Self,
-		rialto_parachain_runtime::Runtime,
-		rialto_parachain_runtime::WithMillauMessagesInstance,
-	>;
+	type ReceiveMessagesDeliveryProofCallBuilder =
+		RialtoParachainMessagesToMillauReceiveMessagesDeliveryProofCallBuilder;
 
 	type SourceBatchCallBuilder = ();
 	type TargetBatchCallBuilder = UtilityPalletBatchCallBuilder<Millau>;

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

@@ -29,7 +29,7 @@ use crate::{
 	cli::{bridge::CliBridgeBase, chain_schema::*},
 };
 use bp_runtime::Chain as ChainBase;
-use relay_substrate_client::{AccountKeyPairOf, Chain, UnsignedTransaction};
+use relay_substrate_client::{calls::SudoCall, AccountKeyPairOf, Chain, UnsignedTransaction};
 use sp_core::Pair;
 use structopt::StructOpt;
 use strum::{EnumString, EnumVariantNames, VariantNames};
@@ -123,13 +123,13 @@ impl BridgeInitializer for MillauToRialtoParachainCliBridge {
 	fn encode_init_bridge(
 		init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
 	) -> <Self::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()
+		use relay_rialto_parachain_client::runtime;
+
+		let initialize_call = runtime::Call::BridgeMillauGrandpa(
+			runtime::BridgeMillauGrandpaCall::initialize(init_data),
+		);
+		let sudo_call = SudoCall::sudo(Box::new(initialize_call));
+		runtime::Call::Sudo(sudo_call)
 	}
 }
 

relays/client-bridge-hub-rococo/Cargo.toml

@@ -22,6 +22,7 @@ bp-runtime = { path = "../../primitives/runtime" }
 bp-wococo = { path = "../../primitives/chain-wococo" }
 
 bridge-runtime-common = { path = "../../bin/runtime-common" }
+
 # Substrate Dependencies
 
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }

relays/client-bridge-hub-rococo/src/lib.rs

@@ -132,7 +132,7 @@ mod tests {
 	#[test]
 	fn parse_transaction_works() {
 		let unsigned = UnsignedTransaction {
-			call: runtime::Call::System(bp_runtime::calls::SystemCall::remark(
+			call: runtime::Call::System(relay_substrate_client::calls::SystemCall::remark(
 				b"Hello world!".to_vec(),
 			))
 			.into(),

relays/client-bridge-hub-rococo/src/runtime_wrapper.rs

@@ -23,8 +23,8 @@ use scale_info::TypeInfo;
 
 pub use bp_header_chain::BridgeGrandpaCallOf;
 pub use bp_parachains::BridgeParachainCall;
-pub use bp_runtime::calls::SystemCall;
 pub use bridge_runtime_common::messages::BridgeMessagesCallOf;
+pub use relay_substrate_client::calls::SystemCall;
 
 // TODO:check-parameter - check SignedExtension
 /// Unchecked BridgeHubRococo extrinsic.

relays/client-bridge-hub-wococo/src/runtime_wrapper.rs

@@ -21,8 +21,8 @@ use scale_info::TypeInfo;
 
 pub use bp_header_chain::BridgeGrandpaCallOf;
 pub use bp_parachains::BridgeParachainCall;
-pub use bp_runtime::calls::SystemCall;
 pub use bridge_runtime_common::messages::BridgeMessagesCallOf;
+pub use relay_substrate_client::calls::SystemCall;
 
 // TODO:check-parameter - check SignedExtension
 /// Unchecked BridgeHubWococo extrinsic.

relays/client-rialto-parachain/Cargo.toml

@@ -7,14 +7,20 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.1.5" }
-relay-substrate-client = { path = "../client-substrate" }
-relay-utils = { path = "../utils" }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Bridge dependencies
 
+bp-header-chain = { path = "../../primitives/header-chain" }
 bp-messages = { path = "../../primitives/messages" }
+bp-millau = { path = "../../primitives/chain-millau" }
+bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-rialto-parachain = { path = "../../primitives/chain-rialto-parachain" }
-rialto-parachain-runtime = { path = "../../bin/rialto-parachain/runtime" }
+bp-runtime = { path = "../../primitives/runtime" }
+
+bridge-runtime-common = { path = "../../bin/runtime-common" }
+relay-substrate-client = { path = "../client-substrate" }
+relay-utils = { path = "../utils" }
 
 # Substrate Dependencies