diff options
Diffstat (limited to 'src/script/descriptor.cpp')
-rw-r--r-- | src/script/descriptor.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 5026470edc..2e1a30744e 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -1761,7 +1761,7 @@ struct KeyParser { std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index, Span<const char>& sp, ParseScriptContext ctx, FlatSigningProvider& out, std::string& error) { using namespace script; - + Assume(ctx == ParseScriptContext::TOP || ctx == ParseScriptContext::P2SH || ctx == ParseScriptContext::P2WSH || ctx == ParseScriptContext::P2TR); std::vector<std::unique_ptr<DescriptorImpl>> ret; auto expr = Expr(sp); if (Func("pk", expr)) { @@ -1787,10 +1787,6 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index ret.emplace_back(std::make_unique<PKHDescriptor>(std::move(pubkey))); } return ret; - } else if (ctx != ParseScriptContext::P2TR && Func("pkh", expr)) { - // Under Taproot, always the Miniscript parser deal with it. - error = "Can only have pkh at top level, in sh(), wsh(), or in tr()"; - return {}; } if (ctx == ParseScriptContext::TOP && Func("combo", expr)) { auto pubkeys = ParsePubkey(key_exp_index, expr, ctx, out, error); |