diff options
author | Andrew Chow <achow101-github@achow101.com> | 2021-07-19 16:02:36 -0400 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2022-06-27 16:47:48 -0400 |
commit | ac7747585fb0629be502a089c9c9be876bd7107d (patch) | |
tree | 3ae648c00c5ba86f3e69690abc915aac04e24250 /src/script | |
parent | 25b6ae46e7249a1b363ef4fb12375f368903c58e (diff) | |
download | bitcoin-ac7747585fb0629be502a089c9c9be876bd7107d.tar.xz |
Fill PSBT Taproot output data to/from SignatureData
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/sign.cpp | 4 | ||||
-rw-r--r-- | src/script/sign.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/script/sign.cpp b/src/script/sign.cpp index e46d9be7d4..5cd773f6ee 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -216,11 +216,15 @@ static bool SignTaprootScript(const SigningProvider& provider, const BaseSignatu static bool SignTaproot(const SigningProvider& provider, const BaseSignatureCreator& creator, const WitnessV1Taproot& output, SignatureData& sigdata, std::vector<valtype>& result) { TaprootSpendData spenddata; + TaprootBuilder builder; // Gather information about this output. if (provider.GetTaprootSpendData(output, spenddata)) { sigdata.tr_spenddata.Merge(spenddata); } + if (provider.GetTaprootBuilder(output, builder)) { + sigdata.tr_builder = builder; + } // Try key path spending. { diff --git a/src/script/sign.h b/src/script/sign.h index cb3c229298..5e58272154 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -70,6 +70,7 @@ struct SignatureData { CScript witness_script; ///< The witnessScript (if any) for the input. witnessScripts are used in P2WSH outputs. CScriptWitness scriptWitness; ///< The scriptWitness of an input. Contains complete signatures or the traditional partial signatures format. scriptWitness is part of a transaction input per BIP 144. TaprootSpendData tr_spenddata; ///< Taproot spending data. + std::optional<TaprootBuilder> tr_builder; ///< Taproot tree used to build tr_spenddata. std::map<CKeyID, SigPair> signatures; ///< BIP 174 style partial signatures for the input. May contain all signatures necessary for producing a final scriptSig or scriptWitness. std::map<CKeyID, std::pair<CPubKey, KeyOriginInfo>> misc_pubkeys; std::vector<unsigned char> taproot_key_path_sig; /// Schnorr signature for key path spending |