Merge pull request stratum-mining#645 from GitGab19/fix-gh-action-errors

Fix gh action errors
xyephy · Oct 15, 2023 · de4e022 · de4e022
2 parents 46f4b19 + 53ec8e0
commit de4e022
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 299 deletions.
diff --git a/protocols/v2/sv2-ffi/sv2.h b/protocols/v2/sv2-ffi/sv2.h
@@ -14,14 +14,14 @@ static const uintptr_t SV2_FRAME_HEADER_LEN_END = 3;
 
 static const uintptr_t SV2_FRAME_CHUNK_SIZE = 65519;
 
+static const uintptr_t AEAD_MAC_LEN = 16;
+
 static const uintptr_t ENCRYPTED_SV2_FRAME_HEADER_SIZE = (SV2_FRAME_HEADER_SIZE + AEAD_MAC_LEN);
 
 static const uintptr_t NOISE_FRAME_HEADER_SIZE = 2;
 
 static const uintptr_t NOISE_FRAME_HEADER_LEN_OFFSET = 0;
 
-static const uintptr_t AEAD_MAC_LEN = 16;
-
 static const uint8_t SV2_MINING_PROTOCOL_DISCRIMINANT = 0;
 
 static const uint8_t SV2_JOB_NEG_PROTOCOL_DISCRIMINANT = 1;

diff --git a/test/config/interop-jd-translator/pool-config.toml b/test/config/interop-jd-translator/pool-config.toml
@@ -20,8 +20,8 @@ pool_signature = "Stratum v2 SRI Pool - gitgab19"
 
 # Template Provider config
 # local TP (this is pointing to localhost so you must run a TP locally for this configuration to work)
-tp_address = "75.119.150.111:8442"
+#tp_address = "75.119.150.111:8442"
 # hosted testnet TP 
-# tp_address = "89.116.25.191:8442"
+ tp_address = "89.116.25.191:8442"
 # hosted regtest TP 
 # tp_address = "75.119.150.111:8442"
diff --git a/test/config/interop-jd-translator/proxy-config.toml b/test/config/interop-jd-translator/proxy-config.toml
@@ -21,7 +21,7 @@ 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
+min_individual_miner_hashrate=500_000.0
 # minimum number of shares needed before a mining.set_difficulty is sent for updating targets
 miner_num_submits_before_update=5
 # target number of shares per minute the miner should be sending

diff --git a/test/config/pool-config-sri-tp-different-port.toml b/test/config/pool-config-sri-tp-different-port.toml
@@ -1,5 +1,5 @@
 listen_address = "127.0.0.1:44254"
-tp_address = "75.119.150.111:8442"
+tp_address = "89.116.25.191:8442"
 listen_jd_address = "127.0.0.1:44264"
 authority_public_key = "3VANfft6ei6jQq1At7d8nmiZzVhBFS4CiQujdgim1ign"
 authority_secret_key = "7qbpUjScc865jyX2kiB4NVJANoC7GA7TAJupdzXWkc62"

diff --git a/test/config/pool-config-sri-tp.toml b/test/config/pool-config-sri-tp.toml
@@ -1,5 +1,5 @@
 listen_address = "127.0.0.1:34254"
-tp_address = "75.119.150.111:8442"
+tp_address = "89.116.25.191:8442"
 listen_jd_address = "127.0.0.1:34264"
 authority_public_key = "3VANfft6ei6jQq1At7d8nmiZzVhBFS4CiQujdgim1ign"
 authority_secret_key = "7qbpUjScc865jyX2kiB4NVJANoC7GA7TAJupdzXWkc62"

diff --git a/test/message-generator/test/interop-jd-translator.json b/test/message-generator/test/interop-jd-translator.json
@@ -108,7 +108,7 @@
                 "WithConditions": {
                     "conditions": [
                         {
-                            "output_string": "Up: Set New Prev Hash",
+                            "output_string": "Received SetNewPrevHash",
                             "output_location": "StdOut",
                             "condition": true
                         }

diff --git a/test/message-generator/test/pool-sri-test-extended_1.json b/test/message-generator/test/pool-sri-test-extended_1.json
@@ -66,11 +66,11 @@
                         [
                             [
                                 "coinbase_tx_prefix",
-                                {"B064K": [2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 54, 1, 30, 0, 83, 116, 114, 97, 116, 117, 109, 32, 118, 50, 32, 83, 82, 73, 32, 80, 111, 111, 108]}
+                                {"B064K": [2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 56, 3, 76, 163, 38, 0, 83, 116, 114, 97, 116, 117, 109, 32, 118, 50, 32, 83, 82, 73, 32, 80, 111, 111, 108]}
                             ],
                             [
                                 "coinbase_tx_suffix",
-                                {"B064K": [255, 255, 255, 255, 2, 0, 242, 5, 42, 1, 0, 0, 0, 22, 0, 20, 52, 109, 166, 15, 152, 118, 139, 176, 201, 181, 188, 3, 22, 5, 97, 249, 228, 77, 64, 86, 0, 0, 0, 0, 0, 0, 0, 0, 38, 106, 36, 170, 33, 169, 237, 226, 246, 28, 63, 113, 209, 222, 253, 63, 169, 153, 223, 163, 105, 83, 117, 92, 105, 6, 137, 121, 153, 98, 180, 139, 235, 216, 54, 151, 78, 140, 249, 0, 0, 0, 0]}
+                                {"B064K": [255, 255, 255, 255, 1, 64, 190, 64, 37, 0, 0, 0, 0, 22, 0, 20, 52, 109, 166, 15, 152, 118, 139, 176, 201, 181, 188, 3, 22, 5, 97, 249, 228, 77, 64, 86, 0, 0, 0, 0]}
                             ]
                         ]
                     ]

diff --git a/utils/message-generator/interop-jdc-change-upstream.json.child-1.log b/utils/message-generator/interop-jdc-change-upstream.json.child-1.log
diff --git a/utils/message-generator/interop-jdc-change-upstream.json.child-2.log b/utils/message-generator/interop-jdc-change-upstream.json.child-2.log
diff --git a/utils/message-generator/interop-jdc-change-upstream.json.child-3.log b/utils/message-generator/interop-jdc-change-upstream.json.child-3.log