Skip to content
This repository was archived by the owner on Apr 24, 2022. It is now read-only.

Commit d933613

Browse files
chfastchfast
committedDec 6, 2018
Merge branch 'release/0.17'
# Conflicts: # .bumpversion.cfg # CMakeLists.txt
·
v0.19.0v0.18.0-rc.0
2 parents 8d54e69 + d01e78c commit d933613

File tree

2 files changed

+132
-89
lines changed

2 files changed

+132
-89
lines changed
 

‎docs/POOL_EXAMPLES_ETH.md

+36-10
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,21 @@ To enable it simply replace tcp with either:
7373

7474
thus your connection scheme changes to `-P stratum+tls://[...]` or `-P stratum+tls12://[...]`. Same applies for `stratum1` and `stratum2`.
7575

76+
## Special characters in variables
77+
78+
You can use the %xx (xx=hexvalue of character) to pass special values.
79+
Some examples:
80+
81+
| Code | Character |
82+
| :---: | :---: |
83+
|%25 | % |
84+
|%26 | & |
85+
|%2e | . |
86+
|%2f | / |
87+
|%3a | : |
88+
|%3f | ? |
89+
|%40 | @ |
90+
7691
## Only for version 0.16+ (older versions not affected)
7792

7893
Stratum autodetection has been introduced to mitigate user's duty to guess/find which stratum flavour to apply (stratum or stratum1 or stratum2).
@@ -93,12 +108,12 @@ We tried to merge the requirements of the variables so they match all pools.
93108

