Merge branch 'develop' into fix/5193-stackerdb-decoherence

Author: jcnelson

stackslib/src/chainstate/coordinator/mod.rs

@@ -179,6 +179,7 @@ pub trait BlockEventDispatcher {
         pox_constants: &PoxConstants,
         reward_set_data: &Option<RewardSetData>,
         signer_bitvec: &Option<BitVec<4000>>,
+        block_timestamp: Option<u64>,
     );
 
     /// called whenever a burn block is about to be

stackslib/src/chainstate/coordinator/tests.rs

@@ -430,6 +430,7 @@ impl BlockEventDispatcher for NullEventDispatcher {
         _pox_constants: &PoxConstants,
         _reward_set_data: &Option<RewardSetData>,
         _signer_bitvec: &Option<BitVec<4000>>,
+        _block_timestamp: Option<u64>,
     ) {
         assert!(
             false,

stackslib/src/chainstate/nakamoto/mod.rs

@@ -2048,6 +2048,8 @@ impl NakamotoChainState {
 
         let signer_bitvec = (&next_ready_block).header.pox_treatment.clone();
 
+        let block_timestamp = next_ready_block.header.timestamp;
+
         // set stacks block accepted
         let mut sort_tx = sort_db.tx_handle_begin(canonical_sortition_tip)?;
         sort_tx.set_stacks_block_accepted(
@@ -2093,6 +2095,7 @@ impl NakamotoChainState {
                 &pox_constants,
                 &reward_set_data,
                 &Some(signer_bitvec),
+                Some(block_timestamp),
             );
         }
 

stackslib/src/chainstate/stacks/db/blocks.rs

@@ -190,6 +190,7 @@ impl BlockEventDispatcher for DummyEventDispatcher {
         _pox_constants: &PoxConstants,
         _reward_set_data: &Option<RewardSetData>,
         _signer_bitvec: &Option<BitVec<4000>>,
+        _block_timestamp: Option<u64>,
     ) {
         assert!(
             false,
@@ -6409,6 +6410,7 @@ impl StacksChainState {
                 &pox_constants,
                 &reward_set_data,
                 &None,
+                None,
             );
         }
 

stackslib/src/net/mod.rs

@@ -2034,6 +2034,7 @@ pub mod test {
             pox_constants: &PoxConstants,
             reward_set_data: &Option<RewardSetData>,
             _signer_bitvec: &Option<BitVec<4000>>,
+            _block_timestamp: Option<u64>,
         ) {
             self.blocks.lock().unwrap().push(TestEventObserverBlock {
                 block: block.clone(),

testnet/stacks-node/src/event_dispatcher.rs

@@ -594,6 +594,7 @@ impl EventObserver {
         pox_constants: &PoxConstants,
         reward_set_data: &Option<RewardSetData>,
         signer_bitvec_opt: &Option<BitVec<4000>>,
+        block_timestamp: Option<u64>,
     ) -> serde_json::Value {
         // Serialize events to JSON
         let serialized_events: Vec<serde_json::Value> = filtered_events
@@ -631,6 +632,7 @@ impl EventObserver {
         let mut payload = json!({
             "block_hash": format!("0x{}", block.block_hash),
             "block_height": metadata.stacks_block_height,
+            "block_time": block_timestamp,
             "burn_block_hash": format!("0x{}", metadata.burn_header_hash),
             "burn_block_height": metadata.burn_header_height,
             "miner_txid": format!("0x{}", winner_txid),
@@ -852,6 +854,7 @@ impl BlockEventDispatcher for EventDispatcher {
         pox_constants: &PoxConstants,
         reward_set_data: &Option<RewardSetData>,
         signer_bitvec: &Option<BitVec<4000>>,
+        block_timestamp: Option<u64>,
     ) {
         self.process_chain_tip(
             block,
@@ -869,6 +872,7 @@ impl BlockEventDispatcher for EventDispatcher {
             pox_constants,
             reward_set_data,
             signer_bitvec,
+            block_timestamp,
         );
     }
 
@@ -1051,6 +1055,7 @@ impl EventDispatcher {
         pox_constants: &PoxConstants,
         reward_set_data: &Option<RewardSetData>,
         signer_bitvec: &Option<BitVec<4000>>,
+        block_timestamp: Option<u64>,
     ) {
         let all_receipts = receipts.to_owned();
         let (dispatch_matrix, events) = self.create_dispatch_matrix_and_event_vector(&all_receipts);
@@ -1102,6 +1107,7 @@ impl EventDispatcher {
                         pox_constants,
                         reward_set_data,
                         signer_bitvec,
+                        block_timestamp,
                     );
 
                 // Send payload
@@ -1508,6 +1514,7 @@ mod test {
         let mblock_confirmed_consumed = ExecutionCost::zero();
         let pox_constants = PoxConstants::testnet_default();
         let signer_bitvec = BitVec::zeros(2).expect("Failed to create BitVec with length 2");
+        let block_timestamp = Some(123456);
 
         let payload = observer.make_new_block_processed_payload(
             filtered_events,
@@ -1525,6 +1532,7 @@ mod test {
             &pox_constants,
             &None,
             &Some(signer_bitvec.clone()),
+            block_timestamp,
         );
         assert_eq!(
             payload
@@ -1576,6 +1584,7 @@ mod test {
         let mblock_confirmed_consumed = ExecutionCost::zero();
         let pox_constants = PoxConstants::testnet_default();
         let signer_bitvec = BitVec::zeros(2).expect("Failed to create BitVec with length 2");
+        let block_timestamp = Some(123456);
 
         let payload = observer.make_new_block_processed_payload(
             filtered_events,
@@ -1593,6 +1602,7 @@ mod test {
             &pox_constants,
             &None,
             &Some(signer_bitvec.clone()),
+            block_timestamp,
         );
 
         let event_signer_signature = payload

testnet/stacks-node/src/run_loop/mod.rs

@@ -197,5 +197,6 @@ pub fn announce_boot_receipts(
         pox_constants,
         &None,
         &None,
+        None,
     );
 }

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -2272,9 +2272,18 @@ fn correct_burn_outs() {
         "Blocks should be sorted by cycle number already"
     );
 
+    let mut last_block_time = None;
     for block in new_blocks_with_reward_set.iter() {
         let cycle_number = block["cycle_number"].as_u64().unwrap();
         let reward_set = block["reward_set"].as_object().unwrap();
+        if let Some(block_time) = block["block_time"].as_u64() {
+            if let Some(last) = last_block_time {
+                assert!(block_time > last, "Block times should be increasing");
+            }
+            last_block_time = Some(block_time);
+        }
+        let cycle_number = block["cycle_number"].as_u64().unwrap();
+        let reward_set = block["reward_set"].as_object().unwrap();
 
         if cycle_number < first_epoch_3_cycle {
             assert!(