Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: event emitter will now emit new_txid in-case a tx replaces another #5381

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
+61 −16
Open

feat: event emitter will now emit new_txid in-case a tx replaces another #5381

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40059a5
Merge pull request #5376 from stacks-network/chore/merge_release_to_m…
wileyj Oct 24, 2024
92627cf
feat: event emitter will now emit new_txid in-case a tx replaces another
usagi32 Oct 24, 2024
ce9fb34
Merge branch 'develop' into feat/replacement_tx_id
jcnelson Nov 8, 2024
82c8701
chore: formatting
obycode Nov 21, 2024
0af0023
Merge branch 'develop' into feat/replacement_tx_id
obycode Nov 21, 2024
7329461
fix: Builds again after merging `develop`
jbencin Nov 25, 2024
91f2a32
Merge branch `stacks/develop` into `feat/replacement_tx_id`
jbencin Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions stackslib/src/chainstate/stacks/miner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,8 +1406,8 @@ impl<'a> StacksMicroblockBuilder<'a> {
self.runtime.num_mined = num_txs;

mem_pool.drop_txs(&invalidated_txs)?;
event_dispatcher.mempool_txs_dropped(invalidated_txs, MemPoolDropReason::TOO_EXPENSIVE);
event_dispatcher.mempool_txs_dropped(to_drop_and_blacklist, MemPoolDropReason::PROBLEMATIC);
event_dispatcher.mempool_txs_dropped(invalidated_txs, None, MemPoolDropReason::TOO_EXPENSIVE);
event_dispatcher.mempool_txs_dropped(to_drop_and_blacklist, None, MemPoolDropReason::PROBLEMATIC);

if blocked {
debug!(
Expand Down Expand Up @@ -2505,8 +2505,8 @@ impl StacksBlockBuilder {
mempool.drop_txs(&invalidated_txs)?;

if let Some(observer) = event_observer {
observer.mempool_txs_dropped(invalidated_txs, MemPoolDropReason::TOO_EXPENSIVE);
observer.mempool_txs_dropped(to_drop_and_blacklist, MemPoolDropReason::PROBLEMATIC);
observer.mempool_txs_dropped(invalidated_txs, None, MemPoolDropReason::TOO_EXPENSIVE);
observer.mempool_txs_dropped(to_drop_and_blacklist, None, MemPoolDropReason::PROBLEMATIC);
}

if let Err(e) = result {
Expand Down
6 changes: 3 additions & 3 deletions stackslib/src/core/mempool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ pub trait ProposalCallbackReceiver: Send {

pub trait MemPoolEventDispatcher {
fn get_proposal_callback_receiver(&self) -> Option<Box<dyn ProposalCallbackReceiver>>;
fn mempool_txs_dropped(&self, txids: Vec<Txid>, reason: MemPoolDropReason);
fn mempool_txs_dropped(&self, txids: Vec<Txid>, new_txid: Option<Txid>, reason: MemPoolDropReason);
fn mined_block_event(
&self,
target_burn_height: u64,
Expand Down Expand Up @@ -2222,7 +2222,7 @@ impl MemPoolDB {

// broadcast drop event if a tx is being replaced
if let (Some(prior_tx), Some(event_observer)) = (prior_tx, event_observer) {
event_observer.mempool_txs_dropped(vec![prior_tx.txid], replace_reason);
event_observer.mempool_txs_dropped(vec![prior_tx.txid], Some(txid), replace_reason);
};

Ok(())
Expand Down Expand Up @@ -2290,7 +2290,7 @@ impl MemPoolDB {
if let Some(event_observer) = event_observer {
let sql = "SELECT txid FROM mempool WHERE height < ?1";
let txids = query_rows(tx, sql, args)?;
event_observer.mempool_txs_dropped(txids, MemPoolDropReason::STALE_COLLECT);
event_observer.mempool_txs_dropped(txids, None, MemPoolDropReason::STALE_COLLECT);
}

let sql = "DELETE FROM mempool WHERE height < ?1";
Expand Down
28 changes: 20 additions & 8 deletions testnet/stacks-node/src/event_dispatcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,9 +951,9 @@ impl ProposalCallbackReceiver for ProposalCallbackHandler {
}

impl MemPoolEventDispatcher for EventDispatcher {
fn mempool_txs_dropped(&self, txids: Vec<Txid>, reason: MemPoolDropReason) {
fn mempool_txs_dropped(&self, txids: Vec<Txid>, new_txid: Option<Txid>, reason: MemPoolDropReason) {
if !txids.is_empty() {
self.process_dropped_mempool_txs(txids, reason)
self.process_dropped_mempool_txs(txids, new_txid, reason)
}
}

Expand Down Expand Up @@ -1572,7 +1572,7 @@ impl EventDispatcher {
}
}

pub fn process_dropped_mempool_txs(&self, txs: Vec<Txid>, reason: MemPoolDropReason) {
pub fn process_dropped_mempool_txs(&self, txs: Vec<Txid>, new_txid: Option<Txid>, reason: MemPoolDropReason) {
// lazily assemble payload only if we have observers
let interested_observers = self.filter_observers(&self.mempool_observers_lookup, true);

Expand All @@ -1584,11 +1584,23 @@ impl EventDispatcher {
.into_iter()
.map(|tx| serde_json::Value::String(format!("0x{}", &tx)))
.collect();

let payload = json!({
"dropped_txids": serde_json::Value::Array(dropped_txids),
"reason": reason.to_string(),
});

let payload = match new_txid{
Some(id) => {
json!({
"dropped_txids": serde_json::Value::Array(dropped_txids),
"reason": reason.to_string(),
"new_txid": format!("0x{}", &id),
})
},
None => {
json!({
"dropped_txids": serde_json::Value::Array(dropped_txids),
"reason": reason.to_string(),
"new_txid": null,
})
}
};

for observer in interested_observers.iter() {
observer.send_dropped_mempool_txs(&payload);
Expand Down