diff --git a/lib/http/rpc.js b/lib/http/rpc.js index 7e2e3760..4838302d 100644 --- a/lib/http/rpc.js +++ b/lib/http/rpc.js @@ -1056,7 +1056,7 @@ RPC.prototype._submitBlock = co(function* _submitBlock(block) { }); RPC.prototype.__submitBlock = co(function* __submitBlock(block) { - var entry, prev, state; + var entry, prev, state, tx; this.logger.info('Handling submitted block: %s.', block.rhash()); @@ -2501,7 +2501,7 @@ RPC.prototype.blockToJSON = co(function* blockToJSON(entry, block, details) { RPC.prototype.entryToJSON = function entryToJSON(entry) { return { size: entry.size, - fee: Amount.btc(entry.fee, true), + fee: Amount.btc(entry.deltaFee, true), modifiedfee: 0, time: entry.ts, height: entry.height, diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js index a117ec54..cfbecc16 100644 --- a/lib/mempool/mempool.js +++ b/lib/mempool/mempool.js @@ -1961,15 +1961,19 @@ Mempool.prototype.getSize = function getSize() { */ Mempool.prototype.prioritise = function _prioritise(entry, pri, fee) { + if (-pri > entry.priority) + pri = -entry.priority; + + entry.priority += pri; + if (-fee > entry.deltaFee) fee = -entry.deltaFee; - if (-pri < entry.priority) - pri = -entry.priority; + if (fee === 0) + return; this.updateAncestors(entry, preprioritise); - entry.priority += pri; entry.deltaFee += fee; entry.descFee += fee; diff --git a/lib/mempool/mempoolentry.js b/lib/mempool/mempoolentry.js index 07cebbab..7256b45d 100644 --- a/lib/mempool/mempoolentry.js +++ b/lib/mempool/mempoolentry.js @@ -163,8 +163,8 @@ MempoolEntry.prototype.txid = function txid() { */ MempoolEntry.prototype.getPriority = function getPriority(height) { - var height = height - this.height; - var priority = (height * this.value) / this.size; + var delta = height - this.height; + var priority = (delta * this.value) / this.size; var result = this.priority + Math.floor(priority); if (result < 0) result = 0; diff --git a/lib/node/logger.js b/lib/node/logger.js index e4569315..b6474de1 100644 --- a/lib/node/logger.js +++ b/lib/node/logger.js @@ -545,7 +545,7 @@ Logger.prototype.context = function context(module) { Logger.prototype.writeConsole = function writeConsole(level, module, args) { var name = Logger.prefixByVal[level]; var msg = ''; - var fmt, color, ch; + var color, ch; assert(name, 'Invalid log level.'); @@ -576,15 +576,15 @@ Logger.prototype.writeConsole = function writeConsole(level, module, args) { assert(color); msg += '\x1b[' + color + 'm'; - msg += '[' + name + '] '; - msg += '\x1b[m'; + msg += '[' + name + ']'; + msg += '\x1b[m '; if (module) { ch = module.charCodeAt(0) + module.length; color = Logger.colors[ch % Logger.colors.length]; msg += '\x1b[' + color + 'm'; - msg += '(' + module + ') '; - msg += '\x1b[m'; + msg += '(' + module + ')'; + msg += '\x1b[m '; } } else { msg += '[' + name + '] ';