diff --git a/lib/bcoin.js b/lib/bcoin.js index 11667ea6..7ccfd5ec 100644 --- a/lib/bcoin.js +++ b/lib/bcoin.js @@ -93,6 +93,8 @@ bcoin.ecdsa.keypair = require('elliptic/lib/elliptic/ec/key'); bcoin.utils = utils; bcoin.utils.debug = bcoin.debug; +bcoin.reader = require('./bcoin/reader'); +bcoin.writer = require('./bcoin/writer'); bcoin.profiler = require('./bcoin/profiler'); bcoin.ec = require('./bcoin/ec'); bcoin.lru = require('./bcoin/lru'); diff --git a/lib/bcoin/protocol/framer.js b/lib/bcoin/protocol/framer.js index 1cf4ae8f..9f048dcc 100644 --- a/lib/bcoin/protocol/framer.js +++ b/lib/bcoin/protocol/framer.js @@ -319,40 +319,6 @@ Framer._getBlocks = function _getBlocks(hashes, stop, writer) { return p; }; -Framer.binput = function _input(input) { - var off = 0; - var script, p; - - script = input.script.encode(); - p = new Buffer(32 + 4 + utils.sizeIntv(script.length) + script.length + 4); - - off += utils.copy(new Buffer(input.prevout.hash, 'hex'), p, off); - off += utils.writeU32(p, input.prevout.index, off); - - off += utils.writeIntv(p, script.length, off); - off += utils.copy(script, p, off); - - off += utils.writeU32(p, input.sequence, off); - - return p; -}; - -Framer.boutput = function _output(output) { - var off = 0; - var script, p; - - script = output.script.encode(); - p = new Buffer(8 + utils.sizeIntv(script.length) + script.length); - - off += utils.write64(p, output.value, off); - assert(output.value.byteLength() <= 8); - - off += utils.writeIntv(p, script.length, off); - off += utils.copy(script, p, off); - - return p; -}; - Framer.utxo = Framer.coin = function _coin(coin, extended, writer) { var p = new BufferWriter(writer); @@ -380,52 +346,6 @@ Framer.coin = function _coin(coin, extended, writer) { return p; }; -Framer.btx = function _tx(tx) { - var inputs = []; - var outputs = []; - var inputSize = 0; - var outputSize = 0; - var off = 0; - var p, i, input, output; - - for (i = 0; i < tx.inputs.length; i++) { - input = Framer.binput(tx.inputs[i]); - inputs.push(input); - inputSize += input.length; - } - - for (i = 0; i < tx.outputs.length; i++) { - output = Framer.boutput(tx.outputs[i]); - outputs.push(output); - outputSize += output.length; - } - - p = new Buffer(4 - + utils.sizeIntv(tx.inputs.length) + inputSize - + utils.sizeIntv(tx.outputs.length) + outputSize - + 4); - - off += utils.write32(p, tx.version, off); - - off += utils.writeIntv(p, tx.inputs.length, off); - for (i = 0; i < inputs.length; i++) { - input = inputs[i]; - off += utils.copy(input, p, off); - } - - off += utils.writeIntv(p, tx.outputs.length, off); - for (i = 0; i < outputs.length; i++) { - output = outputs[i]; - off += utils.copy(output, p, off); - } - - off += utils.writeU32(p, tx.locktime, off); - - p._witnessSize = 0; - - return p; -}; - Framer.tx = function _tx(tx, writer) { var p = new BufferWriter(writer); var i;