diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2018-03-25 21:20:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-25 21:20:00 +0100 |
| commit | 9fa5f6f99636b4dfdf4bc2c6bda5f7ce6ea5b830 (patch) | |
| tree | 546189582faf9052a817bde4c5a034dbc0a8f2e2 /xmrstak | |
| parent | a36b7e63854a56e841347cf225775d526da7a21f (diff) | |
| parent | 487ab2f271b56ed963b03e1783a74de34625b070 (diff) | |
| download | xmr-stak-9fa5f6f99636b4dfdf4bc2c6bda5f7ce6ea5b830.zip xmr-stak-9fa5f6f99636b4dfdf4bc2c6bda5f7ce6ea5b830.tar.gz | |
Merge pull request #1206 from psychocrypt/topic-renameMonero2
rename `monero2` to `monero7`
Diffstat (limited to 'xmrstak')
| -rw-r--r-- | xmrstak/jconf.cpp | 6 | ||||
| -rw-r--r-- | xmrstak/pools.tpl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp index 225fbe0..713beb4 100644 --- a/xmrstak/jconf.cpp +++ b/xmrstak/jconf.cpp @@ -102,7 +102,7 @@ xmrstak_coin_algo coin_algos[] = { { "graft", cryptonight, nullptr }, { "intense", cryptonight, nullptr }, { "karbo", cryptonight, nullptr }, - { "monero2", cryptonight_monero, "pool.usxmrpool.com:3333" }, + { "monero7", cryptonight_monero, "pool.usxmrpool.com:3333" }, { "sumokoin", cryptonight_heavy, nullptr } }; @@ -322,7 +322,7 @@ bool jconf::IsOnAlgoList(std::string& needle) if(needle == "monero") { printer::inst()->print_msg(L0, "You entered Monero as coin name. Monero will hard-fork the PoW.\nThis means it will stop being compatible with other cryptonight coins.\n" - "Please use monero2 if you want to mine Monero, or name the coin that you want to mine."); + "Please use 'monero7' (support auto switch to new POW) if you want to mine Monero, \nor name the coin that you want to mine."); return false; } @@ -623,7 +623,7 @@ bool jconf::parse_config(const char* sFilename, const char* sFilenamePools) if(ctmp == "monero") { printer::inst()->print_msg(L0, "You entered Monero as coin name. Monero will hard-fork the PoW.\nThis means it will stop being compatible with other cryptonight coins.\n" - "Please use monero2 if you want to mine Monero, or name the coin that you want to mine."); + "Please use monero7 (support auto switch to new POW) if you want to mine Monero, or name the coin that you want to mine."); return false; } diff --git a/xmrstak/pools.tpl b/xmrstak/pools.tpl index 0b7084f..d3a8a5a 100644 --- a/xmrstak/pools.tpl +++ b/xmrstak/pools.tpl @@ -28,7 +28,7 @@ POOLCONF], * graft * intense * karbo - * monero2 (use this for Monero's new PoW) + * monero7 (use this for Monero's new PoW) * sumokoin * */ |
