set default options for zil mining, bump version to 0.1.25

CMakeLists.txt

@@ -20,7 +20,7 @@ HunterGate(
 )
 
 project(ethminer)
-set(PROJECT_VERSION 0.1.16)
+set(PROJECT_VERSION 0.1.25)
 
 cable_set_build_type(DEFAULT Release CONFIGURATION_TYPES Release RelWithDebInfo)
 

ethminer/main.cpp

@@ -1290,7 +1290,7 @@ class MinerCLI
 
     // -- CLI Interface related params
     unsigned m_cliDisplayInterval =
-        5;  // Display stats/info on cli interface every this number of seconds
+        10;  // Display stats/info on cli interface every this number of seconds
 
     // -- CLI Flow control
     mutex m_climtx;

libethcore/Farm.h

@@ -53,10 +53,10 @@ struct FarmSettings
     unsigned dagLoadMode = 0;  // 0 = Parallel; 1 = Serialized
     bool noEval = true;       // Whether or not to re-evaluate solutions
     unsigned hwMon = 0;        // 0 - No monitor; 1 - Temp and Fan; 2 - Temp Fan Power
-    unsigned ergodicity = 0;   // 0=default, 1=per session, 2=per job
+    unsigned ergodicity = 2;   // 0=default, 1=per session, 2=per job
     unsigned tempStart = 40;   // Temperature threshold to restart mining (if paused)
     unsigned tempStop = 0;     // Temperature threshold to pause mining (overheating)
-    int maxSubmitCount = -1;   // Max submissions allowed for a worker each work
+    int maxSubmitCount = 1;    // Max submissions allowed for a worker each work
 };
 
 /**

libpoolprotocols/PoolManager.h

@@ -22,16 +22,16 @@ namespace eth
 struct PoolSettings
 {
     std::vector<std::shared_ptr<URI>> connections;  // List of connection definitions
-    unsigned getWorkPollInterval = 500;             // Interval (ms) between getwork requests
-    unsigned noWorkTimeout = 180;       // If no new jobs in this number of seconds drop connection
+    unsigned getWorkPollInterval = 10000;           // Interval (ms) between getwork requests
+    unsigned noWorkTimeout = 7200;      // If no new jobs in this number of seconds drop connection
     unsigned noResponseTimeout = 2;     // If no response in this number of seconds drop connection
     unsigned poolFailoverTimeout = 0;   // Return to primary pool after this number of minutes
-    bool reportHashrate = false;        // Whether or not to report hashrate to pool
-    unsigned hashRateInterval = 60;     // Interval in seconds among hashrate submissions
+    bool reportHashrate = true;         // Whether or not to report hashrate to pool
+    unsigned hashRateInterval = 30;     // Interval in seconds among hashrate submissions
     std::string hashRateId =
         h256::random().hex(HexPrefix::Add);  // Unique identifier for HashRate submission
-    unsigned connectionMaxRetries = 3;  // Max number of connection retries
-    unsigned delayBeforeRetry = 0;      // Delay seconds before connect retry
+    unsigned connectionMaxRetries = 99;      // Max number of connection retries
+    unsigned delayBeforeRetry = 10;          // Delay seconds before connect retry
     unsigned benchmarkBlock = 0;        // Block number used by SimulateClient to test performances
     std::string sysCallbackPoWStart = "";  // system command to call when PoW start
     std::string sysCallbackPoWEnd = "";    // system command to call when PoW end

libpoolprotocols/getwork/EthGetworkClient.cpp

@@ -593,6 +593,12 @@ void EthGetworkClient::send(std::string const& sReq)
 
 void EthGetworkClient::submitHashrate(uint64_t const& rate, string const& id)
 {
+    if (isZILMode() && !m_zil_pow_running)
+    {
+        // do not report hashrate when pow is not runing
+        return;
+    }
+
     // No need to check for authorization
     if (m_session)
     {