Merge branch 'develop' into test/allow_reorg_within_first_proposal_burn_block_timing_secs

Author: obycode

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/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/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/db.rs

@@ -1316,38 +1316,30 @@ fn test_classify_delegate_stx() {
         "Only one delegate_stx op should have been accepted"
     );
 
-    let expected_pre_delegate_addr = StacksAddress::from_legacy_bitcoin_address(
-        &LegacyBitcoinAddress {
+    let expected_pre_delegate_addr =
+        StacksAddress::from_legacy_bitcoin_address(&LegacyBitcoinAddress {
             addrtype: LegacyBitcoinAddressType::PublicKeyHash,
             network_id: BitcoinNetworkType::Mainnet,
             bytes: Hash160([1; 20]),
-        }
-        .into(),
-    );
+        });
 
     let expected_delegate_addr = PoxAddress::Standard(
-        StacksAddress::from_legacy_bitcoin_address(
-            &LegacyBitcoinAddress {
-                addrtype: LegacyBitcoinAddressType::PublicKeyHash,
-                network_id: BitcoinNetworkType::Mainnet,
-                bytes: Hash160([2; 20]),
-            }
-            .into(),
-        ),
+        StacksAddress::from_legacy_bitcoin_address(&LegacyBitcoinAddress {
+            addrtype: LegacyBitcoinAddressType::PublicKeyHash,
+            network_id: BitcoinNetworkType::Mainnet,
+            bytes: Hash160([2; 20]),
+        }),
         Some(AddressHashMode::SerializeP2PKH),
     );
 
     let expected_reward_addr = Some((
         1,
         PoxAddress::Standard(
-            StacksAddress::from_legacy_bitcoin_address(
-                &LegacyBitcoinAddress {
-                    addrtype: LegacyBitcoinAddressType::PublicKeyHash,
-                    network_id: BitcoinNetworkType::Mainnet,
-                    bytes: Hash160([1; 20]),
-                }
-                .into(),
-            ),
+            StacksAddress::from_legacy_bitcoin_address(&LegacyBitcoinAddress {
+                addrtype: LegacyBitcoinAddressType::PublicKeyHash,
+                network_id: BitcoinNetworkType::Mainnet,
+                bytes: Hash160([1; 20]),
+            }),
             Some(AddressHashMode::SerializeP2PKH),
         ),
     ));

stackslib/src/chainstate/coordinator/mod.rs

@@ -1238,8 +1238,8 @@ impl<
                             continue;
                         }
                         Err(e) => {
-                            error!("Failed to query affirmation map: {:?}", &e);
-                            return Err(e.into());
+                            error!("Failed to query affirmation map: {e:?}");
+                            return Err(e);
                         }
                     };
 

stackslib/src/chainstate/coordinator/tests.rs

@@ -4736,7 +4736,7 @@ fn atlas_stop_start() {
                     TransactionVersion::Testnet,
                     TransactionAuth::from_p2pkh(&signer_sk).unwrap(),
                     TransactionPayload::ContractCall(TransactionContractCall {
-                        address: signer_pk.clone().into(),
+                        address: signer_pk.clone(),
                         contract_name: atlas_name.clone(),
                         function_name: "make-attach".into(),
                         function_args: vec![Value::buff_from(vec![ix; 20]).unwrap()],

stackslib/src/chainstate/nakamoto/mod.rs

@@ -4511,7 +4511,7 @@ impl NakamotoChainState {
             Ok((block_fees, _block_burns, txs_receipts)) => (block_fees, txs_receipts),
         };
 
-        tx_receipts.extend(txs_receipts.into_iter());
+        tx_receipts.extend(txs_receipts);
 
         let total_tenure_cost = clarity_tx.cost_so_far();
         let mut block_execution_cost = total_tenure_cost.clone();
@@ -4655,10 +4655,8 @@ impl NakamotoChainState {
         let new_block_id = new_tip.index_block_hash();
         chainstate_tx.log_transactions_processed(&new_block_id, &tx_receipts);
 
-        let reward_cycle = pox_constants.block_height_to_reward_cycle(
-            first_block_height.into(),
-            chain_tip_burn_header_height.into(),
-        );
+        let reward_cycle = pox_constants
+            .block_height_to_reward_cycle(first_block_height, chain_tip_burn_header_height.into());
 
         // store the reward set calculated during this block if it happened
         // NOTE: miner and proposal evaluation should not invoke this because
@@ -4669,14 +4667,14 @@ impl NakamotoChainState {
             Self::write_reward_set(chainstate_tx, &new_block_id, &signer_calculation.reward_set)?;
 
             let cycle_number = if let Some(cycle) = pox_constants.reward_cycle_of_prepare_phase(
-                first_block_height.into(),
+                first_block_height,
                 chain_tip_burn_header_height.into(),
             ) {
                 Some(cycle)
             } else {
                 pox_constants
                     .block_height_to_reward_cycle(
-                        first_block_height.into(),
+                        first_block_height,
                         chain_tip_burn_header_height.into(),
                     )
                     .map(|cycle| cycle + 1)

stackslib/src/chainstate/nakamoto/shadow.rs

@@ -901,17 +901,17 @@ pub fn process_shadow_block(
         ) {
             Ok(receipt_opt) => receipt_opt,
             Err(ChainstateError::InvalidStacksBlock(msg)) => {
-                warn!("Encountered invalid block: {}", &msg);
+                warn!("Encountered invalid block: {msg}");
                 continue;
             }
             Err(ChainstateError::NetError(NetError::DeserializeError(msg))) => {
                 // happens if we load a zero-sized block (i.e. an invalid block)
-                warn!("Encountered invalid block (codec error): {}", &msg);
+                warn!("Encountered invalid block (codec error): {msg}");
                 continue;
             }
             Err(e) => {
                 // something else happened
-                return Err(e.into());
+                return Err(e);
             }
         };
 

stackslib/src/chainstate/nakamoto/tests/node.rs

@@ -1005,7 +1005,7 @@ impl TestStacksNode {
         }
         Ok(blocks
             .into_iter()
-            .zip(all_malleablized_blocks.into_iter())
+            .zip(all_malleablized_blocks)
             .map(|((blk, sz, cost), mals)| (blk, sz, cost, mals))
             .collect())
     }