From 4eb1a09e31ab36405def17632176806fc57d4fcb Mon Sep 17 00:00:00 2001 From: fi3 Date: Thu, 28 Mar 2024 19:20:04 +0100 Subject: [PATCH 1/6] Improve sv2 cpuminer Add a nicer user interface to the sv2 cpuminer with help messages. Add noise to the cpuminer. --- roles/Cargo.lock | 38 +++++++++++++++++++++++ roles/test-utils/mining-device/Cargo.toml | 1 - 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/roles/Cargo.lock b/roles/Cargo.lock index ddd871240..b77aa493b 100644 --- a/roles/Cargo.lock +++ b/roles/Cargo.lock @@ -576,6 +576,44 @@ dependencies = [ "strsim", ] +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "codec_sv2" +version = "1.0.0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + [[package]] name = "clap_derive" version = "4.5.4" diff --git a/roles/test-utils/mining-device/Cargo.toml b/roles/test-utils/mining-device/Cargo.toml index 41429d6a1..263ddfbd4 100644 --- a/roles/test-utils/mining-device/Cargo.toml +++ b/roles/test-utils/mining-device/Cargo.toml @@ -23,4 +23,3 @@ key-utils = { version = "^1.0.0", path = "../../../utils/key-utils" } clap = { version = "^4.5.4", features = ["derive"] } tracing = { version = "0.1" } tracing-subscriber = "0.3" -sha2 = "0.10.6" From 0ce7cc57a7d03dcadd158ae0cbf424b2938bce5f Mon Sep 17 00:00:00 2001 From: fi3 Date: Fri, 5 Apr 2024 12:04:06 +0200 Subject: [PATCH 2/6] Fix fmt and clippy --- roles/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/Cargo.lock b/roles/Cargo.lock index b77aa493b..761115490 100644 --- a/roles/Cargo.lock +++ b/roles/Cargo.lock @@ -585,7 +585,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -596,7 +596,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "codec_sv2" -version = "1.0.0" +version = "1.0.1" dependencies = [ "clap_builder", "clap_derive", From 770fc9117e28af9656e75633b33ebd181f5b9145 Mon Sep 17 00:00:00 2001 From: Vasu Khanna <117103753+star-gazer111@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:54:16 +0530 Subject: [PATCH 3/6] Update proxy-config-example.toml --- roles/mining-proxy/config-examples/proxy-config-example.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/mining-proxy/config-examples/proxy-config-example.toml b/roles/mining-proxy/config-examples/proxy-config-example.toml index 35d3917dd..6766f82d6 100644 --- a/roles/mining-proxy/config-examples/proxy-config-example.toml +++ b/roles/mining-proxy/config-examples/proxy-config-example.toml @@ -6,7 +6,6 @@ listen_mining_port = 34255 max_supported_version = 2 min_supported_version = 2 downstream_share_per_minute = 1 -coinbase_reward_sat = 5_000_000_000 # This value is used by the proxy to communicate to the pool the expected hash rate when we open an # extended channel, based on it the pool will set a target for the channel expected_total_downstream_hr = 10_000 From 9542b7a887d8ca89280544c9c1e90e9a1f3aa478 Mon Sep 17 00:00:00 2001 From: Vasu Khanna <117103753+star-gazer111@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:54:37 +0530 Subject: [PATCH 4/6] Update pool-config-local-tp-example.toml --- roles/pool/config-examples/pool-config-local-tp-example.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/pool/config-examples/pool-config-local-tp-example.toml b/roles/pool/config-examples/pool-config-local-tp-example.toml index 016c372f5..edc69b3c1 100644 --- a/roles/pool/config-examples/pool-config-local-tp-example.toml +++ b/roles/pool/config-examples/pool-config-local-tp-example.toml @@ -1,7 +1,6 @@ # SRI Pool config authority_public_key = "9auqWEzQDVyd2oe1JVGFLMLHZtCo2FFqZwtKA5gd9xbuEu7PH72" authority_secret_key = "mkDLTBBRxdBv998612qipDYoTK3YUrqLe8uWw7gu3iXbSrn2n" -#authority_secret_key = "7qbpUjScc865jyX2kiB4NVJANoC7GA7TAJupdzXWkc62" cert_validity_sec = 3600 test_only_listen_adress_plain = "0.0.0.0:34250" listen_address = "0.0.0.0:34254" From adbf83478d7c383fdc37010b2a3037a757a2f5bc Mon Sep 17 00:00:00 2001 From: Vasu Khanna <117103753+star-gazer111@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:54:56 +0530 Subject: [PATCH 5/6] Update tproxy-config-local-jdc-example.toml --- .../config-examples/tproxy-config-local-jdc-example.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/translator/config-examples/tproxy-config-local-jdc-example.toml b/roles/translator/config-examples/tproxy-config-local-jdc-example.toml index a8bc389aa..5fe4a8eeb 100644 --- a/roles/translator/config-examples/tproxy-config-local-jdc-example.toml +++ b/roles/translator/config-examples/tproxy-config-local-jdc-example.toml @@ -21,7 +21,6 @@ min_supported_version = 2 # Max value for CGminer: 8 # Min value: 2 min_extranonce2_size = 8 -coinbase_reward_sat = 5_000_000_000 # Difficulty params [downstream_difficulty_config] From 9777247b9eb1825c1303d43807ee4532a075b775 Mon Sep 17 00:00:00 2001 From: Vasu Khanna <117103753+star-gazer111@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:55:10 +0530 Subject: [PATCH 6/6] Update tproxy-config-local-pool-example.toml --- .../config-examples/tproxy-config-local-pool-example.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/translator/config-examples/tproxy-config-local-pool-example.toml b/roles/translator/config-examples/tproxy-config-local-pool-example.toml index d963ec945..b4359d5ab 100644 --- a/roles/translator/config-examples/tproxy-config-local-pool-example.toml +++ b/roles/translator/config-examples/tproxy-config-local-pool-example.toml @@ -21,7 +21,6 @@ min_supported_version = 2 # Max value for CGminer: 8 # Min value: 2 min_extranonce2_size = 8 -coinbase_reward_sat = 5_000_000_000 # Difficulty params [downstream_difficulty_config]