feat: swap recovery rescan

BoltzExchange · Feb 25, 2025 · ff1783a · ff1783a
1 parent 27da26e
commit ff1783a
Show file tree

Hide file tree

Showing 32 changed files with 866 additions and 404 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.8",
         "@reown/appkit-adapter-ethers": "^1.6.8",
         "@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,9 @@ export const CreateButton = () => {
         notify,
         ref,
         t,
-        isRecklessMode,
+        newKey,
+        deriveKey,
+        recoveryFileBackupDone,
     } = useGlobalContext();
     const {
         invoice,
@@ -63,8 +65,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 +292,7 @@ export const CreateButton = () => {
                         invoice(),
                         ref(),
                         useRif,
+                        newKey,
                     );
                     break;
 
@@ -304,6 +306,7 @@ export const CreateButton = () => {
                         claimAddress,
                         ref(),
                         useRif,
+                        newKey,
                     );
                     break;
 
@@ -317,11 +320,12 @@ export const CreateButton = () => {
                         claimAddress,
                         ref(),
                         useRif,
+                        newKey,
                     );
                     break;
             }
 
-            if (!(await validateResponse(data, getEtherSwap))) {
+            if (!(await validateResponse(data, deriveKey, getEtherSwap))) {
                 navigate("/error");
                 return;
             }
@@ -349,20 +353,10 @@ 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())
-            ) {
+            if (recoveryFileBackupDone()) {
                 navigate("/swap/" + data.id);
             } else {
-                navigate("/swap/refund/" + data.id);
+                navigate("/backup/" + data.id);
             }
         } catch (err) {
             if (err === "invalid pair hash") {

diff --git a/src/components/DownloadRefund.tsx b/src/components/DownloadRefund.tsx
diff --git a/src/components/RefundButton.tsx b/src/components/RefundButton.tsx
@@ -16,7 +16,7 @@ import { ChainSwap, SubmarineSwap } from "src/utils/swapCreator";
 import RefundEta from "../components/RefundEta";
 import { RBTC } from "../consts/Assets";
 import { SwapType } from "../consts/Enums";
-import { useGlobalContext } from "../context/Global";
+import { deriveKeyFn, useGlobalContext } from "../context/Global";
 import { usePayContext } from "../context/Pay";
 import { useWeb3Signer } from "../context/Web3";
 import {
@@ -112,6 +112,7 @@ export const RefundBtc = (props: {
     swap: Accessor<SubmarineSwap | ChainSwap>;
     setRefundTxId?: Setter<string>;
     buttonOverride?: string;
+    deriveKeyFn?: deriveKeyFn;
 }) => {
     const {
         getSwap,
@@ -121,6 +122,7 @@ export const RefundBtc = (props: {
         notify,
         externalBroadcast,
         t,
+        deriveKey,
     } = useGlobalContext();
     const { setSwap } = usePayContext();
 
@@ -163,6 +165,7 @@ export const RefundBtc = (props: {
 
         try {
             const res = await refund(
+                props.deriveKeyFn || deriveKey,
                 props.swap(),
                 refundAddress(),
                 lockupTransaction(),
@@ -182,6 +185,8 @@ export const RefundBtc = (props: {
             if (props.setRefundTxId) {
                 props.setRefundTxId(res.refundTx);
             }
+
+            setRefundAddress("");
         } catch (error) {
             log.warn("refund failed", error);
             if (typeof error === "string") {
@@ -295,6 +300,7 @@ const RefundButton = (props: {
     swap: Accessor<SubmarineSwap | ChainSwap>;
     setRefundTxId?: Setter<string>;
     buttonOverride?: string;
+    deriveKeyFn?: deriveKeyFn;
 }) => {
     const [preimageHash] = createResource(async () => {
         return (await decodeInvoice((props.swap() as SubmarineSwap).invoice))