Skip to content

Commit

Permalink
handle keccakc variant (refreshed keccak stratum) tpruvot#21
Browse files Browse the repository at this point in the history
keccakc is the same as the original keccak,
but the previous was using a different (early) stratum protocol and factor.

This new implementation use a stratum factor of 256 and a sha256d merkle tree
  • Loading branch information
tpruvot committed Jan 29, 2018
1 parent 4073fd4 commit 0e43298
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Version 1.3.3
- Add tribus algo
- Add x16r algo
- Add keccakc variant

Version 1.3.2
- Add bitcore algo
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Algorithms
#### Implemented, but untested
* ? hefty1 (Heavycoin)
* ? keccak (Maxcoin HelixCoin, CryptoMeth, Galleon, 365coin, Slothcoin, BitcointalkCoin)
* ? keccakc (Creativecoin)
* ? luffa (Joincoin, Doomcoin)
* ? shavite3 (INKcoin)

Expand Down Expand Up @@ -176,7 +177,6 @@ Donations for the work done in this fork are accepted :
Tanguy Pruvot :
* BTC: `1FhDPLPpw18X4srecguG3MxJYe4a1JsZnd`
* ZRC: `ZX6LmrCwphNgitxvDnf8TX6Tsegfxpeozx`
Lucas Jones :
* MRO: `472haywQKoxFzf7asaQ4XKBc2foAY4ezk8HiN63ifW4iAbJiLnfmJfhHSR9XmVKw2WYPnszJV9MEHj9Z5WMK9VCNHaGLDmJ`
Expand Down
2 changes: 1 addition & 1 deletion compat/cpuminer-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
#define PACKAGE_NAME "cpuminer-multi"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "cpuminer-multi 1.3.2"
#define PACKAGE_STRING "cpuminer-multi 1.3.3"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "cpuminer-multi"
Expand Down
9 changes: 7 additions & 2 deletions cpu-miner.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ struct workio_cmd {
};

enum algos {
ALGO_KECCAK, /* Keccak */
ALGO_KECCAK, /* Keccak (old) */
ALGO_KECCAKC, /* Keccak */
ALGO_HEAVY, /* Heavy */
ALGO_NEOSCRYPT, /* NeoScrypt(128, 2, 1) with Salsa20/20 and ChaCha20/20 */
ALGO_QUARK, /* Quark */
Expand Down Expand Up @@ -134,6 +135,7 @@ enum algos {

static const char *algo_names[] = {
"keccak",
"keccakc",
"heavy",
"neoscrypt",
"quark",
Expand Down Expand Up @@ -306,7 +308,8 @@ Options:\n\
groestl GroestlCoin\n\
heavy Heavy\n\
jha JHA\n\
keccak Keccak\n\
keccak Keccak (Old and deprecated)\n\
keccakc Keccak (CreativeCoin)\n\
luffa Luffa\n\
lyra2re Lyra2RE\n\
lyra2rev2 Lyra2REv2 (Vertcoin)\n\
Expand Down Expand Up @@ -1798,6 +1801,7 @@ static void stratum_gen_work(struct stratum_ctx *sctx, struct work *work)
case ALGO_FRESH:
case ALGO_DMD_GR:
case ALGO_GROESTL:
case ALGO_KECCAKC:
case ALGO_LBRY:
case ALGO_LYRA2REV2:
case ALGO_TIMETRAVEL:
Expand Down Expand Up @@ -2228,6 +2232,7 @@ static void *miner_thread(void *userdata)
rc = scanhash_groestl(thr_id, &work, max_nonce, &hashes_done);
break;
case ALGO_KECCAK:
case ALGO_KECCAKC:
rc = scanhash_keccak(thr_id, &work, max_nonce, &hashes_done);
break;
case ALGO_HEAVY:
Expand Down
10 changes: 5 additions & 5 deletions res/cpuminer.rc
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ IDI_ICON1 ICON "cpuminer.ico"
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,3,2,0
PRODUCTVERSION 1,3,2,0
FILEVERSION 1,3,3,0
PRODUCTVERSION 1,3,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
Expand All @@ -76,10 +76,10 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
VALUE "FileVersion", "1.3.2"
VALUE "LegalCopyright", "Copyright (C) 2017"
VALUE "FileVersion", "1.3.3"
VALUE "LegalCopyright", "Copyright (C) 2018"
VALUE "ProductName", "cpuminer-multi"
VALUE "ProductVersion", "1.3.2"
VALUE "ProductVersion", "1.3.3"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 0e43298

Please sign in to comment.