Merge pull request #438 from bitcoinjs/noscript

No Script

src/address.js

@@ -1,7 +1,7 @@
 var base58check = require('bs58check')
-var typeforce = require('typeforce')
 var networks = require('./networks')
 var scripts = require('./scripts')
+var typeforce = require('typeforce')
 var types = require('./types')
 
 function fromBase58Check (address) {
@@ -18,10 +18,11 @@ function fromBase58Check (address) {
 function fromOutputScript (script, network) {
   network = network || networks.bitcoin
 
-  if (scripts.isPubKeyHashOutput(script)) return toBase58Check(script.chunks[2], network.pubKeyHash)
-  if (scripts.isScriptHashOutput(script)) return toBase58Check(script.chunks[1], network.scriptHash)
+  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)
 
-  throw new Error(script.toASM() + ' has no matching Address')
+  throw new Error(scripts.toASM(chunks) + ' has no matching Address')
 }
 
 function toBase58Check (hash, version) {

src/index.js

@@ -1,16 +1,16 @@
 module.exports = {
   Address: require('./address'),
   Block: require('./block'),
-  bufferutils: require('./bufferutils'),
-  crypto: require('./crypto'),
   ECPair: require('./ecpair'),
   ECSignature: require('./ecsignature'),
-  message: require('./message'),
-  opcodes: require('./opcodes'),
   HDNode: require('./hdnode'),
-  Script: require('./script'),
-  scripts: require('./scripts'),
   Transaction: require('./transaction'),
   TransactionBuilder: require('./transaction_builder'),
-  networks: require('./networks')
+
+  bufferutils: require('./bufferutils'),
+  crypto: require('./crypto'),
+  message: require('./message'),
+  networks: require('./networks'),
+  opcodes: require('./opcodes'),
+  scripts: require('./scripts')
 }