diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index a666becb050..34cb687c150 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3589,7 +3589,6 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo } catch (const error::deprecated_rpc_access&) { - // no point in trying again, it'd just eat up credits THROW_WALLET_EXCEPTION_IF(!waiter.wait(), error::wallet_internal_error, "Exception in thread pool"); throw; } @@ -4049,12 +4048,15 @@ boost::optional wallet2::get_keys_file_data(const epee: json.AddMember("original_view_secret_key", value, json.GetAllocator()); } + // This value is serialized for compatibility with wallets which support the pay-to-use RPC system value2.SetInt(0); json.AddMember("persistent_rpc_client_id", value2, json.GetAllocator()); + // This value is serialized for compatibility with wallets which support the pay-to-use RPC system value2.SetFloat(0.0f); json.AddMember("auto_mine_for_rpc_payment", value2, json.GetAllocator()); + // This value is serialized for compatibility with wallets which support the pay-to-use RPC system value2.SetUint64(0); json.AddMember("credits_target", value2, json.GetAllocator()); diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 6c198969f19..f1c3d7c7e4c 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -1230,8 +1230,8 @@ namespace tools a & m_cold_key_images.parent(); if(ver < 29) return; - crypto::secret_key m_rpc_client_secret_key; // Compatibility for old RPC payment system - a & m_rpc_client_secret_key; + crypto::secret_key dummy_rpc_client_secret_key; // Compatibility for old RPC payment system + a & dummy_rpc_client_secret_key; if(ver < 30) { m_has_ever_refreshed_from_node = false; @@ -1267,8 +1267,8 @@ namespace tools FIELD(m_tx_device) FIELD(m_device_last_key_image_sync) FIELD(m_cold_key_images) - crypto::secret_key m_rpc_client_secret_key; // Compatibility for old RPC payment system - FIELD(m_rpc_client_secret_key) + crypto::secret_key dummy_rpc_client_secret_key; // Compatibility for old RPC payment system + FIELD_N("m_rpc_client_secret_key", dummy_rpc_client_secret_key) if (version < 1) { m_has_ever_refreshed_from_node = false;