From 84466fec428a7f653e785f546f4d4f22819f8b00 Mon Sep 17 00:00:00 2001 From: Cheng JIANG Date: Fri, 22 Oct 2021 10:25:57 +0800 Subject: [PATCH] export xcm_pallet config (#4116) * export xcm_pallet config Signed-off-by: Cheng JIANG * run format Signed-off-by: Cheng JIANG * fix typo Signed-off-by: Cheng JIANG * add generic parameter to support different runtimes * Revert "add generic parameter to support different runtimes" This reverts commit 4405ea9fab24307318ffc20a833010fe864b3be3. --- node/service/src/chain_spec.rs | 6 ++++++ runtime/kusama/src/lib.rs | 2 +- runtime/rococo/src/lib.rs | 2 +- runtime/westend/src/lib.rs | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index 502c9dbf7217..84c6e767f0ea 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -558,6 +558,7 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi registrar: westend_runtime::RegistrarConfig { next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID, }, + xcm_pallet: westend_runtime::XcmPalletConfig { safe_xcm_version: Some(2) }, } } @@ -755,6 +756,7 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC }, gilt: Default::default(), paras: Default::default(), + xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2) }, } } @@ -1054,6 +1056,7 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime:: registrar: rococo_runtime::RegistrarConfig { next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID, }, + xcm_pallet: rococo_runtime::XcmPalletConfig { safe_xcm_version: Some(2) }, // bridge_rococo_grandpa: rococo_runtime::BridgeRococoGrandpaConfig { // owner: Some(endowed_accounts[0].clone()), // ..Default::default() @@ -1411,6 +1414,7 @@ pub fn kusama_testnet_genesis( }, gilt: Default::default(), paras: Default::default(), + xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2) }, } } @@ -1492,6 +1496,7 @@ pub fn westend_testnet_genesis( registrar: westend_runtime::RegistrarConfig { next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID, }, + xcm_pallet: westend_runtime::XcmPalletConfig { safe_xcm_version: Some(2) }, } } @@ -1568,6 +1573,7 @@ pub fn rococo_testnet_genesis( registrar: rococo_runtime::RegistrarConfig { next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID, }, + xcm_pallet: rococo_runtime::XcmPalletConfig { safe_xcm_version: Some(2) }, // bridge_rococo_grandpa: rococo_runtime::BridgeRococoGrandpaConfig { // owner: Some(root_key.clone()), // ..Default::default() diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 8e8aa0d0213a..3c6c6b56b028 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1521,7 +1521,7 @@ construct_runtime! { Crowdloan: crowdloan::{Pallet, Call, Storage, Event} = 73, // Pallet for sending XCM. - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin} = 99, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 99, } } diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index d0a0c4dbda73..1dd8cc57dd0b 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -255,7 +255,7 @@ construct_runtime! { Multisig: pallet_multisig::{Pallet, Call, Storage, Event}, // Pallet for sending XCM. - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin} = 99, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 99, } } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index c19d16030539..e4c1d5e15efe 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1101,7 +1101,7 @@ construct_runtime! { Crowdloan: crowdloan::{Pallet, Call, Storage, Event} = 64, // Pallet for sending XCM. - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin} = 99, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 99, } }