mirror of
https://github.com/monero-project/monero.git
synced 2024-11-18 00:37:43 +00:00
Merge pull request #1513
a813ab50
wallet2_api: add solo mining API (moneromooo-monero)
This commit is contained in:
commit
71c7577370
3 changed files with 49 additions and 1 deletions
|
@ -346,7 +346,7 @@ double WalletManagerImpl::miningHashRate() const
|
||||||
cryptonote::COMMAND_RPC_MINING_STATUS::response mres;
|
cryptonote::COMMAND_RPC_MINING_STATUS::response mres;
|
||||||
|
|
||||||
epee::net_utils::http::http_simple_client http_client;
|
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))
|
if (!epee::net_utils::invoke_http_json_remote_command2(m_daemonAddress + "/mining_status", mreq, mres, http_client))
|
||||||
return 0.0;
|
return 0.0;
|
||||||
if (!mres.active)
|
if (!mres.active)
|
||||||
return 0.0;
|
return 0.0;
|
||||||
|
@ -384,6 +384,42 @@ uint64_t WalletManagerImpl::blockTarget() const
|
||||||
return ires.target;
|
return ires.target;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool WalletManagerImpl::isMining() 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 + "/mining_status", mreq, mres, http_client))
|
||||||
|
return false;
|
||||||
|
return mres.active;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WalletManagerImpl::startMining(const std::string &address, uint32_t threads)
|
||||||
|
{
|
||||||
|
cryptonote::COMMAND_RPC_START_MINING::request mreq;
|
||||||
|
cryptonote::COMMAND_RPC_START_MINING::response mres;
|
||||||
|
|
||||||
|
mreq.miner_address = address;
|
||||||
|
mreq.threads_count = threads;
|
||||||
|
|
||||||
|
epee::net_utils::http::http_simple_client http_client;
|
||||||
|
if (!epee::net_utils::invoke_http_json_remote_command2(m_daemonAddress + "/start_mining", mreq, mres, http_client))
|
||||||
|
return false;
|
||||||
|
return mres.status == CORE_RPC_STATUS_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WalletManagerImpl::stopMining()
|
||||||
|
{
|
||||||
|
cryptonote::COMMAND_RPC_STOP_MINING::request mreq;
|
||||||
|
cryptonote::COMMAND_RPC_STOP_MINING::response mres;
|
||||||
|
|
||||||
|
epee::net_utils::http::http_simple_client http_client;
|
||||||
|
if (!epee::net_utils::invoke_http_json_remote_command2(m_daemonAddress + "/stop_mining", mreq, mres, http_client))
|
||||||
|
return false;
|
||||||
|
return mres.status == CORE_RPC_STATUS_OK;
|
||||||
|
}
|
||||||
|
|
||||||
std::string WalletManagerImpl::resolveOpenAlias(const std::string &address, bool &dnssec_valid) const
|
std::string WalletManagerImpl::resolveOpenAlias(const std::string &address, bool &dnssec_valid) const
|
||||||
{
|
{
|
||||||
std::vector<std::string> addresses = tools::dns_utils::addresses_from_url(address, dnssec_valid);
|
std::vector<std::string> addresses = tools::dns_utils::addresses_from_url(address, dnssec_valid);
|
||||||
|
|
|
@ -54,6 +54,9 @@ public:
|
||||||
double miningHashRate() const;
|
double miningHashRate() const;
|
||||||
void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const;
|
void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const;
|
||||||
uint64_t blockTarget() const;
|
uint64_t blockTarget() const;
|
||||||
|
bool isMining() const;
|
||||||
|
bool startMining(const std::string &address, uint32_t threads = 1);
|
||||||
|
bool stopMining();
|
||||||
std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const;
|
std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -571,6 +571,15 @@ struct WalletManager
|
||||||
//! returns current block target
|
//! returns current block target
|
||||||
virtual uint64_t blockTarget() const = 0;
|
virtual uint64_t blockTarget() const = 0;
|
||||||
|
|
||||||
|
//! returns true iff mining
|
||||||
|
virtual bool isMining() const = 0;
|
||||||
|
|
||||||
|
//! starts mining with the set number of threads
|
||||||
|
virtual bool startMining(const std::string &address, uint32_t threads = 1) = 0;
|
||||||
|
|
||||||
|
//! stops mining
|
||||||
|
virtual bool stopMining() = 0;
|
||||||
|
|
||||||
//! resolves an OpenAlias address to a monero address
|
//! resolves an OpenAlias address to a monero address
|
||||||
virtual std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const = 0;
|
virtual std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const = 0;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue