From 0f684277785deac6204c7be93a9273060f21f79f Mon Sep 17 00:00:00 2001 From: Daniel McNally Date: Thu, 28 Sep 2017 22:47:50 -0400 Subject: [PATCH] Adding 'confirmations' property to TX getJSON Adds a 'confirmations' property to the JSON returned by cli tx [hash] as well as the REST '/tx/:hash' call by subtracting TX height from chain height --- lib/http/server.js | 6 +++--- lib/primitives/txmeta.js | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/http/server.js b/lib/http/server.js index e6b558a5..f2ff9332 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); diff --git a/lib/primitives/txmeta.js b/lib/primitives/txmeta.js index ec6e7f7f..6685e222 100644 --- a/lib/primitives/txmeta.js +++ b/lib/primitives/txmeta.js @@ -151,12 +151,14 @@ 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 (chainheight) + json.confirmations = chainheight - this.height; return json; };