Merge branch 'fix/burn-view' of https://github.com/stacks-network/stacks-core into fix/burn-view

Author: jcnelson

CHANGELOG.md

@@ -5,19 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
-## [Unreleased]
+## [3.1.0.0.3]
 
 ### Added
 
 - Add `tenure_timeout_secs` to the miner for determining when a time-based tenure extend should be attempted.
 - Added configuration option `block_proposal_max_age_secs` under `[connection_options]` to prevent processing stale block proposals
 
 ### Changed
-- The RPC endpoint `/v3/block_proposal` no longer will evaluate block proposals more than `block_proposal_max_age_secs` old
 
+- The RPC endpoint `/v3/block_proposal` no longer will evaluate block proposals more than `block_proposal_max_age_secs` old
 - When a transaction is dropped due to replace-by-fee, the `/drop_mempool_tx` event observer payload now includes `new_txid`, which is the transaction that replaced this dropped transaction. When a transaction is dropped for other reasons, `new_txid` is `null`. [#5381](https://github.com/stacks-network/stacks-core/pull/5381)
 - Nodes will assume that all PoX anchor blocks exist by default, and stall initial block download indefinitely to await their arrival (#5502)
 
+### Fixed
+
+- Signers no longer accept messages for blocks from different reward cycles (#5662)
+
 ## [3.1.0.0.2]
 
 ### Added

stacks-signer/CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## Added
 
+## Changed
+
+## [3.1.0.0.3.0]
+
+## Added
+
 - Introduced the `block_proposal_max_age_secs` configuration option for signers, enabling them to automatically ignore block proposals that exceed the specified age in seconds.
 - When a new block proposal is received while the signer is waiting for an existing proposal to be validated, the signer will wait until the existing block is done validating before submitting the new one for validating. ([#5453](https://github.com/stacks-network/stacks-core/pull/5453))
 
@@ -24,6 +30,14 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 - Prevent old reward cycle signers from processing block validation response messages that do not apply to blocks from their cycle.
 
+# [3.1.0.0.2.1]
+
+## Added
+
+## Changed
+
+- Prevent old reward cycle signers from processing block validation response messages that do not apply to blocks from their cycle.
+
 ## [3.1.0.0.2.0]
 
 ## Added

stackslib/src/blockstack_cli.rs

@@ -864,7 +864,7 @@ fn main_handler(mut argv: Vec<String>) -> Result<String, CliError> {
         if let Some(custom_chain_id) = flag.split('=').nth(1) {
             // Attempt to parse the custom chain ID from hex
             chain_id = u32::from_str_radix(custom_chain_id.trim_start_matches("0x"), 16)
-                .map_err(|err| CliError::InvalidChainId(err))?;
+                .map_err(CliError::InvalidChainId)?;
         } else {
             // Use the default testnet chain ID
             chain_id = CHAIN_ID_TESTNET;

stackslib/src/burnchains/bitcoin/address.rs

@@ -591,10 +591,10 @@ impl BitcoinAddress {
         } else {
             BitcoinNetworkType::Testnet
         };
-        if let Some(addr) = BitcoinAddress::from_scriptpubkey(network_id, scriptpubkey) {
-            if let BitcoinAddress::Segwit(sw) = addr {
-                return Some(BitcoinAddress::Segwit(sw));
-            }
+        if let Some(BitcoinAddress::Segwit(sw)) =
+            BitcoinAddress::from_scriptpubkey(network_id, scriptpubkey)
+        {
+            return Some(BitcoinAddress::Segwit(sw));
         }
         return None;
     }

stackslib/src/burnchains/bitcoin/bits.rs

@@ -223,10 +223,7 @@ impl BitcoinTxInputStructured {
                         Instruction::Op(btc_opcodes::OP_CHECKMULTISIG),
                     ) => {
                         // op1 and op2 must be integers
-                        match (
-                            btc_opcodes::from(*op1).classify(),
-                            btc_opcodes::from(*op2).classify(),
-                        ) {
+                        match (op1.classify(), op2.classify()) {
                             (Class::PushNum(num_sigs), Class::PushNum(num_pubkeys)) => {
                                 // the "#instructions - 3" comes from the OP_m, OP_n, and OP_CHECKMULTISIG
                                 if num_sigs < 1

stackslib/src/burnchains/bitcoin/indexer.rs

@@ -503,13 +503,11 @@ impl BitcoinIndexer {
         start_block: u64,
         remove_old: bool,
     ) -> Result<SpvClient, btc_error> {
-        if remove_old {
-            if PathBuf::from(&reorg_headers_path).exists() {
-                fs::remove_file(&reorg_headers_path).map_err(|e| {
-                    error!("Failed to remove {}", reorg_headers_path);
-                    btc_error::Io(e)
-                })?;
-            }
+        if remove_old && PathBuf::from(&reorg_headers_path).exists() {
+            fs::remove_file(&reorg_headers_path).map_err(|e| {
+                error!("Failed to remove {}", reorg_headers_path);
+                btc_error::Io(e)
+            })?;
         }
 
         // bootstrap reorg client

stackslib/src/burnchains/bitcoin/spv.rs

@@ -328,13 +328,11 @@ impl SpvClient {
             } else {
                 return Err(btc_error::DBError(db_error::NoDBError));
             }
-        } else {
+        } else if readwrite {
             // can just open
-            if readwrite {
-                OpenFlags::SQLITE_OPEN_READ_WRITE
-            } else {
-                OpenFlags::SQLITE_OPEN_READ_ONLY
-            }
+            OpenFlags::SQLITE_OPEN_READ_WRITE
+        } else {
+            OpenFlags::SQLITE_OPEN_READ_ONLY
         };
 
         let mut conn = sqlite_open(headers_path, open_flags, false)

stackslib/src/burnchains/db.rs

@@ -393,7 +393,7 @@ impl BurnchainDBTransaction<'_> {
         let args = params![u64_to_sql(target_reward_cycle)?];
         self.sql_tx
             .execute(sql, args)
-            .map_err(|e| DBError::SqliteError(e))?;
+            .map_err(DBError::SqliteError)?;
 
         let sql = "UPDATE block_commit_metadata SET anchor_block = ?1 WHERE burn_block_hash = ?2 AND txid = ?3";
         let args = params![
@@ -424,7 +424,7 @@ impl BurnchainDBTransaction<'_> {
         self.sql_tx
             .execute(sql, args)
             .map(|_| ())
-            .map_err(|e| DBError::SqliteError(e))
+            .map_err(DBError::SqliteError)
     }
 
     /// Calculate a burnchain block's block-commits' descendancy information.

stackslib/src/burnchains/mod.rs

@@ -629,7 +629,7 @@ impl PoxConstants {
             // TODO: I *think* the logic of `== 0` here requires some further digging.
             //  `mod 0` may not have any rewards, but it does not behave like "prepare phase" blocks:
             //  is it already a member of reward cycle "N" where N = block_height / reward_cycle_len
-            reward_index == 0 || reward_index > u64::from(reward_cycle_length - prepare_length)
+            reward_index == 0 || reward_index > reward_cycle_length - prepare_length
         }
     }
 
@@ -658,7 +658,7 @@ impl PoxConstants {
         } else {
             let effective_height = block_height - first_block_height;
             let reward_index = effective_height % reward_cycle_length;
-            reward_index > u64::from(reward_cycle_length - prepare_length)
+            reward_index > reward_cycle_length - prepare_length
         }
     }
 

stackslib/src/burnchains/tests/affirmation.rs

@@ -351,29 +351,27 @@ pub fn make_reward_cycle_with_vote(
                 let append = if !burnchain.is_in_prepare_phase(block_commit.block_height) {
                     // non-prepare-phase commits always confirm their parent
                     true
+                } else if confirm_anchor_block {
+                    // all block-commits confirm anchor block
+                    true
                 } else {
-                    if confirm_anchor_block {
-                        // all block-commits confirm anchor block
+                    // fewer than anchor_threshold commits confirm anchor block
+                    let next_rc_start = burnchain.reward_cycle_to_block_height(
+                        burnchain
+                            .block_height_to_reward_cycle(block_commit.block_height)
+                            .unwrap()
+                            + 1,
+                    );
+                    if block_commit.block_height
+                        + (burnchain.pox_constants.anchor_threshold as u64)
+                        + 1
+                        < next_rc_start
+                    {
+                        // in first half of prepare phase, so confirm
                         true
                     } else {
-                        // fewer than anchor_threshold commits confirm anchor block
-                        let next_rc_start = burnchain.reward_cycle_to_block_height(
-                            burnchain
-                                .block_height_to_reward_cycle(block_commit.block_height)
-                                .unwrap()
-                                + 1,
-                        );
-                        if block_commit.block_height
-                            + (burnchain.pox_constants.anchor_threshold as u64)
-                            + 1
-                            < next_rc_start
-                        {
-                            // in first half of prepare phase, so confirm
-                            true
-                        } else {
-                            // in second half of prepare phase, so don't confirm
-                            false
-                        }
+                        // in second half of prepare phase, so don't confirm
+                        false
                     }
                 };
 
@@ -414,7 +412,7 @@ pub fn make_reward_cycle_with_vote(
             commits
                 .into_iter()
                 .flatten()
-                .map(|cmt| BlockstackOperationType::LeaderBlockCommit(cmt))
+                .map(BlockstackOperationType::LeaderBlockCommit)
                 .collect()
         };
 
@@ -1612,7 +1610,7 @@ fn test_update_pox_affirmation_maps_unique_anchor_block() {
         let cmt_ops: Vec<BlockstackOperationType> = cmts
             .iter()
             .filter_map(|op| op.clone())
-            .map(|op| BlockstackOperationType::LeaderBlockCommit(op))
+            .map(BlockstackOperationType::LeaderBlockCommit)
             .collect();
 
         burnchain_db