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

[Companion] Allow StakingAdmin to set min_commission #6444

Merged
merged 10 commits into from
Dec 26, 2022
Merged

[Companion] Allow StakingAdmin to set min_commission #6444

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4779f3a
rename staking origin
Ank4n Dec 15, 2022
fd4fb73
fix comments
Ank4n Dec 15, 2022
a1ff212
rename origin
Ank4n Dec 17, 2022
7fd74df
Merge branch 'master' into ankan/staking-admin-origin
Ank4n Dec 17, 2022
077342d
Merge remote-tracking branch 'origin/master' into ankan/staking-admin…
Dec 25, 2022
b0ed040
give fake weight before re-benchmarking
Ank4n Dec 25, 2022
256e6dc
".git/.scripts/bench-bot.sh" runtime westend-dev pallet_staking
Dec 25, 2022
6a41df5
".git/.scripts/bench-bot.sh" runtime polkadot-dev pallet_staking
Dec 26, 2022
1dd0348
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_staking
Dec 26, 2022
5b8c5c3
update lockfile for {"substrate"}
Dec 26, 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
3 changes: 1 addition & 2 deletions runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,7 @@ impl pallet_staking::Config for Runtime {
type SessionsPerEra = SessionsPerEra;
type BondingDuration = BondingDuration;
type SlashDeferDuration = SlashDeferDuration;
// The staking admin or root can cancel the slash.
type SlashCancelOrigin = EitherOf<EnsureRoot<Self::AccountId>, StakingAdmin>;
type AdminOrigin = EitherOf<EnsureRoot<Self::AccountId>, StakingAdmin>;
type SessionInterface = Self;
type EraPayout = EraPayout;
type NextNewSession = Session;
Expand Down
333 changes: 173 additions & 160 deletions runtime/kusama/src/weights/pallet_staking.rs
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ parameter_types! {
pub const MaxNominations: u32 = <NposCompactSolution16 as frame_election_provider_support::NposSolution>::LIMIT as u32;
}

type SlashCancelOrigin = EitherOfDiverse<
type StakingAdminOrigin = EitherOfDiverse<
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 3, 4>,
>;
Expand Down Expand Up @@ -599,8 +599,7 @@ impl pallet_staking::Config for Runtime {
type SessionsPerEra = SessionsPerEra;
type BondingDuration = BondingDuration;
type SlashDeferDuration = SlashDeferDuration;
// A super-majority of the council can cancel the slash.
type SlashCancelOrigin = SlashCancelOrigin;
type AdminOrigin = StakingAdminOrigin;
type SessionInterface = Self;
type EraPayout = EraPayout;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
Expand Down
331 changes: 173 additions & 158 deletions runtime/polkadot/src/weights/pallet_staking.rs
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions runtime/test-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,7 @@ impl pallet_staking::Config for Runtime {
type SessionsPerEra = SessionsPerEra;
type BondingDuration = BondingDuration;
type SlashDeferDuration = SlashDeferDuration;
// A majority of the council can cancel the slash.
type SlashCancelOrigin = frame_system::EnsureNever<()>;
type AdminOrigin = frame_system::EnsureNever<()>;
type SessionInterface = Self;
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
Expand Down
3 changes: 1 addition & 2 deletions runtime/westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,7 @@ impl pallet_staking::Config for Runtime {
type SessionsPerEra = SessionsPerEra;
type BondingDuration = BondingDuration;
type SlashDeferDuration = SlashDeferDuration;
// A majority of the council can cancel the slash.
type SlashCancelOrigin = EnsureRoot<AccountId>;
type AdminOrigin = EnsureRoot<AccountId>;
type SessionInterface = Self;
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
Expand Down
Loading