From 61782a70baa50fef4170cb985a1248dbbc2a8b48 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Tue, 21 Jun 2016 14:16:23 -0700 Subject: [PATCH] fix input and output json. --- lib/bcoin/http/server.js | 3 +++ lib/bcoin/input.js | 2 +- lib/bcoin/output.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bcoin/http/server.js b/lib/bcoin/http/server.js index d23eb5b8..c66f34ec 100644 --- a/lib/bcoin/http/server.js +++ b/lib/bcoin/http/server.js @@ -88,6 +88,9 @@ HTTPServer.prototype._init = function _init() { bcoin.debug('Params:'); bcoin.debug(params); + if (params.subtractFee) + options.subtractFee = params.subtractFee; + if (params.id) { assert(params.id !== '!all'); options.id = params.id; diff --git a/lib/bcoin/input.js b/lib/bcoin/input.js index e25bf7a7..41f7b70c 100644 --- a/lib/bcoin/input.js +++ b/lib/bcoin/input.js @@ -478,7 +478,7 @@ Input.prototype.toJSON = function toJSON() { script: this.script.toJSON(), witness: this.witness.toJSON(), sequence: this.sequence, - address: this.getAddress() + address: this.getAddress().toBase58() }; }; diff --git a/lib/bcoin/output.js b/lib/bcoin/output.js index 2564db10..8fa240fd 100644 --- a/lib/bcoin/output.js +++ b/lib/bcoin/output.js @@ -167,7 +167,7 @@ Output.prototype.toJSON = function toJSON() { return { value: utils.btc(this.value), script: this.script.toJSON(), - address: this.getAddress() + address: this.getAddress().toBase58() }; };