better target difficulty

Author: stringhandler

Cargo.lock

@@ -6,20 +6,20 @@ version = "0.2.12"
 [dependencies]
 anyhow = "*"
 clap = { version = "4.5.0", features = ["derive"] }
-minotari_app_grpc = { git = "http://github.com/stringhandler/tari", branch = "st-add-p2pool-tip-info" }
+minotari_app_grpc = { git = "http://github.com/tari-project/tari" }
 num-format = "0.4.4"
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.68"
 sha3 = "0.10"
-tari_common = { git = "http://github.com/stringhandler/tari", branch = "st-add-p2pool-tip-info" }
-tari_common_types = { git = "http://github.com/stringhandler/tari", branch = "st-add-p2pool-tip-info" }
-tari_core = { git = "http://github.com/stringhandler/tari", branch = "st-add-p2pool-tip-info", default-features = false, features = [
+tari_common = { git = "http://github.com/tari-project/tari" }
+tari_common_types = { git = "http://github.com/tari-project/tari" }
+tari_core = { git = "https://github.com/tari-project/tari", default-features = false, features = [
   "transactions",
 ] }
 tari_crypto = { version = "0.21", features = ["borsh"] }
-tari_key_manager = { git = "http://github.com/stringhandler/tari", branch = "st-add-p2pool-tip-info" }
-tari_script = { git = "http://github.com/stringhandler/tari", branch = "st-add-p2pool-tip-info" }
-tari_shutdown = { git = "http://github.com/stringhandler/tari", branch = "st-add-p2pool-tip-info" }
+tari_key_manager = { git = "http://github.com/tari-project/tari" }
+tari_script = { git = "http://github.com/tari-project/tari" }
+tari_shutdown = { git = "https://github.com/tari-project/tari.git" }
 tari_utilities = "0.8"
 
 libsqlite3-sys = { version = "0.25.1", features = ["bundled"] }

Cargo.toml

@@ -639,7 +639,6 @@ async fn run_template_height_watcher(config: ConfigFile, shutdown: ShutdownSigna
         if last_template_time.elapsed() > Duration::from_secs(config.template_refresh_secs) {
             info!(target: LOG_TARGET, "Template refresh time elapsed. Dumping block template.");
             must_refresh = true;
-            last_template_time = Instant::now();
         }
 
         curr_node_height = height_data.height;
@@ -672,6 +671,7 @@ async fn run_template_height_watcher(config: ConfigFile, shutdown: ShutdownSigna
                     continue;
                 },
             };
+            last_template_time = Instant::now();
             // clear_block_template_cache().await;
             replace_block_template_cache(template).await;
             println!("Block template refreshed");
@@ -933,6 +933,7 @@ async fn get_template_from_client(
             node_client.get_new_block(NewBlockTemplate::default()),
         )
         .await??;
+        // dbg!(&block_result);
         let block = block_result.result.block.unwrap();
         let mut header: BlockHeader = block
             .clone()
@@ -948,9 +949,24 @@ async fn get_template_from_client(
             block.clone().header.unwrap().timestamp.to_string(),
             header.mining_hash().clone().to_string()
         );
+        println!(
+            "New template, difficulty: {}, minerdata {}",
+            block_result.target_difficulty,
+            block_result
+                .result
+                .miner_data
+                .as_ref()
+                .map(|m| m.target_difficulty)
+                .unwrap_or_default()
+        );
         // return Ok(());
         return Ok(BlockTemplateData {
-            target_difficulty: block_result.target_difficulty,
+            target_difficulty: block_result
+                .result
+                .miner_data
+                .as_ref()
+                .map(|m| m.target_difficulty)
+                .unwrap_or(block_result.target_difficulty),
             block,
             header,
             mining_hash,

src/main.rs

@@ -135,6 +135,7 @@ pub enum ClientType {
     P2Pool(TariAddress),
 }
 
+#[derive(Debug)]
 pub struct NewBlockResult {
     pub result: GetNewBlockResult,
     pub target_difficulty: u64,