pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-06 05:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

More backports from Cumulus subtree to polkadot-staging (#2283)

Browse Source 
* more backports from Cumulus subtree

* spelling

* fmt

* trigger CI

* Revert "trigger CI"

This reverts commit b009d732aa26d006a7f2b48878ee864c338c49d5.

* Revert "Revert "trigger CI""

This reverts commit 715606a75948124962b14dbb260cf3aed01bc665.

* Revert "Revert "Revert "trigger CI"""

This reverts commit dc0d2233da86fd12a77216008e59bd38fcbb2fac.
This commit is contained in:
Svyatoslav Nikolsky
2023-07-20 14:23:36 +03:00
committed by Bastian Köcher
parent 4d42bb22f3
commit 57550eb867
12 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/bin/millau/node/src/chain_spec.rs
+2 -2
View File
@@ -164,8 +164,8 @@ fn endowed_accounts() -> Vec<AccountId> {
get_account_id_from_seed::<sr25519::Public>(WESTEND_GRANDPA_PALLET_OWNER),
get_account_id_from_seed::<sr25519::Public>("Westend.HeadersRelay1"),
get_account_id_from_seed::<sr25519::Public>("Westend.HeadersRelay2"),
get_account_id_from_seed::<sr25519::Public>("Westend.WestmintHeaders1"),
get_account_id_from_seed::<sr25519::Public>("Westend.WestmintHeaders2"),
get_account_id_from_seed::<sr25519::Public>("Westend.AssetHubWestendHeaders1"),
get_account_id_from_seed::<sr25519::Public>("Westend.AssetHubWestendHeaders2"),
// Accounts, used by Rialto<>Millau bridge
get_account_id_from_seed::<sr25519::Public>(RIALTO_MESSAGES_PALLET_OWNER),
get_account_id_from_seed::<sr25519::Public>("Rialto.HeadersAndMessagesRelay"),
bridges/bin/millau/runtime/src/lib.rs
+4 -3
View File
@@ -531,7 +531,8 @@ impl pallet_bridge_parachains::Config<WithWestendParachainsInstance> for Runtime
type WeightInfo = pallet_bridge_parachains::weights::BridgeWeight<Runtime>;
type BridgesGrandpaPalletInstance = WestendGrandpaInstance;
type ParasPalletName = WestendParasPalletName;
type ParaStoredHeaderDataBuilder = SingleParaStoredHeaderDataBuilder<bp_westend::Westmint>;
type ParaStoredHeaderDataBuilder =
SingleParaStoredHeaderDataBuilder<bp_westend::AssetHubWestend>;
type HeadsToKeep = ConstU32<1024>;
type MaxParaHeadDataSize = MaxWestendParaHeadDataSize;
}
@@ -889,12 +890,12 @@ impl_runtime_apis! {
}
}
impl bp_westend::WestmintFinalityApi<Block> for Runtime {
impl bp_westend::AssetHubWestendFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<HeaderId<bp_westend::Hash, bp_westend::BlockNumber>> {
pallet_bridge_parachains::Pallet::<
Runtime,
WithWestendParachainsInstance,
>::best_parachain_head_id::<bp_westend::Westmint>().unwrap_or(None)
>::best_parachain_head_id::<bp_westend::AssetHubWestend>().unwrap_or(None)
}
}
bridges/modules/grandpa/Cargo.toml
+2 -2
View File
@@ -22,8 +22,8 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["serde"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["serde"] }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
bridges/primitives/chain-westend/src/lib.rs
+10 -10
View File
@@ -56,13 +56,13 @@ impl ChainWithGrandpa for Westend {
const AVERAGE_HEADER_SIZE_IN_JUSTIFICATION: u32 = AVERAGE_HEADER_SIZE_IN_JUSTIFICATION;
}
/// Westmint parachain definition
/// `AssetHubWestend` parachain definition
#[derive(Debug, Clone, Copy)]
pub struct Westmint;
pub struct AssetHubWestend;
// Westmint seems to use the same configuration as all Polkadot-like chains, so we'll use Westend
// primitives here.
impl Chain for Westmint {
// AssetHubWestend seems to use the same configuration as all Polkadot-like chains, so we'll use
// Westend primitives here.
impl Chain for AssetHubWestend {
type BlockNumber = BlockNumber;
type Hash = Hash;
type Hasher = Hasher;
@@ -82,8 +82,8 @@ impl Chain for Westmint {
}
}
impl Parachain for Westmint {
const PARACHAIN_ID: u32 = WESTMINT_PARACHAIN_ID;
impl Parachain for AssetHubWestend {
const PARACHAIN_ID: u32 = ASSET_HUB_WESTEND_PARACHAIN_ID;
}
/// Name of the parachains pallet at the Westend runtime.
@@ -100,9 +100,9 @@ pub const WITH_WESTEND_BRIDGE_PARAS_PALLET_NAME: &str = "BridgeWestendParachains
/// reserve.
pub const MAX_NESTED_PARACHAIN_HEAD_DATA_SIZE: u32 = 128;
/// Identifier of Westmint parachain at the Westend relay chain.
pub const WESTMINT_PARACHAIN_ID: u32 = 1000;
/// Identifier of `AssetHubWestend` parachain at the Westend relay chain.
pub const ASSET_HUB_WESTEND_PARACHAIN_ID: u32 = 1000;
decl_bridge_finality_runtime_apis!(westend);
decl_bridge_finality_runtime_apis!(westmint);
decl_bridge_finality_runtime_apis!(AssetHubWestend);
bridges/primitives/header-chain/Cargo.toml
+3 -3
View File
@@ -19,9 +19,9 @@ bp-runtime = { path = "../runtime", default-features = false }
# Substrate Dependencies
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["serde"] }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["serde"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["serde"] }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
[dev-dependencies]
bridges/primitives/parachains/Cargo.toml
+1 -1
View File
@@ -3,7 +3,7 @@ name = "bp-parachains"
description = "Primitives of parachains module."
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
edition = "2021"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
bridges/primitives/runtime/Cargo.toml
+1 -1
View File
@@ -20,7 +20,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "mas
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["serde"] }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
bridges/primitives/runtime/src/lib.rs
+2 -2
View File
@@ -77,8 +77,8 @@ pub const KUSAMA_CHAIN_ID: ChainId = *b"ksma";
/// Westend chain id.
pub const WESTEND_CHAIN_ID: ChainId = *b"wend";
/// Westend chain id.
pub const WESTMINT_CHAIN_ID: ChainId = *b"wmnt";
/// `AssetHubWestmint` chain id.
pub const ASSET_HUB_WESTEND_CHAIN_ID: ChainId = *b"ahwe";
/// Rococo chain id.
pub const ROCOCO_CHAIN_ID: ChainId = *b"roco";
bridges/relays/bin-substrate/src/bridges/westend_millau/westend_parachains_to_millau.rs
+6 -6
View File
@@ -18,7 +18,7 @@
use crate::cli::bridge::{CliBridgeBase, ParachainToRelayHeadersCliBridge};
use relay_millau_client::Millau;
use relay_westend_client::{Westend, Westmint};
use relay_westend_client::{AssetHubWestend, Westend};
use substrate_relay_helper::parachains::{
DirectSubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline,
};
@@ -28,7 +28,7 @@ use substrate_relay_helper::parachains::{
pub struct WestendParachainsToMillau;
impl SubstrateParachainsPipeline for WestendParachainsToMillau {
type SourceParachain = Westmint;
type SourceParachain = AssetHubWestend;
type SourceRelayChain = Westend;
type TargetChain = Millau;
@@ -44,16 +44,16 @@ pub type WestendParachainsToMillauSubmitParachainHeadsCallBuilder =
>;
//// `WestendParachain` to `Millau` bridge definition.
pub struct WestmintToMillauCliBridge {}
pub struct AssetHubWestendToMillauCliBridge {}
impl ParachainToRelayHeadersCliBridge for WestmintToMillauCliBridge {
impl ParachainToRelayHeadersCliBridge for AssetHubWestendToMillauCliBridge {
type SourceRelay = Westend;
type ParachainFinality = WestendParachainsToMillau;
type RelayFinality =
crate::bridges::westend_millau::westend_headers_to_millau::WestendFinalityToMillau;
}
impl CliBridgeBase for WestmintToMillauCliBridge {
type Source = Westmint;
impl CliBridgeBase for AssetHubWestendToMillauCliBridge {
type Source = AssetHubWestend;
type Target = Millau;
}
bridges/relays/bin-substrate/src/chains/westend.rs
+2 -2
View File
@@ -18,12 +18,12 @@
use crate::cli::CliChain;
use relay_substrate_client::SimpleRuntimeVersion;
use relay_westend_client::{Westend, Westmint};
use relay_westend_client::{AssetHubWestend, Westend};
impl CliChain for Westend {
const RUNTIME_VERSION: Option<SimpleRuntimeVersion> = None;
}
impl CliChain for Westmint {
impl CliChain for AssetHubWestend {
const RUNTIME_VERSION: Option<SimpleRuntimeVersion> = None;
}
bridges/relays/bin-substrate/src/cli/relay_parachains.rs
+3 -3
View File
@@ -24,7 +24,7 @@ use crate::bridges::{
rococo_parachains_to_bridge_hub_wococo::BridgeHubRococoToBridgeHubWococoCliBridge,
wococo_parachains_to_bridge_hub_rococo::BridgeHubWococoToBridgeHubRococoCliBridge,
},
westend_millau::westend_parachains_to_millau::WestmintToMillauCliBridge,
westend_millau::westend_parachains_to_millau::AssetHubWestendToMillauCliBridge,
};
use async_std::sync::Mutex;
use async_trait::async_trait;
@@ -115,7 +115,7 @@ where
}
impl ParachainsRelayer for RialtoParachainToMillauCliBridge {}
impl ParachainsRelayer for WestmintToMillauCliBridge {}
impl ParachainsRelayer for AssetHubWestendToMillauCliBridge {}
impl ParachainsRelayer for BridgeHubRococoToBridgeHubWococoCliBridge {}
impl ParachainsRelayer for BridgeHubWococoToBridgeHubRococoCliBridge {}
impl ParachainsRelayer for BridgeHubKusamaToBridgeHubPolkadotCliBridge {}
@@ -128,7 +128,7 @@ impl RelayParachains {
RelayParachainsBridge::RialtoToMillau =>
RialtoParachainToMillauCliBridge::relay_parachains(self),
RelayParachainsBridge::WestendToMillau =>
WestmintToMillauCliBridge::relay_parachains(self),
AssetHubWestendToMillauCliBridge::relay_parachains(self),
RelayParachainsBridge::RococoToBridgeHubWococo =>
BridgeHubRococoToBridgeHubWococoCliBridge::relay_parachains(self),
RelayParachainsBridge::WococoToBridgeHubRococo =>
bridges/relays/client-westend/src/lib.rs
+7 -7
View File
@@ -58,21 +58,21 @@ impl ChainWithBalances for Westend {
}
}
/// Westmint parachain definition
/// `AssetHubWestend` parachain definition
#[derive(Debug, Clone, Copy)]
pub struct Westmint;
pub struct AssetHubWestend;
impl UnderlyingChainProvider for Westmint {
type Chain = bp_westend::Westmint;
impl UnderlyingChainProvider for AssetHubWestend {
type Chain = bp_westend::AssetHubWestend;
}
// Westmint seems to use the same configuration as all Polkadot-like chains, so we'll use Westend
// primitives here.
impl Chain for Westmint {
const ID: ChainId = bp_runtime::WESTMINT_CHAIN_ID;
impl Chain for AssetHubWestend {
const ID: ChainId = bp_runtime::ASSET_HUB_WESTEND_CHAIN_ID;
const NAME: &'static str = "Westmint";
const BEST_FINALIZED_HEADER_ID_METHOD: &'static str =
bp_westend::BEST_FINALIZED_WESTMINT_HEADER_METHOD;
bp_westend::BEST_FINALIZED_ASSETHUBWESTEND_HEADER_METHOD;
const AVERAGE_BLOCK_INTERVAL: Duration = Duration::from_secs(6);
type SignedBlock = bp_westend::SignedBlock;