powerdlz23 1.1.6 → 1.1.8

package/pto/yaamp/stratum/iniparser/test/twisted.ini

@@ -0,0 +1,131 @@
+#
+# Twisted.ini
+# This file is meant for regression tests
+
+# Different blank settings around the equal sign
+[blanks]
+a=1
+b=1;
+c=1; comment
+d=1# comment
+
+e =1
+f =1;
+g =1; comment
+h =1# comment
+
+i= 1
+j= 1;
+k= 1; comment
+l= 1# comment
+
+m = 1
+n = 1;
+o = 1; comment
+p = 1# comment
+
+q=1 ;
+r=1 ; comment
+s=1 ;comment
+t=1 #comment
+
+# Empty values
+[empty]
+a = ''
+b = ""
+
+c = '' ;
+d = "" ;
+
+e = '' ; comment
+f = "" ; comment
+
+g =
+h = ;
+i = ; comment
+j = # comment
+
+k=
+l=;
+m=;comment
+n=#
+
+# Peculiar values
+[peculiar]
+a=';';
+b='#'#
+c=';';comment
+d='#'#comment
+e=\;
+f=\#
+g=\;comment
+h=\#comment
+i=;;
+j=##
+k=;;;;;;;;;;
+l=##########
+
+# Quotes
+[quotes]
+s1='
+s2=''
+s3='''
+s4=''''
+
+d1="
+d2=""
+d3="""
+d4=""""
+
+m1='"'
+m2="'"
+
+h1=hello'world
+h2='hello'world
+h3='hello'world'
+
+h4=hello"world
+h5="hello"world
+h6="hello"world"
+
+# Section names
+[a]
+[ b]
+[c ]
+[ d ]
+[ begin    end ]
+[ open[ ]
+
+# Multi-line inputs
+[multi]
+a = begin\
+end
+b = begin \
+end
+c = begin \
+ end
+d = 1\
+2\
+3\
+4
+e = 1 \ 
+    2 \ 
+    3 \  
+    4
+f = 1 ; \
+hidden = because of the preceding backslash multi-lining the comment ;
+visible = 1
+g = 1 #\
+and now this comment is hidden too \
+and this one too
+h = 1
+multi \
+line \
+key = 1
+multi \
+line \
+key = \
+multi \
+line \
+value ;
+# end of file

package/pto/yaamp/stratum/job.cpp

@@ -0,0 +1,324 @@
+
+#include "stratum.h"
+
+//client->difficulty_remote = 0;
+//debuglog(" returning %x, %s, %s\n", job->id, client->sock->ip, #condition); \
+
+#define RETURN_ON_CONDITION(condition, ret) \
+	if(condition) \
+	{ \
+		return ret; \
+	}
+
+bool job_assign_client(YAAMP_JOB *job, YAAMP_CLIENT *client, double maxhash)
+{
+	RETURN_ON_CONDITION(client->deleted, true);
+	RETURN_ON_CONDITION(client->jobid_next, true);
+	RETURN_ON_CONDITION(client->jobid_locked && client->jobid_locked != job->id, true);
+	RETURN_ON_CONDITION(client_find_job_history(client, job->id), true);
+	RETURN_ON_CONDITION(maxhash > 0 && job->speed + client->speed > maxhash, true);
+
+	if(job->remote)
+	{
+		YAAMP_REMOTE *remote = job->remote;
+
+		if(g_stratum_reconnect)
+			{RETURN_ON_CONDITION(!client->extranonce_subscribe && !client->reconnectable, true);}
+		else
+			{RETURN_ON_CONDITION(!client->extranonce_subscribe, true);}
+
+		RETURN_ON_CONDITION(client->reconnecting, true);
+		RETURN_ON_CONDITION(job->count >= YAAMP_JOB_MAXSUBIDS, false);
+//		RETURN_ON_CONDITION(client->difficulty_actual > remote->difficulty_actual, false);
+
+		double difficulty_remote = client->difficulty_remote;
+		if(remote->difficulty_actual < client->difficulty_actual)
+		{
+			RETURN_ON_CONDITION(client->difficulty_fixed, true);
+			RETURN_ON_CONDITION(remote->difficulty_actual*4 < client->difficulty_actual, true);
+
+			difficulty_remote = remote->difficulty_actual;
+		}
+
+		else if(remote->difficulty_actual > client->difficulty_actual)
+			difficulty_remote = 0;
+
+		if(remote->nonce2size == 2)
+		{
+			RETURN_ON_CONDITION(job->count > 0, false);
+
+			strcpy(client->extranonce1, remote->nonce1);
+			client->extranonce2size = 2;
+		}
+
+		else if(job->id != client->jobid_sent)
+		{
+			if(!job->remote_subids[client->extranonce1_id])
+				job->remote_subids[client->extranonce1_id] = true;
+
+			else
+			{
+				int i=0;
+				for(; i<YAAMP_JOB_MAXSUBIDS; i++) if(!job->remote_subids[i])
+				{
+					job->remote_subids[i] = true;
+					client->extranonce1_id = i;
+
+					break;
+				}
+
+				RETURN_ON_CONDITION(i == YAAMP_JOB_MAXSUBIDS, false);
+			}
+
+			sprintf(client->extranonce1, "%s%02x", remote->nonce1, client->extranonce1_id);
+			client->extranonce2size = remote->nonce2size-1;
+			client->difficulty_remote = difficulty_remote;
+		}
+
+		client->jobid_locked = job->id;
+	}
+
+	else
+	{
+		strcpy(client->extranonce1, client->extranonce1_default);
+		client->extranonce2size = client->extranonce2size_default;
+
+		client->difficulty_remote = 0;
+		client->jobid_locked = 0;
+	}
+
+	client->jobid_next = job->id;
+
+	job->speed += client->speed;
+	job->count++;
+
+//	debuglog(" assign %x, %f, %d, %s\n", job->id, client->speed, client->reconnecting, client->sock->ip);
+	if(strcmp(client->extranonce1, client->extranonce1_last) || client->extranonce2size != client->extranonce2size_last)
+	{
+//		debuglog("new nonce %x %s %s\n", job->id, client->extranonce1_last, client->extranonce1);
+		if(!client->extranonce_subscribe)
+		{
+			strcpy(client->extranonce1_reconnect, client->extranonce1);
+			client->extranonce2size_reconnect = client->extranonce2size;
+
+			strcpy(client->extranonce1, client->extranonce1_default);
+			client->extranonce2size = client->extranonce2size_default;
+
+			client->reconnecting = true;
+			client->lock_count++;
+			client->unlock = true;
+			client->jobid_sent = client->jobid_next;
+
+			socket_send(client->sock, "{\"id\":null,\"method\":\"client.reconnect\",\"params\":[\"%s\",%d,0]}\n", g_tcp_server, g_tcp_port);
+		}
+
+		else
+		{
+			strcpy(client->extranonce1_last, client->extranonce1);
+			client->extranonce2size_last = client->extranonce2size;
+
+			socket_send(client->sock, "{\"id\":null,\"method\":\"mining.set_extranonce\",\"params\":[\"%s\",%d]}\n",
+				client->extranonce1, client->extranonce2size);
+		}
+	}
+
+	return true;
+}
+
+void job_assign_clients(YAAMP_JOB *job, double maxhash)
+{
+	job->speed = 0;
+	job->count = 0;
+
+	g_list_client.Enter();
+
+	// pass0 locked
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(client->jobid_locked && client->jobid_locked != job->id) continue;
+
+		bool b = job_assign_client(job, client, maxhash);
+		if(!b) break;
+	}
+
+	// pass1 sent
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(client->jobid_sent != job->id) continue;
+
+		bool b = job_assign_client(job, client, maxhash);
+		if(!b) break;
+	}
+
+	// pass2 extranonce_subscribe
+	if(job->remote)	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(!client->extranonce_subscribe) continue;
+
+		bool b = job_assign_client(job, client, maxhash);
+		if(!b) break;
+	}
+
+	// pass3 the rest
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+
+		bool b = job_assign_client(job, client, maxhash);
+		if(!b) break;
+	}
+
+	g_list_client.Leave();
+}
+
+void job_assign_clients_left(double factor)
+{
+	for(CLI li = g_list_coind.first; li; li = li->next)
+	{
+		if(!job_has_free_client()) return;
+
+		YAAMP_COIND *coind = (YAAMP_COIND *)li->data;
+		if(!coind_can_mine(coind)) continue;
+		if(!coind->job) continue;
+
+		double nethash = coind_nethash(coind);
+		g_list_client.Enter();
+
+		for(CLI li = g_list_client.first; li; li = li->next)
+		{
+			YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+
+			bool b = job_assign_client(coind->job, client, nethash*factor);
+			if(!b) break;
+		}
+
+		g_list_client.Leave();
+	}
+}
+
+////////////////////////////////////////////////////////////////////////
+
+pthread_mutex_t g_job_mutex;
+pthread_cond_t g_job_cond;
+
+void *job_thread(void *p)
+{
+	CommonLock(&g_job_mutex);
+	while(1)
+	{
+		job_update();
+		pthread_cond_wait(&g_job_cond, &g_job_mutex);
+	}
+}
+
+void job_init()
+{
+	pthread_mutex_init(&g_job_mutex, 0);
+	pthread_cond_init(&g_job_cond, 0);
+
+	pthread_t thread3;
+	pthread_create(&thread3, NULL, job_thread, NULL);
+}
+
+void job_signal()
+{
+	CommonLock(&g_job_mutex);
+	pthread_cond_signal(&g_job_cond);
+	CommonUnlock(&g_job_mutex);
+}
+
+void job_update()
+{
+//	debuglog("job_update()\n");
+	job_reset_clients();
+
+	//////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	g_list_job.Enter();
+	job_sort();
+
+	for(CLI li = g_list_job.first; li; li = li->next)
+	{
+		YAAMP_JOB *job = (YAAMP_JOB *)li->data;
+		if(!job_can_mine(job)) continue;
+
+		job_assign_clients(job, job->maxspeed);
+		job_unlock_clients(job);
+
+		if(!job_has_free_client()) break;
+	}
+
+	job_unlock_clients();
+	g_list_job.Leave();
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+
+	g_list_coind.Enter();
+	coind_sort();
+
+	job_assign_clients_left(1);
+	job_assign_clients_left(1);
+	job_assign_clients_left(-1);
+
+	g_list_coind.Leave();
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+
+	g_list_client.Enter();
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(client->deleted) continue;
+		if(client->jobid_next) continue;
+
+		debuglog("clients with no job\n");
+		g_current_algo->overflow = true;
+
+		if(!g_list_coind.first) break;
+
+		// here: todo: choose first can mine
+
+		YAAMP_COIND *coind = (YAAMP_COIND *)g_list_coind.first->data;
+		if(!coind) break;
+
+		job_reset_clients(coind->job);
+		coind_create_job(coind, true);
+		job_assign_clients(coind->job, -1);
+
+		break;
+	}
+
+	g_list_client.Leave();
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+
+//	usleep(100*YAAMP_MS);
+
+//	int ready = 0;
+//	debuglog("job_update\n");
+
+	g_list_job.Enter();
+	for(CLI li = g_list_job.first; li; li = li->next)
+	{
+		YAAMP_JOB *job = (YAAMP_JOB *)li->data;
+		if(!job_can_mine(job)) continue;
+
+		job_broadcast(job);
+//		ready++;
+	}
+
+//	debuglog("job_update %d / %d jobs\n", ready, g_list_job.count);
+	g_list_job.Leave();
+
+}
+
+
+
+
+
+
+
+

package/pto/yaamp/stratum/job.h

@@ -0,0 +1,120 @@
+
+#define MAX_AUXS	32
+
+class YAAMP_REMOTE;
+class YAAMP_COIND;
+class YAAMP_COIND_AUX;
+
+struct YAAMP_JOB_VALUES
+{
+	char coinbase[4*1024];
+	char merkleroot_be[1024];
+
+	char header[1024];
+	char header_be[1024];
+	unsigned char header_bin[1024];
+
+	char hash_hex[1024];
+	char hash_be[1024];
+	unsigned char hash_bin[1024];
+};
+
+struct YAAMP_JOB_TEMPLATE
+{
+	int created;
+	char flags[64];
+
+	char prevhash_hex[1024];
+	char prevhash_be[1024];
+
+	int txcount;
+	char txmerkles[YAAMP_SMALLBUFSIZE];
+
+	vector<string> txsteps;
+	vector<string> txdata;
+
+	char version[32];
+	char nbits[32];
+	char ntime[32];
+
+	int height;
+	int target;
+
+	json_int_t value;
+
+	char coinb1[4*1024];
+	char coinb2[4*1024];
+
+	int auxs_size;
+	YAAMP_COIND_AUX *auxs[MAX_AUXS];
+};
+
+#define YAAMP_JOB_MAXSUBIDS		200
+
+class YAAMP_JOB: public YAAMP_OBJECT
+{
+public:
+	bool block_found;
+	char name[1024];
+
+	int count;
+	double speed;
+
+	double maxspeed;
+	double profit;
+
+	YAAMP_COIND *coind;			// either one of them
+	YAAMP_REMOTE *remote;
+	YAAMP_JOB_TEMPLATE *templ;
+
+	bool remote_subids[YAAMP_JOB_MAXSUBIDS];
+};
+
+inline void job_delete(YAAMP_OBJECT *object)
+{
+	YAAMP_JOB *job = (YAAMP_JOB *)object;
+	delete job->templ;
+	delete job;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+
+int job_get_jobid();
+
+void job_sort();
+void job_relock_clients(int jobid_old, int jobid_new);
+void job_unlock_clients(YAAMP_JOB *job=NULL);
+void job_assign_locked_clients(YAAMP_JOB *job);
+
+bool job_can_mine(YAAMP_JOB *job);
+void job_reset_clients(YAAMP_JOB *job=NULL);
+bool job_has_free_client();
+
+//YAAMP_JOB_TEMPLATE *job_create_template(YAAMP_COIND *coind);
+//void job_create_last(YAAMP_COIND *coind, bool force=false);
+
+/////////////////////////
+
+void job_send_jobid(YAAMP_CLIENT *client, int jobid);
+void job_send_last(YAAMP_CLIENT *client);
+void job_broadcast(YAAMP_JOB *job);
+
+/////////////////////////
+
+void *job_thread(void *p);
+void job_signal();
+void job_update();
+void job_init();
+
+
+void coinbase_create(YAAMP_COIND *coind, YAAMP_JOB_TEMPLATE *templ, json_value *json_result);
+
+vector<string> coind_aux_hashlist(YAAMP_COIND_AUX **auxs, int size);
+vector<string> coind_aux_merkle_branch(YAAMP_COIND_AUX **auxs, int size, int index);
+void coind_aux_build_auxs(YAAMP_JOB_TEMPLATE *templ);
+
+
+
+
+
+

package/pto/yaamp/stratum/job_core.cpp

@@ -0,0 +1,132 @@
+
+#include "stratum.h"
+
+void job_sort()
+{
+	for(CLI li = g_list_job.first; li && li->next; li = li->next)
+	{
+		YAAMP_JOB *job1 = (YAAMP_JOB *)li->data;
+		YAAMP_JOB *job2 = (YAAMP_JOB *)li->next->data;
+
+		if(job1->profit < job2->profit)
+		{
+			g_list_job.Swap(li, li->next);
+			job_sort();
+
+			return;
+		}
+	}
+}
+
+bool job_has_free_client()
+{
+	g_list_client.Enter();
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(client->deleted) continue;
+
+		if(!client->jobid_next)
+		{
+			g_list_client.Leave();
+			return true;
+		}
+	}
+
+	g_list_client.Leave();
+	return false;
+}
+
+void job_reset_clients(YAAMP_JOB *job)
+{
+	g_list_client.Enter();
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(client->deleted) continue;
+
+		if(!job || job->id == client->jobid_next)
+			client->jobid_next = 0;
+	}
+
+	g_list_client.Leave();
+}
+
+void job_relock_clients(int jobid_old, int jobid_new)
+{
+	if(!jobid_old || !jobid_new) return;
+
+	g_list_client.Enter();
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(client->jobid_locked != jobid_old) continue;
+
+//		debuglog("relock job %x to %x\n", client->jobid_locked, jobid_new);
+		client->jobid_locked = jobid_new;
+	}
+
+	g_list_client.Leave();
+}
+
+void job_assign_locked_clients(YAAMP_JOB *job)
+{
+	if(!job) return;
+
+	job->speed = 0;
+	job->count = 0;
+
+	g_list_client.Enter();
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(client->jobid_locked != job->id) continue;
+
+//		debuglog("assign job %x %x\n", client->jobid_locked, job->id);
+
+		client->jobid_next = job->id;
+		job->remote_subids[client->extranonce1_id] = true;
+
+		job->speed += client->speed;
+		job->count++;
+	}
+
+	g_list_client.Leave();
+}
+
+void job_unlock_clients(YAAMP_JOB *job)
+{
+	g_list_client.Enter();
+	for(CLI li = g_list_client.first; li; li = li->next)
+	{
+		YAAMP_CLIENT *client = (YAAMP_CLIENT *)li->data;
+		if(client->deleted) continue;
+		if(!client->jobid_locked) continue;
+		if(client->jobid_locked == client->jobid_next) continue;
+		if(job && client->jobid_locked != job->id) continue;
+
+//		debuglog("unlock job %x %x\n", client->jobid_locked, job->id);
+		client->jobid_locked = 0;
+	}
+
+	g_list_client.Leave();
+}
+
+bool job_can_mine(YAAMP_JOB *job)
+{
+	if(job->deleted) return false;
+
+	if(job->remote)
+		return remote_can_mine(job->remote);
+
+	else if(job->coind)
+		return coind_can_mine(job->coind);
+
+	return false;
+}
+
+
+
+
+
+