Skip to content

Commit b283257

Browse files
serban300bkchr
authored andcommitted
Add tool for auto generating runtime code from metadata (#1812)
* Create CLI tool for generating indirect runtimes code * Use the generated runtime for rialto parachain * Avoid autogenerated files when executing cargo spellcheck * Fix clippy warning
1 parent 2657973 commit b283257

File tree

11 files changed

+9866
-79
lines changed

11 files changed

+9866
-79
lines changed

bridges/primitives/chain-millau/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fixed-hash = { version = "0.8.0", default-features = false }
1717
hash256-std-hasher = { version = "0.15.2", default-features = false }
1818
impl-codec = { version = "0.6", default-features = false }
1919
impl-serde = { version = "0.4.0", optional = true }
20-
parity-util-mem = { version = "0.12", default-features = false, features = ["primitive-types"] }
20+
parity-util-mem = { version = "0.11.0", default-features = false, features = ["primitive-types"] }
2121
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
2222
serde = { version = "1.0", optional = true, features = ["derive"] }
2323

bridges/primitives/polkadot-core/Cargo.toml

Lines changed: 1 addition & 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

99
[dependencies]
1010
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
11-
parity-util-mem = { version = "0.12.0", optional = true }
11+
parity-util-mem = { version = "0.11.0", optional = true }
1212
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
1313
serde = { version = "1.0", optional = true, features = ["derive"] }
1414

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ use substrate_relay_helper::finality::{
4242
substrate_relay_helper::generate_submit_finality_proof_call_builder!(
4343
MillauFinalityToRialtoParachain,
4444
MillauFinalityToRialtoParachainCallBuilder,
45-
relay_rialto_parachain_client::runtime::Call::BridgeMillauGrandpa,
46-
relay_rialto_parachain_client::runtime::BridgeMillauGrandpaCall::submit_finality_proof
45+
relay_rialto_parachain_client::RuntimeCall::BridgeMillauGrandpa,
46+
relay_rialto_parachain_client::BridgeGrandpaCall::submit_finality_proof
4747
);
4848

4949
/// Description of Millau -> Rialto finalized headers bridge.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ use substrate_relay_helper::messages_lane::{
2525
substrate_relay_helper::generate_receive_message_proof_call_builder!(
2626
MillauMessagesToRialtoParachain,
2727
MillauMessagesToRialtoParachainReceiveMessagesProofCallBuilder,
28-
relay_rialto_parachain_client::runtime::Call::BridgeMillauMessages,
29-
relay_rialto_parachain_client::runtime::BridgeMillauMessagesCall::receive_messages_proof
28+
relay_rialto_parachain_client::RuntimeCall::BridgeMillauMessages,
29+
relay_rialto_parachain_client::BridgeMessagesCall::receive_messages_proof
3030
);
3131

3232
/// Description of Millau -> RialtoParachain messages bridge.

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@ use crate::cli::{bridge, encode_message::CliEncodeMessage, CliChain};
2020
use bp_runtime::EncodedOrDecodedCall;
2121
use bridge_runtime_common::CustomNetworkId;
2222
use relay_rialto_parachain_client::RialtoParachain;
23-
use relay_substrate_client::{calls::XcmCall, SimpleRuntimeVersion};
23+
use relay_substrate_client::SimpleRuntimeVersion;
2424
use xcm::latest::prelude::*;
2525

2626
impl CliEncodeMessage for RialtoParachain {
2727
fn encode_send_xcm(
2828
message: xcm::VersionedXcm<()>,
2929
bridge_instance_index: u8,
3030
) -> anyhow::Result<EncodedOrDecodedCall<Self::Call>> {
31+
type RuntimeCall = relay_rialto_parachain_client::RuntimeCall;
32+
type XcmCall = relay_rialto_parachain_client::runtime_types::pallet_xcm::pallet::Call;
33+
3134
let dest = match bridge_instance_index {
3235
bridge::RIALTO_PARACHAIN_TO_MILLAU_INDEX =>
3336
(Parent, X1(GlobalConsensus(CustomNetworkId::Millau.as_network_id()))),
@@ -37,9 +40,12 @@ impl CliEncodeMessage for RialtoParachain {
3740
),
3841
};
3942

40-
let xcm_call = XcmCall::send(Box::new(dest.into()), Box::new(message));
43+
let xcm_call = XcmCall::send {
44+
dest: Box::new(unsafe { std::mem::transmute(xcm::VersionedMultiLocation::from(dest)) }),
45+
message: Box::new(unsafe { std::mem::transmute(message) }),
46+
};
4147

42-
Ok(relay_rialto_parachain_client::runtime::Call::PolkadotXcm(xcm_call).into())
48+
Ok(RuntimeCall::PolkadotXcm(xcm_call).into())
4349
}
4450
}
4551

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ use substrate_relay_helper::{
2626
substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
2727
RialtoParachainMessagesToMillau,
2828
RialtoParachainMessagesToMillauReceiveMessagesDeliveryProofCallBuilder,
29-
relay_rialto_parachain_client::runtime::Call::BridgeMillauMessages,
30-
relay_rialto_parachain_client::runtime::BridgeMillauMessagesCall::receive_messages_delivery_proof
29+
relay_rialto_parachain_client::RuntimeCall::BridgeMillauMessages,
30+
relay_rialto_parachain_client::BridgeMessagesCall::receive_messages_delivery_proof
3131
);
3232

3333
/// Description of RialtoParachain -> Millau messages bridge.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use crate::{
2929
cli::{bridge::CliBridgeBase, chain_schema::*},
3030
};
3131
use bp_runtime::Chain as ChainBase;
32-
use relay_substrate_client::{calls::SudoCall, AccountKeyPairOf, Chain, UnsignedTransaction};
32+
use relay_substrate_client::{AccountKeyPairOf, Chain, UnsignedTransaction};
3333
use sp_core::Pair;
3434
use structopt::StructOpt;
3535
use strum::{EnumString, EnumVariantNames, VariantNames};
@@ -123,14 +123,14 @@ impl BridgeInitializer for MillauToRialtoParachainCliBridge {
123123
fn encode_init_bridge(
124124
init_data: <Self::Engine as Engine<Self::Source>>::InitializationData,
125125
) -> <Self::Target as Chain>::Call {
126-
use relay_rialto_parachain_client::runtime;
126+
type RuntimeCall = relay_rialto_parachain_client::RuntimeCall;
127+
type BridgeGrandpaCall = relay_rialto_parachain_client::BridgeGrandpaCall;
128+
type SudoCall = relay_rialto_parachain_client::SudoCall;
127129

128130
let initialize_call =
129-
runtime::Call::BridgeMillauGrandpa(runtime::BridgeMillauGrandpaCall::initialize {
130-
init_data,
131-
});
132-
let sudo_call = SudoCall::sudo(Box::new(initialize_call));
133-
runtime::Call::Sudo(sudo_call)
131+
RuntimeCall::BridgeMillauGrandpa(BridgeGrandpaCall::initialize { init_data });
132+
133+
RuntimeCall::Sudo(SudoCall::sudo { call: Box::new(initialize_call) })
134134
}
135135
}
136136

bridges/relays/client-rialto-parachain/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +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" }
1010
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
11+
subxt = { git = "https://github.com/paritytech/subxt", branch = "master" }
1112

1213
# Bridge dependencies
1314

@@ -24,3 +25,4 @@ relay-substrate-client = { path = "../client-substrate" }
2425

2526
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
2627
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
28+
sp-weights = { git = "https://github.com/paritytech/substrate", branch = "master" }

0 commit comments

Comments
 (0)