RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #341 from pnagurny/bug/unconfirmed-balance

Browse Source 
unconfirmed balance shouldn't include confirmed balance
This commit is contained in:
Chris Kleeschulte 2015-10-21 18:29:28 -04:00
commit 6151735e2e
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.totalReceived.should.equal(1000000000);
results.totalSpent.should.equal(0); results.totalSpent.should.equal(0);
results.balance.should.equal(1000000000); results.balance.should.equal(1000000000);
results.unconfirmedBalance.should.equal(1000000000); results.unconfirmedBalance.should.equal(0);
results.appearances.should.equal(1); results.appearances.should.equal(1);
results.unconfirmedAppearances.should.equal(0); results.unconfirmedAppearances.should.equal(0);
results.txids.length.should.equal(1); results.txids.length.should.equal(1);
@ -580,7 +580,7 @@ describe('Node Functionality', function() {
results.totalReceived.should.equal(2000000000); results.totalReceived.should.equal(2000000000);
results.totalSpent.should.equal(1999990000); results.totalSpent.should.equal(1999990000);
results.balance.should.equal(10000); results.balance.should.equal(10000);
results.unconfirmedBalance.should.equal(10000); results.unconfirmedBalance.should.equal(0);
results.appearances.should.equal(6); results.appearances.should.equal(6);
results.unconfirmedAppearances.should.equal(0); results.unconfirmedAppearances.should.equal(0);
results.txids.length.should.equal(6); 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]; var spentMempool = self.mempoolSpentIndex[spentIndexKey];
txids.push(outputs[i]); txids.push(outputs[i]);
unconfirmedBalance += outputs[i].satoshis;
if(outputs[i].confirmations) { if(outputs[i].confirmations) {
totalReceived += outputs[i].satoshis; totalReceived += outputs[i].satoshis;
balance += outputs[i].satoshis; balance += outputs[i].satoshis;
appearanceIds[outputs[i].txid] = true; appearanceIds[outputs[i].txid] = true;
} else { } else {
unconfirmedBalance += outputs[i].satoshis;
unconfirmedAppearanceIds[outputs[i].txid] = true; unconfirmedAppearanceIds[outputs[i].txid] = true;
} }
if(spentDB || spentMempool) { if(spentDB || spentMempool) {
unconfirmedBalance -= outputs[i].satoshis;
if(spentDB) { if(spentDB) {
totalSpent += outputs[i].satoshis; totalSpent += outputs[i].satoshis;
balance -= outputs[i].satoshis; balance -= outputs[i].satoshis;
} else if(!outputs[i].confirmations) {
unconfirmedBalance -= outputs[i].satoshis;
} }
} }
} }