[Do Not Merge until RBH/WBH upgrade] Relayers use new submit_finality…

…_proof_ex call in Rococo <> Westend bridge (paritytech#2827) * use codegen runtime in WBH + update codegen files for RBH + WBH * use submit_finality_proof_ex for Rococo <> Westend bridge
serban300 · Apr 9, 2024 · 629c862 · 629c862
1 parent 3f5269e
commit 629c862
Show file tree

Hide file tree

Showing 12 changed files with 6,560 additions and 465 deletions.
diff --git a/...-substrate/src/bridges/rococo_westend/bridge_hub_rococo_messages_to_bridge_hub_westend.rs b/...-substrate/src/bridges/rococo_westend/bridge_hub_rococo_messages_to_bridge_hub_westend.rs
@@ -35,8 +35,8 @@ impl MessagesCliBridge for BridgeHubRococoToBridgeHubWestendMessagesCliBridge {
 substrate_relay_helper::generate_receive_message_proof_call_builder!(
 	BridgeHubRococoMessagesToBridgeHubWestendMessageLane,
 	BridgeHubRococoMessagesToBridgeHubWestendMessageLaneReceiveMessagesProofCallBuilder,
-	relay_bridge_hub_westend_client::runtime::Call::BridgeRococoMessages,
-	relay_bridge_hub_westend_client::runtime::BridgeRococoMessagesCall::receive_messages_proof
+	relay_bridge_hub_westend_client::RuntimeCall::BridgeRococoMessages,
+	relay_bridge_hub_westend_client::BridgeMessagesCall::receive_messages_proof
 );
 
 substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(

diff --git a/...-substrate/src/bridges/rococo_westend/bridge_hub_westend_messages_to_bridge_hub_rococo.rs b/...-substrate/src/bridges/rococo_westend/bridge_hub_westend_messages_to_bridge_hub_rococo.rs
@@ -42,8 +42,8 @@ substrate_relay_helper::generate_receive_message_proof_call_builder!(
 substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
 	BridgeHubWestendMessagesToBridgeHubRococoMessageLane,
 	BridgeHubWestendMessagesToBridgeHubRococoMessageLaneReceiveMessagesDeliveryProofCallBuilder,
-	relay_bridge_hub_westend_client::runtime::Call::BridgeRococoMessages,
-	relay_bridge_hub_westend_client::runtime::BridgeRococoMessagesCall::receive_messages_delivery_proof
+	relay_bridge_hub_westend_client::RuntimeCall::BridgeRococoMessages,
+	relay_bridge_hub_westend_client::BridgeMessagesCall::receive_messages_delivery_proof
 );
 
 /// Description of BridgeHubWestend -> BridgeHubRococo messages bridge.

diff --git a/...s/relays/bin-substrate/src/bridges/rococo_westend/rococo_headers_to_bridge_hub_westend.rs b/...s/relays/bin-substrate/src/bridges/rococo_westend/rococo_headers_to_bridge_hub_westend.rs
@@ -31,11 +31,11 @@ use substrate_relay_helper::{
 #[derive(Clone, Debug)]
 pub struct RococoFinalityToBridgeHubWestend;
 
-substrate_relay_helper::generate_submit_finality_proof_call_builder!(
+substrate_relay_helper::generate_submit_finality_proof_ex_call_builder!(
 	RococoFinalityToBridgeHubWestend,
 	SubmitFinalityProofCallBuilder,
-	relay_bridge_hub_westend_client::runtime::Call::BridgeRococoGrandpa,
-	relay_bridge_hub_westend_client::runtime::BridgeRococoGrandpaCall::submit_finality_proof
+	relay_bridge_hub_westend_client::RuntimeCall::BridgeRococoGrandpa,
+	relay_bridge_hub_westend_client::BridgeGrandpaCall::submit_finality_proof_ex
 );
 
 substrate_relay_helper::generate_report_equivocation_call_builder!(

diff --git a/...elays/bin-substrate/src/bridges/rococo_westend/rococo_parachains_to_bridge_hub_westend.rs b/...elays/bin-substrate/src/bridges/rococo_westend/rococo_parachains_to_bridge_hub_westend.rs
@@ -44,8 +44,8 @@ impl SubmitParachainHeadsCallBuilder<BridgeHubRococoToBridgeHubWestend>
 		parachains: Vec<(ParaId, ParaHash)>,
 		parachain_heads_proof: ParaHeadsProof,
 	) -> CallOf<relay_bridge_hub_westend_client::BridgeHubWestend> {
-		relay_bridge_hub_westend_client::runtime::Call::BridgeRococoParachains(
-			relay_bridge_hub_westend_client::runtime::BridgeParachainCall::submit_parachain_heads {
+		relay_bridge_hub_westend_client::RuntimeCall::BridgeRococoParachains(
+			relay_bridge_hub_westend_client::BridgeParachainCall::submit_parachain_heads {
 				at_relay_block: (at_relay_block.0, at_relay_block.1),
 				parachains,
 				parachain_heads_proof,

diff --git a/...s/relays/bin-substrate/src/bridges/rococo_westend/westend_headers_to_bridge_hub_rococo.rs b/...s/relays/bin-substrate/src/bridges/rococo_westend/westend_headers_to_bridge_hub_rococo.rs
@@ -31,11 +31,11 @@ use substrate_relay_helper::{
 #[derive(Clone, Debug)]
 pub struct WestendFinalityToBridgeHubRococo;
 
-substrate_relay_helper::generate_submit_finality_proof_call_builder!(
+substrate_relay_helper::generate_submit_finality_proof_ex_call_builder!(
 	WestendFinalityToBridgeHubRococo,
 	SubmitFinalityProofCallBuilder,
 	relay_bridge_hub_rococo_client::RuntimeCall::BridgeWestendGrandpa,
-	relay_bridge_hub_rococo_client::BridgeGrandpaCall::submit_finality_proof
+	relay_bridge_hub_rococo_client::BridgeGrandpaCall::submit_finality_proof_ex
 );
 
 substrate_relay_helper::generate_report_equivocation_call_builder!(

diff --git a/bridges/relays/bin-substrate/src/cli/init_bridge.rs b/bridges/relays/bin-substrate/src/cli/init_bridge.rs
@@ -122,10 +122,8 @@ impl BridgeInitializer for RococoToBridgeHubWestendCliBridge {
 	fn encode_init_bridge(
 		init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
 	) -> <Self::Target as Chain>::Call {
-		relay_bridge_hub_westend_client::runtime::Call::BridgeRococoGrandpa(
-			relay_bridge_hub_westend_client::runtime::BridgeRococoGrandpaCall::initialize {
-				init_data,
-			},
+		relay_bridge_hub_westend_client::RuntimeCall::BridgeRococoGrandpa(
+			relay_bridge_hub_westend_client::BridgeGrandpaCall::initialize { init_data },
 		)
 	}
 }