@arkade-os/boltz-swap 0.3.34 → 0.3.36

package/dist/{swapsPollProcessor-DFVOAy_-.d.ts → swapsPollProcessor-Bv4Z2R7g.d.ts}

@@ -1,6 +1,6 @@
 import { AsyncStorageTaskQueue, TaskProcessor } from '@arkade-os/sdk/worker/expo';
 import { Identity, ArkProvider, IndexerProvider, IWallet } from '@arkade-os/sdk';
-import { n as SwapRepository, N as Network, r as BoltzSwapProvider, A as ArkadeSwapsConfig } from './types--axEWA8c.js';
+import { n as SwapRepository, N as Network, r as BoltzSwapProvider, A as ArkadeSwapsConfig } from './types-D97i1LFu.js';
 
 /**
  * Dependencies injected into every swap processor at runtime.

package/dist/{types--axEWA8c.d.cts → types-D97i1LFu.d.cts}

@@ -473,8 +473,23 @@ interface SwapManagerClient {
 interface SwapManagerCallbacks {
     claim: (swap: BoltzReverseSwap) => Promise<void>;
     refund: (swap: BoltzSubmarineSwap) => Promise<void>;
-    claimArk: (swap: BoltzChainSwap) => Promise<void>;
-    claimBtc: (swap: BoltzChainSwap) => Promise<void>;
+    /**
+     * Claim the ARK side of a BTC→ARK chain swap.
+     *
+     * Returns the on-chain claim txid — the manager surfaces it from
+     * {@link SwapManager.waitForSwapCompletion}, since Boltz does not report a
+     * usable transaction id for chain swaps at `transaction.claimed`.
+     */
+    claimArk: (swap: BoltzChainSwap) => Promise<{
+        txid: string;
+    }>;
+    /**
+     * Claim the BTC side of an ARK→BTC chain swap. Returns the on-chain claim
+     * txid; see {@link SwapManagerCallbacks.claimArk}.
+     */
+    claimBtc: (swap: BoltzChainSwap) => Promise<{
+        txid: string;
+    }>;
     refundArk: (swap: BoltzChainSwap) => Promise<ChainArkRefundOutcome>;
     signServerClaim?: (swap: BoltzChainSwap) => Promise<void>;
     saveSwap: (swap: BoltzSwap) => Promise<void>;
