Merge branch 'develop' into refactor/add-epoch-index

Author: obycode

stacks-signer/src/lib.rs

@@ -121,7 +121,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SpawnedSigner
             as this could potentially expose sensitive data or functionalities to security risks \
             if additional proper security checks are not integrated in place. \
             For more information, check the documentation at \
-            https://docs.stacks.co/nakamoto-upgrade/signing-and-stacking/faq#what-should-the-networking-setup-for-my-signer-look-like."
+            https://docs.stacks.co/guides-and-tutorials/running-a-signer#preflight-setup"
         );
         let (res_send, res_recv) = channel();
         let ev = SignerEventReceiver::new(config.network.is_mainnet());

testnet/stacks-node/src/run_loop/nakamoto.rs

@@ -723,10 +723,17 @@ impl RunLoop {
 
                     // at tip, and not downloading. proceed to mine.
                     if last_tenure_sortition_height != sortition_db_height {
-                        info!(
-                            "Runloop: Synchronized full burnchain up to height {}. Proceeding to mine blocks",
-                            sortition_db_height
-                        );
+                        if is_miner {
+                            info!(
+                                "Runloop: Synchronized full burnchain up to height {}. Proceeding to mine blocks",
+                                sortition_db_height
+                            );
+                        } else {
+                            info!(
+                                "Runloop: Synchronized full burnchain up to height {}.",
+                                sortition_db_height
+                            );
+                        }
                         last_tenure_sortition_height = sortition_db_height;
                         globals.raise_initiative("runloop-synced".to_string());
                     }

testnet/stacks-node/src/tests/signer/v0.rs

@@ -5302,7 +5302,19 @@ fn signing_in_0th_tenure_of_reward_cycle() {
     })
     .unwrap();
 
-    for signer in &signer_public_keys {
+    let block_mined = test_observer::get_mined_nakamoto_blocks()
+        .last()
+        .unwrap()
+        .clone();
+    // Must ensure that the signers that signed the block have their blocks_signed updated appropriately
+    for signature in &block_mined.signer_signature {
+        let signer = signer_public_keys
+            .iter()
+            .find(|pk| {
+                pk.verify(block_mined.signer_signature_hash.as_bytes(), signature)
+                    .unwrap()
+            })
+            .expect("Unknown signer signature");
         let blocks_signed = get_v3_signer(&signer, next_reward_cycle);
         assert_eq!(blocks_signed, 1);
     }