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

wallet2: correct using of extra_alias_entry / extra_alias_entry_old

Browse source
This commit is contained in:
sowle 2020-05-04 14:57:29 +03:00
parent 1441b5b27f
commit a11bdf39f2
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/wallet/wallet2.cpp
View file

@ -3050,7 +3050,11 @@ void wallet2::request_alias_registration(const currency::extra_alias_entry& ai,
std::vector<currency::tx_destination_entry> destinations;
std::vector<currency::extra_v> extra;
std::vector<currency::attachment_v> attachments;
extra.push_back(ai);
if (get_top_block_height() > m_core_runtime_config.hard_fork_02_starts_after_height)
extra.push_back(ai);
else
extra.push_back(ai.to_old());
currency::tx_destination_entry tx_dest_alias_reward;
tx_dest_alias_reward.addr.resize(1);
@ -3080,7 +3084,12 @@ void wallet2::request_alias_update(currency::extra_alias_entry& ai, currency::tr
std::vector<currency::tx_destination_entry> destinations;
std::vector<currency::extra_v> extra;
std::vector<currency::attachment_v> attachments;
extra.push_back(ai);
if (get_top_block_height() > m_core_runtime_config.hard_fork_02_starts_after_height)
extra.push_back(ai);
else
extra.push_back(ai.to_old());
transfer(destinations, 0, 0, fee, extra, attachments, detail::ssi_digit, tx_dust_policy(DEFAULT_DUST_THRESHOLD), res_tx, CURRENCY_TO_KEY_OUT_RELAXED, false);
}
//----------------------------------------------------------------------------------------------------