feat(bob): concurrent swaps by binarybaron · Pull Request #971 · eigenwallet/core

binarybaron · 2026-04-28T09:48:42Z

No description provided.

binarybaron · 2026-05-05T12:39:12Z

We should display the final state of the swap until the user acknowledges it.

binarybaron · 2026-05-05T12:41:10Z

We should move the "cancel timeline" from the "history" page to the "swaps" page and hide it somewhat (make it expandable).

…-swaps

binarybaron · 2026-05-06T17:52:22Z

Issue:

run_exclusive_initiation releases the initiation lock at swap_manager.rs:642 before the lock-tx is broadcast. UTXO selection happens inside the spawned task (TxLock::new → wallet.send_to_address); the wallet mutex is method-level, so two concurrent buy_xmr calls can build PSBTs from the same UTXOs.

Einliterflasche · 2026-05-18T14:48:30Z

The interaction with the Watcher needs to be updated. The watcher still does in-line cancel_and_refund but should use the swap manager now. At least prevent the swap manager from spawning another state machine while the watcher is refunding

binarybaron · 2026-05-18T14:55:42Z

The interaction with the Watcher needs to be updated. The watcher still does in-line cancel_and_refund but should use the swap manager now. At least prevent the swap manager from spawning another state machine while the watcher is refunding

Yes you are right but the whole watcher should become redundant anyway... It should not be required if the state machine is properly working. The watcher should be abolished at some point.

Einliterflasche · 2026-05-18T14:59:38Z

I have 2 swaps where I had to do the XMR redeem manually which are now always automatically resumed - and keep failing. There needs to be a solution to this. Some kind of manually marking swaps as "do not resume" which is persisted across restarts.

Apart from that, I think we should change "Suspend" in the GUI to something like "Stop" or "Halt".

binarybaron · 2026-05-18T15:07:52Z

I have 2 swaps where I had to do the XMR redeem manually which are now always automatically resumed - and keep failing. There needs to be a solution to this. Some kind of manully marking swaps as "do not resume" which is persisted across restarts.

Apart from that, I think we should change "Suspend" in the GUI to something like "Stop" or "Halt".

"Stop" or "Halt" seems like this actually stop the timelocks from counting down or does something on a protocol level. I dont see them being clearer than "suspend".

Einliterflasche · 2026-05-18T15:17:49Z

"Stop" or "Halt" seems like this actually stop the timelocks from counting down or does something on a protocol level. I dont see them being clearer than "suspend".

Suspend has the same issue, except I have a much harder time imagining what "suspend" means. It's technical jargon.
We need to warn anyway that this doesn't stop the swap / refund window from progressing.

Einliterflasche · 2026-05-18T15:20:51Z

I'll remove the watcher.

What do you propose for the manually-finished-swap problem? We could just add a new db table with columns like swap_id, should_not_resume.

binarybaron · 2026-05-18T16:02:15Z

I'll remove the watcher.

What do you propose for the manually-finished-swap problem? We could just add a new db table with columns like swap_id, should_not_resume.

We could also bundle it with #932

binarybaron · 2026-05-18T16:02:38Z

Not sure if removing the watcher is the move yet... its a reasonable safety fallback mechanism.

Einliterflasche · 2026-05-18T16:07:57Z

It also turns out we use the watcher for balance and timelock updates. I'll keep the watcher and make it interact with the swap manager.

We could also bundle it with #932

Yes. Although there still should be an option to stop a swap from resuming without fully deleting it. It needs to be done as part of this PR though. Otherwise it gets really annoying for people in this situation of which there are a few.

…-swaps

binarybaron · 2026-05-19T10:01:58Z

@Einliterflasche I will merge this today.

Einliterflasche · 2026-05-19T15:08:40Z

We definitely need a docker test which spawns multiple swaps. Also get the ui mock system to work again, it's pretty broken now.

binarybaron · 2026-05-21T15:33:05Z

Also get the ui mock system to work again, it's pretty broken now.

Can you expand? It works perfectly fine for me.

cursor · 2026-05-21T15:44:44Z

