From 6ec687deba13f598a9befb2322f1080987f09b8f Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Thu, 20 Aug 2015 13:31:29 +1000 Subject: [PATCH] rename scripts to script --- src/address.js | 24 ++-- src/index.js | 2 +- src/{scripts.js => script.js} | 0 src/transaction.js | 18 ++- src/transaction_builder.js | 38 +++--- test/address.js | 8 +- test/bitcoin.core.js | 8 +- test/fixtures/{scripts.json => script.json} | 0 test/integration/advanced.js | 4 +- test/integration/crypto.js | 4 +- test/{scripts.js => script.js} | 122 ++++++++++---------- test/transaction.js | 13 +-- test/transaction_builder.js | 2 +- 13 files changed, 120 insertions(+), 123 deletions(-) rename src/{scripts.js => script.js} (100%) rename test/fixtures/{scripts.json => script.json} (100%) rename test/{scripts.js => script.js} (67%) diff --git a/src/address.js b/src/address.js index f5fb215..3bd97be 100644 --- a/src/address.js +++ b/src/address.js @@ -1,11 +1,11 @@ -var base58check = require('bs58check') +var bs58check = require('bs58check') +var script = require('./script') var networks = require('./networks') -var scripts = require('./scripts') var typeforce = require('typeforce') var types = require('./types') function fromBase58Check (address) { - var payload = base58check.decode(address) + var payload = bs58check.decode(address) if (payload.length < 21) throw new TypeError(address + ' is too short') if (payload.length > 21) throw new TypeError(address + ' is too long') @@ -15,14 +15,14 @@ function fromBase58Check (address) { return { hash: hash, version: version } } -function fromOutputScript (script, network) { +function fromOutputScript (scriptPubKey, network) { network = network || networks.bitcoin - var chunks = scripts.decompile(script) - if (scripts.isPubKeyHashOutput(chunks)) return toBase58Check(chunks[2], network.pubKeyHash) - if (scripts.isScriptHashOutput(chunks)) return toBase58Check(chunks[1], network.scriptHash) + var chunks = script.decompile(scriptPubKey) + if (script.isPubKeyHashOutput(chunks)) return toBase58Check(chunks[2], network.pubKeyHash) + if (script.isScriptHashOutput(chunks)) return toBase58Check(chunks[1], network.scriptHash) - throw new Error(scripts.toASM(chunks) + ' has no matching Address') + throw new Error(script.toASM(chunks) + ' has no matching Address') } function toBase58Check (hash, version) { @@ -32,21 +32,21 @@ function toBase58Check (hash, version) { payload.writeUInt8(version, 0) hash.copy(payload, 1) - return base58check.encode(payload) + return bs58check.encode(payload) } function toOutputScript (address, network) { network = network || networks.bitcoin - var payload = base58check.decode(address) + var payload = bs58check.decode(address) if (payload.length < 21) throw new TypeError(address + ' is too short') if (payload.length > 21) throw new TypeError(address + ' is too long') var version = payload.readUInt8(0) var hash = payload.slice(1) - if (version === network.pubKeyHash) return scripts.pubKeyHashOutput(hash) - if (version === network.scriptHash) return scripts.scriptHashOutput(hash) + if (version === network.pubKeyHash) return script.pubKeyHashOutput(hash) + if (version === network.scriptHash) return script.scriptHashOutput(hash) throw new Error(address + ' has no matching Script') } diff --git a/src/index.js b/src/index.js index 4edbe0d..a191f17 100644 --- a/src/index.js +++ b/src/index.js @@ -12,5 +12,5 @@ module.exports = { message: require('./message'), networks: require('./networks'), opcodes: require('./opcodes'), - scripts: require('./scripts') + script: require('./script') } diff --git a/src/scripts.js b/src/script.js similarity index 100% rename from src/scripts.js rename to src/script.js diff --git a/src/transaction.js b/src/transaction.js index 4a5bc0f..3cbacbf 100644 --- a/src/transaction.js +++ b/src/transaction.js @@ -1,7 +1,7 @@ var bufferutils = require('./bufferutils') var crypto = require('./crypto') var opcodes = require('./opcodes') -var scripts = require('./scripts') +var script = require('./script') var typeforce = require('typeforce') var types = require('./types') @@ -99,7 +99,7 @@ Transaction.isCoinbaseHash = function (buffer) { var EMPTY_SCRIPT = new Buffer(0) -Transaction.prototype.addInput = function (hash, index, sequence, script) { +Transaction.prototype.addInput = function (hash, index, sequence, scriptSig) { typeforce(types.tuple( types.Hash256bit, types.UInt32, @@ -111,13 +111,11 @@ Transaction.prototype.addInput = function (hash, index, sequence, script) { sequence = Transaction.DEFAULT_SEQUENCE } - script = script || EMPTY_SCRIPT - // Add the input and return the input's index return (this.ins.push({ hash: hash, index: index, - script: script, + script: scriptSig || EMPTY_SCRIPT, sequence: sequence }) - 1) } @@ -133,8 +131,8 @@ Transaction.prototype.addOutput = function (scriptPubKey, value) { } Transaction.prototype.byteLength = function () { - function scriptSize (script) { - var length = script.length + function scriptSize (someScript) { + var length = someScript.length return bufferutils.varIntSize(length) + length } @@ -193,7 +191,7 @@ Transaction.prototype.hashForSignature = function (inIndex, prevOutScript, hashT // in case concatenating two scripts ends up with two codeseparators, // or an extra one at the end, this prevents all those possible incompatibilities. - var hashScript = scripts.compile(scripts.decompile(prevOutScript).filter(function (x) { + var hashScript = script.compile(script.decompile(prevOutScript).filter(function (x) { return x !== opcodes.OP_CODESEPARATOR })) var i @@ -320,10 +318,10 @@ Transaction.prototype.toHex = function () { return this.toBuffer().toString('hex') } -Transaction.prototype.setInputScript = function (index, script) { +Transaction.prototype.setInputScript = function (index, scriptSig) { typeforce(types.tuple(types.Number, types.Buffer), arguments) - this.ins[index].script = script + this.ins[index].script = scriptSig } module.exports = Transaction diff --git a/src/transaction_builder.js b/src/transaction_builder.js index 1c00057..c349d3a 100644 --- a/src/transaction_builder.js +++ b/src/transaction_builder.js @@ -3,7 +3,7 @@ var bcrypto = require('./crypto') var bufferutils = require('./bufferutils') var networks = require('./networks') var ops = require('./opcodes') -var scripts = require('./scripts') +var script = require('./script') var ECPair = require('./ecpair') var ECSignature = require('./ecsignature') @@ -12,21 +12,21 @@ var Transaction = require('./transaction') function extractInput (txIn) { var redeemScript var scriptSig = txIn.script - var scriptSigChunks = scripts.decompile(scriptSig) + var scriptSigChunks = script.decompile(scriptSig) var prevOutScript - var prevOutType = scripts.classifyInput(scriptSig, true) + var prevOutType = script.classifyInput(scriptSig, true) var scriptType // Re-classify if scriptHash if (prevOutType === 'scripthash') { redeemScript = scriptSigChunks.slice(-1)[0] - prevOutScript = scripts.scriptHashOutput(bcrypto.hash160(redeemScript)) + prevOutScript = script.scriptHashOutput(bcrypto.hash160(redeemScript)) - scriptSig = scripts.compile(scriptSigChunks.slice(0, -1)) + scriptSig = script.compile(scriptSigChunks.slice(0, -1)) scriptSigChunks = scriptSigChunks.slice(0, -1) - scriptType = scripts.classifyInput(scriptSig, true) + scriptType = script.classifyInput(scriptSig, true) } else { scriptType = prevOutType } @@ -34,7 +34,7 @@ function extractInput (txIn) { // pre-empt redeemScript decompilation var redeemScriptChunks if (redeemScript) { - redeemScriptChunks = scripts.decompile(redeemScript) + redeemScriptChunks = script.decompile(redeemScript) } // Extract hashType, pubKeys and signatures @@ -46,7 +46,7 @@ function extractInput (txIn) { hashType = parsed.hashType pubKeys = scriptSigChunks.slice(1) signatures = [parsed.signature] - prevOutScript = scripts.pubKeyHashOutput(bcrypto.hash160(pubKeys[0])) + prevOutScript = script.pubKeyHashOutput(bcrypto.hash160(pubKeys[0])) break @@ -147,8 +147,8 @@ TransactionBuilder.prototype.addInput = function (txHash, vout, sequence, prevOu var input = {} if (prevOutScript) { - var prevOutScriptChunks = scripts.decompile(prevOutScript) - var prevOutType = scripts.classifyOutput(prevOutScriptChunks) + var prevOutScriptChunks = script.decompile(prevOutScript) + var prevOutType = script.classifyOutput(prevOutScriptChunks) // if we can, extract pubKey information switch (prevOutType) { @@ -240,7 +240,7 @@ TransactionBuilder.prototype.__build = function (allowIncomplete) { switch (scriptType) { case 'pubkeyhash': var pkhSignature = input.signatures[0].toScriptSignature(input.hashType) - scriptSig = scripts.pubKeyHashInput(pkhSignature, input.pubKeys[0]) + scriptSig = script.pubKeyHashInput(pkhSignature, input.pubKeys[0]) break case 'multisig': @@ -262,12 +262,12 @@ TransactionBuilder.prototype.__build = function (allowIncomplete) { } var redeemScript = allowIncomplete ? undefined : input.redeemScript - scriptSig = scripts.multisigInput(msSignatures, redeemScript) + scriptSig = script.multisigInput(msSignatures, redeemScript) break case 'pubkey': var pkSignature = input.signatures[0].toScriptSignature(input.hashType) - scriptSig = scripts.pubKeyInput(pkSignature) + scriptSig = script.pubKeyInput(pkSignature) break } } @@ -276,7 +276,7 @@ TransactionBuilder.prototype.__build = function (allowIncomplete) { if (scriptSig) { // wrap as scriptHash if necessary if (input.prevOutType === 'scripthash') { - scriptSig = scripts.scriptHashInput(scriptSig, input.redeemScript) + scriptSig = script.scriptHashInput(scriptSig, input.redeemScript) } tx.setInputScript(index, scriptSig) @@ -318,14 +318,14 @@ TransactionBuilder.prototype.sign = function (index, keyPair, redeemScript, hash if (input.prevOutScript) { if (input.prevOutType !== 'scripthash') throw new Error('PrevOutScript must be P2SH') - var scriptHash = scripts.decompile(input.prevOutScript)[1] + var scriptHash = script.decompile(input.prevOutScript)[1] if (!bufferutils.equal(scriptHash, bcrypto.hash160(redeemScript))) throw new Error('RedeemScript does not match ' + scriptHash.toString('hex')) } - var scriptType = scripts.classifyOutput(redeemScript) + var scriptType = script.classifyOutput(redeemScript) if (!canSignTypes[scriptType]) throw new Error('RedeemScript not supported (' + scriptType + ')') - var redeemScriptChunks = scripts.decompile(redeemScript) + var redeemScriptChunks = script.decompile(redeemScript) var pubKeys = [] switch (scriptType) { case 'multisig': @@ -347,7 +347,7 @@ TransactionBuilder.prototype.sign = function (index, keyPair, redeemScript, hash // if we don't have a prevOutScript, generate a P2SH script if (!input.prevOutScript) { - input.prevOutScript = scripts.scriptHashOutput(bcrypto.hash160(redeemScript)) + input.prevOutScript = script.scriptHashOutput(bcrypto.hash160(redeemScript)) input.prevOutType = 'scripthash' } @@ -365,7 +365,7 @@ TransactionBuilder.prototype.sign = function (index, keyPair, redeemScript, hash // we know nothin' Jon Snow, assume pubKeyHash } else { - input.prevOutScript = scripts.pubKeyHashOutput(bcrypto.hash160(keyPair.getPublicKeyBuffer())) + input.prevOutScript = script.pubKeyHashOutput(bcrypto.hash160(keyPair.getPublicKeyBuffer())) input.prevOutType = 'pubkeyhash' input.pubKeys = [kpPubKey] input.scriptType = input.prevOutType diff --git a/test/address.js b/test/address.js index 345a109..e765eb0 100644 --- a/test/address.js +++ b/test/address.js @@ -3,7 +3,7 @@ var assert = require('assert') var baddress = require('../src/address') var networks = require('../src/networks') -var scripts = require('../src/scripts') +var bscript = require('../src/script') var fixtures = require('./fixtures/address.json') describe('address', function () { @@ -29,7 +29,7 @@ describe('address', function () { describe('fromOutputScript', function () { fixtures.valid.forEach(function (f) { it('parses ' + f.script.slice(0, 30) + '... (' + f.network + ')', function () { - var script = scripts.fromASM(f.script) + var script = bscript.fromASM(f.script) var address = baddress.fromOutputScript(script, networks[f.network]) assert.strictEqual(address, f.base58check) @@ -38,7 +38,7 @@ describe('address', function () { fixtures.invalid.fromOutputScript.forEach(function (f) { it('throws when ' + f.script.slice(0, 30) + '... ' + f.exception, function () { - var script = scripts.fromASM(f.script) + var script = bscript.fromASM(f.script) assert.throws(function () { baddress.fromOutputScript(script) @@ -64,7 +64,7 @@ describe('address', function () { it('exports ' + f.script.slice(0, 30) + '... (' + f.network + ')', function () { var script = baddress.toOutputScript(f.base58check, network) - assert.strictEqual(scripts.toASM(script), f.script) + assert.strictEqual(bscript.toASM(script), f.script) }) }) diff --git a/test/bitcoin.core.js b/test/bitcoin.core.js index 1b56526..cdc3b8e 100644 --- a/test/bitcoin.core.js +++ b/test/bitcoin.core.js @@ -162,7 +162,7 @@ describe('Bitcoin-core', function () { }) }) - describe('scripts.fromASM', function () { + describe('script.fromASM', function () { tx_valid.forEach(function (f) { // Objects that are only a single string are ignored if (f.length === 1) return @@ -185,7 +185,7 @@ describe('Bitcoin-core', function () { it('can parse ' + prevOutScriptPubKey, function () { // TODO: we can probably do better validation than this - bitcoin.scripts.fromASM(prevOutScriptPubKey) + bitcoin.script.fromASM(prevOutScriptPubKey) }) }) }) @@ -218,8 +218,8 @@ describe('Bitcoin-core', function () { assert.strictEqual(transaction.toHex(), txHex) var script = new Buffer(scriptHex, 'hex') - var scriptChunks = bitcoin.scripts.decompile(script) - assert.strictEqual(bitcoin.scripts.compile(scriptChunks).toString('hex'), scriptHex) + var scriptChunks = bitcoin.script.decompile(script) + assert.strictEqual(bitcoin.script.compile(scriptChunks).toString('hex'), scriptHex) var hash = transaction.hashForSignature(inIndex, script, hashType) assert.deepEqual(hash, expectedHash) diff --git a/test/fixtures/scripts.json b/test/fixtures/script.json similarity index 100% rename from test/fixtures/scripts.json rename to test/fixtures/script.json diff --git a/test/integration/advanced.js b/test/integration/advanced.js index 030bd38..c8f1f7a 100644 --- a/test/integration/advanced.js +++ b/test/integration/advanced.js @@ -36,7 +36,7 @@ describe('bitcoinjs-lib (advanced)', function () { var tx = new bitcoin.TransactionBuilder(network) var data = new Buffer('bitcoinjs-lib') - var dataScript = bitcoin.scripts.nullDataOutput(data) + var dataScript = bitcoin.script.nullDataOutput(data) var unspent = unspents.pop() @@ -55,7 +55,7 @@ describe('bitcoinjs-lib (advanced)', function () { var actual = bitcoin.Transaction.fromHex(transaction.txHex) var dataScript2 = actual.outs[0].script - var data2 = bitcoin.scripts.decompile(dataScript2)[1] + var data2 = bitcoin.script.decompile(dataScript2)[1] assert.deepEqual(dataScript, dataScript2) assert.deepEqual(data, data2) diff --git a/test/integration/crypto.js b/test/integration/crypto.js index 6bc0e88..12ed70c 100644 --- a/test/integration/crypto.js +++ b/test/integration/crypto.js @@ -132,9 +132,9 @@ describe('bitcoinjs-lib (crypto)', function () { inputs.forEach(function (input) { var transaction = transactions[input.txId] var script = transaction.ins[input.vout].script - var scriptChunks = bitcoin.scripts.decompile(script) + var scriptChunks = bitcoin.script.decompile(script) - assert(bitcoin.scripts.isPubKeyHashInput(scriptChunks), 'Expected pubKeyHash script') + assert(bitcoin.script.isPubKeyHashInput(scriptChunks), 'Expected pubKeyHash script') var prevOutTxId = bitcoin.bufferutils.reverse(transaction.ins[input.vout].hash).toString('hex') var prevVout = transaction.ins[input.vout].index diff --git a/test/scripts.js b/test/script.js similarity index 67% rename from test/scripts.js rename to test/script.js index 73b9f0d..ce97114 100644 --- a/test/scripts.js +++ b/test/script.js @@ -3,11 +3,11 @@ var assert = require('assert') var bcrypto = require('../src/crypto') var ops = require('../src/opcodes') -var scripts = require('../src/scripts') +var script = require('../src/script') -var fixtures = require('./fixtures/scripts.json') +var fixtures = require('./fixtures/script.json') -describe('scripts', function () { +describe('script', function () { // TODO describe.skip('isCanonicalPubKey', function () {}) describe.skip('isCanonicalSignature', function () {}) @@ -16,17 +16,17 @@ describe('scripts', function () { fixtures.valid.forEach(function (f) { if (f.scriptSig) { it('encodes/decodes ' + f.scriptSig, function () { - var script = scripts.fromASM(f.scriptSig) + var scriptSig = script.fromASM(f.scriptSig) - assert.strictEqual(scripts.toASM(script), f.scriptSig) + assert.strictEqual(script.toASM(scriptSig), f.scriptSig) }) } if (f.scriptPubKey) { it('encodes/decodes ' + f.scriptPubKey, function () { - var script = scripts.fromASM(f.scriptPubKey) + var scriptPubKey = script.fromASM(f.scriptPubKey) - assert.strictEqual(scripts.toASM(script), f.scriptPubKey) + assert.strictEqual(script.toASM(scriptPubKey), f.scriptPubKey) }) } }) @@ -36,17 +36,17 @@ describe('scripts', function () { fixtures.valid.forEach(function (f) { if (f.scriptSig) { it('compiles ' + f.scriptSig, function () { - var script = scripts.fromASM(f.scriptSig) + var scriptSig = script.fromASM(f.scriptSig) - assert.strictEqual(scripts.compile(script).toString('hex'), f.scriptSigHex) + assert.strictEqual(script.compile(scriptSig).toString('hex'), f.scriptSigHex) }) } if (f.scriptPubKey) { it('compiles ' + f.scriptPubKey, function () { - var script = scripts.fromASM(f.scriptPubKey) + var scriptPubKey = script.fromASM(f.scriptPubKey) - assert.strictEqual(scripts.compile(script).toString('hex'), f.scriptPubKeyHex) + assert.strictEqual(script.compile(scriptPubKey).toString('hex'), f.scriptPubKeyHex) }) } }) @@ -56,24 +56,24 @@ describe('scripts', function () { fixtures.valid.forEach(function (f) { if (f.scriptSigHex) { it('decompiles ' + f.scriptSig, function () { - var chunks = scripts.decompile(new Buffer(f.scriptSigHex, 'hex')) + var chunks = script.decompile(new Buffer(f.scriptSigHex, 'hex')) - assert.strictEqual(scripts.toASM(chunks), f.scriptSig) + assert.strictEqual(script.toASM(chunks), f.scriptSig) }) } if (f.scriptPubKeyHex) { it('decompiles ' + f.scriptPubKey, function () { - var chunks = scripts.decompile(new Buffer(f.scriptPubKeyHex, 'hex')) + var chunks = script.decompile(new Buffer(f.scriptPubKeyHex, 'hex')) - assert.strictEqual(scripts.toASM(chunks), f.scriptPubKey) + assert.strictEqual(script.toASM(chunks), f.scriptPubKey) }) } }) fixtures.invalid.decompile.forEach(function (f) { it('decompiles ' + f.hex + ' to [] because of "' + f.description + '"', function () { - var chunks = scripts.decompile(new Buffer(f.hex, 'hex')) + var chunks = script.decompile(new Buffer(f.hex, 'hex')) assert.strictEqual(chunks.length, 0) }) @@ -85,8 +85,8 @@ describe('scripts', function () { if (!f.scriptSig) return it('classifies ' + f.scriptSig + ' as ' + f.type, function () { - var script = scripts.fromASM(f.scriptSig) - var type = scripts.classifyInput(script) + var scriptSig = script.fromASM(f.scriptSig) + var type = script.classifyInput(scriptSig) assert.strictEqual(type, f.type) }) @@ -97,8 +97,8 @@ describe('scripts', function () { if (!f.typeIncomplete) return it('classifies incomplete ' + f.scriptSig + ' as ' + f.typeIncomplete, function () { - var script = scripts.fromASM(f.scriptSig) - var type = scripts.classifyInput(script, true) + var scriptSig = script.fromASM(f.scriptSig) + var type = script.classifyInput(scriptSig, true) assert.strictEqual(type, f.typeIncomplete) }) @@ -110,8 +110,8 @@ describe('scripts', function () { if (!f.scriptPubKey) return it('classifies ' + f.scriptPubKey + ' as ' + f.type, function () { - var script = scripts.fromASM(f.scriptPubKey) - var type = scripts.classifyOutput(script) + var scriptPubKey = script.fromASM(f.scriptPubKey) + var type = script.classifyOutput(scriptPubKey) assert.strictEqual(type, f.type) }) @@ -122,25 +122,25 @@ describe('scripts', function () { var inputFnName = 'is' + type + 'Input' var outputFnName = 'is' + type + 'Output' - var inputFn = scripts[inputFnName] - var outputFn = scripts[outputFnName] + var inputFn = script[inputFnName] + var outputFn = script[outputFnName] describe('is' + type + 'Input', function () { fixtures.valid.forEach(function (f) { var expected = type.toLowerCase() === f.type if (inputFn && f.scriptSig) { - var script = scripts.fromASM(f.scriptSig) + var scriptSig = script.fromASM(f.scriptSig) it('returns ' + expected + ' for ' + f.scriptSig, function () { - assert.strictEqual(inputFn(script), expected) + assert.strictEqual(inputFn(scriptSig), expected) }) if (f.typeIncomplete) { var expectedIncomplete = type.toLowerCase() === f.typeIncomplete it('returns ' + expected + ' for ' + f.scriptSig, function () { - assert.strictEqual(inputFn(script, true), expectedIncomplete) + assert.strictEqual(inputFn(scriptSig, true), expectedIncomplete) }) } } @@ -151,15 +151,15 @@ describe('scripts', function () { fixtures.invalid[inputFnName].forEach(function (f) { if (inputFn && (f.scriptSig || f.scriptSigHex)) { it('returns false for ' + f.description + ' (' + (f.scriptSig || f.scriptSigHex) + ')', function () { - var script + var scriptSig if (f.scriptSig) { - script = scripts.fromASM(f.scriptSig) + scriptSig = script.fromASM(f.scriptSig) } else { - script = scripts.fromHex(f.scriptSigHex) + scriptSig = script.fromHex(f.scriptSigHex) } - assert.strictEqual(inputFn(script), false) + assert.strictEqual(inputFn(scriptSig), false) }) } }) @@ -171,9 +171,9 @@ describe('scripts', function () { if (outputFn && f.scriptPubKey) { it('returns ' + expected + ' for ' + f.scriptPubKey, function () { - var script = scripts.fromASM(f.scriptPubKey) + var scriptPubKey = script.fromASM(f.scriptPubKey) - assert.strictEqual(outputFn(script), expected) + assert.strictEqual(outputFn(scriptPubKey), expected) }) } }) @@ -183,9 +183,9 @@ describe('scripts', function () { fixtures.invalid[outputFnName].forEach(function (f) { if (outputFn && f.scriptPubKey) { it('returns false for ' + f.description + ' (' + f.scriptPubKey + ')', function () { - var script = scripts.fromASM(f.scriptPubKey) + var scriptPubKey = script.fromASM(f.scriptPubKey) - assert.strictEqual(outputFn(script), false) + assert.strictEqual(outputFn(scriptPubKey), false) }) } }) @@ -199,8 +199,8 @@ describe('scripts', function () { it('returns ' + f.scriptSig, function () { var signature = new Buffer(f.signature, 'hex') - var scriptSig = scripts.pubKeyInput(signature) - assert.strictEqual(scripts.toASM(scriptSig), f.scriptSig) + var scriptSig = script.pubKeyInput(signature) + assert.strictEqual(script.toASM(scriptSig), f.scriptSig) }) }) }) @@ -211,9 +211,9 @@ describe('scripts', function () { it('returns ' + f.scriptPubKey, function () { var pubKey = new Buffer(f.pubKey, 'hex') - var scriptPubKey = scripts.pubKeyOutput(pubKey) + var scriptPubKey = script.pubKeyOutput(pubKey) - assert.strictEqual(scripts.toASM(scriptPubKey), f.scriptPubKey) + assert.strictEqual(script.toASM(scriptPubKey), f.scriptPubKey) }) }) }) @@ -227,8 +227,8 @@ describe('scripts', function () { it('returns ' + f.scriptSig, function () { var signature = new Buffer(f.signature, 'hex') - var scriptSig = scripts.pubKeyHashInput(signature, pubKey) - assert.strictEqual(scripts.toASM(scriptSig), f.scriptSig) + var scriptSig = script.pubKeyHashInput(signature, pubKey) + assert.strictEqual(script.toASM(scriptSig), f.scriptSig) }) }) }) @@ -241,8 +241,8 @@ describe('scripts', function () { var pubKeyHash = bcrypto.hash160(pubKey) it('returns ' + f.scriptPubKey, function () { - var scriptPubKey = scripts.pubKeyHashOutput(pubKeyHash) - assert.strictEqual(scripts.toASM(scriptPubKey), f.scriptPubKey) + var scriptPubKey = script.pubKeyHashOutput(pubKeyHash) + assert.strictEqual(script.toASM(scriptPubKey), f.scriptPubKey) }) }) @@ -251,7 +251,7 @@ describe('scripts', function () { it('throws on ' + f.exception, function () { assert.throws(function () { - scripts.pubKeyHashOutput(hash) + script.pubKeyHashOutput(hash) }, new RegExp(f.exception)) }) }) @@ -266,13 +266,13 @@ describe('scripts', function () { return signature ? new Buffer(signature, 'hex') : ops.OP_0 }) - var scriptSig = scripts.multisigInput(signatures) - assert.strictEqual(scripts.toASM(scriptSig), f.scriptSig) + var scriptSig = script.multisigInput(signatures) + assert.strictEqual(script.toASM(scriptSig), f.scriptSig) }) }) fixtures.invalid.multisigInput.forEach(function (f) { - var scriptPubKey = scripts.fromASM(f.scriptPubKey) + var scriptPubKey = script.fromASM(f.scriptPubKey) it('throws on ' + f.exception, function () { var signatures = f.signatures.map(function (signature) { @@ -280,7 +280,7 @@ describe('scripts', function () { }) assert.throws(function () { - scripts.multisigInput(signatures, scriptPubKey) + script.multisigInput(signatures, scriptPubKey) }, new RegExp(f.exception)) }) }) @@ -291,10 +291,10 @@ describe('scripts', function () { if (f.type !== 'multisig') return var pubKeys = f.pubKeys.map(function (p) { return new Buffer(p, 'hex') }) - var scriptPubKey = scripts.multisigOutput(pubKeys.length, pubKeys) + var scriptPubKey = script.multisigOutput(pubKeys.length, pubKeys) it('returns ' + f.scriptPubKey, function () { - assert.strictEqual(scripts.toASM(scriptPubKey), f.scriptPubKey) + assert.strictEqual(script.toASM(scriptPubKey), f.scriptPubKey) }) }) @@ -305,7 +305,7 @@ describe('scripts', function () { it('throws on ' + f.exception, function () { assert.throws(function () { - scripts.multisigOutput(f.m, pubKeys) + script.multisigOutput(f.m, pubKeys) }, new RegExp(f.exception)) }) }) @@ -315,14 +315,14 @@ describe('scripts', function () { fixtures.valid.forEach(function (f) { if (f.type !== 'scripthash') return - var redeemScript = scripts.fromASM(f.redeemScript) - var redeemScriptSig = scripts.fromASM(f.redeemScriptSig) + var redeemScript = script.fromASM(f.redeemScript) + var redeemScriptSig = script.fromASM(f.redeemScriptSig) it('returns ' + f.scriptSig, function () { - var scriptSig = scripts.scriptHashInput(redeemScriptSig, redeemScript) + var scriptSig = script.scriptHashInput(redeemScriptSig, redeemScript) if (f.scriptSig) { - assert.strictEqual(scripts.toASM(scriptSig), f.scriptSig) + assert.strictEqual(script.toASM(scriptSig), f.scriptSig) } else { assert.strictEqual(scriptSig.toString('hex'), f.scriptSigHex) @@ -337,10 +337,10 @@ describe('scripts', function () { if (!f.scriptPubKey) return it('returns ' + f.scriptPubKey, function () { - var redeemScript = scripts.fromASM(f.redeemScript) - var scriptPubKey = scripts.scriptHashOutput(bcrypto.hash160(redeemScript)) + var redeemScript = script.fromASM(f.redeemScript) + var scriptPubKey = script.scriptHashOutput(bcrypto.hash160(redeemScript)) - assert.strictEqual(scripts.toASM(scriptPubKey), f.scriptPubKey) + assert.strictEqual(script.toASM(scriptPubKey), f.scriptPubKey) }) }) @@ -349,7 +349,7 @@ describe('scripts', function () { it('throws on ' + f.exception, function () { assert.throws(function () { - scripts.scriptHashOutput(hash) + script.scriptHashOutput(hash) }, new RegExp(f.exception)) }) }) @@ -360,10 +360,10 @@ describe('scripts', function () { if (f.type !== 'nulldata') return var data = new Buffer(f.data, 'hex') - var scriptPubKey = scripts.nullDataOutput(data) + var scriptPubKey = script.nullDataOutput(data) it('returns ' + f.scriptPubKey, function () { - assert.strictEqual(scripts.toASM(scriptPubKey), f.scriptPubKey) + assert.strictEqual(script.toASM(scriptPubKey), f.scriptPubKey) }) }) }) diff --git a/test/transaction.js b/test/transaction.js index f5effe6..6433887 100644 --- a/test/transaction.js +++ b/test/transaction.js @@ -1,7 +1,7 @@ /* global describe, it, beforeEach */ var assert = require('assert') -var scripts = require('../src/scripts') +var bscript = require('../src/script') var Transaction = require('../src/transaction') @@ -15,17 +15,16 @@ describe('Transaction', function () { raw.ins.forEach(function (txIn) { var txHash = new Buffer(txIn.hash, 'hex') - var script + var scriptSig if (txIn.data) { - var data = new Buffer(txIn.data, 'hex') - script = data + scriptSig = new Buffer(txIn.data, 'hex') } else if (txIn.script) { - script = scripts.fromASM(txIn.script) + scriptSig = bscript.fromASM(txIn.script) } - tx.addInput(txHash, txIn.index, txIn.sequence, script) + tx.addInput(txHash, txIn.index, txIn.sequence, scriptSig) }) raw.outs.forEach(function (txOut) { @@ -36,7 +35,7 @@ describe('Transaction', function () { script = data } else if (txOut.script) { - script = scripts.fromASM(txOut.script) + script = bscript.fromASM(txOut.script) } tx.addOutput(script, txOut.value) diff --git a/test/transaction_builder.js b/test/transaction_builder.js index 07e5a26..13faf50 100644 --- a/test/transaction_builder.js +++ b/test/transaction_builder.js @@ -3,7 +3,7 @@ var address = require('../src/address') var assert = require('assert') var ops = require('../src/opcodes') -var script = require('../src/scripts') +var script = require('../src/script') var BigInteger = require('bigi') var ECPair = require('../src/ecpair')