mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 04:41:03 +00:00
[testnet] Add AssetHubRococo <-> AssetHubWestend asset bridging support (#1967)
## Summary Asset bridging support for AssetHub**Rococo** <-> AssetHub**Wococo** was added [here](https://github.com/paritytech/polkadot-sdk/pull/1215), so now we aim to bridge AssetHub**Rococo** and AssetHub**Westend**. (And perhaps retire AssetHubWococo and the Wococo chains). ## Solution **bridge-hub-westend-runtime** - added new runtime as a copy of `bridge-hub-rococo-runtime` - added support for bridging to `BridgeHubRococo` - added tests and benchmarks **bridge-hub-rococo-runtime** - added support for bridging to `BridgeHubWestend` - added tests and benchmarks - internal refactoring by splitting bridge configuration per network, e.g., `bridge_to_whatevernetwork_config.rs`. **asset-hub-rococo-runtime** - added support for asset bridging to `AssetHubWestend` (allows to receive only WNDs) - added new xcm router for `Westend` - added tests and benchmarks **asset-hub-westend-runtime** - added support for asset bridging to `AssetHubRococo` (allows to receive only ROCs) - added new xcm router for `Rococo` - added tests and benchmarks ## Deployment All changes will be deployed as a part of https://github.com/paritytech/polkadot-sdk/issues/1988. ## TODO - [x] benchmarks for all pallet instances - [x] integration tests - [x] local run scripts Relates to: https://github.com/paritytech/parity-bridges-common/issues/2602 Relates to: https://github.com/paritytech/polkadot-sdk/issues/1988 --------- Co-authored-by: command-bot <> Co-authored-by: Adrian Catangiu <adrian@parity.io> Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
This commit is contained in:
@@ -35,6 +35,7 @@ contracts-rococo-runtime = { path = "../parachains/runtimes/contracts/contracts-
|
||||
bridge-hub-rococo-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-rococo" }
|
||||
bridge-hub-kusama-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-kusama" }
|
||||
bridge-hub-polkadot-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-polkadot" }
|
||||
bridge-hub-westend-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-westend" }
|
||||
penpal-runtime = { path = "../parachains/runtimes/testing/penpal" }
|
||||
jsonrpsee = { version = "0.16.2", features = ["server"] }
|
||||
parachains-common = { path = "../parachains/common" }
|
||||
@@ -115,6 +116,7 @@ runtime-benchmarks = [
|
||||
"bridge-hub-kusama-runtime/runtime-benchmarks",
|
||||
"bridge-hub-polkadot-runtime/runtime-benchmarks",
|
||||
"bridge-hub-rococo-runtime/runtime-benchmarks",
|
||||
"bridge-hub-westend-runtime/runtime-benchmarks",
|
||||
"collectives-polkadot-runtime/runtime-benchmarks",
|
||||
"contracts-rococo-runtime/runtime-benchmarks",
|
||||
"frame-benchmarking-cli/runtime-benchmarks",
|
||||
@@ -137,6 +139,7 @@ try-runtime = [
|
||||
"bridge-hub-kusama-runtime/try-runtime",
|
||||
"bridge-hub-polkadot-runtime/try-runtime",
|
||||
"bridge-hub-rococo-runtime/try-runtime",
|
||||
"bridge-hub-westend-runtime/try-runtime",
|
||||
"collectives-polkadot-runtime/try-runtime",
|
||||
"contracts-rococo-runtime/try-runtime",
|
||||
"glutton-runtime/try-runtime",
|
||||
|
||||
@@ -42,8 +42,10 @@ pub enum BridgeHubRuntimeType {
|
||||
// used by benchmarks
|
||||
PolkadotDevelopment,
|
||||
|
||||
// used with kusama runtime
|
||||
Westend,
|
||||
WestendLocal,
|
||||
// used by benchmarks
|
||||
WestendDevelopment,
|
||||
}
|
||||
|
||||
impl FromStr for BridgeHubRuntimeType {
|
||||
@@ -59,6 +61,8 @@ impl FromStr for BridgeHubRuntimeType {
|
||||
kusama::BRIDGE_HUB_KUSAMA_LOCAL => Ok(BridgeHubRuntimeType::KusamaLocal),
|
||||
kusama::BRIDGE_HUB_KUSAMA_DEVELOPMENT => Ok(BridgeHubRuntimeType::KusamaDevelopment),
|
||||
westend::BRIDGE_HUB_WESTEND => Ok(BridgeHubRuntimeType::Westend),
|
||||
westend::BRIDGE_HUB_WESTEND_LOCAL => Ok(BridgeHubRuntimeType::WestendLocal),
|
||||
westend::BRIDGE_HUB_WESTEND_DEVELOPMENT => Ok(BridgeHubRuntimeType::WestendDevelopment),
|
||||
rococo::BRIDGE_HUB_ROCOCO => Ok(BridgeHubRuntimeType::Rococo),
|
||||
rococo::BRIDGE_HUB_ROCOCO_LOCAL => Ok(BridgeHubRuntimeType::RococoLocal),
|
||||
rococo::BRIDGE_HUB_ROCOCO_DEVELOPMENT => Ok(BridgeHubRuntimeType::RococoDevelopment),
|
||||
@@ -82,7 +86,9 @@ impl BridgeHubRuntimeType {
|
||||
BridgeHubRuntimeType::KusamaLocal |
|
||||
BridgeHubRuntimeType::KusamaDevelopment =>
|
||||
Ok(Box::new(kusama::BridgeHubChainSpec::from_json_file(path)?)),
|
||||
BridgeHubRuntimeType::Westend =>
|
||||
BridgeHubRuntimeType::Westend |
|
||||
BridgeHubRuntimeType::WestendLocal |
|
||||
BridgeHubRuntimeType::WestendDevelopment =>
|
||||
Ok(Box::new(westend::BridgeHubChainSpec::from_json_file(path)?)),
|
||||
BridgeHubRuntimeType::Rococo |
|
||||
BridgeHubRuntimeType::RococoLocal |
|
||||
@@ -131,6 +137,20 @@ impl BridgeHubRuntimeType {
|
||||
Ok(Box::new(westend::BridgeHubChainSpec::from_json_bytes(
|
||||
&include_bytes!("../../chain-specs/bridge-hub-westend.json")[..],
|
||||
)?)),
|
||||
BridgeHubRuntimeType::WestendLocal => Ok(Box::new(westend::local_config(
|
||||
westend::BRIDGE_HUB_WESTEND_LOCAL,
|
||||
"Westend BridgeHub Local",
|
||||
"westend-local",
|
||||
ParaId::new(1002),
|
||||
Some("Bob".to_string()),
|
||||
))),
|
||||
BridgeHubRuntimeType::WestendDevelopment => Ok(Box::new(westend::local_config(
|
||||
westend::BRIDGE_HUB_WESTEND_DEVELOPMENT,
|
||||
"Westend BridgeHub Development",
|
||||
"westend-dev",
|
||||
ParaId::new(1002),
|
||||
Some("Bob".to_string()),
|
||||
))),
|
||||
BridgeHubRuntimeType::Rococo =>
|
||||
Ok(Box::new(rococo::BridgeHubChainSpec::from_json_bytes(
|
||||
&include_bytes!("../../chain-specs/bridge-hub-rococo.json")[..],
|
||||
@@ -311,20 +331,26 @@ pub mod rococo {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
bridge_westend_grandpa: bridge_hub_rococo_runtime::BridgeWestendGrandpaConfig {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
bridge_rococo_grandpa: bridge_hub_rococo_runtime::BridgeRococoGrandpaConfig {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
bridge_wococo_to_rococo_messages:
|
||||
bridge_hub_rococo_runtime::BridgeWococoToRococoMessagesConfig {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
bridge_rococo_to_wococo_messages:
|
||||
bridge_hub_rococo_runtime::BridgeRococoToWococoMessagesConfig {
|
||||
owner: bridges_pallet_owner,
|
||||
..Default::default()
|
||||
},
|
||||
bridge_rococo_messages: bridge_hub_rococo_runtime::BridgeRococoMessagesConfig {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
bridge_wococo_messages: bridge_hub_rococo_runtime::BridgeWococoMessagesConfig {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
bridge_westend_messages: bridge_hub_rococo_runtime::BridgeWestendMessagesConfig {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -488,13 +514,139 @@ pub mod kusama {
|
||||
}
|
||||
}
|
||||
|
||||
/// Sub-module for Westend setup (uses Kusama runtime)
|
||||
/// Sub-module for Westend setup.
|
||||
pub mod westend {
|
||||
use crate::chain_spec::bridge_hubs::kusama;
|
||||
use super::{get_account_id_from_seed, get_collator_keys_from_seed, sr25519, ParaId};
|
||||
use crate::chain_spec::{Extensions, SAFE_XCM_VERSION};
|
||||
use parachains_common::{AccountId, AuraId};
|
||||
use sc_chain_spec::ChainType;
|
||||
|
||||
use super::BridgeHubBalance;
|
||||
|
||||
pub(crate) const BRIDGE_HUB_WESTEND: &str = "bridge-hub-westend";
|
||||
pub type BridgeHubChainSpec = kusama::BridgeHubChainSpec;
|
||||
pub type RuntimeApi = bridge_hub_kusama_runtime::RuntimeApi;
|
||||
pub(crate) const BRIDGE_HUB_WESTEND_LOCAL: &str = "bridge-hub-westend-local";
|
||||
pub(crate) const BRIDGE_HUB_WESTEND_DEVELOPMENT: &str = "bridge-hub-westend-dev";
|
||||
const BRIDGE_HUB_WESTEND_ED: BridgeHubBalance =
|
||||
parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
|
||||
|
||||
/// Specialized `ChainSpec` for the normal parachain runtime.
|
||||
pub type BridgeHubChainSpec =
|
||||
sc_service::GenericChainSpec<bridge_hub_westend_runtime::RuntimeGenesisConfig, Extensions>;
|
||||
pub type RuntimeApi = bridge_hub_westend_runtime::RuntimeApi;
|
||||
|
||||
pub fn local_config(
|
||||
id: &str,
|
||||
chain_name: &str,
|
||||
relay_chain: &str,
|
||||
para_id: ParaId,
|
||||
bridges_pallet_owner_seed: Option<String>,
|
||||
) -> BridgeHubChainSpec {
|
||||
let mut properties = sc_chain_spec::Properties::new();
|
||||
properties.insert("tokenSymbol".into(), "WND".into());
|
||||
properties.insert("tokenDecimals".into(), 12.into());
|
||||
|
||||
BridgeHubChainSpec::from_genesis(
|
||||
// Name
|
||||
chain_name,
|
||||
// ID
|
||||
super::ensure_id(id).expect("invalid id"),
|
||||
ChainType::Local,
|
||||
move || {
|
||||
genesis(
|
||||
// initial collators.
|
||||
vec![
|
||||
(
|
||||
get_account_id_from_seed::<sr25519::Public>("Alice"),
|
||||
get_collator_keys_from_seed::<AuraId>("Alice"),
|
||||
),
|
||||
(
|
||||
get_account_id_from_seed::<sr25519::Public>("Bob"),
|
||||
get_collator_keys_from_seed::<AuraId>("Bob"),
|
||||
),
|
||||
],
|
||||
vec![
|
||||
get_account_id_from_seed::<sr25519::Public>("Alice"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Bob"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Charlie"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Dave"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Eve"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
|
||||
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
|
||||
],
|
||||
para_id,
|
||||
bridges_pallet_owner_seed
|
||||
.as_ref()
|
||||
.map(|seed| get_account_id_from_seed::<sr25519::Public>(seed)),
|
||||
)
|
||||
},
|
||||
Vec::new(),
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
Some(properties),
|
||||
Extensions { relay_chain: relay_chain.to_string(), para_id: para_id.into() },
|
||||
)
|
||||
}
|
||||
|
||||
fn genesis(
|
||||
invulnerables: Vec<(AccountId, AuraId)>,
|
||||
endowed_accounts: Vec<AccountId>,
|
||||
id: ParaId,
|
||||
bridges_pallet_owner: Option<AccountId>,
|
||||
) -> bridge_hub_westend_runtime::RuntimeGenesisConfig {
|
||||
bridge_hub_westend_runtime::RuntimeGenesisConfig {
|
||||
system: bridge_hub_westend_runtime::SystemConfig {
|
||||
code: bridge_hub_westend_runtime::WASM_BINARY
|
||||
.expect("WASM binary was not build, please build it!")
|
||||
.to_vec(),
|
||||
..Default::default()
|
||||
},
|
||||
balances: bridge_hub_westend_runtime::BalancesConfig {
|
||||
balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
|
||||
},
|
||||
parachain_info: bridge_hub_westend_runtime::ParachainInfoConfig {
|
||||
parachain_id: id,
|
||||
..Default::default()
|
||||
},
|
||||
collator_selection: bridge_hub_westend_runtime::CollatorSelectionConfig {
|
||||
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
|
||||
candidacy_bond: BRIDGE_HUB_WESTEND_ED * 16,
|
||||
..Default::default()
|
||||
},
|
||||
session: bridge_hub_westend_runtime::SessionConfig {
|
||||
keys: invulnerables
|
||||
.into_iter()
|
||||
.map(|(acc, aura)| {
|
||||
(
|
||||
acc.clone(), // account id
|
||||
acc, // validator id
|
||||
bridge_hub_westend_runtime::SessionKeys { aura }, // session keys
|
||||
)
|
||||
})
|
||||
.collect(),
|
||||
},
|
||||
aura: Default::default(),
|
||||
aura_ext: Default::default(),
|
||||
parachain_system: Default::default(),
|
||||
polkadot_xcm: bridge_hub_westend_runtime::PolkadotXcmConfig {
|
||||
safe_xcm_version: Some(SAFE_XCM_VERSION),
|
||||
..Default::default()
|
||||
},
|
||||
bridge_rococo_grandpa: bridge_hub_westend_runtime::BridgeRococoGrandpaConfig {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
bridge_rococo_messages: bridge_hub_westend_runtime::BridgeRococoMessagesConfig {
|
||||
owner: bridges_pallet_owner.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Sub-module for Polkadot setup
|
||||
|
||||
@@ -467,7 +467,9 @@ macro_rules! construct_partials {
|
||||
)?;
|
||||
$code
|
||||
},
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend => {
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend |
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendLocal |
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendDevelopment => {
|
||||
let $partials = new_partial::<chain_spec::bridge_hubs::westend::RuntimeApi, _>(
|
||||
&$config,
|
||||
crate::service::aura_build_import_queue::<_, AuraId>,
|
||||
@@ -650,7 +652,9 @@ macro_rules! construct_async_run {
|
||||
{ $( $code )* }.map(|v| (v, task_manager))
|
||||
})
|
||||
},
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend => {
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend |
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendLocal |
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendDevelopment => {
|
||||
runner.async_run(|$config| {
|
||||
let $components = new_partial::<chain_spec::bridge_hubs::westend::RuntimeApi, _>(
|
||||
&$config,
|
||||
@@ -976,7 +980,9 @@ pub fn run() -> Result<()> {
|
||||
>(config, polkadot_config, collator_options, id, hwbench)
|
||||
.await
|
||||
.map(|r| r.0),
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend =>
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend |
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendLocal |
|
||||
chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendDevelopment =>
|
||||
crate::service::start_generic_aura_node::<
|
||||
chain_spec::bridge_hubs::westend::RuntimeApi,
|
||||
AuraId,
|
||||
|
||||
Reference in New Issue
Block a user