Skip to content

Staking: chill_other takes stash instead of controller #2501

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
merged 10 commits into from
Nov 27, 2023
Merged

Staking: chill_other takes stash instead of controller #2501

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9c5e772
chill_other takes stash
Nov 27, 2023
95ee59c
amend proof comment
Nov 27, 2023
44f0206
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
Nov 27, 2023
cc19935
Merge branch 'master' into rb-chill-other-takes-stash
Nov 27, 2023
3e5a30f
Update substrate/frame/staking/src/pallet/mod.rs
Nov 27, 2023
93369d4
amend defensive_proof error messages
Nov 27, 2023
c05e38a
Merge branch 'master' into rb-chill-other-takes-stash
Nov 27, 2023
1471fd7
revert change
Nov 27, 2023
9d20f59
Merge branch 'rb-chill-other-takes-stash' of https://github.com/parit…
Nov 27, 2023
6c72ca5
Merge branch 'master' into rb-chill-other-takes-stash
Nov 27, 2023
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
2 changes: 1 addition & 1 deletion substrate/frame/staking/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ benchmarks! {
)?;

let caller = whitelisted_caller();
}: _(RawOrigin::Signed(caller), controller)
}: _(RawOrigin::Signed(caller), stash.clone())
verify {
assert!(!T::VoterList::contains(&stash));
}
Expand Down
13 changes: 9 additions & 4 deletions substrate/frame/staking/src/pallet/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,7 @@ pub mod pallet {
// (temporary) passive migration.
Self::ledger(StakingAccount::Stash(stash.clone())).map(|ledger| {
let controller = ledger.controller()
.defensive_proof("ledger was fetched used the StakingInterface, so controller field must exist; qed.")
.defensive_proof("ledger was fetched using StakingLedger, so controller field must exist; qed.")
Copy link
Contributor

@gpestana gpestana Nov 27, 2023

Choose a reason for hiding this comment

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

👍

.ok_or(Error::<T>::NotController)?;

if controller == stash {
Expand Down Expand Up @@ -1764,11 +1764,16 @@ pub mod pallet {
/// who do not satisfy these requirements.
#[pallet::call_index(23)]
#[pallet::weight(T::WeightInfo::chill_other())]
pub fn chill_other(origin: OriginFor<T>, controller: T::AccountId) -> DispatchResult {
pub fn chill_other(origin: OriginFor<T>, stash: T::AccountId) -> DispatchResult {
// Anyone can call this function.
let caller = ensure_signed(origin)?;
let ledger = Self::ledger(Controller(controller.clone()))?;
let stash = ledger.stash;
let ledger = Self::ledger(Stash(stash.clone()))?;
let controller = ledger
.controller()
.defensive_proof(
"ledger was fetched using StakingLedger, so controller field must exist; qed.",
)
.ok_or(Error::<T>::NotController)?;

// In order for one user to chill another user, the following conditions must be met:
//
Expand Down
Loading