feat: cooperative submarine claims

src/components/SwapChecker.tsx

@@ -4,7 +4,7 @@ import { createEffect, createSignal } from "solid-js";
 import { RBTC } from "../consts";
 import { useGlobalContext } from "../context/Global";
 import { usePayContext } from "../context/Pay";
-import { claim } from "../utils/claim";
+import { claim, createSubmarineSignature } from "../utils/claim";
 import { fetcher, getApiUrl } from "../utils/helper";
 import { swapStatusFinal, swapStatusPending } from "../utils/swapStatus";
 
@@ -80,7 +80,16 @@ export const SwapChecker = () => {
                 setSwaps(swapsTmp);
                 notify("success", `swap ${res.id} claimed`);
             } catch (e) {
-                log.debug("swapchecker failed to claim swap", e);
+                log.warn("swapchecker failed to claim swap", e);
+            }
+        } else if (data.status === swapStatusPending.TransactionClaimPending) {
+            try {
+                await createSubmarineSignature(currentSwap);
+            } catch (e) {
+                log.warn(
+                    "swapchecker failed to sign cooperative submarine claim",
+                    e,
+                );
             }
         }
     };
@@ -124,9 +133,9 @@ export const SwapChecker = () => {
             `${getApiUrl(activeSwap.asset)}/streamswapstatus?id=${
                 activeSwap.id
             }`,
-            (data) => {
+            async (data) => {
                 prepareSwap(data, activeSwap);
-                claimSwap(data, activeSwap);
+                await claimSwap(data, activeSwap);
             },
         );
     });

src/i18n/i18n.ts

