diff --git a/lib/bcoin/chain.js b/lib/bcoin/chain.js index 49be7463..c46bef08 100644 --- a/lib/bcoin/chain.js +++ b/lib/bcoin/chain.js @@ -1236,7 +1236,7 @@ Chain.prototype.setBestChain = function setBestChain(entry, block, prev, callbac // A higher fork has arrived. // Time to reorganize the chain. - self.logger.warning('WARNING: Reorganizing chain.'); + this.logger.warning('WARNING: Reorganizing chain.'); return this.reorganize(entry, block, done); }; diff --git a/lib/bcoin/chaindb.js b/lib/bcoin/chaindb.js index 804b43de..caeea2fb 100644 --- a/lib/bcoin/chaindb.js +++ b/lib/bcoin/chaindb.js @@ -848,7 +848,7 @@ ChainDB.prototype.connectBlock = function connectBlock(block, view, batch, callb for (i = 0; i < block.txs.length; i++) { tx = block.txs[i]; - hash = tx.hash('hex'); + hash = tx.hash(); if (this.options.indexTX) { batch.put(layout.t(hash), tx.toExtended()); diff --git a/lib/bcoin/coins.js b/lib/bcoin/coins.js index aa34e685..9cc18cbb 100644 --- a/lib/bcoin/coins.js +++ b/lib/bcoin/coins.js @@ -48,20 +48,30 @@ function Coins(options) { */ Coins.prototype.fromOptions = function fromOptions(options) { - if (options.version != null) + if (options.version != null) { + assert(utils.isNumber(options.version)); this.version = options.version; + } - if (options.hash) + if (options.hash) { + assert(typeof options.hash === 'string'); this.hash = options.hash; + } - if (options.height != null) + if (options.height != null) { + assert(utils.isNumber(options.height)); this.height = options.height; + } - if (options.coinbase != null) + if (options.coinbase != null) { + assert(typeof options.coinbase === 'boolean'); this.coinbase = options.coinbase; + } - if (options.outputs) + if (options.outputs) { + assert(Array.isArray(options.outputs)); this.outputs = options.outputs; + } return this; }; diff --git a/lib/bcoin/input.js b/lib/bcoin/input.js index 0342d532..6ce89de1 100644 --- a/lib/bcoin/input.js +++ b/lib/bcoin/input.js @@ -51,8 +51,6 @@ Outpoint.prototype.fromOptions = function fromOptions(options) { */ Outpoint.fromOptions = function fromOptions(options) { - if (options instanceof Outpoint) - return options; return new Outpoint().fromOptions(options); }; @@ -63,7 +61,7 @@ Outpoint.fromOptions = function fromOptions(options) { */ Outpoint.prototype.isNull = function isNull() { - return this.hash === constants.NULL_HASH && this.index === 0xffffffff; + return this.index === 0xffffffff && this.hash === constants.NULL_HASH; }; /** @@ -176,7 +174,7 @@ Outpoint.fromTX = function fromTX(tx, index) { */ Outpoint.prototype.inspect = function inspect() { - return ''; + return ''; }; /**