diff --git a/CMakeLists.txt b/CMakeLists.txt index b11639609..b99788f9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12) set(PROJECT_VERSION "0.9.41") -set(GENOIL_VERSION "1.1.3") +set(GENOIL_VERSION "1.1.4") if (${CMAKE_VERSION} VERSION_GREATER 3.0) cmake_policy(SET CMP0042 OLD) # fix MACOSX_RPATH cmake_policy(SET CMP0048 NEW) # allow VERSION argument in project() diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h index 3423594c1..52b70c03d 100644 --- a/ethminer/MinerAux.h +++ b/ethminer/MinerAux.h @@ -1008,7 +1008,12 @@ private: f.onSolutionFound([&](EthashProofOfWork::Solution sol) { - client.submit(sol); + if (client.isConnected()) { + client.submit(sol); + } + else { + cwarn << "Can't submit solution: Not connected"; + } return false; }); diff --git a/libstratum/EthStratumClient.h b/libstratum/EthStratumClient.h index c91493d37..3e49b02b8 100644 --- a/libstratum/EthStratumClient.h +++ b/libstratum/EthStratumClient.h @@ -28,7 +28,7 @@ public: void setFailover(string const & host, string const & port, string const & user, string const & pass); bool isRunning() { return m_running; } - bool isConnected() { return m_connected; } + bool isConnected() { return m_connected && m_authorized; } h256 currentHeaderHash() { return m_current.headerHash; } bool current() { return m_current; } unsigned waitState() { return m_waitState; } diff --git a/libstratum/EthStratumClientV2.h b/libstratum/EthStratumClientV2.h index 512d7acd7..38e6741a9 100644 --- a/libstratum/EthStratumClientV2.h +++ b/libstratum/EthStratumClientV2.h @@ -29,7 +29,7 @@ public: void setFailover(string const & host, string const & port, string const & user, string const & pass); bool isRunning() { return m_running; } - bool isConnected() { return m_connected; } + bool isConnected() { return m_connected && m_authorized; } h256 currentHeaderHash() { return m_current.headerHash; } bool current() { return m_current; } unsigned waitState() { return m_waitState; } diff --git a/releases/ethminer-0.9.41-genoil-1.0.1.zip b/releases/ethminer-0.9.41-genoil-1.0.1.zip deleted file mode 100644 index 2e02425bd..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.0.1.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.0.2.zip b/releases/ethminer-0.9.41-genoil-1.0.2.zip deleted file mode 100644 index 90614b6b4..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.0.2.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.0.3.zip b/releases/ethminer-0.9.41-genoil-1.0.3.zip deleted file mode 100644 index 65087afed..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.0.3.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.0.4b3.zip b/releases/ethminer-0.9.41-genoil-1.0.4b3.zip deleted file mode 100644 index 67193e83c..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.0.4b3.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.0.5.zip b/releases/ethminer-0.9.41-genoil-1.0.5.zip deleted file mode 100644 index 206fb91e3..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.0.5.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.0.6.zip b/releases/ethminer-0.9.41-genoil-1.0.6.zip deleted file mode 100644 index b2e202941..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.0.6.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.0.7.zip b/releases/ethminer-0.9.41-genoil-1.0.7.zip deleted file mode 100644 index f3f91b9e3..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.0.7.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.1.1.zip b/releases/ethminer-0.9.41-genoil-1.1.1.zip deleted file mode 100644 index 73f207e4b..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.1.1.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.1.2.zip b/releases/ethminer-0.9.41-genoil-1.1.2.zip deleted file mode 100644 index d245c3f43..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.1.2.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.1.3.zip b/releases/ethminer-0.9.41-genoil-1.1.3.zip deleted file mode 100644 index 38d8fa032..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.1.3.zip and /dev/null differ diff --git a/releases/ethminer-0.9.41-genoil-1.1.4.zip b/releases/ethminer-0.9.41-genoil-1.1.4.zip new file mode 100644 index 000000000..4e75ddf44 Binary files /dev/null and b/releases/ethminer-0.9.41-genoil-1.1.4.zip differ diff --git a/releases/ethminer-0.9.41-genoil-1.1.zip b/releases/ethminer-0.9.41-genoil-1.1.zip deleted file mode 100644 index 514bfbf08..000000000 Binary files a/releases/ethminer-0.9.41-genoil-1.1.zip and /dev/null differ