From 18ed753ecd000ebd1c3389407d9e1c079f4ff5db Mon Sep 17 00:00:00 2001 From: Cheng JIANG Date: Fri, 19 Nov 2021 13:07:26 +0800 Subject: [PATCH 1/2] export hrmp config --- node/service/src/chain_spec.rs | 7 +++++++ runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- runtime/westend/src/lib.rs | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index 3c4c24eab332..2d14b73d1691 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -361,6 +361,7 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene claims: polkadot::ClaimsConfig { claims: vec![], vesting: vec![] }, vesting: polkadot::VestingConfig { vesting: vec![] }, treasury: Default::default(), + hrmp: Default::default(), configuration: polkadot::ConfigurationConfig { config: default_parachains_host_configuration(), }, @@ -540,6 +541,7 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] }, vesting: westend::VestingConfig { vesting: vec![] }, sudo: westend::SudoConfig { key: endowed_accounts[0].clone() }, + hrmp: Default::default(), configuration: westend::ConfigurationConfig { config: default_parachains_host_configuration(), }, @@ -737,6 +739,7 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC claims: kusama::ClaimsConfig { claims: vec![], vesting: vec![] }, vesting: kusama::VestingConfig { vesting: vec![] }, treasury: Default::default(), + hrmp: Default::default(), configuration: kusama::ConfigurationConfig { config: default_parachains_host_configuration(), }, @@ -1302,6 +1305,7 @@ pub fn polkadot_testnet_genesis( claims: polkadot::ClaimsConfig { claims: vec![], vesting: vec![] }, vesting: polkadot::VestingConfig { vesting: vec![] }, treasury: Default::default(), + hrmp: Default::default(), configuration: polkadot::ConfigurationConfig { config: default_parachains_host_configuration(), }, @@ -1386,6 +1390,7 @@ pub fn kusama_testnet_genesis( claims: kusama::ClaimsConfig { claims: vec![], vesting: vec![] }, vesting: kusama::VestingConfig { vesting: vec![] }, treasury: Default::default(), + hrmp: Default::default(), configuration: kusama::ConfigurationConfig { config: default_parachains_host_configuration(), }, @@ -1463,6 +1468,7 @@ pub fn westend_testnet_genesis( authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] }, vesting: westend::VestingConfig { vesting: vec![] }, sudo: westend::SudoConfig { key: root_key }, + hrmp: Default::default(), configuration: westend::ConfigurationConfig { config: default_parachains_host_configuration(), }, @@ -1533,6 +1539,7 @@ pub fn rococo_testnet_genesis( membership: Default::default(), authority_discovery: rococo_runtime::AuthorityDiscoveryConfig { keys: vec![] }, sudo: rococo_runtime::SudoConfig { key: root_key.clone() }, + hrmp: Default::default(), configuration: rococo_runtime::ConfigurationConfig { config: polkadot_runtime_parachains::configuration::HostConfiguration { max_validators_per_core: Some(1), diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index cea2ea71b04e..3ea8535ff13c 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1552,7 +1552,7 @@ construct_runtime! { Initializer: parachains_initializer::{Pallet, Call, Storage} = 57, Dmp: parachains_dmp::{Pallet, Call, Storage} = 58, Ump: parachains_ump::{Pallet, Call, Storage, Event} = 59, - Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event} = 60, + Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event, Config} = 60, ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61, // Parachain Onboarding Pallets. Start indices at 70 to leave room. diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index c6d2ae4b1d01..3d6d7fc7176e 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1355,7 +1355,7 @@ construct_runtime! { Initializer: parachains_initializer::{Pallet, Call, Storage} = 57, Dmp: parachains_dmp::{Pallet, Call, Storage} = 58, Ump: parachains_ump::{Pallet, Call, Storage, Event} = 59, - Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event} = 60, + Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event, Config} = 60, ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61, // Parachain Onboarding Pallets. Start indices at 70 to leave room. diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 6790ec73150b..5532663ef1f4 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1101,7 +1101,7 @@ construct_runtime! { Initializer: parachains_initializer::{Pallet, Call, Storage} = 48, Dmp: parachains_dmp::{Pallet, Call, Storage} = 49, Ump: parachains_ump::{Pallet, Call, Storage, Event} = 50, - Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event} = 51, + Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event, Config} = 51, ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 52, // Parachain Onboarding Pallets. Start indices at 60 to leave room. From 65f724a14a8aa5450326da5a990d15e51736a57d Mon Sep 17 00:00:00 2001 From: Cheng JIANG Date: Fri, 19 Nov 2021 13:32:59 +0800 Subject: [PATCH 2/2] fix build --- node/service/src/chain_spec.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index 2d14b73d1691..7c39cd31316e 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -1546,7 +1546,6 @@ pub fn rococo_testnet_genesis( ..default_parachains_host_configuration() }, }, - hrmp: Default::default(), paras: rococo_runtime::ParasConfig { paras: vec![] }, registrar: rococo_runtime::RegistrarConfig { next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID,