Merge pull request #5305 from stacks-network/fix/nakamoto-downloader-at-reward-cycle-boundary

Fix/nakamoto downloader at reward cycle boundary

Author: jcnelson

stackslib/src/net/download/nakamoto/tenure.rs

@@ -325,15 +325,12 @@ impl TenureStartEnd {
                 wt_start.winning_block_id.clone(),
                 wt_end.winning_block_id.clone(),
                 rc,
-                downloader_block_height_to_reward_cycle(
-                    pox_constants,
-                    first_burn_height,
-                    wt_start.burn_height,
-                )
-                .expect(&format!(
-                    "FATAL: tenure from before system start ({} <= {})",
-                    wt_start.burn_height, first_burn_height
-                )),
+                pox_constants
+                    .block_height_to_reward_cycle(first_burn_height, wt_start.burn_height)
+                    .expect(&format!(
+                        "FATAL: tenure from before system start ({} <= {})",
+                        wt_start.burn_height, first_burn_height
+                    )),
                 wt.processed,
             );
             tenure_start_end.fetch_end_block = true;

stackslib/src/net/download/nakamoto/tenure_downloader_set.rs

@@ -407,6 +407,12 @@ impl NakamotoTenureDownloaderSet {
                 continue;
             };
 
+            info!("Download tenure {}", &ch;
+                "tenure_start_block" => %tenure_info.start_block_id,
+                "tenure_end_block" => %tenure_info.end_block_id,
+                "tenure_start_reward_cycle" => tenure_info.start_reward_cycle,
+                "tenure_end_reward_cycle" => tenure_info.end_reward_cycle);
+
             debug!(
                 "Download tenure {} (start={}, end={}) (rc {},{})",
                 &ch,

stackslib/src/net/inv/nakamoto.rs

@@ -679,6 +679,7 @@ impl NakamotoTenureInv {
             }
             StacksMessageType::Nack(nack_data) => {
                 info!("{:?}: remote peer NACKed our GetNakamotoInv", network.get_local_peer();
+                      "remote_peer" => %self.neighbor_address,
                       "error_code" => nack_data.error_code);
 
                 if nack_data.error_code != NackErrorCodes::NoSuchBurnchainBlock {