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

tx_receiver/tx_receiver_old handling fixed

Browse source
This commit is contained in:
sowle 2020-04-29 21:06:08 +03:00
parent a5516dbd7e
commit c00ca6d5bc
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/currency_core/currency_format_utils_abstract.h
View file

@ -107,6 +107,7 @@ namespace currency
return false;
}
//---------------------------------------------------------------
// callback should return true to continue iterating through the container
template <typename A, typename B, typename container_t, typename callback_t>
bool handle_2_alternative_types_in_variant_container(const container_t& container, callback_t& cb)
{

22
src/wallet/wallet2.cpp
View file

@ -473,22 +473,22 @@ void wallet2::prepare_wti_decrypted_attachments(wallet_public::wallet_transfer_i
if (wti.is_income)
{
account_public_address sender_address = AUTO_VAL_INIT(sender_address);
wti.show_sender = handle_2_alternative_types_in_variant_container<tx_payer, tx_payer_old>(decrypted_att, [&](const tx_payer& p) { sender_address = p.acc_addr; return false; } );
wti.show_sender = handle_2_alternative_types_in_variant_container<tx_payer, tx_payer_old>(decrypted_att, [&](const tx_payer& p) { sender_address = p.acc_addr; return false; /* <- continue? */ } );
if (wti.show_sender)
wti.remote_addresses.push_back(currency::get_account_address_as_str(sender_address));
}
else
{
//TODO: actually recipients could be more then one, handle it in future
//tx_receiver tr = AUTO_VAL_INIT(tr);
//if (!wti.remote_addresses.size() && get_type_in_variant_container(decrypted_att, tr))
// wti.remote_addresses.push_back(currency::get_account_address_as_str(tr.acc_addr));
account_public_address receiver_address = AUTO_VAL_INIT(receiver_address);
handle_2_alternative_types_in_variant_container<tx_receiver, tx_receiver_old>(decrypted_att, [&](const tx_payer& p) {
wti.remote_addresses.push_back(currency::get_account_address_as_str(p.acc_addr));
return true; // continue iterating through the container
});
if (wti.remote_addresses.empty())
{
account_public_address receiver_address = AUTO_VAL_INIT(receiver_address);
handle_2_alternative_types_in_variant_container<tx_receiver, tx_receiver_old>(decrypted_att, [&](const tx_receiver& p) {
std::string addr_str = currency::get_account_address_as_str(p.acc_addr);
wti.remote_addresses.push_back(addr_str);
LOG_PRINT_YELLOW("prepare_wti_decrypted_attachments, income=false, wti.amount = " << print_money_brief(wti.amount) << ", rem. addr = " << addr_str, LOG_LEVEL_0);
return true; // continue iterating through the container
});
}
}
currency::tx_comment cm;