Merge branch 'develop' into feat/hot-reload-miner-spend

Author: jcnelson

CHANGELOG.md

@@ -9,20 +9,29 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## Added
 
+- Add `disable_retries` mode for events_observer disabling automatic retry on error
+
+## Changed
+
+- Implement faster cost tracker for default cost functions in Clarity
+- By default, miners will wait for a new tenure to start for a configurable amount of time after receiving a burn block before
+  submitting a block commit. This will reduce the amount of RBF transactions miners are expected to need.
+- Add weight threshold and percentages to `StackerDBListener` logs
+
+## [3.1.0.0.6]
+
+## Added
+
 - The `BlockProposal` StackerDB message serialization struct now includes a `server_version` string, which represents the version of the node that the miner is using. ([#5803](https://github.com/stacks-network/stacks-core/pull/5803))
 - Add `vrf_seed` to the `/v3/sortitions` rpc endpoint
 - Added hot-reloading of `burnchain.burn_fee_cap` from a miner's config file ([#5857](https://github.com/stacks-network/stacks-core/pull/5857))
 
 ### Changed
 
-- Implement faster cost tracker for default cost functions in Clarity
 - Miner will stop waiting for signatures on a block if the Stacks tip advances (causing the block it had proposed to be invalid).
-- By default, miners will wait for a new tenure to start for a configurable amount of time after receiving a burn block before 
-  submitting a block commit. This will reduce the amount of RBF transactions miners are expected to need.
 - Logging improvements:
   - P2P logs now includes a reason for dropping a peer or neighbor
   - Improvements to how a PeerAddress is logged (human readable format vs hex)
-  - Add weight threshold and percentages to `StackerDBListener` logs
 
 ### Fixed
 

clarity/src/vm/costs/mod.rs

@@ -217,8 +217,7 @@ impl DefaultVersion {
             };
 
             CostErrors::CostComputationFailed(format!(
-                "Error evaluating result of cost function {}: {e}",
-                &cost_function_ref.function_name
+                "Error evaluating result of cost function {cost_function_ref}: {e}",
             ))
         })
     }

libsigner/src/v0/messages.rs

@@ -1330,7 +1330,9 @@ impl StacksMessageCodec for RejectReason {
     }
 
     fn consensus_deserialize<R: Read>(fd: &mut R) -> Result<Self, CodecError> {
-        let type_prefix_byte = read_next::<u8, _>(fd)?;
+        let Ok(type_prefix_byte) = read_next::<u8, _>(fd) else {
+            return Ok(RejectReason::Unknown(RejectReasonPrefix::Unknown as u8));
+        };
         let type_prefix = RejectReasonPrefix::from(type_prefix_byte);
         let code = match type_prefix {
             RejectReasonPrefix::ValidationFailed => RejectReason::ValidationFailed(
@@ -1963,4 +1965,20 @@ mod test {
         assert_eq!(block_accepted.signature, block_accepted_old.signature);
         assert_eq!(block_accepted.metadata, block_accepted_old.metadata);
     }
+
+    #[test]
+    fn test_deserialize_old_block_response() {
+        // Fixture of an older version of a block response that has a tenure_extend_timestamp
+        // but _not_ a reject_reason.
+        let hex_str = "01006dc371d2313be71f93ac759f3302e5a0e4ff77dd0e73f13bb491936b5489d5390032208fc53bd0984c84abaac44ecd777e473e3e325066217e9d7314baa5cdfe1847363e1036f364b4bf7982f4d103079b17c19bf8a19904e822c2d62a5021c19700000036737461636b732d7369676e657220302e302e3120283a2c2072656c65617365206275696c642c206c696e7578205b7838365f36345d290200000008000000006751c76e";
+        let bytes = hex_bytes(hex_str).unwrap();
+        let block_response = read_next::<SignerMessage, _>(&mut &bytes[..]).unwrap();
+        let SignerMessage::BlockResponse(BlockResponse::Accepted(accepted)) = block_response else {
+            panic!("Expected BlockResponse::Accepted");
+        };
+        assert_eq!(
+            accepted.response_data.reject_reason,
+            RejectReason::Unknown(RejectReasonPrefix::Unknown as u8)
+        );
+    }
 }

stacks-signer/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## [Unreleased]
 
+## Changed
+
+- 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.6.0]
+
 ## Added
 
 - Introduced the `reorg_attempts_activity_timeout_ms` configuration option for signers which is used to determine the length of time after the last block of a tenure is confirmed that an incoming miner's attempts to reorg it are considered valid miner activity.
@@ -17,12 +28,6 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - Increase default `block_proposal_timeout_ms` from 10 minutes to 4 hours. Until #5729 is implemented, there is no value in rejecting a late block from a miner, since a late block is better than no block at all.
 - Signers no longer view any block proposal by a miner in their DB as indicative of valid miner activity.
 - Various index improvements to the signer's database to improve performance.
-- 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]
 

stackslib/src/clarity_vm/tests/costs.rs

@@ -892,7 +892,12 @@ fn eval_cost_fn(
         .eval_read_only(&boot_costs_id, &exec)
         .map(|(value, _, _)| Some(value));
 
-    parse_cost(cost_fn_name, exec_result)
+    let clarity_cost_fn_ref = ClarityCostFunctionReference {
+        contract_id: boot_costs_id,
+        function_name: cost_fn_name.to_string(),
+    };
+
+    parse_cost(&clarity_cost_fn_ref.to_string(), exec_result)
 }
 
 fn eval_replaced_cost_fn(

stackslib/src/config/mod.rs

@@ -915,6 +915,7 @@ impl Config {
                         endpoint: observer.endpoint,
                         events_keys,
                         timeout_ms: observer.timeout_ms.unwrap_or(1_000),
+                        disable_retries: observer.disable_retries.unwrap_or(false),
                     });
                 }
                 observers
@@ -928,6 +929,7 @@ impl Config {
                 endpoint: val,
                 events_keys: vec![EventKeyType::AnyEvent],
                 timeout_ms: 1_000,
+                disable_retries: false,
             });
         };
 
@@ -2824,13 +2826,15 @@ pub struct EventObserverConfigFile {
     pub endpoint: String,
     pub events_keys: Vec<String>,
     pub timeout_ms: Option<u64>,
+    pub disable_retries: Option<bool>,
 }
 
 #[derive(Clone, Default, Debug, Hash, PartialEq, Eq, PartialOrd)]
 pub struct EventObserverConfig {
     pub endpoint: String,
     pub events_keys: Vec<EventKeyType>,
     pub timeout_ms: u64,
+    pub disable_retries: bool,
 }
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd)]