forked from xmrig/xmrig-amd
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
divide nonce revise to config file Updated readme Updated contacts bitbucket links -> github delete to manual ping skein runtime memory corruption checking support to force cl_khr_int64_base_atomics change to stratum protocol (difficulty) add to config file in cmake source refactoring (prehash, diff zero count) change to parse nonce logic change to difficulty length delete unnecessary parsing apply modified target apply modified format, delete legacy code set variant as 1 apply job id for each block refactoring protocol define chage to icon & remove donate change to ico Update README.md
- Loading branch information
Joowon Yun
authored and
Joon_
committed
Jun 19, 2018
1 parent
4cc922f
commit c3a49c4
Showing
24 changed files
with
358 additions
and
209 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| /build | ||
| /CMakeLists.txt.user | ||
| /build2 | ||
| /.vscode |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,38 @@ | ||
| # XMRig AMD | ||
| # HYCminer AMD | ||
|
|
||
| :warning: **You must update miners to version 2.5 before April 6 due [Monero PoW change](https://getmonero.org/2018/02/11/PoW-change-and-key-reuse.html).** | ||
| HYCminer is a high performance Hycon (HYC) OpenCL miner, forked from [XMRig](https://github.com/xmrig/xmrig) release v2.6.1. | ||
|
|
||
| [](https://github.com/xmrig/xmrig-amd/releases) | ||
| [](https://github.com/xmrig/xmrig-amd/releases) | ||
| [](https://github.com/xmrig/xmrig-amd/releases) | ||
| [](https://github.com/xmrig/xmrig-amd/blob/master/LICENSE) | ||
| [](https://github.com/xmrig/xmrig-amd/stargazers) | ||
| [](https://github.com/xmrig/xmrig-amd/network) | ||
|
|
||
| XMRig is high performance Monero (XMR) OpenCL miner, with the official full Windows support. | ||
|
|
||
| GPU mining part based on [Wolf9466](https://github.com/OhGodAPet) and [psychocrypt](https://github.com/psychocrypt) code. | ||
|
|
||
| * This is the AMD (OpenCL) GPU mining version, there is also a [CPU version](https://github.com/xmrig/xmrig) and [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia). | ||
| * [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases. | ||
|
|
||
| :warning: Suggested values for GPU auto configuration can be not optimal or not working, you may need tweak your threads options. Please fell free open an [issue](https://github.com/xmrig/xmrig-amd/issues) if auto configuration suggest wrong values. | ||
|
|
||
| <img src="https://i.imgur.com/TFncsi7.png" width="696" > | ||
| * This is the **AMD GPU** mining version, there is also a [CPU version](https://github.com/team-hycon/xmrig) and [NVIDIA GPU version](https://github.com/team-hycon/xmrig-nvidia). | ||
| * We plan on releasing our roadmap for next releases soon. | ||
|
|
||
| #### Table of contents | ||
| * [Features](#features) | ||
| * [Download](#download) | ||
| * [Usage](#usage) | ||
| * [Build](https://github.com/xmrig/xmrig-amd/wiki/Build) | ||
| * [Donations](#donations) | ||
| * [Release checksums](#release-checksums) | ||
| * [Algorithm variations](#algorithm-variations) | ||
| * [Build](https://github.com/team-hycon/xmrig-amd/wiki/Build) | ||
| * [Common Issues](#common-issues) | ||
| * [Other information](#other-information) | ||
| * [Contacts](#contacts) | ||
|
|
||
| ## Features | ||
| * Currently running Cryptonight v7 | ||
| * High performance. | ||
| * Official Windows support. | ||
| * Support for backup (failover) mining server. | ||
| * CryptoNight-Lite support for AEON. | ||
| * Automatic GPU configuration. | ||
| * GPU health monitoring (clocks, power, temperature, fan speed) | ||
| * Nicehash support. | ||
| * It's open source software. | ||
|
|
||
| ## Download | ||
| * Binary releases: https://github.com/xmrig/xmrig-amd/releases | ||
| * Git tree: https://github.com/xmrig/xmrig-amd.git | ||
| * Clone with `git clone https://github.com/xmrig/xmrig-amd.git` :hammer: [Build instructions](https://github.com/xmrig/xmrig-amd/wiki/Build). | ||
| * Binary releases: TBA | ||
| * Git tree: https://github.com/team-hycon/xmrig-amd.git | ||
| * Clone with `git clone https://github.com/team-hycon/xmrig-amd.git` :hammer: [Build instructions](https://github.com/team-hycon/xmrig-amd/wiki/Build). | ||
|
|
||
| ## Usage | ||
| Use [config.xmrig.com](https://config.xmrig.com/amd) to generate, edit or share configurations. | ||
| See the example `config.json` to configure the miner. | ||
|
|
||
| ### Command line options | ||
| ``` | ||
|
|
@@ -75,19 +63,22 @@ Use [config.xmrig.com](https://config.xmrig.com/amd) to generate, edit or share | |
| -V, --version output version information and exit | ||
| ``` | ||
|
|
||
| ## Donations | ||
| Default donation 5% (5 minutes in 100 minutes) can be reduced to 1% via command line option `--donate-level`. | ||
| Also you can use configuration via config file, default **config.json**. You can load multiple config files and combine it with command line options. | ||
|
|
||
| * XMR: `48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD` | ||
| * BTC: `1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT` | ||
| ## Other information | ||
| * No HTTP support, only stratum protocol support. | ||
| * No TLS support. | ||
| * Default donation 5% (5 minutes in 100 minutes) can be reduced to 1% via command line option `--donate-level`. | ||
|
|
||
| ## Release checksums | ||
| ### SHA-256 | ||
| ``` | ||
| 3763040fa33980f3cd0c56467044a179e8f7f10193503cbee100a64030ba6469 xmrig-amd-2.7.0-beta-win32.zip/xmrig-amd.exe | ||
| 01834ceb8b451a0094acdb6cca684e8b92791182a7c3a6deb38a5e37e5236f64 xmrig-amd-2.7.0-beta-win64.zip/xmrig-amd.exe | ||
| ``` | ||
| ## SHA256 for Windows Binary files | ||
| ad7871564a0417d8b0d608bc34e61d7ab71dffcb61fabff1d3efb79173223826: certUtil -hashfile hycon-amd-win-0.0.1-without-mhttpd/xmrig-amd.exe sha256 | ||
| 0dd192e71b6df71a912ab3d614b19de240ebfc7be2c03963d4b268e5599154f3: certUtil -hashfile hycon-amd-win-0.0.1/xmrig-nvidia.exe sha256 | ||
|
|
||
| ## Contacts | ||
| * [email protected] | ||
| * [reddit](https://www.reddit.com/user/XMRig/) | ||
| * [email protected] | ||
| * [site](https://www.hycon.io) | ||
| * [reddit](https://www.reddit.com/r/HYCON) | ||
| * [facebook](https://www.facebook.com/teamHycon) | ||
| * [instagram](https://www.instagram.com/teamhycon) | ||
| * [medium](https://www.medium.com/@teamhycon) | ||
| * [twitter](https://www.twitter.com/teamhycon) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| { | ||
| "algo": "cryptonight", | ||
| "background": false, | ||
| "colors": true, | ||
| "donate-level": 1, | ||
| "log-file": null, | ||
| "print-time": 60, | ||
| "retries": 5, | ||
| "retry-pause": 5, | ||
| "syslog": false, | ||
| "threads": [ | ||
| { | ||
| "index": 0, | ||
| "threads": 8, | ||
| "intensity": 400, | ||
| "worksize" : 8, | ||
| "blocks": 12, | ||
| "bfactor": 0, | ||
| "bsleep": 0, | ||
| "affine_to_cpu": false | ||
| } | ||
| ], | ||
| "pools": [ | ||
| { | ||
| "url": "127.0.0.1:9081", | ||
| "user": "userid", | ||
| "pass": "pw", | ||
| "keepalive": true, | ||
| "nicehash": false, | ||
| "variant": 1 | ||
| } | ||
| ], | ||
| "api": { | ||
| "port": 0, | ||
| "access-token": null, | ||
| "worker-id": null | ||
| } | ||
| } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
| * Copyright 2016 Jay D Dee <[email protected]> | ||
| * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> | ||
| * Copyright 2016-2018 XMRig <https://github.com/xmrig>, <[email protected]> | ||
| * Copyright 2018 Team-Hycon <https://github.com/Team-Hycon> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -97,7 +98,7 @@ struct GpuContext | |
| int computeUnits; | ||
| std::string name; | ||
|
|
||
| uint32_t Nonce; | ||
| uint64_t Nonce; | ||
| }; | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> | ||
| * Copyright 2018 Lee Clagett <https://github.com/vtnerd> | ||
| * Copyright 2016-2018 XMRig <https://github.com/xmrig>, <[email protected]> | ||
| * Copyright 2018 Team-Hycon <https://github.com/Team-Hycon> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -40,6 +41,7 @@ | |
| #include "core/Config.h" | ||
| #include "crypto/CryptoNight_constants.h" | ||
| #include "cryptonight.h" | ||
| #include "common/net/Protocol.h" | ||
|
|
||
|
|
||
| constexpr const char *kSetKernelArgErr = "Error %s when calling clSetKernelArg for kernel %d, argument %d."; | ||
|
|
@@ -113,7 +115,7 @@ size_t InitOpenCLGpu(int index, cl_context opencl_ctx, GpuContext* ctx, const ch | |
| return OCL_ERR_API; | ||
| } | ||
|
|
||
| ctx->InputBuffer = clCreateBuffer(opencl_ctx, CL_MEM_READ_ONLY, 88, NULL, &ret); | ||
| ctx->InputBuffer = clCreateBuffer(opencl_ctx, CL_MEM_READ_ONLY, LEN::BLOB, NULL, &ret); | ||
| if (ret != CL_SUCCESS) { | ||
| LOG_ERR("Error %s when calling clCreateBuffer to create input buffer.", err_to_str(ret)); | ||
| return OCL_ERR_API; | ||
|
|
@@ -436,20 +438,17 @@ size_t InitOpenCL(GpuContext* ctx, size_t num_gpus, xmrig::Config *config) | |
| return OCL_ERR_SUCCESS; | ||
| } | ||
|
|
||
| size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t target, uint32_t variant) | ||
| size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t target, uint32_t variant, uint32_t moneroNonce) | ||
| { | ||
| cl_int ret; | ||
|
|
||
| if (input_len > 84) { | ||
| if (input_len > LEN::BLOB) { | ||
| return OCL_ERR_BAD_PARAMS; | ||
| } | ||
|
|
||
| input[input_len] = 0x01; | ||
| memset(input + input_len + 1, 0, 88 - input_len - 1); | ||
|
|
||
| size_t numThreads = ctx->rawIntensity; | ||
|
|
||
| if ((ret = clEnqueueWriteBuffer(ctx->CommandQueues, ctx->InputBuffer, CL_TRUE, 0, 88, input, 0, NULL, NULL)) != CL_SUCCESS) { | ||
| if ((ret = clEnqueueWriteBuffer(ctx->CommandQueues, ctx->InputBuffer, CL_TRUE, 0, LEN::BLOB, input, 0, NULL, NULL)) != CL_SUCCESS) { | ||
| LOG_ERR("Error %s when calling clEnqueueWriteBuffer to fill input buffer.", err_to_str(ret)); | ||
| return OCL_ERR_API; | ||
| } | ||
|
|
@@ -497,6 +496,11 @@ size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t tar | |
| LOG_ERR(kSetKernelArgErr, err_to_str(ret), 1 + cn_kernel_offset, 4); | ||
| return OCL_ERR_API; | ||
| } | ||
|
|
||
| if ((ret = clSetKernelArg(ctx->Kernels[1 + cn_kernel_offset], 4, sizeof(cl_uint), &moneroNonce)) != CL_SUCCESS) { | ||
| LOG_ERR(kSetKernelArgErr, err_to_str(ret), 1 + cn_kernel_offset, 4); | ||
| return OCL_ERR_API; | ||
| } | ||
| } | ||
|
|
||
| // CN3 Kernel | ||
|
|
@@ -666,4 +670,4 @@ size_t XMRRunJob(GpuContext* ctx, cl_uint* HashOutput, uint32_t variant) | |
| ctx->Nonce += (uint32_t) g_intensity; | ||
|
|
||
| return OCL_ERR_SUCCESS; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> | ||
| * Copyright 2016 Jay D Dee <[email protected]> | ||
| * Copyright 2016-2017 XMRig <[email protected]> | ||
| * Copyright 2018 Team-Hycon <https://github.com/Team-Hycon> | ||
| * | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
|
|
@@ -46,7 +47,7 @@ class NetworkState | |
|
|
||
| char pool[256]; | ||
| std::array<uint64_t, 10> topDiff { { } }; | ||
| uint32_t diff; | ||
| uint64_t diff; | ||
| uint64_t accepted; | ||
| uint64_t failures; | ||
| uint64_t rejected; | ||
|
|
||
Oops, something went wrong.