mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 02:21:04 +00:00
Refactor away from opaque hashes (#5226)
* System.BlockHash * Fix hash * Introduce K/V iteration in all _concat maps Also move across: - System.Account (blake2_128_concat) - Balances.Locks (twox_64_concat) - ElectionsPhragmen.VotesOf (twox_64_concat) - ElectionsPhragmen.StakeOf (twox_64_concat) - Identity.IdentityOf (twox_64_concat) - Identity.SubsOf (twox_64_concat) - Society.Payouts (twox_64_concat) - Session.NextKeys (twox_64_concat) - Identity.SuperOf (blake2_128_concat) - Session.KeyOwner (blake2_128_concat) - Society.SuspendedCandidates (twox_64_concat) - Society.SuspendedMembers (twox_64_concat) - Society.Vouching (twox_64_concat) - Society.Strikes (twox_64_concat) - System.EventTopics - Balances.Account * Build fixes * Ensure migration happens in correct order * Staking.* * Vesting.* Offences.* * Democracy.* * Babe.* Collective.* * Grandpa.* * Assets.* Benchmark.* Contracts.* Elections.* Asset.* Nicks.* Also introduce real account list * ImOnline.* * Treasury.* * Recovery.* * Final bits. * Docs * Fix one test * Fix test * All passing except the UI tests * Remove linked_map part 1 * Remove linked_map * Some iterator utils for double maps. * Remove old migrations * Introduce tombstone for LinkedMap type * Migration for genesis hash * Fix build * Fix hash * Rename Map is_linked -> unused, keeping backwards compat (#5256) * Update frame/balances/src/lib.rs Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com> * Update frame/elections/src/lib.rs Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com> * Remove old migration code. * Update frame/system/src/lib.rs Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com> * Update bin/node/runtime/src/lib.rs Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com> * Fix hash * fix session migration * Fix watning Co-authored-by: Jaco Greeff <jacogr@gmail.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: Robert Habermeier <rphmeier@gmail.com>
This commit is contained in:
@@ -261,10 +261,7 @@ use sp_runtime::{Percent, ModuleId, RuntimeDebug,
|
||||
};
|
||||
use frame_support::{decl_error, decl_module, decl_storage, decl_event, ensure, dispatch::DispatchResult};
|
||||
use frame_support::weights::SimpleDispatchInfo;
|
||||
use frame_support::traits::{
|
||||
Currency, ReservableCurrency, Randomness, Get, ChangeMembers, BalanceStatus,
|
||||
ExistenceRequirement::AllowDeath,
|
||||
};
|
||||
use frame_support::traits::{Currency, ReservableCurrency, Randomness, Get, ChangeMembers, BalanceStatus, ExistenceRequirement::AllowDeath, MigrateAccount};
|
||||
use frame_system::{self as system, ensure_signed, ensure_root};
|
||||
|
||||
type BalanceOf<T, I> = <<T as Trait<I>>::Currency as Currency<<T as system::Trait>::AccountId>>::Balance;
|
||||
@@ -414,7 +411,7 @@ decl_storage! {
|
||||
|
||||
/// The set of suspended candidates.
|
||||
pub SuspendedCandidates get(suspended_candidate):
|
||||
map hasher(blake2_256) T::AccountId
|
||||
map hasher(twox_64_concat) T::AccountId
|
||||
=> Option<(BalanceOf<T, I>, BidKind<T::AccountId, BalanceOf<T, I>>)>;
|
||||
|
||||
/// Amount of our account balance that is specifically for the next round's bid(s).
|
||||
@@ -432,19 +429,19 @@ decl_storage! {
|
||||
}): Vec<T::AccountId>;
|
||||
|
||||
/// The set of suspended members.
|
||||
pub SuspendedMembers get(fn suspended_member): map hasher(blake2_256) T::AccountId => bool;
|
||||
pub SuspendedMembers get(fn suspended_member): map hasher(twox_64_concat) T::AccountId => bool;
|
||||
|
||||
/// The current bids, stored ordered by the value of the bid.
|
||||
Bids: Vec<Bid<T::AccountId, BalanceOf<T, I>>>;
|
||||
|
||||
/// Members currently vouching or banned from vouching again
|
||||
Vouching get(fn vouching): map hasher(blake2_256) T::AccountId => Option<VouchingStatus>;
|
||||
Vouching get(fn vouching): map hasher(twox_64_concat) T::AccountId => Option<VouchingStatus>;
|
||||
|
||||
/// Pending payouts; ordered by block number, with the amount that should be paid out.
|
||||
Payouts: map hasher(blake2_256) T::AccountId => Vec<(T::BlockNumber, BalanceOf<T, I>)>;
|
||||
Payouts: map hasher(twox_64_concat) T::AccountId => Vec<(T::BlockNumber, BalanceOf<T, I>)>;
|
||||
|
||||
/// The ongoing number of losing votes cast by the member.
|
||||
Strikes: map hasher(blake2_256) T::AccountId => StrikeCount;
|
||||
Strikes: map hasher(twox_64_concat) T::AccountId => StrikeCount;
|
||||
|
||||
/// Double map from Candidate -> Voter -> (Maybe) Vote.
|
||||
Votes: double_map
|
||||
@@ -1133,6 +1130,12 @@ decl_event! {
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: Trait> MigrateAccount<T::AccountId> for Module<T> {
|
||||
fn migrate_account(a: &T::AccountId) {
|
||||
Payouts::<T>::migrate_key_from_blake(a);
|
||||
}
|
||||
}
|
||||
|
||||
/// Simple ensure origin struct to filter for the founder account.
|
||||
pub struct EnsureFounder<T>(sp_std::marker::PhantomData<T>);
|
||||
impl<T: Trait> EnsureOrigin<T::Origin> for EnsureFounder<T> {
|
||||
|
||||
@@ -77,7 +77,7 @@ impl frame_system::Trait for Test {
|
||||
type AvailableBlockRatio = AvailableBlockRatio;
|
||||
type Version = ();
|
||||
type ModuleToIndex = ();
|
||||
type OnNewAccount = ();
|
||||
type MigrateAccount = (); type OnNewAccount = ();
|
||||
type OnKilledAccount = ();
|
||||
type AccountData = pallet_balances::AccountData<u64>;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user