CRC and fix test compilatation after merge

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

.github/workflows/bitcoin-tests.yml

@@ -146,8 +146,8 @@ jobs:
           - tests::signer::v0::single_miner_empty_sortition
           - tests::signer::v0::multiple_miners_empty_sortition
           - tests::signer::v0::block_proposal_timeout
+          - tests::signer::v0::reorg_attempts_count_towards_miner_validity
           - tests::signer::v0::reorg_attempts_activity_timeout_exceeded
-          - tests::signer::v0::late_reorg_attempts_do_not_count_towards_miner_validity
           - tests::signer::v0::allow_reorg_within_first_proposal_burn_block_timing_secs
           - tests::nakamoto_integrations::burn_ops_integration_test
           - tests::nakamoto_integrations::check_block_heights

stacks-signer/src/chainstate.rs

@@ -124,8 +124,8 @@ pub struct ProposalEvalConfig {
     pub tenure_last_block_proposal_timeout: Duration,
     /// How much idle time must pass before allowing a tenure extend
     pub tenure_idle_timeout: Duration,
-    /// Time following a block's global acceptance that a signer will consider an attempt by a miner to reorg the block
-    /// as valid towards miner activity
+    /// Time following the last block of the previous tenure's global acceptance that a signer will consider an attempt by
+    /// the new miner to reorg it as valid towards miner activity
     pub reorg_attempts_activity_timeout: Duration,
 }
 
@@ -574,10 +574,9 @@ impl SortitionsView {
                     "proposed_chain_length" => block.header.chain_length,
                     "expected_at_least" => info.block.header.chain_length + 1,
                 );
-                if info.signed_group.unwrap_or(get_epoch_time_secs())
-                    + reorg_attempts_activity_timeout.as_secs()
-                    > get_epoch_time_secs()
-                {
+                if info.signed_group.map_or(true, |signed_time| {
+                    signed_time + reorg_attempts_activity_timeout.as_secs() > get_epoch_time_secs()
+                }) {
                     // Note if there is no signed_group time, this is a locally accepted block (i.e. tenure_last_block_proposal_timeout has not been exceeded).
                     // Treat any attempt to reorg a locally accepted block as valid miner activity.
                     // If the call returns a globally accepted block, check its globally accepted time against a quarter of the block_proposal_timeout

stacks-signer/src/config.rs

@@ -142,8 +142,8 @@ pub struct SignerConfig {
     pub tenure_idle_timeout: Duration,
     /// The maximum age of a block proposal in seconds that will be processed by the signer
     pub block_proposal_max_age_secs: u64,
-    /// Time following a block's global acceptance that a signer will consider an attempt by a miner to reorg the block
-    /// as valid towards miner activity
+    /// Time following the last block of the previous tenure's global acceptance that a signer will consider an attempt by
+    /// the new miner to reorg it as valid towards miner activity
     pub reorg_attempts_activity_timeout: Duration,
 }
 
@@ -185,8 +185,8 @@ pub struct GlobalConfig {
     pub tenure_idle_timeout: Duration,
     /// The maximum age of a block proposal that will be processed by the signer
     pub block_proposal_max_age_secs: u64,
-    /// Time following a block's global acceptance that a signer will consider an attempt by a miner to reorg the block
-    /// as valid towards miner activity
+    /// Time following the last block of the previous tenure's global acceptance that a signer will consider an attempt by
+    /// the new miner to reorg it as valid towards miner activity
     pub reorg_attempts_activity_timeout: Duration,
 }
 

stacks-signer/src/signerdb.rs

@@ -774,7 +774,7 @@ impl SignerDb {
 
     /// Return whether there was signed block in a tenure (identified by its consensus hash)
     pub fn has_signed_block_in_tenure(&self, tenure: &ConsensusHash) -> Result<bool, DBError> {
-        let query = "SELECT block_info FROM blocks WHERE consensus_hash = ? AND signed_over = 1 ORDER BY stacks_height DESC LIMIT 1";
+        let query = "SELECT block_info FROM blocks WHERE consensus_hash = ? AND signed_over = 1 DESC LIMIT 1";
         let result: Option<String> = query_row(&self.db, query, [tenure])?;
 
         Ok(result.is_some())

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

@@ -11410,7 +11410,7 @@ fn reorg_attempts_activity_timeout_exceeded() {
 
     info!("------------------------- Test Setup -------------------------");
     let num_signers = 5;
-    let sender_sk = Secp256k1PrivateKey::new();
+    let sender_sk = Secp256k1PrivateKey::random();
     let sender_addr = tests::to_addr(&sender_sk);
     let send_amt = 100;
     let send_fee = 180;