highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-20 11:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: Use CTxDestination in CRecipient rather than scriptPubKey

Browse Source
This commit is contained in:
Andrew Chow
2023-08-09 09:42:04 -04:00
parent 07d3bdf4eb
commit ad0c469d98
7 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/wallet.cpp
View File

@@ -2213,15 +2213,13 @@ OutputType CWallet::TransactionChangeType(const std::optional<OutputType>& chang
bool any_pkh{false};
for (const auto& recipient : vecSend) {
std::vector<std::vector<uint8_t>> dummy;
const TxoutType type{Solver(recipient.scriptPubKey, dummy)};
if (type == TxoutType::WITNESS_V1_TAPROOT) {
if (std::get_if<WitnessV1Taproot>(&recipient.dest)) {
any_tr = true;
} else if (type == TxoutType::WITNESS_V0_KEYHASH) {
} else if (std::get_if<WitnessV0KeyHash>(&recipient.dest)) {
any_wpkh = true;
} else if (type == TxoutType::SCRIPTHASH) {
} else if (std::get_if<ScriptHash>(&recipient.dest)) {
any_sh = true;
} else if (type == TxoutType::PUBKEYHASH) {
} else if (std::get_if<PKHash>(&recipient.dest)) {
any_pkh = true;
}
}