configure testing parameters

Dev2

.gitignore

@@ -22,7 +22,6 @@ coverage/*
 **/*.creator
 *.log
 *.tmp
-*.tmp.*
 .DS_Store
 bin/florincoin*
 bin/SHA256SUMS.asc

lib/services/address/encoding.js

@@ -2,13 +2,11 @@
 
 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 buffers = [this.servicePrefix, this.addressIndex];
+  var prefix = new Buffer('00', 'hex');
+  var buffers = [this.servicePrefix, prefix];
 
   var addressSizeBuffer = new Buffer(1);
   addressSizeBuffer.writeUInt8(address.length);
@@ -60,7 +58,8 @@ Encoding.prototype.decodeAddressIndexKey = function(buffer) {
 };
 
 Encoding.prototype.encodeUtxoIndexKey = function(address, txid, outputIndex) {
-  var buffers = [this.servicePrefix, this.utxoIndex];
+  var prefix = new Buffer('01', 'hex');
+  var buffers = [this.servicePrefix, prefix];
 
   var addressSizeBuffer = new Buffer(1);
   addressSizeBuffer.writeUInt8(address.length);
@@ -115,53 +114,5 @@ 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,9 +16,7 @@ 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 
@@ -69,8 +67,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.
-//(old one: non-optimized for large data)
-AddressService.prototype.__getAddressHistory = function(addresses, options, callback) {
+//
+AddressService.prototype.getAddressHistory = function(addresses, options, callback) {
   var self = this;
   var cacheUsed = false;
 
@@ -175,106 +173,8 @@ AddressService.prototype.__getAddressHistory = function(addresses, options, call
 
 };
 
-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
-//(old one: non-optimized for large data)
-AddressService.prototype.__getAddressSummary = function(address, options, callback) {
+AddressService.prototype.getAddressSummary = function(address, options, callback) {
 
   var self = this;
 
@@ -300,7 +200,7 @@ AddressService.prototype.__getAddressSummary = function(address, options, callba
     txApperances: 0,
   };
 
-  self.__getAddressHistory(address, options, function(err, results) { //old fn
+  self.getAddressHistory(address, options, function(err, results) {
 
     if (err) {
       return callback(err);
@@ -318,229 +218,6 @@ AddressService.prototype.__getAddressSummary = function(address, options, callba
 
 };
 
-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++) {
@@ -588,6 +265,7 @@ 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);
@@ -605,110 +283,6 @@ 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;
@@ -791,11 +365,6 @@ 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);
 
@@ -871,21 +440,19 @@ AddressService.prototype.stop = function(callback) {
 
 AddressService.prototype._getTxidStream = function(address, options) {
 
-  var criteria = {};
+  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
+  };
 
-  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);
 
@@ -896,7 +463,6 @@ AddressService.prototype._getTxidStream = function(address, options) {
   return txidStream;
 };
 
-//(used by old fn)
 AddressService.prototype._getAddressTxHistory = function(options, callback) {
 
   var self = this;
@@ -925,7 +491,6 @@ AddressService.prototype._getAddressTxHistory = function(options, callback) {
 
 };
 
-//(used by old fn)
 AddressService.prototype._getAddressTxidHistory = function(address, options, callback) {
   var self = this;
 
@@ -935,6 +500,9 @@ 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;
   }
@@ -983,15 +551,7 @@ AddressService.prototype._getAddressTxidHistory = function(address, options, cal
 
       txIdTransformStream._transform = function(chunk, enc, callback) {
         var txInfo = self._encoding.decodeAddressIndexKey(chunk);
-
-        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 });
-
+        results.push({ txid: txInfo.txid, height: txInfo.height });
         callback();
       };
 
@@ -1003,225 +563,6 @@ 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;

lib/services/block/index.js

@@ -13,7 +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
+const MAX_IGNORED_BLOCK = 5; //Maximum ignored block allowed before trigging sync again
+var __TestingCount = 2;
 
 var BlockService = function(options) {
 
@@ -724,13 +725,13 @@ BlockService.prototype._findLatestValidBlockHeader = function(callback) {
     // 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
     // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
- if (!_.isUndefined(header)) {
+ if (typeof header !== 'undefined') {
       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 (typeof header.height !== 'undefined') {
           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.');
           }
@@ -936,15 +937,25 @@ BlockService.prototype._processBlock = function(block, callback) {
 
   log.debug('Block Service: new block: ' + block.rhash());
 
+  //Manually ignore a block for testing
+  __TestingCount--;
+  console.debug("TESTING: __TestingCount=", __TestingCount);
+  if(__TestingCount === 0){
+    console.debug("TESTING: Ignored block");
+    return callback();
+  }
+
   // common case
   if (!self._detectReorg(block)) {
     return self._saveBlock(block, callback);
   }
 
+  console.debug("TESTING: _ignoredBlockCount=", self._ignoredBlockCount)
   //SZ: count the ignored blocks. if many blocks ignored, trigger sync process
   if(self._ignoredBlockCount < MAX_IGNORED_BLOCK)
     self._ignoredBlockCount++;
   else {
+    console.debug("TESTING: resync is stopped")
     self._ignoredBlockCount = 0;
     self._removeAllSubscriptions();
     self._startSync();

lib/services/db/index.js

@@ -3,7 +3,6 @@
 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');
@@ -96,7 +95,7 @@ DB.prototype.get = function(key, options, callback) {
   var cb = callback;
   var opts = options;
 
-  if (!_.isFunction(callback)) {
+  if (typeof callback !== 'function') {
     cb = options;
     opts = {};
   }
@@ -151,21 +150,6 @@ DB.prototype.put = function(key, value, callback) {
   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) {

lib/services/transaction/index.js

@@ -114,7 +114,7 @@ TransactionService.prototype.getTransaction = function(txid, options, callback)
 
   var self = this;
 
-  if (!_.isFunction(callback)) {
+  if (typeof callback !== 'function') {
     callback = options;
   }
 

lib/services/web/index.js

@@ -4,7 +4,6 @@ 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;
@@ -106,7 +105,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, express_ws);
+      this.node.services[key].setupRoutes(subApp, express);
     } else {
       log.debug('No routes defined for: ' + key);
     }

package.json

@@ -5,12 +5,12 @@
     "node": ">=8.0.0"
   },
   "author": "BitPay <dev@bitpay.com>",
-  "version": "5.0.9-beta-rm",
+  "version": "5.0.8",
   "main": "./index.js",
-  "repository": "git://github.com/ranchimall/flocore-node.git",
-  "homepage": "https://github.com/ranchimall/flocore-node",
+  "repository": "git://github.com/oipwg/flocore-node.git",
+  "homepage": "https://github.com/oipwg/flocore-node",
   "bugs": {
-    "url": "https://github.com/ranchimall/flocore-node/issues"
+    "url": "https://github.com/oipwg/flocore-node/issues"
   },
   "bin": {
     "flocore-node": "./bin/flocore-node"
@@ -36,14 +36,13 @@
     "commander": "^2.8.1",
     "errno": "^0.1.4",
     "express": "^4.13.3",
-    "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": "github:ranchimall/flosight-api",
-    "flosight-ui": "github:ranchimall/flosight-ui",
+    "flosight-api": "^5.0.0-beta.75",
+    "flosight-ui": "^5.0.0-beta.72",
     "leveldown": "^2.0.0",
     "levelup": "^2.0.0",
     "liftoff": "^2.2.0",