Merge branch 'scriptclean'

Conflicts: test/wallet.js
2014-06-14 10:30:42 +08:00 · 2014-06-14 10:30:42 +08:00 · 8e00eb6855
commit 8e00eb6855
parent 07a0beee90 38a2475bf5
20 changed files with 500 additions and 587 deletions
--- a/src/wallet.js
+++ b/src/wallet.js
@ -152,7 +152,7 @@ function Wallet(seed, network) {
      var address

      try {
-        address = Address.fromScriptPubKey(txOut.script, network).toString()
+        address = Address.fromOutputScript(txOut.script, network).toString()
      } catch(e) {
        if (!(e.message.match(/has no matching Address/))) throw e
      }