Merge pull request stratum-mining#310 from GitGab19/adapt-apps-to-new-extranonce-manager

Adapt apps to new extranonce APIs

Author: GitGab19

integration-tests/Cargo.lock

@@ -261,6 +261,7 @@ pub fn start_jdc(
         required_extensions,
         monitoring_address,
         monitoring_cache_refresh_secs,
+        None,
     );
     let ret = jd_client_sv2::JobDeclaratorClient::new(jd_client_proxy);
     let ret_clone = ret.clone();

integration-tests/lib/mod.rs

@@ -71,7 +71,7 @@ async fn jdc_cached_shares_relayed_on_set_custom_job_success() {
             // to guarantee the miner can easily generate valid shares.
             // This helps ensure the first received share is valid.
             target: [0xff_u8; 32].to_vec().try_into().unwrap(),
-            extranonce_size: 8,
+            extranonce_size: open_channel_msg.min_extranonce_size,
             extranonce_prefix: vec![0x00, 0x00, 0x00, 0x00].try_into().unwrap(),
             group_channel_id: 1,
         },

integration-tests/tests/jdc_cached_shares.rs

@@ -1178,7 +1178,7 @@ async fn non_aggregated_translator_correctly_deals_with_close_channel_message()
                     .try_into()
                     .unwrap(),
                     // full extranonce has a total of 8 bytes
-                    extranonce_size: 4,
+                    extranonce_size: open_extended_mining_channel.min_extranonce_size,
                     extranonce_prefix: vec![0x00, 0x01, 0x00, i as u8].try_into().unwrap(),
                     group_channel_id: GROUP_CHANNEL_ID,
                 },

integration-tests/tests/translator_integration.rs

@@ -20,6 +20,9 @@ shares_per_minute = 6.0
 # How many shares do we want to acknowledge in a batch
 share_batch_size = 10
 
+# Number of rollable extranonce bytes reserved for extended downstreams (default 8)
+# reserved_downstream_rollable_extranonce_size = 8
+
 # JDC supports two modes:
 # "FULLTEMPLATE"  - full template mining
 # "COINBASEONLY" - coinbase-only mining

miner-apps/Cargo.lock

@@ -20,6 +20,9 @@ shares_per_minute = 6.0
 # How many shares do we want to acknowledge in a batch
 share_batch_size = 10
 
+# Number of rollable extranonce bytes reserved for extended downstreams (default 8)
+# reserved_downstream_rollable_extranonce_size = 8
+
 # JDC supports two modes:
 # "FULLTEMPLATE"  - full template mining
 # "COINBASEONLY" - coinbase-only mining

miner-apps/jd-client/config-examples/mainnet/jdc-config-bitcoin-core-ipc-hosted-infra-example.toml

@@ -20,6 +20,9 @@ shares_per_minute = 6.0
 # How many shares do we want to acknowledge in a batch
 share_batch_size = 10
 
+# Number of rollable extranonce bytes reserved for extended downstreams (default 8)
+# reserved_downstream_rollable_extranonce_size = 8
+
 # JDC supports two modes:
 # "FULLTEMPLATE"  - full template mining
 # "COINBASEONLY" - coinbase-only mining

miner-apps/jd-client/config-examples/mainnet/jdc-config-bitcoin-core-ipc-local-infra-example.toml

@@ -20,6 +20,9 @@ shares_per_minute = 6.0
 # How many shares do we want to acknowledge in a batch
 share_batch_size = 10
 
+# Number of rollable extranonce bytes reserved for extended downstreams (default 8)
+# reserved_downstream_rollable_extranonce_size = 8
+
 # JDC supports two modes:
 # "FULLTEMPLATE"  - full template mining
 # "COINBASEONLY" - coinbase-only mining

miner-apps/jd-client/config-examples/mainnet/jdc-config-hosted-infra-example.toml

@@ -24,6 +24,9 @@ shares_per_minute = 6.0
 # How many shares do we want to acknowledge in a batch
 share_batch_size = 10
 
+# Number of rollable extranonce bytes reserved for extended downstreams (default 8)
+# reserved_downstream_rollable_extranonce_size = 8
+
 # JDC mode: FULLTEMPLATE, COINBASEONLY, or SOLOMINING
 mode = "SOLOMINING"