From b76c39403c8a590815ab3b8702d55ae117696da8 Mon Sep 17 00:00:00 2001 From: Sky Young Date: Tue, 10 Sep 2019 08:37:57 -0600 Subject: [PATCH 1/2] Grab `floData` from the correct variable --- lib/transactions.js | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/transactions.js b/lib/transactions.js index 39c423b..fa2541e 100644 --- a/lib/transactions.js +++ b/lib/transactions.js @@ -77,7 +77,7 @@ TxController.prototype.transformTransaction = function(transaction, options, cal txid: transaction.txid(), version: transaction.version, locktime: transaction.locktime, - floData: transaction.strFloData + floData: transaction.floData.toString() }; if(transaction.inputs[0].isCoinbase()) { diff --git a/package.json b/package.json index d2aec0a..9e1d88a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "flosight-api", "description": "A Florincoin blockchain REST and web socket API service for Flocore Node.", - "version": "5.0.0-beta.74", + "version": "5.0.0-beta.75", "repository": "git://github.com/bitpay/flosight-api.git", "bugs": { "url": "https://github.com/bitpay/flosight-api/issues" @@ -30,7 +30,7 @@ "dependencies": { "JSONStream": "^1.3.1", "async": "*", - "fcoin": "^1.1.0", + "fcoin": "^1.1.1", "flocore-lib": "^0.15.2", "flocore-message": "^1.0.7", "body-parser": "^1.13.3", From cf328364401b795e271c1fa940729f197071284e Mon Sep 17 00:00:00 2001 From: Sky Young Date: Tue, 10 Sep 2019 08:41:36 -0600 Subject: [PATCH 2/2] Fix other locations that used strFloData --- lib/blocks.js | 8 ++++---- lib/transactions.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/blocks.js b/lib/blocks.js index 05a0d91..f39b2b1 100644 --- a/lib/blocks.js +++ b/lib/blocks.js @@ -371,13 +371,13 @@ BlockController.prototype.getPoolInfo = function(tx) { if (!tx) { return {}; } - var strFloData = ""; + var floData = ""; - if (tx.strFloData) - strFloData = tx.strFloData; + if (tx.floData) + floData = tx.floData.toString() for(var k in this.poolStrings) { - if (strFloData.includes(k)) { + if (floData.includes(k)) { return this.poolStrings[k]; } } diff --git a/lib/transactions.js b/lib/transactions.js index fa2541e..0cb5ae8 100644 --- a/lib/transactions.js +++ b/lib/transactions.js @@ -211,7 +211,7 @@ TxController.prototype.transformInvTransaction = function(transaction) { valueOut: valueOut / 1e8, vout: vout, isRBF: isRBF, - floData: transaction.strFloData + floData: transaction.floData.toString() }; return transformed;