Merge branch 'develop' into chore/stacks-node-client-logs

Author: obycode

.github/workflows/bitcoin-tests.yml

@@ -140,6 +140,11 @@ jobs:
         with:
           btc-version: "25.0"
 
+      ## Increase open file descriptors limit
+      - name: Increase Open File Descriptors
+        run: |
+          sudo prlimit --nofile=4096:4096
+
       ## Run test matrix using restored cache of archive file
       ##   - Test will timeout after env.TEST_TIMEOUT minutes
       - name: Run Tests

stacks-signer/src/chainstate.rs

@@ -194,10 +194,18 @@ impl SortitionsView {
             .cur_sortition
             .is_timed_out(self.config.block_proposal_timeout, signer_db)?
         {
+            info!(
+                "Current miner timed out, marking as invalid.";
+                "current_sortition_consensus_hash" => ?self.cur_sortition.consensus_hash,
+            );
             self.cur_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock;
         }
         if let Some(last_sortition) = self.last_sortition.as_mut() {
             if last_sortition.is_timed_out(self.config.block_proposal_timeout, signer_db)? {
+                info!(
+                    "Last miner timed out, marking as invalid.";
+                    "last_sortition_consensus_hash" => ?last_sortition.consensus_hash,
+                );
                 last_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock;
             }
         }

stacks-signer/src/client/stacks_client.rs

@@ -449,13 +449,16 @@ impl StacksClient {
             "chosen_parent" => %chosen_parent,
             "last_sortition" => %last_sortition,
         );
+        let path = self.tenure_forking_info_path(chosen_parent, last_sortition);
+        let timer = crate::monitoring::new_rpc_call_timer(&path, &self.http_origin);
         let send_request = || {
             self.stacks_node_client
-                .get(self.tenure_forking_info_path(chosen_parent, last_sortition))
+                .get(&path)
                 .send()
                 .map_err(backoff::Error::transient)
         };
         let response = retry_with_exponential_backoff(send_request)?;
+        timer.stop_and_record();
         if !response.status().is_success() {
             return Err(ClientError::RequestFailure(response.status()));
         }
@@ -467,16 +470,16 @@ impl StacksClient {
     /// Get the sortition information for the latest sortition
     pub fn get_latest_sortition(&self) -> Result<SortitionInfo, ClientError> {
         debug!("stacks_node_client: Getting latest sortition...");
+        let path = self.sortition_info_path();
+        let timer = crate::monitoring::new_rpc_call_timer(&path, &self.http_origin);
         let send_request = || {
-            self.stacks_node_client
-                .get(self.sortition_info_path())
-                .send()
-                .map_err(|e| {
-                    warn!("Signer failed to request latest sortition"; "err" => ?e);
-                    e
-                })
+            self.stacks_node_client.get(&path).send().map_err(|e| {
+                warn!("Signer failed to request latest sortition"; "err" => ?e);
+                e
+            })
         };
         let response = send_request()?;
+        timer.stop_and_record();
         if !response.status().is_success() {
             return Err(ClientError::RequestFailure(response.status()));
         }
@@ -487,16 +490,16 @@ impl StacksClient {
     /// Get the sortition information for a given sortition
     pub fn get_sortition(&self, ch: &ConsensusHash) -> Result<SortitionInfo, ClientError> {
         debug!("stacks_node_client: Getting sortition with consensus hash {ch}...");
+        let path = format!("{}/consensus/{}", self.sortition_info_path(), ch.to_hex());
+        let timer = crate::monitoring::new_rpc_call_timer(&path, &self.http_origin);
         let send_request = || {
-            self.stacks_node_client
-                .get(format!("{}/consensus/{}", self.sortition_info_path(), ch.to_hex()))
-                .send()
-                .map_err(|e| {
-                    warn!("Signer failed to request sortition"; "consensus_hash" => %ch, "err" => ?e);
-                    e
-                })
+            self.stacks_node_client.get(&path).send().map_err(|e| {
+                warn!("Signer failed to request sortition"; "consensus_hash" => %ch, "err" => ?e);
+                e
+            })
         };
         let response = send_request()?;
+        timer.stop_and_record();
         if !response.status().is_success() {
             return Err(ClientError::RequestFailure(response.status()));
         }
@@ -604,7 +607,6 @@ impl StacksClient {
                 .map_err(backoff::Error::transient)
         };
         let response = retry_with_exponential_backoff(send_request)?;
-        #[cfg(feature = "monitoring_prom")]
         timer.stop_and_record();
         if !response.status().is_success() {
             return Err(ClientError::RequestFailure(response.status()));
@@ -723,13 +725,11 @@ impl StacksClient {
             "block_id" => %block.header.block_id(),
             "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 send_request = || {
             self.stacks_node_client
-                .post(format!(
-                    "{}{}?broadcast=1",
-                    self.http_origin,
-                    postblock_v3::PATH
-                ))
+                .post(&path)
                 .header("Content-Type", "application/octet-stream")
                 .header(AUTHORIZATION, self.auth_password.clone())
                 .body(block.serialize_to_vec())
@@ -740,6 +740,7 @@ impl StacksClient {
                 })
         };
         let response = retry_with_exponential_backoff(send_request)?;
+        timer.stop_and_record();
         if !response.status().is_success() {
             return Err(ClientError::RequestFailure(response.status()));
         }

stacks-signer/src/signerdb.rs

@@ -251,14 +251,14 @@ impl BlockInfo {
 
     /// Mark the block as locally rejected and invalid
     pub fn mark_locally_rejected(&mut self) -> Result<(), String> {
-        self.move_to(BlockState::LocallyRejected);
+        self.move_to(BlockState::LocallyRejected)?;
         self.valid = Some(false);
         Ok(())
     }
 
     /// Mark the block as globally rejected and invalid
     pub fn mark_globally_rejected(&mut self) -> Result<(), String> {
-        self.move_to(BlockState::GloballyRejected);
+        self.move_to(BlockState::GloballyRejected)?;
         self.valid = Some(false);
         Ok(())
     }

stacks-signer/src/v0/signer.rs

@@ -400,6 +400,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(),
+            "burn_height" => block_proposal.burn_height,
         );
         crate::monitoring::increment_block_proposals_received();
         let mut block_info = BlockInfo::from(block_proposal.clone());

testnet/stacks-node/src/config.rs

@@ -1460,7 +1460,7 @@ impl BurnchainConfig {
             rpc_ssl: false,
             username: None,
             password: None,
-            timeout: 300,
+            timeout: 60,
             magic_bytes: BLOCKSTACK_MAGIC_MAINNET.clone(),
             local_mining_public_key: None,
             process_exit_at_block_height: None,
@@ -2376,7 +2376,7 @@ impl Default for MinerConfig {
             first_attempt_time_ms: 10,
             subsequent_attempt_time_ms: 120_000,
             microblock_attempt_time_ms: 30_000,
-            nakamoto_attempt_time_ms: 20_000,
+            nakamoto_attempt_time_ms: 5_000,
             probability_pick_no_estimate_tx: 25,
             block_reward_recipient: None,
             segwit: false,