Merge branch 'develop' of https://github.com/stacks-network/stacks-core into fix/clippy-ci-stacks-lib-needless-borrow

Author: jferrant

.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

@@ -5,19 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
-## [Unreleased]
+## [3.1.0.0.3]
 
 ### Added
 
 - Add `tenure_timeout_secs` to the miner for determining when a time-based tenure extend should be attempted.
 - Added configuration option `block_proposal_max_age_secs` under `[connection_options]` to prevent processing stale block proposals
 
 ### Changed
-- The RPC endpoint `/v3/block_proposal` no longer will evaluate block proposals more than `block_proposal_max_age_secs` old
 
+- The RPC endpoint `/v3/block_proposal` no longer will evaluate block proposals more than `block_proposal_max_age_secs` old
 - When a transaction is dropped due to replace-by-fee, the `/drop_mempool_tx` event observer payload now includes `new_txid`, which is the transaction that replaced this dropped transaction. When a transaction is dropped for other reasons, `new_txid` is `null`. [#5381](https://github.com/stacks-network/stacks-core/pull/5381)
 - Nodes will assume that all PoX anchor blocks exist by default, and stall initial block download indefinitely to await their arrival (#5502)
 
+### Fixed
+
+- Signers no longer accept messages for blocks from different reward cycles (#5662)
+
 ## [3.1.0.0.2]
 
 ### Added

CHANGELOG.md

@@ -9,8 +9,17 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## Added
 
+## Changed
+
+## [3.1.0.0.3.0]
+
+## Added
+
 - 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
@@ -24,6 +33,14 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 - Prevent old reward cycle signers from processing block validation response messages that do not apply to blocks from their cycle.
 
+# [3.1.0.0.2.1]
+
+## Added
+
+## Changed
+
+- Prevent old reward cycle signers from processing block validation response messages that do not apply to blocks from their cycle.
+
 ## [3.1.0.0.2.0]
 
 ## Added

stacks-signer/CHANGELOG.md

@@ -323,8 +323,10 @@ impl StacksClient {
             block,
             chain_id: self.chain_id,
         };
-        let timer =
-            crate::monitoring::new_rpc_call_timer(&self.block_proposal_path(), &self.http_origin);
+        let timer = crate::monitoring::actions::new_rpc_call_timer(
+            &self.block_proposal_path(),
+            &self.http_origin,
+        );
         let send_request = || {
             self.stacks_node_client
                 .post(self.block_proposal_path())
@@ -399,7 +401,8 @@ impl StacksClient {
             "{}{RPC_TENURE_FORKING_INFO_PATH}/:start/:stop",
             self.http_origin
         );
-        let timer = crate::monitoring::new_rpc_call_timer(&metrics_path, &self.http_origin);
+        let timer =
+            crate::monitoring::actions::new_rpc_call_timer(&metrics_path, &self.http_origin);
         let send_request = || {
             self.stacks_node_client
                 .get(&path)
@@ -420,7 +423,7 @@ impl StacksClient {
     pub fn get_current_and_last_sortition(&self) -> Result<CurrentAndLastSortition, ClientError> {
         debug!("StacksClient: Getting current and prior sortition");
         let path = format!("{}/latest_and_last", self.sortition_info_path());
-        let timer = crate::monitoring::new_rpc_call_timer(&path, &self.http_origin);
+        let timer = crate::monitoring::actions::new_rpc_call_timer(&path, &self.http_origin);
         let send_request = || {
             self.stacks_node_client.get(&path).send().map_err(|e| {
                 warn!("Signer failed to request latest sortition"; "err" => ?e);
@@ -460,8 +463,10 @@ impl StacksClient {
     /// Get the current peer info data from the stacks node
     pub fn get_peer_info(&self) -> Result<PeerInfo, ClientError> {
         debug!("StacksClient: Getting peer info");
-        let timer =
-            crate::monitoring::new_rpc_call_timer(&self.core_info_path(), &self.http_origin);
+        let timer = crate::monitoring::actions::new_rpc_call_timer(
+            &self.core_info_path(),
+            &self.http_origin,
+        );
         let send_request = || {
             self.stacks_node_client
                 .get(self.core_info_path())
@@ -485,7 +490,7 @@ impl StacksClient {
         debug!("StacksClient: Getting reward set signers";
             "reward_cycle" => reward_cycle,
         );
-        let timer = crate::monitoring::new_rpc_call_timer(
+        let timer = crate::monitoring::actions::new_rpc_call_timer(
             &format!("{}/v3/stacker_set/:reward_cycle", self.http_origin),
             &self.http_origin,
         );
@@ -521,7 +526,8 @@ impl StacksClient {
     /// Retrieve the current pox data from the stacks node
     pub fn get_pox_data(&self) -> Result<RPCPoxInfoData, ClientError> {
         debug!("StacksClient: Getting pox data");
-        let timer = crate::monitoring::new_rpc_call_timer(&self.pox_path(), &self.http_origin);
+        let timer =
+            crate::monitoring::actions::new_rpc_call_timer(&self.pox_path(), &self.http_origin);
         let send_request = || {
             self.stacks_node_client
                 .get(self.pox_path())
@@ -572,7 +578,7 @@ impl StacksClient {
             "address" => %address,
         );
         let timer_label = format!("{}/v2/accounts/:principal", self.http_origin);
-        let timer = crate::monitoring::new_rpc_call_timer(&timer_label, &self.http_origin);
+        let timer = crate::monitoring::actions::new_rpc_call_timer(&timer_label, &self.http_origin);
         let send_request = || {
             self.stacks_node_client
                 .get(self.accounts_path(address))
@@ -628,7 +634,7 @@ impl StacksClient {
             "block_height" => %block.header.chain_length,
         );
         let path = format!("{}{}?broadcast=1", self.http_origin, postblock_v3::PATH);
-        let timer = crate::monitoring::new_rpc_call_timer(&path, &self.http_origin);
+        let timer = crate::monitoring::actions::new_rpc_call_timer(&path, &self.http_origin);
         let send_request = || {
             self.stacks_node_client
                 .post(&path)
@@ -678,7 +684,7 @@ impl StacksClient {
             "{}/v2/contracts/call-read/:principal/{contract_name}/{function_name}",
             self.http_origin
         );
-        let timer = crate::monitoring::new_rpc_call_timer(&timer_label, &self.http_origin);
+        let timer = crate::monitoring::actions::new_rpc_call_timer(&timer_label, &self.http_origin);
         let response = self
             .stacks_node_client
             .post(path)

stacks-signer/src/client/stacks_client.rs

@@ -125,7 +125,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SpawnedSigner
         );
         let (res_send, res_recv) = channel();
         let ev = SignerEventReceiver::new(config.network.is_mainnet());
-        crate::monitoring::start_serving_monitoring_metrics(config.clone()).ok();
+        crate::monitoring::actions::start_serving_monitoring_metrics(config.clone()).ok();
         let runloop = RunLoop::new(config.clone());
         let mut signer: RunLoopSigner<S, T> = libsigner::Signer::new(runloop, ev, res_send);
         let running_signer = signer.spawn(endpoint).expect("Failed to spawn signer");