Merge pull request #7080 from stacks-network/release/3.4.0.0.1

wileyj · web-flow · commit eef1647d90c0 · 2026-04-06T05:39:31.000Z
Release/3.4.0.0.1 into master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ 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).
 
+## [3.4.0.0.1]
+
+### Fixed
+
+- Fix a bug that could cause genesis sync to stall forever due to a slow path in computing the canonical Stacks tip getting triggerred when the Stacks tip is significantly behind the sortition tip.
+- Validate PoX addresses.
+- Fix the 3.4 activation height in sample testnet configs.
+
 ## [3.4.0.0.0]
 
 ### Added
diff --git a/changelog.d/7000-genesis-sync-stuck.fixed b/changelog.d/7000-genesis-sync-stuck.fixed
diff --git a/sample/conf/testnet-follower-conf.toml b/sample/conf/testnet-follower-conf.toml
@@ -115,4 +115,4 @@ start_height = 109280
 
 [[burnchain.epochs]]
 epoch_name = "3.4"
-start_height = 159645
+start_height = 159350
diff --git a/sample/conf/testnet-miner-conf.toml b/sample/conf/testnet-miner-conf.toml
@@ -150,4 +150,4 @@ start_height = 109280
 
 [[burnchain.epochs]]
 epoch_name = "3.4"
-start_height = 159645
+start_height = 159350
diff --git a/sample/conf/testnet-signer.toml b/sample/conf/testnet-signer.toml
@@ -118,4 +118,4 @@ start_height = 109280
 
 [[burnchain.epochs]]
 epoch_name = "3.4"
-start_height = 159645
+start_height = 159350
diff --git a/stacks-node/src/tests/nakamoto_integrations.rs b/stacks-node/src/tests/nakamoto_integrations.rs
@@ -767,6 +767,10 @@ where
     Ok(())
 }
 
+/// Wait until check returns Ok(true), if check ever returns an Err(), this
+///  method will immediately return that Err().
+///
+/// After timeout_seconds have passed, this function returns `Err("Timed out")`
 pub fn wait_for<F>(timeout_secs: u64, mut check: F) -> Result<(), String>
 where
     F: FnMut() -> Result<bool, String>,
diff --git a/stacks-node/src/tests/signer/mod.rs b/stacks-node/src/tests/signer/mod.rs
@@ -1794,6 +1794,7 @@ fn setup_stx_btc_node<G: FnMut(&mut NeonConfig)>(
             EventKeyType::BlockProposal,
             EventKeyType::MinedBlocks,
             EventKeyType::BurnchainBlocks,
+            EventKeyType::MemPoolTransactions,
         ],
         timeout_ms: 1000,
         disable_retries: false,
