Squashed 'bridges/' changes from 557ecbcecc..04b3dda6aa

04b3dda6aa Remove from subtree (#2111)
f8ff15e7e7 Add `MessagesPalletInstance` for integrity tests (#2107)
92ccef58e6 Use generated runtimes for BHR/BHW (#2106)
b33e0a585b Fix comment (#2105)

git-subtree-dir: bridges
git-subtree-split: 04b3dda6aa38599e612ff637710b6d2cff275ef3

bin/millau/runtime/src/rialto_messages.rs

@@ -166,7 +166,7 @@ mod tests {
 
 	#[test]
 	fn ensure_millau_message_lane_weights_are_correct() {
-		check_message_lane_weights::<bp_millau::Millau, Runtime>(
+		check_message_lane_weights::<bp_millau::Millau, Runtime, WithRialtoMessagesInstance>(
 			bp_rialto::EXTRA_STORAGE_PROOF_SIZE,
 			bp_millau::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
 			bp_millau::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,

bin/millau/runtime/src/rialto_parachain_messages.rs

@@ -172,7 +172,7 @@ mod tests {
 
 	#[test]
 	fn ensure_millau_message_lane_weights_are_correct() {
-		check_message_lane_weights::<bp_millau::Millau, Runtime>(
+		check_message_lane_weights::<bp_millau::Millau, Runtime, WithRialtoParachainMessagesInstance>(
 			bp_rialto_parachain::EXTRA_STORAGE_PROOF_SIZE,
 			bp_millau::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
 			bp_millau::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,

bin/rialto-parachain/runtime/src/millau_messages.rs

@@ -150,7 +150,11 @@ mod tests {
 
 	#[test]
 	fn ensure_millau_message_lane_weights_are_correct() {
-		check_message_lane_weights::<bp_rialto_parachain::RialtoParachain, Runtime>(
+		check_message_lane_weights::<
+			bp_rialto_parachain::RialtoParachain,
+			Runtime,
+			WithMillauMessagesInstance,
+		>(
 			bp_millau::EXTRA_STORAGE_PROOF_SIZE,
 			bp_rialto_parachain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
 			bp_rialto_parachain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,

bin/rialto/runtime/src/millau_messages.rs

@@ -150,7 +150,7 @@ mod tests {
 
 	#[test]
 	fn ensure_millau_message_lane_weights_are_correct() {
-		check_message_lane_weights::<bp_rialto::Rialto, Runtime>(
+		check_message_lane_weights::<bp_rialto::Rialto, Runtime, WithMillauMessagesInstance>(
 			bp_millau::EXTRA_STORAGE_PROOF_SIZE,
 			bp_rialto::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
 			bp_rialto::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,

bin/runtime-common/src/integrity.rs

@@ -292,7 +292,8 @@ where
 /// Check that the message lane weights are correct.
 pub fn check_message_lane_weights<
 	C: Chain,
-	T: frame_system::Config + pallet_bridge_messages::Config,
+	T: frame_system::Config + pallet_bridge_messages::Config<MessagesPalletInstance>,
+	MessagesPalletInstance: 'static,
 >(
 	bridged_chain_extra_storage_proof_size: u32,
 	this_chain_max_unrewarded_relayers: MessageNonce,
@@ -303,15 +304,15 @@ pub fn check_message_lane_weights<
 	// in other words: pass true for all known production chains
 	runtime_includes_refund_extension: bool,
 ) {
-	type Weights<T> = <T as pallet_bridge_messages::Config>::WeightInfo;
+	type Weights<T, MI> = <T as pallet_bridge_messages::Config<MI>>::WeightInfo;
 
 	// check basic weight assumptions
-	pallet_bridge_messages::ensure_weights_are_correct::<Weights<T>>();
+	pallet_bridge_messages::ensure_weights_are_correct::<Weights<T, MessagesPalletInstance>>();
 
 	// check that weights allow us to receive messages
 	let max_incoming_message_proof_size = bridged_chain_extra_storage_proof_size
 		.saturating_add(messages::target::maximal_incoming_message_size(C::max_extrinsic_size()));
-	pallet_bridge_messages::ensure_able_to_receive_message::<Weights<T>>(
+	pallet_bridge_messages::ensure_able_to_receive_message::<Weights<T, MessagesPalletInstance>>(
 		C::max_extrinsic_size(),
 		C::max_extrinsic_weight(),
 		max_incoming_message_proof_size,
@@ -321,7 +322,7 @@ pub fn check_message_lane_weights<
 	// check that weights allow us to receive delivery confirmations
 	let max_incoming_inbound_lane_data_proof_size =
 		InboundLaneData::<()>::encoded_size_hint_u32(this_chain_max_unrewarded_relayers as _);
-	pallet_bridge_messages::ensure_able_to_receive_confirmation::<Weights<T>>(
+	pallet_bridge_messages::ensure_able_to_receive_confirmation::<Weights<T, MessagesPalletInstance>>(
 		C::max_extrinsic_size(),
 		C::max_extrinsic_weight(),
 		max_incoming_inbound_lane_data_proof_size,
@@ -336,9 +337,12 @@ pub fn check_message_lane_weights<
 	// ensures the extension will not refund weight when it doesn't need to (i.e. if pallet
 	// weights do not account weights of refund extension).
 	if runtime_includes_refund_extension {
-		assert_ne!(Weights::<T>::receive_messages_proof_overhead_from_runtime(), Weight::zero());
 		assert_ne!(
-			Weights::<T>::receive_messages_delivery_proof_overhead_from_runtime(),
+			Weights::<T, MessagesPalletInstance>::receive_messages_proof_overhead_from_runtime(),
+			Weight::zero()
+		);
+		assert_ne!(
+			Weights::<T, MessagesPalletInstance>::receive_messages_delivery_proof_overhead_from_runtime(),
 			Weight::zero()
 		);
 	}

relays/bin-substrate/Cargo.toml

@@ -49,7 +49,7 @@ relay-utils = { path = "../utils" }
 relay-westend-client = { path = "../client-westend" }
 relay-wococo-client = { path = "../client-wococo" }
 rialto-runtime = { path = "../../bin/rialto/runtime" }
-# we are not using this runtime to craft callsour transactions, but we still need it
+# we are not using this runtime to craft call or transactions, but we still need it
 # to prepare large XCM messages
 rialto-parachain-runtime = { path = "../../bin/rialto-parachain/runtime" }
 substrate-relay-helper = { path = "../lib-substrate-relay" }

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

@@ -35,15 +35,15 @@ impl MessagesCliBridge for BridgeHubRococoToBridgeHubWococoMessagesCliBridge {
 substrate_relay_helper::generate_receive_message_proof_call_builder!(
 	BridgeHubRococoMessagesToBridgeHubWococoMessageLane,
 	BridgeHubRococoMessagesToBridgeHubWococoMessageLaneReceiveMessagesProofCallBuilder,
-	relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoMessages,
-	relay_bridge_hub_wococo_client::runtime::BridgeRococoMessagesCall::receive_messages_proof
+	relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoMessages,
+	relay_bridge_hub_wococo_client::BridgeMessagesCall::receive_messages_proof
 );
 
 substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
 	BridgeHubRococoMessagesToBridgeHubWococoMessageLane,
 	BridgeHubRococoMessagesToBridgeHubWococoMessageLaneReceiveMessagesDeliveryProofCallBuilder,
-	relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoMessages,
-	relay_bridge_hub_rococo_client::runtime::BridgeWococoMessagesCall::receive_messages_delivery_proof
+	relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoMessages,
+	relay_bridge_hub_rococo_client::BridgeMessagesCall::receive_messages_delivery_proof
 );
 
 /// Description of BridgeHubRococo -> BridgeHubWococo messages bridge.

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

@@ -35,15 +35,15 @@ impl MessagesCliBridge for BridgeHubWococoToBridgeHubRococoMessagesCliBridge {
 substrate_relay_helper::generate_receive_message_proof_call_builder!(
 	BridgeHubWococoMessagesToBridgeHubRococoMessageLane,
 	BridgeHubWococoMessagesToBridgeHubRococoMessageLaneReceiveMessagesProofCallBuilder,
-	relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoMessages,
-	relay_bridge_hub_rococo_client::runtime::BridgeWococoMessagesCall::receive_messages_proof
+	relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoMessages,
+	relay_bridge_hub_rococo_client::BridgeMessagesCall::receive_messages_proof
 );
 
 substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
 	BridgeHubWococoMessagesToBridgeHubRococoMessageLane,
 	BridgeHubWococoMessagesToBridgeHubRococoMessageLaneReceiveMessagesDeliveryProofCallBuilder,
-	relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoMessages,
-	relay_bridge_hub_wococo_client::runtime::BridgeRococoMessagesCall::receive_messages_delivery_proof
+	relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoMessages,
+	relay_bridge_hub_wococo_client::BridgeMessagesCall::receive_messages_delivery_proof
 );
 
 /// Description of BridgeHubWococo -> BridgeHubRococo messages bridge.

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

@@ -32,8 +32,8 @@ pub struct RococoFinalityToBridgeHubWococo;
 substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	RococoFinalityToBridgeHubWococo,
 	RococoFinalityToBridgeHubWococoCallBuilder,
-	relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoGrandpa,
-	relay_bridge_hub_wococo_client::runtime::BridgeRococoGrandpaCall::submit_finality_proof
+	relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoGrandpa,
+	relay_bridge_hub_wococo_client::BridgeGrandpaCall::submit_finality_proof
 );
 
 #[async_trait]

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

@@ -44,8 +44,8 @@ impl SubmitParachainHeadsCallBuilder<BridgeHubRococoToBridgeHubWococo>
 		parachains: Vec<(ParaId, ParaHash)>,
 		parachain_heads_proof: ParaHeadsProof,
 	) -> CallOf<relay_bridge_hub_wococo_client::BridgeHubWococo> {
-		relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoParachain(
-			relay_bridge_hub_wococo_client::runtime::BridgeParachainCall::submit_parachain_heads {
+		relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoParachain(
+			relay_bridge_hub_wococo_client::BridgeParachainCall::submit_parachain_heads {
 				at_relay_block: (at_relay_block.0, at_relay_block.1),
 				parachains,
 				parachain_heads_proof,

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

@@ -32,8 +32,8 @@ pub struct WococoFinalityToBridgeHubRococo;
 substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	WococoFinalityToBridgeHubRococo,
 	WococoFinalityToBridgeHubRococoCallBuilder,
-	relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoGrandpa,
-	relay_bridge_hub_rococo_client::runtime::BridgeWococoGrandpaCall::submit_finality_proof
+	relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoGrandpa,
+	relay_bridge_hub_rococo_client::BridgeGrandpaCall::submit_finality_proof
 );
 
 #[async_trait]

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

@@ -44,8 +44,8 @@ impl SubmitParachainHeadsCallBuilder<BridgeHubWococoToBridgeHubRococo>
 		parachains: Vec<(ParaId, ParaHash)>,
 		parachain_heads_proof: ParaHeadsProof,
 	) -> CallOf<relay_bridge_hub_rococo_client::BridgeHubRococo> {
-		relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoParachain(
-			bp_parachains::BridgeParachainCall::submit_parachain_heads {
+		relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoParachain(
+			relay_bridge_hub_rococo_client::BridgeParachainCall::submit_parachain_heads {
 				at_relay_block: (at_relay_block.0, at_relay_block.1),
 				parachains,
 				parachain_heads_proof,

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

@@ -180,10 +180,8 @@ impl BridgeInitializer for RococoToBridgeHubWococoCliBridge {
 	fn encode_init_bridge(
 		init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
 	) -> <Self::Target as Chain>::Call {
-		relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoGrandpa(
-			relay_bridge_hub_wococo_client::runtime::BridgeRococoGrandpaCall::initialize {
-				init_data,
-			},
+		relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoGrandpa(
+			relay_bridge_hub_wococo_client::BridgeGrandpaCall::initialize { init_data },
 		)
 	}
 }
@@ -194,10 +192,8 @@ impl BridgeInitializer for WococoToBridgeHubRococoCliBridge {
 	fn encode_init_bridge(
 		init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
 	) -> <Self::Target as Chain>::Call {
-		relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoGrandpa(
-			relay_bridge_hub_rococo_client::runtime::BridgeWococoGrandpaCall::initialize {
-				init_data,
-			},
+		relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoGrandpa(
+			relay_bridge_hub_rococo_client::BridgeGrandpaCall::initialize { init_data },
 		)
 	}
 }

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

@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive"] }
 scale-info = { version = "2.6.0", default-features = false, features = ["derive"] }
-relay-substrate-client = { path = "../client-substrate" }
+subxt = { version = "0.28.0", default-features = false, features = [] }
 
 # Bridge dependencies
 
@@ -17,12 +17,15 @@ bp-bridge-hub-wococo = { path = "../../primitives/chain-bridge-hub-wococo" }
 bp-header-chain = { path = "../../primitives/header-chain" }
 bp-messages = { path = "../../primitives/messages" }
 bp-parachains = { path = "../../primitives/parachains" }
+bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-runtime = { path = "../../primitives/runtime" }
 bp-wococo = { path = "../../primitives/chain-wococo" }
 
 bridge-runtime-common = { path = "../../bin/runtime-common" }
+relay-substrate-client = { path = "../client-substrate" }
 
 # Substrate Dependencies
 
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-weights = { git = "https://github.com/paritytech/substrate", branch = "master" }