mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 09:57:56 +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
@@ -30,6 +30,7 @@ use sp_core::H256;
|
||||
use sp_runtime::{
|
||||
testing::Header,
|
||||
traits::{BlakeTwo256, IdentityLookup},
|
||||
TokenError,
|
||||
};
|
||||
|
||||
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
|
||||
@@ -84,6 +85,10 @@ impl pallet_balances::Config for Test {
|
||||
type ExistentialDeposit = ConstU64<1>;
|
||||
type AccountStore = System;
|
||||
type WeightInfo = ();
|
||||
type FreezeIdentifier = ();
|
||||
type MaxFreezes = ();
|
||||
type HoldIdentifier = ();
|
||||
type MaxHolds = ();
|
||||
}
|
||||
|
||||
pub struct TestBaseCallFilter;
|
||||
@@ -107,7 +112,7 @@ impl Config for Test {
|
||||
type WeightInfo = ();
|
||||
}
|
||||
|
||||
use pallet_balances::{Call as BalancesCall, Error as BalancesError};
|
||||
use pallet_balances::Call as BalancesCall;
|
||||
|
||||
pub fn new_test_ext() -> sp_io::TestExternalities {
|
||||
let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
|
||||
@@ -126,16 +131,16 @@ fn now() -> Timepoint<u64> {
|
||||
}
|
||||
|
||||
fn call_transfer(dest: u64, value: u64) -> Box<RuntimeCall> {
|
||||
Box::new(RuntimeCall::Balances(BalancesCall::transfer { dest, value }))
|
||||
Box::new(RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest, value }))
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multisig_deposit_is_taken_and_returned() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 15);
|
||||
let call_weight = call.get_dispatch_info().weight;
|
||||
@@ -196,9 +201,9 @@ fn cancel_multisig_returns_deposit() {
|
||||
fn timepoint_checking_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 15);
|
||||
let hash = blake2_256(&call.encode());
|
||||
@@ -254,9 +259,9 @@ fn timepoint_checking_works() {
|
||||
fn multisig_2_of_3_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 15);
|
||||
let call_weight = call.get_dispatch_info().weight;
|
||||
@@ -287,9 +292,9 @@ fn multisig_2_of_3_works() {
|
||||
fn multisig_3_of_3_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 3);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 15);
|
||||
let call_weight = call.get_dispatch_info().weight;
|
||||
@@ -357,9 +362,9 @@ fn cancel_multisig_works() {
|
||||
fn multisig_2_of_3_as_multi_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 15);
|
||||
let call_weight = call.get_dispatch_info().weight;
|
||||
@@ -389,9 +394,9 @@ fn multisig_2_of_3_as_multi_works() {
|
||||
fn multisig_2_of_3_as_multi_with_many_calls_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call1 = call_transfer(6, 10);
|
||||
let call1_weight = call1.get_dispatch_info().weight;
|
||||
@@ -440,9 +445,9 @@ fn multisig_2_of_3_as_multi_with_many_calls_works() {
|
||||
fn multisig_2_of_3_cannot_reissue_same_call() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 10);
|
||||
let call_weight = call.get_dispatch_info().weight;
|
||||
@@ -482,14 +487,13 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
|
||||
call_weight
|
||||
));
|
||||
|
||||
let err = DispatchError::from(BalancesError::<Test, _>::InsufficientBalance).stripped();
|
||||
System::assert_last_event(
|
||||
pallet_multisig::Event::MultisigExecuted {
|
||||
approving: 3,
|
||||
timepoint: now(),
|
||||
multisig: multi,
|
||||
call_hash: hash,
|
||||
result: Err(err),
|
||||
result: Err(TokenError::FundsUnavailable.into()),
|
||||
}
|
||||
.into(),
|
||||
);
|
||||
@@ -593,9 +597,9 @@ fn duplicate_approvals_are_ignored() {
|
||||
fn multisig_1_of_3_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 1);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 15);
|
||||
let hash = blake2_256(&call.encode());
|
||||
@@ -646,9 +650,9 @@ fn multisig_filters() {
|
||||
fn weight_check_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 2);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 15);
|
||||
assert_ok!(Multisig::as_multi(
|
||||
@@ -682,9 +686,9 @@ fn multisig_handles_no_preimage_after_all_approve() {
|
||||
// the call will go through.
|
||||
new_test_ext().execute_with(|| {
|
||||
let multi = Multisig::multi_account_id(&[1, 2, 3][..], 3);
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer(RuntimeOrigin::signed(3), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), multi, 5));
|
||||
assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(3), multi, 5));
|
||||
|
||||
let call = call_transfer(6, 15);
|
||||
let call_weight = call.get_dispatch_info().weight;
|
||||
|
||||
Reference in New Issue
Block a user