diff --git a/stacks-signer/src/client/stacks_client.rs b/stacks-signer/src/client/stacks_client.rs
@@ -473,6 +473,11 @@ impl StacksClient {
         &self,
         reward_cycle: u64,
     ) -> Result<Option<Vec<NakamotoSignerEntry>>, ClientError> {
+        Ok(self.get_reward_set(reward_cycle)?.stacker_set.signers)
+    }
+
+    /// Get the reward set signers from the stacks node for the given reward cycle
+    pub fn get_reward_set(&self, reward_cycle: u64) -> Result<GetStackersResponse, ClientError> {
         debug!("StacksClient: Getting reward set signers";
             "reward_cycle" => reward_cycle,
         );
@@ -506,7 +511,7 @@ impl StacksClient {
         let stackers_response =
             retry_with_exponential_backoff::<_, ClientError, GetStackersResponse>(send_request)?;
         timer.stop_and_record();
-        Ok(stackers_response.stacker_set.signers)
+        Ok(stackers_response)
     }
 
     /// Retrieve the current pox data from the stacks node
diff --git a/stackslib/src/chainstate/nakamoto/miner.rs b/stackslib/src/chainstate/nakamoto/miner.rs
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use clarity::vm::clarity::ClarityError;
 use clarity::vm::costs::ExecutionCost;
 use stacks_common::types::chainstate::{
     BlockHeaderHash, BurnchainHeaderHash, ConsensusHash, StacksBlockId,
@@ -853,13 +854,12 @@ impl BlockBuilder for NakamotoBlockBuilder {
         };
 
         let quiet = !cfg!(test);
+        let is_mainnet = clarity_tx.config.mainnet;
         let result = {
             // preemptively skip problematic transactions
-            if let Err(e) = Relayer::static_check_problematic_relayed_tx(
-                clarity_tx.config.mainnet,
-                clarity_tx.get_epoch(),
-                tx,
-            ) {
+            if let Err(e) =
+                Relayer::static_check_problematic_relayed_tx(is_mainnet, clarity_tx.get_epoch(), tx)
+            {
                 info!(
                     "Detected problematic tx {} while mining; dropping from mempool",
                     tx.txid()
@@ -874,6 +874,19 @@ impl BlockBuilder for NakamotoBlockBuilder {
                 quiet,
                 max_execution_time,
                 |receipt| {
+                    if !receipt.post_condition_aborted {
+                        let all_events_valid = receipt.events.iter().all(|event| {
+                            crate::net::api::postblock_proposal::is_event_pox_addr_valid(
+                                is_mainnet, event,
+                            )
+                        });
+                        if !all_events_valid {
+                            return Err(Error::ClarityError(ClarityError::BadTransaction(
+                                "All PoX events were not valid".into(),
+                            )));
+                        }
+                    };
+
                     let size = receipt.size().ok_or_else(|| {
                         Error::InvalidStacksBlock("Could not calculate receipt size".into())
                     })?;
diff --git a/stackslib/src/chainstate/nakamoto/signer_set.rs b/stackslib/src/chainstate/nakamoto/signer_set.rs
@@ -61,9 +61,10 @@ impl RawRewardSetEntry {
         })?;
 
         let reward_address = PoxAddress::try_from_pox_tuple(is_mainnet, &pox_addr_tuple)
-            .ok_or_else(|| {
-                ChainstateError::Expects(format!("not a valid PoX address: {pox_addr_tuple}"))
-            })?;
+            .unwrap_or_else(|| {
+                warn!("Invalid PoX address supplied, replacing with burn address"; "pox_addr_tuple" => %pox_addr_tuple);
+                PoxAddress::standard_burn_address(is_mainnet)
+            });
 
         let total_ustx = tuple_data
             .remove("total-ustx")
diff --git a/stackslib/src/net/api/postblock_proposal.rs b/stackslib/src/net/api/postblock_proposal.rs
@@ -22,6 +22,9 @@ use std::thread::{self, JoinHandle};
 use std::time::{Duration, Instant};
 
 use clarity::vm::costs::ExecutionCost;
+use clarity::vm::events::StacksTransactionEvent;
+use clarity::vm::types::{ResponseData, TupleData};
+use clarity::vm::Value;
 use regex::{Captures, Regex};
 use serde::Deserialize;
 use stacks_common::codec::{Error as CodecError, StacksMessageCodec, MAX_PAYLOAD_LEN};
@@ -35,6 +38,8 @@ use stacks_common::util::tests::TestFlag;
 use crate::chainstate::burn::db::sortdb::{SortitionDB, SortitionHandleConn};
 use crate::chainstate::nakamoto::miner::{MinerTenureInfoCause, NakamotoBlockBuilder};
 use crate::chainstate::nakamoto::{NakamotoBlock, NakamotoChainState, NAKAMOTO_BLOCK_VERSION};
+use crate::chainstate::stacks::address::PoxAddress;
+use crate::chainstate::stacks::boot::PoxVersions;
 use crate::chainstate::stacks::db::{StacksBlockHeaderTypes, StacksChainState, StacksHeaderInfo};
 use crate::chainstate::stacks::miner::{
     BlockBuilder, BlockLimitFunction, TransactionError, TransactionProblematic, TransactionResult,
@@ -260,6 +265,74 @@ pub struct NakamotoBlockProposal {
     pub replay_txs: Option<Vec<StacksTransaction>>,
 }
 
+fn match_result_ok(value: &Value) -> Option<&Value> {
+    let Value::Response(ResponseData { committed, data }) = value else {
+        return None;
+    };
+    if !committed {
+        return None;
+    }
+    Some(data.as_ref())
+}
+
+fn match_tuple(value: &Value) -> Option<&TupleData> {
+    if let Value::Tuple(data) = value {
+        Some(data)
+    } else {
+        None
+    }
+}
+
+pub fn is_event_pox_addr_valid(is_mainnet: bool, event: &StacksTransactionEvent) -> bool {
+    let StacksTransactionEvent::SmartContractEvent(event) = event else {
+        // only smart contract events are relevant, so everything else is "okay"
+        return true;
+    };
+    if !event.key.0.is_boot() {
+        // only boot code events are relevant, so everything else is "okay"
+        return true;
+    }
+    if event.key.0.name.as_str() != PoxVersions::Pox4.get_name_str() {
+        // only pox events are relevant
+        return true;
+    }
+    if &event.key.1 != "print" {
+        // only look at print events
+        return true;
+    }
+    let Some(pox_event_tuple) = match_result_ok(&event.value) else {
+        // only care about (okay ...) results
+        return true;
+    };
+    let Some(outer_tuple_data) = match_tuple(&pox_event_tuple) else {
+        // should be unreachable
+        return true;
+    };
+    let Ok(data_tuple) = outer_tuple_data.get("data") else {
+        // should be unreachable
+        return true;
+    };
+    let Some(data_tuple_data) = match_tuple(&data_tuple) else {
+        // should be unreachable
+        return true;
+    };
+    let Ok(pox_addr_tuple) = data_tuple_data.get("pox-addr") else {
+        // should be unreachable
+        return true;
+    };
+
+    let pox_addr_value = if let Value::Optional(data) = pox_addr_tuple {
+        match data.data {
+            None => return true,
+            Some(ref inner) => inner.as_ref(),
+        }
+    } else {
+        pox_addr_tuple
+    };
+
+    PoxAddress::try_from_pox_tuple(is_mainnet, pox_addr_value).is_some()
+}
+
 impl NakamotoBlockProposal {
     fn spawn_validation_thread(
         self,
@@ -646,7 +719,18 @@ impl NakamotoBlockProposal {
                 &mut receipts_total,
             );
             let err = match tx_result {
-                TransactionResult::Success(_) => Ok(()),
+                TransactionResult::Success(success_result) => {
+                    let all_events_valid = success_result
+                        .receipt
+                        .events
+                        .iter()
+                        .all(|event| is_event_pox_addr_valid(mainnet, event));
+                    if !all_events_valid {
+                        Err(format!("Found an offending transaction: {i}"))
+                    } else {
+                        Ok(())
+                    }
+                }
                 TransactionResult::Skipped(s) => Err(format!("tx {i} skipped: {}", s.error)),
                 TransactionResult::ProcessingError(e) => {
                     Err(format!("Error processing tx {i}: {}", e.error))
diff --git a/versions.toml b/versions.toml
@@ -1,4 +1,4 @@
 # Update these values when a new release is created.
 # `stacks-common/build.rs` will automatically update `versions.rs` with these values.
-stacks_node_version = "3.4.0.0.0"
-stacks_signer_version = "3.4.0.0.0.0"
+stacks_node_version = "3.4.0.0.1"
+stacks_signer_version = "3.4.0.0.1.0"
