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

wallet2: correct handling of tx_payer/tx_payer_old (covered by hard_fork_2_tx_payer_in_wallet test)

Browse source
This commit is contained in:
sowle 2020-04-28 15:58:25 +03:00
parent ead981b838
commit d3f353935f
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View file

@ -469,13 +469,13 @@ void wallet2::process_new_transaction(const currency::transaction& tx, uint64_t
void wallet2::prepare_wti_decrypted_attachments(wallet_public::wallet_transfer_info& wti, const std::vector<currency::payload_items_v>& decrypted_att)
{
PROFILE_FUNC("wallet2::prepare_wti_decrypted_attachments");
tx_payer tp = AUTO_VAL_INIT(tp);
wti.show_sender = get_type_in_variant_container(decrypted_att, tp);
if (wti.is_income)
{
if(wti.show_sender)
wti.remote_addresses.push_back(currency::get_account_address_as_str(tp.acc_addr));
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; } );
if (wti.show_sender)
wti.remote_addresses.push_back(currency::get_account_address_as_str(sender_address));
}
else
{