Merge branch '0.3.x'

Author: luke-jr

src/datum_stratum_dupes.c

@@ -258,8 +258,8 @@ T_DATUM_STRATUM_DUPE_ITEM *datum_stratum_add_new_dupe(T_DATUM_STRATUM_DUPES *dup
 	i->job_index = job_index;
 	i->ntime = ntime_val;
 	i->version_bits = version_bits;
-	i->extra_nonce1 = *((uint32_t *)&extranonce_bin[0]);
-	i->extra_nonce2 = *((uint64_t *)&extranonce_bin[4]);
+	i->extra_nonce_a = *((uint64_t *)&extranonce_bin[0]);
+	i->extra_nonce_b = *((uint32_t *)&extranonce_bin[8]);
 	if (!insert_after) {
 		// is a new entry
 		i->next = NULL;
@@ -331,9 +331,9 @@ bool datum_stratum_check_for_dupe(T_DATUM_STRATUM_THREADPOOL_DATA *t, unsigned i
 					// same ntime....!
 					if (version_bits == i->version_bits) {
 						// same version bits?!?!?!?
-						if (i->extra_nonce1 == *((uint32_t *)&extranonce_bin[0])) {
+						if (i->extra_nonce_a == *((uint64_t *)&extranonce_bin[0])) {
 							// same extra nonce 1?!?!?!??!
-							if (i->extra_nonce2 == *((uint64_t *)&extranonce_bin[4])) {
+							if (i->extra_nonce_b == *((uint32_t *)&extranonce_bin[8])) {
 								// ok, this is a duplicate :(
 								return true;
 							}

src/datum_stratum_dupes.h

@@ -52,8 +52,8 @@ typedef struct T_DATUM_STRATUM_DUPE_ITEM {
 	unsigned short job_index;
 	unsigned int ntime;
 	unsigned int version_bits;
-	unsigned int extra_nonce1;
-	uint64_t extra_nonce2;
+	uint64_t extra_nonce_a;  // extranonce1 + first 32 bits of extranonce2
+	uint32_t extra_nonce_b;  // last 32 bits of extranonce2
 
 	struct T_DATUM_STRATUM_DUPE_ITEM *next;
 } T_DATUM_STRATUM_DUPE_ITEM;