RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

txdb: fix coin incrementation.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-10-20 20:23:01 -07:00
parent 8e1b2ea8e9
commit 96e6cee67d
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/wallet/txdb.js
View File

@ -779,7 +779,6 @@ TXDB.prototype.resolveInput = co(function* resolveInput(tx, index, path) {
if (stx.height === -1) { if (stx.height === -1) {
credit.spent = true; credit.spent = true;
this.saveCredit(credit, path); this.saveCredit(credit, path);
this.pending.coin++;
if (tx.height !== -1) if (tx.height !== -1)
this.pending.confirmed += credit.coin.value; this.pending.confirmed += credit.coin.value;
} }
@ -991,6 +990,7 @@ TXDB.prototype.insert = co(function* insert(tx) {
// be updated as it reflects the on-chain // be updated as it reflects the on-chain
// balance _and_ mempool balance assuming // balance _and_ mempool balance assuming
// everything in the mempool were to confirm. // everything in the mempool were to confirm.
this.pending.coin--;
this.pending.unconfirmed -= coin.value; this.pending.unconfirmed -= coin.value;
if (tx.height === -1) { if (tx.height === -1) {
@ -1010,7 +1010,6 @@ TXDB.prototype.insert = co(function* insert(tx) {
// coin will be indexed as an undo // coin will be indexed as an undo
// coin so it can be reconnected // coin so it can be reconnected
// later during a reorg. // later during a reorg.
this.pending.coin--;
this.pending.confirmed -= coin.value; this.pending.confirmed -= coin.value;
this.removeCredit(credit, path); this.removeCredit(credit, path);
} }
@ -1129,6 +1128,7 @@ TXDB.prototype.confirm = co(function* confirm(tx) {
// first place. // first place.
this.spendCredit(credit, tx, i); this.spendCredit(credit, tx, i);
this.pending.coin--;
this.pending.unconfirmed -= credit.coin.value; this.pending.unconfirmed -= credit.coin.value;
} }
@ -1144,7 +1144,6 @@ TXDB.prototype.confirm = co(function* confirm(tx) {
// We can now safely remove the credit // We can now safely remove the credit
// entirely, now that we know it's also // entirely, now that we know it's also
// been removed on-chain. // been removed on-chain.
this.pending.coin--;
this.pending.confirmed -= coin.value; this.pending.confirmed -= coin.value;
this.removeCredit(credit, path); this.removeCredit(credit, path);
@ -1176,7 +1175,6 @@ TXDB.prototype.confirm = co(function* confirm(tx) {
coin = credit.coin; coin = credit.coin;
coin.height = tx.height; coin.height = tx.height;
this.pending.coin++;
this.pending.confirmed += output.value; this.pending.confirmed += output.value;
this.saveCredit(credit, path); this.saveCredit(credit, path);
@ -1264,12 +1262,11 @@ TXDB.prototype.erase = co(function* erase(tx) {
// Recalculate the balance, remove // Recalculate the balance, remove
// from stxo set, remove the undo // from stxo set, remove the undo
// coin, and resave the credit. // coin, and resave the credit.
this.pending.coin++;
this.pending.unconfirmed += coin.value; this.pending.unconfirmed += coin.value;
if (tx.height !== -1) { if (tx.height !== -1)
this.pending.coin++;
this.pending.confirmed += coin.value; this.pending.confirmed += coin.value;
}
this.unspendCredit(tx, i); this.unspendCredit(tx, i);
this.saveCredit(credit, path); this.saveCredit(credit, path);
@ -1449,7 +1446,6 @@ TXDB.prototype.disconnect = co(function* disconnect(tx) {
details.setInput(i, path, coin); details.setInput(i, path, coin);
this.pending.coin++;
this.pending.confirmed += coin.value; this.pending.confirmed += coin.value;
// Resave the credit and mark it // Resave the credit and mark it
@ -1486,7 +1482,6 @@ TXDB.prototype.disconnect = co(function* disconnect(tx) {
coin = credit.coin; coin = credit.coin;
coin.height = -1; coin.height = -1;
this.pending.coin++;
this.pending.confirmed -= output.value; this.pending.confirmed -= output.value;
this.saveCredit(credit, path); this.saveCredit(credit, path);