diff --git a/lib/http/server.js b/lib/http/server.js index e6b558a5..374ee2e5 100644 --- a/lib/http/server.js +++ b/lib/http/server.js @@ -210,7 +210,7 @@ HTTPServer.prototype.initRouter = function initRouter() { const view = await this.node.getMetaView(meta); - res.send(200, meta.getJSON(this.network, view)); + res.send(200, meta.getJSON(this.network, view, this.chain.height)); }); // TX by address @@ -226,7 +226,7 @@ HTTPServer.prototype.initRouter = function initRouter() { for (const meta of metas) { const view = await this.node.getMetaView(meta); - result.push(meta.getJSON(this.network, view)); + result.push(meta.getJSON(this.network, view, this.chain.height)); } res.send(200, result); @@ -245,7 +245,7 @@ HTTPServer.prototype.initRouter = function initRouter() { for (const meta of metas) { const view = await this.node.getMetaView(meta); - result.push(meta.getJSON(this.network, view)); + result.push(meta.getJSON(this.network, view, this.chain.height)); } res.send(200, result); @@ -279,8 +279,8 @@ HTTPServer.prototype.initRouter = function initRouter() { } const height = await this.chain.getHeight(hash); - - res.send(200, block.getJSON(this.network, view, height)); + + res.send(200, block.getJSON(this.network, view, height, confirmations)); }); // Mempool snapshot diff --git a/lib/primitives/block.js b/lib/primitives/block.js index ae9c8918..9be79213 100644 --- a/lib/primitives/block.js +++ b/lib/primitives/block.js @@ -575,11 +575,12 @@ Block.prototype.toJSON = function toJSON() { * @returns {Object} */ -Block.prototype.getJSON = function getJSON(network, view, height) { +Block.prototype.getJSON = function getJSON(network, view, height, confirmations) { network = Network.get(network); return { hash: this.rhash(), height: height, + confirmations: confirmations, version: this.version, prevBlock: util.revHex(this.prevBlock), merkleRoot: util.revHex(this.merkleRoot), diff --git a/lib/primitives/txmeta.js b/lib/primitives/txmeta.js index ec6e7f7f..9f9e92dc 100644 --- a/lib/primitives/txmeta.js +++ b/lib/primitives/txmeta.js @@ -151,12 +151,16 @@ TXMeta.prototype.toJSON = function toJSON() { * @returns {Object} */ -TXMeta.prototype.getJSON = function getJSON(network, view) { +TXMeta.prototype.getJSON = function getJSON(network, view, chainheight) { const json = this.tx.getJSON(network, view, null, this.index); json.mtime = this.mtime; json.height = this.height; json.block = this.block ? util.revHex(this.block) : null; json.time = this.time; + if (this.block === null) + json.confirmations = 0; + else + json.confirmations = chainheight - this.height + 1; return json; };