Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Treasury support KTON Proposal #306

Merged
merged 19 commits into from
Mar 3, 2020
Merged

Treasury support KTON Proposal #306

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b826db3
add: READMEs for balances
clearloop Feb 27, 2020
c148de4
add: basic StakingBalance in treasury
clearloop Feb 28, 2020
8296575
update: convert Ring to StakingBalance in treasury
clearloop Feb 28, 2020
13d04c9
fix: prev treasury tests
clearloop Feb 28, 2020
c15d486
fix: tests in runtime relating to treasury
clearloop Feb 28, 2020
57e3fa3
fix: ProposalBondMinimum in treasury
clearloop Feb 29, 2020
d8b7f86
travis: add local test cases for darwinia
clearloop Feb 29, 2020
2ba401b
fix: treasury deps in node-runtime
clearloop Feb 29, 2020
888f233
add: spend_funds for kton
clearloop Mar 1, 2020
fad2d13
build: unlink .cargo/config
clearloop Mar 1, 2020
d6d62db
add: tests for kton
clearloop Mar 1, 2020
e7eec5a
add: separate treasury tests
clearloop Mar 1, 2020
5a175b2
remove: StakingBalance enum in treasury
clearloop Mar 2, 2020
a11cf71
fix: no spent no burn
clearloop Mar 2, 2020
80581e5
add: more tests to no_spent_no_burn
clearloop Mar 2, 2020
d235280
add: common logic tests for treasury
clearloop Mar 3, 2020
c08ca16
fix: approve should failed since one of kton or ring is not satisfied
clearloop Mar 3, 2020
e2950b9
optimize: merge if-else closures
clearloop Mar 3, 2020
463a47b
fix: conditon mixed up
clearloop Mar 3, 2020
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
13 changes: 4 additions & 9 deletions frame/treasury/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,25 +371,20 @@ impl<T: Trait> Module<T> {
return true;
}

// no spent no burn
if p.ring_value == RingBalance::<T>::from(0) {
miss_any_ring = true;
}

if p.kton_value == KtonBalance::<T>::from(0) {
miss_any_kton = true;
}

hackfisher marked this conversation as resolved.
Show resolved Hide resolved
if p.ring_value > RingBalance::<T>::from(0) {
budget_remaining_ring -= p.ring_value;
hackfisher marked this conversation as resolved.
Show resolved Hide resolved
let _ = T::RingCurrency::unreserve(&p.proposer, p.ring_bond);
imbalance_ring.subsume(T::RingCurrency::deposit_creating(&p.beneficiary, p.ring_value));
} else {
miss_any_ring = true;
}

if p.kton_value > KtonBalance::<T>::from(0) {
hackfisher marked this conversation as resolved.
Show resolved Hide resolved
budget_remaining_kton -= p.kton_value;
let _ = T::KtonCurrency::unreserve(&p.proposer, p.kton_bond);
imbalance_kton.subsume(T::KtonCurrency::deposit_creating(&p.beneficiary, p.kton_value));
} else {
miss_any_kton = true;
hackfisher marked this conversation as resolved.
Show resolved Hide resolved
}

<Proposals<T>>::remove(index);
Expand Down