diff --git a/rc.local b/rc.local index c13bccb..68bdc8e 100644 --- a/rc.local +++ b/rc.local @@ -39,7 +39,7 @@ screen -dmS lyra2v2 $STRATUM_DIR/run.sh lyra2v2 screen -dmS blake $STRATUM_DIR/run.sh blake #screen -dmS keccak $STRATUM_DIR/run.sh keccak -#screen -dmS whirlpool $STRATUM_DIR/run.sh whirlpool +screen -dmS whirlpool $STRATUM_DIR/run.sh whirlpool screen -dmS skein $STRATUM_DIR/run.sh skein screen -dmS skein2 $STRATUM_DIR/run.sh skein2 diff --git a/stratum/config.sample/fresh.conf b/stratum/config.sample/fresh.conf index 4bf8094..d1a31ca 100644 --- a/stratum/config.sample/fresh.conf +++ b/stratum/config.sample/fresh.conf @@ -1,6 +1,6 @@ [TCP] server = yaamp.com -port = 4133 +port = 4144 password = tu8tu5 [SQL] diff --git a/stratum/config.sample/whirlpool.conf b/stratum/config.sample/whirlpool.conf new file mode 100644 index 0000000..4db9f43 --- /dev/null +++ b/stratum/config.sample/whirlpool.conf @@ -0,0 +1,16 @@ +[TCP] +server = yaamp.com +port = 4133 +password = tu8tu5 + +[SQL] +host = yaampdb +database = yaamp +username = root +password = patofpaq + +[STRATUM] +algo = whirlpool +difficulty = 0.02 +max_ttf = 20000000 + diff --git a/web/yaamp/core/functions/yaamp.php b/web/yaamp/core/functions/yaamp.php index c2954a7..a917005 100755 --- a/web/yaamp/core/functions/yaamp.php +++ b/web/yaamp/core/functions/yaamp.php @@ -48,19 +48,19 @@ function yaamp_get_algo_norm($algo) 'x11' => 1.0, 'x13' => 1.0, 'zr5' => 1.0, + 'myr-gr' => 1.0, 'nist5' => 1.0, 'neoscrypt' => 1.0, 'lyra2' => 1.0, 'lyra2v2' => 1.0, 'quark' => 1.0, - 'fresh' => 1.0, 'qubit' => 1.0, 'skein' => 1.0, - 'groestl' => 1.0, 'blake' => 1.0, 'keccak' => 1.0, 'skein2' => 1.0, 'velvet' => 1.0, + 'whirlpool' => 1.0, 'yescrypt' => 1.0, ); @@ -125,7 +125,7 @@ function getAlgoPort($algo) 'nist5' => 3833, 'x14' => 3933, 'quark' => 4033, - 'fresh' => 4133, + 'whirlpool' => 4133, 'neoscrypt' => 4233, 'scryptn' => 4333, 'lyra2' => 4433, @@ -139,8 +139,7 @@ function getAlgoPort($algo) 'skein2' => 5233, //'groestl' => 5333, 'dmd-gr' => 5333, - //'myr-gr' => 5433, - 'whirlpool' => 5433, + 'myr-gr' => 5433, 'zr5' => 5533, // 5555 to 5683 reserved 'blake' => 5733,