@@ -165,6 +165,8 @@ const dict = {
         version: "Version",
         commithash: "Commit Hash",
         open_in_wallet: "Open in Wallet",
+        invoice_paid: "Invoice paid",
+        creating_coop_claim: "Creating cooperative claim transaction.",
     },
     de: {
         language: "Deutsch",
@@ -337,6 +339,8 @@ const dict = {
         version: "Version",
         commithash: "Commit Hash",
         open_in_wallet: "Im Wallet öffnen",
+        invoice_paid: "Rechnung bezahlt",
+        creating_coop_claim: "Erstelle kooperative Claim-Transaktion.",
     },
     es: {
         language: "Español",
@@ -510,6 +514,9 @@ const dict = {
         version: "Versión",
         commithash: "Commit Hash",
         open_in_wallet: "Abrir en monedero",
+        invoice_paid: "Factura pagada",
+        creating_coop_claim:
+            "Creación de una transacción de reclamación cooperativa.",
     },
     zh: {
         language: "中文",
@@ -667,6 +674,8 @@ const dict = {
         version: "版本",
         commithash: "提交哈希",
         open_in_wallet: "在钱包中打开",
+        invoice_paid: "发票已支付",
+        creating_coop_claim: "创建合作索赔交易。",
     },
 };
 

src/pages/Pay.tsx

@@ -14,12 +14,13 @@ import InvoiceSet from "../status/InvoiceSet";
 import SwapCreated from "../status/SwapCreated";
 import SwapExpired from "../status/SwapExpired";
 import SwapRefunded from "../status/SwapRefunded";
+import TransactionClaimPending from "../status/TransactionClaimPending";
 import TransactionClaimed from "../status/TransactionClaimed";
 import TransactionConfirmed from "../status/TransactionConfirmed";
 import TransactionLockupFailed from "../status/TransactionLockupFailed";
 import TransactionMempool from "../status/TransactionMempool";
 import { fetcher } from "../utils/helper";
-import { swapStatusFailed } from "../utils/swapStatus";
+import { swapStatusFailed, swapStatusPending } from "../utils/swapStatus";
 
 const Pay = () => {
     const params = useParams();
@@ -155,6 +156,13 @@ const Pay = () => {
                     <Show when={swapStatus() == "invoice.pending"}>
                         <InvoicePending />
                     </Show>
+                    <Show
+                        when={
+                            swapStatus() ===
+                            swapStatusPending.TransactionClaimPending
+                        }>
+                        <TransactionClaimPending />
+                    </Show>
                     <Show when={swapStatus() == "swap.created"}>
                         <SwapCreated />
                     </Show>

src/status/TransactionClaimPending.tsx

@@ -0,0 +1,15 @@
+import LoadingSpinner from "../components/LoadingSpinner";
+import { useGlobalContext } from "../context/Global";
+
+const TransactionClaimPending = () => {
+    const { t } = useGlobalContext();
+    return (
+        <div>
+            <h2>{t("invoice_paid")}</h2>
+            <p>{t("creating_coop_claim")}</p>
+            <LoadingSpinner />
+        </div>
+    );
+};
+
+export default TransactionClaimPending;

src/utils/boltzClient.ts

@@ -143,6 +143,26 @@ export const getPartialReverseClaimSignature = async (
     };
 };
 
+export const getSubmarineClaimDetails = async (asset: string, id: string) => {
+    const res = await fetcher(`/v2/swap/submarine/${id}/claim`, asset);
+    return {
+        pubNonce: Musig.parsePubNonce(res.pubNonce),
+        preimage: Buffer.from(res.preimage, "hex"),
+        transactionHash: Buffer.from(res.transactionHash, "hex"),
+    };
+};
+
+export const postSubmarineClaimDetails = async (
+    asset: string,
+    id: string,
+    pubNonce: Buffer | Uint8Array,
+    partialSignature: Buffer | Uint8Array,
+) =>
+    fetcher(`/v2/swap/submarine/${id}/claim`, asset, {
+        pubNonce: Buffer.from(pubNonce).toString("hex"),
+        partialSignature: Buffer.from(partialSignature).toString("hex"),
+    });
+
 export {
     Pairs,
     PairLegacy,

src/utils/claim.ts

@@ -1,3 +1,4 @@
+import { crypto } from "bitcoinjs-lib";
 import {
     ClaimDetails,
     OutputType,
@@ -13,6 +14,8 @@ import { LBTC, RBTC } from "../consts";
 import {
     TransactionInterface,
     getPartialReverseClaimSignature,
+    getSubmarineClaimDetails,
+    postSubmarineClaimDetails,
 } from "./boltzClient";
 import {
     DecodedAddress,
@@ -24,6 +27,7 @@ import {
     setup,
 } from "./compat";
 import { fetcher, parseBlindingKey, parsePrivateKey } from "./helper";
+import { decodeInvoice } from "./invoice";
 import { createMusig, hashForWitnessV1, tweakMusig } from "./taproot/musig";
 
 const createAdjustedClaim = <
@@ -213,3 +217,35 @@ export const claim = async (
     }
     return swap;
 };
+
+export const createSubmarineSignature = async (swap) => {
+    if (swap.asset === RBTC) {
+        return;
+    }
+
+    await setup();
+    log.info(`creating cooperative claim signature for`, swap.id);
+
+    const claimDetails = await getSubmarineClaimDetails(swap.asset, swap.id);
+    if (
+        crypto.sha256(claimDetails.preimage).toString("hex") !==
+        decodeInvoice(swap.invoice).preimageHash
+    ) {
+        throw "invalid preimage";
+    }
+
+    const boltzPublicKey = Buffer.from(swap.claimPublicKey, "hex");
+    const musig = createMusig(parsePrivateKey(swap.privateKey), boltzPublicKey);
+    const tree = SwapTreeSerializer.deserializeSwapTree(swap.swapTree);
+    tweakMusig(swap.asset, musig, tree.tree);
+
+    musig.aggregateNonces([[boltzPublicKey, claimDetails.pubNonce]]);
+    musig.initializeSession(claimDetails.transactionHash);
+
+    await postSubmarineClaimDetails(
+        swap.asset,
+        swap.id,
+        musig.getPublicNonce(),
+        musig.signPartial(),
+    );
+};

src/utils/swapStatus.ts

@@ -1,6 +1,7 @@
 export const swapStatusPending = {
     TransactionConfirmed: "transaction.confirmed",
     TransactionMempool: "transaction.mempool",
+    TransactionClaimPending: "transaction.claim.pending",
 };
 
 export const swapStatusFailed = {