github-jwinterm/nodejs-pool
1
0
Fork 0
mirror of https://github.com/jwinterm/nodejs-pool.git synced 2026-10-17 05:21:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Alexander Blair
2017-11-13 10:45:29 -08:00
parent 7d9bc7d606 01ef225985
commit 204a83f7c1
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/local_comms.js
+11 -7
View File
@@ -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;
module.exports = Database;
package.json
+1 -1
View File
@@ -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",