zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

unconfirmed balance shouldn't include confirmed balance

This commit is contained in:
Patrick Nagurny 2015-10-21 17:45:06 -04:00
parent aa4569e8f3
commit 9bdd9e7995
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/regtest-node.js
View File

@ -307,7 +307,7 @@ describe('Node Functionality', function() {
results.totalReceived.should.equal(1000000000);
results.totalSpent.should.equal(0);
results.balance.should.equal(1000000000);
results.unconfirmedBalance.should.equal(1000000000);
results.unconfirmedBalance.should.equal(0);
results.appearances.should.equal(1);
results.unconfirmedAppearances.should.equal(0);
results.txids.length.should.equal(1);
@ -580,7 +580,7 @@ describe('Node Functionality', function() {
results.totalReceived.should.equal(2000000000);
results.totalSpent.should.equal(1999990000);
results.balance.should.equal(10000);
results.unconfirmedBalance.should.equal(10000);
results.unconfirmedBalance.should.equal(0);
results.appearances.should.equal(6);
results.unconfirmedAppearances.should.equal(0);
results.txids.length.should.equal(6);

6
lib/services/address/index.js
View File

@ -1199,20 +1199,22 @@ AddressService.prototype.getAddressSummary = function(address, options, callback
var spentMempool = self.mempoolSpentIndex[spentIndexKey];
txids.push(outputs[i]);
unconfirmedBalance += outputs[i].satoshis;
if(outputs[i].confirmations) {
totalReceived += outputs[i].satoshis;
balance += outputs[i].satoshis;
appearanceIds[outputs[i].txid] = true;
} else {
unconfirmedBalance += outputs[i].satoshis;
unconfirmedAppearanceIds[outputs[i].txid] = true;
}
if(spentDB || spentMempool) {
unconfirmedBalance -= outputs[i].satoshis;
if(spentDB) {
totalSpent += outputs[i].satoshis;
balance -= outputs[i].satoshis;
} else if(!outputs[i].confirmations) {
unconfirmedBalance -= outputs[i].satoshis;
}
}
}