Merge pull request #4187 from stacks-network/feat/interim-mining

Nakamoto-Node: Support for interim block mining

.github/workflows/bitcoin-tests.yml

@@ -70,6 +70,7 @@ jobs:
           - tests::neon_integrations::use_latest_tip_integration_test
           - tests::should_succeed_handling_malformed_and_valid_txs
           - tests::nakamoto_integrations::simple_neon_integration
+          - tests::nakamoto_integrations::mine_multiple_per_tenure_integration
     steps:
       ## Setup test environment
       - name: Setup Test Environment

stacks-signer/src/runloop.rs

@@ -2,7 +2,6 @@ use std::collections::VecDeque;
 use std::sync::mpsc::Sender;
 use std::time::Duration;
 
-use backoff::default;
 use libsigner::{SignerRunLoop, StackerDBChunksEvent};
 use slog::{slog_debug, slog_error, slog_info, slog_warn};
 use stacks_common::{debug, error, info, warn};

stackslib/src/burnchains/bitcoin/indexer.rs

@@ -18,7 +18,7 @@ use std::convert::TryFrom;
 use std::net::Shutdown;
 use std::ops::{Deref, DerefMut};
 use std::path::PathBuf;
-use std::sync::atomic::AtomicBool;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 use std::{cmp, fs, net, path, time};
@@ -339,6 +339,12 @@ impl BitcoinIndexer {
         let mut initiated = false;
 
         while keep_going {
+            if let Some(ref should_keep_running) = self.should_keep_running {
+                if !should_keep_running.load(Ordering::SeqCst) {
+                    return Err(btc_error::TimedOut);
+                }
+            }
+
             if do_handshake {
                 debug!("(Re)establish peer connection");