From c390943f06eeef9e5d25a714df5e758d98e26df9 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Tue, 26 Sep 2017 14:15:09 +1000 Subject: [PATCH] scripthash: avoid circular dep with P2WSH --- src/templates/scripthash/input.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/templates/scripthash/input.js b/src/templates/scripthash/input.js index ef3a047d6..4b68ce515 100644 --- a/src/templates/scripthash/input.js +++ b/src/templates/scripthash/input.js @@ -7,8 +7,8 @@ var typeforce = require('typeforce') var p2ms = require('../multisig/') var p2pk = require('../pubkey/') var p2pkh = require('../pubkeyhash/') -var p2wpkh = require('../witnesspubkeyhash/') -var p2wsh = require('../witnessscripthash/') +var p2wpkho = require('../witnesspubkeyhash/output') +var p2wsho = require('../witnessscripthash/output') function check (script, allowIncomplete) { var chunks = bscript.decompile(script) @@ -28,8 +28,8 @@ function check (script, allowIncomplete) { // is witness? if (chunks.length === 1) { - return p2wsh.output.check(redeemScriptChunks) || - p2wpkh.output.check(redeemScriptChunks) + return p2wsho.check(redeemScriptChunks) || + p2wpkho.output.check(redeemScriptChunks) } // match types