mirror of
https://github.com/monero-project/monero.git
synced 2024-12-14 20:36:31 +02:00
wallet2: fix store-tx-info loading
The backward compatibility code was always setting it to 1 in modern wallets since store_tx_keys was not present and thus assumed to be 1 by default. Reported by SeventhAlpaca
This commit is contained in:
parent
51873fec04
commit
2e9d1e6e1f
@ -4059,9 +4059,18 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
|
|||||||
m_always_confirm_transfers = field_always_confirm_transfers;
|
m_always_confirm_transfers = field_always_confirm_transfers;
|
||||||
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, print_ring_members, int, Int, false, true);
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, print_ring_members, int, Int, false, true);
|
||||||
m_print_ring_members = field_print_ring_members;
|
m_print_ring_members = field_print_ring_members;
|
||||||
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, store_tx_keys, int, Int, false, true);
|
if (json.HasMember("store_tx_info"))
|
||||||
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, store_tx_info, int, Int, false, true);
|
{
|
||||||
m_store_tx_info = ((field_store_tx_keys != 0) || (field_store_tx_info != 0));
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, store_tx_info, int, Int, true, true);
|
||||||
|
m_store_tx_info = field_store_tx_info;
|
||||||
|
}
|
||||||
|
else if (json.HasMember("store_tx_keys")) // backward compatibility
|
||||||
|
{
|
||||||
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, store_tx_keys, int, Int, true, true);
|
||||||
|
m_store_tx_info = field_store_tx_keys;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
m_store_tx_info = true;
|
||||||
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, default_mixin, unsigned int, Uint, false, 0);
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, default_mixin, unsigned int, Uint, false, 0);
|
||||||
m_default_mixin = field_default_mixin;
|
m_default_mixin = field_default_mixin;
|
||||||
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, default_priority, unsigned int, Uint, false, 0);
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, default_priority, unsigned int, Uint, false, 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user