@@ -530,6 +545,7 @@ declare class SwapManager implements SwapManagerClient {
     private webSocketUnavailable;
     private swapsInProgress;
     private swapSubscriptions;
+    private chainClaimPromises;
     private claimCallback;
     private refundCallback;
     private claimArkCallback;
@@ -629,13 +645,30 @@ declare class SwapManager implements SwapManagerClient {
      * Blocks until the swap reaches a final status or fails.
      * Useful when you want blocking behavior even with SwapManager enabled.
      *
-     * @throws If the swap is already in a final status (submarine/chain swaps throw immediately;
-     *         reverse swaps return the existing txid).
+     * If the swap is already in a final status, resolves immediately with the
+     * on-chain txid of the successfully claimed swap (reverse: from
+     * getReverseSwapTxId; submarine/chain: from getSwapStatus) and throws for a
+     * failed final status.
+     *
+     * @throws If the swap is already in a failed final status.
      * @throws If the swap is not found in the manager.
+     * @throws If a completed swap has no transaction id available yet.
      */
     waitForSwapCompletion(swapId: string): Promise<{
         txid: string;
     }>;
+    /**
+     * Resolve the on-chain txid for a claimed submarine/chain swap.
+     *
+     * Chain swaps are claimed by the manager itself, so the claim txid captured
+     * from the claimArk/claimBtc callback is the swap's on-chain completion and
+     * is preferred — Boltz does not surface it via getSwapStatus at
+     * transaction.claimed. Submarine swaps (claimed by Boltz) and chain swaps
+     * we never claimed in this session (e.g. restored already-claimed) fall
+     * back to the provider status. Rejects when no transaction id is available,
+     * so callers never receive the Boltz swap id in place of a real txid.
+     */
+    private resolveClaimedTxid;
     /**
      * Check if a swap is currently being processed
      * Useful for preventing race conditions
@@ -711,6 +744,16 @@ declare class SwapManager implements SwapManagerClient {
      * Execute claim action for chain swap Ark to Btc
      */
     private executeClaimBtcAction;
+    /**
+     * Store the in-flight claim promise returned by a claim callback so
+     * {@link resolveClaimedTxid} can await it and surface the real on-chain
+     * txid at transaction.claimed — even when that update races the still
+     * in-flight claim. Storing the promise (not the resolved txid) closes the
+     * window where the txid is not yet captured when transaction.claimed
+     * arrives. Defensive against callbacks that don't return a promise (older
+     * integrations, test doubles): those simply fall back to getSwapStatus.
+     */
+    private rememberChainClaim;
     /**
      * Execute refund action for chain swap Ark to Btc
      */

package/dist/{types--axEWA8c.d.ts → types-D97i1LFu.d.ts}

@@ -473,8 +473,23 @@ interface SwapManagerClient {
 interface SwapManagerCallbacks {
     claim: (swap: BoltzReverseSwap) => Promise<void>;
     refund: (swap: BoltzSubmarineSwap) => Promise<void>;
-    claimArk: (swap: BoltzChainSwap) => Promise<void>;
-    claimBtc: (swap: BoltzChainSwap) => Promise<void>;
+    /**
+     * Claim the ARK side of a BTC→ARK chain swap.
+     *
+     * Returns the on-chain claim txid — the manager surfaces it from
+     * {@link SwapManager.waitForSwapCompletion}, since Boltz does not report a
+     * usable transaction id for chain swaps at `transaction.claimed`.
+     */
+    claimArk: (swap: BoltzChainSwap) => Promise<{
+        txid: string;
+    }>;
+    /**
+     * Claim the BTC side of an ARK→BTC chain swap. Returns the on-chain claim
+     * txid; see {@link SwapManagerCallbacks.claimArk}.
+     */
+    claimBtc: (swap: BoltzChainSwap) => Promise<{
+        txid: string;
+    }>;
     refundArk: (swap: BoltzChainSwap) => Promise<ChainArkRefundOutcome>;
     signServerClaim?: (swap: BoltzChainSwap) => Promise<void>;
     saveSwap: (swap: BoltzSwap) => Promise<void>;
@@ -530,6 +545,7 @@ declare class SwapManager implements SwapManagerClient {
     private webSocketUnavailable;
     private swapsInProgress;
     private swapSubscriptions;
+    private chainClaimPromises;
     private claimCallback;
     private refundCallback;
     private claimArkCallback;
@@ -629,13 +645,30 @@ declare class SwapManager implements SwapManagerClient {
      * Blocks until the swap reaches a final status or fails.
      * Useful when you want blocking behavior even with SwapManager enabled.
      *
-     * @throws If the swap is already in a final status (submarine/chain swaps throw immediately;
-     *         reverse swaps return the existing txid).
+     * If the swap is already in a final status, resolves immediately with the
+     * on-chain txid of the successfully claimed swap (reverse: from
+     * getReverseSwapTxId; submarine/chain: from getSwapStatus) and throws for a
+     * failed final status.
+     *
+     * @throws If the swap is already in a failed final status.
      * @throws If the swap is not found in the manager.
+     * @throws If a completed swap has no transaction id available yet.
      */
     waitForSwapCompletion(swapId: string): Promise<{
         txid: string;
     }>;
+    /**
+     * Resolve the on-chain txid for a claimed submarine/chain swap.
+     *
+     * Chain swaps are claimed by the manager itself, so the claim txid captured
+     * from the claimArk/claimBtc callback is the swap's on-chain completion and
+     * is preferred — Boltz does not surface it via getSwapStatus at
+     * transaction.claimed. Submarine swaps (claimed by Boltz) and chain swaps
+     * we never claimed in this session (e.g. restored already-claimed) fall
+     * back to the provider status. Rejects when no transaction id is available,
+     * so callers never receive the Boltz swap id in place of a real txid.
+     */
+    private resolveClaimedTxid;
     /**
      * Check if a swap is currently being processed
      * Useful for preventing race conditions
@@ -711,6 +744,16 @@ declare class SwapManager implements SwapManagerClient {
      * Execute claim action for chain swap Ark to Btc
      */
     private executeClaimBtcAction;
+    /**
+     * Store the in-flight claim promise returned by a claim callback so
+     * {@link resolveClaimedTxid} can await it and surface the real on-chain
+     * txid at transaction.claimed — even when that update races the still
+     * in-flight claim. Storing the promise (not the resolved txid) closes the
+     * window where the txid is not yet captured when transaction.claimed
+     * arrives. Defensive against callbacks that don't return a promise (older
+     * integrations, test doubles): those simply fall back to getSwapStatus.
+     */
+    private rememberChainClaim;
     /**
      * Execute refund action for chain swap Ark to Btc
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/boltz-swap",
-  "version": "0.3.34",
+  "version": "0.3.36",
   "type": "module",
   "description": "A production-ready TypeScript package that brings Boltz submarine-swaps to Arkade.",
   "main": "./dist/index.js",
@@ -76,7 +76,7 @@
     "@scure/btc-signer": "2.0.1",
     "bip68": "1.0.4",
     "light-bolt11-decoder": "3.2.0",
-    "@arkade-os/sdk": "0.4.29"
+    "@arkade-os/sdk": "0.4.31"
   },
   "peerDependencies": {
     "expo-task-manager": ">=3.0.0",
@@ -92,7 +92,7 @@
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
-    "vite": "7.1.11"
+    "vite": "^7.3.2"
   },
   "publishConfig": {
     "access": "public",