mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-31 14:31:02 +00:00
Some remaining fixes (mostly insubstantial) for relay (#2859)
* if bundled version is `None` and cli said "use bundled" => error * update chain spec and transaction versions * use generated runtime wrapper for PBH and KBH * trigger CI * Revert "trigger CI" This reverts commit 7d9f51e34829d9224b352300d062e365243def5e. * Revert "Revert "trigger CI"" This reverts commit c86ca0e264367e39abad29b9f09f09578a980568. * Revert "Revert "Revert "trigger CI""" This reverts commit 95e7da258bb2ace4ed2cafdb01833317f38cfcfc.
This commit is contained in:
committed by
Bastian Köcher
parent
80604ffeaa
commit
a822b82c85
File diff suppressed because it is too large
Load Diff
@@ -16,21 +16,28 @@
|
||||
|
||||
//! Types used to connect to the BridgeHub-Kusama-Substrate parachain.
|
||||
|
||||
use bp_bridge_hub_kusama::AVERAGE_BLOCK_INTERVAL;
|
||||
pub mod codegen_runtime;
|
||||
|
||||
use bp_bridge_hub_kusama::{SignedExtension, AVERAGE_BLOCK_INTERVAL};
|
||||
use bp_polkadot::SuffixedCommonSignedExtensionExt;
|
||||
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_kusama_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_kusama::UncheckedExtrinsic<RuntimeCall, SignedExtension>;
|
||||
type UtilityCall = runtime_types::pallet_utility::pallet::Call;
|
||||
|
||||
/// Kusama chain definition
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
@@ -47,7 +54,7 @@ impl Chain for BridgeHubKusama {
|
||||
const AVERAGE_BLOCK_INTERVAL: Duration = AVERAGE_BLOCK_INTERVAL;
|
||||
|
||||
type SignedBlock = bp_bridge_hub_kusama::SignedBlock;
|
||||
type Call = runtime::Call;
|
||||
type Call = RuntimeCall;
|
||||
}
|
||||
|
||||
impl ChainWithBalances for BridgeHubKusama {
|
||||
@@ -56,13 +63,22 @@ impl ChainWithBalances for BridgeHubKusama {
|
||||
}
|
||||
}
|
||||
|
||||
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 BridgeHubKusama {
|
||||
type UtilityPallet = MockedRuntimeUtilityPallet<runtime::Call>;
|
||||
type UtilityPallet = MockedRuntimeUtilityPallet<RuntimeCall>;
|
||||
}
|
||||
|
||||
impl ChainWithTransactions for BridgeHubKusama {
|
||||
type AccountKeyPair = sp_core::sr25519::Pair;
|
||||
type SignedTransaction = runtime::UncheckedExtrinsic;
|
||||
type SignedTransaction = UncheckedExtrinsic;
|
||||
|
||||
fn sign_transaction(
|
||||
param: SignParam<Self>,
|
||||
@@ -70,7 +86,7 @@ impl ChainWithTransactions for BridgeHubKusama {
|
||||
) -> 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,
|
||||
@@ -85,7 +101,7 @@ impl ChainWithTransactions for BridgeHubKusama {
|
||||
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(),
|
||||
@@ -127,13 +143,13 @@ 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(),
|
||||
))
|
||||
.into(),
|
||||
call: RuntimeCall::System(SystemCall::remark { remark: b"Hello world!".to_vec() })
|
||||
.into(),
|
||||
nonce: 777,
|
||||
tip: 888,
|
||||
era: TransactionEra::immortal(),
|
||||
|
||||
Reference in New Issue
Block a user