mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 23:57:56 +00:00
Add sudo::remove_key (#2165)
Changes: - Adds a new call `remove_key` to the sudo pallet to permanently remove the sudo key. - Remove some clones and general maintenance --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: command-bot <>
This commit is contained in:
Oliver Tale-Yazdi
committed by
GitHub
GitHub
parent
640e385aec
commit
9adb46c868
@@ -146,7 +146,7 @@ type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup
|
||||
pub mod pallet {
|
||||
use super::{DispatchResult, *};
|
||||
use frame_support::pallet_prelude::*;
|
||||
use frame_system::pallet_prelude::*;
|
||||
use frame_system::{pallet_prelude::*, RawOrigin};
|
||||
|
||||
/// Default preludes for [`Config`].
|
||||
pub mod config_preludes {
|
||||
@@ -190,11 +190,6 @@ pub mod pallet {
|
||||
#[pallet::call]
|
||||
impl<T: Config> Pallet<T> {
|
||||
/// Authenticates the sudo key and dispatches a function call with `Root` origin.
|
||||
///
|
||||
/// The dispatch origin for this call must be _Signed_.
|
||||
///
|
||||
/// ## Complexity
|
||||
/// - O(1).
|
||||
#[pallet::call_index(0)]
|
||||
#[pallet::weight({
|
||||
let dispatch_info = call.get_dispatch_info();
|
||||
@@ -207,12 +202,11 @@ pub mod pallet {
|
||||
origin: OriginFor<T>,
|
||||
call: Box<<T as Config>::RuntimeCall>,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
// This is a public call, so we ensure that the origin is some signed account.
|
||||
let sender = ensure_signed(origin)?;
|
||||
ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
|
||||
Self::ensure_sudo(origin)?;
|
||||
|
||||
let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into());
|
||||
let res = call.dispatch_bypass_filter(RawOrigin::Root.into());
|
||||
Self::deposit_event(Event::Sudid { sudo_result: res.map(|_| ()).map_err(|e| e.error) });
|
||||
|
||||
// Sudo user does not pay a fee.
|
||||
Ok(Pays::No.into())
|
||||
}
|
||||
@@ -222,9 +216,6 @@ pub mod pallet {
|
||||
/// Sudo user to specify the weight of the call.
|
||||
///
|
||||
/// The dispatch origin for this call must be _Signed_.
|
||||
///
|
||||
/// ## Complexity
|
||||
/// - O(1).
|
||||
#[pallet::call_index(1)]
|
||||
#[pallet::weight((*weight, call.get_dispatch_info().class))]
|
||||
pub fn sudo_unchecked_weight(
|
||||
@@ -232,37 +223,30 @@ pub mod pallet {
|
||||
call: Box<<T as Config>::RuntimeCall>,
|
||||
weight: Weight,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
// This is a public call, so we ensure that the origin is some signed account.
|
||||
let sender = ensure_signed(origin)?;
|
||||
Self::ensure_sudo(origin)?;
|
||||
let _ = weight; // We don't check the weight witness since it is a root call.
|
||||
ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
|
||||
|
||||
let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into());
|
||||
let res = call.dispatch_bypass_filter(RawOrigin::Root.into());
|
||||
Self::deposit_event(Event::Sudid { sudo_result: res.map(|_| ()).map_err(|e| e.error) });
|
||||
|
||||
// Sudo user does not pay a fee.
|
||||
Ok(Pays::No.into())
|
||||
}
|
||||
|
||||
/// Authenticates the current sudo key and sets the given AccountId (`new`) as the new sudo
|
||||
/// key.
|
||||
///
|
||||
/// The dispatch origin for this call must be _Signed_.
|
||||
///
|
||||
/// ## Complexity
|
||||
/// - O(1).
|
||||
#[pallet::call_index(2)]
|
||||
#[pallet::weight(T::WeightInfo::set_key())]
|
||||
pub fn set_key(
|
||||
origin: OriginFor<T>,
|
||||
new: AccountIdLookupOf<T>,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
// This is a public call, so we ensure that the origin is some signed account.
|
||||
let sender = ensure_signed(origin)?;
|
||||
ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
|
||||
let new = T::Lookup::lookup(new)?;
|
||||
Self::ensure_sudo(origin)?;
|
||||
|
||||
let new = T::Lookup::lookup(new)?;
|
||||
Self::deposit_event(Event::KeyChanged { old: Key::<T>::get(), new: new.clone() });
|
||||
Key::<T>::put(new);
|
||||
|
||||
Self::deposit_event(Event::KeyChanged { old_sudoer: Key::<T>::get() });
|
||||
Key::<T>::put(&new);
|
||||
// Sudo user does not pay a fee.
|
||||
Ok(Pays::No.into())
|
||||
}
|
||||
@@ -271,9 +255,6 @@ pub mod pallet {
|
||||
/// a given account.
|
||||
///
|
||||
/// The dispatch origin for this call must be _Signed_.
|
||||
///
|
||||
/// ## Complexity
|
||||
/// - O(1).
|
||||
#[pallet::call_index(3)]
|
||||
#[pallet::weight({
|
||||
let dispatch_info = call.get_dispatch_info();
|
||||
@@ -287,17 +268,29 @@ pub mod pallet {
|
||||
who: AccountIdLookupOf<T>,
|
||||
call: Box<<T as Config>::RuntimeCall>,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
// This is a public call, so we ensure that the origin is some signed account.
|
||||
let sender = ensure_signed(origin)?;
|
||||
ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
|
||||
Self::ensure_sudo(origin)?;
|
||||
|
||||
let who = T::Lookup::lookup(who)?;
|
||||
|
||||
let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into());
|
||||
|
||||
let res = call.dispatch_bypass_filter(RawOrigin::Signed(who).into());
|
||||
Self::deposit_event(Event::SudoAsDone {
|
||||
sudo_result: res.map(|_| ()).map_err(|e| e.error),
|
||||
});
|
||||
|
||||
// Sudo user does not pay a fee.
|
||||
Ok(Pays::No.into())
|
||||
}
|
||||
|
||||
/// Permanently removes the sudo key.
|
||||
///
|
||||
/// **This cannot be un-done.**
|
||||
#[pallet::call_index(4)]
|
||||
#[pallet::weight(T::WeightInfo::remove_key())]
|
||||
pub fn remove_key(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
|
||||
Self::ensure_sudo(origin)?;
|
||||
|
||||
Self::deposit_event(Event::KeyRemoved {});
|
||||
Key::<T>::kill();
|
||||
|
||||
// Sudo user does not pay a fee.
|
||||
Ok(Pays::No.into())
|
||||
}
|
||||
@@ -313,9 +306,13 @@ pub mod pallet {
|
||||
},
|
||||
/// The sudo key has been updated.
|
||||
KeyChanged {
|
||||
/// The old sudo key if one was previously set.
|
||||
old_sudoer: Option<T::AccountId>,
|
||||
/// The old sudo key (if one was previously set).
|
||||
old: Option<T::AccountId>,
|
||||
/// The new sudo key (if one was set).
|
||||
new: T::AccountId,
|
||||
},
|
||||
/// The key was permanently removed.
|
||||
KeyRemoved,
|
||||
/// A [sudo_as](Pallet::sudo_as) call just took place.
|
||||
SudoAsDone {
|
||||
/// The result of the call made by the sudo user.
|
||||
@@ -324,9 +321,9 @@ pub mod pallet {
|
||||
}
|
||||
|
||||
#[pallet::error]
|
||||
/// Error for the Sudo pallet
|
||||
/// Error for the Sudo pallet.
|
||||
pub enum Error<T> {
|
||||
/// Sender must be the Sudo account
|
||||
/// Sender must be the Sudo account.
|
||||
RequireSudo,
|
||||
}
|
||||
|
||||
@@ -345,8 +342,19 @@ pub mod pallet {
|
||||
#[pallet::genesis_build]
|
||||
impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
|
||||
fn build(&self) {
|
||||
if let Some(ref key) = self.key {
|
||||
Key::<T>::put(key);
|
||||
Key::<T>::set(self.key.clone());
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: Config> Pallet<T> {
|
||||
/// Ensure that the caller is the sudo key.
|
||||
pub(crate) fn ensure_sudo(origin: OriginFor<T>) -> DispatchResult {
|
||||
let sender = ensure_signed(origin)?;
|
||||
|
||||
if Self::key().map_or(false, |k| k == sender) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(Error::<T>::RequireSudo.into())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user