94109
| Variables | Description | Sample |
95110
| ------------ | ------------ | ------ |
96-
| `ETH_WALLET` | Replace `ETH_WALLET` with your Ethereum wallet number including the leading `0x`. | `0x1234567890ABCDEF1234567890abcdef12345678` |
97-
| `WORKERNAME` | `WORKERNAME` may only contain letters and numbers. Some pools also only allow up to a maximum of 8 characters! | `pl1rig01` |
98-
| `EMAIL` | `EMAIL` may contain letters, numbers, underscores, dashes, dots and the @-sign. It **must** contain a @-sign and a dot! | `joe1.doe_jr-ny@acme.com` |
99-
| `USERNAME` | `USERNAME` you got from the pool (like [miningpoolhub.com](#miningpoolhubcom)) | `my_username` |
100-
| `WORKERPWD` | `WORKERPWD` is the password you got from the pool for the worker (like [miningpoolhub.com](#miningpoolhubcom)) - if you have no password set try using 'x' | `my_workerpwd` |
101-
| `BTC_WALLET` | As some pools honor your work in BTC (eg [nicehash.com](#nicehashcom)) `BTC_WALLET` is your Bitcoin wallet address | `1A2b3C4d5e5F6g7H8I9j0kLmNoPqRstUvW` |
111+
| `ETH_WALLET` | Replace `ETH_WALLET` with your Ethereum wallet number including the leading `0x`. | `0x1234567890ABCDEF1234567890abcdef12345678` |
112+
| `WORKERNAME` | `WORKERNAME` may only contain letters and numbers. Some pools also only allow up to a maximum of 8 characters! | `pl1rig01` |
113+
| `EMAIL` | `EMAIL` may contain letters, numbers, underscores. Please encode dashes, @-sign and other uncommon charaters using the [Special characters](#special-characters-in-variables) | `joe1.doe_jr-ny%40acme.com` |
114+
| `USERNAME` | `USERNAME` you got from the pool (like [miningpoolhub.com](#miningpoolhubcom)) | `my_username` |
115+
| `WORKERPWD` | `WORKERPWD` is the password you got from the pool for the worker (like [miningpoolhub.com](#miningpoolhubcom)) - if you have no password set try using 'x' | `my_workerpwd` |
116+
| `BTC_WALLET` | As some pools honor your work in BTC (eg [nicehash.com](#nicehashcom)) `BTC_WALLET` is your Bitcoin wallet address | `1A2b3C4d5e5F6g7H8I9j0kLmNoPqRstUvW` |
102117

103118
## Servers
104119

@@ -163,6 +178,10 @@ Without email
163178
-P stratum1+tcp://ETH_WALLET.WORKERNAME@eth-us2.dwarfpool.com:8008
164179
```
165180

181+
HINTS:
182+
183+
* Use "%40" for the @-sign in your email address
184+
166185
### ethermine.org
167186

168187
Non-SSL connection:
@@ -200,12 +219,15 @@ SSL connection:
200219
### miningpoolhub.com
201220

202221
```
203-
-P stratum2+tcp://USERNAME.WORKERNAME:WORKERPWD@asia.ethash-hub.miningpoolhub.com:20535
204-
-P stratum2+tcp://USERNAME.WORKERNAME:WORKERPWD@europe.ethash-hub.miningpoolhub.com:20535
205-
-P stratum2+tcp://USERNAME.WORKERNAME:WORKERPWD@us-east.ethash-hub.miningpoolhub.com:20535
222+
-P stratum2+tcp://USERNAME%2eWORKERNAME:WORKERPWD@asia.ethash-hub.miningpoolhub.com:20535
223+
-P stratum2+tcp://USERNAME%2eWORKERNAME:WORKERPWD@europe.ethash-hub.miningpoolhub.com:20535
224+
-P stratum2+tcp://USERNAME%2eWORKERNAME:WORKERPWD@us-east.ethash-hub.miningpoolhub.com:20535
206225
```
207226

208-
HINT: It seems the password is not being verified by the pool so you can use a plain `x` as `WORKERPWD`.
227+
HINTS:
228+
229+
* miningpoolhub.com needs username.workername in the internal login process. Use "%2e" to join them into one parameter.
230+
* It seems the password is not being verified by the pool so you can use a plain `x` as `WORKERPWD`.
209231

210232
### nanopool.org
211233

@@ -229,6 +251,10 @@ Without email:
229251
-P stratum1+tcp://ETH_WALLET.WORKERNAME@eth-us-west1.nanopool.org:9999
230252
```
231253

254+
HINTS:
255+
256+
* Use "%40" for the @-sign in your email address
257+
232258
### nicehash.com
233259

234260
```

‎scripts/testpools.bash

+96-79
Original file line numberDiff line numberDiff line change
@@ -19,98 +19,99 @@
1919
# export some vars as "./ethminer" could be still a wrapper script
2020
export ETH_WALLET="0x9E431042fAA3224837e9BEDEcc5F4858cf0390B9"
2121
export WORKERNAME="pooltester"
22-
export EMAIL="andrea.lanfranchi@gmail.com"
22+
export EMAIL="andrea.lanfranchi%40gmail.com"
2323
export USERNAME="aminer"
2424
export WORKERPWD="x"
2525
export BTC_WALLET="3C4FURwL4oAaEUuCLYmNPUEKQSPR1FAJ3m"
2626

27-
2827
POOLS=""
2928
#2miners.com
30-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth.2miners.com:2020"
29+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth.2miners.com:2020"
3130
#dwarfpool.org
32-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-ar.dwarfpool.com:8008/WORKERNAME/EMAIL"
33-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-asia.dwarfpool.com:8008/WORKERNAME/EMAIL"
34-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-au.dwarfpool.com:8008/WORKERNAME/EMAIL"
35-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-br.dwarfpool.com:8008/WORKERNAME/EMAIL"
36-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-cn.dwarfpool.com:8008/WORKERNAME/EMAIL"
37-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-cn2.dwarfpool.com:8008/WORKERNAME/EMAIL"
38-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-eu.dwarfpool.com:8008/WORKERNAME/EMAIL"
39-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-hk.dwarfpool.com:8008/WORKERNAME/EMAIL"
40-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-sg.dwarfpool.com:8008/WORKERNAME/EMAIL"
41-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-ru.dwarfpool.com:8008/WORKERNAME/EMAIL"
42-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-ru2.dwarfpool.com:8008/WORKERNAME/EMAIL"
43-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-us.dwarfpool.com:8008/WORKERNAME/EMAIL"
44-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-us2.dwarfpool.com:8008/WORKERNAME/EMAIL"
45-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-ar.dwarfpool.com:8008"
46-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-asia.dwarfpool.com:8008"
47-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-au.dwarfpool.com:8008"
48-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-br.dwarfpool.com:8008"
49-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-cn.dwarfpool.com:8008"
50-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-cn2.dwarfpool.com:8008"
51-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-eu.dwarfpool.com:8008"
52-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-hk.dwarfpool.com:8008"
53-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-sg.dwarfpool.com:8008"
54-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-ru.dwarfpool.com:8008"
55-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-ru2.dwarfpool.com:8008"
56-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-us.dwarfpool.com:8008"
57-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-us2.dwarfpool.com:8008"
31+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-ar.dwarfpool.com:8008/WORKERNAME/EMAIL"
32+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-asia.dwarfpool.com:8008/WORKERNAME/EMAIL"
33+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-au.dwarfpool.com:8008/WORKERNAME/EMAIL"
34+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-br.dwarfpool.com:8008/WORKERNAME/EMAIL"
35+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-cn.dwarfpool.com:8008/WORKERNAME/EMAIL"
36+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-cn2.dwarfpool.com:8008/WORKERNAME/EMAIL"
37+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-eu.dwarfpool.com:8008/WORKERNAME/EMAIL"
38+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-hk.dwarfpool.com:8008/WORKERNAME/EMAIL"
39+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-sg.dwarfpool.com:8008/WORKERNAME/EMAIL"
40+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-ru.dwarfpool.com:8008/WORKERNAME/EMAIL"
41+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-ru2.dwarfpool.com:8008/WORKERNAME/EMAIL"
42+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-us.dwarfpool.com:8008/WORKERNAME/EMAIL"
43+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-us2.dwarfpool.com:8008/WORKERNAME/EMAIL"
44+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-ar.dwarfpool.com:8008"
45+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-asia.dwarfpool.com:8008"
46+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-au.dwarfpool.com:8008"
47+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-br.dwarfpool.com:8008"
48+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-cn.dwarfpool.com:8008"
49+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-cn2.dwarfpool.com:8008"
50+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-eu.dwarfpool.com:8008"
51+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-hk.dwarfpool.com:8008"
52+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-sg.dwarfpool.com:8008"
53+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-ru.dwarfpool.com:8008"
54+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-ru2.dwarfpool.com:8008"
55+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-us.dwarfpool.com:8008"
56+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-us2.dwarfpool.com:8008"
5857
#ethermine.org
59-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@asia1.ethermine.org:4444"
60-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eu1.ethermine.org:4444"
61-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@us1.ethermine.org:4444"
62-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@us2.ethermine.org:4444"
58+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@asia1.ethermine.org:4444"
59+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eu1.ethermine.org:4444"
60+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@us1.ethermine.org:4444"
61+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@us2.ethermine.org:4444"
6362
#ethermine.org-ssl
64-
POOLS="$POOLS stratum+ssl://ETH_WALLET.WORKERNAME@asia1.ethermine.org:5555"
65-
POOLS="$POOLS stratum+ssl://ETH_WALLET.WORKERNAME@eu1.ethermine.org:5555"
66-
POOLS="$POOLS stratum+ssl://ETH_WALLET.WORKERNAME@us1.ethermine.org:5555"
67-
POOLS="$POOLS stratum+ssl://ETH_WALLET.WORKERNAME@us2.ethermine.org:5555"
63+
POOLS="$POOLS stratum1+ssl://ETH_WALLET.WORKERNAME@asia1.ethermine.org:5555"
64+
POOLS="$POOLS stratum1+ssl://ETH_WALLET.WORKERNAME@eu1.ethermine.org:5555"
65+
POOLS="$POOLS stratum1+ssl://ETH_WALLET.WORKERNAME@us1.ethermine.org:5555"
66+
POOLS="$POOLS stratum1+ssl://ETH_WALLET.WORKERNAME@us2.ethermine.org:5555"
6867
#ethpool.org
69-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@asia1.ethpool.org:3333"
70-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eu1.ethpool.org:3333"
71-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@us1.ethpool.org:3333"
68+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@asia1.ethpool.org:3333"
69+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eu1.ethpool.org:3333"
70+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@us1.ethpool.org:3333"
7271
#f2pool.com
73-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth.f2pool.com:8008"
72+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth.f2pool.com:8008"
7473
#miningpoolhub.com
75-
POOLS="$POOLS stratum+tcp://USERNAME.WORKERNAME:WORKERPWD@asia.ethash-hub.miningpoolhub.com:20535"
76-
POOLS="$POOLS stratum+tcp://USERNAME.WORKERNAME:WORKERPWD@europe.ethash-hub.miningpoolhub.com:20535"
77-
POOLS="$POOLS stratum+tcp://USERNAME.WORKERNAME:WORKERPWD@us-east.ethash-hub.miningpoolhub.com:20535"
74+
POOLS="$POOLS stratum2+tcp://USERNAME%2eWORKERNAME:WORKERPWD@asia.ethash-hub.miningpoolhub.com:20535"
75+
POOLS="$POOLS stratum2+tcp://USERNAME%2eWORKERNAME:WORKERPWD@europe.ethash-hub.miningpoolhub.com:20535"
76+
POOLS="$POOLS stratum2+tcp://USERNAME%2eWORKERNAME:WORKERPWD@us-east.ethash-hub.miningpoolhub.com:20535"
77+
#miningpoolhub.com-ssl - see issue 1629 - seems not working
78+
#POOLS="$POOLS stratum2+ssl://USERNAME%2eWORKERNAME:WORKERPWD@asia.ethash-hub.miningpoolhub.com:20535"
79+
#POOLS="$POOLS stratum2+ssl://USERNAME%2eWORKERNAME:WORKERPWD@europe.ethash-hub.miningpoolhub.com:20535"
80+
#POOLS="$POOLS stratum2+ssl://USERNAME%2eWORKERNAME:WORKERPWD@us-east.ethash-hub.miningpoolhub.com:20535"
7881
#nanopool.org
79-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-asia1.nanopool.org:9999/WORKERNAME/EMAIL"
80-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-eu1.nanopool.org:9999/WORKERNAME/EMAIL"
81-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-eu2.nanopool.org:9999/WORKERNAME/EMAIL"
82-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-us-east1.nanopool.org:9999/WORKERNAME/EMAIL"
83-
POOLS="$POOLS stratum+tcp://ETH_WALLET@eth-us-west1.nanopool.org:9999/WORKERNAME/EMAIL"
84-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-asia1.nanopool.org:9999"
85-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-eu1.nanopool.org:9999"
86-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-eu2.nanopool.org:9999"
87-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-us-east1.nanopool.org:9999"
88-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth-us-west1.nanopool.org:9999"
82+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-asia1.nanopool.org:9999/WORKERNAME/EMAIL"
83+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-eu1.nanopool.org:9999/WORKERNAME/EMAIL"
84+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-eu2.nanopool.org:9999/WORKERNAME/EMAIL"
85+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-us-east1.nanopool.org:9999/WORKERNAME/EMAIL"
86+
POOLS="$POOLS stratum1+tcp://ETH_WALLET@eth-us-west1.nanopool.org:9999/WORKERNAME/EMAIL"
87+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-asia1.nanopool.org:9999"
88+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-eu1.nanopool.org:9999"
89+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-eu2.nanopool.org:9999"
90+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-us-east1.nanopool.org:9999"
91+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eth-us-west1.nanopool.org:9999"
8992
#nicehash.com
90-
POOLS="$POOLS stratum+tcp://BTC_WALLET@daggerhashimoto.br.nicehash.com:3353"
91-
POOLS="$POOLS stratum+tcp://BTC_WALLET@daggerhashimoto.eu.nicehash.com:3353"
92-
POOLS="$POOLS stratum+tcp://BTC_WALLET@daggerhashimoto.hk.nicehash.com:3353"
93-
POOLS="$POOLS stratum+tcp://BTC_WALLET@daggerhashimoto.in.nicehash.com:3353"
94-
POOLS="$POOLS stratum+tcp://BTC_WALLET@daggerhashimoto.jp.nicehash.com:3353"
95-
POOLS="$POOLS stratum+tcp://BTC_WALLET@daggerhashimoto.usa.nicehash.com:3353"
96-
POOLS="$POOLS stratum+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.br.nicehash.com:3353"
97-
POOLS="$POOLS stratum+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.eu.nicehash.com:3353"
98-
POOLS="$POOLS stratum+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.hk.nicehash.com:3353"
99-
POOLS="$POOLS stratum+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.in.nicehash.com:3353"
100-
POOLS="$POOLS stratum+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.jp.nicehash.com:3353"
101-
POOLS="$POOLS stratum+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.usa.nicehash.com:3353"
102-
#pool.sexy
103-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eth.pool.sexy:10002"
93+
POOLS="$POOLS stratum2+tcp://BTC_WALLET@daggerhashimoto.br.nicehash.com:3353"
94+
POOLS="$POOLS stratum2+tcp://BTC_WALLET@daggerhashimoto.eu.nicehash.com:3353"
95+
POOLS="$POOLS stratum2+tcp://BTC_WALLET@daggerhashimoto.hk.nicehash.com:3353"
96+
POOLS="$POOLS stratum2+tcp://BTC_WALLET@daggerhashimoto.in.nicehash.com:3353"
97+
POOLS="$POOLS stratum2+tcp://BTC_WALLET@daggerhashimoto.jp.nicehash.com:3353"
98+
POOLS="$POOLS stratum2+tcp://BTC_WALLET@daggerhashimoto.usa.nicehash.com:3353"
99+
POOLS="$POOLS stratum2+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.br.nicehash.com:3353"
100+
POOLS="$POOLS stratum2+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.eu.nicehash.com:3353"
101+
POOLS="$POOLS stratum2+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.hk.nicehash.com:3353"
102+
POOLS="$POOLS stratum2+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.in.nicehash.com:3353"
103+
POOLS="$POOLS stratum2+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.jp.nicehash.com:3353"
104+
POOLS="$POOLS stratum2+tcp://BTC_WALLET.WORKERNAME@daggerhashimoto.usa.nicehash.com:3353"
104105
#sparkpool.com
105-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@cn.sparkpool.com:3333"
106-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@eu.sparkpool.com:3333"
107-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@jp.sparkpool.com:3333"
108-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@kr.sparkpool.com:3333"
109-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@na-east.sparkpool.com:3333"
110-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@na-west.sparkpool.com:3333"
111-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@tw.sparkpool.com:3333"
106+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@cn.sparkpool.com:3333"
107+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@eu.sparkpool.com:3333"
108+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@jp.sparkpool.com:3333"
109+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@kr.sparkpool.com:3333"
110+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@na-east.sparkpool.com:3333"
111+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@na-west.sparkpool.com:3333"
112+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@tw.sparkpool.com:3333"
112113
# whalesburg
113-
POOLS="$POOLS stratum+tcp://ETH_WALLET.WORKERNAME@proxy.pool.whalesburg.com:8082"
114+
POOLS="$POOLS stratum1+tcp://ETH_WALLET.WORKERNAME@proxy.pool.whalesburg.com:8082"
114115

115116
# check if any parameter and give a hint to specify -G, -U or -X
116117
if [[ "x" == "x$1" ]]; then
@@ -119,6 +120,22 @@ if [[ "x" == "x$1" ]]; then
119120
exit 2
120121
fi
121122

123+
# replace explicit stratum version with autodetect version
124+
if [[ 1 == 0 ]]; then
125+
p=""
126+
for pool in $POOLS; do
127+
v=$pool
128+
v=$(echo "${v/stratum2+tcp/stratum}")
129+
v=$(echo "${v/stratum1+tcp/stratum}")
130+
v=$(echo "${v/stratum+tcp/stratum}")
131+
v=$(echo "${v/stratum2+ssl/stratums}")
132+
v=$(echo "${v/stratum1+ssl/stratums}")
133+
v=$(echo "${v/stratum+ssl/stratums}")
134+
p="$p $v"
135+
done
136+
POOLS=$p
137+
fi
138+
122139
error_cnt=0
123140
for pool in $POOLS; do
124141
rm -f log.txt
@@ -133,8 +150,9 @@ for pool in $POOLS; do
133150
pool=$(echo "${pool/BTC_WALLET/$BTC_WALLET}")
134151

135152
echo "Testing=$current_test_pattern"
136-
echo "./ethminer -v 9 --exit -P $pool $@"
137-
./ethminer -v 9 --exit -P $pool $@ > log.txt 2>&1 &
153+
echo "./ethminer -v 1 --exit --report-hashrate -P $pool $@"
154+
echo "./ethminer -v 1 --exit --report-hashrate -P $pool $@" > log.txt
155+
./ethminer -v 1 --exit --report-hashrate -P $pool $@ >> log.txt 2>&1 &
138156
pid=$!
139157
#echo "PID=$pid"
140158

@@ -189,4 +207,3 @@ else
189207
fi
190208

191209
exit 0
192-

0 commit comments

Comments
 (0)
This repository has been archived.