GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 22025d06e5 into merged_master (Bitcoin PR bitcoin/bitcoin#28605)

Browse source
This commit is contained in:
Byron Hambly 2025-11-10 14:17:41 +02:00
commit 8556ebfa64
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
19 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/spend.cpp
View file

@ -1991,7 +1991,7 @@ static util::Result<CreatedTransactionResult> CreateTransactionInternal(
}
// Before we return success, we assume any change key will be used to prevent
// accidental re-use.
// accidental reuse.
for (auto& reservedest_ : reservedest) {
reservedest_->KeepDestination();
}
@ -2045,7 +2045,7 @@ util::Result<CreatedTransactionResult> CreateTransaction(
tmp_cc.m_avoid_partial_spends = true;
// ELEMENTS: only for unblinded transactions
// Re-use the change destination from the first creation attempt to avoid skipping BIP44 indexes
// Reuse the change destination from the first creation attempt to avoid skipping BIP44 indexes
const int ungrouped_change_pos = txr_ungrouped.change_pos;
if (ungrouped_change_pos != -1 && !blind_details) {
const CAsset& asset = txr_ungrouped.tx->vout[ungrouped_change_pos].nAsset.GetAsset();