Merge branch 'develop' into test/allow_reorg_within_first_proposal_burn_block_timing_secs

Author: obycode

.github/workflows/bitcoin-tests.yml

@@ -125,6 +125,7 @@ jobs:
           - tests::signer::v0::continue_after_tenure_extend
           - tests::signer::v0::tenure_extend_after_idle_signers
           - tests::signer::v0::tenure_extend_after_idle_miner
+          - tests::signer::v0::tenure_extend_after_failed_miner
           - tests::signer::v0::tenure_extend_succeeds_after_rejected_attempt
           - tests::signer::v0::stx_transfers_dont_effect_idle_timeout
           - tests::signer::v0::idle_tenure_extend_active_mining
@@ -141,6 +142,9 @@ jobs:
           - tests::signer::v0::incoming_signers_ignore_block_proposals
           - tests::signer::v0::outgoing_signers_ignore_block_proposals
           - tests::signer::v0::injected_signatures_are_ignored_across_boundaries
+          - tests::signer::v0::fast_sortition
+          - tests::signer::v0::single_miner_empty_sortition
+          - tests::signer::v0::multiple_miners_empty_sortition
           - tests::signer::v0::block_proposal_timeout
           - tests::signer::v0::rejected_blocks_count_towards_miner_validity
           - tests::signer::v0::allow_reorg_within_first_proposal_burn_block_timing_secs
@@ -163,6 +167,7 @@ jobs:
           - tests::nakamoto_integrations::sip029_coinbase_change
           - tests::nakamoto_integrations::clarity_cost_spend_down
           - tests::nakamoto_integrations::v3_blockbyheight_api_endpoint
+          - tests::nakamoto_integrations::test_tenure_extend_from_flashblocks
           # TODO: enable these once v1 signer is supported by a new nakamoto epoch
           # - tests::signer::v1::dkg
           # - tests::signer::v1::sign_request_rejected

.github/workflows/ci.yml

@@ -112,19 +112,10 @@ jobs:
   ##         - commit to either (development, master) branch
   create-cache:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      needs.check-release.outputs.is_release == 'true' ||
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: Create Test Cache
     needs:
       - rustfmt
@@ -144,19 +135,9 @@ jobs:
   ##         - commit to either (development, next, master) branch
   stacks-core-tests:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: Stacks Core Tests
     needs:
       - rustfmt
@@ -177,19 +158,9 @@ jobs:
   ##         - commit to either (development, next, master) branch
   stacks-core-build-tests:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: Stacks Core Build Tests
     needs:
       - rustfmt
@@ -198,42 +169,21 @@ jobs:
 
   bitcoin-tests:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: Bitcoin Tests
     needs:
       - rustfmt
       - create-cache
       - check-release
     uses: ./.github/workflows/bitcoin-tests.yml
 
-
   p2p-tests:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: P2P Tests
     needs:
       - rustfmt

.github/workflows/docs-pr.yml

@@ -7,7 +7,12 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## [Unreleased]
 
-## Added
+### Added
+
+- The stacks-node miner now performs accurate tenure-extensions in certain bitcoin block production
+  cases: when a bitcoin block is produced before the previous bitcoin block's Stacks tenure started.
+  Previously, the miner had difficulty restarting their missed tenure and extending into the new
+  bitcoin block, leading to 1-2 bitcoin blocks of missed Stacks block production.
 
 ## Changed
 

CHANGELOG.md

@@ -135,6 +135,12 @@ pub struct StackerDBChunkAckData {
     pub code: Option<u32>,
 }
 
+impl fmt::Display for StackerDBChunkAckData {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
+
 impl SlotMetadata {
     /// Make a new unsigned slot metadata
     pub fn new_unsigned(

libstackerdb/src/libstackerdb.rs

@@ -17,6 +17,9 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 - Introduced the `block_proposal_max_age_secs` configuration option for signers, enabling them to automatically ignore block proposals that exceed the specified age in seconds.
 - When a new block proposal is received while the signer is waiting for an existing proposal to be validated, the signer will wait until the existing block is done validating before submitting the new one for validating. ([#5453](https://github.com/stacks-network/stacks-core/pull/5453))
+- Introduced two new prometheus metrics:
+  - `stacks_signer_block_validation_latencies_histogram`: the validation_time_ms reported by the node when validating a block proposal
+  - `stacks_signer_block_response_latencies_histogram`: the "end-to-end" time it takes for the signer to issue a block response
 
 ## Changed
 - Improvements to the stale signer cleanup logic: deletes the prior signer if it has no remaining unprocessed blocks in its database

stacks-signer/CHANGELOG.md

@@ -200,6 +200,7 @@ impl SortitionsView {
             info!(
                 "Current miner timed out, marking as invalid.";
                 "block_height" => block.header.chain_length,
+                "block_proposal_timeout" => ?self.config.block_proposal_timeout,
                 "current_sortition_consensus_hash" => ?self.cur_sortition.consensus_hash,
             );
             self.cur_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock;
@@ -320,7 +321,7 @@ impl SortitionsView {
                     return Ok(false);
                 }
             }
-            ProposedBy::LastSortition(_last_sortition) => {
+            ProposedBy::LastSortition(last_sortition) => {
                 // should only consider blocks from the last sortition if the new sortition was invalidated
                 //  before we signed their first block.
                 if self.cur_sortition.miner_status
@@ -331,6 +332,7 @@ impl SortitionsView {
                         "proposed_block_consensus_hash" => %block.header.consensus_hash,
                         "proposed_block_signer_sighash" => %block.header.signer_signature_hash(),
                         "current_sortition_miner_status" => ?self.cur_sortition.miner_status,
+                        "last_sortition" => %last_sortition.consensus_hash
                     );
                     return Ok(false);
                 }