feat: swap recovery rescan

BoltzExchange · Feb 10, 2025 · 448a9d3 · 448a9d3
1 parent 371f9d1
commit 448a9d3
Show file tree

Hide file tree

Showing 26 changed files with 432 additions and 435 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -69,6 +69,7 @@
         "@reown/appkit": "^1.6.5",
         "@reown/appkit-adapter-ethers": "^1.6.5",
         "@scure/base": "^1.2.4",
+        "@scure/bip32": "^1.6.2",
         "@solid-primitives/i18n": "^2.1.1",
         "@solid-primitives/storage": "^4.2.1",
         "@solidjs/router": "^0.15.2",

diff --git a/src/components/CreateButton.tsx b/src/components/CreateButton.tsx
@@ -14,7 +14,7 @@ import { fetchBolt12Invoice, getPairs } from "../utils/boltzClient";
 import { formatAmount } from "../utils/denomination";
 import { formatError } from "../utils/errors";
 import { HardwareSigner } from "../utils/hardware/HadwareSigner";
-import { coalesceLn, isMobile } from "../utils/helper";
+import { coalesceLn } from "../utils/helper";
 import { fetchBip353, fetchLnurl } from "../utils/invoice";
 import {
     SomeSwap,
@@ -36,7 +36,8 @@ export const CreateButton = () => {
         notify,
         ref,
         t,
-        isRecklessMode,
+        newKey,
+        deriveKey,
     } = useGlobalContext();
     const {
         invoice,
@@ -63,8 +64,7 @@ export const CreateButton = () => {
         bolt12Offer,
         setBolt12Offer,
     } = useCreateContext();
-    const { getEtherSwap, signer, providers, hasBrowserWallet } =
-        useWeb3Signer();
+    const { getEtherSwap, signer, providers } = useWeb3Signer();
 
     const [buttonDisable, setButtonDisable] = createSignal(false);
     const [buttonClass, setButtonClass] = createSignal("btn");
@@ -291,6 +291,7 @@ export const CreateButton = () => {
                         invoice(),
                         ref(),
                         useRif,
+                        newKey,
                     );
                     break;
 
@@ -304,6 +305,7 @@ export const CreateButton = () => {
                         claimAddress,
                         ref(),
                         useRif,
+                        newKey,
                     );
                     break;
 
@@ -317,11 +319,12 @@ export const CreateButton = () => {
                         claimAddress,
                         ref(),
                         useRif,
+                        newKey,
                     );
                     break;
             }
 
-            if (!(await validateResponse(data, getEtherSwap))) {
+            if (!(await validateResponse(data, deriveKey, getEtherSwap))) {
                 navigate("/error");
                 return;
             }
@@ -349,21 +352,7 @@ export const CreateButton = () => {
             setOnchainAddress("");
             setAddressValid(false);
 
-            // Mobile EVM browsers struggle with downloading files
-            const isMobileEvmBrowser = () => isMobile() && hasBrowserWallet();
-
-            // No backups needed for Reverse Swaps or when we send RBTC
-            if (
-                isRecklessMode() ||
-                swapType() === SwapType.Reverse ||
-                assetSend() === RBTC ||
-                // Only disable refund files on mobile EVM browsers when one side is RSK
-                (assetReceive() === RBTC && isMobileEvmBrowser())
-            ) {
-                navigate("/swap/" + data.id);
-            } else {
-                navigate("/swap/refund/" + data.id);
-            }
+            navigate("/swap/" + data.id);
         } catch (err) {
             if (err === "invalid pair hash") {
                 setPairs(await getPairs());

diff --git a/src/components/DownloadRefund.tsx b/src/components/DownloadRefund.tsx
diff --git a/src/components/RefundButton.tsx b/src/components/RefundButton.tsx
@@ -121,6 +121,7 @@ export const RefundBtc = (props: {
         notify,
         externalBroadcast,
         t,
+        deriveKey,
     } = useGlobalContext();
     const { setSwap } = usePayContext();
 
@@ -163,6 +164,7 @@ export const RefundBtc = (props: {
 
         try {
             const res = await refund(
+                deriveKey,
                 props.swap(),
                 refundAddress(),
                 lockupTransaction(),

diff --git a/src/components/SwapChecker.tsx b/src/components/SwapChecker.tsx
@@ -2,7 +2,6 @@ import { OutputType } from "boltz-core";
 import log from "loglevel";
 import { createEffect, onCleanup, onMount } from "solid-js";
 
-import { config } from "../config";
 import { BTC, LBTC, RBTC } from "../consts/Assets";
 import { SwapType } from "../consts/Enums";
 import {
@@ -53,7 +52,6 @@ class BoltzWebSocket {
 
     constructor(
         private readonly url: string,
-        private readonly wsFallback: string | undefined,
         private readonly relevantIds: Set<string>,
         private readonly prepareSwap: (id: string, status: SwapStatus) => void,
         private readonly claimSwap: (
@@ -64,12 +62,7 @@ class BoltzWebSocket {
 
     public connect = () => {
         log.debug("Opening WebSocket");
-        this.openWebSocket(`${this.url}/v2/ws`).catch(() => {
-            if (this.wsFallback !== undefined) {
-                log.debug("Opening fallback WebSocket");
-                void this.openWebSocket(this.wsFallback).then().catch();
-            }
-        });
+        void this.openWebSocket(`${this.url}/v2/ws`);
     };
 
     public close = () => {
@@ -179,6 +172,7 @@ export const SwapChecker = () => {
         setSwapStorage,
         externalBroadcast,
         t,
+        deriveKey,
     } = useGlobalContext();
 
     let ws: BoltzWebSocket | undefined = undefined;
@@ -266,6 +260,7 @@ export const SwapChecker = () => {
         ) {
             try {
                 const res = await claim(
+                    deriveKey,
                     currentSwap as ReverseSwap | ChainSwap,
                     data.transaction as { hex: string },
                     true,
@@ -294,7 +289,10 @@ export const SwapChecker = () => {
             data.status === swapStatusPending.TransactionClaimPending
         ) {
             try {
-                await createSubmarineSignature(currentSwap as SubmarineSwap);
+                await createSubmarineSignature(
+                    deriveKey,
+                    currentSwap as SubmarineSwap,
+                );
                 notify(
                     "success",
                     t("swap_completed", { id: currentSwap.id }),
@@ -329,7 +327,10 @@ export const SwapChecker = () => {
             log.debug(
                 `Helping server claim ${swap.assetSend} of Chain Swap ${swap.id}`,
             );
-            const sig = await createTheirPartialChainSwapSignature(swap);
+            const sig = await createTheirPartialChainSwapSignature(
+                deriveKey,
+                swap,
+            );
             await postChainSwapDetails(swap.id, undefined, sig);
         } catch (e) {
             log.warn(
@@ -350,7 +351,6 @@ export const SwapChecker = () => {
 
         ws = new BoltzWebSocket(
             getApiUrl(),
-            config.apiUrl.wsFallback,
             new Set<string>(swapsToCheck.map((s) => s.id)),
             prepareSwap,
             claimSwap,