diff --git a/Cargo.lock b/Cargo.lock index dc5189aa1a..c3b47f47e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6961,7 +6961,6 @@ dependencies = [ "sp-runtime", "sp-trie", "sp-weights", - "staging-xcm", "staging-xcm-builder", ] diff --git a/relay/kusama/constants/Cargo.toml b/relay/kusama/constants/Cargo.toml index de4e95788f..d696045292 100644 --- a/relay/kusama/constants/Cargo.toml +++ b/relay/kusama/constants/Cargo.toml @@ -20,7 +20,6 @@ sp-core = { workspace = true } sp-trie = { workspace = true, optional = true } pallet-remote-proxy = { workspace = true } -xcm = { workspace = true } xcm-builder = { workspace = true } [features] @@ -37,7 +36,6 @@ std = [ "sp-trie?/std", "sp-weights/std", "xcm-builder/std", - "xcm/std", ] fast-runtime = [] runtime-benchmarks = [ @@ -48,5 +46,4 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "sp-trie", "xcm-builder/runtime-benchmarks", - "xcm/runtime-benchmarks", ] diff --git a/relay/kusama/constants/src/lib.rs b/relay/kusama/constants/src/lib.rs index a2d5b7b120..5f196cf319 100644 --- a/relay/kusama/constants/src/lib.rs +++ b/relay/kusama/constants/src/lib.rs @@ -272,8 +272,7 @@ pub mod xcm { /// Pluralistic bodies existing within the consensus. pub mod body { // The body corresponding to the Kusama OpenGov FellowshipAdmin Origin. - pub const KUSAMA_FELLOWSHIP_ADMIN_BODY_ID: xcm::latest::BodyId = - xcm::latest::BodyId::Moniker([b'k', b'f', b'a', b'b']); + pub const FELLOWSHIP_ADMIN_INDEX: u32 = 1; } } diff --git a/relay/kusama/src/governance/fellowship.rs b/relay/kusama/src/governance/fellowship.rs index 79a2a2ba53..e1c1eb329e 100644 --- a/relay/kusama/src/governance/fellowship.rs +++ b/relay/kusama/src/governance/fellowship.rs @@ -21,6 +21,7 @@ use alloc::borrow::Cow; use frame_support::traits::{MapSuccess, TryMapSuccess}; +use kusama_runtime_constants::xcm::body::FELLOWSHIP_ADMIN_INDEX; use sp_arithmetic::traits::CheckedSub; use sp_runtime::{ morph_types, str_array as s, @@ -33,7 +34,7 @@ parameter_types! { pub const AlarmInterval: BlockNumber = 1; pub const SubmissionDeposit: Balance = 0; pub const UndecidingTimeout: BlockNumber = 7 * DAYS; - pub const FellowshipAdminBodyId: BodyId = kusama_runtime_constants::xcm::body::KUSAMA_FELLOWSHIP_ADMIN_BODY_ID; + pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX); } const TRACKS_DATA: [pallet_referenda::Track; 10] = [ diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs index 1562c040f1..654db48516 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs +++ b/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs @@ -40,6 +40,7 @@ use frame_support::{ }, }; use frame_system::EnsureRoot; +use kusama_runtime_constants::xcm::body::FELLOWSHIP_ADMIN_INDEX; use pallet_xcm::{AuthorizedAliasers, XcmPassthrough}; use parachains_common::xcm_config::{ AllSiblingSystemParachains, ConcreteAssetFromSystem, ParentRelayOrSiblingParachains, @@ -454,7 +455,7 @@ parameter_types! { // `GeneralAdmin` pluralistic body. pub const GeneralAdminBodyId: BodyId = BodyId::Administration; // `FellowshipAdmin` pluralistic body. - pub const FellowshipAdminBodyId: BodyId = kusama_runtime_constants::xcm::body::KUSAMA_FELLOWSHIP_ADMIN_BODY_ID; + pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX); } /// Type to convert the `StakingAdmin` origin to a Plurality `Location` value.