pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-18 03:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix staking rebond weight refund (#9508)

Browse Source 
* Fix staking `rebond` weight refund


Comment

* use safe arithmetic

* comment
This commit is contained in:
Zeke Mostov
2021-08-09 04:59:00 -07:00
committed by GitHub
parent 4503a722da
commit 4dc8db2b80
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/staking/src/pallet/mod.rs
+7 -10
View File
@@ -23,10 +23,7 @@ use frame_support::{
Currency, CurrencyToVote, EnsureOrigin, EstimateNextNewSession, Get, LockIdentifier, Currency, CurrencyToVote, EnsureOrigin, EstimateNextNewSession, Get, LockIdentifier,
LockableCurrency, OnUnbalanced, UnixTime, LockableCurrency, OnUnbalanced, UnixTime,
}, },
weights::{ weights::Weight,
constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS},
Weight,
},
}; };
use frame_system::{ensure_root, ensure_signed, offchain::SendTransactionTypes, pallet_prelude::*}; use frame_system::{ensure_root, ensure_signed, offchain::SendTransactionTypes, pallet_prelude::*};
use sp_runtime::{ use sp_runtime::{
@@ -1311,18 +1308,18 @@ pub mod pallet {
let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?; let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk); ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
let initial_unlocking = ledger.unlocking.len() as u32;
let ledger = ledger.rebond(value); let ledger = ledger.rebond(value);
// Last check: the new active amount of ledger must be more than ED. // Last check: the new active amount of ledger must be more than ED.
ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond); ensure!(ledger.active >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond);
Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value)); Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
Self::update_ledger(&controller, &ledger); Self::update_ledger(&controller, &ledger);
Ok(Some(
35 * WEIGHT_PER_MICROS + let removed_chunks = 1u32 // for the case where the last iterated chunk is not removed
50 * WEIGHT_PER_NANOS * (ledger.unlocking.len() as Weight) + .saturating_add(initial_unlocking)
T::DbWeight::get().reads_writes(3, 2), .saturating_sub(ledger.unlocking.len() as u32);
) Ok(Some(T::WeightInfo::rebond(removed_chunks)).into())
.into())
} }
/// Set `HistoryDepth` value. This function will delete any history information /// Set `HistoryDepth` value. This function will delete any history information