From 2a5814585b3070bf6d22366c5b9cd9ae92da0196 Mon Sep 17 00:00:00 2001 From: gaeacodes Date: Mon, 8 Feb 2021 16:08:09 +0530 Subject: [PATCH 1/5] let -> var --- lib/services/bitcoind.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js index 65e18dea..c720a100 100644 --- a/lib/services/bitcoind.js +++ b/lib/services/bitcoind.js @@ -2164,7 +2164,7 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { }); } else { self._tryAllClients(function (client, done) { - let transactionData = {}; + var transactionData = {}; async.series( [ function (callback) { @@ -2241,7 +2241,7 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { var txid = transactionData.txid; var vins = tx.inputs; var functionsArray = []; - for (let index = 0; index < vins.length; index++) { + for (var index = 0; index < vins.length; index++) { functionsArray.push(function (callback) { var prevTxId = vins[index].prevTxId || null; var rewards = 0; @@ -2280,7 +2280,7 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { var totalReward = 0; //res.forEach((reward) => (totalReward = reward + totalReward)); - for (let index = 0; index < res.length; index++) { + for (var index = 0; index < res.length; index++) { tx.inputs[index].rewardClaimed = res[index].rewards ? res[index].rewards * 1e-8 : 0; From b4ae39d59edc21bd9637aed41da84cd7ce65314a Mon Sep 17 00:00:00 2001 From: gaeacodes Date: Tue, 9 Feb 2021 12:19:39 +0530 Subject: [PATCH 2/5] returns txid for address summary --- lib/services/bitcoind.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js index c720a100..9088cb4e 100644 --- a/lib/services/bitcoind.js +++ b/lib/services/bitcoind.js @@ -1721,6 +1721,10 @@ Bitcoin.prototype.getAddressSummary = function (addressArg, options, callback) { if (err) { return callback(err); } + var availableTxids = mempoolTxids.reverse().concat(summaryTxids); + summary.txidOverflow = + availableTxids.length > self.maxTxids ? true : false; + summary.availableTxids = !summary.txidOverflow ? availableTxids : []; self.summaryCache.set(cacheKey, summary); finishWithTxids(); } From 3a7dbc8e449851fb29379b08bcf2c121cfa8abc6 Mon Sep 17 00:00:00 2001 From: gaeacodes Date: Tue, 9 Feb 2021 12:52:23 +0530 Subject: [PATCH 3/5] cleanup --- lib/services/bitcoind.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js index 9088cb4e..0e53b79c 100644 --- a/lib/services/bitcoind.js +++ b/lib/services/bitcoind.js @@ -2245,9 +2245,9 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { var txid = transactionData.txid; var vins = tx.inputs; var functionsArray = []; - for (var index = 0; index < vins.length; index++) { + for (var i = 0; i < vins.length; i++) { functionsArray.push(function (callback) { - var prevTxId = vins[index].prevTxId || null; + var prevTxId = vins[i].prevTxId || null; var rewards = 0; if (prevTxId) { client.getRawTransaction( @@ -2262,7 +2262,7 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { tiptime: tx.blockTimestamp || self.tipTime, locktime: result.locktime, height: result.height ? result.height : 1000001, //To satisfy getKomodoRewards constraints on unconfirmed transactions - satoshis: vins[index].satoshis, + satoshis: vins[i].satoshis, }; rewards = getKomodoRewards(rewardData); callback(null, { @@ -2284,25 +2284,24 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { var totalReward = 0; //res.forEach((reward) => (totalReward = reward + totalReward)); - for (var index = 0; index < res.length; index++) { - tx.inputs[index].rewardClaimed = res[index].rewards - ? res[index].rewards * 1e-8 + for (var i = 0; i < res.length; i++) { + tx.inputs[i].rewardClaimed = res[i].rewards + ? res[i].rewards * 1e-8 : 0; - var actualTimeRewardAccrued = res[index].prevTxnLocktime - ? (tx.blockTimestamp || self.tipTime) - - res[index].prevTxnLocktime + var actualTimeRewardAccrued = res[i].prevTxnLocktime + ? (tx.blockTimestamp || self.tipTime) - res[i].prevTxnLocktime : null; if (actualTimeRewardAccrued) { - tx.inputs[index].timeRewardAccrued = + tx.inputs[i].timeRewardAccrued = actualTimeRewardAccrued < 31 * 24 * 60 * 60 ? actualTimeRewardAccrued : 31 * 24 * 60 * 60; } else { - tx.inputs[index].timeRewardAccrued = null; + tx.inputs[i].timeRewardAccrued = null; } - totalReward = tx.inputs[index].rewardClaimed + totalReward; + totalReward = tx.inputs[i].rewardClaimed + totalReward; } tx.rewardClaimed = totalReward; tx.feeSatoshis = From b50e480653c2ce8d2c274351f5e1e66ed7c7d6ea Mon Sep 17 00:00:00 2001 From: gaeacodes Date: Tue, 9 Feb 2021 14:54:43 +0530 Subject: [PATCH 4/5] var -> let --- lib/services/bitcoind.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js index 0e53b79c..eefb6fba 100644 --- a/lib/services/bitcoind.js +++ b/lib/services/bitcoind.js @@ -2168,7 +2168,7 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { }); } else { self._tryAllClients(function (client, done) { - var transactionData = {}; + let transactionData = {}; async.series( [ function (callback) { @@ -2245,7 +2245,7 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { var txid = transactionData.txid; var vins = tx.inputs; var functionsArray = []; - for (var i = 0; i < vins.length; i++) { + for (let i = 0; i < vins.length; i++) { functionsArray.push(function (callback) { var prevTxId = vins[i].prevTxId || null; var rewards = 0; @@ -2284,7 +2284,7 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { var totalReward = 0; //res.forEach((reward) => (totalReward = reward + totalReward)); - for (var i = 0; i < res.length; i++) { + for (let i = 0; i < res.length; i++) { tx.inputs[i].rewardClaimed = res[i].rewards ? res[i].rewards * 1e-8 : 0; From 47933d14b278389431e38329cfd2b41f278acca9 Mon Sep 17 00:00:00 2001 From: gaeacodes Date: Wed, 10 Feb 2021 13:31:47 +0530 Subject: [PATCH 5/5] cleanup --- lib/services/bitcoind.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js index eefb6fba..a48afd12 100644 --- a/lib/services/bitcoind.js +++ b/lib/services/bitcoind.js @@ -2283,7 +2283,6 @@ Bitcoin.prototype.getDetailedTransaction = function (txid, callback) { async.series(functionsArray, function (err, res) { var totalReward = 0; - //res.forEach((reward) => (totalReward = reward + totalReward)); for (let i = 0; i < res.length; i++) { tx.inputs[i].rewardClaimed = res[i].rewards ? res[i].rewards * 1e-8