export xcm_pallet config

node/service/src/chain_spec.rs

@@ -558,6 +558,10 @@ 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),
+			..Default::default()
+		},
 	}
 }
 
@@ -755,6 +759,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), ..Default::default() },
 	}
 }
 
@@ -1054,6 +1059,10 @@ 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),
+			..Default::default()
+		},
 		// bridge_rococo_grandpa: rococo_runtime::BridgeRococoGrandpaConfig {
 		// 	owner: Some(endowed_accounts[0].clone()),
 		// 	..Default::default()
@@ -1411,6 +1420,7 @@ pub fn kusama_testnet_genesis(
 		},
 		gilt: Default::default(),
 		paras: Default::default(),
+		xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2), ..Default::default() },
 	}
 }
 
@@ -1492,6 +1502,10 @@ 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),
+			..Default::default()
+		},
 	}
 }
 
@@ -1568,6 +1582,10 @@ 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),
+			..Default::default()
+		},
 		// bridge_rococo_grandpa: rococo_runtime::BridgeRococoGrandpaConfig {
 		// 	owner: Some(root_key.clone()),
 		// 	..Default::default()

runtime/kusama/src/lib.rs

@@ -49,9 +49,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use beefy_primitives::crypto::AuthorityId as BeefyId;
 use frame_support::{
 	construct_runtime, parameter_types,
-	traits::{
-		Contains, Everything, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing,
-	},
+	traits::{Contains, Everything, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing},
 	weights::Weight,
 	PalletId, RuntimeDebug,
 };
@@ -1523,7 +1521,7 @@ construct_runtime! {
 		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
 	}
 }
 

runtime/rococo/src/lib.rs

@@ -255,7 +255,7 @@ construct_runtime! {
 		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>},
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
 
 	}
 }

runtime/westend/src/lib.rs

@@ -1101,7 +1101,7 @@ construct_runtime! {
 		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 64,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
 	}
 }
 

xcm/pallet-xcm/src/lib.rs

@@ -388,20 +388,21 @@ pub mod pallet {
 		StorageValue<_, VersionMigrationStage, OptionQuery>;
 
 	#[pallet::genesis_config]
-	pub struct GenesisConfig {
+	pub struct GenesisConfig<T: Config> {
 		/// The default version to encode outgoing XCM messages with.
 		pub safe_xcm_version: Option<XcmVersion>,
+		pub phantom: sp_std::marker::PhantomData<T>,
 	}
 
 	#[cfg(feature = "std")]
-	impl Default for GenesisConfig {
+	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			Self { safe_xcm_version: Some(XCM_VERSION) }
+			Self { safe_xcm_version: Some(XCM_VERSION), phantom: Default::default() }
 		}
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
 		fn build(&self) {
 			SafeXcmVersion::<T>::set(self.safe_xcm_version);
 		}

xcm/pallet-xcm/src/mock.rs

@@ -324,6 +324,10 @@ pub(crate) fn new_test_ext_with_balances(
 		.assimilate_storage(&mut t)
 		.unwrap();
 
+	pallet_xcm::GenesisConfig::<Test> { safe_xcm_version: Some(2), ..Default::default() }
+		.assimilate_storage(&mut t)
+		.unwrap();
+
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext