Merge pull request bitcoinjs#530 from bitcoinjs/lesscomp

address: fix compiled assumption for fromOutputScript
mbijon · Jan 28, 2016 · 682ba7e · 682ba7e
2 parents 4ee194e + 67da1b3
commit 682ba7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/address.js b/src/address.js
@@ -18,8 +18,8 @@ function fromBase58Check (address) {
 function fromOutputScript (scriptPubKey, network) {
   network = network || networks.bitcoin
 
-  if (bscript.isPubKeyHashOutput(scriptPubKey)) return toBase58Check(scriptPubKey.slice(3, 23), network.pubKeyHash)
-  if (bscript.isScriptHashOutput(scriptPubKey)) return toBase58Check(scriptPubKey.slice(2, 22), network.scriptHash)
+  if (bscript.isPubKeyHashOutput(scriptPubKey)) return toBase58Check(bscript.compile(scriptPubKey).slice(3, 23), network.pubKeyHash)
+  if (bscript.isScriptHashOutput(scriptPubKey)) return toBase58Check(bscript.compile(scriptPubKey).slice(2, 22), network.scriptHash)
 
   throw new Error(bscript.toASM(scriptPubKey) + ' has no matching Address')
 }

diff --git a/test/address.js b/test/address.js
@@ -36,6 +36,15 @@ describe('address', function () {
       })
     })
 
+    fixtures.valid.forEach(function (f) {
+      it('parses (as chunks) ' + f.script.slice(0, 30) + '... (' + f.network + ')', function () {
+        var chunks = bscript.decompile(bscript.fromASM(f.script))
+        var address = baddress.fromOutputScript(chunks, networks[f.network])
+
+        assert.strictEqual(address, f.base58check)
+      })
+    })
+
     fixtures.invalid.fromOutputScript.forEach(function (f) {
       it('throws when ' + f.script.slice(0, 30) + '... ' + f.exception, function () {
         var script = bscript.fromASM(f.script)