Merge pull request #6 from bogdanadnan/dev

Dev
This commit is contained in:
bogdanadnan 2019-08-28 11:57:17 +03:00 committed by GitHub
commit 5983bc6cbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 57 deletions

View file

@ -1,31 +0,0 @@
# Algorithms
NinjaRig uses a different way to specify algorithms, compared to other miners.
Algorithm selection splitted to 2 parts:
* Global base algorithm per miner or proxy instance, `algo` option. Possible values: `argon2id`.
* Algorithm variant specified separately for each pool, `variant` option.
* [Full table for supported algorithm and variants.](https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-algorithm-names-and-variants)
#### Example
```json
{
"algo": "argon2id",
...
"pools": [
{
"url": "...",
"variant": 1,
...
}
],
...
}
```
## Mining algorithm negotiation
If your pool support [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/issues/168) miner will choice proper variant automaticaly and if you choice wrong base algorithm you will see error message.
Pools with mining algorithm negotiation support.
* [www.hashvault.pro](https://www.hashvault.pro/)

View file

@ -1,7 +1,7 @@
{
"algo": "chukwa/wrkz",
"algo": "chukwa",
"api": {
"port": 0,
"port": 10000,
"access-token": null,
"id": null,
"worker-id": null,
@ -11,22 +11,21 @@
"autosave": true,
"background": false,
"colors": true,
"threads": "all",
"cpu-threads": "all",
"cpu-optimization": null,
"cpu-affinity": null,
"cpu-priority": null,
"use-gpu": "CUDA",
"gpu-intensity": 50,
"donate-level": 1,
"log-file": "./log.txt",
"priority": null,
"donate-level": 5,
"log-file": null,
"pools": [
{
"url": "testnet.wrkz.work:5555",
"user": "WrkzRNDQDwFCBynKPc459v3LDa1gEGzG3j962tMUBko1fw9xgdaS9mNiGMgA9s1q7hS1Z8SGRVWzcGc8Sh8xsvfZ6u2wJEtoZB",
"url": "stratum+tcp://trtl.muxdux.com:5555",
"user": "TRTLuxUdNNphJcrVfH27HMZumtFuJrmHG8B5ky3tzuAcZk7UcEdis2dAQbaQ2aVVGnGEqPtvDhMgWjZdfq8HenxKPEkrR43K618",
"pass": "x",
"rig-id": null,
"nicehash": false,
"keepalive": true,
"variant": "wrkz",
"keepalive": false,
"variant": "chukwa",
"enabled": true,
"tls": false,
"tls-fingerprint": null
@ -35,7 +34,28 @@
"print-time": 60,
"retries": 5,
"retry-pause": 5,
"safe": false,
"user-agent": null,
"watch": true
"syslog": false,
"watch": true,
"use-gpu": [
"OPENCL",
"CUDA"
],
"gpu-intensity": [
50.0
],
"gpu-filter": [
{
"engine": "OPENCL",
"filter": "AMD"
},
{
"engine": "OPENCL",
"filter": "Radeon"
},
{
"engine": "OPENCL",
"filter": "Advanced Micro Devices"
}
]
}

View file

@ -33,9 +33,9 @@ namespace xmrig {
const static char *default_config =
R"===(
{
"algo": "argon2",
"algo": "chukwa",
"api": {
"port": 0,
"port": 10000,
"access-token": null,
"id": null,
"worker-id": null,
@ -45,21 +45,22 @@ R"===(
"autosave": true,
"background": false,
"colors": true,
"cpu-threads": "all",
"cpu-optimization": null,
"cpu-affinity": null,
"cpu-priority": null,
"priority": null,
"donate-level": 5,
"huge-pages": true,
"log-file": null,
"max-cpu-usage": 100,
"pools": [
{
"url": "donate.v2.xmrig.com:3333",
"user": "YOUR_WALLET_ADDRESS",
"url": "stratum+tcp://trtl.muxdux.com:5555",
"user": "TRTLuxUdNNphJcrVfH27HMZumtFuJrmHG8B5ky3tzuAcZk7UcEdis2dAQbaQ2aVVGnGEqPtvDhMgWjZdfq8HenxKPEkrR43K618",
"pass": "x",
"rig-id": null,
"nicehash": false,
"keepalive": false,
"variant": -1,
"variant": "chukwa",
"enabled": true,
"tls": false,
"tls-fingerprint": null
}
@ -67,10 +68,30 @@ R"===(
"print-time": 60,
"retries": 5,
"retry-pause": 5,
"safe": false,
"threads": null,
"user-agent": null,
"watch": false
"syslog": false,
"watch": true,
"use-gpu": [
"OPENCL",
"CUDA"
],
"gpu-intensity": [
50.0
],
"gpu-filter": [
{
"engine": "OPENCL",
"filter": "AMD"
},
{
"engine": "OPENCL",
"filter": "Radeon"
},
{
"engine": "OPENCL",
"filter": "Advanced Micro Devices"
}
]
}
)===";
#endif