From 24ca0d9fc26536ca36833a36809a48abaa391f2a Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 11 Aug 2016 02:40:24 -0700 Subject: [PATCH] rpc: tx json again... --- lib/bcoin/http/rpc.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/bcoin/http/rpc.js b/lib/bcoin/http/rpc.js index f1f0670b..2b9adb09 100644 --- a/lib/bcoin/http/rpc.js +++ b/lib/bcoin/http/rpc.js @@ -3234,8 +3234,8 @@ RPC.prototype.listsinceblock = function listsinceblock(args, callback) { RPC.prototype._toListTX = function _toListTX(tx, callback) { var self = this; - var i, receive, member, det, sent, received; - var sendMember, recMember, json; + var i, receive, member, det, sent, received, index; + var sendMember, recMember, sendIndex, recIndex, json; this.walletdb.tx.toDetails(this.wallet.id, tx, function(err, details) { if (err) @@ -3265,29 +3265,35 @@ RPC.prototype._toListTX = function _toListTX(tx, callback) { continue; received += member.value; recMember = member; + recIndex = i; continue; } sent += member.value; sendMember = member; + sendIndex = i; } member = receive ? recMember : sendMember; + index = receive ? recIndex : sendIndex; // In the odd case where we send to ourselves. if (!member) { assert(!receive); member = recMember; + index = recIndex; sent = received; } json = { - account: member.path.name, - address: member.address.toBase58(self.network), + account: member.path ? member.path.name : '', + address: member.address + ? member.address.toBase58(self.network) + : null, category: receive ? 'receive' : 'send', amount: +utils.btc(receive ? received : -sent), - label: member.path.name, - vout: 0, + label: member.path ? member.path.name : undefined, + vout: index, confirmations: details.confirmations, blockhash: details.block ? utils.revHex(details.block) : null, blockindex: details.index,