fix: signer runloop calculates miner pk with block header instead of signerdb chunks (#5858)

Author: kantai

libsigner/src/events.rs

@@ -188,8 +188,7 @@ impl StacksMessageCodec for BlockProposalData {
 pub enum SignerEvent<T: SignerEventTrait> {
     /// A miner sent a message over .miners
     /// The `Vec<T>` will contain any signer messages made by the miner.
-    /// The `StacksPublicKey` is the message sender's public key.
-    MinerMessages(Vec<T>, StacksPublicKey),
+    MinerMessages(Vec<T>),
     /// The signer messages for other signers and miners to observe
     /// The u32 is the signer set to which the message belongs (either 0 or 1)
     SignerMessages(u32, Vec<T>),
@@ -513,20 +512,13 @@ impl<T: SignerEventTrait> TryFrom<StackerDBChunksEvent> for SignerEvent<T> {
             && event.contract_id.is_boot()
         {
             let mut messages = vec![];
-            let mut miner_pk = None;
             for chunk in event.modified_slots {
                 let Ok(msg) = T::consensus_deserialize(&mut chunk.data.as_slice()) else {
                     continue;
                 };
-
-                miner_pk = Some(chunk.recover_pk().map_err(|e| {
-                    EventError::MalformedRequest(format!(
-                        "Failed to recover PK from StackerDB chunk: {e}"
-                    ))
-                })?);
                 messages.push(msg);
             }
-            SignerEvent::MinerMessages(messages, miner_pk.ok_or(EventError::EmptyChunksEvent)?)
+            SignerEvent::MinerMessages(messages)
         } else if event.contract_id.name.starts_with(SIGNERS_NAME) && event.contract_id.is_boot() {
             let Some((signer_set, _)) =
                 get_signers_db_signer_set_message_id(event.contract_id.name.as_str())

stacks-signer/CHANGELOG.md

@@ -20,6 +20,10 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - Add new reject codes to the signer response for better visibility into why a block was rejected.
 - When allowing a reorg within the `reorg_attempts_activity_timeout_ms`, the signer will now watch the responses from other signers and if >30% of them reject this reorg attempt, then the signer will mark the miner as invalid, reject further attempts to reorg and allow the previous miner to extend their tenure.
 
+### Fixed
+
+- The signer runloop no longer relies on pubkey reports from the SignerDB event system. This previously led to improper proposal rejections via #5858. 
+
 ## [3.1.0.0.5.0]
 
 ### Added

stacks-signer/src/v0/signer.rs

@@ -184,7 +184,7 @@ impl SignerTrait<SignerMessage> for Signer {
                     self.handle_block_response(stacks_client, block_response, sortition_state);
                 }
             }
-            SignerEvent::MinerMessages(messages, miner_pubkey) => {
+            SignerEvent::MinerMessages(messages) => {
                 debug!(
                     "{self}: Received {} messages from the miner",
                     messages.len();
@@ -196,11 +196,19 @@ impl SignerTrait<SignerMessage> for Signer {
                             if self.test_ignore_all_block_proposals(block_proposal) {
                                 continue;
                             }
+                            let Some(miner_pubkey) = block_proposal.block.header.recover_miner_pk()
+                            else {
+                                warn!("{self}: Failed to recover miner pubkey";
+                                      "signer_sighash" => %block_proposal.block.header.signer_signature_hash(),
+                                      "consensus_hash" => %block_proposal.block.header.consensus_hash);
+                                continue;
+                            };
+
                             self.handle_block_proposal(
                                 stacks_client,
                                 sortition_state,
                                 block_proposal,
-                                miner_pubkey,
+                                &miner_pubkey,
                             );
                         }
                         SignerMessage::BlockPushed(b) => {