reverted old code

Author: rdeioris

stacks-node/src/tests/nakamoto_integrations.rs

@@ -12647,11 +12647,6 @@ fn test_sip_031_activation() {
         return;
     }
 
-    // skip the test til we move to epoch 3.2
-    if StacksEpochId::latest() != StacksEpochId::Epoch32 {
-        //return;
-    }
-
     let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
     naka_conf.node.pox_sync_sample_secs = 180;
     naka_conf.burnchain.max_rbf = 10_000_000;
@@ -12764,11 +12759,6 @@ fn test_sip_031_activation() {
         {
             break;
         }
-
-        for block in test_observer::get_blocks().iter().rev() {
-            println!("BLOCK {:?}", block);
-            //let events = block.get("events").unwrap().as_array().unwrap();
-        }
     }
 
     info!(

stackslib/src/chainstate/nakamoto/mod.rs

@@ -713,15 +713,15 @@ fn get_sip_031_emission_schedule(mainnet: bool) -> Vec<SIP031EmissionInterval> {
 impl SIP031EmissionInterval {
     /// Look up the amount of STX to emit at the start of the tenure at the specified height.
     /// Precondition: `intervals` must be sorted in descending order by `start_height`
-    pub fn get_sip_031_emission_at_height(height: u64, mainnet: bool) -> u128 {
+    pub fn get_sip_031_emission_at_height(burn_height: u64, mainnet: bool) -> u128 {
         let intervals = get_sip_031_emission_schedule(mainnet);
 
         if intervals.is_empty() {
             return 0;
         }
 
         for interval in intervals {
-            if height >= interval.start_height {
+            if burn_height >= interval.start_height {
                 return interval.amount;
             }
         }
@@ -732,11 +732,11 @@ impl SIP031EmissionInterval {
 
     /// Verify that a list of intervals is sorted in descending order by `start_height`
     pub fn check_inversed_order(intervals: &[SIP031EmissionInterval]) -> bool {
-        if intervals.len() < 2 {
+        let Some(mut ht) = intervals.first().map(|x| x.start_height) else {
+            // if the interval list is empty, its sorted
             return true;
-        }
+        };
 
-        let mut ht = intervals[0].start_height;
         for interval in intervals.iter().skip(1) {
             if interval.start_height > ht {
                 return false;
@@ -4216,8 +4216,6 @@ impl NakamotoChainState {
             "parent_header_hash" => %parent_header_hash,
         );
 
-        let evaluated_epoch = clarity_tx.get_epoch();
-
         if new_tenure {
             clarity_tx
                 .connection()
@@ -4239,6 +4237,8 @@ impl NakamotoChainState {
                 })?;
         }
 
+        let evaluated_epoch = clarity_tx.get_epoch();
+
         let auto_unlock_events = if evaluated_epoch >= StacksEpochId::Epoch21 {
             let unlock_events = StacksChainState::check_and_handle_reward_start(
                 burn_header_height.into(),

stackslib/src/core/mod.rs

@@ -105,7 +105,7 @@ pub const BITCOIN_MAINNET_STACKS_30_BURN_HEIGHT: u64 = 867_867;
 /// This is Epoch-3.1, activation height proposed in SIP-029
 pub const BITCOIN_MAINNET_STACKS_31_BURN_HEIGHT: u64 = 875_000;
 /// This is Epoch-3.2, activation height proposed in SIP-031 (placeholder for now)
-pub const BITCOIN_MAINNET_STACKS_32_BURN_HEIGHT: u64 = u64::MAX;
+pub const BITCOIN_MAINNET_STACKS_32_BURN_HEIGHT: u64 = 907_740;
 
 /// Bitcoin mainline testnet3 activation heights.
 /// TODO: No longer used since testnet3 is dead, so remove.