@satora/swap 1.6.1 → 1.7.1

package/dist/index.cjs

@@ -1733,6 +1733,11 @@ var SwapWorker = class {
   #executing = /* @__PURE__ */ new Set();
   /** Swaps with a scheduled auto-claim retry (backoff timer + attempt count). */
   #retries = /* @__PURE__ */ new Map();
+  /**
+   * Swaps whose claim needs the user's wallet (RIF Relay): handed to
+   * `onActionRequired` once and not auto-run while the claim is recommended.
+   */
+  #needsUser = /* @__PURE__ */ new Set();
   #unsubs = [];
   #started = false;
   constructor(options) {
@@ -1775,6 +1780,7 @@ var SwapWorker = class {
     this.#hintSource.stop();
     for (const { timer } of this.#retries.values()) clearTimeout(timer);
     this.#retries.clear();
+    this.#needsUser.clear();
     this.#executing.clear();
   }
   /** Chain-reconcile every tracked swap (the post-outage catch-up sweep). */
@@ -1797,9 +1803,11 @@ var SwapWorker = class {
     }
     this.#hintSource.subscribe([swapId]);
     if (recommended && AUTO_EXECUTABLE.has(recommended) && this.#execute) {
+      if (this.#needsUser.has(swapId)) return;
       this.#autoExecute(swapId, actions);
       return;
     }
+    this.#needsUser.delete(swapId);
     this.#cancelRetry(swapId);
     if (!recommended) return;
     const automation = actions.actions.find(
@@ -1816,6 +1824,12 @@ var SwapWorker = class {
     if (!actionId) return;
     this.#executing.add(swapId);
     void execute(swapId, actionId).then(() => this.#cancelRetry(swapId)).catch((error) => {
+      if (needsWallet(error)) {
+        this.#cancelRetry(swapId);
+        this.#needsUser.add(swapId);
+        this.#onActionRequired?.(swapId, actions);
+        return;
+      }
       console.warn(`SwapWorker: ${actionId}(${swapId}) failed:`, error);
       this.#scheduleRetry(swapId, actions);
     }).finally(() => this.#executing.delete(swapId));
@@ -1863,6 +1877,9 @@ var SwapWorker = class {
     if (existing) clearTimeout(existing.timer);
   }
 };
+function needsWallet(error) {
+  return error instanceof Error && error.name === "WalletClaimRequiredError";
+}
 
 // src/hints/ws-status-source.ts
 var MAX_ARGS_PER_FRAME = 64;
@@ -2108,6 +2125,12 @@ function buildArkadeVhtlcRef(input) {
 
 // src/tracker/from-swap.ts
 var ms = (seconds2) => seconds2 * 1e3;
+var ONCHAIN_CLAIM_MARGIN_SECONDS = 30 * 60;
+function onchainClaimDeadline(refundLocktime, network) {
+  const net = network?.toLowerCase();
+  const mainnet = net === "bitcoin" || net === "mainnet";
+  return ms(refundLocktime - (mainnet ? ONCHAIN_CLAIM_MARGIN_SECONDS : 0));
+}
 var MAINNET_LOCKED_TOKEN = {
   1: "0x18084fba666a33d37592fa2633fd49a74dd93a88",
   // tBTC
@@ -2382,6 +2405,37 @@ function swapToTracked(stored) {
         serverRefundLocktime: 0
         // no on-chain server leg
       };
+    // The user's payment is held off-chain; the server funds the BTC HTLC
+    // the client claims.
+    case "lightning_to_bitcoin":
+      return {
+        swapId: r.id,
+        serverHtlc: bitcoinLeg(
+          r.btc_htlc_address,
+          r.hash_lock,
+          Number(r.target_amount)
+        ),
+        clientRefundLocktime: 0,
+        // no on-chain client leg
+        serverRefundLocktime: onchainClaimDeadline(
+          r.btc_refund_locktime,
+          r.network
+        )
+      };
+    // Client funds the BTC HTLC; the server pays the invoice and sweeps it.
+    case "bitcoin_to_lightning":
+      return {
+        swapId: r.id,
+        clientHtlc: bitcoinLeg(
+          r.btc_htlc_address,
+          r.hash_lock,
+          Number(r.source_amount),
+          CLIENT_FUNDING_MIN_CONFIRMATIONS
+        ),
+        clientRefundLocktime: ms(r.btc_refund_locktime),
+        serverRefundLocktime: 0
+        // no on-chain server leg
+      };
     default:
       return void 0;
   }
@@ -2877,6 +2931,10 @@ var Client = class {
     return this.#legacy.getChainConfig(...args);
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  getRifRelay(...args) {
+    return this.#legacy.getRifRelay(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   getReferralFee(...args) {
     return this.#legacy.getReferralFee(...args);
   }
@@ -3013,6 +3071,18 @@ var Client = class {
     );
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  createLightningToBitcoinSwap(...args) {
+    return this.#trackAfterCreate(
+      this.#legacy.createLightningToBitcoinSwap(...args)
+    );
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
+  createBitcoinToLightningSwap(...args) {
+    return this.#trackAfterCreate(
+      this.#legacy.createBitcoinToLightningSwap(...args)
+    );
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   createEvmToLightningSwap(...args) {
     return this.#trackAfterCreate(
       this.#legacy.createEvmToLightningSwap(...args)
@@ -3041,10 +3111,22 @@ var Client = class {
     return this.#legacy.fundSwap(...args);
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  fundSwapFromSolana(...args) {
+    return this.#legacy.fundSwapFromSolana(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
+  getSolanaUsdcBalance(...args) {
+    return this.#legacy.getSolanaUsdcBalance(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   refundEvmWithSigner(...args) {
     return this.#legacy.refundEvmWithSigner(...args);
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  refundEvmSponsored(...args) {
+    return this.#legacy.refundEvmSponsored(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   collabRefundEvmWithSigner(...args) {
     return this.#legacy.collabRefundEvmWithSigner(...args);
   }
@@ -3069,6 +3151,10 @@ var Client = class {
     return this.#trackAfterRetry(this.#legacy.continueRefundedEvmSwap(...args));
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  recoverCctpInboundSwap(...args) {
+    return this.#legacy.recoverCctpInboundSwap(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   recoverGaslessFunds(...args) {
     return this.#legacy.recoverGaslessFunds(...args);
   }
@@ -3497,6 +3583,10 @@ var ClientBuilder = class {
     this.#inner.withAa(...args);
     return this;
   }
+  withSolanaRpcUrl(...args) {
+    this.#inner.withSolanaRpcUrl(...args);
+    return this;
+  }
   withLogger(...args) {
     this.#inner.withLogger(...args);
     return this;