new x16r algo, with stratum factor 256, like timetravel algos

beware: this algo may have a variable hashrate, unlike timetravel

its ignored from benchs for this reason
This commit is contained in:
Tanguy Pruvot 2018-01-12 18:35:06 +01:00
parent e4914a6b09
commit 0019ca611d
7 changed files with 219 additions and 4 deletions

View file

@ -12,7 +12,7 @@ SOURCES=lyra2re.c lyra2v2.c Lyra2.c lyra2z.c Lyra2z.c Sponge.c \
blake.c scrypt.c c11.c x11.c x13.c sha256.c sha256t.c jha.c keccak.c deep.c tribus.c \
hsr14.c sm3.c \
x14.c x15.c x17.c nist5.c fresh.c quark.c neoscrypt.c scryptn.c qubit.c skein.c groestl.c \
bitcore.c timetravel.c xevan.c bastion.c hmq17.c \
bitcore.c timetravel.c x16r.c xevan.c bastion.c hmq17.c \
skein2.c zr5.c bmw.c luffa.c pentablake.c whirlpool.c whirlpoolx.c blakecoin.c \
blake2.c \
yescrypt.c yescrypt-opt.c sha256_Y.c lbry.c \

178
stratum/algos/x16r.c Normal file
View file

@ -0,0 +1,178 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sha3/sph_blake.h>
#include <sha3/sph_bmw.h>
#include <sha3/sph_groestl.h>
#include <sha3/sph_jh.h>
#include <sha3/sph_keccak.h>
#include <sha3/sph_skein.h>
#include <sha3/sph_luffa.h>
#include <sha3/sph_cubehash.h>
#include <sha3/sph_shavite.h>
#include <sha3/sph_simd.h>
#include <sha3/sph_echo.h>
#include <sha3/sph_hamsi.h>
#include <sha3/sph_fugue.h>
#include <sha3/sph_shabal.h>
#include <sha3/sph_whirlpool.h>
#include <sha3/sph_sha2.h>
#include "common.h"
enum Algo {
BLAKE = 0,
BMW,
GROESTL,
JH,
KECCAK,
SKEIN,
LUFFA,
CUBEHASH,
SHAVITE,
SIMD,
ECHO,
HAMSI,
FUGUE,
SHABAL,
WHIRLPOOL,
SHA512,
HASH_FUNC_COUNT
};
static void getAlgoString(const uint8_t* prevblock, char *output)
{
char *sptr = output;
for (int j = 0; j < HASH_FUNC_COUNT; j++) {
char b = (15 - j) >> 1; // 16 ascii hex chars, reversed
uint8_t algoDigit = (j & 1) ? prevblock[b] & 0xF : prevblock[b] >> 4;
if (algoDigit >= 10)
sprintf(sptr, "%c", 'A' + (algoDigit - 10));
else
sprintf(sptr, "%u", (uint32_t) algoDigit);
sptr++;
}
*sptr = '\0';
}
void x16r_hash(const char* input, char* output, uint32_t len)
{
uint32_t hash[64/4];
char hashOrder[HASH_FUNC_COUNT + 1] = { 0 };
sph_blake512_context ctx_blake;
sph_bmw512_context ctx_bmw;
sph_groestl512_context ctx_groestl;
sph_skein512_context ctx_skein;
sph_jh512_context ctx_jh;
sph_keccak512_context ctx_keccak;
sph_luffa512_context ctx_luffa;
sph_cubehash512_context ctx_cubehash;
sph_shavite512_context ctx_shavite;
sph_simd512_context ctx_simd;
sph_echo512_context ctx_echo;
sph_hamsi512_context ctx_hamsi;
sph_fugue512_context ctx_fugue;
sph_shabal512_context ctx_shabal;
sph_whirlpool_context ctx_whirlpool;
sph_sha512_context ctx_sha512;
void *in = (void*) input;
int size = len;
getAlgoString(&input[4], hashOrder);
for (int i = 0; i < 16; i++)
{
const char elem = hashOrder[i];
const uint8_t algo = elem >= 'A' ? elem - 'A' + 10 : elem - '0';
switch (algo) {
case BLAKE:
sph_blake512_init(&ctx_blake);
sph_blake512(&ctx_blake, in, size);
sph_blake512_close(&ctx_blake, hash);
break;
case BMW:
sph_bmw512_init(&ctx_bmw);
sph_bmw512(&ctx_bmw, in, size);
sph_bmw512_close(&ctx_bmw, hash);
break;
case GROESTL:
sph_groestl512_init(&ctx_groestl);
sph_groestl512(&ctx_groestl, in, size);
sph_groestl512_close(&ctx_groestl, hash);
break;
case SKEIN:
sph_skein512_init(&ctx_skein);
sph_skein512(&ctx_skein, in, size);
sph_skein512_close(&ctx_skein, hash);
break;
case JH:
sph_jh512_init(&ctx_jh);
sph_jh512(&ctx_jh, in, size);
sph_jh512_close(&ctx_jh, hash);
break;
case KECCAK:
sph_keccak512_init(&ctx_keccak);
sph_keccak512(&ctx_keccak, in, size);
sph_keccak512_close(&ctx_keccak, hash);
break;
case LUFFA:
sph_luffa512_init(&ctx_luffa);
sph_luffa512(&ctx_luffa, in, size);
sph_luffa512_close(&ctx_luffa, hash);
break;
case CUBEHASH:
sph_cubehash512_init(&ctx_cubehash);
sph_cubehash512(&ctx_cubehash, in, size);
sph_cubehash512_close(&ctx_cubehash, hash);
break;
case SHAVITE:
sph_shavite512_init(&ctx_shavite);
sph_shavite512(&ctx_shavite, in, size);
sph_shavite512_close(&ctx_shavite, hash);
break;
case SIMD:
sph_simd512_init(&ctx_simd);
sph_simd512(&ctx_simd, in, size);
sph_simd512_close(&ctx_simd, hash);
break;
case ECHO:
sph_echo512_init(&ctx_echo);
sph_echo512(&ctx_echo, in, size);
sph_echo512_close(&ctx_echo, hash);
break;
case HAMSI:
sph_hamsi512_init(&ctx_hamsi);
sph_hamsi512(&ctx_hamsi, in, size);
sph_hamsi512_close(&ctx_hamsi, hash);
break;
case FUGUE:
sph_fugue512_init(&ctx_fugue);
sph_fugue512(&ctx_fugue, in, size);
sph_fugue512_close(&ctx_fugue, hash);
break;
case SHABAL:
sph_shabal512_init(&ctx_shabal);
sph_shabal512(&ctx_shabal, in, size);
sph_shabal512_close(&ctx_shabal, hash);
break;
case WHIRLPOOL:
sph_whirlpool_init(&ctx_whirlpool);
sph_whirlpool(&ctx_whirlpool, in, size);
sph_whirlpool_close(&ctx_whirlpool, hash);
break;
case SHA512:
sph_sha512_init(&ctx_sha512);
sph_sha512(&ctx_sha512,(const void*) in, size);
sph_sha512_close(&ctx_sha512,(void*) hash);
break;
}
in = (void*) hash;
size = 64;
}
memcpy(output, hash, 32);
}