-                // If the swap is already running, we can skip the refund
-                // The refund will be handled by the state machine
-                if let Some(current_swap_id) = self.swap_lock.get_current_swap_id().await {
-                    if current_swap_id == swap_id {


Watcher blocked during error retries

Medium Severity

The background watcher skips cancel/refund whenever SwapManager still lists a swap as running, but failed swaps now stay registered through indefinite exponential backoff retries. If bob::run keeps erroring before making progress, the watcher never runs its safety refund even when cancel timelocks expire.

Additional Locations (1)

swap/src/cli/swap_manager.rs#L705-L727

^{Reviewed by Cursor Bugbot for commit 90c4b2f. Configure here.}

Einliterflasche · 2026-05-21T23:44:28Z

stale swaps still get shown on the Swaps tab even when I clicked "do not auto resume"
I'd expect there to be one mock control ui thing for each swap, immediately as part of that swap widget. so that we can test multipe swaps at the same time, controlling each on it's own

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

- reserve the running slot during cancel_and_refund so a concurrent start/resume cannot race the refund transaction - replace the oneshot spawn-gate by holding the running-map lock across spawn + insert - unify MakeInitialSwap/RebuildSwap into a single per-swap factory - make run_exclusive_initiation a SwapManager method, emit a terminal Released when the initiation body errors - misc: drop unwrap_or(0) in unix_now_ms, dead watcher import, unused useHasSwapPhaseSwap hook

cursor

Cursor Bugbot has reviewed your changes and found 3 potential issues.

There are 4 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 57fc4ec. Configure here.}

cursor · 2026-06-11T11:13:52Z

+  return saneSwapInfos.filter(
+    (info) =>
+      isBobStateNameRunningSwap(info.state_name) && swaps[info.swap_id] == null,
+  );


Auto-resume hidden from GUI

High Severity

The Swaps tab still lists idle resumable swaps from DB state alone, while auto_resume is only stored in SQLite and never exposed on GetSwapInfoResponse. Swaps marked “Don’t auto resume on startup” keep appearing with Resume, matching reported stale-swap behavior.

Additional Locations (1)

swap/src/cli/api/request.rs#L195-L220

^{Reviewed by Cursor Bugbot for commit 57fc4ec. Configure here.}

cursor · 2026-06-11T11:13:52Z

+        isOfferPhase(existingSwap.curr)
+      ) {
+        delete swap.swaps[action.payload.swap_id];
+        return;


Offer cleanup misses retry

Medium Severity

Terminal Released cleanup drops offer-phase swaps only when existingSwap.curr is an offer event. If curr is already a retry Released, offer-phase prev is ignored and the entry stays on the Offers tab until manually closed.

^{Reviewed by Cursor Bugbot for commit 57fc4ec. Configure here.}

cursor · 2026-06-11T11:13:52Z

+      if (phaseEvent == null) return false;
+      return mode === "offers"
+        ? isOfferPhase(phaseEvent)
+        : !isOfferPhase(phaseEvent);


Hidden retry backoff panel

Medium Severity

Swaps in retry backoff are omitted from the widget when curr is Released and prev is null, because phaseEvent becomes null and the filter returns false. The retry banner and state UI never mount for that session entry.

^{Reviewed by Cursor Bugbot for commit 57fc4ec. Configure here.}

binarybaron and others added 3 commits April 28, 2026 11:48

feat(bob): concurrent swaps

dcbeb26

feat(swap): extract SwapManager with retry-with-backoff

12f6c59

feat(gui): split swap page into Offers and Swaps tabs

2e5aa69

binarybaron and others added 3 commits May 5, 2026 19:11

feat: resume all swaps on start up

9deb326

Merge remote-tracking branch 'origin/master' into feat/bob-concurrent…

5efb0a5

…-swaps

bunch of fixes

21dfabe

Einliterflasche added 2 commits May 18, 2026 14:55

Merge branch 'master' into feat/bob-concurrent-swaps

0c9e533

fix(gui): Object.values() doesn't work on null or undefined

9cbb4e5

Einliterflasche and others added 5 commits May 18, 2026 18:11

fix(watcher): use SwapManager::cancel_and_refund

4426f78

Merge remote-tracking branch 'origin/master' into feat/bob-concurrent…

c5ef802

…-swaps

feat: allow disabling auto resume

ed24d71

nit

3493a7d

changelog entry

b04ebf0

binarybaron marked this pull request as ready for review May 19, 2026 10:01

cursor Bot reviewed May 19, 2026

View reviewed changes

Comment thread swap/src/database/sqlite.rs

Comment thread swap/src/cli/swap_manager.rs Outdated

Comment thread swap/src/cli/api/request.rs

Comment thread src-gui/src/store/hooks.ts

migration table, add docker test for parallel swaps, fix state stepper

26f7eaf

cursor Bot reviewed May 21, 2026

View reviewed changes

Comment thread src-gui/src/renderer/components/pages/swap/swap/CancelButton.tsx

Merge branch 'master' into feat/bob-concurrent-swaps

90c4b2f

cursor Bot reviewed May 21, 2026

View reviewed changes

binarybaron and others added 2 commits May 22, 2026 15:57

fix(gui): always show lock-tx description on BitcoinLockTxInMempoolPage

3cb0b87

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

cursor Bot reviewed Jun 11, 2026

View reviewed changes

Conversation

binarybaron commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

binarybaron commented May 5, 2026

Uh oh!

binarybaron commented May 5, 2026

Uh oh!

binarybaron commented May 6, 2026

Uh oh!

Einliterflasche commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

binarybaron commented May 18, 2026

Uh oh!

Einliterflasche commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

binarybaron commented May 18, 2026

Uh oh!

Einliterflasche commented May 18, 2026

Uh oh!

Einliterflasche commented May 18, 2026

Uh oh!

binarybaron commented May 18, 2026

Uh oh!

binarybaron commented May 18, 2026

Uh oh!

Einliterflasche commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

binarybaron commented May 19, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Einliterflasche commented May 19, 2026

Uh oh!

binarybaron commented May 21, 2026

Uh oh!

Uh oh!

cursor Bot May 21, 2026

Choose a reason for hiding this comment

Watcher blocked during error retries

Uh oh!

Einliterflasche commented May 21, 2026

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor Bot Jun 11, 2026

Choose a reason for hiding this comment

Auto-resume hidden from GUI

Uh oh!

cursor Bot Jun 11, 2026

Choose a reason for hiding this comment

Offer cleanup misses retry

Uh oh!

cursor Bot Jun 11, 2026

Choose a reason for hiding this comment

Hidden retry backoff panel

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

binarybaron commented Apr 28, 2026 •

edited

Loading

Einliterflasche commented May 18, 2026 •

edited

Loading

Einliterflasche commented May 18, 2026 •

edited

Loading

Einliterflasche commented May 18, 2026 •

edited

Loading