Commit 6cd906a4606a5b360a8c08046eb1ec77b2344a34
2011-10-09T11:19:40
Properly check shares against target difficulty.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/main.c b/main.c
index 302cc8e..d5a1060 100644
--- a/main.c
+++ b/main.c
@@ -2079,7 +2079,7 @@ bool regeneratehash(const struct work *work)
int diffshift = 0;
int i;
- for (i = 0; i < 80/4; i++)
+ for (i = 0; i < 80 / 4; i++)
swap32[i] = swab32(data32[i]);
sha2(swap, 80, hash1, false);
@@ -3957,15 +3957,35 @@ err_out:
return false;
}
+bool hashtest(const struct work *work)
+{
+ uint32_t *data32 = (uint32_t *)(work->data);
+ unsigned char swap[128];
+ uint32_t *swap32 = (uint32_t *)swap;
+ unsigned char hash1[32];
+ int i;
+
+ for (i = 0; i < 80 / 4; i++)
+ swap32[i] = swab32(data32[i]);
+
+ sha2(swap, 80, hash1, false);
+ sha2(hash1, 32, (unsigned char *)(work->hash), false);
+ return fulltest(work->hash, work->target);
+
+}
+
bool submit_nonce(struct thr_info *thr, struct work *work, uint32_t nonce)
{
- work->data[64+12+0] = (nonce>>0) & 0xff;
- work->data[64+12+1] = (nonce>>8) & 0xff;
- work->data[64+12+2] = (nonce>>16) & 0xff;
- work->data[64+12+3] = (nonce>>24) & 0xff;
+ work->data[64 + 12 + 0] = (nonce >> 0) & 0xff;
+ work->data[64 + 12 + 1] = (nonce >> 8) & 0xff;
+ work->data[64 + 12 + 2] = (nonce >> 16) & 0xff;
+ work->data[64 + 12 + 3] = (nonce >> 24) & 0xff;
+
/* Do one last check before attempting to submit the work */
- if (!fulltest(work->data + 64, work->target))
+ if (!hashtest(work)) {
+ applog(LOG_INFO, "Share below target");
return true;
+ }
return submit_work_sync(thr, work);
}