Fixes unhandled exceptions in Transaction

This commit is contained in:
Felipe Lima 2014-08-26 10:56:17 -03:00
parent 29dcf56262
commit ba9ff424c2

View File

@ -633,8 +633,13 @@ Transaction.prototype.getReceivingAddresses = function(networkName) {
ret = []; ret = [];
for (var i = 0; i<this.outs.length; i++) { for (var i = 0; i<this.outs.length; i++) {
var o = this.outs[i]; var o = this.outs[i];
var addr = Address.fromScriptPubKey(o.getScript(), networkName)[0].toString(); var tmp = Address.fromScriptPubKey(o.getScript(), networkName);
ret.push(addr); if (typeof tmp !== 'undefined') {
var addr = tmp[0].toString();
ret.push(addr);
} else {
ret.push(null);
}
} }
return ret; return ret;
}; };
@ -648,8 +653,13 @@ Transaction.prototype.getSendingAddresses = function(networkName) {
ret.push(null); ret.push(null);
continue; continue;
} }
var addr = Address.fromScriptSig(scriptSig, networkName); try {
ret.push(addr?addr.toString():null); var addr = Address.fromScriptSig(scriptSig, networkName);
ret.push(addr?addr.toString():null);
} catch(err) {
// Error: Invalid public key
ret.push(null);
}
} }
return ret; return ret;
}; };