From f539398fb0c273fe9b3c02c5b3151781654e762d Mon Sep 17 00:00:00 2001 From: Snipa22 Date: Tue, 7 Nov 2017 11:37:02 -0800 Subject: [PATCH 1/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb39ed9..55a51f2 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "jsonwebtoken": "^7.2.1", "minimist": "1.2.0", "moment": "2.17.1", - "mysql": "2.12.0", + "mysql": "^2.12.0", "node-lmdb": "0.4.12", "promise-mysql": "3.0.0", "protocol-buffers": "^3.2.1", From b9669b8f18d2fe339bd5b84a1301d439af30d9fc Mon Sep 17 00:00:00 2001 From: Snipa22 Date: Tue, 7 Nov 2017 11:40:18 -0800 Subject: [PATCH 2/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55a51f2..76368b3 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "jsonwebtoken": "^7.2.1", "minimist": "1.2.0", "moment": "2.17.1", - "mysql": "^2.12.0", + "mysql": "2.15.0", "node-lmdb": "0.4.12", "promise-mysql": "3.0.0", "protocol-buffers": "^3.2.1", From b48bd95c8bb624b963a8d3ca9cbc2e5ee52b0bdb Mon Sep 17 00:00:00 2001 From: MineMoneroPRO Date: Fri, 10 Nov 2017 00:18:47 +0300 Subject: [PATCH 3/4] Update local_comms.js fix for #145 --- lib/local_comms.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/local_comms.js b/lib/local_comms.js index 5955893..4d0b213 100644 --- a/lib/local_comms.js +++ b/lib/local_comms.js @@ -581,12 +581,16 @@ function Database(){ let oldestLockedBlock = this.getOldestLockedBlock(); async.waterfall([ function(callback){ - global.coinFuncs.getBlockHeaderByHash(oldestLockedBlock.hash, (err, result) => { - oldestLockedBlock.height = result.height; - console.log(`Got the oldest block`); - callback(null, oldestLockedBlock); - }); - }, + if (oldestLockedBlock === null) { + callback(null, oldestLockedBlock) + } else { + global.coinFuncs.getBlockHeaderByHash(oldestLockedBlock.hash, (err, result) => { + oldestLockedBlock.height = result.height; + console.log(Got the oldest block); + callback(null, oldestLockedBlock); + }); + } + }, function(oldestLockedBlock, callback){ global.coinFuncs.getLastBlockHeader(function(err, body){ if (oldestLockedBlock === null){ @@ -691,4 +695,4 @@ function Database(){ }, 900000); // Set DB env reload for every 15 minutes. } -module.exports = Database; \ No newline at end of file +module.exports = Database; From 77786e73dcbfcd159a1a6642e11322b226fda836 Mon Sep 17 00:00:00 2001 From: MineMoneroPRO Date: Fri, 10 Nov 2017 00:47:26 +0300 Subject: [PATCH 4/4] Update local_comms.js --- lib/local_comms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/local_comms.js b/lib/local_comms.js index 4d0b213..72d24d3 100644 --- a/lib/local_comms.js +++ b/lib/local_comms.js @@ -586,7 +586,7 @@ function Database(){ } else { global.coinFuncs.getBlockHeaderByHash(oldestLockedBlock.hash, (err, result) => { oldestLockedBlock.height = result.height; - console.log(Got the oldest block); + console.log(`Got the oldest block`); callback(null, oldestLockedBlock); }); }