From 173e133bf401df814c29021444a5cd0f938c8f05 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 11 Feb 2016 01:43:32 -0800 Subject: [PATCH] minor keypair fix. --- lib/bcoin/keypair.js | 4 ++-- lib/bcoin/wallet.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bcoin/keypair.js b/lib/bcoin/keypair.js index 461a6c69..8308f133 100644 --- a/lib/bcoin/keypair.js +++ b/lib/bcoin/keypair.js @@ -37,8 +37,8 @@ function KeyPair(options) { if (options.pub) options.publicKey = options.pub; - if (options.key instanceof KeyPair) - return options.key; + if (options.pair instanceof KeyPair) + return options.pair; this.options = options; this.pair = null; diff --git a/lib/bcoin/wallet.js b/lib/bcoin/wallet.js index 9b506223..07c356fa 100644 --- a/lib/bcoin/wallet.js +++ b/lib/bcoin/wallet.js @@ -796,7 +796,7 @@ Wallet.prototype.toJSON = function toJSON(encrypt) { keys: this.keys.map(function(key) { return key.xpubkey; }), - balance: utils.toBTC(this.getBalance()), + balance: utils.btc(this.getBalance()), tx: this.tx.toJSON() }; };