Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion: Accept Kusama StakingAdmin origin #1865

Merged
merged 12 commits into from
Dec 22, 2022
Merged

Companion: Accept Kusama StakingAdmin origin #1865

Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3ec82c2
Companion: Accept Kusamsa StakinAdmin origin
muharem Nov 12, 2022
6d06324
Fellows origin for xcmp queue controller
muharem Nov 14, 2022
1c8a40f
plurality bodies to ensure origin
muharem Nov 18, 2022
48a6c87
Merge remote-tracking branch 'origin/master' into muharem-kusama-xcm-…
muharem Nov 18, 2022
5b2ee18
Merge remote-tracking branch 'origin/master' into muharem-kusama-xcm-…
muharem Nov 23, 2022
bd61c46
include root into controller ensure origin
muharem Nov 24, 2022
876b196
fix
muharem Nov 24, 2022
0a0c7b4
use xcm bodies
muharem Dec 12, 2022
4594534
Merge remote-tracking branch 'origin/master' into muharem-kusama-xcm-…
muharem Dec 12, 2022
9d980b7
rename to more frequent "defense"
muharem Dec 13, 2022
1f93fc4
Merge remote-tracking branch 'origin/master' into muharem-kusama-xcm-…
Dec 21, 2022
fe4b025
Merge remote-tracking branch 'origin/master' into muharem-kusama-xcm-…
Dec 22, 2022
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
25 changes: 20 additions & 5 deletions parachains/runtimes/assets/statemine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ use xcm_config::{KsmLocation, XcmConfig};
pub use sp_runtime::BuildStorage;

// Polkadot imports
use pallet_xcm::{EnsureXcm, IsMajorityOfBody};
use pallet_xcm::{EnsureXcm, IsMajorityOfBody, IsVoiceOfBody};
use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
use xcm::latest::BodyId;
use xcm_executor::XcmExecutor;
Expand Down Expand Up @@ -450,6 +450,11 @@ impl parachain_info::Config for Runtime {}

impl cumulus_pallet_aura_ext::Config for Runtime {}

parameter_types! {
// Fellows pluralistic body.
pub const FellowsBodyId: BodyId = BodyId::Technical;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that as long as the Tech Committee and Fellowship coexist, the Tech Comm would be able to control this origin.
https://github.com/paritytech/polkadot/pull/6273/files#r1049712864

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, but this should be valid?
Tech Committee has a root permissions.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, they do not. Only fast tracking permission.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double checked, Technical xcm body not used/mapped right now in kusama or polkadot (only docs tells as its supposed to be used as Tech Comm), it's safe to start using it as Fellows.

}

impl cumulus_pallet_xcmp_queue::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type XcmExecutor = XcmExecutor<XcmConfig>;
Expand All @@ -458,7 +463,10 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
type ControllerOrigin = EitherOfDiverse<
EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>,
EnsureXcm<(
IsMajorityOfBody<KsmLocation, ExecutiveBody>,
IsVoiceOfBody<KsmLocation, FellowsBodyId>,
)>,
>;
type ControllerOriginConverter = xcm_config::XcmOriginToTransactDispatchOrigin;
type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
Expand Down Expand Up @@ -501,11 +509,18 @@ parameter_types! {
pub const MinCandidates: u32 = 5;
pub const SessionLength: BlockNumber = 6 * HOURS;
pub const MaxInvulnerables: u32 = 100;
// StakingAdmin pluralistic body.
pub const StakingAdminBodyId: BodyId = BodyId::Defense;
}

/// We allow root and the Relay Chain council to execute privileged collator selection operations.
pub type CollatorSelectionUpdateOrigin =
EitherOfDiverse<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>>;
/// We allow root, the Relay Chain council and the StakingAdmin to execute privileged collator selection operations.
pub type CollatorSelectionUpdateOrigin = EitherOfDiverse<
EnsureRoot<AccountId>,
EnsureXcm<(
IsMajorityOfBody<KsmLocation, ExecutiveBody>,
IsVoiceOfBody<KsmLocation, StakingAdminBodyId>,
)>,
>;

impl pallet_collator_selection::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
Expand Down