Bug fix

- Fixed: mempool (unconfirmed tx) getting repeated in chain query when using before option

.gitignore

@@ -21,6 +21,8 @@ coverage/*
 **/*.config
 **/*.creator
 *.log
+*.tmp
+*.tmp.*
 .DS_Store
 bin/florincoin*
 bin/SHA256SUMS.asc
@@ -31,3 +33,4 @@ flocore-node.json*
 *.bak
 *.orig
 lib/services/insight-api
+testnet/*

addresses.txt

@@ -1 +0,0 @@
-mtLDA41NWe9rLm7nuMvAnTs2SbP49cz1ZR

lib/cli/flocore.js

@@ -31,6 +31,15 @@ function main(parentServicesPath, additionalServices) {
       node.cli.main(parentServicesPath, additionalServices);
     }
 
+    // Gracefully Shut Down
+    process.on('SIGTERM', function () {
+      console.log("Shutting down flocore-node")
+      node.stop(function() {
+        console.log("flocore-node successfully stopped!")
+        process.exit(0)
+      })
+    })
+
   });
 
 }

lib/node.js

@@ -226,7 +226,7 @@ Node.prototype.stop = function(callback) {
      if (callback) {
        callback();
      }
-  });
+  }); 
 };
 
 module.exports = Node;

lib/scaffold/start.js

@@ -201,23 +201,26 @@ function cleanShutdown(_process, node) {
       return _process.exit(1);
     }
     log.info('Halted');
-    _process.exit(0);
+    process.exit(0);
   });
 }
 
 function exitHandler(options, _process, node, err) {
-  if (err) {
+  // Handle and log errors other than SIGINT shutdown
+  if (err && err !== "SIGINT") {
     log.error('uncaught exception:', err);
     if(err.stack) {
       log.error(err.stack);
     }
-    node.stop(function(err) {
-      if(err) {
-        log.error('Failed to stop services: ' + err);
-      }
-      _process.exit(-1);
-    });
+    if(options.exit)
+      node.stop(function(err) {
+        if(err) {
+          log.error('Failed to stop services: ' + err);
+        }
+        _process.exit(-1);
+      });
   }
+  // Handle SIGINT (Ctrl+C)
   if (options.sigint) {
     if (!shuttingDown) {
       shuttingDown = true;
@@ -227,7 +230,7 @@ function exitHandler(options, _process, node, err) {
 }
 
 function registerExitHandlers(_process, node) {
-  _process.on('uncaughtException', exitHandler.bind(null, {exit:true}, _process, node));
+  _process.on('uncaughtException', exitHandler.bind(null, {exit:false}, _process, node));
   _process.on('SIGINT', exitHandler.bind(null, {sigint:true}, _process, node));
 }
 

lib/services/address/encoding.js

@@ -2,11 +2,13 @@
 
 function Encoding(servicePrefix) {
   this.servicePrefix = servicePrefix;
+  this.addressIndex = new Buffer('00', 'hex');
+  this.utxoIndex = new Buffer('01', 'hex');
+  this.addressCache = new Buffer('fe', 'hex');
 }
 
 Encoding.prototype.encodeAddressIndexKey = function(address, height, txid, index, input, timestamp) {
-  var prefix = new Buffer('00', 'hex');
-  var buffers = [this.servicePrefix, prefix];
+  var buffers = [this.servicePrefix, this.addressIndex];
 
   var addressSizeBuffer = new Buffer(1);
   addressSizeBuffer.writeUInt8(address.length);
@@ -58,8 +60,7 @@ Encoding.prototype.decodeAddressIndexKey = function(buffer) {
 };
 
 Encoding.prototype.encodeUtxoIndexKey = function(address, txid, outputIndex) {
-  var prefix = new Buffer('01', 'hex');
-  var buffers = [this.servicePrefix, prefix];
+  var buffers = [this.servicePrefix, this.utxoIndex];
 
   var addressSizeBuffer = new Buffer(1);
   addressSizeBuffer.writeUInt8(address.length);
@@ -114,5 +115,53 @@ Encoding.prototype.decodeUtxoIndexValue = function(buffer) {
   };
 };
 
+Encoding.prototype.encodeAddressCacheKey = function(address) {
+  return Buffer.concat([this.servicePrefix, this.addressCache, new Buffer(address, 'utf8')]);
+}
+
+Encoding.prototype.decodeAddressCacheKey = function(buffer) {
+  return buffer.slice(3).toString('utf8');
+}
+
+Encoding.prototype.encodeAddressCacheValue = function(lastTx, lastBlock, balance, received, sent, txApperances) {
+  
+  var buffer = [];
+
+  var balanceBuffer = new Buffer(8);
+  balanceBuffer.writeBigUInt64BE(BigInt(balance));
+  buffer.push(balanceBuffer);
+
+  var receivedBuffer = new Buffer(8);
+  receivedBuffer.writeBigUInt64BE(BigInt(received));
+  buffer.push(receivedBuffer);
+
+  var sentBuffer = new Buffer(8);
+  sentBuffer.writeBigUInt64BE(BigInt(sent));
+  buffer.push(sentBuffer);
+
+  var txApperancesBuffer = new Buffer(4);
+  txApperancesBuffer.writeUInt32BE(txApperances);
+  buffer.push(txApperancesBuffer);
+
+  var txidBuffer = new Buffer(lastTx, 'hex');
+  buffer.push(txidBuffer);
+
+  var blkBuffer = new Buffer(lastBlock, 'hex');
+  buffer.push(blkBuffer);
+
+  return Buffer.concat(buffer); 
+}
+
+Encoding.prototype.decodeAddressCacheValue = function(buffer) {
+
+  var balance = parseInt(buffer.readBigUInt64BE(0));
+  var received = parseInt(buffer.readBigUInt64BE(8));
+  var sent = parseInt(buffer.readBigUInt64BE(16));
+  var txApperances = buffer.readUInt32BE(24);
+  var lastTx = buffer.slice(28, 60).toString('hex'); //28 + 32 (tx hash buffer length) = 60
+  var lastBlock = buffer.slice(60).toString('hex');
+  return { lastTx, lastBlock, balance, received, sent, txApperances };
+}
+
 module.exports = Encoding;
 

lib/services/address/index.js

@@ -16,7 +16,9 @@ var utils = require('../../utils');
 var LRU = require('lru-cache');
 var XXHash = require('xxhash');
 
-
+const MAX_TX_QUERY_LIMIT_HISTORY = 1000;
+const MAX_TX_QUERY_LIMIT_UTXO = 1000;
+const MAX_TX_QUERY_LIMIT_SUMMARY = 500;
 
 // See rationale about this cache at function getTxList(next)
 const TXID_LIST_CACHE_ITEMS = 250;              // nr of items (this translates to: consecutive 
@@ -67,8 +69,8 @@ AddressService.dependencies = [
 // then I would pass back [tx1, tx2] in that order
 //
 // Instead of passing addresses, with from>0, options.cacheKey can be used to define the address set.
-//
-AddressService.prototype.getAddressHistory = function(addresses, options, callback) {
+//(old one: non-optimized for large data)
+AddressService.prototype.__getAddressHistory = function(addresses, options, callback) {
   var self = this;
   var cacheUsed = false;
 
@@ -173,8 +175,106 @@ AddressService.prototype.getAddressHistory = function(addresses, options, callba
 
 };
 
+AddressService.prototype.getAddressHistory = function(addresses, options, streamer, callback) {
+  var self = this;
+
+  options = options || {};
+  //options.from = options.from || 0; //Deprecated, use `after` and `before` option
+  //options.to = options.to || 0xffffffff; //Deprecated, use `after` and `before` option
+
+  if(!_.isFunction(callback)){ //if only 3 args, then streamer is callback
+    callback = streamer;
+    streamer = () => null; //NULL fn
+  }
+
+  if (_.isUndefined(options.queryMempool)) {
+    options.queryMempool = true;
+  }
+
+  if (_.isUndefined(options.mempoolOnly)) {
+    options.mempoolOnly = false;
+  }
+
+  if(_.isUndefined(options.reverse)) {
+    options.reverse = false;
+  }
+
+  var old_support = false;
+  //Quick support for `from` and `to` options (DEPRECATED! Not recommeded to use)
+  if(!_.isUndefined(options.from) || !_.isUndefined(options.to)) { 
+    old_support = true;
+    options.from = options.from || 0;
+    options.to = options.to || 0xffffffff; //Max value of to will actually be MAX_TX_QUERY_LIMIT_HISTORY
+  }
+
+  if (_.isString(addresses)) {
+    addresses = [addresses];
+  }
+
+  var results = {
+    totalCount: 0,
+    items: [],
+  }
+
+  async.eachLimit(addresses, 4, function(address, next) {
+
+    var addr_options = Object.assign({}, options), addr_count = 0;
+
+    self._streamAddressSummary(address, addr_options, function(err, tx){
+
+      if(err)
+        return log.error(err);
+
+        addr_count++;
+
+        if(!results.items.some(x => x.txid() === tx.txid())) {//add only if tx not already in array
+          if(!options.reverse)
+            results.items.unshift(tx); //using unshift, so that recent tx (low) are at front
+          else
+            results.items.push(tx);
+        } 
+          
+        
+        if(results.items.length > MAX_TX_QUERY_LIMIT_HISTORY) { //remove items from array when overflown
+          results.items.sort((a, b) => (b.__height || 0xffffffff) - (a.__height || 0xffffffff) || b.txid().localeCompare(a.txid()));
+          let del_count = results.items.length - MAX_TX_QUERY_LIMIT_HISTORY;
+          let start_index = (old_support || options.reverse) ? MAX_TX_QUERY_LIMIT_HISTORY : 0;
+          results.items.splice(start_index, del_count);
+
+          results.incomplete = true;
+
+          if(!old_support && addr_count >= MAX_TX_QUERY_LIMIT_HISTORY)
+            addr_options.flag_stop = true; //limit has reached, stop quering db for more tx
+                
+        }
+      
+      streamer(null, tx);
+
+    }, next);
+
+  }, function(err) {
+
+    if (err) {
+      return callback(err);
+    }
+
+    //sort items in desc block-height, then asc txid (if same height)
+    results.items.sort((a, b) => (b.__height || 0xffffffff) - (a.__height || 0xffffffff) || b.txid().localeCompare(a.txid()));
+    results.totalCount = results.items.length ;
+
+    //Quick support for `from` and `to` options (DEPRECATED! Not recommeded to use)
+    if(old_support) { 
+      results.items = results.items.slice(options.from, options.to);
+    }
+
+    callback(null, results);
+
+  })
+
+}
 // this is basically the same as _getAddressHistory apart from the summary
-AddressService.prototype.getAddressSummary = function(address, options, callback) {
+//(old one: non-optimized for large data)
+AddressService.prototype.__getAddressSummary = function(address, options, callback) {
 
   var self = this;
 
@@ -200,7 +300,7 @@ AddressService.prototype.getAddressSummary = function(address, options, callback
     txApperances: 0,
   };
 
-  self.getAddressHistory(address, options, function(err, results) {
+  self.__getAddressHistory(address, options, function(err, results) { //old fn
 
     if (err) {
       return callback(err);
@@ -218,6 +318,229 @@ AddressService.prototype.getAddressSummary = function(address, options, callback
 
 };
 
+AddressService.prototype.getAddressSummary = function(address, options, streamer, callback) {
+
+  var self = this;
+
+  options = options || {};
+  //options.from = options.from || 0; //Deprecated, use `after` and `before` option
+  //options.to = options.to || 0xffffffff; //Deprecated, use `after` and `before` option
+
+  if (_.isUndefined(options.queryMempool)) {
+    options.queryMempool = true;
+  }
+
+  if(!_.isFunction(callback)){ //if only 3 args, then streamer is callback
+    callback = streamer;
+    streamer = () => null; //NULL fn
+  }
+
+  var count = 0;
+
+  var result = {
+    addrStr: address,
+    balance: 0,
+    balanceSat: 0,
+    totalReceived: 0,
+    totalReceivedSat: 0,
+    totalSent: 0,
+    totalSentSat: 0,
+    unconfirmedBalance: 0,
+    unconfirmedBalanceSat: 0,
+    unconfirmedTxApperances: 0,
+    txApperances: 0,
+  };
+
+  var useCache = _.isUndefined(options.after) && _.isUndefined(options.before);
+  var lastTx, lastBlock;
+
+  self._loadCache(address, result, useCache, function(err, lastCachedTx) {
+    if(err)
+      log.error(err);
+    
+    if(!_.isUndefined(lastCachedTx))
+      options.after = lastCachedTx;
+
+    self._streamAddressSummary(address, options, function(err, tx) {
+
+      if(err)
+          return log.error(err);
+
+      if(tx) {
+        count++;
+        self._aggregateAddressSummaryResult(tx, address, result, options);
+        
+        if(tx.confirmations) {
+          lastTx = tx.txid();
+          lastBlock = tx.blockhash;
+        }
+      }
+
+      if(count >= MAX_TX_QUERY_LIMIT_SUMMARY) {//stop quering db when limit reached
+        options.flag_stop = true;
+        result.incomplete = true;
+      }
+      
+      streamer(null, tx);
+
+    }, function(err) {
+
+      if (err) {
+        return callback(err);
+      }
+
+      result.balanceSat = parseInt(result.balanceSat.toFixed());
+      result.totalReceivedSat = parseInt(result.totalReceivedSat.toFixed());
+      result.totalSentSat = parseInt(result.totalSentSat.toFixed());
+      result.txApperances = parseInt(result.txApperances.toFixed());
+      result.unconfirmedBalanceSat = parseInt(result.unconfirmedBalanceSat.toFixed());
+      result.unconfirmedTxApperances = parseInt(result.unconfirmedTxApperances.toFixed());
+
+      result.balance = Unit.fromSatoshis(result.balanceSat).toBTC();
+      result.totalReceived = Unit.fromSatoshis(result.totalReceivedSat).toBTC();
+      result.totalSent = Unit.fromSatoshis(result.totalSentSat).toBTC();
+      result.unconfirmedBalance = Unit.fromSatoshis(result.unconfirmedBalanceSat).toBTC();
+
+      result.lastItem = lastTx;
+
+      callback(null, result);
+    
+      //store in cache if needed
+      if(useCache) {
+        if(result.incomplete) //full summary needs to be calculated in background
+          self._cacheSummaryInBackground(address, lastTx, lastBlock, result);
+        else if (!_.isUndefined(lastCachedTx) && !_.isUndefined(lastTx) 
+          && lastTx != lastCachedTx && !self._cacheInstance.has(address))  //update cache if needed
+            self._storeCache(address, lastTx, lastBlock, result);
+      }
+
+    });
+
+  })
+
+}
+
+AddressService.prototype._cacheInstance = new Set();
+AddressService.prototype._cacheSummaryInBackground = function(address, lastTx, lastBlock, result){
+  const self = this;
+
+  if(self._cacheInstance.has(address))
+    return;
+
+  self._cacheInstance.add(address);
+
+  const cache = {
+    balanceSat: result.balanceSat,
+    totalReceivedSat: result.totalReceivedSat,
+    totalSentSat: result.totalSentSat,
+    txApperances: result.txApperances,
+    unconfirmedBalanceSat: 0, //unconfirmed (mempool) values should not be cached
+    unconfirmedTxApperances: 0
+  }; 
+  const options = { queryMempool: false, after: lastTx, noTxList: true };
+
+  self._streamAddressSummary(address, options, function(err, tx) {
+
+    if(err)
+      return log.error(err);
+
+    if(tx) {
+      self._aggregateAddressSummaryResult(tx, address, cache, options);
+      if(tx.confirmations){
+        lastTx = tx.txid();
+        lastBlock = tx.blockhash;
+      }
+    }
+
+  }, function(err) {
+
+    if (err) 
+      return log.error(err);
+
+    cache.balanceSat = parseInt(cache.balanceSat.toFixed());
+    cache.totalReceivedSat = parseInt(cache.totalReceivedSat.toFixed());
+    cache.totalSentSat = parseInt(cache.totalSentSat.toFixed());
+    cache.txApperances = parseInt(cache.txApperances.toFixed());
+
+    if(!_.isUndefined(lastTx))
+      self._storeCache(address, lastTx, lastBlock, cache);
+
+    self._cacheInstance.delete(address); //remove from running instance
+
+  });
+  
+}
+
+AddressService.prototype._storeCache = function(address, lastCacheTx, lastCacheBlock, result, callback) {
+  const self = this;
+  var key = self._encoding.encodeAddressCacheKey(address);  
+  var value = self._encoding.encodeAddressCacheValue(lastCacheTx, lastCacheBlock, result.balanceSat, result.totalReceivedSat, result.totalSentSat, result.txApperances)
+  
+  if(!_.isFunction(callback)) //if callback is not passed, call a empty function
+    callback = () => null;
+
+  self._db.put(key, value, callback);
+}
+
+AddressService.prototype._loadCache = function(address, result, useCache, callback) {
+  const self = this;
+
+  if(!useCache) //skip if useCache is false (cases like 'after' and/or 'before' parameter is used by client)
+    return callback();
+
+  var key = self._encoding.encodeAddressCacheKey(address);
+  self._db.get(key, function(err, value) {
+
+    if (err) {
+      return callback(err);
+    }
+    if (!value) {
+      return callback();
+    }
+      
+    var addressCache = self._encoding.decodeAddressCacheValue(value);
+
+    var lastCacheTx = addressCache.lastTx, lastCacheBlock = addressCache.lastBlock
+
+    self._block.getBlock(lastCacheBlock, function(err, block) {
+      
+      if(err) {
+        return callback(err);
+      }
+
+      if (!block) { //block not found, probably removed in reorg.
+        //delete the existing cache and recalc values freshly
+        self._deleteCache(address, function() {
+          callback();
+        });
+
+      } else {
+
+        //values are in satoshis
+        result.balanceSat = addressCache.balance;
+        result.totalReceivedSat = addressCache.received;
+        result.totalSentSat = addressCache.sent;
+        result.txApperances = addressCache.txApperances;
+      
+        callback(null, lastCacheTx);
+      }
+
+    })
+
+  });
+}
+
+AddressService.prototype._deleteCache = function(address, callback) {
+  const self = this;
+  var key = self._encoding.encodeAddressCacheKey(address);
+
+  if(!_.isFunction(callback)) //if callback is not passed, call a empty function
+    callback = () => null;
+
+    self._db.del(key, callback);
+
+}
+
 AddressService.prototype._setOutputResults = function(tx, address, result) {
 
   for(var j = 0; j < tx.outputs.length; j++) {
@@ -265,7 +588,6 @@ AddressService.prototype._getAddressSummaryResult = function(txs, address, resul
   var self = this;
 
   for(var i = 0; i < txs.length; i++) {
-
     var tx = txs[i];
 
     self._setOutputResults(tx, address, result);
@@ -283,6 +605,110 @@ AddressService.prototype._getAddressSummaryResult = function(txs, address, resul
   return result;
 };
 
+AddressService.prototype._getOccurrenceCount = function(tx, address) {
+  let count = 0;
+
+  for(var i = 0; i < tx.inputs.length; i++) {
+
+    var input = tx.inputs[i];
+
+    if(utils.getAddress(input, this._network) === address)
+      count++;
+
+  }
+
+  for(var j = 0; j < tx.outputs.length; j++) {
+
+    var output = tx.outputs[j];
+
+    if(utils.getAddress(output, this._network) === address)
+      count++;
+
+  }
+
+  return count;
+
+}
+
+AddressService.prototype._getOutputResults = function(tx, address) {
+
+  let value = 0;
+
+  for(var j = 0; j < tx.outputs.length; j++) {
+
+    var output = tx.outputs[j];
+
+    if (utils.getAddress(output, this._network) === address) 
+      value += output.value;
+
+  }
+
+  return value;
+
+};
+
+AddressService.prototype._getInputResults = function(tx, address) {
+  
+  let value = 0;
+
+  for(var i = 0; i < tx.inputs.length; i++) {
+
+    var input = tx.inputs[i];
+
+    if (utils.getAddress(input, this._network) === address) 
+      value += tx.__inputValues[i];
+
+  }
+
+  return value;
+
+};
+
+AddressService.prototype._aggregateAddressSummaryResult = function (tx, address, result, options) {
+  
+  var self = this;
+
+  let output_val = self._getOutputResults(tx, address);
+  let input_val = self._getInputResults(tx, address);
+  
+  //aggregate the result
+
+  if(tx.confirmations) {
+
+    result.txApperances++;
+
+    result.totalReceivedSat += output_val;
+    result.balanceSat += output_val;
+  
+    result.totalSentSat += input_val;
+    result.balanceSat -= input_val;
+  
+  } else {
+    result.unconfirmedTxApperances++;
+    result.unconfirmedBalanceSat += output_val;
+    result.unconfirmedBalanceSat -= input_val;
+  }
+
+    if (!options.noTxList) {
+
+      if (!result.transactions)  {
+        result.transactions = [];
+      }
+
+      let txid = tx.txid();
+      if(!result.transactions.includes(txid)) {  //push txid only if its not in the array
+        
+        result.transactions.unshift(txid); //using unshift, so that recent tx (low confirmation) are at front
+        
+        if(result.transactions.length > MAX_TX_QUERY_LIMIT_SUMMARY)
+          result.transactions.pop(); //pop the oldest tx in list (when list limit is maxed out)
+      
+        }
+
+    }
+
+}
+
 AddressService.prototype.getAddressUnspentOutputs = function(address, options, callback) {
 
   var self = this;
@@ -365,6 +791,11 @@ AddressService.prototype.getAddressUnspentOutputs = function(address, options, c
 
       utxoStream.on('data', function(data) {
 
+        if(results.length >= MAX_TX_QUERY_LIMIT_UTXO) { //Max array limit reached, end response
+          utxoStream.emit('end'); 
+          return;
+        }
+
         var key = self._encoding.decodeUtxoIndexKey(data.key);
         var value =  self._encoding.decodeUtxoIndexValue(data.value);
 
@@ -440,19 +871,21 @@ AddressService.prototype.stop = function(callback) {
 
 AddressService.prototype._getTxidStream = function(address, options) {
 
-  var start = this._encoding.encodeAddressIndexKey(address);
-  var end = Buffer.concat([
-    start.slice(0, address.length + 4),
-    options.endHeightBuf,
-    new Buffer(new Array(83).join('f'), 'hex')
-  ]);
-
-  var criteria = {
-    gte: start,
-    lte: end,
-    reverse: true // txids stream from low confirmations to high confirmations
-  };
+  var criteria = {};
 
+  if(options.after) 
+    criteria.gt = this._encoding.encodeAddressIndexKey(address, options.start, options.after, 0xffffffff, 1, 0xffffffff); //0xffffffff is for getting after the txid
+  else 
+    criteria.gte = this._encoding.encodeAddressIndexKey(address, options.start);
+  
+  if(options.before)
+    criteria.lt = this._encoding.encodeAddressIndexKey(address, options.end, options.before); //get before the txid
+  else
+    criteria.lte = this._encoding.encodeAddressIndexKey(address, options.end, Array(65).join('f'), 0xffffffff, 1, 0xffffffff);
+  
+  //reverse option can be used explictly when latest tx are required
+  if(options.reverse)
+    criteria.reverse = true;
   // txid stream
   var txidStream = this._db.createKeyStream(criteria);
 
@@ -463,6 +896,7 @@ AddressService.prototype._getTxidStream = function(address, options) {
   return txidStream;
 };
 
+//(used by old fn)
 AddressService.prototype._getAddressTxHistory = function(options, callback) {
 
   var self = this;
@@ -491,6 +925,7 @@ AddressService.prototype._getAddressTxHistory = function(options, callback) {
 
 };
 
+//(used by old fn)
 AddressService.prototype._getAddressTxidHistory = function(address, options, callback) {
   var self = this;
 
@@ -500,9 +935,6 @@ AddressService.prototype._getAddressTxidHistory = function(address, options, cal
 
   var results = [];
 
-  options.endHeightBuf = new Buffer(4);
-  options.endHeightBuf.writeUInt32BE(options.end);
-
   if (_.isUndefined(options.queryMempool)) {
     options.queryMempool = true;
   }
@@ -551,7 +983,15 @@ AddressService.prototype._getAddressTxidHistory = function(address, options, cal
 
       txIdTransformStream._transform = function(chunk, enc, callback) {
         var txInfo = self._encoding.decodeAddressIndexKey(chunk);
-        results.push({ txid: txInfo.txid, height: txInfo.height });
+
+        if(results.length >= MAX_TX_QUERY_LIMIT_HISTORY) { //Max array limit reached, end response
+          txIdTransformStream.emit('end'); 
+          return;
+        }
+
+        if(!results.some(r => r.txid == txInfo.txid)) //add txid to array only if its not already there
+          results.push({ txid: txInfo.txid, height: txInfo.height });
+
         callback();
       };
 
@@ -563,6 +1003,225 @@ AddressService.prototype._getAddressTxidHistory = function(address, options, cal
 
 };
 
+AddressService.prototype._streamAddressSummary = function(address, options, streamer, callback) {
+  var self = this;
+
+  options = options || {};
+  options.start = options.start || 0;
+  options.end = options.end || 0xffffffff;
+
+  //options.from = options.from || 0; //Deprecated, use `after` and `before` option
+  //options.to = options.to || 0xffffffff; //Deprecated, use `after` and `before` option
+
+  if (_.isUndefined(options.queryMempool)) {
+    options.queryMempool = true;
+  }
+
+  if (_.isUndefined(options.mempoolOnly)) {
+    options.mempoolOnly = false;
+  }
+
+  if (_.isUndefined(options.reverse)) {
+    options.reverse = false;
+  }
+
+  //declare the queue to process tx data
+  var tmpTxList = {}; //store processed txid temporarily to ignore duplication
+
+  var q = async.queue(function(id, cb) {
+
+    //duplication finding
+    if(id.txid in tmpTxList){
+
+      tmpTxList[id.txid][0]++;
+      
+      if(tmpTxList[id.txid][1] !== null && tmpTxList[id.txid][0] >= tmpTxList[id.txid][1]) //all duplications are found for this txid
+        delete tmpTxList[id.txid];
+      
+      return cb();
+
+    } else tmpTxList[id.txid] = [1, null];
+
+    if (id.height === 0xffffffff) {
+
+      return self._mempool.getMempoolTransaction(id.txid, function(err, tx) {
+
+        if (err || !tx) {
+          return cb(err || new Error('Address Service: could not find tx: ' + id.txid));
+        }
+        self._transaction.setTxMetaInfo(tx, options, cb);
+
+      });
+
+    }
+
+    self._transaction.getDetailedTransaction(id.txid, options, cb);
+
+  }, 1);
+
+  //q.pause(); //pause and wait until queue is set (not needed)
+
+  function chunkCallback(err, tx){
+
+    if(q.killed || (!err && !tx)) //no error or tx data (duplicate calls will have empty tx value) 
+      return; 
+
+    if(tx){
+      let txid = tx.txid();
+      tmpTxList[txid][1] = self._getOccurrenceCount(tx, address);
+
+      if(tmpTxList[txid][0] >= tmpTxList[txid][1]) //all duplications are found for this txid
+        delete tmpTxList[txid];
+    }
+
+    streamer(err, tx);
+
+    if((err || options.flag_stop) && !q.killed){
+
+      q.kill();
+      q.killed = true;
+
+      return callback();
+    }
+
+  }
+
+    const waterfall_array = [];
+
+    waterfall_array.push(
+    //Find start height if `after` option is passed
+    function parse_after_id(next){
+
+      if(_.isUndefined(options.after)) {
+        return next();
+      }
+      
+      self._transaction.getTransaction(options.after, options, function(err, tx) {
+
+        if(tx && tx.confirmations && tx.height >= options.start) {
+  
+          options.start = tx.height;
+
+        } else { 
+
+          delete options.after;
+
+        } 
+
+        next();
+        
+      });
+
+    });
+
+    waterfall_array.push(
+    //Find end height if `before` option is passed
+    function parse_before_id(next){
+  
+      if(_.isUndefined(options.before)) {
+        return next();
+      }
+      
+      self._transaction.getTransaction(options.before, options, function(err, tx) {
+
+        if(tx && tx.confirmations && tx.height <= options.end) {
+  
+          options.end = tx.height;
+
+        } else { 
+
+          delete options.before;
+
+        } 
+
+        next();
+        
+      });
+
+    });
+
+    // stream the confirmed txids out of the address index
+    function query_confirmed_txids(next) {
+
+      if (options.mempoolOnly) {  //Option to query from mempool only (ie, unconfirmed txs only)
+        return next();
+      }
+
+      var txIdTransformStream = new Transform({ objectMode: true });
+
+      txIdTransformStream._flush = function(cb) {
+        txIdTransformStream.emit('end');
+        cb();
+      };
+
+      txIdTransformStream.on('error', function(err) {
+        log.error('Address Service: txstream err: ' + err);
+        txIdTransformStream.unpipe();
+      });
+
+      txIdTransformStream.on('end', function() {
+        next();
+      });
+
+      txIdTransformStream._transform = function(chunk, enc, cb) {
+
+        if(options.flag_stop)//stop data query          
+          return txIdTransformStream.unpipe();
+
+        var txInfo = self._encoding.decodeAddressIndexKey(chunk);
+        q.push({ txid: txInfo.txid, height: txInfo.height }, chunkCallback);
+        
+        cb();
+      };
+
+      var txidStream = self._getTxidStream(address, options);
+      txidStream.pipe(txIdTransformStream);
+      
+    }
+
+    // query the mempool for relevant txs for this address
+    function query_mempool_txids(next) {
+
+      if (!options.queryMempool || !_.isUndefined(options.before)) { //if queryMempool=false or options.before is given a valid value, then do not query mempool
+        return next();
+      }
+
+      self._mempool.getTxidsByAddress(address, 'both', function(err, mempoolTxids) {
+
+        if (mempoolTxids.length <= 0) {
+          return next();
+        }
+  
+        mempoolTxids.map(id => q.push(id, chunkCallback));
+        next();
+      });
+
+    }
+
+    if(options.reverse){ //when queried txs in reverse key order, mempool first then confirmed
+      waterfall_array.push(query_mempool_txids);
+      waterfall_array.push(query_confirmed_txids);
+    } else {  //when queried tx in key order, confirmed tx 1st, then mempool
+      waterfall_array.push(query_confirmed_txids);
+      waterfall_array.push(query_mempool_txids);
+    }
+
+    waterfall_array.push(
+    //wait for queue to complete
+    function end_fall(next) {
+
+      if(!q.started || q.idle()) //No tx in query (or) already finished querying
+        return next();
+
+      else
+        q.drain = () => next();
+
+    });
+
+  async.waterfall(waterfall_array, callback);
+
+}
+
 AddressService.prototype._removeBlock = function(block, callback) {
 
   var self = this;
@@ -630,7 +1289,7 @@ AddressService.prototype._removeInput = function(input, tx, block, index, callba
   }
 
   address.network = self._network;
-  address = address.toString();
+  address = address.toString(self._network);
 
   assert(block && block.__ts && block.__height, 'Missing block or block values.');
 
@@ -674,7 +1333,7 @@ AddressService.prototype._removeOutput = function(output, tx, block, index, call
   }
 
   address.network = self._network;
-  address = address.toString();
+  address = address.toString(self._network);
 
   assert(block && block.__ts && block.__height, 'Missing block or block values.');
 
@@ -743,7 +1402,7 @@ AddressService.prototype._processInput = function(tx, input, index, opts) {
   }
 
   address.network = this._network;
-  address = address.toString();
+  address = address.toString(this._network);
 
   var txid = tx.txid();
   var timestamp = this._timestamp.getTimestampSync(opts.block.rhash());
@@ -781,7 +1440,7 @@ AddressService.prototype._processOutput = function(tx, output, index, opts) {
   }
 
   address.network = this._network;
-  address = address.toString();
+  address = address.toString(this._network);
 
   var txid = tx.txid();
   var timestamp = this._timestamp.getTimestampSync(opts.block.rhash());

lib/services/block/block_handler.js

@@ -242,7 +242,7 @@ ProcessSerial.prototype._write = function(block, enc, callback) {
 
   self.block.once('concurrentaddblock', function() {
     if(!check()) {
-      var err = new Error('Concurrent block ' + self.block.concurrentTip.__height + ' is less than ' + block.__height);
+      var err = 'Concurrent block ' + self.block.concurrentTip.__height + ' is less than ' + block.__height;
       return self.emit('error', err);
     }
     self._process(block, callback);

lib/services/block/encoding.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Block = require('fcoin').block;
+var Block = require('fcoin').Block;
 // stores -- block header as key, block itself as value (optionally)
 
 function Encoding(servicePrefix) {

lib/services/block/index.js

@@ -13,6 +13,8 @@ var bcoin = require('fcoin');
 var _ = require('lodash');
 var LRU = require('lru-cache');
 
+const MAX_IGNORED_BLOCK = 16; //Maximum ignored block allowed before trigging sync again
+
 var BlockService = function(options) {
 
   BaseService.call(this, options);
@@ -231,8 +233,8 @@ BlockService.prototype._resetTip = function(callback) {
   self._header.getAllHeaders(function(err, headers) {
 
     if (err || !headers) {
-      return callback(err || new Error('headers required'));
-    }
+      log.error(err || 'headers required'); return callback(err);
+      }
 
     log.info('Block Service: retrieved all the headers for lookups.');
 
@@ -252,13 +254,18 @@ BlockService.prototype._resetTip = function(callback) {
           return callback(err);
         }
 
-	if (!_block) {
+  if (!_block) {
           log.debug('Block Service: block: ' + header.hash + ' was not found, proceeding to older blocks.');
-	}
+  }
 
         block = _block;
         header = headers.getIndex(--height);
-        assert(header, 'Header not found for reset.');
+
+      // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+        if (header == false) { 
+        log.error('Header not found for reset.');
+        }
+      //  assert(header, 'Header not found for reset.');
 
         if (!block) {
           log.debug('Block Service: trying block: ' + header.hash);
@@ -271,8 +278,8 @@ BlockService.prototype._resetTip = function(callback) {
     }, function(err) {
 
       if (err || !block) {
-        return callback(err ||
-          new Error('Block Service: none of the blocks from the headers match what is already indexed in the block service.'));
+        log.error(err ||
+          'Block Service: none of the blocks from the headers match what is already indexed in the block service.'); return callback(err);
       }
 
       self._setTip({ hash: block.rhash(), height: height + 1 }, callback);
@@ -370,8 +377,8 @@ BlockService.prototype._loadRecentBlockHashes = function(callback) {
     self.getBlock(hash, function(err, block) {
 
       if (err || !block) {
-        return callback(err || new Error('Block Service: attempted to retrieve block: ' + hash +
-          ' but was not in the index.'));
+        log.error(err || 'Block Service: attempted to retrieve block: ' + hash +
+          ' but was not in the index.'); return callback(err);
       }
 
       var prevHash = bcoin.util.revHex(block.prevBlock);
@@ -387,7 +394,11 @@ BlockService.prototype._loadRecentBlockHashes = function(callback) {
       return callback(err);
     }
 
-    assert(self._recentBlockHashes.length === times, 'Block Service: did not load enough recent block hashes from the index.');
+    // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+        if (self._recentBlockHashes.length != times) { 
+        log.error('Block Service: did not load enough recent block hashes from the index.');
+        }
+    //assert(self._recentBlockHashes.length === times, 'Block Service: did not load enough recent block hashes from the index.');
     log.info('Block Service: loaded: ' + self._recentBlockHashes.length + ' hashes from the index.');
     callback();
 
@@ -406,7 +417,7 @@ BlockService.prototype._getTimeSinceLastBlock = function(callback) {
   self._header.getBlockHeader(Math.max(self._tip.height - 1, 0), function(err, header) {
 
     if(err || !header) {
-      return callback(err || new Error('Block Service: we should have a header in order to get time since last block.'));
+      log.error(err || 'Block Service: we should have a header in order to get time since last block.'); return callback(err);
     }
 
     async.map([ self._tip.hash, header.hash ], function(hash, next) {
@@ -628,6 +639,7 @@ BlockService.prototype._startBlockSubscription = function() {
   }
 
   this._subscribedBlock = true;
+  this._ignoredBlockCount = 0; //SZ: reset the ignored count to 0 when subscription starts
 
   log.info('Block Service: starting p2p block subscription.');
   this._bus.on('p2p/block', this._queueBlock.bind(this));
@@ -656,7 +668,7 @@ BlockService.prototype._findLatestValidBlockHeader = function(callback) {
   if (self._reorgToBlock) {
     return self._header.getBlockHeader(self._reorgToBlock, function(err, header) {
       if (err || !header) {
-        return callback(err || new Error('Block Service: header not found to reorg to.'));
+        log.error(err || 'Block Service: header not found to reorg to.'); return callback(err);
       }
       callback(null, header);
     });
@@ -711,12 +723,19 @@ BlockService.prototype._findLatestValidBlockHeader = function(callback) {
     // any of our recent block hashes in its indexes.
     // if some joker mines a block using an orphan block as its prev block, then the effect of this will be
     // us detecting a reorg, but not actually reorging anything
-    assert(header, 'Block Service: we could not locate any of our recent block hashes in the header service ' +
-      'index. Perhaps our header service sync\'ed to the wrong chain?');
-
-    assert(header.height <= self._tip.height, 'Block Service: we found a common ancestor header whose ' +
-      'height was greater than our current tip. This should be impossible.');
-
+    // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+ if (!_.isUndefined(header)) {
+      if (header == false) { 
+        log.error('Block Service: we could not locate any of our recent block hashes in the header service ' + 'index. Perhaps our header service sync\'ed to the wrong chain?');
+        }
+     }   
+    // assert(header, 'Block Service: we could not locate any of our recent block hashes in the header service ' + 'index. Perhaps our header service sync\'ed to the wrong chain?');
+  if (!_.isUndefined(header.height)) {
+          if (header.height > self._tip.height) { 
+          log.error('Block Service: we found a common ancestor header whose ' + 'height was greater than our current tip. This should be impossible.');
+          }
+    // assert(header.height <= self._tip.height, 'Block Service: we found a common ancestor header whose ' + 'height was greater than our current tip. This should be impossible.');
+  }
     callback(null, header);
 
   });
@@ -739,13 +758,13 @@ BlockService.prototype._findBlocksToRemove = function(commonHeader, callback) {
     self._getBlock(hash, function(err, block) {
 
       if (err || !block) {
-        return next(err || new Error('Block Service: block not found in index.'));
+        return next(err || 'Block Service: block not found in index.');
       }
 
       self._timestamp.getTimestamp(block.rhash(), function(err, timestamp) {
 
         if (err || !timestamp) {
-          return callback(err || new Error('timestamp missing from reorg.'));
+          log.error(err || 'timestamp missing from reorg.'); return callback(err);
         }
 
         block.__height = height;
@@ -815,8 +834,10 @@ BlockService.prototype._handleReorg = function(callback) {
 
         blocksToRemove = _blocksToRemove;
 
-        assert(blocksToRemove.length >= 1 && blocksToRemove.length <= self._recentBlockHashes.length,
-          'Block Service: the number of blocks to remove looks to be incorrect.');
+      // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+      if (blocksToRemove.length < 1 || blocksToRemove.length > self._recentBlockHashes.length) { 
+        log.error('Block Service: the number of blocks to remove looks to be incorrect.');   }
+ //        assert(blocksToRemove.length >= 1 && blocksToRemove.length <= self._recentBlockHashes.length, 'Block Service: the number of blocks to remove looks to be incorrect.');
 
         log.warn('Block Service: chain reorganization detected, current height/hash: ' + self._tip.height + '/' +
           self._tip.hash + ' common ancestor hash: ' + commonAncestorHeader.hash + ' at height: ' + commonAncestorHeader.height +
@@ -920,6 +941,15 @@ BlockService.prototype._processBlock = function(block, callback) {
     return self._saveBlock(block, callback);
   }
 
+  //SZ: count the ignored blocks. if many blocks ignored, trigger sync process
+  if(self._ignoredBlockCount < MAX_IGNORED_BLOCK)
+    self._ignoredBlockCount++;
+  else {
+    self._ignoredBlockCount = 0;
+    self._removeAllSubscriptions();
+    self._startSync();
+  }
+
   // reorg -- in this case, we will not handle the reorg right away
   // instead, we will skip the block and wait for the eventual call to
   // "onHeaders" function. When the header service calls this function,
@@ -935,6 +965,7 @@ BlockService.prototype._saveBlock = function(block, callback) {
 
   var self = this;
   block.__height = self._tip.height + 1;
+  self._ignoredBlockCount = 0; //SZ: a block is saved, reset the ignored count
 
   var services = self.node.services;
 
@@ -982,7 +1013,9 @@ BlockService.prototype._saveBlock = function(block, callback) {
 BlockService.prototype._handleError = function(err) {
   if (!this.node.stopping) {
     log.error('Block Service: handle error ' + err);
-    return this.node.stop();
+    //FLO Crash Error Resolution by RanchiMall 10th May 2021
+    //return this.node.stop();
+    return;
   }
 };
 
@@ -1077,7 +1110,7 @@ BlockService.prototype._startSync = function() {
     this.on('next block', this._sync.bind(this));
     this.on('synced', this._onSynced.bind(this));
     clearInterval(this._reportInterval);
-    this._reportingInterval = setInterval(this._logProgress.bind(this), 5000);
+    this._reportInterval = setInterval(this._logProgress.bind(this), 5000);
     return this._sync();
   }
 

lib/services/block/reorg.js

@@ -315,7 +315,7 @@ Reorg.prototype.findCommonAncestorAndNewHashes = function(oldTipHash, newTipHash
           }
 
           if(!mainPosition && !forkPosition) {
-            return next(new Error('Unknown common ancestor'));
+            return next('Unknown common ancestor');
           }
 
           next();

lib/services/db/index.js

@@ -3,6 +3,7 @@
 var util = require('util');
 var fs = require('fs');
 var async = require('async');
+var _ = require('lodash');
 var levelup = require('levelup');
 var leveldown = require('leveldown');
 var mkdirp = require('mkdirp');
@@ -49,7 +50,8 @@ DB.dependencies = [];
 DB.prototype._onError = function(err) {
   if (!this._stopping) {
     log.error('Db Service: error: ' + err);
-    this.node.stop();
+    //FLO Crash Error Resolution by RanchiMall 10th May 2021
+    //this.node.stop();
   }
 };
 
@@ -94,7 +96,7 @@ DB.prototype.get = function(key, options, callback) {
   var cb = callback;
   var opts = options;
 
-  if (typeof callback !== 'function') {
+  if (!_.isFunction(callback)) {
     cb = options;
     opts = {};
   }
@@ -117,7 +119,9 @@ DB.prototype.get = function(key, options, callback) {
 
   } else {
 
-    cb(new Error('Shutdown sequence underway, not able to complete the query'));
+    // FLOSight Error Correction from RanchiMall 20th May 2021.
+    //cb(new Error('Shutdown sequence underway, not able to complete the query'));
+    log.error('Shutdown sequence underway, not able to complete the query');
   }
 
 };
@@ -128,17 +132,40 @@ DB.prototype.put = function(key, value, callback) {
     callback();
   }
 
-  assert(Buffer.isBuffer(key), 'key NOT a buffer as expected.');
+  // FLOSight Error Correction from RanchiMall 20th May 2021. removed the unhandled assert and replaced by looging of error
+  if (Buffer.isBuffer(key) == false) { 
+      log.error('key NOT a buffer as expected.');
+    }
+ // assert(Buffer.isBuffer(key), 'key NOT a buffer as expected.');
 
   if (value) {
-
-    assert(Buffer.isBuffer(value), 'value exists but NOT a buffer as expected.');
+  
+  // FLOSight Error Correction from RanchiMall 20th May 2021. removed the unhandled assert and replaced by looging of error
+    if (Buffer.isBuffer(value) == false) { 
+      log.error('value exists but NOT a buffer as expected.');
+     }
+    //assert(Buffer.isBuffer(value), 'value exists but NOT a buffer as expected.');
 
   }
 
   this._store.put(key, value, callback);
 };
 
+DB.prototype.del = function(key, callback) {
+
+  if (this._stopping) {
+    callback();
+  }
+
+  // FLOSight Error Correction from RanchiMall 20th May 2021. removed the unhandled assert and replaced by looging of error
+  if (Buffer.isBuffer(key) == false) { 
+    log.error('key NOT a buffer as expected.');
+  }
+  // assert(Buffer.isBuffer(key), 'key NOT a buffer as expected.');
+
+  this._store.del(key, callback);
+}
+
 DB.prototype.batch = function(ops, callback) {
 
   if (this._stopping) {
@@ -147,11 +174,18 @@ DB.prototype.batch = function(ops, callback) {
 
   for(var i = 0; i < ops.length; i++) {
 
-    assert(Buffer.isBuffer(ops[i].key), 'key NOT a buffer as expected.');
+  // FLOSight Error Correction from RanchiMall 20th May 2021. removed the unhandled assert and replaced by looging of error
+    if (Buffer.isBuffer(ops[i].key) == false) { 
+      log.error('key NOT a buffer as expected.');
+      }
+    //assert(Buffer.isBuffer(ops[i].key), 'key NOT a buffer as expected.');
 
     if (ops[i].value) {
-
-      assert(Buffer.isBuffer(ops[i].value), 'value exists but NOT a buffer as expected.');
+      // FLOSight Error Correction from RanchiMall 20th May 2021. removed the unhandled assert and replaced by looging of error
+        if (Buffer.isBuffer(ops[i].value) == false) { 
+        log.error('value exists but NOT a buffer as expected.');
+        }
+      //assert(Buffer.isBuffer(ops[i].value), 'value exists but NOT a buffer as expected.');
 
     }
   }

lib/services/header/index.js

@@ -7,12 +7,15 @@ var index = require('../../');
 var log = index.log;
 var utils = require('../../utils');
 var async = require('async');
-var BN = require('bn.js');
+// var BN = require('bn.js');
+var BN = require('bcrypto/lib/bn.js')
 var consensus = require('fcoin').consensus;
 var assert = require('assert');
 var constants = require('../../constants');
 var bcoin = require('fcoin');
 
+const SYNC_CHECK_INTERVAL = 1000 * 60 * 15; //15 mins
+
 var HeaderService = function(options) {
 
   BaseService.call(this, options);
@@ -144,7 +147,11 @@ HeaderService.prototype._adjustTipBackToCheckpoint = function() {
 
 HeaderService.prototype._setGenesisBlock = function(callback) {
 
-  assert(this._tip.hash === this.GENESIS_HASH, 'Expected tip hash to be genesis hash, but it was not.');
+  // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+  if (this._tip.hash != this.GENESIS_HASH) { 
+      log.error('Expected tip hash to be genesis hash, but it was not.');
+    }
+ // assert(this._tip.hash === this.GENESIS_HASH, 'Expected tip hash to be genesis hash, but it was not.');
 
   var genesisHeader = {
     hash: this.GENESIS_HASH,
@@ -411,7 +418,10 @@ HeaderService.prototype._getDBOpForLastHeader = function(nextHeader) {
   this._lastHeader.nextHash = nextHeader.hash;
   var keyHash = this._encoding.encodeHeaderHashKey(this._lastHeader.hash);
 
-  assert(this._lastHeader.height >= 0, 'Trying to save a header with incorrect height.');
+  // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+  if (this._lastHeader.height < 0) {  log.error('Trying to save a header with incorrect height.');
+    }
+  // assert(this._lastHeader.height >= 0, 'Trying to save a header with incorrect height.');
 
   var keyHeight = this._encoding.encodeHeaderHeightKey(this._lastHeader.height);
   var value = this._encoding.encodeHeaderValue(this._lastHeader);
@@ -465,9 +475,12 @@ HeaderService.prototype._onHeaders = function(headers) {
   for(var i = 0; i < transformedHeaders.length; i++) {
 
     var header = transformedHeaders[i];
-
-    assert(self._lastHeader.hash === header.prevHash, 'headers not in order: ' + self._lastHeader.hash +
-      ' -and- ' + header.prevHash + ' Last header at height: ' + self._lastHeader.height);
+    
+    // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+    if (self._lastHeader.hash != header.prevHash) { 
+      log.error('headers not in order: ' + self._lastHeader.hash + ' -and- ' + header.prevHash + ' Last header at height: ' + self._lastHeader.height);
+    }
+   // assert(self._lastHeader.hash === header.prevHash, 'headers not in order: ' + self._lastHeader.hash + ' -and- ' + header.prevHash + ' Last header at height: ' + self._lastHeader.height);
 
     var ops = self._onHeader(header);
 
@@ -484,8 +497,9 @@ HeaderService.prototype._onHeaders = function(headers) {
 };
 
 HeaderService.prototype._handleError = function(err) {
-  log.error('Header Service: ' + err);
-  this.node.stop();
+  log.error('Error in Header Service: ' + err); 
+  return;
+  //this.node.stop();
 };
 
 HeaderService.prototype._saveHeaders = function(dbOps, callback) {
@@ -510,6 +524,7 @@ HeaderService.prototype._saveHeaders = function(dbOps, callback) {
 HeaderService.prototype._onHeadersSave = function(callback) {
   var self = this;
 
+  self._syncUnresponsive = false; //SZ: got response from peer
   self._logProgress();
 
   if (!self._syncComplete()) {
@@ -517,6 +532,12 @@ HeaderService.prototype._onHeadersSave = function(callback) {
     return callback();
   }
 
+  //SZ: clear the interval check as sync is completed
+  if(self._syncCheckInterval){
+    clearInterval(self._syncCheckInterval); 
+    self._syncCheckInterval = null;
+  }
+
   self._endHeaderSubscription(); // we don't need headers any more
   self._startBlockSubscription(); // we need new blocks coming tu us aynchronuously
 
@@ -573,12 +594,15 @@ HeaderService.prototype._startBlockSubscription = function() {
 };
 
 HeaderService.prototype._syncComplete = function() {
+  // Check if we have reached the last block that we can download.
+  var bestHeight = Math.max(this._bestHeight, this._lastHeader.height);
 
-  // we always ask for the max number of headers, which is 2000.
-  // so any response with < 2000 means we have reached the end of the headers list.
-  // we could make an extra call if the number of total headers is multiple of 2000.
-  return this._lastHeaderCount < 2000;
+  var syncComplete = bestHeight === this._tip.height
 
+  if (syncComplete && this._initialSync)
+    log.info("Header Service: Sync Complete!")
+  
+  return syncComplete
 };
 
 HeaderService.prototype._setBestHeader = function() {
@@ -593,7 +617,7 @@ HeaderService.prototype._getHeader = function(height, hash, callback) {
   /*jshint -W018 */
   if (!hash && !(height >= 0)) {
     /*jshint +W018 */
-    return callback(new Error('invalid arguments'));
+    return callback('invalid arguments');
   }
 
   if (height === self._lastHeader.height || hash === self._lastHeader.hash) {
@@ -692,6 +716,23 @@ HeaderService.prototype._startSync = function() {
     // common case
     if (numNeeded > 0) {
       log.info('Header Service: Gathering: ' + numNeeded + ' ' + 'header(s) from the peer-to-peer network.');
+      
+      //SZ: Adding interval check for sync with peer is responsive or not
+      //(only if fcoin is started by flocore)
+      if(self._p2p._bcoin){
+        self._syncUnresponsive = true;
+        self._syncCheckInterval = setInterval(() => {
+          //check the best height
+          if(self._bestHeight < self._p2p._bcoin._bcoin.pool.chain.height)
+              self._bestHeight = self._p2p._bcoin._bcoin.pool.chain.height;
+          //call sync again if unresponsive
+          if(self._syncUnresponsive)
+            self._sync();
+          else //reset unresponsive as true
+            self._syncUnresponsive = true;
+        }, SYNC_CHECK_INTERVAL);
+      }      
+
       return self._sync();
     }
 
@@ -773,9 +814,11 @@ HeaderService.prototype._findReorgConditionInNewPeer = function(callback) {
 
       // nothing matched...
       // at this point, we should wonder if we are connected to the wrong network
-      assert(true, 'We tried to find a common header between current set of headers ' +
-        'and the new peer\'s set of headers, but there were none. This should be impossible ' +
-          ' if the new peer is using the same genesis block.');
+      // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error 
+       if (false) { 
+      log.error('We tried to find a common header between current set of headers ' + 'and the new peer\'s set of headers, but there were none. This should be impossible ' + ' if the new peer is using the same genesis block.');
+    }
+     // assert(true, 'We tried to find a common header between current set of headers ' +'and the new peer\'s set of headers, but there were none. This should be impossible ' +' if the new peer is using the same genesis block.');
     });
 
     self._getP2PHeaders(self.GENESIS_HASH);
@@ -876,7 +919,11 @@ HeaderService.prototype._sync = function() {
 
 HeaderService.prototype.getEndHash = function(tip, blockCount, callback) {
 
-  assert(blockCount >= 1, 'Header Service: block count to getEndHash must be at least 1.');
+ // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+    if (blockCount < 1) { 
+      log.error('Header Service: block count to getEndHash must be at least 1.');
+    }
+  // assert(blockCount >= 1, 'Header Service: block count to getEndHash must be at least 1.');
 
   var self = this;
 
@@ -887,7 +934,7 @@ HeaderService.prototype.getEndHash = function(tip, blockCount, callback) {
   }
 
   if (numResultsNeeded <= 0) {
-    return callback(new Error('Header Service: block service is mis-aligned '));
+    return callback('Header Service: block service is mis-aligned ');
   }
 
   var startingHeight = tip.height + 1;
@@ -917,8 +964,11 @@ HeaderService.prototype.getEndHash = function(tip, blockCount, callback) {
     if (streamErr) {
       return streamErr;
     }
-
-    assert(results.length === numResultsNeeded, 'getEndHash returned incorrect number of results.');
+   // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+          if (results.length != numResultsNeeded) { 
+      log.error('getEndHash returned incorrect number of results.');
+    }
+  // assert(results.length === numResultsNeeded, 'getEndHash returned incorrect number of results.');
 
     var index = numResultsNeeded - 1;
     var endHash =  index <= 0 || !results[index] ? 0 : results[index];
@@ -936,7 +986,11 @@ HeaderService.prototype.getEndHash = function(tip, blockCount, callback) {
 };
 
 HeaderService.prototype.getLastHeader = function() {
-  assert(this._lastHeader, 'Last header should be populated.');
+   // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+  if (this._lastHeader == false) { 
+      log.error('Last header should be populated.'); return;
+    }
+   // assert(this._lastHeader, 'Last header should be populated.');
   return this._lastHeader;
 };
 
@@ -949,7 +1003,7 @@ HeaderService.prototype._adjustHeadersForCheckPointTip = function(callback) {
   var start = self._encoding.encodeHeaderHeightKey(self._tip.height);
   var end = self._encoding.encodeHeaderHeightKey(0xffffffff);
 
-  log.info('Getting last header synced at height: ' + self._tip.height);
+  log.info('Header Service: Getting last header synced at height: ' + self._tip.height);
 
   var criteria = {
     gte: start,
@@ -969,6 +1023,7 @@ HeaderService.prototype._adjustHeadersForCheckPointTip = function(callback) {
     // any records with a height greater than our current tip height can be scheduled for removal
     // because they will be replaced shortly
     // and for every height record, we must also remove its hash record
+
     if (header.height > self._tip.height) {
       removalOps.push({
         type: 'del',
@@ -992,8 +1047,14 @@ HeaderService.prototype._adjustHeadersForCheckPointTip = function(callback) {
     if (streamErr) {
       return streamErr;
     }
+    
 
-    assert(self._lastHeader, 'The last synced header was not in the database.');
+   // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+    if (self._lastHeader == false) { 
+      log.error('The last synced header was not in the database.'); 
+    }
+    //assert(self._lastHeader, 'The last synced header was not in the database.');
+   
     self._tip.hash = self._lastHeader.hash;
     self._tip.height = self._lastHeader.height;
     self._db.batch(removalOps, callback);

lib/services/mempool/encoding.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tx = require('fcoin').tx;
+var tx = require('fcoin').TX;
 
 function Encoding(servicePrefix) {
   this.servicePrefix = servicePrefix;

lib/services/mempool/index.js

@@ -247,7 +247,7 @@ MempoolService.prototype._onTransaction = function(tx) {
   self._db.batch(ops, function(err) {
     if(err) {
       log.error(err);
-      self.node.stop();
+      // self.node.stop();
     }
 
     for (var i = 0; i < self._subscriptions.transaction.length; i++) {

lib/services/p2p/bcoin.js

@@ -3,46 +3,50 @@
 var index = require('../../');
 var log = index.log;
 var bcoin = require('fcoin');
+// var bzmq = require('bzmq');
 
 var Bcoin = function(options) {
   this._config = this._getConfig(options);
 };
 
 Bcoin.prototype.start = function(callback) {
-  var self = this;
-  self._bcoin = bcoin.fullnode(self._config);
+  this._bcoin = new bcoin.FullNode(this._config);
 
-  log.info('Starting Fcoin full node...');
+  log.info('Starting fcoin FullNode...');
 
-  self._bcoin.open().then(function() {
-    self._bcoin.connect().then(function() {
-      log.info('Waiting for Fcoin to sync');
-      self._bcoin.startSync();
-      // this will instruct the p2p service to start trying to connect to bcoin right away
+  this._bcoin.open().then(() => {
+    this._bcoin.connect().then(() => {
+      this._bcoin.startSync();
       callback();
     });
   });
 };
 
-Bcoin.prototype.stop = function() {
-  this._bcoin.stopSync();
-  this._bcoin.disconnect();
-  this._bcoin.close();
+Bcoin.prototype.stop = function(callback) {
+  this._bcoin.close().then(() => {
+    log.info("fcoin shutdown")
+    callback()
+  });
 };
 
 // --- privates
 
 Bcoin.prototype._getConfig = function(options) {
   var config = {
-    db: 'leveldb',
-    checkpoints: true,
     network: options.network || 'main',
-    listen: true,
+    port: options.port,
+
+    logFile: true,
     logConsole: true,
     logLevel: 'info',
-    port: options.port,
-    persistent: true,
-    workers: true
+
+    // indexTx: true,
+    // indexAddress: true,
+
+    checkpoints: true,
+    memory: false,
+    workers: true,
+    listen: true
   };
   if (options.prefix) {
     config.prefix = options.prefix;

lib/services/p2p/index.js

@@ -8,7 +8,8 @@ var log = index.log;
 var BaseService = require('../../service');
 var assert = require('assert');
 var Bcoin = require('./bcoin');
-var BcoinTx = require('fcoin').tx;
+var BcoinBlock = require('fcoin').Block;
+var BcoinTx = require('fcoin').TX;
 var Networks = require('flocore-lib').Networks;
 var BitcoreRPC = require('bitcoind-rpc');
 var LRU = require('lru-cache');
@@ -89,7 +90,7 @@ P2P.prototype.getP2PBlock = function(opts, callback) {
 
   self.once(opts.blockHash, callback);
 
-  peer.sendMessage(self.messages.GetBlocks(blockFilter));
+  peer.sendMessage(self.messages.GetBlocks(blockFilter, { Block: BcoinBlock }));
 };
 
 P2P.prototype.getHeaders = function(filter) {
@@ -253,10 +254,10 @@ P2P.prototype._initCache = function() {
 };
 
 P2P.prototype._initRPC = function (options) {
-  var port = 7312
+  var port = 7313
 
   if (this.node.network === 'testnet')
-    port = 17312
+    port = 17313
 
   this._config = options.rpc || {
     user: 'flocore',
@@ -277,7 +278,7 @@ P2P.prototype._initP2P = function() {
   if (this.node.network === 'regtest') {
     Networks.enableRegtest();
   }
-  this.messages = new p2p.Messages({ network: Networks.get(this.node.network), Transaction: BcoinTx });
+  this.messages = new p2p.Messages({ network: Networks.get(this.node.network), Transaction: BcoinTx, Block: BcoinBlock });
   this._peerHeights = [];
   this._peers = [];
   this._peerIndex = 0;
@@ -363,7 +364,8 @@ P2P.prototype._matchNetwork = function(network) {
     log.error('Configured network: "' + this.node.network +
       '" does not match our peer\'s reported network: "' +
       network.name + '".');
-    return this.node.stop();
+    // return this.node.stop();
+    return ;
   }
 
   return this.node.network === network.name ? network.name : network.alias;
@@ -423,7 +425,12 @@ P2P.prototype._setListeners = function() {
 
 P2P.prototype._setResourceFilter = function(filter) {
 
-  assert(filter && filter.startHash, 'A "startHash" field is required to retrieve headers or blocks');
+  // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+  if (filter == false || filter.startHash == false) { 
+      log.error('A "startHash" field is required to retrieve headers or blocks');
+    }
+ // assert(filter && filter.startHash, 'A "startHash" field is required to retrieve headers or blocks');
+ 
   if (!filter.endHash) {
     filter.endHash = 0;
   }
@@ -432,9 +439,6 @@ P2P.prototype._setResourceFilter = function(filter) {
 };
 
 P2P.prototype._startBcoin = function(callback) {
-
-  var self = this;
-
   var network;
   var port;
   if (['livenet', 'live', 'main', 'mainnet'].indexOf(this.node.network) !== -1) {
@@ -445,16 +449,16 @@ P2P.prototype._startBcoin = function(callback) {
     port = this._configPeers[0].port || 17312;
   } else {
     network = this.node.network;
-    port = this._configPeers[0].port || 48444;
+    port = this._configPeers[0].port || 17412;
   }
 
-  self._bcoin = new Bcoin({
+  this._bcoin = new Bcoin({
     network: network,
-    prefix: self.node.datadir,
+    prefix: this.node.datadir,
     port: port
   });
 
-  self._bcoin.start(callback);
+  this._bcoin.start(callback);
 
 };
 

lib/services/transaction/encoding.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Tx = require('fcoin').tx;
+var Tx = require('fcoin').TX;
 
 function Encoding(servicePrefix) {
   this.servicePrefix = servicePrefix;

lib/services/transaction/index.js

@@ -7,6 +7,7 @@ var _ = require('lodash');
 var async = require('async');
 var assert = require('assert');
 var LRU = require('lru-cache');
+var log = require('../../index').log;
 
 function TransactionService(options) {
   BaseService.call(this, options);
@@ -113,7 +114,7 @@ TransactionService.prototype.getTransaction = function(txid, options, callback)
 
   var self = this;
 
-  if (typeof callback !== 'function') {
+  if (!_.isFunction(callback)) {
     callback = options;
   }
 
@@ -184,8 +185,11 @@ TransactionService.prototype.setTxMetaInfo = function(tx, options, callback) {
 
         var inputSatoshis = 0;
 
-        assert(tx.__inputValues.length === tx.inputs.length,
-        'Transaction Service: input values length is not the same as the number of inputs.');
+// FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+  if (tx.__inputValues.length != tx.inputs.length) { 
+      log.error('Transaction Service: input values length is not the same as the number of inputs.');
+    }
+ // assert(tx.__inputValues.length === tx.inputs.length, 'Transaction Service: input values length is not the same as the number of inputs.');
 
         tx.__inputValues.forEach(function(val) {
 
@@ -308,13 +312,18 @@ TransactionService.prototype._getInputValues = function(tx, options, callback) {
       // if not in mempool or tx index, we just don't have it, yet?
       function(txid, tx, next) {
         if (!tx) {
-          return next(new Error('Transaction Service: prev transacion: (' + input.prevout.txid() + ') for tx: ' +
+          return next(log.error('Transaction Service: prev transacion: (' + input.prevout.txid() + ') for tx: ' +
             _tx.txid() + ' at input index: ' + outputIndex + ' is missing from the index or not in the memory pool. It could  be' +
             ' that the parent tx has not yet been relayed to us, but will be relayed in the near future.'));
         }
+
         var output = tx.outputs[outputIndex];
 
-        assert(output, 'Expected an output, but did not get one for tx: ' + tx.txid() + ' outputIndex: ' + outputIndex);
+// FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+      if (output == false) { 
+        log.error('Expected an output, but did not get one for tx: ' + tx.txid() + ' outputIndex: ' + outputIndex);
+        }
+ // assert(output, 'Expected an output, but did not get one for tx: ' + tx.txid() + ' outputIndex: ' + outputIndex);
 
         next(null, output.value);
       }
@@ -374,7 +383,11 @@ TransactionService.prototype.onBlock = function(block, callback) {
       return callback(err);
     }
 
-    assert(block.txs.length === operations.length, 'It seems we are not indexing the correct number of transactions.');
+// FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+  if (block.txs.length != operations.length) { 
+      log.error('It seems we are not indexing the correct number of transactions.');
+    }
+//   assert(block.txs.length === operations.length, 'It seems we are not indexing the correct number of transactions.');
 
     callback(null, _.flattenDeep(operations));
   });
@@ -476,19 +489,30 @@ TransactionService.prototype._processTransaction = function(tx, opts, callback)
       return callback(err);
     }
 
-    assert(inputValues && inputValues.length === tx.inputs.length,
-      'Input values missing from tx.');
+  // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+    if (inputValues == false || inputValues.length != tx.inputs.length) { 
+      log.error('Input values missing from tx.');
+    }
+  //  assert(inputValues && inputValues.length === tx.inputs.length, 'Input values missing from tx.');
 
     // inputValues
     tx.__inputValues = inputValues;
 
     // timestamp
     tx.__timestamp = self._getBlockTimestamp(opts.block.rhash());
-    assert(tx.__timestamp, 'Timestamp is required when saving a transaction.');
+   // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+    if (tx.__timestamp == false) { 
+      log.error('Timestamp is required when saving a transaction.');
+    }
+    //  assert(tx.__timestamp, 'Timestamp is required when saving a transaction.');
 
     // height
     tx.__height = opts.block.__height;
-    assert(tx.__height, 'Block height is required when saving a trasnaction.');
+// FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
+    if (tx.__height == false) { 
+      log.error('Block height is required when saving a trasnaction.');
+    }
+  //assert(tx.__height, 'Block height is required when saving a trasnaction.');
 
     // block hash
     tx.__blockhash = opts.block.rhash();

lib/services/web/index.js

@@ -4,6 +4,7 @@ var fs = require('fs');
 var http = require('http');
 var https = require('https');
 var express = require('express');
+var express_ws = require('express-ws');
 var bodyParser = require('body-parser');
 var socketio = require('socket.io');
 var inherits = require('util').inherits;
@@ -105,7 +106,7 @@ WebService.prototype.setupAllRoutes = function() {
 
     if(service.getRoutePrefix && service.setupRoutes) {
       this.app.use('/' + this.node.services[key].getRoutePrefix(), subApp);
-      this.node.services[key].setupRoutes(subApp, express);
+      this.node.services[key].setupRoutes(subApp, express, express_ws);
     } else {
       log.debug('No routes defined for: ' + key);
     }

lib/utils.js

@@ -175,7 +175,7 @@ utils.getAddress = function(item, network) {
     return;
   }
   address.network = network;
-  return address.toString();
+  return address.toString(network);
 };
 
 module.exports = utils;

package.json

@@ -5,12 +5,12 @@
     "node": ">=8.0.0"
   },
   "author": "BitPay <dev@bitpay.com>",
-  "version": "5.0.0-beta.69",
+  "version": "5.0.9-beta-rm",
   "main": "./index.js",
-  "repository": "git://github.com/oipwg/flocore-node.git",
-  "homepage": "https://github.com/oipwg/flocore-node",
+  "repository": "git://github.com/ranchimall/flocore-node.git",
+  "homepage": "https://github.com/ranchimall/flocore-node",
   "bugs": {
-    "url": "https://github.com/oipwg/flocore-node/issues"
+    "url": "https://github.com/ranchimall/flocore-node/issues"
   },
   "bin": {
     "flocore-node": "./bin/flocore-node"
@@ -36,18 +36,19 @@
     "commander": "^2.8.1",
     "errno": "^0.1.4",
     "express": "^4.13.3",
-    "fcoin": "1.0.0-beta.20",
-    "flocore-lib": "0.15.1",
-    "flocore-p2p": "5.0.0-beta.6",
+    "express-ws": "^5.0.2",
+    "fcoin": "^1.1.4",
+    "flocore-lib": "^0.15.2",
+    "flocore-message": "^1.0.7",
+    "flocore-p2p": "^5.0.0-beta.8",
     "florincoind-rpc": "0.7.1",
-    "flosight-api": "^5.0.0-beta.68",
-    "flosight-ui": "^5.0.0-beta.72",
+    "flosight-api": "github:ranchimall/flosight-api",
+    "flosight-ui": "github:ranchimall/flosight-ui",
     "leveldown": "^2.0.0",
     "levelup": "^2.0.0",
     "liftoff": "^2.2.0",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.12",
     "lru-cache": "^4.1.1",
-    "memwatch-next": "^0.3.0",
     "mkdirp": "0.5.0",
     "path-is-absolute": "^1.0.0",
     "socket.io": "^1.4.5",
@@ -60,7 +61,7 @@
     "istanbul": "^0.4.3",
     "jshint": "^2.9.2",
     "jshint-stylish": "^2.1.0",
-    "mocha": "3.2.0",
+    "mocha": "^6.2.0",
     "proxyquire": "^1.3.1",
     "rimraf": "^2.4.2",
     "sinon": "^1.15.4"