LBRYFoundation/pool
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/pool.git synced 2025-08-23 17:37:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable zr5, disable scrypt

Browse source
This commit is contained in:
Tanguy Pruvot 2015-07-02 23:42:14 +02:00
parent bb31cec957
commit d5a22387c2
8 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rc.local
View file

@ -16,15 +16,16 @@ 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 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 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 qubit /var/stratum/run.sh qubit
screen -dmS lyra2 /var/stratum/run.sh lyra2
screen -dmS zr5 /var/stratum/run.sh zr5
exit 0
# exit 0

3
stratum/algos/makefile
View file

@ -8,7 +8,8 @@ CFLAGS=-c -O3 -I /usr/include/mysql -march=native
LDFLAGS=-O2
SOURCES=Lyra2RE.c Lyra2.c Sponge.c blake.c scrypt.c c11.c x11.c x13.c sha256.c keccak.c \
x14.c x15.c nist5.c fresh.c quark.c neoscrypt.c scryptn.c qubit.c skein.c groestl.c
x14.c x15.c nist5.c fresh.c quark.c neoscrypt.c scryptn.c qubit.c skein.c groestl.c \
zr5.c
OBJECTS=$(SOURCES:.c=.o)
OUTPUT=libalgos.a

BIN
stratum/sha3/libhash.a
View file

Binary file not shown.

2
stratum/stratum.cpp
View file

@ -107,7 +107,7 @@ YAAMP_ALGO g_algos[] =
{"skein", skein_hash, 1, 0, 0},
{"keccak", keccak_hash, 1, 0, 0},
// {"zr5", zr5_hash, 0x10000, 0, 0},
{"zr5", zr5_hash, 0x10000, 0, 0},
// {"whirlpoolx", whirlpoolx_hash, 1, 0, 0},
// {"jha", jha_hash, 1, 0, 0},
// {"m7", NULL, 1, 0},

2
stratum/stratum.h
View file

@ -135,7 +135,7 @@ void sha256_double_hash_hex(const char *input, char *output, unsigned int len);
#include "algos/keccak.h"
//#include "algos/whirlpoolx.h"
//#include "algos/zr5.h"
#include "algos/zr5.h"
//#include "jha.h"
//#include "hash/m7m.h"

1
web/yaamp/core/backend/services.php
View file

@ -20,6 +20,7 @@ function BackendUpdateServices()
12=>'quark',
111=>'c11',
112=>'zr5',
);
$res = fetch_url('https://www.nicehash.com/api?method=stats.global.current');

7
web/yaamp/core/functions/yaamp.php
View file

@ -2,13 +2,13 @@
function yaamp_get_algos()
{
return array('sha256', 'scrypt', 'scryptn', 'neoscrypt', 'quark', 'lyra2', 'qubit', 'c11', 'x11', 'x13', 'x15');
return array('sha256', /*'scrypt', 'scryptn',*/ 'neoscrypt', 'quark', 'lyra2', 'qubit', 'c11', 'x11', 'x13', 'x15', 'zr5');
}
function yaamp_get_algo_norm($algo)
{
$a = array(
// 'sha256' => 1,
'sha256' => 1,
'scrypt' => 1,
'scryptn' => 0.5,
'c11' => 5.5,
@ -27,6 +27,7 @@ function yaamp_get_algo_norm($algo)
'groestl' => 5,
'blake' => 300,
'keccak' => 160,
'zr5' => 5.5,
);
if(!isset($a[$algo]))
@ -51,6 +52,7 @@ function getAlgoColors($algo)
'quark' => '#c0c0c0',
'qubit' => '#d0a0f0',
'lyra2' => '#80a0f0',
'zr5' => '#d0d0d0',
);
if(!isset($a[$algo]))
@ -82,6 +84,7 @@ function getAlgoPort($algo)
'skein' => 4933,
'groestl' => 5033,
'keccak' => 5133,
'zr5' => 5233,
);
if(!isset($a[$algo]))

5
web/yaamp/modules/site/multialgo.php
View file

@ -6,7 +6,7 @@
<p>Here's how you can achieve automatic switching to the best algo.</p>
<p style="width: 700px;">Use the password parameter to define a set of algos you want to mine. Your miner
<p style="width: 700px;">Use the password parameter to define a set of algos you want to mine. Your miner
connection will close (and move to your next configured algo) if the algo is not the best profitable of your set.</p>
<pre class="main-left-box" style='padding: 3px; font-size: .9em; background-color: #ffffee; font-family: monospace;'>
@ -56,12 +56,13 @@ is the reference with a factor of 1.</p>
<pre class="main-left-box" style='padding: 3px; font-size: .9em; background-color: #ffffee; font-family: monospace;'>
'scrypt' => 1,
'scryptn' => 0.5,
'c11' => 5.5,
'c11' => 2.0,
'x11' => 5.5,
'x13' => 3.9,
'x14' => 3.7,
'x15' => 3.5,
'nist5' => 15,
'zr5' => 15,
'neoscrypt' => 0.3,
'lyra2' => 1.3,
'quark' => 6,