diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-03 14:31:28 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-03 14:31:28 +0200 |
| commit | e24cd86c1819172a15fc2b329de1e7f35a253c72 (patch) | |
| tree | e3a4d20522d75c3c7d798df473bd350d3da94f31 | |
| parent | Merge pull request #1826 (diff) | |
| parent | wallet api: add missing mining options (diff) | |
| download | monero-e24cd86c1819172a15fc2b329de1e7f35a253c72.tar.xz | |
Merge pull request #1827
db1c7d80 wallet api: add missing mining options (Jaquee)
| -rw-r--r-- | src/wallet/api/wallet_manager.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/api/wallet_manager.h | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2_api.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index 359b57349..ea2a66275 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -417,13 +417,15 @@ bool WalletManagerImpl::isMining() const return mres.active; } -bool WalletManagerImpl::startMining(const std::string &address, uint32_t threads) +bool WalletManagerImpl::startMining(const std::string &address, uint32_t threads, bool background_mining, bool ignore_battery) { cryptonote::COMMAND_RPC_START_MINING::request mreq; cryptonote::COMMAND_RPC_START_MINING::response mres; mreq.miner_address = address; mreq.threads_count = threads; + mreq.ignore_battery = ignore_battery; + mreq.do_background_mining = background_mining; if (!connect_and_invoke(m_daemonAddress, "/start_mining", mreq, mres)) return false; diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h index 126bc65d1..677c105fb 100644 --- a/src/wallet/api/wallet_manager.h +++ b/src/wallet/api/wallet_manager.h @@ -62,7 +62,7 @@ public: void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const; uint64_t blockTarget() const; bool isMining() const; - bool startMining(const std::string &address, uint32_t threads = 1); + bool startMining(const std::string &address, uint32_t threads = 1, bool background_mining = false, bool ignore_battery = true); bool stopMining(); std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const; diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h index e32d23d9f..eee1c8d3c 100644 --- a/src/wallet/wallet2_api.h +++ b/src/wallet/wallet2_api.h @@ -696,7 +696,7 @@ struct WalletManager 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; + virtual bool startMining(const std::string &address, uint32_t threads = 1, bool background_mining = false, bool ignore_battery = true) = 0; //! stops mining virtual bool stopMining() = 0; |