Merge branch 'develop' into fix/5193-stackerdb-decoherence

Author: jcnelson

testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

@@ -2817,7 +2817,7 @@ impl BitcoinRPCRequest {
 
     fn send(config: &Config, payload: BitcoinRPCRequest) -> RPCResult<serde_json::Value> {
         let request = BitcoinRPCRequest::build_rpc_request(&config, &payload);
-        let timeout = Duration::from_secs(60);
+        let timeout = Duration::from_secs(u64::from(config.burnchain.timeout));
 
         let host = request.preamble().host.hostname();
         let port = request.preamble().host.port();

testnet/stacks-node/src/config.rs

@@ -1418,6 +1418,7 @@ pub struct BurnchainConfig {
     pub rpc_ssl: bool,
     pub username: Option<String>,
     pub password: Option<String>,
+    /// Timeout, in seconds, for communication with bitcoind
     pub timeout: u32,
     pub magic_bytes: MagicBytes,
     pub local_mining_public_key: Option<String>,
@@ -1557,6 +1558,7 @@ pub struct BurnchainConfigFile {
     pub rpc_ssl: Option<bool>,
     pub username: Option<String>,
     pub password: Option<String>,
+    /// Timeout, in seconds, for communication with bitcoind
     pub timeout: Option<u32>,
     pub magic_bytes: Option<String>,
     pub local_mining_public_key: Option<String>,

testnet/stacks-node/src/neon_node.rs

@@ -1715,6 +1715,10 @@ impl BlockMinerThread {
                         info!("Relayer: Stacks tip has changed to {}/{} since we last tried to mine a block in {} at burn height {}; attempt was {} (for Stacks tip {}/{})",
                                parent_consensus_hash, stacks_parent_header.anchored_header.block_hash(), prev_block.burn_hash, parent_block_burn_height, prev_block.attempt, &prev_block.parent_consensus_hash, &prev_block.anchored_block.header.parent_block);
                         best_attempt = cmp::max(best_attempt, prev_block.attempt);
+                        // Since the chain tip has changed, we should try to mine a new block, even
+                        // if it has less transactions than the previous block we mined, since that
+                        // previous block would now be a reorg.
+                        max_txs = 0;
                     } else {
                         info!("Relayer: Burn tip has changed to {} ({}) since we last tried to mine a block in {}",
                                &self.burn_block.burn_header_hash, self.burn_block.block_height, &prev_block.burn_hash);

testnet/stacks-node/src/tests/signer/v0.rs

@@ -3178,6 +3178,7 @@ fn min_gap_between_blocks() {
         .as_stacks_nakamoto()
         .unwrap()
         .timestamp;
+    assert!(blocks.len() >= 2, "Expected at least 2 mined blocks");
     let penultimate_block = blocks.get(blocks.len() - 2).unwrap();
     let penultimate_block_time = penultimate_block
         .anchored_header