Skip to content

fix(platform-wallet): use dash-spv's own acceptance timeout instead of a 30s override #4481

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

Merged
lklimek merged 1 commit into from
Sep 2, 2026
Merged

fix(platform-wallet): use dash-spv's own acceptance timeout instead of a 30s override #4481

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
19 changes: 4 additions & 15 deletions packages/rs-platform-wallet/src/broadcaster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,6 @@ impl TransactionBroadcaster for DapiBroadcaster {
}
}

/// How long the SPV broadcast waits for a network-acceptance verdict before
/// reporting the outcome as unknown. Shorter than dash-spv's own default so a
/// user-facing send does not hang for a full minute. On live Dash networks
/// acceptance usually resolves in seconds via the InstantSend lock or the
/// withheld-peer echo, well inside this bound.
const SPV_ACCEPTANCE_TIMEOUT: Duration = Duration::from_secs(30);

/// The SPV broadcast channel: send through P2P peers and await dash-spv's
/// network-acceptance verdict (rust-dashcore#913).
#[async_trait]
Expand Down Expand Up @@ -188,11 +181,7 @@ impl SpvBroadcaster {
impl TransactionBroadcaster for SpvBroadcaster {
async fn broadcast(&self, transaction: &Transaction) -> Result<Txid, BroadcastError> {
let txid = transaction.txid();
match self
.spv
.broadcast_and_wait(transaction, Some(SPV_ACCEPTANCE_TIMEOUT))
.await
{
match self.spv.broadcast_and_wait(transaction, None).await {
Ok(BroadcastResult::Accepted { relayed_by }) => {
tracing::info!(
txid = %txid,
Expand All @@ -208,9 +197,9 @@ impl TransactionBroadcaster for SpvBroadcaster {
// later echo/IS-lock/confirmation or the reservation-TTL
// backstop reconciles the reservation.
Ok(BroadcastResult::Uncertain) => Err(BroadcastError::MaybeSent {
reason: format!(
"SPV broadcast saw no acceptance signal within {SPV_ACCEPTANCE_TIMEOUT:?}"
),
reason:
"SPV broadcast saw no acceptance signal before dash-spv's acceptance timeout"
.to_string(),
}),
// Provably never sent (per the SpvChannel error contract): no
// bytes reached the network, so the reservation is safe to
Expand Down
Loading