From a976fba27b45c742207b7081565a4e35a3282c9f Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Wed, 26 Sep 2018 16:02:52 +1000 Subject: [PATCH] add network derivation from redeem.network --- src/payments/p2sh.js | 6 +++++- src/payments/p2wsh.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/payments/p2sh.js b/src/payments/p2sh.js index 4741936..0729c8b 100644 --- a/src/payments/p2sh.js +++ b/src/payments/p2sh.js @@ -45,7 +45,11 @@ function p2sh (a, opts) { witness: typef.maybe(typef.arrayOf(typef.Buffer)) }, a) - const network = a.network || BITCOIN_NETWORK + let network = a.network + if (!network) { + network = (a.redeem && a.redeem.network) || BITCOIN_NETWORK + } + const o = { network } const _address = lazy.value(function () { diff --git a/src/payments/p2wsh.js b/src/payments/p2wsh.js index a26e706..d8e6e8a 100644 --- a/src/payments/p2wsh.js +++ b/src/payments/p2wsh.js @@ -59,7 +59,11 @@ function p2wsh (a, opts) { }) const _rchunks = lazy.value(function () { return bscript.decompile(a.redeem.input) }) - const network = a.network || BITCOIN_NETWORK + let network = a.network + if (!network) { + network = (a.redeem && a.redeem.network) || BITCOIN_NETWORK + } + const o = { network } lazy.prop(o, 'address', function () {