kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wallet_api: add a few daemon related getters

Browse source 
Blockchain height, version, Mining hash rate...
This commit is contained in:
moneromooo-monero 2016-11-29 10:54:38 +00:00
parent dbf2ab56c5
commit fcd178ef33
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
3 changed files with 88 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/wallet/api/wallet_manager.cpp
View file

@ -130,9 +130,26 @@ std::string WalletManagerImpl::errorString() const
return m_errorString;
}
void WalletManagerImpl::setDaemonHost(const std::string &hostname)
void WalletManagerImpl::setDaemonAddress(const std::string &address)
{
m_daemonAddress = address;
}
bool WalletManagerImpl::connected(uint32_t *version = NULL) 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);
req_t.jsonrpc = "2.0";
req_t.id = epee::serialization::storage_entry(0);
req_t.method = "get_version";
epee::net_utils::http::http_simple_client http_client;
bool r = epee::net_utils::invoke_http_json_remote_command2(m_daemonAddress + "/json_rpc", req_t, resp_t, http_client);
if (!r)
return false;
if (version)
*version = resp_t.result.version;
return true;
}
bool WalletManagerImpl::checkPayment(const std::string &address_text, const std::string &txid_text, const std::string &txkey_text, const std::string &daemon_address, uint64_t &received, uint64_t &height, std::string &error) const
@ -287,6 +304,52 @@ bool WalletManagerImpl::checkPayment(const std::string &address_text, const std:
return true;
}
uint64_t WalletManagerImpl::blockchainHeight() 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.height;
}
uint64_t WalletManagerImpl::blockchainTargetHeight() 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_height >= ires.height ? ires.target_height : ires.height;
}
uint64_t WalletManagerImpl::networkDifficulty() 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.difficulty;
}
double WalletManagerImpl::miningHashRate() const
{
cryptonote::COMMAND_RPC_MINING_STATUS::request mreq;
cryptonote::COMMAND_RPC_MINING_STATUS::response mres;
epee::net_utils::http::http_simple_client http_client;
if (!epee::net_utils::invoke_http_json_remote_command2(m_daemonAddress + "/getinfo", mreq, mres, http_client))
return 0.0;
if (!mres.active)
return 0.0;
return mres.speed;
}
///////////////////// WalletManagerFactory implementation //////////////////////
WalletManager *WalletManagerFactory::getWalletManager()

8
src/wallet/api/wallet_manager.h
View file

@ -45,12 +45,18 @@ public:
bool walletExists(const std::string &path);
std::vector<std::string> findWallets(const std::string &path);
std::string errorString() const;
void setDaemonHost(const std::string &hostname);
void setDaemonAddress(const std::string &address);
bool connected(uint32_t *version) 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;
private:
WalletManagerImpl() {}
friend struct WalletManagerFactory;
std::string m_daemonAddress;
std::string m_errorString;
};

17
src/wallet/wallet2_api.h
View file

@ -486,6 +486,23 @@ struct WalletManager
//! returns verbose error string regarding last error;
virtual std::string errorString() const = 0;
//! set the daemon address (hostname and port)
virtual void setDaemonAddress(const std::string &address) = 0;
//! returns whether the daemon can be reached, and its version number
virtual bool connected(uint32_t *version = NULL) const = 0;
//! returns current blockchain height
virtual uint64_t blockchainHeight() const = 0;
//! returns current blockchain target height
virtual uint64_t blockchainTargetHeight() const = 0;
//! returns current network difficulty
virtual uint64_t networkDifficulty() const = 0;
//! returns current mining hash rate (0 if not mining)
virtual double miningHashRate() const = 0;
};