mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-03 09:57:23 +00:00
93e8ffed55
* Introduce preimages module in traits * Multisize Preimages * Len not actually necessary * Tweaks to the preimage API * Fixes * Get Scheduler building with new API * Scheduler tests pass * Bounded Scheduler 🎉 * Use Agenda holes and introduce IncompleteSince to avoid need to reschedule * Tests pass with new weight system * New benchmarks * Add missing file * Drop preimage when permenantly overeight * Drop preimage when permenantly overeight * Referenda uses latest preimage API * Testing ok * Adding tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * fmt Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add preimage migration Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Docs * Remove dbg * Refactor Democracy * Refactor Democracy * Add final MEL * Remove silly maps * Fixes * Minor refactor * Formatting * Fixes * Fixes * Fixes * Update frame/preimage/src/lib.rs Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> * Add migrations to Democracy * WIP Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Resolve conflicts Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Revert "Resolve conflicts" This reverts commit 734d66d69e54553471ffa54fa52e3e304dc8f106. * Undo wrong resolves... Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * WIP Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Make compile Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * massage clippy Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * More clippy Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * clippy annoyance Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * clippy annoyance Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix benchmarks Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * add missing file * Test <Preimage as QueryPreimage> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * More tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Clippy harassment Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add test Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * clippy Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fixup tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Remove old stuff Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * fmt Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Test <Scheduler as Anon> trait functions Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update pallet-ui tests Why is this needed? Should not be the case unless master is broken... Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * More scheduler trait test Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * More tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Apply review suggestion Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Beauty fixes Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add Scheduler test migration_v3_to_v4_works Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Merge fixup Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Keep referenda benchmarks instantiatable Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update weights Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Use new scheduler weight functions Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Use new democracy weight functions Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Use weight compare functions Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update pallet-ui tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * More renaming… Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * More renaming… Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add comment Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Implement OnRuntimeUpgrade for scheduler::v3_to_v4 migration Put the migration into a proper `MigrateToV4` struct and implement the OnRuntimeUpgrade hooks for it. Also move the test to use that instead. This should make it easier for adding it to Polkadot. Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Clippy Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Handle undecodable Agendas Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Remove trash Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix test Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Use new OnRuntimeUpgrade functions Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * fix test Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix BoundedSlice::truncate_from Co-authored-by: jakoblell Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix pre_upgrade hook return values Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add more error logging Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Find too large preimages in the pre_upgrade hook Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Test that too large Calls in agendas are ignored Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Use new OnRuntimeUpgrade hooks Why did the CI not catch this?! Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * works fine - just more logs Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix staking migration Causing issues on Kusama... Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix UI tests No idea why this is needed. This is actually undoing an earlier change. Maybe the CI has different rustc versions!? Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Remove multisig's Calls (#12072) * Remove multisig's Calls * Multisig: Fix tests and re-introduce reserve logic (#12241) * Fix tests and re-introduce reserve logic * fix benches * add todo * remove irrelevant bench * [Feature] Add a migration that drains and refunds stored calls (#12313) * [Feature] Add a migration that drains and refunds stored calls * migration fixes * fixes * address review comments * consume the whole block weight * fix assertions * license header * fix interface Co-authored-by: parity-processbot <> Co-authored-by: parity-processbot <> Co-authored-by: Roman Useinov <roman.useinov@gmail.com> * Fix test Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix multisig benchmarks Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * ".git/.scripts/bench-bot.sh" pallet dev pallet_democracy * ".git/.scripts/bench-bot.sh" pallet dev pallet_scheduler * ".git/.scripts/bench-bot.sh" pallet dev pallet_preimage Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: parity-processbot <> Co-authored-by: Roman Useinov <roman.useinov@gmail.com>
234 lines
6.8 KiB
Rust
234 lines
6.8 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! The vote datatype.
|
|
|
|
use crate::{Conviction, Delegations, ReferendumIndex};
|
|
use codec::{Decode, Encode, EncodeLike, Input, MaxEncodedLen, Output};
|
|
use frame_support::traits::Get;
|
|
use scale_info::TypeInfo;
|
|
use sp_runtime::{
|
|
traits::{Saturating, Zero},
|
|
BoundedVec, RuntimeDebug,
|
|
};
|
|
use sp_std::prelude::*;
|
|
|
|
/// A number of lock periods, plus a vote, one way or the other.
|
|
#[derive(Copy, Clone, Eq, PartialEq, Default, RuntimeDebug)]
|
|
pub struct Vote {
|
|
pub aye: bool,
|
|
pub conviction: Conviction,
|
|
}
|
|
|
|
impl Encode for Vote {
|
|
fn encode_to<T: Output + ?Sized>(&self, output: &mut T) {
|
|
output.push_byte(u8::from(self.conviction) | if self.aye { 0b1000_0000 } else { 0 });
|
|
}
|
|
}
|
|
|
|
impl MaxEncodedLen for Vote {
|
|
fn max_encoded_len() -> usize {
|
|
1
|
|
}
|
|
}
|
|
|
|
impl EncodeLike for Vote {}
|
|
|
|
impl Decode for Vote {
|
|
fn decode<I: Input>(input: &mut I) -> Result<Self, codec::Error> {
|
|
let b = input.read_byte()?;
|
|
Ok(Vote {
|
|
aye: (b & 0b1000_0000) == 0b1000_0000,
|
|
conviction: Conviction::try_from(b & 0b0111_1111)
|
|
.map_err(|_| codec::Error::from("Invalid conviction"))?,
|
|
})
|
|
}
|
|
}
|
|
|
|
impl TypeInfo for Vote {
|
|
type Identity = Self;
|
|
|
|
fn type_info() -> scale_info::Type {
|
|
scale_info::Type::builder()
|
|
.path(scale_info::Path::new("Vote", module_path!()))
|
|
.composite(
|
|
scale_info::build::Fields::unnamed()
|
|
.field(|f| f.ty::<u8>().docs(&["Raw vote byte, encodes aye + conviction"])),
|
|
)
|
|
}
|
|
}
|
|
|
|
/// A vote for a referendum of a particular account.
|
|
#[derive(Encode, MaxEncodedLen, Decode, Copy, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)]
|
|
pub enum AccountVote<Balance> {
|
|
/// A standard vote, one-way (approve or reject) with a given amount of conviction.
|
|
Standard { vote: Vote, balance: Balance },
|
|
/// A split vote with balances given for both ways, and with no conviction, useful for
|
|
/// parachains when voting.
|
|
Split { aye: Balance, nay: Balance },
|
|
}
|
|
|
|
impl<Balance: Saturating> AccountVote<Balance> {
|
|
/// Returns `Some` of the lock periods that the account is locked for, assuming that the
|
|
/// referendum passed iff `approved` is `true`.
|
|
pub fn locked_if(self, approved: bool) -> Option<(u32, Balance)> {
|
|
// winning side: can only be removed after the lock period ends.
|
|
match self {
|
|
AccountVote::Standard { vote, balance } if vote.aye == approved =>
|
|
Some((vote.conviction.lock_periods(), balance)),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
/// The total balance involved in this vote.
|
|
pub fn balance(self) -> Balance {
|
|
match self {
|
|
AccountVote::Standard { balance, .. } => balance,
|
|
AccountVote::Split { aye, nay } => aye.saturating_add(nay),
|
|
}
|
|
}
|
|
|
|
/// Returns `Some` with whether the vote is an aye vote if it is standard, otherwise `None` if
|
|
/// it is split.
|
|
pub fn as_standard(self) -> Option<bool> {
|
|
match self {
|
|
AccountVote::Standard { vote, .. } => Some(vote.aye),
|
|
_ => None,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A "prior" lock, i.e. a lock for some now-forgotten reason.
|
|
#[derive(
|
|
Encode,
|
|
MaxEncodedLen,
|
|
Decode,
|
|
Default,
|
|
Copy,
|
|
Clone,
|
|
Eq,
|
|
PartialEq,
|
|
Ord,
|
|
PartialOrd,
|
|
RuntimeDebug,
|
|
TypeInfo,
|
|
)]
|
|
pub struct PriorLock<BlockNumber, Balance>(BlockNumber, Balance);
|
|
|
|
impl<BlockNumber: Ord + Copy + Zero, Balance: Ord + Copy + Zero> PriorLock<BlockNumber, Balance> {
|
|
/// Accumulates an additional lock.
|
|
pub fn accumulate(&mut self, until: BlockNumber, amount: Balance) {
|
|
self.0 = self.0.max(until);
|
|
self.1 = self.1.max(amount);
|
|
}
|
|
|
|
pub fn locked(&self) -> Balance {
|
|
self.1
|
|
}
|
|
|
|
pub fn rejig(&mut self, now: BlockNumber) {
|
|
if now >= self.0 {
|
|
self.0 = Zero::zero();
|
|
self.1 = Zero::zero();
|
|
}
|
|
}
|
|
}
|
|
|
|
/// An indicator for what an account is doing; it can either be delegating or voting.
|
|
#[derive(Clone, Encode, Decode, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
|
|
#[codec(mel_bound(skip_type_params(MaxVotes)))]
|
|
#[scale_info(skip_type_params(MaxVotes))]
|
|
pub enum Voting<Balance, AccountId, BlockNumber, MaxVotes: Get<u32>> {
|
|
/// The account is voting directly. `delegations` is the total amount of post-conviction voting
|
|
/// weight that it controls from those that have delegated to it.
|
|
Direct {
|
|
/// The current votes of the account.
|
|
votes: BoundedVec<(ReferendumIndex, AccountVote<Balance>), MaxVotes>,
|
|
/// The total amount of delegations that this account has received.
|
|
delegations: Delegations<Balance>,
|
|
/// Any pre-existing locks from past voting/delegating activity.
|
|
prior: PriorLock<BlockNumber, Balance>,
|
|
},
|
|
/// The account is delegating `balance` of its balance to a `target` account with `conviction`.
|
|
Delegating {
|
|
balance: Balance,
|
|
target: AccountId,
|
|
conviction: Conviction,
|
|
/// The total amount of delegations that this account has received.
|
|
delegations: Delegations<Balance>,
|
|
/// Any pre-existing locks from past voting/delegating activity.
|
|
prior: PriorLock<BlockNumber, Balance>,
|
|
},
|
|
}
|
|
|
|
impl<Balance: Default, AccountId, BlockNumber: Zero, MaxVotes: Get<u32>> Default
|
|
for Voting<Balance, AccountId, BlockNumber, MaxVotes>
|
|
{
|
|
fn default() -> Self {
|
|
Voting::Direct {
|
|
votes: Default::default(),
|
|
delegations: Default::default(),
|
|
prior: PriorLock(Zero::zero(), Default::default()),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<
|
|
Balance: Saturating + Ord + Zero + Copy,
|
|
BlockNumber: Ord + Copy + Zero,
|
|
AccountId,
|
|
MaxVotes: Get<u32>,
|
|
> Voting<Balance, AccountId, BlockNumber, MaxVotes>
|
|
{
|
|
pub fn rejig(&mut self, now: BlockNumber) {
|
|
match self {
|
|
Voting::Direct { prior, .. } => prior,
|
|
Voting::Delegating { prior, .. } => prior,
|
|
}
|
|
.rejig(now);
|
|
}
|
|
|
|
/// The amount of this account's balance that much currently be locked due to voting.
|
|
pub fn locked_balance(&self) -> Balance {
|
|
match self {
|
|
Voting::Direct { votes, prior, .. } =>
|
|
votes.iter().map(|i| i.1.balance()).fold(prior.locked(), |a, i| a.max(i)),
|
|
Voting::Delegating { balance, prior, .. } => *balance.max(&prior.locked()),
|
|
}
|
|
}
|
|
|
|
pub fn set_common(
|
|
&mut self,
|
|
delegations: Delegations<Balance>,
|
|
prior: PriorLock<BlockNumber, Balance>,
|
|
) {
|
|
let (d, p) = match self {
|
|
Voting::Direct { ref mut delegations, ref mut prior, .. } => (delegations, prior),
|
|
Voting::Delegating { ref mut delegations, ref mut prior, .. } => (delegations, prior),
|
|
};
|
|
*d = delegations;
|
|
*p = prior;
|
|
}
|
|
|
|
pub fn prior(&self) -> &PriorLock<BlockNumber, Balance> {
|
|
match self {
|
|
Voting::Direct { prior, .. } => prior,
|
|
Voting::Delegating { prior, .. } => prior,
|
|
}
|
|
}
|
|
}
|