BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from maraoz/improve/felipecsl 

Improve felipecsl PR
This commit is contained in:
Felipe Lima 2014-10-27 11:25:20 -02:00
parent 693f2aac7b c9c49da658
commit b5219c7805
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Address.js
View File

@ -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';

19
lib/Transaction.js
View File

@ -633,19 +633,19 @@ 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();
@ -653,13 +653,8 @@ Transaction.prototype.getSendingAddresses = function(networkName) {
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;
};