diff options
| -rw-r--r-- | doc/FAQ.md | 11 | ||||
| -rw-r--r-- | xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu | 5 | ||||
| -rw-r--r-- | xmrstak/cli/cli-miner.cpp | 5 | ||||
| -rw-r--r-- | xmrstak/jconf.cpp | 6 | ||||
| -rw-r--r-- | xmrstak/pools.tpl | 2 |
5 files changed, 17 insertions, 12 deletions
@@ -9,7 +9,7 @@ * [Virus Protection Alert](#virus-protection-alert) * [Change Currency to Mine](#change-currency-to-mine) * [How can I mine Monero](#how-can-i-mine-monero) -* [Why is Monero named monero2](why-is-monero-named-monero2) +* [Why is Monero named monero7](why-is-monero-named-monero7) * [Which currency must be chosen if my fork coin is not listed](#which-currency-must-be-chosen-if-my-fork-coin-is-not-listed) ## "Obtaining SeLockMemoryPrivilege failed." @@ -72,15 +72,16 @@ If your antivirus software flags **xmr-stak**, it will likely move it to its qua If the miner is compiled for Monero and Aeon than you can change - the value `currency` in the config *or* - - start the miner with the [command line option](usage.md) `--currency monero` or `--currency aeon` + - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon` + - run `xmr-stak --help` to see all supported currencies and algorithms ## How can I mine Monero -Set the value `currency` in `pools.txt` to `monero2`. +Set the value `currency` in `pools.txt` to `monero7`. -## Why is Monero named monero2 +## Why is Monero named monero7 -To avoid configuration conflicts after the hard fork of Monero to the new POW with our old naming schema where all cryptonight currencies was selected by choosing `monero` as currency we decided to switch to the name `monero2`. +To avoid configuration conflicts after the hard fork of Monero to the new POW with our old naming schema where all cryptonight currencies was selected by choosing `monero` as currency we decided to switch to the name `monero7`. ## Which currency must be chosen if my fork coin is not listed diff --git a/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu index 0925fd5..c2a1f87 100644 --- a/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu +++ b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu @@ -127,7 +127,7 @@ __global__ void cryptonight_extra_gpu_prepare( int threads, uint32_t * __restric uint32_t ctx_b[4]; uint32_t ctx_key1[40]; uint32_t ctx_key2[40]; - uint32_t input[28]; + uint32_t input[21]; memcpy( input, d_input, len ); //*((uint32_t *)(((char *)input) + 39)) = startNonce + thread; @@ -299,7 +299,8 @@ extern "C" int cryptonight_extra_cpu_init(nvid_ctx* ctx) CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_ctx_text, 32 * sizeof(uint32_t) * wsize)); CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_ctx_a, 4 * sizeof(uint32_t) * wsize)); CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_ctx_b, ctx_b_size)); - CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_input, 28 * sizeof (uint32_t ) )); + // POW block format http://monero.wikia.com/wiki/PoW_Block_Header_Format + CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_input, 21 * sizeof (uint32_t ) )); CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_result_count, sizeof (uint32_t ) )); CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_result_nonce, 10 * sizeof (uint32_t ) )); CUDA_CHECK_MSG( diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index 9a1becf..2e84ec5 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -783,7 +783,10 @@ int do_benchmark(int block_version) printer::inst()->print_msg(L0, "Wait 30 sec until all backends are initialized"); std::this_thread::sleep_for(std::chrono::seconds(30)); - xmrstak::miner_work benchWork = xmrstak::miner_work("", work, sizeof(work), 0, false, 0); + /* AMD and NVIDIA is currently only supporting work sizes up to 84byte + * \todo fix this issue + */ + xmrstak::miner_work benchWork = xmrstak::miner_work("", work, 84, 0, false, 0); printer::inst()->print_msg(L0, "Start a 60 second benchmark..."); xmrstak::globalStates::inst().switch_work(benchWork, dat); uint64_t iStartStamp = get_timestamp_ms(); 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 * */ |
