mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-31 08:41:02 +00:00
Use generated runtimes for BHR/BHW (#2106)
* Use generated runtimes for BHR/BHW * Deduplicate BHR/BHW runtimes * Add script for regenerating runtimes
This commit is contained in:
committed by
Bastian Köcher
parent
a2b017594f
commit
9dfa496d15
+4
-4
@@ -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.
|
||||
|
||||
+4
-4
@@ -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.
|
||||
|
||||
+2
-2
@@ -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]
|
||||
|
||||
+2
-2
@@ -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,
|
||||
|
||||
+2
-2
@@ -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]
|
||||
|
||||
+2
-2
@@ -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,
|
||||
|
||||
@@ -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 },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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" }
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -16,22 +16,29 @@
|
||||
|
||||
//! Types used to connect to the BridgeHub-Rococo-Substrate parachain.
|
||||
|
||||
use bp_bridge_hub_rococo::{BridgeHubSignedExtension, AVERAGE_BLOCK_INTERVAL};
|
||||
pub mod codegen_runtime;
|
||||
|
||||
use bp_bridge_hub_rococo::{BridgeHubSignedExtension, SignedExtension, AVERAGE_BLOCK_INTERVAL};
|
||||
use bp_messages::MessageNonce;
|
||||
use bp_runtime::ChainId;
|
||||
use codec::Encode;
|
||||
use relay_substrate_client::{
|
||||
Chain, ChainWithBalances, ChainWithMessages, ChainWithTransactions, ChainWithUtilityPallet,
|
||||
Error as SubstrateError, MockedRuntimeUtilityPallet, SignParam, UnderlyingChainProvider,
|
||||
UnsignedTransaction,
|
||||
calls::UtilityCall as MockUtilityCall, Chain, ChainWithBalances, ChainWithMessages,
|
||||
ChainWithTransactions, ChainWithUtilityPallet, Error as SubstrateError,
|
||||
MockedRuntimeUtilityPallet, SignParam, UnderlyingChainProvider, UnsignedTransaction,
|
||||
};
|
||||
use sp_core::{storage::StorageKey, Pair};
|
||||
use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount};
|
||||
use std::time::Duration;
|
||||
|
||||
/// Re-export runtime wrapper
|
||||
pub mod runtime_wrapper;
|
||||
pub use runtime_wrapper as runtime;
|
||||
pub use codegen_runtime::api::runtime_types;
|
||||
|
||||
pub type RuntimeCall = runtime_types::bridge_hub_rococo_runtime::RuntimeCall;
|
||||
pub type BridgeMessagesCall = runtime_types::pallet_bridge_messages::pallet::Call;
|
||||
pub type BridgeGrandpaCall = runtime_types::pallet_bridge_grandpa::pallet::Call;
|
||||
pub type BridgeParachainCall = runtime_types::pallet_bridge_parachains::pallet::Call;
|
||||
type UncheckedExtrinsic = bp_bridge_hub_rococo::UncheckedExtrinsic<RuntimeCall, SignedExtension>;
|
||||
type UtilityCall = runtime_types::pallet_utility::pallet::Call;
|
||||
|
||||
/// Rococo chain definition
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
@@ -49,7 +56,7 @@ impl Chain for BridgeHubRococo {
|
||||
const AVERAGE_BLOCK_INTERVAL: Duration = AVERAGE_BLOCK_INTERVAL;
|
||||
|
||||
type SignedBlock = bp_bridge_hub_rococo::SignedBlock;
|
||||
type Call = runtime::Call;
|
||||
type Call = RuntimeCall;
|
||||
}
|
||||
|
||||
impl ChainWithBalances for BridgeHubRococo {
|
||||
@@ -58,13 +65,22 @@ impl ChainWithBalances for BridgeHubRococo {
|
||||
}
|
||||
}
|
||||
|
||||
impl From<MockUtilityCall<RuntimeCall>> for RuntimeCall {
|
||||
fn from(value: MockUtilityCall<RuntimeCall>) -> RuntimeCall {
|
||||
match value {
|
||||
MockUtilityCall::batch_all(calls) =>
|
||||
RuntimeCall::Utility(UtilityCall::batch_all { calls }),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ChainWithUtilityPallet for BridgeHubRococo {
|
||||
type UtilityPallet = MockedRuntimeUtilityPallet<runtime::Call>;
|
||||
type UtilityPallet = MockedRuntimeUtilityPallet<RuntimeCall>;
|
||||
}
|
||||
|
||||
impl ChainWithTransactions for BridgeHubRococo {
|
||||
type AccountKeyPair = sp_core::sr25519::Pair;
|
||||
type SignedTransaction = runtime::UncheckedExtrinsic;
|
||||
type SignedTransaction = UncheckedExtrinsic;
|
||||
|
||||
fn sign_transaction(
|
||||
param: SignParam<Self>,
|
||||
@@ -72,7 +88,7 @@ impl ChainWithTransactions for BridgeHubRococo {
|
||||
) -> Result<Self::SignedTransaction, SubstrateError> {
|
||||
let raw_payload = SignedPayload::new(
|
||||
unsigned.call,
|
||||
runtime::SignedExtension::from_params(
|
||||
SignedExtension::from_params(
|
||||
param.spec_version,
|
||||
param.transaction_version,
|
||||
unsigned.era,
|
||||
@@ -86,7 +102,7 @@ impl ChainWithTransactions for BridgeHubRococo {
|
||||
let signer: sp_runtime::MultiSigner = param.signer.public().into();
|
||||
let (call, extra, _) = raw_payload.deconstruct();
|
||||
|
||||
Ok(runtime::UncheckedExtrinsic::new_signed(
|
||||
Ok(UncheckedExtrinsic::new_signed(
|
||||
call,
|
||||
signer.into_account().into(),
|
||||
signature.into(),
|
||||
@@ -135,12 +151,12 @@ mod tests {
|
||||
use super::*;
|
||||
use relay_substrate_client::TransactionEra;
|
||||
|
||||
type SystemCall = runtime_types::frame_system::pallet::Call;
|
||||
|
||||
#[test]
|
||||
fn parse_transaction_works() {
|
||||
let unsigned = UnsignedTransaction {
|
||||
call: runtime::Call::System(relay_substrate_client::calls::SystemCall::remark(
|
||||
b"Hello world!".to_vec(),
|
||||
))
|
||||
call: RuntimeCall::System(SystemCall::remark { remark: b"Hello world!".to_vec() })
|
||||
.into(),
|
||||
nonce: 777,
|
||||
tip: 888,
|
||||
|
||||
@@ -1,69 +0,0 @@
|
||||
// Copyright 2019-2021 Parity Technologies (UK) Ltd.
|
||||
// This file is part of Parity Bridges Common.
|
||||
|
||||
// Parity Bridges Common is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity Bridges Common is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity Bridges Common. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Types that are specific to the BridgeHubRococo runtime.
|
||||
|
||||
use codec::{Decode, Encode};
|
||||
use scale_info::TypeInfo;
|
||||
|
||||
pub use bp_bridge_hub_rococo::SignedExtension;
|
||||
pub use bp_header_chain::BridgeGrandpaCallOf;
|
||||
pub use bp_parachains::BridgeParachainCall;
|
||||
pub use bridge_runtime_common::messages::BridgeMessagesCallOf;
|
||||
pub use relay_substrate_client::calls::{SystemCall, UtilityCall};
|
||||
|
||||
/// Unchecked BridgeHubRococo extrinsic.
|
||||
pub type UncheckedExtrinsic = bp_bridge_hub_rococo::UncheckedExtrinsic<Call, SignedExtension>;
|
||||
|
||||
// The indirect pallet call used to sync `Wococo` GRANDPA finality to `BHRococo`.
|
||||
pub type BridgeWococoGrandpaCall = BridgeGrandpaCallOf<bp_wococo::Wococo>;
|
||||
// The indirect pallet call used to sync `BridgeHubWococo` messages to `BHRococo`.
|
||||
pub type BridgeWococoMessagesCall = BridgeMessagesCallOf<bp_bridge_hub_wococo::BridgeHubWococo>;
|
||||
|
||||
/// `BridgeHubRococo` Runtime `Call` enum.
|
||||
///
|
||||
/// The enum represents a subset of possible `Call`s we can send to `BridgeHubRococo` chain.
|
||||
/// Ideally this code would be auto-generated from metadata, because we want to
|
||||
/// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
|
||||
///
|
||||
/// All entries here (like pretty much in the entire file) must be kept in sync with
|
||||
/// `BridgeHubRococo` `construct_runtime`, so that we maintain SCALE-compatibility.
|
||||
#[allow(clippy::large_enum_variant)]
|
||||
#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
|
||||
pub enum Call {
|
||||
#[cfg(test)]
|
||||
#[codec(index = 0)]
|
||||
System(SystemCall),
|
||||
/// Utility pallet.
|
||||
#[codec(index = 40)]
|
||||
Utility(UtilityCall<Call>),
|
||||
|
||||
/// Wococo bridge pallet.
|
||||
#[codec(index = 41)]
|
||||
BridgeWococoGrandpa(BridgeWococoGrandpaCall),
|
||||
/// Wococo parachain bridge pallet.
|
||||
#[codec(index = 42)]
|
||||
BridgeWococoParachain(BridgeParachainCall),
|
||||
/// Wococo messages bridge pallet.
|
||||
#[codec(index = 46)]
|
||||
BridgeWococoMessages(BridgeWococoMessagesCall),
|
||||
}
|
||||
|
||||
impl From<UtilityCall<Call>> for Call {
|
||||
fn from(call: UtilityCall<Call>) -> Call {
|
||||
Call::Utility(call)
|
||||
}
|
||||
}
|
||||
@@ -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,16 +17,19 @@ 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-rococo = { path = "../../primitives/chain-rococo" }
|
||||
bp-runtime = { path = "../../primitives/runtime" }
|
||||
|
||||
bridge-runtime-common = { path = "../../bin/runtime-common" }
|
||||
relay-bridge-hub-rococo-client = { path = "../client-bridge-hub-rococo" }
|
||||
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" }
|
||||
|
||||
[dev-dependencies]
|
||||
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
|
||||
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
//! Types used to connect to the BridgeHub-Wococo-Substrate parachain.
|
||||
|
||||
use bp_bridge_hub_wococo::{BridgeHubSignedExtension, AVERAGE_BLOCK_INTERVAL};
|
||||
use bp_bridge_hub_wococo::{BridgeHubSignedExtension, SignedExtension, AVERAGE_BLOCK_INTERVAL};
|
||||
use bp_messages::MessageNonce;
|
||||
use bp_runtime::ChainId;
|
||||
use codec::Encode;
|
||||
@@ -29,9 +29,14 @@ use sp_core::{storage::StorageKey, Pair};
|
||||
use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount};
|
||||
use std::time::Duration;
|
||||
|
||||
/// Re-export runtime wrapper
|
||||
pub mod runtime_wrapper;
|
||||
pub use runtime_wrapper as runtime;
|
||||
pub use codegen_runtime::api::runtime_types;
|
||||
use relay_bridge_hub_rococo_client::codegen_runtime;
|
||||
|
||||
pub type RuntimeCall = runtime_types::bridge_hub_rococo_runtime::RuntimeCall;
|
||||
pub type BridgeMessagesCall = runtime_types::pallet_bridge_messages::pallet::Call;
|
||||
pub type BridgeGrandpaCall = runtime_types::pallet_bridge_grandpa::pallet::Call;
|
||||
pub type BridgeParachainCall = runtime_types::pallet_bridge_parachains::pallet::Call;
|
||||
type UncheckedExtrinsic = bp_bridge_hub_wococo::UncheckedExtrinsic<RuntimeCall, SignedExtension>;
|
||||
|
||||
/// Wococo chain definition
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
@@ -49,7 +54,7 @@ impl Chain for BridgeHubWococo {
|
||||
const AVERAGE_BLOCK_INTERVAL: Duration = AVERAGE_BLOCK_INTERVAL;
|
||||
|
||||
type SignedBlock = bp_bridge_hub_wococo::SignedBlock;
|
||||
type Call = runtime::Call;
|
||||
type Call = RuntimeCall;
|
||||
}
|
||||
|
||||
impl ChainWithBalances for BridgeHubWococo {
|
||||
@@ -59,12 +64,12 @@ impl ChainWithBalances for BridgeHubWococo {
|
||||
}
|
||||
|
||||
impl ChainWithUtilityPallet for BridgeHubWococo {
|
||||
type UtilityPallet = MockedRuntimeUtilityPallet<runtime::Call>;
|
||||
type UtilityPallet = MockedRuntimeUtilityPallet<RuntimeCall>;
|
||||
}
|
||||
|
||||
impl ChainWithTransactions for BridgeHubWococo {
|
||||
type AccountKeyPair = sp_core::sr25519::Pair;
|
||||
type SignedTransaction = runtime::UncheckedExtrinsic;
|
||||
type SignedTransaction = UncheckedExtrinsic;
|
||||
|
||||
fn sign_transaction(
|
||||
param: SignParam<Self>,
|
||||
@@ -72,7 +77,7 @@ impl ChainWithTransactions for BridgeHubWococo {
|
||||
) -> Result<Self::SignedTransaction, SubstrateError> {
|
||||
let raw_payload = SignedPayload::new(
|
||||
unsigned.call,
|
||||
runtime::SignedExtension::from_params(
|
||||
SignedExtension::from_params(
|
||||
param.spec_version,
|
||||
param.transaction_version,
|
||||
unsigned.era,
|
||||
@@ -86,7 +91,7 @@ impl ChainWithTransactions for BridgeHubWococo {
|
||||
let signer: sp_runtime::MultiSigner = param.signer.public().into();
|
||||
let (call, extra, _) = raw_payload.deconstruct();
|
||||
|
||||
Ok(runtime::UncheckedExtrinsic::new_signed(
|
||||
Ok(UncheckedExtrinsic::new_signed(
|
||||
call,
|
||||
signer.into_account().into(),
|
||||
signature.into(),
|
||||
@@ -135,10 +140,12 @@ mod tests {
|
||||
use super::*;
|
||||
use relay_substrate_client::TransactionEra;
|
||||
|
||||
type SystemCall = runtime_types::frame_system::pallet::Call;
|
||||
|
||||
#[test]
|
||||
fn parse_transaction_works() {
|
||||
let unsigned = UnsignedTransaction {
|
||||
call: runtime::Call::System(runtime::SystemCall::remark(b"Hello world!".to_vec()))
|
||||
call: RuntimeCall::System(SystemCall::remark { remark: b"Hello world!".to_vec() })
|
||||
.into(),
|
||||
nonce: 777,
|
||||
tip: 888,
|
||||
|
||||
@@ -1,115 +0,0 @@
|
||||
// Copyright 2019-2021 Parity Technologies (UK) Ltd.
|
||||
// This file is part of Parity Bridges Common.
|
||||
|
||||
// Parity Bridges Common is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity Bridges Common is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity Bridges Common. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Types that are specific to the BridgeHubWococo runtime.
|
||||
|
||||
use codec::{Decode, Encode};
|
||||
use scale_info::TypeInfo;
|
||||
|
||||
pub use bp_bridge_hub_wococo::SignedExtension;
|
||||
pub use bp_header_chain::BridgeGrandpaCallOf;
|
||||
pub use bp_parachains::BridgeParachainCall;
|
||||
pub use bridge_runtime_common::messages::BridgeMessagesCallOf;
|
||||
pub use relay_substrate_client::calls::{SystemCall, UtilityCall};
|
||||
|
||||
/// Unchecked BridgeHubWococo extrinsic.
|
||||
pub type UncheckedExtrinsic = bp_bridge_hub_wococo::UncheckedExtrinsic<Call, SignedExtension>;
|
||||
|
||||
// The indirect pallet call used to sync `Rococo` GRANDPA finality to `BHWococo`.
|
||||
pub type BridgeRococoGrandpaCall = BridgeGrandpaCallOf<bp_rococo::Rococo>;
|
||||
// The indirect pallet call used to sync `BridgeHubRococo` messages to `BridgeHubWococo`.
|
||||
pub type BridgeRococoMessagesCall = BridgeMessagesCallOf<bp_bridge_hub_rococo::BridgeHubRococo>;
|
||||
|
||||
/// `BridgeHubWococo` Runtime `Call` enum.
|
||||
///
|
||||
/// The enum represents a subset of possible `Call`s we can send to `BridgeHubWococo` chain.
|
||||
/// Ideally this code would be auto-generated from metadata, because we want to
|
||||
/// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
|
||||
///
|
||||
/// All entries here (like pretty much in the entire file) must be kept in sync with
|
||||
/// `BridgeHubWococo` `construct_runtime`, so that we maintain SCALE-compatibility.
|
||||
#[allow(clippy::large_enum_variant)]
|
||||
#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
|
||||
pub enum Call {
|
||||
#[cfg(test)]
|
||||
#[codec(index = 0)]
|
||||
System(SystemCall),
|
||||
/// Utility pallet.
|
||||
#[codec(index = 40)]
|
||||
Utility(UtilityCall<Call>),
|
||||
|
||||
/// Rococo bridge pallet.
|
||||
#[codec(index = 43)]
|
||||
BridgeRococoGrandpa(BridgeRococoGrandpaCall),
|
||||
/// Rococo parachain bridge pallet.
|
||||
#[codec(index = 44)]
|
||||
BridgeRococoParachain(BridgeParachainCall),
|
||||
/// Rococo messages bridge pallet.
|
||||
#[codec(index = 45)]
|
||||
BridgeRococoMessages(BridgeRococoMessagesCall),
|
||||
}
|
||||
|
||||
impl From<UtilityCall<Call>> for Call {
|
||||
fn from(call: UtilityCall<Call>) -> Call {
|
||||
Call::Utility(call)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use bp_runtime::BasicOperatingMode;
|
||||
use sp_consensus_grandpa::AuthorityList;
|
||||
use sp_core::hexdisplay::HexDisplay;
|
||||
use sp_runtime::traits::Header;
|
||||
use std::str::FromStr;
|
||||
|
||||
pub type RelayBlockNumber = bp_polkadot_core::BlockNumber;
|
||||
pub type RelayBlockHasher = bp_polkadot_core::Hasher;
|
||||
pub type RelayBlockHeader = sp_runtime::generic::Header<RelayBlockNumber, RelayBlockHasher>;
|
||||
|
||||
#[test]
|
||||
fn encode_decode_calls() {
|
||||
let header = RelayBlockHeader::new(
|
||||
75,
|
||||
bp_polkadot_core::Hash::from_str(
|
||||
"0xd2c0afaab32de0cb8f7f0d89217e37c5ea302c1ffb5a7a83e10d20f12c32874d",
|
||||
)
|
||||
.expect("invalid value"),
|
||||
bp_polkadot_core::Hash::from_str(
|
||||
"0x92b965f0656a4e0e5fc0167da2d4b5ee72b3be2c1583c4c1e5236c8c12aa141b",
|
||||
)
|
||||
.expect("invalid value"),
|
||||
bp_polkadot_core::Hash::from_str(
|
||||
"0xae4a25acf250d72ed02c149ecc7dd3c9ee976d41a2888fc551de8064521dc01d",
|
||||
)
|
||||
.expect("invalid value"),
|
||||
Default::default(),
|
||||
);
|
||||
let init_data = bp_header_chain::InitializationData {
|
||||
header: Box::new(header),
|
||||
authority_list: AuthorityList::default(),
|
||||
set_id: 6,
|
||||
operating_mode: BasicOperatingMode::Normal,
|
||||
};
|
||||
let call = BridgeRococoGrandpaCall::initialize { init_data };
|
||||
let tx = Call::BridgeRococoGrandpa(call);
|
||||
|
||||
// encode call as hex string
|
||||
let hex_encoded_call = format!("0x{:?}", HexDisplay::from(&Encode::encode(&tx)));
|
||||
assert_eq!(hex_encoded_call, "0x2b01ae4a25acf250d72ed02c149ecc7dd3c9ee976d41a2888fc551de8064521dc01d2d0192b965f0656a4e0e5fc0167da2d4b5ee72b3be2c1583c4c1e5236c8c12aa141bd2c0afaab32de0cb8f7f0d89217e37c5ea302c1ffb5a7a83e10d20f12c32874d0000060000000000000000");
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -56,7 +56,7 @@ impl Chain for RialtoParachain {
|
||||
const AVERAGE_BLOCK_INTERVAL: Duration = Duration::from_secs(5);
|
||||
|
||||
type SignedBlock = bp_polkadot_core::SignedBlock;
|
||||
type Call = runtime_types::rialto_parachain_runtime::RuntimeCall;
|
||||
type Call = RuntimeCall;
|
||||
}
|
||||
|
||||
impl ChainWithBalances for RialtoParachain {
|
||||
|
||||
Reference in New Issue
Block a user