gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move spending endpoints into expressions

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-03-10 17:11:12 -07:00
parent 7a0bc7d888
commit 8c40d1bd72
3 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/accountant.rs
View File

@@ -109,12 +109,13 @@ impl Accountant {
/// Commit funds to the 'to' party.
fn complete_transaction(self: &mut Self, tr: &Transaction<i64>) {
if self.balances.contains_key(&tr.plan.to) {
if let Some(x) = self.balances.get_mut(&tr.plan.to) {
let to = tr.plan.to();
if self.balances.contains_key(&to) {
if let Some(x) = self.balances.get_mut(&to) {
*x += tr.asset;
}
} else {
self.balances.insert(tr.plan.to, tr.asset);
self.balances.insert(to, tr.asset);
}
}
@@ -149,17 +150,17 @@ impl Accountant {
return Err(AccountingError::InvalidTransferSignature);
}
if !tr.plan.unless_any.is_empty() {
if !tr.plan.unless_any.0.is_empty() {
// TODO: Check to see if the transaction is expired.
}
if !Self::is_deposit(allow_deposits, &tr.from, &tr.plan.to) {
if !Self::is_deposit(allow_deposits, &tr.from, &tr.plan.to()) {
if let Some(x) = self.balances.get_mut(&tr.from) {
*x -= tr.asset;
}
}
if !self.all_satisfied(&tr.plan.if_all) {
if !self.all_satisfied(&tr.plan.if_all.0) {
self.pending.insert(tr.sig, tr.clone());
return Ok(());
}
@@ -175,7 +176,7 @@ impl Accountant {
// if Signature(from) is in unless_any, return funds to tx.from, and remove the tx from this map.
// TODO: Use find().
for cond in &tr.plan.unless_any {
for cond in &tr.plan.unless_any.0 {
if let Condition::Signature(pubkey) = *cond {
if from == pubkey {
cancel = true;
@@ -220,17 +221,17 @@ impl Accountant {
// Check to see if any timelocked transactions can be completed.
let mut completed = vec![];
for (key, tr) in &self.pending {
for cond in &tr.plan.if_all {
for cond in &tr.plan.if_all.0 {
if let Condition::Timestamp(dt) = *cond {
if self.last_time >= dt {
if tr.plan.if_all.len() == 1 {
if tr.plan.if_all.0.len() == 1 {
completed.push(*key);
}
}
}
}
// TODO: Add this in once we start removing constraints
//if tr.plan.if_all.is_empty() {
//if tr.plan.if_all.0.is_empty() {
// // TODO: Remove tr from pending
// self.complete_transaction(tr);
//}