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

payments/p2sh: try not to rely on o. in validation

Browse source
This commit is contained in:
Daniel Cousens 2018-07-27 20:20:28 +10:00
parent cf9a35f59b
commit 54ec449a75
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/payments/p2sh.js
View file

@ -58,7 +58,7 @@ function p2sh (a, opts) {
const _redeem = lazy.value(function () { const _redeem = lazy.value(function () {
const chunks = _chunks() const chunks = _chunks()
return { return {
network: network, network,
output: chunks[chunks.length - 1], output: chunks[chunks.length - 1],
input: bscript.compile(chunks.slice(0, -1)), input: bscript.compile(chunks.slice(0, -1)),
witness: a.witness || [] witness: a.witness || []
@ -166,9 +166,10 @@ function p2sh (a, opts) {
if (a.redeem) { if (a.redeem) {
if (a.redeem.network && a.redeem.network !== network) throw new TypeError('Network mismatch') if (a.redeem.network && a.redeem.network !== network) throw new TypeError('Network mismatch')
if (o.redeem) { if (a.input) {
if (a.redeem.output && !a.redeem.output.equals(o.redeem.output)) throw new TypeError('Redeem.output mismatch') const redeem = _redeem()
if (a.redeem.input && !a.redeem.input.equals(o.redeem.input)) throw new TypeError('Redeem.input mismatch') if (a.redeem.output && !a.redeem.output.equals(redeem.output)) throw new TypeError('Redeem.output mismatch')
if (a.redeem.input && !a.redeem.input.equals(redeem.input)) throw new TypeError('Redeem.input mismatch')
} }
checkRedeem(a.redeem) checkRedeem(a.redeem)