diff --git a/lib/services/address/index.js b/lib/services/address/index.js index 95744561..89b3c99e 100644 --- a/lib/services/address/index.js +++ b/lib/services/address/index.js @@ -363,7 +363,7 @@ AddressService.prototype.stop = function(callback) { AddressService.prototype._getTxidStream = function(address, options) { - var start = this._encoding.encodeAddressIndexKey(address, options.start); + var start = this._encoding.encodeAddressIndexKey(address); var end = Buffer.concat([ start.slice(0, address.length + 4), options.endHeightBuf, @@ -470,7 +470,6 @@ AddressService.prototype._getAddressTxHistory = function(options, callback) { }; -// main api function for insight-api/bws AddressService.prototype._getAddressTxidHistory = function(address, options, callback) { var self = this; @@ -709,9 +708,7 @@ AddressService.prototype.onBlock = function(block, callback) { operations = _.flattenDeep(operations); - setImmediate(function() { - callback(null, operations); - }); + callback(null, operations); }; AddressService.prototype._processInput = function(tx, input, index, opts) { diff --git a/lib/services/mempool/encoding.js b/lib/services/mempool/encoding.js index b0aae44e..ad327da2 100644 --- a/lib/services/mempool/encoding.js +++ b/lib/services/mempool/encoding.js @@ -73,13 +73,5 @@ Encoding.prototype.decodeMempoolAddressKey = function(buffer) { }; -Encoding.prototype.encodeMempoolAddressValue = function(transaction) { - return transaction.toRaw(); -}; - -Encoding.prototype.decodeMempoolAddressValue = function(buffer) { - return tx.fromRaw(buffer); -}; - module.exports = Encoding; diff --git a/lib/services/mempool/index.js b/lib/services/mempool/index.js index 89125ed9..aa3651b5 100644 --- a/lib/services/mempool/index.js +++ b/lib/services/mempool/index.js @@ -64,6 +64,12 @@ MempoolService.prototype._flushMempool = function(callback) { lte: self._encoding.encodeMempoolTransactionKey(new Array(65).join('f')) }; + var timer = setInterval(function() { + log.info('Mempool Service: removed: ' + totalCount + ' records during mempool flush.'); + }, 5000); + + timer.unref(); + var stream = self._db.createReadStream(criteria); stream.on('data', function(data) { @@ -72,10 +78,12 @@ MempoolService.prototype._flushMempool = function(callback) { type: 'del', key: data.key }); + totalCount += ops.length; self._db.batch(ops); }); stream.on('end', function() { + clearInterval(timer); log.info('Mempool Service: completed flushing: ' + totalCount + ' tx mempool records.'); callback(); });