fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'beta' of https://github.com/xmrig/xmrig

Browse source
This commit is contained in:
MoneroOcean 2019-10-29 14:19:29 -07:00
commit 245838ffae
57 changed files with 1167 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/net/strategies/DonateStrategy.cpp
View file

@ -226,7 +226,7 @@ void xmrig::DonateStrategy::onTimer(const Timer *)
}
xmrig::Client *xmrig::DonateStrategy::createProxy()
xmrig::IClient *xmrig::DonateStrategy::createProxy()
{
if (m_controller->config()->pools().proxyDonate() == Pools::PROXY_DONATE_NONE) {
return nullptr;
@ -243,7 +243,7 @@ xmrig::Client *xmrig::DonateStrategy::createProxy()
Pool pool(client->ip(), client->pool().port(), m_userId, client->pool().password(), 0, true, client->isTLS());
pool.setAlgo(client->pool().algorithm());
auto proxy = new Client(-1, Platform::userAgent(), this);
IClient *proxy = new Client(-1, Platform::userAgent(), this);
proxy->setPool(pool);
proxy->setQuiet(true);

2
src/net/strategies/DonateStrategy.h
View file

@ -91,7 +91,7 @@ private:
inline State state() const { return m_state; }
Client *createProxy();
IClient *createProxy();
void idle(double min, double max);
void setAlgorithms(rapidjson::Document &doc, rapidjson::Value &params);
void setJob(IClient *client, const Job &job);