Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

wallet: more needed_money fixes (primarily for escrow, mode separate tx and sweep bare outs)

Browse source
This commit is contained in:
sowle 2025-03-11 23:38:36 +01:00
parent e15a7f804e
commit b6efadad40
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wallet/wallet2.cpp
View file

@ -2409,7 +2409,7 @@ bool wallet2::sweep_bare_unspent_outputs(const currency::account_public_address&
} }
uint64_t fee = TX_DEFAULT_FEE; uint64_t fee = TX_DEFAULT_FEE;
std::vector<tx_destination_entry> destinations{ tx_destination_entry(group.total_amount + group.additional_tid_amount - fee, target_address) }; std::vector<tx_destination_entry> destinations{ tx_destination_entry(group.total_amount + group.additional_tid_amount - fee, target_address) };
assets_selection_context needed_money_map{ std::make_pair(native_coin_asset_id, selection_for_amount{group.total_amount + group.additional_tid_amount, group.total_amount + group.additional_tid_amount}) }; assets_selection_context needed_money_map{ std::make_pair(native_coin_asset_id, selection_for_amount{group.total_amount + group.additional_tid_amount, group.total_amount + group.additional_tid_amount, group.total_amount + group.additional_tid_amount}) };
try try
{ {
prepare_tx_destinations(needed_money_map, get_current_split_strategy(), tx_dust_policy{}, destinations, 0 /* tx_flags */, ftp.prepared_destinations); prepare_tx_destinations(needed_money_map, get_current_split_strategy(), tx_dust_policy{}, destinations, 0 /* tx_flags */, ftp.prepared_destinations);
@ -7901,11 +7901,11 @@ bool wallet2::prepare_transaction(construct_tx_param& ctp, currency::finalize_tx
if (ftp.tx_version > TRANSACTION_VERSION_PRE_HF4) if (ftp.tx_version > TRANSACTION_VERSION_PRE_HF4)
{ {
for (const auto& el : msc.proposal_info.to_initiator) for (const auto& el : msc.proposal_info.to_initiator)
needed_money_map[el.asset_id].needed_amount += el.amount; needed_money_map[el.asset_id].add_to_needed_and_requested_amount(el.amount);
} }
if (msc.escrow) if (msc.escrow)
needed_money_map[currency::native_coin_asset_id].needed_amount += (currency::get_outs_money_amount(tx_for_mode_separate) - get_inputs_money_amount(tx_for_mode_separate)); needed_money_map[currency::native_coin_asset_id].add_to_needed_and_requested_amount(currency::get_outs_money_amount(tx_for_mode_separate) - get_inputs_money_amount(tx_for_mode_separate));
} }
TIME_MEASURE_FINISH_MS(get_needed_money_time); TIME_MEASURE_FINISH_MS(get_needed_money_time);

1
src/wallet/wallet2_base.h
View file

@ -247,6 +247,7 @@ namespace tools
uint64_t needed_amount = 0; // amount that is necessary (sum of outputs + fee) uint64_t needed_amount = 0; // amount that is necessary (sum of outputs + fee)
uint64_t requested_amount = 0; // amount that is used when looking for outputs to spend (requested_amount >= needed_amount) uint64_t requested_amount = 0; // amount that is used when looking for outputs to spend (requested_amount >= needed_amount)
uint64_t found_amount = 0; // sum amount that was found in the wallet, (found_amount >= requested_amount); found_amount - needed_amount = change uint64_t found_amount = 0; // sum amount that was found in the wallet, (found_amount >= requested_amount); found_amount - needed_amount = change
void add_to_needed_and_requested_amount(uint64_t v) { needed_amount += v; requested_amount += v; } // consider removing this and 'requested_amount' when we start using zero-amount outputs -- sowle
}; };
typedef std::unordered_map<crypto::public_key, selection_for_amount> assets_selection_context; typedef std::unordered_map<crypto::public_key, selection_for_amount> assets_selection_context;