fix: reverse swap double broadcast by jackstar12 · Pull Request #486 · BoltzExchange/boltz-client

jackstar12 · 2025-06-30T13:56:02Z

if a swap accepts zero-conf and goes into transaction.confirmed before
the invoice is being settled, the client tries to broadcast again,
leading to an insufficient replacement error

Summary by CodeRabbit

Bug Fixes
- Improved handling of reverse swap status updates to prevent redundant processing when a claim transaction has already been broadcast.

if a swap accepts zero-conf and goes into transaction.confirmed before the invoice is being settled, the client tries to broadcast again, leading to an insufficient replacement error

coderabbitai · 2025-06-30T13:56:08Z

Walkthrough

A conditional check was introduced in the handleReverseSwapStatus method to determine if the ClaimTransactionId is already set when the status is boltz.TransactionConfirmed. If it is, the method skips updating the lockup transaction ID and constructing the claim transaction, thus avoiding redundant processing.

Changes

File(s)	Change Summary
internal/nursery/reverse.go	Added a conditional check in `handleReverseSwapStatus` to skip claim transaction logic if already set.

Poem

A check in the code, a pause in the flow,
No double claims now, just onward we go!
If the claim is already written,
The swap's next steps are smitten.
With tidy logic, the nursery's bright—
Less work for bunnies, and all feels right! 🐇✨

✨ Finishing Touches

📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

michael1011 · 2025-06-30T14:30:23Z

@coderabbitai review

coderabbitai · 2025-06-30T14:30:28Z

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

coderabbitai

Actionable comments posted: 0

🧹 Nitpick comments (1)

internal/nursery/reverse.go (1)
163-166: LGTM! Effective fix for double broadcast prevention.

The conditional check correctly prevents redundant claim transaction processing when the transaction has already been broadcast during the TransactionMempool phase. This addresses the "insufficient replacement" error described in the PR objectives.

The logic is sound:

Early exit before database operations and transaction construction

Proper placement at the beginning of the TransactionConfirmed case

Clear comment explaining the rationale

Consider adding a debug log statement to improve troubleshooting:
 // already broadcasted on transaction.mempool
 if reverseSwap.ClaimTransactionId != "" {
+    logger.Debugf("Skipping claim transaction construction for Reverse Swap %s - already broadcast", reverseSwap.Id)
     break
 }

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d4acf18 and 5f66aee.

📒 Files selected for processing (1)

internal/nursery/reverse.go (1 hunks)

fix: reverse swap double broadcast

5f66aee

if a swap accepts zero-conf and goes into transaction.confirmed before the invoice is being settled, the client tries to broadcast again, leading to an insufficient replacement error

jackstar12 requested a review from michael1011 June 30, 2025 13:57

michael1011 approved these changes Jun 30, 2025

View reviewed changes

coderabbitai Bot reviewed Jun 30, 2025

View reviewed changes

michael1011 merged commit 4edb60d into master Jun 30, 2025
3 checks passed

michael1011 deleted the fix/reverse-swap-double-broadcast branch June 30, 2025 14:35

coderabbitai Bot mentioned this pull request Jul 8, 2025

feat: implement transaction.direct status update #497

Merged

This was referenced Oct 9, 2025

feat: retry claims #568

Closed

feat: retry reverse and chain claims #570

Merged

coderabbitai Bot mentioned this pull request Oct 17, 2025

refactor: finalize chain and reverse swaps after claim #573

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: reverse swap double broadcast#486

fix: reverse swap double broadcast#486
michael1011 merged 1 commit into
masterfrom
fix/reverse-swap-double-broadcast

jackstar12 commented Jun 30, 2025 •

edited by coderabbitai Bot

Loading

Uh oh!

coderabbitai Bot commented Jun 30, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

michael1011 commented Jun 30, 2025

Uh oh!

coderabbitai Bot commented Jun 30, 2025

Uh oh!

coderabbitai Bot left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

jackstar12 commented Jun 30, 2025 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Poem

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

michael1011 commented Jun 30, 2025

Uh oh!

coderabbitai Bot commented Jun 30, 2025

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jackstar12 commented Jun 30, 2025 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jun 30, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)