Merge branch 'develop' into feat/naka-miner-heuristics

Author: kantai

stacks-signer/src/chainstate.rs

@@ -195,6 +195,7 @@ impl SortitionsView {
         {
             info!(
                 "Current miner timed out, marking as invalid.";
+                "block_height" => block.header.chain_length,
                 "current_sortition_consensus_hash" => ?self.cur_sortition.consensus_hash,
             );
             self.cur_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock;
@@ -203,6 +204,7 @@ impl SortitionsView {
             if last_sortition.is_timed_out(self.config.block_proposal_timeout, signer_db)? {
                 info!(
                     "Last miner timed out, marking as invalid.";
+                    "block_height" => block.header.chain_length,
                     "last_sortition_consensus_hash" => ?last_sortition.consensus_hash,
                 );
                 last_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock;
@@ -365,6 +367,7 @@ impl SortitionsView {
             "sortition_state.consensus_hash" => %sortition_state.consensus_hash,
             "sortition_state.prior_sortition" => %sortition_state.prior_sortition,
             "sortition_state.parent_tenure_id" => %sortition_state.parent_tenure_id,
+            "block_height" => block.header.chain_length,
         );
 
         let tenures_reorged = client.get_tenure_forking_info(
@@ -424,6 +427,7 @@ impl SortitionsView {
                             "Miner is not building off of most recent tenure. A tenure they reorg has already mined blocks, but the block was poorly timed, allowing the reorg.";
                             "proposed_block_consensus_hash" => %block.header.consensus_hash,
                             "proposed_block_signer_sighash" => %block.header.signer_signature_hash(),
+                            "proposed_block_height" => block.header.chain_length,
                             "parent_tenure" => %sortition_state.parent_tenure_id,
                             "last_sortition" => %sortition_state.prior_sortition,
                             "violating_tenure_id" => %tenure.consensus_hash,
@@ -596,6 +600,7 @@ impl SortitionsView {
                 "Have no accepted blocks in the tenure, assuming block confirmation is correct";
                 "proposed_block_consensus_hash" => %block.header.consensus_hash,
                 "proposed_block_signer_sighash" => %block.header.signer_signature_hash(),
+                "proposed_block_height" => block.header.chain_length,
             );
             return Ok(true);
         };

stacks-signer/src/v0/signer.rs

@@ -189,6 +189,7 @@ impl SignerTrait<SignerMessage> for Signer {
                             info!(
                                 "{self}: Got block pushed message";
                                 "block_id" => %b.block_id(),
+                                "block_height" => b.header.chain_length,
                                 "signer_sighash" => %b.header.signer_signature_hash(),
                             );
                             stacks_client.post_block_until_ok(self, &b);
@@ -352,6 +353,7 @@ impl Signer {
             "{self}: received a block proposal for a new block. Submit block for validation. ";
             "signer_sighash" => %signer_signature_hash,
             "block_id" => %block_proposal.block.block_id(),
+            "block_height" => block_proposal.block.header.chain_length,
             "burn_height" => block_proposal.burn_height,
         );
         crate::monitoring::increment_block_proposals_received();