wallet2_api: some new APIs to access daemon state
This commit is contained in:
parent
049b7e9a93
commit
c0a0fcaff0
3 changed files with 41 additions and 2 deletions
|
@ -137,7 +137,7 @@ void WalletManagerImpl::setDaemonAddress(const std::string &address)
|
|||
m_daemonAddress = address;
|
||||
}
|
||||
|
||||
bool WalletManagerImpl::connected(uint32_t *version = NULL) const
|
||||
bool WalletManagerImpl::connected(uint32_t *version) const
|
||||
{
|
||||
epee::json_rpc::request<cryptonote::COMMAND_RPC_GET_VERSION::request> req_t = AUTO_VAL_INIT(req_t);
|
||||
epee::json_rpc::response<cryptonote::COMMAND_RPC_GET_VERSION::response, std::string> resp_t = AUTO_VAL_INIT(resp_t);
|
||||
|
@ -352,6 +352,37 @@ double WalletManagerImpl::miningHashRate() const
|
|||
return mres.speed;
|
||||
}
|
||||
|
||||
void WalletManagerImpl::hardForkInfo(uint8_t &version, uint64_t &earliest_height) const
|
||||
{
|
||||
epee::json_rpc::request<cryptonote::COMMAND_RPC_HARD_FORK_INFO::request> req_t = AUTO_VAL_INIT(req_t);
|
||||
epee::json_rpc::response<cryptonote::COMMAND_RPC_HARD_FORK_INFO::response, std::string> resp_t = AUTO_VAL_INIT(resp_t);
|
||||
|
||||
version = 0;
|
||||
earliest_height = 0;
|
||||
|
||||
epee::net_utils::http::http_simple_client http_client;
|
||||
req_t.jsonrpc = "2.0";
|
||||
req_t.id = epee::serialization::storage_entry(0);
|
||||
req_t.method = "hard_fork_info";
|
||||
req_t.params.version = 0;
|
||||
bool r = epee::net_utils::invoke_http_json_remote_command2(m_daemonAddress + "/json_rpc", req_t, resp_t, http_client);
|
||||
if (!r || resp_t.result.status != CORE_RPC_STATUS_OK)
|
||||
return;
|
||||
version = resp_t.result.version;
|
||||
earliest_height = resp_t.result.earliest_height;
|
||||
}
|
||||
|
||||
uint64_t WalletManagerImpl::blockTarget() const
|
||||
{
|
||||
cryptonote::COMMAND_RPC_GET_INFO::request ireq;
|
||||
cryptonote::COMMAND_RPC_GET_INFO::response ires;
|
||||
|
||||
epee::net_utils::http::http_simple_client http_client;
|
||||
if (!epee::net_utils::invoke_http_json_remote_command2(m_daemonAddress + "/getinfo", ireq, ires, http_client))
|
||||
return 0;
|
||||
return ires.target;
|
||||
}
|
||||
|
||||
std::string WalletManagerImpl::resolveOpenAlias(const std::string &address, bool &dnssec_valid) const
|
||||
{
|
||||
std::vector<std::string> addresses = tools::wallet2::addresses_from_url(address, dnssec_valid);
|
||||
|
|
|
@ -46,12 +46,14 @@ public:
|
|||
std::vector<std::string> findWallets(const std::string &path);
|
||||
std::string errorString() const;
|
||||
void setDaemonAddress(const std::string &address);
|
||||
bool connected(uint32_t *version) const;
|
||||
bool connected(uint32_t *version = NULL) const;
|
||||
bool checkPayment(const std::string &address, const std::string &txid, const std::string &txkey, const std::string &daemon_address, uint64_t &received, uint64_t &height, std::string &error) const;
|
||||
uint64_t blockchainHeight() const;
|
||||
uint64_t blockchainTargetHeight() const;
|
||||
uint64_t networkDifficulty() const;
|
||||
double miningHashRate() const;
|
||||
void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const;
|
||||
uint64_t blockTarget() const;
|
||||
std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const;
|
||||
|
||||
private:
|
||||
|
|
|
@ -562,6 +562,12 @@ struct WalletManager
|
|||
//! returns current mining hash rate (0 if not mining)
|
||||
virtual double miningHashRate() const = 0;
|
||||
|
||||
//! returns current hard fork info
|
||||
virtual void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const = 0;
|
||||
|
||||
//! returns current block target
|
||||
virtual uint64_t blockTarget() const = 0;
|
||||
|
||||
//! resolves an OpenAlias address to a monero address
|
||||
virtual std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const = 0;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue