Adding file tree & update coins

README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/tpruvot/yiimp.svg?branch=next)](https://travis-ci.org/tpruvot/yiimp)
 
-#yiimp - yaamp fork
+# yiimp - yaamp fork
 
 WARNINGS
 - Use at your own risks.
@@ -125,6 +125,30 @@ There a lot of unused code in the php branch. Lot come from other projects I wor
 	http://www.yiiframework.com/
 
 
+# yiimp - file tree
+
+	NOTE: "/yiimp/" in Github repo => "/var/" on VPS (after compiling yiimp)
+
+| Front-End |  |
+|:-----------|:-----------|
+| Homepage | `yiimp/web/yaamp/modules/site/index.php` |
+| API | `yiimp/web/yaamp/modules/site/api.php` |
+| About us | `yiimp/web/yaamp/modules/site/about.php` |
+| Results | `yiimp/web/yaamp/modules/site/results` |
+| Dedicated custom ports (line:144) |  `if statement for Dedicated custom ports.` |
+| Next payment (line:128 & 134) | `yiimp/web/yaamp/ui/main.php` |
+| Images | `yiimp/web/images` |
+
+| coins and payment fix |  |
+|:-----------|:-----------|
+| yiimp/web/yaamp/core/backend/payment.php (line:57) | `\|\| $coin->symbol == '<coinSymbol>' \|\|` <br> ` note: (coinSymbol is different from coinAlgo).` |
+| yiimp/stratum/algos (new file)  | `<algo>.h (copy from another exisitng to make easier)` |
+| yiimp/stratum/stratum.h (line:149) | `#include "algos/<algo>.h"` |
+| yiimp/web/yaamp/core/functions/yaamp.php | `function yaamp_get_algos; function yaamp_algo_mBTC_factor; function yaamp_get_algo_norm; function getAlgoColors; function getAlgoPort)` |
+| sql/labels.json |  `"<ticker>":"<coin>", (example: "ETN":"Electroneum",)` |
+| rc-old.local (line:18) | `screen -dmS <algo> /var/stratum/run.sh <algo/coin/ticker>` <br> `(example: screen -dmS x11 /var/stratum/run.sh x11)` |
+
+
 Credits:
 
 Thanks to globalzon to have released the initial Yaamp source code.

rc-old.local

@@ -0,0 +1,29 @@
+#!/bin/sh -e
+#
+# rc.local // rc-old.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+screen -dmS main /var/web/main.sh
+screen -dmS loop2 /var/web/loop2.sh
+screen -dmS blocks /var/web/blocks.sh
+
+screen -dmS x11 /var/stratum/run.sh x11
+screen -dmS x13 /var/stratum/run.sh x13
+screen -dmS x15 /var/stratum/run.sh x15
+screen -dmS sha /var/stratum/run.sh sha
+screen -dmS scrypt1 /var/stratum/run.sh scrypt
+screen -dmS scrypt2 /var/stratum/run.sh scryptn
+screen -dmS neo /var/stratum/run.sh neo
+screen -dmS quark /var/stratum/run.sh quark
+screen -dmS qubit /var/stratum/run.sh qubit
+screen -dmS lyra2 /var/stratum/run.sh lyra2
+
+exit 0

sql/labels.json

@@ -283,6 +283,8 @@
 "ETD":"EthereumDark",
 "ETHAN":"EthanCoin",
 "ETH":"Ethereum",
+"ETN":"Electroneum",
+"ETNX":"Electronero",
 "ETOK":"eToken",
 "ETR":"Easterncoin",
 "EVENT":"EventToken",
@@ -376,6 +378,7 @@
 "GSX":"GlowShares",
 "GUE":"Guerillacoin",
 "GUN":"Guncoin",
+"GUT":"GPUnion",
 "GXG":"GroinCoin",
 "H20":"H20Coin",
 "H5C":"High5Coin",
@@ -556,7 +559,7 @@
 "NIST5":"N5Coin",
 "NJA":"Ninjacoin",
 "NKT":"NakamotoDark",
-"NLG":"GuldenCoin",
+"NLG":"Gulden",
 "NMB":"Nimbus",
 "NMC":"Namecoin",
 "NOAH":"NoahCoin",
@@ -597,6 +600,7 @@
 "PENG":"PenguinCoin",
 "PEN":"PenCoin",
 "PES":"Pesa",
+"PGN":"PigeonCoin",
 "PHC":"PHCoin",
 "PHO":"Photon",
 "PHS":"Philosopherstone",
@@ -642,7 +646,9 @@
 "QTM2":"Quantum2",
 "QTZ":"Quartz",
 "QUID":"Quid",
+"RADIUS":"Radius",
 "RAIN":"Rainbowgoldcoin",
+"RVN":"RavenCoin",
 "RAW":"RawCoin",
 "RBBT":"Rabbitcoin",
 "RBC":"Rambocoin",
@@ -651,6 +657,7 @@
 "RC":"Russiacoin",
 "RDD":"ReddCoin",
 "REKT":"RektCoin",
+"RENESIS":"Renesis",
 "REP":"Republicoin",
 "RIC":"Riecoin",
 "RIE":"Riecoin",

stratum/client_difficulty.cpp

@@ -83,9 +83,15 @@ int client_send_difficulty(YAAMP_CLIENT *client, double difficulty)
 
 void client_initialize_difficulty(YAAMP_CLIENT *client)
 {
-	char *p = strstr(client->password, "d=");
-	char *p2 = strstr(client->password, "decred=");
-	if(!p || p2) return;
+	char *p = client->password;
+	char *p2 = strstr(client->password, "decred=") + sizeof(char)*6;
+
+        while ( (p=strstr(p,"d=")) != NULL ) {
+                if (p != p2) break;
+                p++;
+        }
+
+	if(!p) return;
 
 	double diff = client_normalize_difficulty(atof(p+2));
 	uint64_t user_target = diff_to_target(diff);

stratum/coinbase.cpp

@@ -285,6 +285,58 @@ void coinbase_create(YAAMP_COIND *coind, YAAMP_JOB_TEMPLATE *templ, json_value *
 		coind->reward = (double)available / 100000000 * coind->reward_mul;
 		return;
 	}
+	else if(strcmp(coind->symbol, "SECI") == 0) {
+		char script_payee[512] = { 0 };
+		char payees[1];
+		int npayees = (templ->has_segwit_txs) ? 2 : 1;
+		bool masternode_payments = json_get_bool(json_result, "masternode_payments");
+		bool masternodes_enabled = json_get_bool(json_result, "enforce_masternode_payments");
+
+		if (masternodes_enabled && masternode_payments) {
+			const char *payee = json_get_string(json_result, "payee");
+			json_int_t amount = json_get_int(json_result, "payee_amount");
+			if (payee && amount)
+				++npayees;
+		}
+
+		//mainnet
+        	json_int_t charity_amount = 50000000;
+        	sprintf(coind->charity_address, "3FMmX2S8yknSZ4NsxtxbQwQkgvbe81R5kR");
+
+		//testnet
+        	//json_int_t charity_amount = 50000000;
+        	//sprintf(coind->charity_address, "93ASJtDuVYVdKXemH9BrtSMscznvsp9stD");
+		++npayees;
+		available -= charity_amount;
+		base58_decode(coind->charity_address, script_payee);
+		sprintf(payees, "%02x", npayees);
+		strcat(templ->coinb2, payees);
+		if (templ->has_segwit_txs) strcat(templ->coinb2, commitment);
+		char echarity_amount[32];
+		encode_tx_value(echarity_amount, charity_amount);
+		strcat(templ->coinb2, echarity_amount);
+		char coinb2_part[1024] = { 0 };
+		char coinb2_len[3] = { 0 };
+		sprintf(coinb2_part, "a9%02x%s87", (unsigned int)(strlen(script_payee) >> 1) & 0xFF, script_payee);
+		sprintf(coinb2_len, "%02x", (unsigned int)(strlen(coinb2_part) >> 1) & 0xFF);
+		strcat(templ->coinb2, coinb2_len);
+		strcat(templ->coinb2, coinb2_part);
+		if (masternodes_enabled && masternode_payments) {
+			//duplicated: revisit ++todo
+			const char *payee = json_get_string(json_result, "payee");
+			json_int_t amount = json_get_int(json_result, "payee_amount");
+			if (payee && amount) {
+				available -= amount;
+				base58_decode(payee, script_payee);
+				job_pack_tx(coind, templ->coinb2, amount, script_payee);
+			}
+		}
+		job_pack_tx(coind, templ->coinb2, available, NULL);
+		strcat(templ->coinb2, "00000000"); // locktime
+
+		coind->reward = (double)available / 100000000 * coind->reward_mul;
+		return;
+	}
 
 	// 2 txs are required on these coins, one for foundation (dev fees)
 	if(coind->charity_percent && !coind->hasmasternodes)
@@ -523,6 +575,49 @@ void coinbase_create(YAAMP_COIND *coind, YAAMP_JOB_TEMPLATE *templ, json_value *
 		//debuglog("%s %d dests %s\n", coind->symbol, npayees, script_dests);
 		return;
 	}
+
+	else if(strcmp(coind->symbol, "ARC") == 0)
+	{
+		char script_dests[2048] = { 0 };
+		char script_payee[128] = { 0 };
+		char payees[4];
+		int npayees = 1;
+		bool masternode_enabled = json_get_bool(json_result, "goldminenode_payments_enforced");
+		bool superblocks_enabled = json_get_bool(json_result, "superblocks_enabled");
+		json_value* superblock = json_get_array(json_result, "superblock");
+		json_value* masternode = json_get_object(json_result, "goldminenode");
+		if(superblocks_enabled && superblock) {
+			for(int i = 0; i < superblock->u.array.length; i++) {
+				const char *payee = json_get_string(superblock->u.array.values[i], "payee");
+				json_int_t amount = json_get_int(superblock->u.array.values[i], "amount");
+				if (payee && amount) {
+					npayees++;
+					available -= amount;
+					base58_decode(payee, script_payee);
+					job_pack_tx(coind, script_dests, amount, script_payee);
+					//debuglog("%s superblock %s %u\n", coind->symbol, payee, amount);
+				}
+			}
+		}
+		if (masternode_enabled && masternode) {
+			const char *payee = json_get_string(masternode, "payee");
+			json_int_t amount = json_get_int(masternode, "amount");
+			if (payee && amount) {
+				npayees++;
+				available -= amount;
+				base58_decode(payee, script_payee);
+				job_pack_tx(coind, script_dests, amount, script_payee);
+			}
+		}
+		sprintf(payees, "%02x", npayees);
+		strcat(templ->coinb2, payees);
+		strcat(templ->coinb2, script_dests);
+		job_pack_tx(coind, templ->coinb2, available, NULL);
+		strcat(templ->coinb2, "00000000"); // locktime
+		coind->reward = (double)available/100000000*coind->reward_mul;
+		//debuglog("%s %d dests %s\n", coind->symbol, npayees, script_dests);
+		return;
+	}
 
 
 	else if(coind->hasmasternodes && coind->oldmasternodes) /* OLD DASH style */
@@ -595,7 +690,20 @@ void coinbase_create(YAAMP_COIND *coind, YAAMP_JOB_TEMPLATE *templ, json_value *
 			strcat(templ->coinb2, "01");
 		}
 	}
-
+        // When Gulden is in phase 3 it is required that the miner deducts the witness subsidy from the reward, it instead gets paid to the witness.
+        else if(strcmp(coind->symbol, "NLG") == 0)
+        {
+            if (templ->has_pow2_witness_data)
+            {
+                  strcat(templ->coinb2, "03");
+                  //Below line is (probably) not necessary - uncomment this if your pool is earning the wrong subsidy in phase 3.
+                  //available -= templ->pow2_subsidy;
+            }
+            else
+            {
+                strcat(templ->coinb2, "01");
+            }
+        }
 	else if (templ->has_segwit_txs) {
 		strcat(templ->coinb2, "02");
 		strcat(templ->coinb2, commitment);
@@ -605,6 +713,13 @@ void coinbase_create(YAAMP_COIND *coind, YAAMP_JOB_TEMPLATE *templ, json_value *
 
 	job_pack_tx(coind, templ->coinb2, available, NULL);
 
+        // Append witness data after normal coinbase outputs - witness data is already hex encoded and already contains amounts.
+        if(strcmp(coind->symbol, "NLG") == 0 && templ->has_pow2_witness_data)
+        {
+            strcat(templ->coinb2, templ->pow2_aux_1);
+            strcat(templ->coinb2, templ->pow2_aux_2);
+        }
+
 	//if(coind->txmessage)
 	//	strcat(templ->coinb2, "00");
 

stratum/coind_template.cpp

@@ -251,9 +251,15 @@ YAAMP_JOB_TEMPLATE *coind_create_template(YAAMP_COIND *coind)
 	json_value *json_result = json_get_object(json, "result");
 	if(!json_result || json_is_null(json_result))
 	{
-		coind_error(coind, "getblocktemplate result");
-		json_value_free(json);
-		return NULL;
+                strcpy(params, "[]");
+                json_value *json = rpc_call(&coind->rpc, "getblocktemplate", params);
+                json_value *json_result = json_get_object(json, "result");
+                if(!json || json_is_null(json)) {
+                   coind_error(coind, "getblocktemplate result");
+                   json_value_free(json);
+                   return NULL;
+                }
+
 	}
 
 	// segwit rule
@@ -394,6 +400,28 @@ YAAMP_JOB_TEMPLATE *coind_create_template(YAAMP_COIND *coind)
 
 	templ->has_segwit_txs = false;
 
+        templ->has_pow2_witness_data = false;
+
+        if (strcmp(coind->symbol, "NLG") == 0)
+        {
+
+            json_value* pow2_aux_1_val = json_get_val(json_result, "pow2_aux1");
+            json_value* pow2_aux_2_val = json_get_val(json_result, "pow2_aux2");
+            if (pow2_aux_1_val && json_is_string(pow2_aux_1_val) && pow2_aux_2_val && json_is_string(pow2_aux_2_val))
+            {
+                const char* pow2_aux_1 = json_get_string(json_result, "pow2_aux1");
+                const char* pow2_aux_2 = json_get_string(json_result, "pow2_aux2");
+                if(pow2_aux_1 && strlen(pow2_aux_1) && pow2_aux_2 && strlen(pow2_aux_2))
+                {
+                    strcpy(templ->pow2_aux_1, pow2_aux_1);
+                    strcpy(templ->pow2_aux_2, pow2_aux_2);
+                    templ->has_pow2_witness_data = true;
+                    templ->pow2_subsidy = json_get_int(json_result, "pow2_subsidy");
+                }
+            }
+        }
+
+
 	templ->has_filtered_txs = false;
 	templ->filtered_txs_fee = 0;
 

stratum/config/run.sh

@@ -3,10 +3,13 @@
 ulimit -n 10240
 ulimit -u 10240
 
+#echo "$1 stratum started" | mail -s "$1 stratum started" [email protected] # change email address to valid one
+
 cd /var/stratum
 while [ -e config/${1}.conf ]; do
 	gzip -f config/${1}.log
         ./stratum config/$1
+	#echo "$1 stratum crashed/restarted" | mail -s "$1 stratum crashed/restarted" [email protected] # change email address to valid one
 	sleep 1
 done
 exec bash

stratum/db.cpp

@@ -207,13 +207,18 @@ void db_update_coinds(YAAMP_DB *db)
 		YAAMP_COIND *coind = (YAAMP_COIND *)object_find(&g_list_coind, atoi(row[0]));
 		if(!coind)
 		{
+		   if (!strlen(g_stratum_coin_include) || (strlen(g_stratum_coin_include) && strstr(g_stratum_coin_include, row[20])))
+		   {
 			coind = new YAAMP_COIND;
 			memset(coind, 0, sizeof(YAAMP_COIND));
 
 			coind->newcoind = true;
 			coind->newblock = true;
 			coind->id = atoi(row[0]);
 			coind->aux.coind = coind;
+		   }
+		   else
+			continue;
 		}
 		else
 			coind->newcoind = false;

stratum/db.h

@@ -20,6 +20,7 @@ void db_update_coinds(YAAMP_DB *db);
 void db_update_remotes(YAAMP_DB *db);
 
 //int db_find_user(YAAMP_DB *db, YAAMP_CLIENT *client);
+bool db_check_symbol(YAAMP_DB *db, char *symbol);
 void db_add_user(YAAMP_DB *db, YAAMP_CLIENT *client);
 
 void db_add_worker(YAAMP_DB *db, YAAMP_CLIENT *client);

stratum/job.cpp

@@ -264,7 +264,7 @@ void job_update()
 	//////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	g_list_job.Enter();
-	job_sort();
+	// job_sort();
 
 	for(CLI li = g_list_job.first; li; li = li->next)
 	{

stratum/job.h

@@ -61,6 +61,13 @@ struct YAAMP_JOB_TEMPLATE
 
 	int auxs_size;
 	YAAMP_COIND_AUX *auxs[MAX_AUXS];
+
+        // Start of Gulden specific data for phase 3 witnessing
+        bool has_pow2_witness_data;
+        int pow2_subsidy;
+        char pow2_aux_1[2048];
+        char pow2_aux_2[2048];
+        // End of Gulden spcific data for phase 3 witnessing
 };
 
 #define YAAMP_JOB_MAXSUBIDS		200