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

tests/integration/payments: enable failing P2SH(P2WSH(P2WPKH)) tests

Browse source
This commit is contained in:
Daniel Cousens 2018-07-20 17:30:18 +10:00
parent faf3645361
commit de0259a820
2 changed files with 12 additions and 6 deletions

14
src/transaction_builder.js
View file

@ -232,6 +232,11 @@ function prepareInput (input, ourPubKey, redeemScript, witnessValue, witnessScri
expanded.signatures = input.signatures
}
let signScript = witnessScript
if (expanded.type === SCRIPT_TYPES.P2WPKH) {
signScript = payments.p2pkh({ pubkey: expanded.pubkeys[0] }).output
}
return {
redeemScript,
redeemScriptType: SCRIPT_TYPES.P2WSH,
@ -243,7 +248,7 @@ function prepareInput (input, ourPubKey, redeemScript, witnessValue, witnessScri
prevOutScript: p2sh.output,
hasWitness: true,
signScript: witnessScript,
signScript,
signType: expanded.type,
pubkeys: expanded.pubkeys,
@ -303,6 +308,11 @@ function prepareInput (input, ourPubKey, redeemScript, witnessValue, witnessScri
expanded.signatures = input.signatures
}
let signScript = witnessScript
if (expanded.type === SCRIPT_TYPES.P2WPKH) {
signScript = payments.p2pkh({ pubkey: expanded.pubkeys[0] }).output
}
return {
witnessScript,
witnessScriptType: expanded.type,
@ -311,7 +321,7 @@ function prepareInput (input, ourPubKey, redeemScript, witnessValue, witnessScri
prevOutScript: p2wsh.output,
hasWitness: true,
signScript: witnessScript,
signScript,
signType: expanded.type,
pubkeys: expanded.pubkeys,