diff --git a/lib/bcoin/chain.js b/lib/bcoin/chain.js index adcf3c68..2fa0c393 100644 --- a/lib/bcoin/chain.js +++ b/lib/bcoin/chain.js @@ -615,7 +615,6 @@ Chain.prototype._checkInputs = function _checkInputs(block, prev, flags, callbac if (err) return callback(err); - // Check all transactions for (i = 0; i < block.txs.length; i++) { tx = block.txs[i]; diff --git a/lib/bcoin/datastore.js b/lib/bcoin/datastore.js index 12be9274..74424d21 100644 --- a/lib/bcoin/datastore.js +++ b/lib/bcoin/datastore.js @@ -14,8 +14,8 @@ var assert = utils.assert; var fs = bcoin.fs; var pad32 = utils.pad32; -var MAX_FILE_SIZE = 512 * 1024 * 1024; -var MAX_FILE_SIZE = 10 * 1024 * 1024; +var MAX_FILE_SIZE = 128 * 1024 * 1024; +// var MAX_FILE_SIZE = 10 * 1024 * 1024; var NULL_CHUNK = new Buffer([0xff, 0xff, 0xff, 0xff]); /** diff --git a/lib/bcoin/protocol/framer.js b/lib/bcoin/protocol/framer.js index 26285168..9f4ed84c 100644 --- a/lib/bcoin/protocol/framer.js +++ b/lib/bcoin/protocol/framer.js @@ -630,10 +630,12 @@ Framer._block = function _block(block, useWitness) { tx = block.txs[i]; if (tx.render) { - witnessSize += tx._witnessSize; - tx = useWitness && tx.hasWitness() + p = useWitness ? tx.render() : tx.renderNormal(); + witnessSize += tx._witnessSize; + tx = p; + p = null; } else { tx = useWitness && bcoin.tx.prototype.hasWitness.call(block.txs[i]) ? Framer.witnessTX(block.txs[i])