From 077588e90a58b8b3e1937698c15eb257f87844f0 Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Thu, 14 Jan 2016 01:34:40 -0800
Subject: [PATCH] fix script.args.

---
 lib/bcoin/script.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/bcoin/script.js b/lib/bcoin/script.js
index 506fc904..98b31d15 100644
--- a/lib/bcoin/script.js
+++ b/lib/bcoin/script.js
@@ -1684,23 +1684,21 @@ script.sigopsScripthash = function sigopsScripthash(s) {
 };
 
 script.args = function args(s) {
-  var type, keys, m;
+  var keys, m;
 
   s = bcoin.script.subscript(s);
 
   if (script.lockTime(s))
     s = s.slice(3);
 
-  type = script.standard(s);
-
-  if (type === 'pubkey')
+  if (script.isPubkey(s))
     return 1;
 
-  if (type === 'pubkeyhash')
+  if (script.isPubkeyhash(s))
     return 2;
 
-  if (type === 'multisig') {
-    keys = bcoin.script.isMultisig(s);
+  if (script.isMultisig(s)) {
+    keys = s.slice(1, -2);
     if (!pub)
       return -1;
     m = new bn(s[0]).toNumber();
@@ -1709,10 +1707,10 @@ script.args = function args(s) {
     return m + 1;
   }
 
-  if (type === 'scripthash')
+  if (script.isScripthash(s))
     return 1;
 
-  if (type === 'nulldata')
+  if (script.isNulldata(s))
     return -1;
 
   return -1;