aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/node_rpc_proxy.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/wallet/node_rpc_proxy.h')
-rw-r--r--src/wallet/node_rpc_proxy.h31
1 files changed, 3 insertions, 28 deletions
diff --git a/src/wallet/node_rpc_proxy.h b/src/wallet/node_rpc_proxy.h
index 47a0ff101..0dcfd0f83 100644
--- a/src/wallet/node_rpc_proxy.h
+++ b/src/wallet/node_rpc_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, The Monero Project
+// Copyright (c) 2017-2023, The Monero Project
//
// All rights reserved.
//
@@ -34,7 +34,6 @@
#include "include_base_utils.h"
#include "net/abstract_http_client.h"
#include "rpc/core_rpc_server_commands_defs.h"
-#include "wallet_rpc_helpers.h"
namespace tools
{
@@ -42,9 +41,8 @@ namespace tools
class NodeRPCProxy
{
public:
- NodeRPCProxy(epee::net_utils::http::abstract_http_client &http_client, rpc_payment_state_t &rpc_payment_state, boost::recursive_mutex &mutex);
+ NodeRPCProxy(epee::net_utils::http::abstract_http_client &http_client, boost::recursive_mutex &mutex);
- void set_client_secret_key(const crypto::secret_key &skey) { m_client_id_secret_key = skey; }
void invalidate();
void set_offline(bool offline) { m_offline = offline; }
@@ -58,28 +56,14 @@ public:
boost::optional<std::string> get_dynamic_base_fee_estimate(uint64_t grace_blocks, uint64_t &fee);
boost::optional<std::string> get_dynamic_base_fee_estimate_2021_scaling(uint64_t grace_blocks, std::vector<uint64_t> &fees);
boost::optional<std::string> get_fee_quantization_mask(uint64_t &fee_quantization_mask);
- boost::optional<std::string> get_rpc_payment_info(bool mining, bool &payment_required, uint64_t &credits, uint64_t &diff, uint64_t &credits_per_hash_found, cryptonote::blobdata &blob, uint64_t &height, uint64_t &seed_height, crypto::hash &seed_hash, crypto::hash &next_seed_hash, uint32_t &cookie);
boost::optional<std::string> get_transactions(const std::vector<crypto::hash> &txids, const std::function<void(const cryptonote::COMMAND_RPC_GET_TRANSACTIONS::request&, const cryptonote::COMMAND_RPC_GET_TRANSACTIONS::response&, bool)> &f);
-
-private:
- template<typename T> void handle_payment_changes(const T &res, std::true_type) {
- if (res.status == CORE_RPC_STATUS_OK || res.status == CORE_RPC_STATUS_PAYMENT_REQUIRED)
- m_rpc_payment_state.credits = res.credits;
- if (res.top_hash != m_rpc_payment_state.top_hash)
- {
- m_rpc_payment_state.top_hash = res.top_hash;
- m_rpc_payment_state.stale = true;
- }
- }
- template<typename T> void handle_payment_changes(const T &res, std::false_type) {}
+ boost::optional<std::string> get_block_header_by_height(uint64_t height, cryptonote::block_header_response &block_header);
private:
boost::optional<std::string> get_info();
epee::net_utils::http::abstract_http_client &m_http_client;
- rpc_payment_state_t &m_rpc_payment_state;
boost::recursive_mutex &m_daemon_rpc_mutex;
- crypto::secret_key m_client_id_secret_key;
bool m_offline;
uint64_t m_height;
@@ -94,15 +78,6 @@ private:
uint64_t m_target_height;
uint64_t m_block_weight_limit;
time_t m_get_info_time;
- time_t m_rpc_payment_info_time;
- uint64_t m_rpc_payment_diff;
- uint64_t m_rpc_payment_credits_per_hash_found;
- cryptonote::blobdata m_rpc_payment_blob;
- uint64_t m_rpc_payment_height;
- uint64_t m_rpc_payment_seed_height;
- crypto::hash m_rpc_payment_seed_hash;
- crypto::hash m_rpc_payment_next_seed_hash;
- uint32_t m_rpc_payment_cookie;
time_t m_height_time;
time_t m_target_height_time;
std::vector<std::pair<uint8_t, uint64_t>> m_daemon_hard_forks;