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

rpc: tx json again...

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-08-11 02:40:24 -07:00
parent 532e46b2d1
commit 24ca0d9fc2
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/bcoin/http/rpc.js
View File

@ -3234,8 +3234,8 @@ RPC.prototype.listsinceblock = function listsinceblock(args, callback) {
RPC.prototype._toListTX = function _toListTX(tx, callback) { RPC.prototype._toListTX = function _toListTX(tx, callback) {
var self = this; var self = this;
var i, receive, member, det, sent, received; var i, receive, member, det, sent, received, index;
var sendMember, recMember, json; var sendMember, recMember, sendIndex, recIndex, json;
this.walletdb.tx.toDetails(this.wallet.id, tx, function(err, details) { this.walletdb.tx.toDetails(this.wallet.id, tx, function(err, details) {
if (err) if (err)
@ -3265,29 +3265,35 @@ RPC.prototype._toListTX = function _toListTX(tx, callback) {
continue; continue;
received += member.value; received += member.value;
recMember = member; recMember = member;
recIndex = i;
continue; continue;
} }
sent += member.value; sent += member.value;
sendMember = member; sendMember = member;
sendIndex = i;
} }
member = receive ? recMember : sendMember; member = receive ? recMember : sendMember;
index = receive ? recIndex : sendIndex;
// In the odd case where we send to ourselves. // In the odd case where we send to ourselves.
if (!member) { if (!member) {
assert(!receive); assert(!receive);
member = recMember; member = recMember;
index = recIndex;
sent = received; sent = received;
} }
json = { json = {
account: member.path.name, account: member.path ? member.path.name : '',
address: member.address.toBase58(self.network), address: member.address
? member.address.toBase58(self.network)
: null,
category: receive ? 'receive' : 'send', category: receive ? 'receive' : 'send',
amount: +utils.btc(receive ? received : -sent), amount: +utils.btc(receive ? received : -sent),
label: member.path.name, label: member.path ? member.path.name : undefined,
vout: 0, vout: index,
confirmations: details.confirmations, confirmations: details.confirmations,
blockhash: details.block ? utils.revHex(details.block) : null, blockhash: details.block ? utils.revHex(details.block) : null,
blockindex: details.index, blockindex: details.index,