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

[BridgeHub] Added default chain_spec for live Rococo/Wococo

Browse Source
This commit is contained in:
Branislav Kontur
2022-10-13 23:42:04 +02:00
parent 58fef4fd97
commit d9441aa144
2 changed files with 90 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot-parachain/src/chain_spec/bridge_hubs.rs
+86 -30
View File
@@ -14,17 +14,19 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>. // along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
use crate::chain_spec::{get_account_id_from_seed, get_collator_keys_from_seed};
use cumulus_primitives_core::ParaId; use cumulus_primitives_core::ParaId;
use sc_chain_spec::ChainSpec; use sc_chain_spec::{ChainSpec, ChainType};
use sc_cli::RuntimeVersion; use sc_cli::RuntimeVersion;
use sp_core::sr25519;
use std::{path::PathBuf, str::FromStr}; use std::{path::PathBuf, str::FromStr};
/// Collects all supported BridgeHub configurations /// Collects all supported BridgeHub configurations
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub enum BridgeHubRuntimeType { pub enum BridgeHubRuntimeType {
Rococo, Rococo { default_config: bool },
RococoLocal, RococoLocal,
Wococo, Wococo { default_config: bool },
WococoLocal, WococoLocal,
} }
@@ -33,9 +35,13 @@ impl FromStr for BridgeHubRuntimeType {
fn from_str(value: &str) -> Result<Self, Self::Err> { fn from_str(value: &str) -> Result<Self, Self::Err> {
match value { match value {
rococo::BRIDGE_HUB_ROCOCO => Ok(BridgeHubRuntimeType::Rococo), rococo::BRIDGE_HUB_ROCOCO => Ok(BridgeHubRuntimeType::Rococo { default_config: false }),
rococo::BRIDGE_HUB_ROCOCO_DEFAULT =>
Ok(BridgeHubRuntimeType::Rococo { default_config: true }),
rococo::BRIDGE_HUB_ROCOCO_LOCAL => Ok(BridgeHubRuntimeType::RococoLocal), rococo::BRIDGE_HUB_ROCOCO_LOCAL => Ok(BridgeHubRuntimeType::RococoLocal),
wococo::BRIDGE_HUB_WOCOCO => Ok(BridgeHubRuntimeType::Wococo), wococo::BRIDGE_HUB_WOCOCO => Ok(BridgeHubRuntimeType::Wococo { default_config: false }),
wococo::BRIDGE_HUB_WOCOCO_DEFAULT =>
Ok(BridgeHubRuntimeType::Wococo { default_config: true }),
wococo::BRIDGE_HUB_WOCOCO_LOCAL => Ok(BridgeHubRuntimeType::WococoLocal), wococo::BRIDGE_HUB_WOCOCO_LOCAL => Ok(BridgeHubRuntimeType::WococoLocal),
_ => Err(format!("Value '{}' is not configured yet", value)), _ => Err(format!("Value '{}' is not configured yet", value)),
} }
@@ -47,42 +53,74 @@ impl BridgeHubRuntimeType {
pub fn chain_spec_from_json_file(&self, path: PathBuf) -> Result<Box<dyn ChainSpec>, String> { pub fn chain_spec_from_json_file(&self, path: PathBuf) -> Result<Box<dyn ChainSpec>, String> {
Ok(Box::new(match self { Ok(Box::new(match self {
BridgeHubRuntimeType::Rococo => rococo::BridgeHubChainSpec::from_json_file(path)?, BridgeHubRuntimeType::Rococo { .. } =>
rococo::BridgeHubChainSpec::from_json_file(path)?,
BridgeHubRuntimeType::RococoLocal => rococo::BridgeHubChainSpec::from_json_file(path)?, BridgeHubRuntimeType::RococoLocal => rococo::BridgeHubChainSpec::from_json_file(path)?,
BridgeHubRuntimeType::Wococo => wococo::BridgeHubChainSpec::from_json_file(path)?, BridgeHubRuntimeType::Wococo { .. } =>
wococo::BridgeHubChainSpec::from_json_file(path)?,
BridgeHubRuntimeType::WococoLocal => wococo::BridgeHubChainSpec::from_json_file(path)?, BridgeHubRuntimeType::WococoLocal => wococo::BridgeHubChainSpec::from_json_file(path)?,
})) }))
} }
pub fn load_config(&self) -> Result<Box<dyn ChainSpec>, String> { pub fn load_config(&self) -> Result<Box<dyn ChainSpec>, String> {
match self { match self {
BridgeHubRuntimeType::Rococo => BridgeHubRuntimeType::Rococo { default_config } =>
Ok(Box::new(rococo::BridgeHubChainSpec::from_json_bytes( if *default_config {
&include_bytes!("../../../parachains/chain-specs/bridge-hub-rococo.json")[..], Ok(Box::new(rococo::default_config(
)?)), rococo::BRIDGE_HUB_ROCOCO,
BridgeHubRuntimeType::RococoLocal => Ok(Box::new(rococo::local_config( "Rococo BrideHub",
ChainType::Live,
"rococo",
ParaId::new(1013),
None,
None,
)))
} else {
Ok(Box::new(rococo::BridgeHubChainSpec::from_json_bytes(
&include_bytes!("../../../parachains/chain-specs/bridge-hub-rococo.json")[..],
)?))
},
BridgeHubRuntimeType::RococoLocal => Ok(Box::new(rococo::default_config(
rococo::BRIDGE_HUB_ROCOCO_LOCAL, rococo::BRIDGE_HUB_ROCOCO_LOCAL,
"Rococo BrideHub Local", "Rococo BrideHub Local",
ChainType::Local,
"rococo-local", "rococo-local",
ParaId::new(1013), ParaId::new(1013),
Some("Alice".to_string()),
Some("Bob".to_string()),
))), ))),
BridgeHubRuntimeType::Wococo => BridgeHubRuntimeType::Wococo { default_config } =>
Ok(Box::new(rococo::BridgeHubChainSpec::from_json_bytes( if *default_config {
&include_bytes!("../../../parachains/chain-specs/bridge-hub-wococo.json")[..], Ok(Box::new(wococo::default_config(
)?)), wococo::BRIDGE_HUB_WOCOCO,
BridgeHubRuntimeType::WococoLocal => Ok(Box::new(wococo::local_config( "Wococo BrideHub",
ChainType::Live,
"wococo",
ParaId::new(1013),
None,
None,
)))
} else {
Ok(Box::new(rococo::BridgeHubChainSpec::from_json_bytes(
&include_bytes!("../../../parachains/chain-specs/bridge-hub-wococo.json")[..],
)?))
},
BridgeHubRuntimeType::WococoLocal => Ok(Box::new(wococo::default_config(
wococo::BRIDGE_HUB_WOCOCO_LOCAL, wococo::BRIDGE_HUB_WOCOCO_LOCAL,
"Wococo BrideHub Local", "Wococo BrideHub Local",
ChainType::Local,
"wococo-local", "wococo-local",
ParaId::new(1013), ParaId::new(1013),
Some("Alice".to_string()),
Some("Bob".to_string()),
))), ))),
} }
} }
pub fn runtime_version(&self) -> &'static RuntimeVersion { pub fn runtime_version(&self) -> &'static RuntimeVersion {
match self { match self {
BridgeHubRuntimeType::Rococo | BridgeHubRuntimeType::Rococo { .. } |
BridgeHubRuntimeType::Wococo | BridgeHubRuntimeType::Wococo { .. } |
BridgeHubRuntimeType::RococoLocal | BridgeHubRuntimeType::RococoLocal |
BridgeHubRuntimeType::WococoLocal => { BridgeHubRuntimeType::WococoLocal => {
// this is intentional, for Rococo/Wococo we just want to have one runtime, which is configured for both sides // this is intentional, for Rococo/Wococo we just want to have one runtime, which is configured for both sides
@@ -107,15 +145,13 @@ fn ensure_id(id: &str) -> Result<&str, String> {
/// Sub-module for Rococo setup /// Sub-module for Rococo setup
pub mod rococo { pub mod rococo {
use super::ParaId; use super::{get_account_id_from_seed, get_collator_keys_from_seed, sr25519, ParaId};
use crate::chain_spec::{ use crate::chain_spec::{Extensions, SAFE_XCM_VERSION};
get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
};
use parachains_common::{AccountId, AuraId}; use parachains_common::{AccountId, AuraId};
use sc_chain_spec::ChainType; use sc_chain_spec::ChainType;
use sp_core::sr25519;
pub(crate) const BRIDGE_HUB_ROCOCO: &str = "bridge-hub-rococo"; pub(crate) const BRIDGE_HUB_ROCOCO: &str = "bridge-hub-rococo";
pub(crate) const BRIDGE_HUB_ROCOCO_DEFAULT: &str = "bridge-hub-rococo-default";
pub(crate) const BRIDGE_HUB_ROCOCO_LOCAL: &str = "bridge-hub-rococo-local"; pub(crate) const BRIDGE_HUB_ROCOCO_LOCAL: &str = "bridge-hub-rococo-local";
/// Specialized `ChainSpec` for the normal parachain runtime. /// Specialized `ChainSpec` for the normal parachain runtime.
@@ -124,11 +160,14 @@ pub mod rococo {
pub type RuntimeApi = bridge_hub_rococo_runtime::RuntimeApi; pub type RuntimeApi = bridge_hub_rococo_runtime::RuntimeApi;
pub fn local_config( pub fn default_config(
id: &str, id: &str,
chain_name: &str, chain_name: &str,
chain_type: ChainType,
relay_chain: &str, relay_chain: &str,
para_id: ParaId, para_id: ParaId,
root_key_seed: Option<String>,
bridges_pallet_owner_seed: Option<String>,
) -> BridgeHubChainSpec { ) -> BridgeHubChainSpec {
let properties = sc_chain_spec::Properties::new(); let properties = sc_chain_spec::Properties::new();
// TODO: check // TODO: check
@@ -141,7 +180,7 @@ pub mod rococo {
chain_name, chain_name,
// ID // ID
super::ensure_id(id).expect("invalid id"), super::ensure_id(id).expect("invalid id"),
ChainType::Local, chain_type,
move || { move || {
genesis( genesis(
// initial collators. // initial collators.
@@ -170,8 +209,12 @@ pub mod rococo {
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"), get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
], ],
para_id, para_id,
Some(get_account_id_from_seed::<sr25519::Public>("Alice")), root_key_seed
Some(get_account_id_from_seed::<sr25519::Public>("Bob")), .as_ref()
.map(|seed| get_account_id_from_seed::<sr25519::Public>(&seed)),
bridges_pallet_owner_seed
.as_ref()
.map(|seed| get_account_id_from_seed::<sr25519::Public>(&seed)),
) )
}, },
Vec::new(), Vec::new(),
@@ -242,19 +285,32 @@ pub mod rococo {
pub mod wococo { pub mod wococo {
use super::ParaId; use super::ParaId;
use crate::chain_spec::bridge_hubs::rococo; use crate::chain_spec::bridge_hubs::rococo;
use sc_chain_spec::ChainType;
pub(crate) const BRIDGE_HUB_WOCOCO: &str = "bridge-hub-wococo"; pub(crate) const BRIDGE_HUB_WOCOCO: &str = "bridge-hub-wococo";
pub(crate) const BRIDGE_HUB_WOCOCO_DEFAULT: &str = "bridge-hub-wococo-default";
pub(crate) const BRIDGE_HUB_WOCOCO_LOCAL: &str = "bridge-hub-wococo-local"; pub(crate) const BRIDGE_HUB_WOCOCO_LOCAL: &str = "bridge-hub-wococo-local";
pub type BridgeHubChainSpec = rococo::BridgeHubChainSpec; pub type BridgeHubChainSpec = rococo::BridgeHubChainSpec;
pub type RuntimeApi = rococo::RuntimeApi; pub type RuntimeApi = rococo::RuntimeApi;
pub fn local_config( pub fn default_config(
id: &str, id: &str,
chain_name: &str, chain_name: &str,
chain_type: ChainType,
relay_chain: &str, relay_chain: &str,
para_id: ParaId, para_id: ParaId,
root_key_seed: Option<String>,
bridges_pallet_owner_seed: Option<String>,
) -> BridgeHubChainSpec { ) -> BridgeHubChainSpec {
rococo::local_config(id, chain_name, relay_chain, para_id) rococo::default_config(
id,
chain_name,
chain_type,
relay_chain,
para_id,
root_key_seed,
bridges_pallet_owner_seed,
)
} }
} }
polkadot-parachain/src/command.rs
+4 -4
View File
@@ -481,12 +481,12 @@ macro_rules! construct_async_run {
Runtime::BridgeHub(bridge_hub_runtime_type) => { Runtime::BridgeHub(bridge_hub_runtime_type) => {
runner.async_run(|$config| { runner.async_run(|$config| {
let $components = match bridge_hub_runtime_type { let $components = match bridge_hub_runtime_type {
chain_spec::bridge_hubs::BridgeHubRuntimeType::Rococo | chain_spec::bridge_hubs::BridgeHubRuntimeType::Rococo { .. } |
chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal => new_partial::<chain_spec::bridge_hubs::rococo::RuntimeApi, _>( chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal => new_partial::<chain_spec::bridge_hubs::rococo::RuntimeApi, _>(
&$config, &$config,
crate::service::aura_build_import_queue::<_, AuraId>, crate::service::aura_build_import_queue::<_, AuraId>,
)?, )?,
chain_spec::bridge_hubs::BridgeHubRuntimeType::Wococo | chain_spec::bridge_hubs::BridgeHubRuntimeType::Wococo { .. } |
chain_spec::bridge_hubs::BridgeHubRuntimeType::WococoLocal => new_partial::<chain_spec::bridge_hubs::wococo::RuntimeApi, _>( chain_spec::bridge_hubs::BridgeHubRuntimeType::WococoLocal => new_partial::<chain_spec::bridge_hubs::wococo::RuntimeApi, _>(
&$config, &$config,
crate::service::aura_build_import_queue::<_, AuraId>, crate::service::aura_build_import_queue::<_, AuraId>,
@@ -781,13 +781,13 @@ pub fn run() -> Result<()> {
.map(|r| r.0) .map(|r| r.0)
.map_err(Into::into), .map_err(Into::into),
Runtime::BridgeHub(bridge_hub_runtime_type) => match bridge_hub_runtime_type { Runtime::BridgeHub(bridge_hub_runtime_type) => match bridge_hub_runtime_type {
chain_spec::bridge_hubs::BridgeHubRuntimeType::Rococo | chain_spec::bridge_hubs::BridgeHubRuntimeType::Rococo { .. } |
chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal => chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal =>
crate::service::start_generic_aura_node::< crate::service::start_generic_aura_node::<
chain_spec::bridge_hubs::rococo::RuntimeApi, chain_spec::bridge_hubs::rococo::RuntimeApi,
AuraId, AuraId,
>(config, polkadot_config, collator_options, id, hwbench), >(config, polkadot_config, collator_options, id, hwbench),
chain_spec::bridge_hubs::BridgeHubRuntimeType::Wococo | chain_spec::bridge_hubs::BridgeHubRuntimeType::Wococo { .. } |
chain_spec::bridge_hubs::BridgeHubRuntimeType::WococoLocal => chain_spec::bridge_hubs::BridgeHubRuntimeType::WococoLocal =>
crate::service::start_generic_aura_node::< crate::service::start_generic_aura_node::<
chain_spec::bridge_hubs::wococo::RuntimeApi, chain_spec::bridge_hubs::wococo::RuntimeApi,