|
|
@ -653,6 +653,7 @@ wallet2::wallet2(network_type nettype, bool restricted):
|
|
|
|
m_refresh_from_block_height(0),
|
|
|
|
m_refresh_from_block_height(0),
|
|
|
|
m_explicit_refresh_from_block_height(true),
|
|
|
|
m_explicit_refresh_from_block_height(true),
|
|
|
|
m_confirm_missing_payment_id(true),
|
|
|
|
m_confirm_missing_payment_id(true),
|
|
|
|
|
|
|
|
m_confirm_non_default_ring_size(true),
|
|
|
|
m_ask_password(true),
|
|
|
|
m_ask_password(true),
|
|
|
|
m_min_output_count(0),
|
|
|
|
m_min_output_count(0),
|
|
|
|
m_min_output_value(0),
|
|
|
|
m_min_output_value(0),
|
|
|
@ -2560,6 +2561,9 @@ bool wallet2::store_keys(const std::string& keys_file_name, const epee::wipeable
|
|
|
|
value2.SetInt(m_confirm_missing_payment_id ? 1 :0);
|
|
|
|
value2.SetInt(m_confirm_missing_payment_id ? 1 :0);
|
|
|
|
json.AddMember("confirm_missing_payment_id", value2, json.GetAllocator());
|
|
|
|
json.AddMember("confirm_missing_payment_id", value2, json.GetAllocator());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
value2.SetInt(m_confirm_non_default_ring_size ? 1 :0);
|
|
|
|
|
|
|
|
json.AddMember("confirm_non_default_ring_size", value2, json.GetAllocator());
|
|
|
|
|
|
|
|
|
|
|
|
value2.SetInt(m_ask_password ? 1 :0);
|
|
|
|
value2.SetInt(m_ask_password ? 1 :0);
|
|
|
|
json.AddMember("ask_password", value2, json.GetAllocator());
|
|
|
|
json.AddMember("ask_password", value2, json.GetAllocator());
|
|
|
|
|
|
|
|
|
|
|
@ -2661,6 +2665,7 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
|
|
|
|
m_auto_refresh = true;
|
|
|
|
m_auto_refresh = true;
|
|
|
|
m_refresh_type = RefreshType::RefreshDefault;
|
|
|
|
m_refresh_type = RefreshType::RefreshDefault;
|
|
|
|
m_confirm_missing_payment_id = true;
|
|
|
|
m_confirm_missing_payment_id = true;
|
|
|
|
|
|
|
|
m_confirm_non_default_ring_size = true;
|
|
|
|
m_ask_password = true;
|
|
|
|
m_ask_password = true;
|
|
|
|
m_min_output_count = 0;
|
|
|
|
m_min_output_count = 0;
|
|
|
|
m_min_output_value = 0;
|
|
|
|
m_min_output_value = 0;
|
|
|
@ -2761,6 +2766,8 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
|
|
|
|
m_refresh_from_block_height = field_refresh_height;
|
|
|
|
m_refresh_from_block_height = field_refresh_height;
|
|
|
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, confirm_missing_payment_id, int, Int, false, true);
|
|
|
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, confirm_missing_payment_id, int, Int, false, true);
|
|
|
|
m_confirm_missing_payment_id = field_confirm_missing_payment_id;
|
|
|
|
m_confirm_missing_payment_id = field_confirm_missing_payment_id;
|
|
|
|
|
|
|
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, confirm_non_default_ring_size, int, Int, false, true);
|
|
|
|
|
|
|
|
m_confirm_non_default_ring_size = field_confirm_non_default_ring_size;
|
|
|
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, ask_password, int, Int, false, true);
|
|
|
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, ask_password, int, Int, false, true);
|
|
|
|
m_ask_password = field_ask_password;
|
|
|
|
m_ask_password = field_ask_password;
|
|
|
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, default_decimal_point, int, Int, false, CRYPTONOTE_DISPLAY_DECIMAL_POINT);
|
|
|
|
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, default_decimal_point, int, Int, false, CRYPTONOTE_DISPLAY_DECIMAL_POINT);
|
|
|
|