From 197034b5dd9e2f2cbfc4b32b213b62ea6698a06a Mon Sep 17 00:00:00 2001 From: BenDroid Date: Sun, 25 Mar 2018 14:41:56 +0200 Subject: [PATCH] Increased version and changed donationstrategy again --- src/donate.h | 2 +- src/net/strategies/DonateStrategy.cpp | 6 +++--- src/net/strategies/DonateStrategy.h | 2 +- src/version.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/donate.h b/src/donate.h index 2ffb3d4b..1527a759 100644 --- a/src/donate.h +++ b/src/donate.h @@ -33,7 +33,7 @@ * Percentage of your hashing power that you want to donate to the developer, can be 0 if you don't want to do that. * Example of how it works for the default setting of 1: * You miner will mine into your usual pool for 99 minutes, then switch to the developer's pool for 1 minute. - * Since v1.5.2 start time randomized in range from 50 to 150 minutes minus donation time, to reduce peaks on donation + * Since v1.5.2 start time randomized in range from 30 to 60 minutes minus donation time, to reduce peaks on donation * pool when restarting a bunch of miners. * Switching is instant, and only happens after a successful connection, so you never loose any hashes. * diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index 85d144fd..62567d1b 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -68,7 +68,7 @@ DonateStrategy::DonateStrategy(const char *agent, IStrategyListener *listener) : m_timer.data = this; uv_timer_init(uv_default_loop(), &m_timer); - idle(random(3000, 9000) * 1000 - m_donateTime); + idle(random(1500, 3600) * 1000); } @@ -125,9 +125,9 @@ void DonateStrategy::onResultAccepted(Client *client, const SubmitResult &result } -void DonateStrategy::idle(int timeout) +void DonateStrategy::idle(uint64_t timeout) { - uv_timer_start(&m_timer, DonateStrategy::onTimer, static_cast(timeout), 0); + uv_timer_start(&m_timer, DonateStrategy::onTimer, timeout, 0); } diff --git a/src/net/strategies/DonateStrategy.h b/src/net/strategies/DonateStrategy.h index 3cb644b8..f7ac2919 100644 --- a/src/net/strategies/DonateStrategy.h +++ b/src/net/strategies/DonateStrategy.h @@ -58,7 +58,7 @@ protected: void onResultAccepted(Client *client, const SubmitResult &result, const char *error) override; private: - void idle(int timeout); + void idle(uint64_t timeout); void suspend(); static void onTimer(uv_timer_t *handle); diff --git a/src/version.h b/src/version.h index ad21d144..430d97e8 100644 --- a/src/version.h +++ b/src/version.h @@ -36,14 +36,14 @@ #define APP_DESC "XMRigCC CPU miner" #define APP_COPYRIGHT "Copyright (C) 2017- BenDr0id" #endif -#define APP_VERSION "1.5.1 (based on XMRig 2.4.5)" +#define APP_VERSION "1.5.2 (based on XMRig 2.4.5)" #define APP_DOMAIN "" #define APP_SITE "https://github.com/Bendr0id/xmrigCC" #define APP_KIND "cpu" #define APP_VER_MAJOR 1 #define APP_VER_MINOR 5 -#define APP_VER_BUILD 1 +#define APP_VER_BUILD 2 #define APP_VER_REV 0 #ifndef NDEBUG