fix: don't log aggregate public keys as missing so often (do so at the caller's option), and in the p2p stack in particular, remember that aggregate public keys are never going to appear if we're pre-3.0

Author: jcnelson

stackslib/src/chainstate/nakamoto/mod.rs

@@ -1773,6 +1773,7 @@ impl NakamotoChainState {
         chainstate: &mut StacksChainState,
         for_burn_block_height: u64,
         at_block_id: &StacksBlockId,
+        warn_if_not_found: bool,
     ) -> Result<Point, ChainstateError> {
         // Get the current reward cycle
         let Some(rc) = sort_handle.pox_constants().block_height_to_reward_cycle(
@@ -1788,18 +1789,22 @@ impl NakamotoChainState {
             return Err(ChainstateError::InvalidStacksBlock(msg));
         };
 
-        debug!(
+        test_debug!(
             "get-approved-aggregate-key at block {}, cycle {}",
-            at_block_id, rc
+            at_block_id,
+            rc
         );
         match chainstate.get_aggregate_public_key_pox_4(sortdb, at_block_id, rc)? {
             Some(key) => Ok(key),
             None => {
-                warn!(
-                    "Failed to get aggregate public key";
-                    "block_id" => %at_block_id,
-                    "reward_cycle" => rc,
-                );
+                // this can happen for a whole host of reasons
+                if warn_if_not_found {
+                    warn!(
+                        "Failed to get aggregate public key";
+                        "block_id" => %at_block_id,
+                        "reward_cycle" => rc,
+                    );
+                }
                 Err(ChainstateError::InvalidStacksBlock(
                     "Failed to get aggregate public key".into(),
                 ))
@@ -1828,6 +1833,7 @@ impl NakamotoChainState {
             chainstate,
             block_sn.block_height,
             &aggregate_key_block_header.index_block_hash(),
+            true,
         )?;
         Ok(aggregate_public_key)
     }

stackslib/src/net/p2p.rs

@@ -5388,7 +5388,7 @@ impl PeerNetwork {
             .last_key_value()
             .map(|(rc, _)| rc.saturating_add(1))
             .unwrap_or(0);
-        let new_agg_pubkeys = (next_agg_pubkey_rc..=sort_tip_rc)
+        let mut new_agg_pubkeys: Vec<_> = (next_agg_pubkey_rc..=sort_tip_rc)
             .filter_map(|key_rc| {
                 let ih = sortdb.index_handle(&tip_sn.sortition_id);
                 let agg_pubkey_opt = if self.get_current_epoch().epoch_id < StacksEpochId::Epoch25 {
@@ -5404,6 +5404,7 @@ impl PeerNetwork {
                         chainstate,
                         self.burnchain.reward_cycle_to_block_height(key_rc),
                         &stacks_tip_block_id,
+                        false,
                     )
                     .ok()
                 };
@@ -5414,6 +5415,10 @@ impl PeerNetwork {
             })
             .collect();
 
+        if new_agg_pubkeys.len() == 0 && self.aggregate_public_keys.len() == 0 {
+            // special case -- we're before epoch 3.0, so don't waste time doing this again
+            new_agg_pubkeys.push((sort_tip_rc, None));
+        }
         Ok(new_agg_pubkeys)
     }