From 54ec449a751faa55d607d70d02904ad27d6120c0 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Fri, 27 Jul 2018 20:20:28 +1000
Subject: [PATCH] payments/p2sh: try not to rely on o. in validation
---
src/payments/p2sh.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/payments/p2sh.js b/src/payments/p2sh.js
index 9c80b09..b642154 100644
--- a/src/payments/p2sh.js
+++ b/src/payments/p2sh.js
@@ -58,7 +58,7 @@ function p2sh (a, opts) {
const _redeem = lazy.value(function () {
const chunks = _chunks()
return {
- network: network,
+ network,
output: chunks[chunks.length - 1],
input: bscript.compile(chunks.slice(0, -1)),
witness: a.witness || []
@@ -166,9 +166,10 @@ function p2sh (a, opts) {
if (a.redeem) {
if (a.redeem.network && a.redeem.network !== network) throw new TypeError('Network mismatch')
- if (o.redeem) {
- if (a.redeem.output && !a.redeem.output.equals(o.redeem.output)) throw new TypeError('Redeem.output mismatch')
- if (a.redeem.input && !a.redeem.input.equals(o.redeem.input)) throw new TypeError('Redeem.input mismatch')
+ if (a.input) {
+ const redeem = _redeem()
+ 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)