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

Move comments to main check logic

Browse source
This commit is contained in:
Luke Childs 2019-06-28 18:28:28 +07:00
parent f961724c73
commit 18e7c9de80
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/psbt.js
View file

@ -7,7 +7,6 @@ const checkRedeemScript = (inputIndex, scriptPubKey, redeemScript) => {
const redeemScriptOutput = payments.p2sh({ const redeemScriptOutput = payments.p2sh({
redeem: { output: redeemScript }, redeem: { output: redeemScript },
}).output; }).output;
// If a redeemScript is provided, the scriptPubKey must be for that redeemScript
if (!scriptPubKey.equals(redeemScriptOutput)) { if (!scriptPubKey.equals(redeemScriptOutput)) {
throw new Error( throw new Error(
`Redeem script for input #${inputIndex} doesn't match the scriptPubKey in the prevout`, `Redeem script for input #${inputIndex} doesn't match the scriptPubKey in the prevout`,
@ -62,10 +61,12 @@ class Psbt extends bip174_1.Psbt {
if (input.redeemScript) { if (input.redeemScript) {
const prevoutIndex = unsignedTx.ins[inputIndex].index; const prevoutIndex = unsignedTx.ins[inputIndex].index;
const prevout = nonWitnessUtxoTx.outs[prevoutIndex]; const prevout = nonWitnessUtxoTx.outs[prevoutIndex];
// If a redeemScript is provided, the scriptPubKey must be for that redeemScript
checkRedeemScript(inputIndex, prevout.script, input.redeemScript); checkRedeemScript(inputIndex, prevout.script, input.redeemScript);
} }
} else if (input.witnessUtxo) { } else if (input.witnessUtxo) {
if (input.redeemScript) { if (input.redeemScript) {
// If a redeemScript is provided, the scriptPubKey must be for that redeemScript
checkRedeemScript( checkRedeemScript(
inputIndex, inputIndex,
input.witnessUtxo.script, input.witnessUtxo.script,

4
ts_src/psbt.ts
View file

@ -12,7 +12,6 @@ const checkRedeemScript = (
redeem: { output: redeemScript }, redeem: { output: redeemScript },
}).output as Buffer; }).output as Buffer;
// If a redeemScript is provided, the scriptPubKey must be for that redeemScript
if (!scriptPubKey.equals(redeemScriptOutput)) { if (!scriptPubKey.equals(redeemScriptOutput)) {
throw new Error( throw new Error(
`Redeem script for input #${inputIndex} doesn't match the scriptPubKey in the prevout`, `Redeem script for input #${inputIndex} doesn't match the scriptPubKey in the prevout`,
@ -70,10 +69,13 @@ export class Psbt extends PsbtBase {
if (input.redeemScript) { if (input.redeemScript) {
const prevoutIndex = unsignedTx.ins[inputIndex].index; const prevoutIndex = unsignedTx.ins[inputIndex].index;
const prevout = nonWitnessUtxoTx.outs[prevoutIndex]; const prevout = nonWitnessUtxoTx.outs[prevoutIndex];
// If a redeemScript is provided, the scriptPubKey must be for that redeemScript
checkRedeemScript(inputIndex, prevout.script, input.redeemScript); checkRedeemScript(inputIndex, prevout.script, input.redeemScript);
} }
} else if (input.witnessUtxo) { } else if (input.witnessUtxo) {
if (input.redeemScript) { if (input.redeemScript) {
// If a redeemScript is provided, the scriptPubKey must be for that redeemScript
checkRedeemScript( checkRedeemScript(
inputIndex, inputIndex,
input.witnessUtxo.script, input.witnessUtxo.script,