From f6fe37be6b7f53c89bad8ccbf34e8a69031fa0aa Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Tue, 2 Feb 2016 18:03:17 -0800
Subject: [PATCH] improve address.ownInput.

---
 lib/bcoin/address.js | 24 +++---------------------
 lib/bcoin/wallet.js  |  2 +-
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/lib/bcoin/address.js b/lib/bcoin/address.js
index e00e7fc5..7e5436fd 100644
--- a/lib/bcoin/address.js
+++ b/lib/bcoin/address.js
@@ -387,14 +387,15 @@ Address.prototype.ownInput = function ownInput(tx, index) {
   var inputs;
 
   inputs = tx.inputs.filter(function(input, i) {
-    var s;
-
     if (!input.prevout.tx && this.tx._all[input.prevout.hash])
       input.prevout.tx = this.tx._all[input.prevout.hash];
 
     if (index != null && index !== i)
       return false;
 
+    if (input.prevout.tx)
+      return !!this.ownOutput(input.prevout.tx, input.prevout.index);
+
     // if (bcoin.script.isPubkeyInput(input.script, key, tx, i))
     //   return true;
 
@@ -409,25 +410,6 @@ Address.prototype.ownInput = function ownInput(tx, index) {
         return true;
     }
 
-    if (!input.prevout.tx)
-      return false;
-
-    s = input.prevout.tx.getSubscript(input.prevout.index);
-
-    if (bcoin.script.isPubkey(s, key))
-      return true;
-
-    if (bcoin.script.isPubkeyhash(s, hash))
-      return true;
-
-    if (bcoin.script.isMultisig(s, keys))
-      return true;
-
-    if (scriptHash) {
-      if (bcoin.script.isScripthash(s, scriptHash))
-        return true;
-    }
-
     return false;
   }, this);
 
diff --git a/lib/bcoin/wallet.js b/lib/bcoin/wallet.js
index 03144d61..1296d218 100644
--- a/lib/bcoin/wallet.js
+++ b/lib/bcoin/wallet.js
@@ -429,7 +429,7 @@ Wallet.prototype.createTX = function createTX(outputs, fee) {
 Wallet.prototype.scriptInputs = function scriptInputs(tx) {
   this.fillPrevout(tx);
   return this.addresses.reduce(function(total, address) {
-    return total + address.signInputs(tx);
+    return total + address.scriptInputs(tx);
   }, 0);
 };