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

Add remove_proxies API for pallet-proxies #7557 #12714

Merged
merged 18 commits into from
May 26, 2023
Merged
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions frame/proxy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ use frame_support::{
traits::{Currency, Get, InstanceFilter, IsSubType, IsType, OriginTrait, ReservableCurrency},
RuntimeDebug,
};
use frame_system::{self as system};
use frame_system::{self as system, ensure_signed};
pub use pallet::*;
use scale_info::TypeInfo;
use sp_io::hashing::blake2_256;
use sp_runtime::{
Expand All @@ -50,8 +51,6 @@ use sp_runtime::{
use sp_std::prelude::*;
pub use weights::WeightInfo;

pub use pallet::*;

type CallHashOf<T> = <<T as Config>::CallHasher as Hash>::Output;

type BalanceOf<T> =
Expand Down Expand Up @@ -265,9 +264,7 @@ pub mod pallet {
#[pallet::weight(T::WeightInfo::remove_proxies(T::MaxProxies::get()))]
pub fn remove_proxies(origin: OriginFor<T>) -> DispatchResult {
let who = ensure_signed(origin)?;
let (_, old_deposit) = Proxies::<T>::take(&who);
T::Currency::unreserve(&who, old_deposit);

Self::remove_all_proxy_delegates(&who);
Ok(())
}

Expand Down Expand Up @@ -799,4 +796,13 @@ impl<T: Config> Pallet<T> {
let e = call.dispatch(origin);
Self::deposit_event(Event::ProxyExecuted { result: e.map(|_| ()).map_err(|e| e.error) });
}

/// Removes all proxy delegates for a given delegator.
///
/// Parameters:
/// - `delegator`: The delegator account.
pub fn remove_all_proxy_delegates(delegator: &T::AccountId) {
sam0x17 marked this conversation as resolved.
Show resolved Hide resolved
let (_, old_deposit) = Proxies::<T>::take(&delegator);
T::Currency::unreserve(&delegator, old_deposit);
}
}