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

NIS should retain funds in reserve #12928

Merged
gavofyork merged 20 commits into from
Jan 17, 2023
Merged

NIS should retain funds in reserve #12928

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Update frame/nis/src/lib.rs 
Co-authored-by: Keith Yeung <[email protected]>
  • Loading branch information
@gavofyork @KiChjang
gavofyork and KiChjang authored Jan 16, 2023
commit 5f8fa275c8af991f8fd9cfa38d44790585c882be
4 changes: 2 additions & 2 deletions frame/nis/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,8 +720,8 @@ pub mod pallet {
.map_err(|_| Error::<T>::Unfunded)?;
} else {
T::Currency::unreserve_named(&T::ReserveId::get(), &who, amount);
on_hold -= amount;
summary.receipts_on_hold -= amount;
on_hold.saturating_reduce(amount);
summary.receipts_on_hold.saturating_reduce(amount);
if dropped && !on_hold.is_zero() {
// Reclaim any remainder:
// Transfer `excess` to the pot if we have now fully compensated for the
Expand Down