mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-21 01:41:03 +00:00
Deprecate Currency; introduce holds and freezing into fungible traits (#12951)
* First reworking of fungibles API * New API and docs * More fungible::* API improvements * New ref-counting logic for old API * Missing files * Fixes * Use the new transfer logic * Use fungibles for the dispatchables * Use shelve/restore names * Locking works with total balance. * repotting and removal * Separate Holds from Reserves * Introduce freezes * Missing files * Tests for freezing * Fix hold+freeze combo * More tests * Fee-free dispatchable for upgrading accounts * Benchmarks and a few fixes * Another test * Docs and refactor to avoid blanket impls * Repot * Fit out ItemOf fully * Add events to Balanced traits * Introduced events into Hold traits * Fix Assets pallet tests * Assets benchmarks pass * Missing files and fixes * Fixes * Fixes * Benchmarks fixes * Fix balance benchmarks * Formatting * Expose fungible sub modules * Move NIS to fungible API * Fix broken impl and add test * Fix tests * API for `transfer_and_hold` * Use composite APIs * Formatting * Upgraded event * Fixes * Fixes * Fixes * Fixes * Repot tests and some fixed * Fix some bits * Fix dust tests * Rename `set_balance` - `Balances::set_balance` becomes `Balances::force_set_balance` - `Unbalanced::set_balance` becomes `Unbalances::write_balance` * becomes * Move dust handling to fungibles API * Formatting * Fixes and more refactoring * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Use reducible_balance for better correctness on fees * Reducing hold to zero should remove entry. * Add test * Docs * Update frame/support/src/traits/tokens/fungibles/hold.rs Co-authored-by: Muharem Ismailov <ismailov.m.h@gmail.com> * Update frame/support/src/traits/tokens/fungibles/regular.rs Co-authored-by: Muharem Ismailov <ismailov.m.h@gmail.com> * Update frame/support/src/traits/tokens/fungible/hold.rs Co-authored-by: Muharem Ismailov <ismailov.m.h@gmail.com> * Update frame/support/src/traits/tokens/fungible/regular.rs Co-authored-by: Muharem Ismailov <ismailov.m.h@gmail.com> * Docs * Docs * Docs * Fix NIS benchmarks * Doc comment * Remove post_mutation * Fix some tests * Fix some grumbles * Enumify bool args to fungible(s) functions * Fix up assets and balances * Formatting * Fix contracts * Fix tests & benchmarks build * Typify minted boolean arg * Typify on_hold boolean arg; renames * Fix numerous tests * Fix dependency issue * Privatize dangerous API mutate_account * Fix contracts (@alext - please check this commit) * Remove println * Fix tests for contracts * Fix broken rename * Fix broken rename * Fix broken rename * Docs * Update frame/support/src/traits/tokens/fungible/hold.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * remove from_ref_time * Update frame/executive/src/lib.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/executive/src/lib.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Reenable test * Update frame/support/src/traits/tokens/fungibles/hold.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungible/hold.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungible/hold.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungible/hold.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/currency.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/lottery/src/tests.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungible/mod.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungible/regular.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungibles/freeze.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungible/regular.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungibles/hold.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungibles/hold.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Update frame/support/src/traits/tokens/fungibles/hold.rs Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> * Rename UnwantedRemoval to UnwantedAccountRemoval * Docs * Formatting * Update frame/balances/src/lib.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update primitives/runtime/src/lib.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * handle_raw_dust oes nothing * Formatting * Fixes * Grumble * Fixes * Add test * Add test * Tests for reducible_balance * Fixes * Fix Salary * Fixes * Disable broken test * Disable nicely * Fixes * Fixes * Fixes * Rename some events * Fix nomination pools breakage * Add compatibility stub for transfer tx * Reinstate a safely compatible version of Balances set_balance * Fixes * Grumble * Update frame/nis/src/lib.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_balances * disable flakey tests * Update frame/balances/src/lib.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * Grumbles * Grumble --------- Co-authored-by: Muharem Ismailov <ismailov.m.h@gmail.com> Co-authored-by: Alexander Theißen <alex.theissen@me.com> Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> Co-authored-by: command-bot <>
This commit is contained in:
Gavin Wood
@@ -139,6 +139,7 @@ benchmarks! {
|
||||
let other: T::AccountId = account("other", 0, SEED);
|
||||
let other_lookup = T::Lookup::unlookup(other.clone());
|
||||
|
||||
T::Currency::make_free_balance_be(&other, T::Currency::minimum_balance());
|
||||
add_locks::<T>(&other, l as u8);
|
||||
let expected_balance = add_vesting_schedules::<T>(other_lookup.clone(), s)?;
|
||||
|
||||
@@ -168,6 +169,7 @@ benchmarks! {
|
||||
let other: T::AccountId = account("other", 0, SEED);
|
||||
let other_lookup = T::Lookup::unlookup(other.clone());
|
||||
|
||||
T::Currency::make_free_balance_be(&other, T::Currency::minimum_balance());
|
||||
add_locks::<T>(&other, l as u8);
|
||||
add_vesting_schedules::<T>(other_lookup.clone(), s)?;
|
||||
// At block 21 everything is unlocked.
|
||||
@@ -200,8 +202,10 @@ benchmarks! {
|
||||
let target: T::AccountId = account("target", 0, SEED);
|
||||
let target_lookup = T::Lookup::unlookup(target.clone());
|
||||
// Give target existing locks
|
||||
T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
|
||||
add_locks::<T>(&target, l as u8);
|
||||
// Add one vesting schedules.
|
||||
let orig_balance = T::Currency::free_balance(&target);
|
||||
let mut expected_balance = add_vesting_schedules::<T>(target_lookup.clone(), s)?;
|
||||
|
||||
let transfer_amount = T::MinVestedTransfer::get();
|
||||
@@ -216,7 +220,7 @@ benchmarks! {
|
||||
}: _(RawOrigin::Signed(caller), target_lookup, vesting_schedule)
|
||||
verify {
|
||||
assert_eq!(
|
||||
expected_balance,
|
||||
orig_balance + expected_balance,
|
||||
T::Currency::free_balance(&target),
|
||||
"Transfer didn't happen",
|
||||
);
|
||||
@@ -238,8 +242,10 @@ benchmarks! {
|
||||
let target: T::AccountId = account("target", 0, SEED);
|
||||
let target_lookup = T::Lookup::unlookup(target.clone());
|
||||
// Give target existing locks
|
||||
T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
|
||||
add_locks::<T>(&target, l as u8);
|
||||
// Add one less than max vesting schedules
|
||||
let orig_balance = T::Currency::free_balance(&target);
|
||||
let mut expected_balance = add_vesting_schedules::<T>(target_lookup.clone(), s)?;
|
||||
|
||||
let transfer_amount = T::MinVestedTransfer::get();
|
||||
@@ -254,7 +260,7 @@ benchmarks! {
|
||||
}: _(RawOrigin::Root, source_lookup, target_lookup, vesting_schedule)
|
||||
verify {
|
||||
assert_eq!(
|
||||
expected_balance,
|
||||
orig_balance + expected_balance,
|
||||
T::Currency::free_balance(&target),
|
||||
"Transfer didn't happen",
|
||||
);
|
||||
@@ -272,6 +278,7 @@ benchmarks! {
|
||||
let caller: T::AccountId = account("caller", 0, SEED);
|
||||
let caller_lookup = T::Lookup::unlookup(caller.clone());
|
||||
// Give target existing locks.
|
||||
T::Currency::make_free_balance_be(&caller, T::Currency::minimum_balance());
|
||||
add_locks::<T>(&caller, l as u8);
|
||||
// Add max vesting schedules.
|
||||
let expected_balance = add_vesting_schedules::<T>(caller_lookup, s)?;
|
||||
@@ -322,6 +329,7 @@ benchmarks! {
|
||||
let caller: T::AccountId = account("caller", 0, SEED);
|
||||
let caller_lookup = T::Lookup::unlookup(caller.clone());
|
||||
// Give target other locks.
|
||||
T::Currency::make_free_balance_be(&caller, T::Currency::minimum_balance());
|
||||
add_locks::<T>(&caller, l as u8);
|
||||
// Add max vesting schedules.
|
||||
let total_transferred = add_vesting_schedules::<T>(caller_lookup, s)?;
|
||||
|
||||
@@ -80,6 +80,10 @@ impl pallet_balances::Config for Test {
|
||||
type MaxReserves = ();
|
||||
type ReserveIdentifier = [u8; 8];
|
||||
type WeightInfo = ();
|
||||
type FreezeIdentifier = ();
|
||||
type MaxFreezes = ();
|
||||
type HoldIdentifier = ();
|
||||
type MaxHolds = ();
|
||||
}
|
||||
parameter_types! {
|
||||
pub const MinVestedTransfer: u64 = 256 * 2;
|
||||
|
||||
@@ -17,7 +17,10 @@
|
||||
|
||||
use frame_support::{assert_noop, assert_ok, assert_storage_noop, dispatch::EncodeLike};
|
||||
use frame_system::RawOrigin;
|
||||
use sp_runtime::traits::{BadOrigin, Identity};
|
||||
use sp_runtime::{
|
||||
traits::{BadOrigin, Identity},
|
||||
TokenError,
|
||||
};
|
||||
|
||||
use super::{Vesting as VestingStorage, *};
|
||||
use crate::mock::{Balances, ExtBuilder, System, Test, Vesting};
|
||||
@@ -180,10 +183,8 @@ fn unvested_balance_should_not_transfer() {
|
||||
assert_eq!(user1_free_balance, 100); // Account 1 has free balance
|
||||
// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
|
||||
assert_eq!(Vesting::vesting_balance(&1), Some(45));
|
||||
assert_noop!(
|
||||
Balances::transfer(Some(1).into(), 2, 56),
|
||||
pallet_balances::Error::<Test, _>::LiquidityRestrictions,
|
||||
); // Account 1 cannot send more than vested amount
|
||||
// Account 1 cannot send more than vested amount...
|
||||
assert_noop!(Balances::transfer_allow_death(Some(1).into(), 2, 56), TokenError::Frozen);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -195,7 +196,7 @@ fn vested_balance_should_transfer() {
|
||||
// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
|
||||
assert_eq!(Vesting::vesting_balance(&1), Some(45));
|
||||
assert_ok!(Vesting::vest(Some(1).into()));
|
||||
assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
|
||||
assert_ok!(Balances::transfer_allow_death(Some(1).into(), 2, 55));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -213,7 +214,7 @@ fn vested_balance_should_transfer_with_multi_sched() {
|
||||
// Account 1 has only 256 units unlocking at block 1 (plus 1280 already fee).
|
||||
assert_eq!(Vesting::vesting_balance(&1), Some(2304));
|
||||
assert_ok!(Vesting::vest(Some(1).into()));
|
||||
assert_ok!(Balances::transfer(Some(1).into(), 2, 1536));
|
||||
assert_ok!(Balances::transfer_allow_death(Some(1).into(), 2, 1536));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -233,7 +234,7 @@ fn vested_balance_should_transfer_using_vest_other() {
|
||||
// Account 1 has only 5 units vested at block 1 (plus 50 unvested)
|
||||
assert_eq!(Vesting::vesting_balance(&1), Some(45));
|
||||
assert_ok!(Vesting::vest_other(Some(2).into(), 1));
|
||||
assert_ok!(Balances::transfer(Some(1).into(), 2, 55));
|
||||
assert_ok!(Balances::transfer_allow_death(Some(1).into(), 2, 55));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -251,7 +252,7 @@ fn vested_balance_should_transfer_using_vest_other_with_multi_sched() {
|
||||
// Account 1 has only 256 units unlocking at block 1 (plus 1280 already free).
|
||||
assert_eq!(Vesting::vesting_balance(&1), Some(2304));
|
||||
assert_ok!(Vesting::vest_other(Some(2).into(), 1));
|
||||
assert_ok!(Balances::transfer(Some(1).into(), 2, 1536));
|
||||
assert_ok!(Balances::transfer_allow_death(Some(1).into(), 2, 1536));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -266,8 +267,8 @@ fn non_vested_cannot_vest_other() {
|
||||
#[test]
|
||||
fn extra_balance_should_transfer() {
|
||||
ExtBuilder::default().existential_deposit(10).build().execute_with(|| {
|
||||
assert_ok!(Balances::transfer(Some(3).into(), 1, 100));
|
||||
assert_ok!(Balances::transfer(Some(3).into(), 2, 100));
|
||||
assert_ok!(Balances::transfer_allow_death(Some(3).into(), 1, 100));
|
||||
assert_ok!(Balances::transfer_allow_death(Some(3).into(), 2, 100));
|
||||
|
||||
let user1_free_balance = Balances::free_balance(&1);
|
||||
assert_eq!(user1_free_balance, 200); // Account 1 has 100 more free balance than normal
|
||||
@@ -278,12 +279,13 @@ fn extra_balance_should_transfer() {
|
||||
// Account 1 has only 5 units vested at block 1 (plus 150 unvested)
|
||||
assert_eq!(Vesting::vesting_balance(&1), Some(45));
|
||||
assert_ok!(Vesting::vest(Some(1).into()));
|
||||
assert_ok!(Balances::transfer(Some(1).into(), 3, 155)); // Account 1 can send extra units gained
|
||||
assert_ok!(Balances::transfer_allow_death(Some(1).into(), 3, 155)); // Account 1 can send extra units gained
|
||||
|
||||
// Account 2 has no units vested at block 1, but gained 100
|
||||
assert_eq!(Vesting::vesting_balance(&2), Some(200));
|
||||
assert_ok!(Vesting::vest(Some(2).into()));
|
||||
assert_ok!(Balances::transfer(Some(2).into(), 3, 100)); // Account 2 can send extra units gained
|
||||
assert_ok!(Balances::transfer_allow_death(Some(2).into(), 3, 100)); // Account 2 can send extra
|
||||
// units gained
|
||||
});
|
||||
}
|
||||
|
||||
@@ -305,7 +307,7 @@ fn liquid_funds_should_transfer_with_delayed_vesting() {
|
||||
assert_eq!(Vesting::vesting(&12).unwrap(), vec![user12_vesting_schedule]);
|
||||
|
||||
// Account 12 can still send liquid funds
|
||||
assert_ok!(Balances::transfer(Some(12).into(), 3, 256 * 5));
|
||||
assert_ok!(Balances::transfer_allow_death(Some(12).into(), 3, 256 * 5));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1144,14 +1146,11 @@ fn vested_transfer_less_than_existential_deposit_fails() {
|
||||
);
|
||||
|
||||
// vested_transfer fails.
|
||||
assert_noop!(
|
||||
Vesting::vested_transfer(Some(3).into(), 99, sched),
|
||||
pallet_balances::Error::<Test, _>::ExistentialDeposit,
|
||||
);
|
||||
assert_noop!(Vesting::vested_transfer(Some(3).into(), 99, sched), TokenError::BelowMinimum,);
|
||||
// force_vested_transfer fails.
|
||||
assert_noop!(
|
||||
Vesting::force_vested_transfer(RawOrigin::Root.into(), 3, 99, sched),
|
||||
pallet_balances::Error::<Test, _>::ExistentialDeposit,
|
||||
TokenError::BelowMinimum,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user