Merge pull request #10475

172b4e1 fix: warning: variable set but not used (tobtoht)
This commit is contained in:
tobtoht
2026-04-29 08:07:45 +00:00
4 changed files with 4 additions and 11 deletions
+3 -4
View File
@@ -9730,7 +9730,7 @@ void wallet2::transfer_selected(const std::vector<cryptonote::tx_destination_ent
//prepare inputs
LOG_PRINT_L2("preparing outputs");
typedef cryptonote::tx_source_entry::output_entry tx_output_entry;
size_t i = 0, out_index = 0;
size_t out_index = 0;
std::vector<cryptonote::tx_source_entry> sources;
for(size_t idx: selected_transfers)
{
@@ -9749,7 +9749,6 @@ void wallet2::transfer_selected(const std::vector<cryptonote::tx_destination_ent
oe.second.mask = std::get<2>(outs[out_index][n]);
src.outputs.push_back(oe);
++i;
}
//paste real transaction to the random index
@@ -9950,7 +9949,7 @@ void wallet2::transfer_selected_rct(std::vector<cryptonote::tx_destination_entry
//prepare inputs
LOG_PRINT_L2("preparing outputs");
size_t i = 0, out_index = 0;
size_t out_index = 0;
std::vector<cryptonote::tx_source_entry> sources;
for(size_t idx: selected_transfers)
{
@@ -9973,7 +9972,6 @@ void wallet2::transfer_selected_rct(std::vector<cryptonote::tx_destination_entry
oe.second.mask = std::get<2>(outs[out_index][n]);
src.outputs.push_back(oe);
}
++i;
//paste real transaction to the random index
auto it_to_replace = std::find_if(src.outputs.begin(), src.outputs.end(), [&](const tx_output_entry& a)
@@ -12663,6 +12661,7 @@ bool wallet2::check_reserve_proof(const cryptonote::account_public_address &addr
}
catch(...) {}
THROW_WALLET_EXCEPTION_IF(!loaded, error::wallet_internal_error, "Failed to parse reserve proof signature data");
THROW_WALLET_EXCEPTION_IF(subaddr_spendkeys.count(address.m_spend_public_key) == 0, error::wallet_internal_error,
"The given address isn't found in the proof");