Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

NIS should retain funds in reserve #12928

Merged
merged 20 commits into from
Jan 17, 2023
Merged

NIS should retain funds in reserve #12928

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9417d04
Keep funds with receipt holder
gavofyork Dec 13, 2022
d137f16
Counterpart is optional
gavofyork Dec 14, 2022
d50027c
Use named reserves
gavofyork Dec 14, 2022
66e69f7
Tests
gavofyork Dec 15, 2022
00d6700
Benchmarks
gavofyork Dec 15, 2022
f9cace3
Fixes
gavofyork Dec 15, 2022
3b18e1d
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
5f8fa27
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
050f15a
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
8788a87
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
a15b065
Update frame/nis/src/tests.rs
gavofyork Jan 16, 2023
fab2f6f
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
1a4de12
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
fac1db5
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
ffb0f8d
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
653309a
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
761d056
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
55186cc
Update frame/nis/src/lib.rs
gavofyork Jan 16, 2023
2d143b9
Formatting
gavofyork Jan 17, 2023
b925c41
Merge remote-tracking branch 'origin/master' into gav-nis-reserve
ggwpez Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,6 +1496,7 @@ parameter_types! {
pub const ThawThrottle: (Perquintill, BlockNumber) = (Perquintill::from_percent(25), 5);
pub Target: Perquintill = Perquintill::zero();
pub const NisPalletId: PalletId = PalletId(*b"py/nis ");
pub const NisReserveId: [u8; 8] = *b"py/nis ";
}

impl pallet_nis::Config for Runtime {
Expand All @@ -1519,6 +1520,7 @@ impl pallet_nis::Config for Runtime {
type IntakePeriod = IntakePeriod;
type MaxIntakeWeight = MaxIntakeWeight;
type ThawThrottle = ThawThrottle;
type ReserveId = NisReserveId;
}

parameter_types! {
Expand Down
41 changes: 39 additions & 2 deletions frame/nis/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

use super::*;
use frame_benchmarking::{account, benchmarks, whitelisted_caller};
use frame_support::traits::{Currency, EnsureOrigin, Get};
use frame_support::traits::{nonfungible::Inspect, Currency, EnsureOrigin, Get};
use frame_system::RawOrigin;
use sp_arithmetic::Perquintill;
use sp_runtime::{
Expand Down Expand Up @@ -106,6 +106,7 @@ benchmarks! {
T::Currency::make_free_balance_be(&caller, bid);
Nis::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), bid, 1)?;
Nis::<T>::process_queues(Perquintill::one(), 1, 1, &mut WeightCounter::unlimited());
Nis::<T>::communify(RawOrigin::Signed(caller.clone()).into(), 0)?;
let original = T::Currency::free_balance(&Nis::<T>::account_id());
T::Currency::make_free_balance_be(&Nis::<T>::account_id(), BalanceOf::<T>::min_value());
}: _<T::RuntimeOrigin>(origin)
Expand All @@ -116,7 +117,7 @@ benchmarks! {
assert!(missing <= Perquintill::one() / 100_000);
}

thaw {
thaw_private {
let caller: T::AccountId = whitelisted_caller();
T::Currency::make_free_balance_be(&caller, T::MinBid::get() * BalanceOf::<T>::from(3u32));
Nis::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinBid::get(), 1)?;
Expand All @@ -128,6 +129,42 @@ benchmarks! {
assert!(Receipts::<T>::get(0).is_none());
}

thaw_communal {
let caller: T::AccountId = whitelisted_caller();
T::Currency::make_free_balance_be(&caller, T::MinBid::get() * BalanceOf::<T>::from(3u32));
Nis::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinBid::get(), 1)?;
Nis::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinBid::get(), 1)?;
Nis::<T>::process_queues(Perquintill::one(), 1, 2, &mut WeightCounter::unlimited());
Receipts::<T>::mutate(0, |m_g| if let Some(ref mut g) = m_g { g.expiry = Zero::zero() });
Nis::<T>::communify(RawOrigin::Signed(caller.clone()).into(), 0)?;
}: _(RawOrigin::Signed(caller.clone()), 0)
verify {
assert!(Receipts::<T>::get(0).is_none());
}

privatize {
let caller: T::AccountId = whitelisted_caller();
T::Currency::make_free_balance_be(&caller, T::MinBid::get() * BalanceOf::<T>::from(3u32));
Nis::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinBid::get(), 1)?;
Nis::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinBid::get(), 1)?;
Nis::<T>::process_queues(Perquintill::one(), 1, 2, &mut WeightCounter::unlimited());
Nis::<T>::communify(RawOrigin::Signed(caller.clone()).into(), 0)?;
}: _(RawOrigin::Signed(caller.clone()), 0)
verify {
assert_eq!(Nis::<T>::owner(&0), Some(caller));
}

communify {
let caller: T::AccountId = whitelisted_caller();
T::Currency::make_free_balance_be(&caller, T::MinBid::get() * BalanceOf::<T>::from(3u32));
Nis::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinBid::get(), 1)?;
Nis::<T>::place_bid(RawOrigin::Signed(caller.clone()).into(), T::MinBid::get(), 1)?;
Nis::<T>::process_queues(Perquintill::one(), 1, 2, &mut WeightCounter::unlimited());
}: _(RawOrigin::Signed(caller.clone()), 0)
verify {
assert_eq!(Nis::<T>::owner(&0), None);
}

process_queues {
fill_queues::<T>()?;
}: {
Expand Down
Loading