Skip to content

Commit 92ccef5

Browse files
serban300serban300
authored
Use generated runtimes for BHR/BHW (#2106)
* Use generated runtimes for BHR/BHW * Deduplicate BHR/BHW runtimes * Add script for regenerating runtimes
1 parent b33e0a5 commit 92ccef5

20 files changed

+3675
-418
lines changed

‎Cargo.lock

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ impl MessagesCliBridge for BridgeHubRococoToBridgeHubWococoMessagesCliBridge {
3535
substrate_relay_helper::generate_receive_message_proof_call_builder!(
3636
BridgeHubRococoMessagesToBridgeHubWococoMessageLane,
3737
BridgeHubRococoMessagesToBridgeHubWococoMessageLaneReceiveMessagesProofCallBuilder,
38-
relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoMessages,
39-
relay_bridge_hub_wococo_client::runtime::BridgeRococoMessagesCall::receive_messages_proof
38+
relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoMessages,
39+
relay_bridge_hub_wococo_client::BridgeMessagesCall::receive_messages_proof
4040
);
4141

4242
substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
4343
BridgeHubRococoMessagesToBridgeHubWococoMessageLane,
4444
BridgeHubRococoMessagesToBridgeHubWococoMessageLaneReceiveMessagesDeliveryProofCallBuilder,
45-
relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoMessages,
46-
relay_bridge_hub_rococo_client::runtime::BridgeWococoMessagesCall::receive_messages_delivery_proof
45+
relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoMessages,
46+
relay_bridge_hub_rococo_client::BridgeMessagesCall::receive_messages_delivery_proof
4747
);
4848

4949
/// Description of BridgeHubRococo -> BridgeHubWococo messages bridge.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ impl MessagesCliBridge for BridgeHubWococoToBridgeHubRococoMessagesCliBridge {
3535
substrate_relay_helper::generate_receive_message_proof_call_builder!(
3636
BridgeHubWococoMessagesToBridgeHubRococoMessageLane,
3737
BridgeHubWococoMessagesToBridgeHubRococoMessageLaneReceiveMessagesProofCallBuilder,
38-
relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoMessages,
39-
relay_bridge_hub_rococo_client::runtime::BridgeWococoMessagesCall::receive_messages_proof
38+
relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoMessages,
39+
relay_bridge_hub_rococo_client::BridgeMessagesCall::receive_messages_proof
4040
);
4141

4242
substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
4343
BridgeHubWococoMessagesToBridgeHubRococoMessageLane,
4444
BridgeHubWococoMessagesToBridgeHubRococoMessageLaneReceiveMessagesDeliveryProofCallBuilder,
45-
relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoMessages,
46-
relay_bridge_hub_wococo_client::runtime::BridgeRococoMessagesCall::receive_messages_delivery_proof
45+
relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoMessages,
46+
relay_bridge_hub_wococo_client::BridgeMessagesCall::receive_messages_delivery_proof
4747
);
4848

4949
/// Description of BridgeHubWococo -> BridgeHubRococo messages bridge.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ pub struct RococoFinalityToBridgeHubWococo;
3232
substrate_relay_helper::generate_submit_finality_proof_call_builder!(
3333
RococoFinalityToBridgeHubWococo,
3434
RococoFinalityToBridgeHubWococoCallBuilder,
35-
relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoGrandpa,
36-
relay_bridge_hub_wococo_client::runtime::BridgeRococoGrandpaCall::submit_finality_proof
35+
relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoGrandpa,
36+
relay_bridge_hub_wococo_client::BridgeGrandpaCall::submit_finality_proof
3737
);
3838

