mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: do not make two COutputs, use shared_ptr

Browse Source
This commit is contained in:
furszy committed 2023-03-08 10:15:06 -03:00
1 parent 8d12127a9c
commit 805f399b17
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/spend.cpp
+7 -6
View File
@@ -445,10 +445,10 @@ FilteredOutputGroups GroupOutputs(const CWallet& wallet,
// OUTPUT_GROUP_MAX_ENTRIES COutputs, a new OutputGroup is added to the end of the vector. // OUTPUT_GROUP_MAX_ENTRIES COutputs, a new OutputGroup is added to the end of the vector.
typedef std::map<std::pair<CScript, OutputType>, std::vector<OutputGroup>> ScriptPubKeyToOutgroup; typedef std::map<std::pair<CScript, OutputType>, std::vector<OutputGroup>> ScriptPubKeyToOutgroup;
const auto& group_outputs = []( const auto& group_outputs = [](
const COutput& output, OutputType type, size_t ancestors, size_t descendants, const std::shared_ptr<COutput>& output, OutputType type, size_t ancestors, size_t descendants,
ScriptPubKeyToOutgroup& groups_map, const CoinSelectionParams& coin_sel_params, ScriptPubKeyToOutgroup& groups_map, const CoinSelectionParams& coin_sel_params,
bool positive_only) { bool positive_only) {
std::vector<OutputGroup>& groups = groups_map[std::make_pair(output.txout.scriptPubKey,type)]; std::vector<OutputGroup>& groups = groups_map[std::make_pair(output->txout.scriptPubKey,type)];
if (groups.size() == 0) { if (groups.size() == 0) {
// No OutputGroups for this scriptPubKey yet, add one // No OutputGroups for this scriptPubKey yet, add one
@@ -468,8 +468,8 @@ FilteredOutputGroups GroupOutputs(const CWallet& wallet,
} }
// Filter for positive only before adding the output to group // Filter for positive only before adding the output to group
if (!positive_only || output.GetEffectiveValue() > 0) { if (!positive_only || output->GetEffectiveValue() > 0) {
group->Insert(std::make_shared<COutput>(output), ancestors, descendants); group->Insert(output, ancestors, descendants);
} }
}; };
@@ -483,8 +483,9 @@ FilteredOutputGroups GroupOutputs(const CWallet& wallet,
size_t ancestors, descendants; size_t ancestors, descendants;
wallet.chain().getTransactionAncestry(output.outpoint.hash, ancestors, descendants); wallet.chain().getTransactionAncestry(output.outpoint.hash, ancestors, descendants);
group_outputs(output, type, ancestors, descendants, spk_to_groups_map, coin_sel_params, /*positive_only=*/ false); const auto& shared_output = std::make_shared<COutput>(output);
group_outputs(output, type, ancestors, descendants, spk_to_positive_groups_map, group_outputs(shared_output, type, ancestors, descendants, spk_to_groups_map, coin_sel_params, /*positive_only=*/ false);
group_outputs(shared_output, type, ancestors, descendants, spk_to_positive_groups_map,
coin_sel_params, /*positive_only=*/ true); coin_sel_params, /*positive_only=*/ true);
} }
} }