Add INKcoin support

Royaltropico · Apr 23, 2014 · c159bef · c159bef
1 parent e68cb6e
commit c159bef
Show file tree

Hide file tree

Showing 5 changed files with 158 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -19,12 +19,14 @@ minerd_SOURCES	= elist.h miner.h compat.h \
 		  cpu-miner.c util.c \
 		  sha2.c scrypt.c keccak.c \
 		  heavy.c quark.c skein.c \
+		  ink.c \
 		  sha3/sph_keccak.c \
 		  sha3/sph_hefty1.c \
 		  sha3/sph_groestl.c \
 		  sha3/sph_skein.c \
 		  sha3/sph_bmw.c \
 		  sha3/sph_jh.c \
+		  sha3/sph_shavite.c \
 		  sha3/sph_blake.c
 if ARCH_x86
 minerd_SOURCES += sha2-x86.S scrypt-x86.S

diff --git a/cpu-miner.c b/cpu-miner.c
@@ -107,6 +107,7 @@ enum sha256_algos {
 	ALGO_HEAVY,         /* Heavy */
 	ALGO_QUARK,         /* Quark */
 	ALGO_SKEIN,         /* Skein */
+	ALGO_INK,           /* INKcoin */
 };
 
 static const char *algo_names[] = {
@@ -116,6 +117,7 @@ static const char *algo_names[] = {
 	[ALGO_HEAVY]        = "heavy",
 	[ALGO_QUARK]        = "quark",
 	[ALGO_SKEIN]        = "skein",
+	[ALGO_INK]          = "ink",
 };
 
 bool opt_debug = false;
@@ -180,6 +182,7 @@ Options:\n\
                           quark     Quark\n\
                           heavy     Heavy\n\
                           skein     Skein\n\
+                          ink       INKcoin\n\
   -o, --url=URL         URL of mining server\n\
   -O, --userpass=U:P    username:password pair for mining server\n\
   -u, --user=USERNAME   username for mining server\n\
@@ -815,6 +818,10 @@ static void *miner_thread(void *userdata)
 	        rc = scanhash_skein(thr_id, work.data, work.target,
 	                            max_nonce, &hashes_done);
 	        break;
+	    case ALGO_INK:
+	        rc = scanhash_ink(thr_id, work.data, work.target,
+	                            max_nonce, &hashes_done);
+	        break;
 
 		default:
 			/* should never happen */

diff --git a/ink.c b/ink.c
@@ -0,0 +1,145 @@
+#include "cpuminer-config.h"
+#include "miner.h"
+
+#include <string.h>
+#include <stdint.h>
+
+#include "sha3/sph_shavite.h"
+
+static void inkhash(void *state, const void *input)
+{
+    sph_shavite512_context	 ctx_shavite;
+    uint32_t hash[16];
+
+    sph_shavite512_init(&ctx_shavite);
+    sph_shavite512 (&ctx_shavite, (const void*) input, 80);
+    sph_shavite512_close(&ctx_shavite, (void*) hash);
+
+    sph_shavite512_init(&ctx_shavite);
+    sph_shavite512(&ctx_shavite, (const void*) hash, 64);
+    sph_shavite512_close(&ctx_shavite, (void*) hash);
+
+    memcpy(state, hash, 32);
+
+/*	
+	int ii;
+	printf("result: ");
+	for (ii=0; ii < 32; ii++)
+	{
+		printf ("%.2x",((uint8_t*)state)[ii]);
+	};
+	printf ("\n");	
+*/	
+}
+
+int scanhash_ink(int thr_id, uint32_t *pdata, const uint32_t *ptarget,
+	uint32_t max_nonce, unsigned long *hashes_done)
+{
+	uint32_t n = pdata[19] - 1;
+	const uint32_t first_nonce = pdata[19];
+	const uint32_t Htarg = ptarget[7];
+
+	uint32_t hash64[8] __attribute__((aligned(32)));
+	uint32_t endiandata[32];
+
+	//char testdata[] = {"\x70\x00\x00\x00\x5d\x38\x5b\xa1\x14\xd0\x79\x97\x0b\x29\xa9\x41\x8f\xd0\x54\x9e\x7d\x68\xa9\x5c\x7f\x16\x86\x21\xa3\x14\x20\x10\x00\x00\x00\x00\x57\x85\x86\xd1\x49\xfd\x07\xb2\x2f\x3a\x8a\x34\x7c\x51\x6d\xe7\x05\x2f\x03\x4d\x2b\x76\xff\x68\xe0\xd6\xec\xff\x9b\x77\xa4\x54\x89\xe3\xfd\x51\x17\x32\x01\x1d\xf0\x73\x10\x00"};
+
+	//we need bigendian data...
+	//lessons learned: do NOT endianchange directly in pdata, this will all proof-of-works be considered as stale from minerd.... 
+	int kk=0;
+	for (; kk < 32; kk++)
+	{
+		be32enc(&endiandata[kk], ((uint32_t*)pdata)[kk]);
+	};
+
+//	if (opt_debug) 
+//	{
+//		applog(LOG_DEBUG, "Thr: %02d, firstN: %08x, maxN: %08x, ToDo: %d", thr_id, first_nonce, max_nonce, max_nonce-first_nonce);
+//	}
+
+	/* I'm to lazy to put the loop in an inline function... so dirty copy'n'paste.... */
+	/* i know that i could set a variable, but i don't know how the compiler will optimize it, not that then the cpu needs to load the value *everytime* in a register */
+	if (ptarget[7]==0) {
+		do {
+			pdata[19] = ++n;
+			be32enc(&endiandata[19], n); 
+			inkhash(hash64, &endiandata);
+			if (((hash64[7]&0xFFFFFFFF)==0) && 
+					fulltest(hash64, ptarget)) {
+				*hashes_done = n - first_nonce + 1;
+				return true;
+			}
+		} while (n < max_nonce && !work_restart[thr_id].restart);	
+	} 
+	else if (ptarget[7]<=0xF) 
+	{
+		do {
+			pdata[19] = ++n;
+			be32enc(&endiandata[19], n); 
+			inkhash(hash64, &endiandata);
+			if (((hash64[7]&0xFFFFFFF0)==0) && 
+					fulltest(hash64, ptarget)) {
+				*hashes_done = n - first_nonce + 1;
+				return true;
+			}
+		} while (n < max_nonce && !work_restart[thr_id].restart);	
+	} 
+	else if (ptarget[7]<=0xFF) 
+	{
+		do {
+			pdata[19] = ++n;
+			be32enc(&endiandata[19], n); 
+			inkhash(hash64, &endiandata);
+			if (((hash64[7]&0xFFFFFF00)==0) && 
+					fulltest(hash64, ptarget)) {
+				*hashes_done = n - first_nonce + 1;
+				return true;
+			}
+		} while (n < max_nonce && !work_restart[thr_id].restart);	
+	} 
+	else if (ptarget[7]<=0xFFF) 
+	{
+		do {
+			pdata[19] = ++n;
+			be32enc(&endiandata[19], n); 
+			inkhash(hash64, &endiandata);
+			if (((hash64[7]&0xFFFFF000)==0) && 
+					fulltest(hash64, ptarget)) {
+				*hashes_done = n - first_nonce + 1;
+				return true;
+			}
+		} while (n < max_nonce && !work_restart[thr_id].restart);	
+
+	} 
+	else if (ptarget[7]<=0xFFFF) 
+	{
+		do {
+			pdata[19] = ++n;
+			be32enc(&endiandata[19], n); 
+			inkhash(hash64, &endiandata);
+			if (((hash64[7]&0xFFFF0000)==0) && 
+					fulltest(hash64, ptarget)) {
+				*hashes_done = n - first_nonce + 1;
+				return true;
+			}
+		} while (n < max_nonce && !work_restart[thr_id].restart);	
+
+	} 
+	else 
+	{
+		do {
+			pdata[19] = ++n;
+			be32enc(&endiandata[19], n); 
+			inkhash(hash64, &endiandata);
+			if (fulltest(hash64, ptarget)) {
+				*hashes_done = n - first_nonce + 1;
+				return true;
+			}
+		} while (n < max_nonce && !work_restart[thr_id].restart);	
+	}
+
+
+	*hashes_done = n - first_nonce + 1;
+	pdata[19] = n;
+	return 0;
+}
diff --git a/miner.h b/miner.h
@@ -168,6 +168,9 @@ extern int scanhash_quark(int thr_id, uint32_t *pdata, const uint32_t *ptarget,
 extern int scanhash_skein(int thr_id, uint32_t *pdata, const uint32_t *ptarget,
        	uint32_t max_nonce, unsigned long *hashes_done);
 
+extern int scanhash_ink(int thr_id, uint32_t *pdata, const uint32_t *ptarget,
+       	uint32_t max_nonce, unsigned long *hashes_done);
+
 struct thr_info {
 	int		id;
 	pthread_t	pth;

diff --git a/skein.c b/skein.c
@@ -26,7 +26,7 @@ static void skeinhash(void *state, const void *input)
     SHA256_CTX sha256;
     SHA256_Init(&sha256);
     SHA256_Update(&sha256, hashA, 64);
-    SHA256_Final(hashB, &sha256);
+    SHA256_Final((unsigned char*) hashB, &sha256);
 
     memcpy(state, hashB, 32);
 
@@ -62,7 +62,6 @@ int scanhash_skein(int thr_id, uint32_t *pdata, const uint32_t *ptarget,
 	};
 
 	do {
-
 		pdata[19] = ++n;
 		be32enc(&endiandata[19], n); 
 		skeinhash(hash64, &endiandata);