Skip to content

Refactor our changes out of the core Staking code. #1802

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
Neopallium merged 10 commits into from
May 5, 2025
Merged

Refactor our changes out of the core Staking code. #1802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
301001a
Start moving our changes out of the core Staking code.
Neopallium Apr 3, 2025
09c3d06
Refactor chill/nominate code.
Neopallium Apr 4, 2025
8b86b30
Refactor slashing switch.
Neopallium Apr 7, 2025
603ecc5
Add missing "Polymesh added" notes.
Neopallium Apr 7, 2025
e83e55b
FIXUP
Neopallium Apr 7, 2025
6a2a159
Access Polymesh staking logic through an associated type.
Neopallium Apr 8, 2025
90c8e44
Impl PermissionedStaking on the pallet.
Neopallium Apr 8, 2025
7b8aee4
Refactor some of our logic out of the benchmarking and testing code.
Neopallium Apr 9, 2025
84af13f
Avoid using our User type.
Neopallium Apr 9, 2025
7a229bf
Add ED check to trait.
Neopallium Apr 15, 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
3 changes: 2 additions & 1 deletion pallets/runtime/common/src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ macro_rules! misc_pallet_impls {
type SlashDeferDuration = SlashDeferDuration;
type AdminOrigin = polymesh_primitives::EnsureRoot;
type SessionInterface = Self;
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
type EraPayout = pallet_staking::PolymeshConvertCurve<Self, RewardCurve>;
type NextNewSession = Session;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
Expand All @@ -275,6 +275,7 @@ macro_rules! misc_pallet_impls {
type Call = RuntimeCall;
type PalletsOrigin = OriginCaller;
type RewardScheduler = Scheduler;
type Permissioned = Staking;
}

impl pallet_authority_discovery::Config for Runtime {
Expand Down
3 changes: 1 addition & 2 deletions pallets/runtime/develop/src/benchmarks/pallet_session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ impl<T: Config> ValidatorInfo<T> {
Some(balance),
)
.unwrap()
.0
.account();
.0;
let controller = pallet_staking::Pallet::<T>::bonded(&stash).expect("not stash");

let keys = T::Keys::decode(&mut TrailingZeroInput::zeroes()).unwrap();
Expand Down
5 changes: 3 additions & 2 deletions pallets/runtime/tests/src/staking/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use sp_staking::{EraIndex, SessionIndex};
use pallet_balances::AccountData;
use pallet_balances::BlockRewardConfig;
use pallet_staking::types::SlashingSwitch;
use pallet_staking::{self as pallet_staking, *};
use pallet_staking::*;
use polymesh_primitives::asset::AssetId;
use polymesh_primitives::constants::currency::POLY;
use polymesh_primitives::identity_id::GenesisIdentityRecord;
Expand Down Expand Up @@ -599,7 +599,7 @@ impl pallet_staking::Config for Test {
type SlashDeferDuration = SlashDeferDuration;
type AdminOrigin = frame_system::EnsureRoot<AccountId>;
type SessionInterface = Self;
type EraPayout = ConvertCurve<RewardCurve>;
type EraPayout = PolymeshConvertCurve<Self, RewardCurve>;
type NextNewSession = Session;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
Expand All @@ -615,6 +615,7 @@ impl pallet_staking::Config for Test {
type Call = RuntimeCall;
type PalletsOrigin = OriginCaller;
type RewardScheduler = Scheduler;
type Permissioned = Staking;
}

impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Test
Expand Down
1 change: 0 additions & 1 deletion pallets/staking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ std = [
"pallet-babe/std",
"sp-arithmetic/std",
"rand_chacha",
"frame-benchmarking",
]
runtime-benchmarks = [
"frame-benchmarking",
Expand Down
Loading