3939
#[async_trait]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ impl SubmitParachainHeadsCallBuilder<BridgeHubRococoToBridgeHubWococo>
4444
parachains: Vec<(ParaId, ParaHash)>,
4545
parachain_heads_proof: ParaHeadsProof,
4646
) -> CallOf<relay_bridge_hub_wococo_client::BridgeHubWococo> {
47-
relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoParachain(
48-
relay_bridge_hub_wococo_client::runtime::BridgeParachainCall::submit_parachain_heads {
47+
relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoParachain(
48+
relay_bridge_hub_wococo_client::BridgeParachainCall::submit_parachain_heads {
4949
at_relay_block: (at_relay_block.0, at_relay_block.1),
5050
parachains,
5151
parachain_heads_proof,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ pub struct WococoFinalityToBridgeHubRococo;
3232
substrate_relay_helper::generate_submit_finality_proof_call_builder!(
3333
WococoFinalityToBridgeHubRococo,
3434
WococoFinalityToBridgeHubRococoCallBuilder,
35-
relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoGrandpa,
36-
relay_bridge_hub_rococo_client::runtime::BridgeWococoGrandpaCall::submit_finality_proof
35+
relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoGrandpa,
36+
relay_bridge_hub_rococo_client::BridgeGrandpaCall::submit_finality_proof
3737
);
3838

3939
#[async_trait]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ impl SubmitParachainHeadsCallBuilder<BridgeHubWococoToBridgeHubRococo>
4444
parachains: Vec<(ParaId, ParaHash)>,
4545
parachain_heads_proof: ParaHeadsProof,
4646
) -> CallOf<relay_bridge_hub_rococo_client::BridgeHubRococo> {
47-
relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoParachain(
48-
bp_parachains::BridgeParachainCall::submit_parachain_heads {
47+
relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoParachain(
48+
relay_bridge_hub_rococo_client::BridgeParachainCall::submit_parachain_heads {
4949
at_relay_block: (at_relay_block.0, at_relay_block.1),
5050
parachains,
5151
parachain_heads_proof,

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,8 @@ impl BridgeInitializer for RococoToBridgeHubWococoCliBridge {
180180
fn encode_init_bridge(
181181
init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
182182
) -> <Self::Target as Chain>::Call {
183-
relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoGrandpa(
184-
relay_bridge_hub_wococo_client::runtime::BridgeRococoGrandpaCall::initialize {
185-
init_data,
186-
},
183+
relay_bridge_hub_wococo_client::RuntimeCall::BridgeRococoGrandpa(
184+
relay_bridge_hub_wococo_client::BridgeGrandpaCall::initialize { init_data },
187185
)
188186
}
189187
}
@@ -194,10 +192,8 @@ impl BridgeInitializer for WococoToBridgeHubRococoCliBridge {
194192
fn encode_init_bridge(
195193
init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
196194
) -> <Self::Target as Chain>::Call {
197-
relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoGrandpa(
198-
relay_bridge_hub_rococo_client::runtime::BridgeWococoGrandpaCall::initialize {
199-
init_data,
200-
},
195+
relay_bridge_hub_rococo_client::RuntimeCall::BridgeWococoGrandpa(
196+
relay_bridge_hub_rococo_client::BridgeGrandpaCall::initialize { init_data },
201197
)
202198
}
203199
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
88
[dependencies]
99
codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive"] }
1010
scale-info = { version = "2.6.0", default-features = false, features = ["derive"] }
11-
relay-substrate-client = { path = "../client-substrate" }
11+
subxt = { version = "0.28.0", default-features = false, features = [] }
1212

1313
# Bridge dependencies
1414

@@ -17,12 +17,15 @@ bp-bridge-hub-wococo = { path = "../../primitives/chain-bridge-hub-wococo" }
1717
bp-header-chain = { path = "../../primitives/header-chain" }
1818
bp-messages = { path = "../../primitives/messages" }
1919
bp-parachains = { path = "../../primitives/parachains" }
20+
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
2021
bp-runtime = { path = "../../primitives/runtime" }
2122
bp-wococo = { path = "../../primitives/chain-wococo" }
2223

2324
bridge-runtime-common = { path = "../../bin/runtime-common" }
25+
relay-substrate-client = { path = "../client-substrate" }
2426

2527
# Substrate Dependencies
2628

2729
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
2830
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
31+
sp-weights = { git = "https://github.com/paritytech/substrate", branch = "master" }

0 commit comments

Comments
 (0)