RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scriptOutput: move "p2shify".

Browse Source
This commit is contained in:
Christopher Jeffrey 2015-12-07 15:53:56 -08:00
parent 37e1c8a2ef
commit a1fea2bd65
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/bcoin/tx.js
View File

@ -301,16 +301,6 @@ TX.prototype.scriptOutput = function(options) {
assert(n >= 1 && n <= 3); assert(n >= 1 && n <= 3);
script = bcoin.script.multisig(keys, m, n); script = bcoin.script.multisig(keys, m, n);
// make it p2sh
if (options.hash) {
var hash = utils.ripesha(bcoin.script.encode(script));
script = [
'hash160',
hash,
'eq'
];
}
} else if (bcoin.wallet.validateAddress(options.address, 'p2sh')) { } else if (bcoin.wallet.validateAddress(options.address, 'p2sh')) {
// p2sh transaction // p2sh transaction
// https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki // https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki
@ -332,6 +322,18 @@ TX.prototype.scriptOutput = function(options) {
]; ];
} }
// make it p2sh
if (options.hash) {
var redeem = script;
var hash = utils.ripesha(bcoin.script.encode(redeem));
script = [
'hash160',
hash,
'eq'
];
script.redeem = redeem;
}
return script; return script;
}; };