diff options
author | Pieter Wuille <pieter@wuille.net> | 2021-11-09 23:08:16 -0500 |
---|---|---|
committer | Pieter Wuille <pieter@wuille.net> | 2022-07-19 17:36:08 -0400 |
commit | 8d9670ccb756592bddb2a269bf5078d62658537b (patch) | |
tree | d545409bed2c1eb21d2a62617f817da4084c3ec3 /src/script | |
parent | 5560682a4464852eb3c244c1ddf9eea02dc962b2 (diff) | |
download | bitcoin-8d9670ccb756592bddb2a269bf5078d62658537b.tar.xz |
Add rawtr() descriptor for P2TR with unknown tweak
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/descriptor.cpp | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 34a4da74f8..db386c9ab8 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -1015,6 +1015,24 @@ public: bool IsSingleType() const final { return true; } }; +/** A parsed rawtr(...) descriptor. */ +class RawTRDescriptor final : public DescriptorImpl +{ +protected: + std::vector<CScript> MakeScripts(const std::vector<CPubKey>& keys, Span<const CScript> scripts, FlatSigningProvider& out) const override + { + assert(keys.size() == 1); + XOnlyPubKey xpk(keys[0]); + if (!xpk.IsFullyValid()) return {}; + WitnessV1Taproot output{xpk}; + return Vector(GetScriptForDestination(output)); + } +public: + RawTRDescriptor(std::unique_ptr<PubkeyProvider> output_key) : DescriptorImpl(Vector(std::move(output_key)), "rawtr") {} + std::optional<OutputType> GetOutputType() const override { return OutputType::BECH32M; } + bool IsSingleType() const final { return true; } +}; + //////////////////////////////////////////////////////////////////////////// // Parser // //////////////////////////////////////////////////////////////////////////// @@ -1453,6 +1471,16 @@ std::unique_ptr<DescriptorImpl> ParseScript(uint32_t& key_exp_index, Span<const error = "Can only have tr at top level"; return nullptr; } + if (ctx == ParseScriptContext::TOP && Func("rawtr", expr)) { + auto arg = Expr(expr); + auto output_key = ParsePubkey(key_exp_index, arg, ParseScriptContext::P2TR, out, error); + if (!output_key) return nullptr; + ++key_exp_index; + return std::make_unique<RawTRDescriptor>(std::move(output_key)); + } else if (Func("rawtr", expr)) { + error = "Can only have rawtr at top level"; + return nullptr; + } if (ctx == ParseScriptContext::TOP && Func("raw", expr)) { std::string str(expr.begin(), expr.end()); if (!IsHex(str)) { @@ -1626,6 +1654,13 @@ std::unique_ptr<DescriptorImpl> InferScript(const CScript& script, ParseScriptCo } } } + // If the above doesn't work, construct a rawtr() descriptor with just the encoded x-only pubkey. + if (pubkey.IsFullyValid()) { + auto key = InferXOnlyPubkey(pubkey, ParseScriptContext::P2TR, provider); + if (key) { + return std::make_unique<RawTRDescriptor>(std::move(key)); + } + } } if (ctx == ParseScriptContext::P2WSH) { |