Merge branch 'develop' of https://github.com/stacks-network/stacks-core into chore/fix-multiple-miners

Author: jferrant

stackslib/src/net/api/getsortition.rs

@@ -182,7 +182,11 @@ impl GetSortitionHandler {
                 // try to figure out what the last snapshot in this fork was with a successful
                 //  sortition.
                 // optimization heuristic: short-circuit the load if its just `stacks_parent_sn`
-                let last_sortition_ch = if stacks_parent_sn.sortition {
+                //   if the sortition count incremented by exactly 1 between us and our **stacks** parent,
+                //   then the stacks parent's sortition *must* be the last one with a winner.
+                let sortitions_incremented_by_1 =
+                    sortition_sn.num_sortitions == stacks_parent_sn.num_sortitions + 1;
+                let last_sortition_ch = if sortitions_incremented_by_1 {
                     stacks_parent_sn.consensus_hash.clone()
                 } else {
                     // we actually need to perform the marf lookup

testnet/stacks-node/src/nakamoto_node/miner.rs

@@ -1123,6 +1123,12 @@ impl BlockMinerThread {
                 tenure_change_tx: None,
             });
         };
+        if self.last_block_mined.is_some() {
+            return Ok(NakamotoTenureInfo {
+                coinbase_tx: None,
+                tenure_change_tx: None,
+            });
+        }
 
         let parent_block_id = parent_block_info.stacks_parent_header.index_block_hash();
         let mut payload = TenureChangePayload {
@@ -1152,10 +1158,10 @@ impl BlockMinerThread {
                     &parent_block_id,
                 )
                 .map_err(NakamotoNodeError::MiningFailure)?;
-                debug!("Miner: Extending tenure";
-                    "burn_view_consensus_hash" => %burn_view_consensus_hash,
-                    "parent_block_id" => %parent_block_id,
-                    "num_blocks_so_far" => num_blocks_so_far,
+                info!("Miner: Extending tenure";
+                      "burn_view_consensus_hash" => %burn_view_consensus_hash,
+                      "parent_block_id" => %parent_block_id,
+                      "num_blocks_so_far" => num_blocks_so_far,
                 );
                 payload = payload.extend(
                     *burn_view_consensus_hash,

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -8461,8 +8461,10 @@ fn mock_mining() {
     let mock_mining_blocks_end = follower_naka_mined_blocks.load(Ordering::SeqCst);
     let blocks_mock_mined = mock_mining_blocks_end - mock_mining_blocks_start;
     assert!(
-        blocks_mock_mined > tenure_count,
-        "Should have mock mined at least `tenure_count` nakamoto blocks"
+        blocks_mock_mined >= tenure_count,
+        "Should have mock mined at least `tenure_count` nakamoto blocks. Mined = {}. Expected = {}",
+        blocks_mock_mined,
+        tenure_count,
     );
 
     // wait for follower to reach the chain tip