From a9a5f7c4ad9beb092d2f551c5bebea47960c40a9 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 13 Nov 2014 15:50:27 -0800 Subject: [PATCH] do not convert wallet txs for now. --- lib/bitcoind.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/bitcoind.js b/lib/bitcoind.js index 9836fb1d..d7b446ba 100644 --- a/lib/bitcoind.js +++ b/lib/bitcoind.js @@ -812,9 +812,11 @@ Wallet.prototype.getUnconfirmedBalance = function(options) { // Convert to regular TX Wallet.prototype.listTransactions = Wallet.prototype.getTransactions = function(options) { - return bitcoindjs.walletListTransactions(options || {}).map(function(tx) { - return Transaction.fromHex(tx.hex); - }); + var txs = bitcoindjs.walletListTransactions(options || {}); + // return txs.map(function(tx) { + // return Transaction.fromHex(tx.hex); + // }); + return txs; }; Wallet.prototype.listReceivedByAddress = @@ -831,7 +833,8 @@ Wallet.prototype.getAccounts = function(options) { // Convert to regular TX Wallet.prototype.getTransaction = function(options) { var tx = bitcoindjs.walletGetTransaction(options || {}); - return tx ? Transaction.fromHex(tx.hex) : tx; + // return tx ? Transaction.fromHex(tx.hex) : tx; + return tx; }; Wallet.prototype.backup = function(options) {