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.

cursor

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

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

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

cursor · 2026-05-19T10:06:14Z

+        .await?;
+
+        Ok(())
+    }


Missing database migration for auto_resume table

High Severity

The new get_auto_resume and set_auto_resume methods query an auto_resume table, but no migration file exists in swap/migrations/ to create it. The database uses sqlx::migrate!("./migrations") to manage schema. Without a migration, any call to these methods will fail with a "table not found" error at runtime, breaking both resume_all_swaps (which reads auto_resume) and suspend_swap with disable_auto_resume: true.

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

cursor · 2026-05-19T10:06:15Z

+        .await
+        .context("Failed to release initiation lock")?;
+    result
+}


Initiation lock released before UTXO selection completes

High Severity

run_exclusive_initiation releases the initiation lock as soon as manager.start() returns, but start() only spawns the state-machine task — it doesn't wait for TxLock creation (UTXO selection). Two concurrent buy_xmr calls can therefore both pass determine_btc_to_swap sequentially, spawn their tasks, and then both tasks select UTXOs from the same unspent set concurrently, risking double-spend attempts or transaction failures.

Additional Locations (1)

swap/src/cli/api/request.rs#L1092-L1173

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

cursor · 2026-05-19T10:06:15Z

-    let seller_addresses = db.get_addresses(seller_peer_id).await?;
-
-    let mut event_loop_handle = context.try_get_event_loop_handle().await?;
+    db.set_auto_resume(swap_id, true).await?;


Manual resume silently re-enables auto-resume preference

Medium Severity

resume_swap unconditionally calls db.set_auto_resume(swap_id, true), overwriting a user's explicit "Don't auto resume on startup" preference. A user who disabled auto-resume for a problematic swap and later manually resumes it to check progress will unknowingly re-enable auto-resume, causing the swap to resume on every restart — the exact problem the PR discussion identifies users are experiencing.

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

cursor · 2026-05-19T10:06:15Z

+    const swap = state.swap.swaps[swapId];
+    return swap != null && swap.curr.type !== "Released";
+  });
+}


useIsSpecificSwapRunning ignores retry-backoff state inconsistently

Low Severity

useIsSpecificSwapRunning treats any Released event as "not running," but the codebase's isSwapInFlight helper (used by useIsSwapRunning, useRunningSwapsCount, badge counts) correctly treats a Released with next_auto_resume_at_unix_ms as still in flight. This inconsistency means a swap in retry-backoff is counted as running for badges but not for the per-swap check, which could cause subtle UI contradictions.

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

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 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

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!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor Bot May 19, 2026

Choose a reason for hiding this comment

Missing database migration for auto_resume table

Uh oh!

cursor Bot May 19, 2026

Choose a reason for hiding this comment

Initiation lock released before UTXO selection completes

Uh oh!

cursor Bot May 19, 2026

Choose a reason for hiding this comment

Manual resume silently re-enables auto-resume preference

Uh oh!

cursor Bot May 19, 2026

Choose a reason for hiding this comment

useIsSpecificSwapRunning ignores retry-backoff state inconsistently

Uh oh!

Einliterflasche commented May 19, 2026

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

Missing database migration for `auto_resume` table

`useIsSpecificSwapRunning` ignores retry-backoff state inconsistently