Skip to content

fix: distinguish dropped txs from mempool txs in esplora confirmations #169

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

Open
matthewjablack wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: distinguish dropped txs from mempool txs in esplora confirmations #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
111 changes: 100 additions & 11 deletions ddk-manager/src/manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ where
self.check_signed_contracts(&signed_contracts).await?;
self.check_confirmed_contracts().await?;
self.check_preclosed_contracts().await?;
self.recover_incorrectly_closed_contracts().await?;

if check_channels {
self.channel_checks().await?;
Expand Down Expand Up @@ -890,6 +891,30 @@ where

let contract_id = funding_input.dlc_input.as_ref().unwrap().contract_id;

// Skip pre-close if the splice fund tx was dropped from the
// mempool (get_transaction_confirmations returns Err for
// dropped txs after the esplora fix). Mempool txs (Ok(0))
// and confirmed txs (Ok(n)) proceed normally.
let splice_fund_txid = contract
.accepted_contract
.dlc_transactions
.fund
.compute_txid();
if self
.blockchain
.get_transaction_confirmations(&splice_fund_txid)
.await
.is_err()
{
log_debug!(
self.logger,
"Splice fund tx not found, skipping pre-close of previous contract. splice_fund_txid={} contract_id={}",
splice_fund_txid,
contract_id.to_lower_hex_string(),
);
continue;
}

let confirmed_contract_in_splice = match get_contract_in_state!(
self,
&contract_id,
Expand All @@ -899,14 +924,14 @@ where
Ok(c) => Ok(c),
Err(Error::InvalidState(e)) => {
log_trace!(self.logger,
"The previouse contract referenced in a splice transaction is in an unexpected state. contract_id={} error={}",
"The previouse contract referenced in a splice transaction is in an unexpected state. contract_id={} error={}",
contract_id.to_lower_hex_string(), e.to_string(),
);
continue;
}
Err(e) => {
log_debug!(self.logger,
"The previouse contract referenced in a splice transaction failed to retrieve. contract_id={} error={}",
"The previouse contract referenced in a splice transaction failed to retrieve. contract_id={} error={}",
contract_id.to_lower_hex_string(), e.to_string(),
);
Err(e)
Expand All @@ -920,8 +945,9 @@ where
};

log_debug!(self.logger,
"The previous contract that was spliced is now closed because the splice contract is confirmed. contract_id={}",
"The previous contract that was spliced is now closed because the splice contract is confirmed. contract_id={} splice_fund_txid={}",
contract_id.to_lower_hex_string(),
splice_fund_txid,
);

self.store
Expand Down Expand Up @@ -1118,10 +1144,14 @@ where
.dlc_transactions
.pending_close_txs
{
let confirmations = self
let confirmations = match self
.blockchain
.get_transaction_confirmations(&pending_close_tx.compute_txid())
.await?;
.await
{
Ok(c) => c,
Err(_) => continue,
};

log_debug!(
self.logger,
Expand Down Expand Up @@ -1300,10 +1330,32 @@ where
#[tracing::instrument(skip_all, level = "debug")]
async fn check_preclosed_contract(&self, contract: &PreClosedContract) -> Result<(), Error> {
let broadcasted_txid = contract.signed_cet.compute_txid();
let confirmations = self
let confirmations = match self
.blockchain
.get_transaction_confirmations(&broadcasted_txid)
.await?;
.await
{
Ok(c) => c,
Err(e) => {
// For splice pre-closes (no attestations), a tx-not-found
// error means the splice funding tx was dropped from the
// mempool. Revert back to Confirmed.
if contract.attestations.is_none() {
log_info!(
self.logger,
"Pre-closed splice contract closing tx not found, reverting to confirmed. broadcasted_txid={} contract_id={} error={}",
broadcasted_txid,
contract.signed_contract.accepted_contract.get_contract_id_string(),
e
);
self.store
.update_contract(&Contract::Confirmed(contract.signed_contract.clone()))
.await?;
return Ok(());
}
return Err(e);
}
};
log_debug!(
self.logger,
"Checking pre-closed contract. broadcasted_txid={} contract_id={} confirmations={}",
Expand All @@ -1314,9 +1366,10 @@ where
.get_contract_id_string(),
confirmations
);

if confirmations >= *NB_CONFIRMATIONS {
log_debug!(self.logger,
"Pre-closed contract is fully confirmed. Moving to closed. broadcasted_txid={} contract_id={}",
"Pre-closed contract is fully confirmed. Moving to closed. broadcasted_txid={} contract_id={}",
broadcasted_txid.to_string(),
contract.signed_contract.accepted_contract.get_contract_id_string()
);
Expand Down Expand Up @@ -1356,6 +1409,39 @@ where
Ok(())
}

/// Recover splice-closed contracts whose closing tx was dropped from
/// the mempool. Only reverts contracts closed via splice (attestations
/// is None). Uses get_transaction to verify the tx is truly gone — not
/// just unconfirmed in the mempool.
#[tracing::instrument(skip_all, level = "debug")]
async fn recover_incorrectly_closed_contracts(&self) -> Result<(), Error> {
let contracts = self.store.get_contracts().await?;
for contract in contracts {
let Contract::Closed(ref closed) = contract else {
continue;
};
if closed.attestations.is_some() {
continue;
}
let Some(ref cet) = closed.signed_cet else {
continue;
};
let txid = cet.compute_txid();
if self.blockchain.get_transaction(&txid).await.is_err() {
log_info!(
self.logger,
"Splice-closed contract closing tx not found, reverting to confirmed. closing_txid={} contract_id={}",
txid,
closed.contract_id.to_lower_hex_string(),
);
self.store
.update_contract(&Contract::Confirmed(closed.signed_contract.clone()))
.await?;
}
}
Ok(())
}

#[tracing::instrument(skip_all, level = "debug")]
async fn close_contract(
&self,
Expand All @@ -1366,7 +1452,8 @@ where
let confirmations = self
.blockchain
.get_transaction_confirmations(&signed_cet.compute_txid())
.await?;
.await
.unwrap_or(0);

if confirmations < 1 {
log_info!(
Expand Down Expand Up @@ -1448,7 +1535,8 @@ where
let confirmations = self
.blockchain
.get_transaction_confirmations(&refund.compute_txid())
.await?;
.await
.unwrap_or(0);
if confirmations == 0 {
log_debug!(self.logger,
"Refund transaction has not been broadcast yet. Sending transaction txid={} contract_id={}",
Expand Down Expand Up @@ -1494,7 +1582,8 @@ where
let confirmations = self
.blockchain
.get_transaction_confirmations(&refund_txid)
.await?;
.await
.unwrap_or(0);

if confirmations > 0 {
// Counterparty (or we) already broadcast the refund tx. Update state.
Expand Down
25 changes: 19 additions & 6 deletions ddk/src/chain/esplora.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@ impl ddk_manager::Blockchain for EsploraClient {
.get_tx_status(tx_id)
.await
.map_err(esplora_err_to_manager_err)?;
let tip_height = self
.async_client
.get_height()
.await
.map_err(esplora_err_to_manager_err)?;
if txn.confirmed {
let tip_height = self
.async_client
.get_height()
.await
.map_err(esplora_err_to_manager_err)?;
match txn.block_height {
Some(height) => Ok(tip_height
.checked_sub(height)
Expand All @@ -187,7 +187,20 @@ impl ddk_manager::Blockchain for EsploraClient {
None => Ok(0),
}
} else {
Ok(0)
// tx is unconfirmed — check if it's in the mempool or truly gone
match self.async_client.get_tx(tx_id).await {
Ok(Some(_)) => Ok(0),
_ => {
log_warn!(
self.logger,
"Transaction not found in mempool or on-chain. txid={}",
tx_id,
);
Err(esplora_err_to_manager_err(
EsploraError::TransactionNotFound(*tx_id),
))
}
}
}
}
}
Expand Down
Loading