Skip to content

Commit

Permalink
@rbrunner7 comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffro256 committed Feb 11, 2023
1 parent 9ec27b0 commit 34f0726
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion src/wallet/wallet2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -4049,12 +4048,15 @@ boost::optional<wallet2::keys_file_data> 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());

Expand Down
8 changes: 4 additions & 4 deletions src/wallet/wallet2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 34f0726

Please sign in to comment.