Skip to content

Align KUSAMA_FELLOWSHIP_ADMIN_BODY_ID -> FELLOWSHIP_ADMIN_INDEX #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkontur merged 2 commits into from
Sep 24, 2025
Merged

Align KUSAMA_FELLOWSHIP_ADMIN_BODY_ID -> FELLOWSHIP_ADMIN_INDEX #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
679c9fc
Review comment for KUSAMA_FELLOWSHIP_ADMIN_BODY_ID->FELLOWSHIP_ADMIN_…
bkontur Sep 24, 2025
cef0146
Unused dep
bkontur Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions relay/kusama/constants/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -37,7 +36,6 @@ std = [
"sp-trie?/std",
"sp-weights/std",
"xcm-builder/std",
"xcm/std",
]
fast-runtime = []
runtime-benchmarks = [
Expand All @@ -48,5 +46,4 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
"sp-trie",
"xcm-builder/runtime-benchmarks",
"xcm/runtime-benchmarks",
]
3 changes: 1 addition & 2 deletions relay/kusama/constants/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
3 changes: 2 additions & 1 deletion relay/kusama/src/governance/fellowship.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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<u16, Balance, BlockNumber>; 10] = [
Expand Down
3 changes: 2 additions & 1 deletion system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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.
Expand Down
Loading