From 83381186d136064a48bc4136b983d346a99b07d4 Mon Sep 17 00:00:00 2001
From: Wei Lu <luwei.here@gmail.com>
Date: Sat, 22 Mar 2014 21:01:40 +0800
Subject: [PATCH] add (some) fromAddress and getInType tests to script

---
 src/script.js  |  6 ++++++
 test/script.js | 34 ++++++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/script.js b/src/script.js
index c47945c..85c4454 100644
--- a/src/script.js
+++ b/src/script.js
@@ -150,6 +150,7 @@ Script.prototype.toScriptHash = function() {
     return util.sha256ripe160(this.buffer)
 }
 
+//TODO: support testnet
 Script.prototype.getToAddress = function() {
     var outType = this.getOutType();
 
@@ -164,6 +165,11 @@ Script.prototype.getToAddress = function() {
     return new Address(this.chunks[1], 5)
 }
 
+//TODO: support testnet
+Script.prototype.getFromAddress = function(){
+    return new Address(this.simpleInHash());
+}
+
 /**
  * Compare the script to known templates of scriptSig.
  *
diff --git a/test/script.js b/test/script.js
index 76f3a6f..d5b7ef5 100644
--- a/test/script.js
+++ b/test/script.js
@@ -10,6 +10,14 @@ var bytesToHex = Convert.bytesToHex;
 var hexToBytes = Convert.hexToBytes;
 
 describe('Script', function() {
+  var p2shScriptPubKey, pubkeyScriptPubkey, addressScriptSig
+
+  beforeEach(function(){
+    p2shScriptPubKey = "a914e8c300c87986efa84c37c0519929019ef86eb5b487"
+    pubkeyScriptPubKey = "76a9145a3acbc7bbcc97c5ff16f5909c9d7d3fadb293a888ac"
+    addressScriptSig = "48304502206becda98cecf7a545d1a640221438ff8912d9b505ede67e0138485111099f696022100ccd616072501310acba10feb97cecc918e21c8e92760cd35144efec7622938f30141040cd2d2ce17a1e9b2b3b2cb294d40eecf305a25b7e7bfdafae6bb2639f4ee399b3637706c3d377ec4ab781355add443ae864b134c5e523001c442186ea60f0eb8"
+  })
+
   describe('constructor', function() {
     it('works for a byte array', function() {
       assert.ok(new Script([]))
@@ -53,25 +61,39 @@ describe('Script', function() {
 
   describe('getOutType', function() {
     it('works for p2sh', function() {
-      var script = Script.fromHex("a914e8c300c87986efa84c37c0519929019ef86eb5b487")
+      var script = Script.fromHex(p2shScriptPubKey)
       assert.equal(script.getOutType(), 'P2SH')
     })
 
     it('works for pubkey', function() {
-      var script = Script.fromHex("76a9145a3acbc7bbcc97c5ff16f5909c9d7d3fadb293a888ac")
+      var script = Script.fromHex(pubkeyScriptPubKey)
       assert.equal(script.getOutType(), 'Pubkey')
     })
   })
 
+  describe('getInType', function() {
+    it('works for address', function() {
+      var script = Script.fromHex(addressScriptSig)
+      assert.equal(script.getInType(), 'Address')
+    })
+  })
+
   describe('getToAddress', function() {
     it('works for p2sh type output', function() {
-      var script = Script.fromHex("a914e8c300c87986efa84c37c0519929019ef86eb5b487")
-      assert.equal(script.getToAddress(), '3NukJ6fYZJ5Kk8bPjycAnruZkE5Q7UW7i8')
+      var script = Script.fromHex(p2shScriptPubKey)
+      assert.equal(script.getToAddress().toString(), '3NukJ6fYZJ5Kk8bPjycAnruZkE5Q7UW7i8')
     })
 
     it('works for pubkey type output', function() {
-      var script = Script.fromHex("76a9145a3acbc7bbcc97c5ff16f5909c9d7d3fadb293a888ac")
-      assert.equal(script.getToAddress(), '19E6FV3m3kEPoJD5Jz6dGKdKwTVvjsWUvu')
+      var script = Script.fromHex(pubkeyScriptPubKey)
+      assert.equal(script.getToAddress().toString(), '19E6FV3m3kEPoJD5Jz6dGKdKwTVvjsWUvu')
+    })
+  })
+
+  describe('getFromAddress', function() {
+    it('works for address type input', function() {
+      var script = Script.fromHex(addressScriptSig)
+      assert.equal(script.getFromAddress().toString(), '1BBjuhF2jHxu7tPinyQGCuaNhEs6f5u59u')
     })
   })
 })