fix: broadcast events for "stale" chunks

Author: kantai

stackslib/src/net/relay.rs

@@ -2497,6 +2497,12 @@ impl Relayer {
                 let tx = self.stacker_dbs.tx_begin(config.clone())?;
                 for sync_result in sync_results.into_iter() {
                     for chunk in sync_result.chunks_to_store.into_iter() {
+                        if let Some(event_list) = all_events.get_mut(&sync_result.contract_id) {
+                            event_list.push(chunk.clone());
+                        } else {
+                            all_events.insert(sync_result.contract_id.clone(), vec![chunk.clone()]);
+                        }
+
                         let md = chunk.get_slot_metadata();
                         if let Err(e) = tx.try_replace_chunk(&sc, &md, &chunk.data) {
                             if matches!(e, Error::StaleChunk { .. }) {
@@ -2525,11 +2531,6 @@ impl Relayer {
                             debug!("Stored chunk"; "stackerdb_contract_id" => %sync_result.contract_id, "slot_id" => md.slot_id, "slot_version" => md.slot_version);
                         }
 
-                        if let Some(event_list) = all_events.get_mut(&sync_result.contract_id) {
-                            event_list.push(chunk.clone());
-                        } else {
-                            all_events.insert(sync_result.contract_id.clone(), vec![chunk.clone()]);
-                        }
                         let msg = StacksMessageType::StackerDBPushChunk(StackerDBPushChunkData {
                             contract_id: sc.clone(),
                             rc_consensus_hash: rc_consensus_hash.clone(),

stackslib/src/net/stackerdb/db.rs

@@ -25,7 +25,6 @@ use stacks_common::util::get_epoch_time_secs;
 use stacks_common::util::hash::Sha512Trunc256Sum;
 use stacks_common::util::secp256k1::MessageSignature;
 
-use super::StackerDBEventDispatcher;
 use crate::net::stackerdb::{StackerDBConfig, StackerDBTx, StackerDBs, STACKERDB_INV_MAX};
 use crate::net::{Error as net_error, StackerDBChunkData};
 use crate::util_lib::db::{
@@ -396,20 +395,6 @@ impl StackerDBTx<'_> {
         Ok(())
     }
 
-    /// Try to upload a chunk to the StackerDB instance, notifying
-    ///  and subscribed listeners via the `dispatcher`
-    pub fn put_chunk<ED: StackerDBEventDispatcher>(
-        self,
-        contract: &QualifiedContractIdentifier,
-        chunk: StackerDBChunkData,
-        dispatcher: &ED,
-    ) -> Result<(), net_error> {
-        self.try_replace_chunk(contract, &chunk.get_slot_metadata(), &chunk.data)?;
-        self.commit()?;
-        dispatcher.new_stackerdb_chunks(contract.clone(), vec![chunk]);
-        Ok(())
-    }
-
     /// Add or replace a chunk for a given reward cycle, if it is valid
     /// Otherwise, this errors out with Error::StaleChunk
     pub fn try_replace_chunk(

testnet/stacks-node/src/tests/signer/v0.rs

@@ -105,8 +105,8 @@ use crate::event_dispatcher::{
     EventObserver, MinedNakamotoBlockEvent, TEST_SKIP_BLOCK_ANNOUNCEMENT,
 };
 use crate::nakamoto_node::miner::{
-    TEST_BLOCK_ANNOUNCE_STALL, TEST_BLOCK_PUSH_SKIP, TEST_BROADCAST_PROPOSAL_STALL,
-    TEST_MINE_STALL, TEST_P2P_BROADCAST_STALL,
+    TEST_BLOCK_ANNOUNCE_STALL, TEST_BROADCAST_PROPOSAL_STALL, TEST_MINE_STALL,
+    TEST_P2P_BROADCAST_STALL,
 };
 use crate::nakamoto_node::stackerdb_listener::TEST_IGNORE_SIGNERS;
 use crate::neon::{Counters, RunLoopCounter};
@@ -17374,8 +17374,6 @@ fn bitcoin_reorg_extended_tenure() {
 
     miners.wait_for_chains(60);
 
-    thread::sleep(Duration::from_secs(5));
-
     // stall p2p broadcast and signer block announcements
     //  so that we can ensure all the signers approve the proposal
     //  before it gets accepted by stacks-nodes