Merge remote-tracking branch 'origin/release/0.14'

# Conflicts: # .bumpversion.cfg # CMakeLists.txt # libpoolprotocols/stratum/EthStratumClient.cpp
dok441 · May 1, 2018 · fa3ea1f · fa3ea1f
2 parents 2a8fdb5 + 08e16bc
commit fa3ea1f
Show file tree

Hide file tree

Showing 4 changed files with 501 additions and 129 deletions.
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
@@ -961,6 +961,13 @@ class MinerCLI
 			mgr.addConnection(m_endpoints[i]);
 		}
 
+		// If we are in simulation mode we add a fake connection
+		if (m_mode == OperationMode::Simulation) {
+			PoolConnection con(URI("http://-:0"));
+			mgr.clearConnections();
+			mgr.addConnection(con);
+		}
+
 #if API_CORE
 		Api api(this->m_api_port, f);
 #endif

diff --git a/libpoolprotocols/PoolManager.cpp b/libpoolprotocols/PoolManager.cpp
@@ -149,7 +149,12 @@ void PoolManager::workLoop()
 			std::string h = toHex(toCompactBigEndian(mp.rate(), 1));
 			std::string res = h[0] != '0' ? h : h.substr(1);
 
-			p_client->submitHashrate("0x" + res);
+			// Should be 32 bytes
+			// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_submithashrate
+			std::ostringstream ss;
+			ss << std::setw(64) << std::setfill('0') << res;
+
+			p_client->submitHashrate("0x" + ss.str());
 			m_hashrateReportingTimePassed = 0;
 		}
 	}