diff options
| author | Pieter Wuille <pieter@wuille.net> | 2021-03-03 15:02:56 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2021-06-12 12:25:28 -0700 |
| commit | dbb0ce9fbff01ffe4dd29da465f43ecaddc2854c (patch) | |
| tree | 6fa9f24f53c40dfc157525532a16131339cc1c5f /src/script/descriptor.cpp | |
| parent | b0e5fbf6fad854ad03ce092ff5f1582166e5b24e (diff) | |
| download | bitcoin-dbb0ce9fbff01ffe4dd29da465f43ecaddc2854c.tar.xz | |
Add TaprootSpendData data structure, equivalent to script map for P2[W]SH
This data structures stores all information necessary for spending a taproot
output (the internal key, the Merkle root, and the control blocks for every
script leaf).
It is added to signing providers, and populated by the tr() descriptor.
Diffstat (limited to 'src/script/descriptor.cpp')
| -rw-r--r-- | src/script/descriptor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 51cf8a7d62..84a8b06c5c 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -843,7 +843,9 @@ protected: XOnlyPubKey xpk(keys[0]); if (!xpk.IsFullyValid()) return {}; builder.Finalize(xpk); - return Vector(GetScriptForDestination(builder.GetOutput())); + WitnessV1Taproot output = builder.GetOutput(); + out.tr_spenddata[output].Merge(builder.GetSpendData()); + return Vector(GetScriptForDestination(output)); } bool ToStringSubScriptHelper(const SigningProvider* arg, std::string& ret, bool priv, bool normalized) const override { |