resolve merge conflict for frequent work changes

Author: cdetrio

ethminer/MinerAux.h

@@ -770,7 +770,7 @@ class MinerCLI
 			f.start("opencl", false);
 		else if (_m == MinerType::CUDA)
 			f.start("cuda", false);
-		WorkPackage current, previous;
+		EthashProofOfWork::WorkPackage current;
 		std::mutex x_current;
 		while (m_running)
 			try
@@ -810,9 +810,6 @@ class MinerCLI
 					if (hh != current.headerHash)
 					{
 						x_current.lock();
-						previous.headerHash = current.headerHash;
-						previous.seedHash = current.seedHash;
-						previous.boundary = current.boundary;
 						current.headerHash = hh;
 						current.seedHash = newSeedHash;
 						current.boundary = h256(fromHex(v[2].asString()), h256::AlignRight);
@@ -824,9 +821,11 @@ class MinerCLI
 				}
 				cnote << "Solution found; Submitting to" << _remote << "...";
 				cnote << "  Nonce:" << solution.nonce.hex();
-				if (EthashAux::eval(current.seedHash, current.headerHash, solution.nonce).value < current.boundary)
+				cnote << "  headerHash:" << solution.headerHash.hex();
+				cnote << "  mixHash:" << solution.mixHash.hex();
+				if (EthashAux::eval(solution.seedHash, solution.headerHash, solution.nonce).value < solution.boundary)
 				{
-					bool ok = prpc->eth_submitWork("0x" + toString(solution.nonce), "0x" + toString(current.headerHash), "0x" + toString(solution.mixHash));
+					bool ok = prpc->eth_submitWork("0x" + toString(solution.nonce), "0x" + toString(solution.headerHash), "0x" + toString(solution.mixHash));
 					if (ok) {
 						cnote << "B-) Submitted and accepted.";
 						f.acceptedSolution(false);
@@ -837,19 +836,6 @@ class MinerCLI
 					}
 					//exit(0);
 				}
-				else if (EthashAux::eval(previous.seedHash, previous.headerHash, solution.nonce).value < previous.boundary)
-				{
-					bool ok = prpc->eth_submitWork("0x" + toString(solution.nonce), "0x" + toString(previous.headerHash), "0x" + toString(solution.mixHash));
-					if (ok) {
-						cnote << "B-) Submitted and accepted.";
-						f.acceptedSolution(true);
-					}
-					else {
-						cwarn << ":-( Not accepted.";
-						f.rejectedSolution(true);
-					}
-					//exit(0);
-				}
 				else {
 					f.failedSolution();
 					cwarn << "FAILURE: GPU gave incorrect result!";

libethcore/EthashAux.h

@@ -34,9 +34,48 @@ namespace eth
 
 struct Solution
 {
-	Nonce nonce;
-	h256 mixHash;
-};
+	struct Solution
+	{
+		Nonce nonce;
+		h256 mixHash;
+		h256 headerHash;
+		h256 seedHash;
+		h256 boundary;
+	};
+
+	struct Result
+	{
+		h256 value;
+		h256 mixHash;
+	};
+
+	struct WorkPackage
+	{
+		WorkPackage() = default;
+		WorkPackage(Ethash::BlockHeader const& _bh) :
+			boundary(_bh.boundary()),
+			headerHash(_bh.hashWithout()),
+			seedHash(_bh.seedHash())
+		{ }
+		void reset() { headerHash = h256(); }
+		operator bool() const { return headerHash != h256(); }
+
+		h256 boundary;
+		h256 headerHash;	///< When h256() means "pause until notified a new work package is available".
+		h256 seedHash;
+
+		uint64_t startNonce = 0;
+		int exSizeBits = -1;
+	};
+
+	static const WorkPackage NullWorkPackage;
+
+	/// Default value of the local work size. Also known as workgroup size.
+	static const unsigned defaultLocalWorkSize;
+	/// Default value of the global work size as a multiplier of the local work size
+	static const unsigned defaultGlobalWorkSizeMultiplier;
+	/// Default value of the milliseconds per global work size (per batch)
+	static const unsigned defaultMSPerBatch;
 
 struct Result
 {

libethcore/EthashGPUMiner.cpp

@@ -125,7 +125,7 @@ bool EthashGPUMiner::report(uint64_t _nonce)
 	Nonce n = (Nonce)(u64)_nonce;
 	Result r = EthashAux::eval(work().seedHash, work().headerHash, n);
 	if (r.value < work().boundary)
-		return submitProof(Solution{n, r.mixHash});
+		return submitProof(Solution{n, r.mixHash, work().headerHash, work().seedHash, work().boundary});
 	return false;
 }