Merge pull request #726 from plebhash/rename-config-examples

rename config examples + remove `roles/*/*-config.toml`
stratum-mining · Jan 23, 2024 · 2f034b3 · 2f034b3
2 parents 55a25fe + 8346e17
commit 2f034b3
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 205 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ lcov.info
 *.py
 **/conf/**
 cobertura.xml
+/roles/*/*-config.toml
diff --git a/...examples/proxy-config-hosted-example.toml → ...g-examples/jdc-config-hosted-example.toml b/...examples/proxy-config-hosted-example.toml → ...g-examples/jdc-config-hosted-example.toml
diff --git a/...-examples/proxy-config-local-example.toml → ...ig-examples/jdc-config-local-example.toml b/...-examples/proxy-config-local-example.toml → ...ig-examples/jdc-config-local-example.toml
diff --git a/roles/jd-client/jdc-config.toml b/roles/jd-client/jdc-config.toml
diff --git a/roles/jd-server/jds-config.toml b/roles/jd-server/jds-config.toml
diff --git a/roles/mining-proxy/proxy-config-example.toml → ...config-examples/proxy-config-example.toml b/roles/mining-proxy/proxy-config-example.toml → ...config-examples/proxy-config-example.toml
diff --git a/roles/mining-proxy/proxy-config.toml b/roles/mining-proxy/proxy-config.toml
diff --git a/roles/pool/config.toml b/roles/pool/config.toml
diff --git a/roles/pool/pool-config.toml b/roles/pool/pool-config.toml
diff --git a/...mples/proxy-config-local-jdc-example.toml → ...ples/tproxy-config-local-jdc-example.toml b/...mples/proxy-config-local-jdc-example.toml → ...ples/tproxy-config-local-jdc-example.toml
@@ -25,13 +25,13 @@ coinbase_reward_sat = 5_000_000_000
 
 # Difficulty params
 [downstream_difficulty_config]
-# hashes/s of the weakest miner that will be connecting
-min_individual_miner_hashrate=5_000_000.0
+# hashes/s of the weakest miner that will be connecting (e.g.: 10 Th/s = 10_000_000_000_000.0)
+min_individual_miner_hashrate=10_000_000_000_000.0
 # target number of shares per minute the miner should be sending
 shares_per_minute = 6.0
 
 [upstream_difficulty_config]
 # interval in seconds to elapse before updating channel hashrate with the pool
 channel_diff_update_interval = 60
-# estimated accumulated hashrate of all downstream miners
-channel_nominal_hashrate = 5_000_000.0
+# estimated accumulated hashrate of all downstream miners (e.g.: 10 Th/s = 10_000_000_000_000.0)
+channel_nominal_hashrate = 10_000_000_000_000.0
diff --git a/...ples/proxy-config-local-pool-example.toml → ...les/tproxy-config-local-pool-example.toml b/...ples/proxy-config-local-pool-example.toml → ...les/tproxy-config-local-pool-example.toml
@@ -25,13 +25,13 @@ coinbase_reward_sat = 5_000_000_000
 
 # Difficulty params
 [downstream_difficulty_config]
-# hashes/s of the weakest miner that will be connecting
-min_individual_miner_hashrate=5_000_000.0
+# hashes/s of the weakest miner that will be connecting (e.g.: 10 Th/s = 10_000_000_000_000.0)
+min_individual_miner_hashrate=10_000_000_000_000.0
 # target number of shares per minute the miner should be sending
 shares_per_minute = 6.0
 
 [upstream_difficulty_config]
 # interval in seconds to elapse before updating channel hashrate with the pool
 channel_diff_update_interval = 60
-# estimated accumulated hashrate of all downstream miners
-channel_nominal_hashrate = 5_000_000.0
+# estimated accumulated hashrate of all downstream miners (e.g.: 10 Th/s = 10_000_000_000_000.0)
+channel_nominal_hashrate = 10_000_000_000_000.0
diff --git a/roles/translator/proxy-config.toml b/roles/translator/proxy-config.toml