Merge pull request bitcoinjs#907 from bitcoinjs/nocirc

rm bitcoin.script circular dependencies with templates

Author: dcousens

src/index.js

@@ -1,4 +1,13 @@
+var script = require('./script')
+
+var templates = require('./templates')
+for (var key in templates) {
+  script[key] = templates[key]
+}
+
 module.exports = {
+  bufferutils: require('./bufferutils'), // TODO: remove in 4.0.0
+
   Block: require('./block'),
   ECPair: require('./ecpair'),
   ECSignature: require('./ecsignature'),
@@ -7,9 +16,8 @@ module.exports = {
   TransactionBuilder: require('./transaction_builder'),
 
   address: require('./address'),
-  bufferutils: require('./bufferutils'), // TODO: remove in 4.0.0
   crypto: require('./crypto'),
   networks: require('./networks'),
   opcodes: require('bitcoin-ops'),
-  script: require('./script')
+  script: script
 }

src/script.js

@@ -212,8 +212,3 @@ module.exports = {
   isPushOnly: isPushOnly,
   isDefinedHashType: isDefinedHashType
 }
-
-var templates = require('./templates')
-for (var key in templates) {
-  module.exports[key] = templates[key]
-}

src/templates/multisig/input.js

@@ -2,6 +2,7 @@
 
 var Buffer = require('safe-buffer').Buffer
 var bscript = require('../../script')
+var p2mso = require('./output')
 var typeforce = require('typeforce')
 var OPS = require('bitcoin-ops')
 
@@ -28,7 +29,7 @@ function encodeStack (signatures, scriptPubKey) {
   typeforce([partialSignature], signatures)
 
   if (scriptPubKey) {
-    var scriptData = bscript.multisig.output.decode(scriptPubKey)
+    var scriptData = p2mso.decode(scriptPubKey)
 
     if (signatures.length < scriptData.m) {
       throw new TypeError('Not enough signatures provided')

src/templates/scripthash/input.js

@@ -4,6 +4,12 @@ var Buffer = require('safe-buffer').Buffer
 var bscript = require('../../script')
 var typeforce = require('typeforce')
 
+var p2ms = require('../multisig/')
+var p2pk = require('../pubkey/')
+var p2pkh = require('../pubkeyhash/')
+var p2wpkho = require('../witnesspubkeyhash/output')
+var p2wsho = require('../witnessscripthash/output')
+
 function check (script, allowIncomplete) {
   var chunks = bscript.decompile(script)
   if (chunks.length < 1) return false
@@ -22,19 +28,19 @@ function check (script, allowIncomplete) {
 
   // is witness?
   if (chunks.length === 1) {
-    return bscript.witnessScriptHash.output.check(redeemScriptChunks) ||
-      bscript.witnessPubKeyHash.output.check(redeemScriptChunks)
+    return p2wsho.check(redeemScriptChunks) ||
+      p2wpkho.check(redeemScriptChunks)
   }
 
   // match types
-  if (bscript.pubKeyHash.input.check(scriptSigChunks) &&
-    bscript.pubKeyHash.output.check(redeemScriptChunks)) return true
+  if (p2pkh.input.check(scriptSigChunks) &&
+    p2pkh.output.check(redeemScriptChunks)) return true
 
-  if (bscript.multisig.input.check(scriptSigChunks, allowIncomplete) &&
-    bscript.multisig.output.check(redeemScriptChunks)) return true
+  if (p2ms.input.check(scriptSigChunks, allowIncomplete) &&
+    p2ms.output.check(redeemScriptChunks)) return true
 
-  if (bscript.pubKey.input.check(scriptSigChunks) &&
-    bscript.pubKey.output.check(redeemScriptChunks)) return true
+  if (p2pk.input.check(scriptSigChunks) &&
+    p2pk.output.check(redeemScriptChunks)) return true
 
   return false
 }