LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Made it process multisig addresses correctly

Browse source
This commit is contained in:
vub 2013-11-20 16:43:14 -05:00
parent a2ccfc66a0
commit 397de49089
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bitcoinjs-min.js vendored
View file

File diff suppressed because one or more lines are too long

10
src/script.js
View file

@ -118,8 +118,9 @@ Script.prototype.parse = function () {
* Any other script (no template matched).
*/
Script.prototype.getOutType = function () {
if (this.chunks[this.chunks.length-1] == Opcode.map.OP_CHECKMULTISIG &&
this.chunks[this.chunks.length-2] <= 3) {
if (this.chunks[this.chunks.length-1] == Opcode.map.OP_EQUAL &&
this.chunks[0] == Opcode.map.OP_HASH160 &&
this.chunks.length == 3) {
// Transfer to M-OF-N
return 'P2SH';
}
@ -149,7 +150,10 @@ Script.prototype.toScriptHash = function () {
};
Script.prototype.toAddress = function() {
return new Address(this.toScriptHash());
var outType = this.getOutType();
return outType == 'Pubkey' ? new Address(this.chunks[2])
: outType == 'P2SH' ? new Address(this.chunks[1],5)
: new Address(this.chunks[1],5)
}
/**