16
stratum/algos/x16r.h Normal file
View file

@ -0,0 +1,16 @@
#ifndef X16R_H
#define X16R_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
void x16r_hash(const char* input, char* output, uint32_t len);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -0,0 +1,16 @@
[TCP]
server = yaamp.com
port = 3737
password = tu8tu5
[SQL]
host = yaampdb
database = yaamp
username = root
password = patofpaq
[STRATUM]
algo = x16r
difficulty = 0.25
max_ttf = 50000

View file

@ -110,6 +110,7 @@ YAAMP_ALGO g_algos[] =
{"x11evo", x11evo_hash, 1, 0, 0},
{"xevan", xevan_hash, 0x100, 0, 0},
{"x16r", x16r_hash, 0x100, 0, 0},
{"timetravel", timetravel_hash, 0x100, 0, 0},
{"bitcore", timetravel10_hash, 0x100, 0, 0},
{"hsr", hsr_hash, 1, 0, 0},
@ -251,9 +252,9 @@ int main(int argc, char **argv)
g_current_algo->name, g_tcp_server, g_tcp_port);
// ntime should not be changed by miners for these algos
g_allow_rolltime = strcmp(g_current_algo->name,"x11evo");
g_allow_rolltime = g_allow_rolltime && strcmp(g_current_algo->name,"timetravel");
g_allow_rolltime = g_allow_rolltime && strcmp(g_current_algo->name,"bitcore");
g_allow_rolltime = strcmp(g_stratum_algo,"x11evo");
g_allow_rolltime = g_allow_rolltime && strcmp(g_stratum_algo,"timetravel");
g_allow_rolltime = g_allow_rolltime && strcmp(g_stratum_algo,"bitcore");
if (!g_allow_rolltime)
stratumlog("note: time roll disallowed for %s algo\n", g_current_algo->name);

View file

@ -140,6 +140,7 @@ void sha256_double_hash_hex(const char *input, char *output, unsigned int len);
#include "algos/x13.h"
#include "algos/x14.h"
#include "algos/x15.h"
#include "algos/x16r.h"
#include "algos/x17.h"
#include "algos/xevan.h"
#include "algos/hmq17.h"

View file

@ -37,6 +37,7 @@ function yaamp_get_algos()
'x13',
'x14',
'x15',
'x16r',
'x17',
'xevan',
'groestl', // dmd-gr -m 256 (deprecated)
@ -133,6 +134,7 @@ function getAlgoColors($algo)
'x13' => '#ffd880',
'x14' => '#f0c080',
'x15' => '#f0b080',
'x16r' => '#f0b080',
'x17' => '#f0b0a0',
'xevan' => '#f0b0a0',
'argon2' => '#e0d0e0',
@ -196,6 +198,7 @@ function getAlgoPort($algo)
'x11evo' => 3553,
'x13' => 3633,
'x15' => 3733,
'x16r' => 3636,
'x17' => 3737,
'xevan' => 3739,
'hmq1725' => 3747,