refactor changes

bitpay · Oct 27, 2014 · c9c49da · c9c49da
1 parent 693f2aa
commit c9c49da
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/lib/Address.js b/lib/Address.js
@@ -189,7 +189,13 @@ Address.fromPubkeyHashScriptSig = function(scriptSig, network) {
 //extract an address from scriptSig
 Address.fromScriptSig = function(scriptSig, network) {
   if (typeof scriptSig === 'string') {
-    scriptSig = new Script(new Buffer(scriptSig, 'hex'));
+    try {
+      var scriptSigBuf = new Buffer(scriptSig, 'hex')
+    } catch(err) {
+      // Error: Invalid public key
+      return null;
+    }
+    scriptSig = new Script(scriptSigBuf);
   }
   if (!network)
     network = 'livenet';

diff --git a/lib/Transaction.js b/lib/Transaction.js
@@ -633,33 +633,28 @@ Transaction.prototype.getReceivingAddresses = function(networkName) {
   ret = [];
   for (var i = 0; i<this.outs.length; i++) {
     var o = this.outs[i];
-    var tmp = Address.fromScriptPubKey(o.getScript(), networkName);
-    if (typeof tmp[0] !== 'undefined') {
-      var addr = tmp[0].toString();
-      ret.push(addr);
+    var addrs = Address.fromScriptPubKey(o.getScript(), networkName);
+    if (typeof addrs[0] !== 'undefined') {
+      ret.push(addrs[0].toString());
     } else {
       ret.push(null);
     }
   }
   return ret;
 };
+
 Transaction.prototype.getSendingAddresses = function(networkName) {
-  var ret = [];
   if (!networkName) networkName = 'livenet';
+  var ret = [];
   for (var i = 0; i<this.ins.length; i++) {
     var input = this.ins[i];
     var scriptSig = input.getScript();
     if (scriptSig.getBuffer().length === 0) {
       ret.push(null);
       continue;
     }
-    try {
-      var addr = Address.fromScriptSig(scriptSig, networkName);
-      ret.push(addr?addr.toString():null);
-    } catch(err) {
-      // Error: Invalid public key
-      ret.push(null);
-    }
+    var addr = Address.fromScriptSig(scriptSig, networkName);
+    ret.push(addr?addr.toString():null);
   }
   return ret;
 };