Fix elections-phragmen and proxy issue #7040
- Loading branch information
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # Changelog | ||
| All notable changes to this crate will be documented in this file. | ||
|
|
||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||
| and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||
|
|
||
| ## [Unreleased] | ||
|
|
||
| ### Added | ||
| [Add slashing events to elections-phragmen](https://github.com/paritytech/substrate/pull/7543) | ||
|
|
||
| ### Changed | ||
|
|
||
| ### Fixed | ||
| [Don't slash all outgoing members](https://github.com/paritytech/substrate/pull/7394) | ||
| [Fix wrong outgoing calculation in election](https://github.com/paritytech/substrate/pull/7384) | ||
|
|
||
| ### Security | ||
| \[**Needs Migration**\] [Fix elections-phragmen and proxy issue + Record deposits on-chain](https://github.com/paritytech/substrate/pull/7040) | ||
|
|
||
| ## [2.0.0] - 2020-09-2020 | ||
|
|
||
| Initial version from which version tracking has begun. | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "pallet-elections-phragmen" | ||
| version = "3.0.0" | ||
| authors = ["Parity Technologies <[email protected]>"] | ||
| edition = "2018" | ||
| license = "Apache-2.0" | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,95 +127,88 @@ type NegativeImbalanceOf<T> = | |
| /// Helper functions for migrations of this module. | ||
| pub mod migrations { | ||
| use super::*; | ||
| use frame_support::{ | ||
| traits::{PalletVersion, GetPalletVersion}, | ||
| Twox64Concat, | ||
| migration::StorageKeyIterator, | ||
| }; | ||
|
|
||
| pub fn migrate_to_3_0_0<T: Trait>(old_voter_bond: BalanceOf<T>, old_candidacy_bond: BalanceOf<T>) -> Weight { | ||
| let current_version = <Module<T> as GetPalletVersion>::current_version(); | ||
| let maybe_storage_version = <Module<T> as GetPalletVersion>::storage_version(); | ||
|
|
||
| if current_version == PalletVersion::new(3, 0, 0) { | ||
|
||
| match maybe_storage_version { | ||
| Some(storage_version) if storage_version == PalletVersion::new(2, 0, 0) => { | ||
kianenigma marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| migrate_voters_to_recorded_deposit::<T>(old_voter_bond); | ||
| migrate_candidates_to_recorded_deposit::<T>(old_candidacy_bond); | ||
| migrate_runners_up_to_recorded_deposit::<T>(old_candidacy_bond); | ||
| migrate_members_to_recorded_deposit::<T>(old_candidacy_bond); | ||
| Weight::max_value() | ||
| }, | ||
| _ => { | ||
| 0 | ||
| } | ||
| } | ||
| } else { | ||
| 0 | ||
| } | ||
| } | ||
|
|
||
| /// Migrate from the old legacy voting bond (fixed) to the new one (per-vote dynamic). | ||
| /// | ||
| /// Will only be triggered if storage version is V1. | ||
| pub fn migrate_voters_to_recorded_deposit<T: Trait>(old_deposit: BalanceOf<T>) { | ||
| let mut count = 0; | ||
| <StorageKeyIterator<T::AccountId, (BalanceOf<T>, Vec<T::AccountId>), Twox64Concat>>::new( | ||
| <Voting<T>>::module_prefix(), | ||
| b"Voting", | ||
| ) | ||
| .for_each(|(who, (stake, votes))| { | ||
| // Insert a new value into the same location, thus no need to do `.drain()`. | ||
| let deposit = old_deposit; | ||
| let voter = Voter { votes, stake, deposit }; | ||
| <Voting<T>>::insert(who, voter); | ||
| count += 1; | ||
| }); | ||
| } | ||
|
|
||
| /// Migrate all candidates to recorded deposit. | ||
| /// | ||
| /// Will only be triggered if storage version is V1. | ||
| pub fn migrate_candidates_to_recorded_deposit<T: Trait>(old_deposit: BalanceOf<T>) { | ||
| let old_candidates = frame_support::migration::take_storage_value::<Vec<T::AccountId>>( | ||
| <Voting<T>>::module_prefix(), | ||
| b"Candidates", | ||
| &[], | ||
| ) | ||
| .unwrap_or_default(); | ||
| let new_candidates = old_candidates | ||
| .into_iter() | ||
| .map(|c| (c, old_deposit)) | ||
| .collect::<Vec<_>>(); | ||
| <Candidates<T>>::put(new_candidates); | ||
| } | ||
|
|
||
| pub fn migrate_members_to_recorded_deposit<T: Trait>(deposit: BalanceOf<T>) { | ||
| let _ = <Members<T>>::translate::<Vec<(T::AccountId, BalanceOf<T>)>, _>( | ||
| |maybe_old_members| { | ||
| maybe_old_members.map(|old_members| { | ||
| frame_support::debug::info!( | ||
| "migrated {} member accounts.", | ||
| old_members.len() | ||
| ); | ||
| old_members | ||
| .into_iter() | ||
| .map(|(who, stake)| SeatHolder { | ||
| who, | ||
| stake, | ||
| deposit, | ||
| }) | ||
| .collect::<Vec<_>>() | ||
| }) | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| pub fn migrate_runners_up_to_recorded_deposit<T: Trait>(deposit: BalanceOf<T>) -> Weight { | ||
|
|
@@ -2705,7 +2698,7 @@ mod tests { | |
| assert_err_with_weight!( | ||
| Elections::remove_member(Origin::root(), 4, false), | ||
| Error::<Test>::InvalidReplacement, | ||
| Some(34042000) // only thing that matters for now is that it is NOT the full block. | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.