templates: rename to scripts

src/address.js

@@ -1,7 +1,7 @@
 var assert = require('assert')
 var base58check = require('./base58check')
 var networks = require('./networks')
-var templates = require('./templates')
+var scripts = require('./scripts')
 
 function findScriptTypeByVersion(queryVersion) {
   for (var networkName in networks) {
@@ -38,7 +38,7 @@ Address.fromBase58Check = function(string) {
 Address.fromScriptPubKey = function(script, network) {
   network = network || networks.bitcoin
 
-  var type = templates.classifyScriptPubKey(script)
+  var type = scripts.classifyOutput(script)
 
   if (type === 'pubkeyhash') {
     return new Address(script.chunks[2], network.pubKeyHash)
@@ -63,10 +63,11 @@ Address.prototype.toScriptPubKey = function() {
   var scriptType = findScriptTypeByVersion(this.version)
 
   if (scriptType === 'pubkeyhash') {
-    return templates.createPubKeyHashScriptPubKey(this.hash)
+    return scripts.pubKeyHashOutput(this.hash)
 
   } else if (scriptType === 'scripthash') {
-    return templates.createP2SHScriptPubKey(this.hash)
+    return scripts.scriptHashOutput(this.hash)
+
   }
 
   assert(false, this.toString() + ' has no matching Script')

src/index.js

@@ -14,6 +14,7 @@ module.exports = {
   opcodes: require('./opcodes'),
   HDNode: require('./hdnode'),
   Script: require('./script'),
+  scripts: require('./scripts'),
   Transaction: T.Transaction,
   TransactionIn: T.TransactionIn,
   TransactionOut: T.TransactionOut,

src/scripts.js

@@ -2,7 +2,7 @@ var assert = require('assert')
 var opcodes = require('./opcodes')
 var Script = require('./script')
 
-function classifyScriptPubKey(script) {
+function classifyOutput(script) {
   if (isPubkeyhash.call(script)) {
     return 'pubkeyhash'
   } else if (isPubkey.call(script)) {
@@ -18,7 +18,7 @@ function classifyScriptPubKey(script) {
   }
 }
 
-function classifyScriptSig(script) {
+function classifyInput(script) {
   if (script.chunks.length == 1 && Buffer.isBuffer(script.chunks[0])) {
     return 'pubkey'
   } else if (script.chunks.length == 2 && Buffer.isBuffer(script.chunks[0]) && Buffer.isBuffer(script.chunks[1])) {
@@ -82,7 +82,7 @@ function isSmallIntOp(opcode) {
 
 // Standard Script Templates
 // {pubKey} OP_CHECKSIG
-function createPubKeyScriptPubKey(pubKey) {
+function pubKeyOutput(pubKey) {
   return Script.fromChunks([
     pubKey.toBuffer(),
     opcodes.OP_CHECKSIG
@@ -90,7 +90,7 @@ function createPubKeyScriptPubKey(pubKey) {
 }
 
 // OP_DUP OP_HASH160 {pubKeyHash} OP_EQUALVERIFY OP_CHECKSIG
-function createPubKeyHashScriptPubKey(hash) {
+function pubKeyHashOutput(hash) {
   assert(Buffer.isBuffer(hash), 'Expected Buffer, got ' + hash)
 
   return Script.fromChunks([
@@ -103,7 +103,7 @@ function createPubKeyHashScriptPubKey(hash) {
 }
 
 // OP_HASH160 {scriptHash} OP_EQUAL
-function createP2SHScriptPubKey(hash) {
+function scriptHashOutput(hash) {
   assert(Buffer.isBuffer(hash), 'Expected Buffer, got ' + hash)
 
   return Script.fromChunks([
@@ -114,7 +114,7 @@ function createP2SHScriptPubKey(hash) {
 }
 
 // m [pubKeys ...] n OP_CHECKMULTISIG
-function createMultisigScriptPubKey(m, pubKeys) {
+function multisigOutput(m, pubKeys) {
   assert(Array.isArray(pubKeys), 'Expected Array, got ' + pubKeys)
   assert(pubKeys.length >= m, 'Not enough pubKeys provided')
 
@@ -132,21 +132,21 @@ function createMultisigScriptPubKey(m, pubKeys) {
 }
 
 // {signature}
-function createPubKeyScriptSig(signature) {
+function pubKeyInput(signature) {
   assert(Buffer.isBuffer(signature), 'Expected Buffer, got ' + signature)
 
   return Script.fromChunks(signature)
 }
 
 // {signature} {pubKey}
-function createPubKeyHashScriptSig(signature, pubKey) {
+function pubKeyHashInput(signature, pubKey) {
   assert(Buffer.isBuffer(signature), 'Expected Buffer, got ' + signature)
 
   return Script.fromChunks([signature, pubKey.toBuffer()])
 }
 
 // <scriptSig> {serialized scriptPubKey script}
-function createP2SHScriptSig(scriptSig, scriptPubKey) {
+function scriptHashInput(scriptSig, scriptPubKey) {
   return Script.fromChunks([].concat(
     scriptSig.chunks,
     scriptPubKey.toBuffer()
@@ -154,7 +154,7 @@ function createP2SHScriptSig(scriptSig, scriptPubKey) {
 }
 
 // OP_0 [signatures ...]
-function createMultisigScriptSig(signatures, scriptPubKey) {
+function multisigInput(signatures, scriptPubKey) {
   if (scriptPubKey) {
     assert(isMultisig.call(scriptPubKey))
 
@@ -167,14 +167,14 @@ function createMultisigScriptSig(signatures, scriptPubKey) {
 }
 
 module.exports = {
-  classifyScriptPubKey: classifyScriptPubKey,
-  classifyScriptSig: classifyScriptSig,
-  createMultisigScriptPubKey: createMultisigScriptPubKey,
-  createMultisigScriptSig: createMultisigScriptSig,
-  createP2SHScriptPubKey: createP2SHScriptPubKey,
-  createP2SHScriptSig: createP2SHScriptSig,
-  createPubKeyHashScriptPubKey: createPubKeyHashScriptPubKey,
-  createPubKeyHashScriptSig: createPubKeyHashScriptSig,
-  createPubKeyScriptPubKey: createPubKeyScriptPubKey,
-  createPubKeyScriptSig: createPubKeyScriptSig
+  classifyInput: classifyInput,
+  classifyOutput: classifyOutput,
+  multisigInput: multisigInput,
+  multisigOutput: multisigOutput,
+  pubKeyHashInput: pubKeyHashInput,
+  pubKeyHashOutput: pubKeyHashOutput,
+  pubKeyInput: pubKeyInput,
+  pubKeyOutput: pubKeyOutput,
+  scriptHashInput: scriptHashInput,
+  scriptHashOutput: scriptHashOutput
 }

src/transaction.js

@@ -5,7 +5,7 @@ var bufferutils = require('./bufferutils')
 var crypto = require('./crypto')
 var ecdsa = require('./ecdsa')
 var opcodes = require('./opcodes')
-var templates = require('./templates')
+var scripts = require('./scripts')
 
 var Address = require('./address')
 var ECKey = require('./eckey')
@@ -346,7 +346,7 @@ Transaction.prototype.sign = function(index, key, type) {
   var signature = this.signScriptSig(index, script, key, type)
 
   // FIXME: Assumed prior TX was pay-to-pubkey-hash
-  var scriptSig = templates.createPubKeyHashScriptSig(signature, key.pub)
+  var scriptSig = scripts.pubKeyHashInput(signature, key.pub)
   this.setScriptSig(index, scriptSig)
 }