@satora/swap 1.3.2 → 1.4.0

package/dist/index.d.cts

@@ -161,6 +161,16 @@ type SwapActionInput = {
      * `false`, `pending` resolves to `wait` (not `fund`) and no refund is offered.
      */
     clientFunds?: boolean;
+    /**
+     * Whether the server's leg is an on-chain HTLC the client claims (the
+     * default). `false` for receive-on-Lightning swaps (`*_to_lightning`): there
+     * the server "funds" by paying the client's invoice off-chain, so there is
+     * nothing to claim and no claim window — {@link serverRefundLocktime} is
+     * meaningless. When `false`, `serverfunded` (the payment is in flight)
+     * resolves to `wait`, with the unilateral refund listed but blocked until
+     * the client's own timelock, exactly like `clientfunded`.
+     */
+    serverFunds?: boolean;
 };
 /** On-chain state of one HTLC in a swap. */
 type HtlcObservation = "absent" | "mempool" | "confirmed" | "invalid" | "spent_claim" | "spent_refund";
@@ -682,6 +692,8 @@ declare class Client {
     /** Delegated to the legacy client (migration checkpoint). */
     createArkadeToLightningSwap(...args: Parameters<Client$1["createArkadeToLightningSwap"]>): ReturnType<Client$1["createArkadeToLightningSwap"]>;
     /** Delegated to the legacy client (migration checkpoint). */
+    createEvmToLightningSwap(...args: Parameters<Client$1["createEvmToLightningSwap"]>): ReturnType<Client$1["createEvmToLightningSwap"]>;
+    /** Delegated to the legacy client (migration checkpoint). */
     createEvmToArkadeSwapGeneric(...args: Parameters<Client$1["createEvmToArkadeSwapGeneric"]>): ReturnType<Client$1["createEvmToArkadeSwapGeneric"]>;
     /** Delegated to the legacy client (migration checkpoint). */
     createEvmToBitcoinSwap(...args: Parameters<Client$1["createEvmToBitcoinSwap"]>): ReturnType<Client$1["createEvmToBitcoinSwap"]>;

package/dist/index.d.ts

@@ -161,6 +161,16 @@ type SwapActionInput = {
      * `false`, `pending` resolves to `wait` (not `fund`) and no refund is offered.
      */
     clientFunds?: boolean;
+    /**
+     * Whether the server's leg is an on-chain HTLC the client claims (the
+     * default). `false` for receive-on-Lightning swaps (`*_to_lightning`): there
+     * the server "funds" by paying the client's invoice off-chain, so there is
+     * nothing to claim and no claim window — {@link serverRefundLocktime} is
+     * meaningless. When `false`, `serverfunded` (the payment is in flight)
+     * resolves to `wait`, with the unilateral refund listed but blocked until
+     * the client's own timelock, exactly like `clientfunded`.
+     */
+    serverFunds?: boolean;
 };
 /** On-chain state of one HTLC in a swap. */
 type HtlcObservation = "absent" | "mempool" | "confirmed" | "invalid" | "spent_claim" | "spent_refund";
@@ -682,6 +692,8 @@ declare class Client {
     /** Delegated to the legacy client (migration checkpoint). */
     createArkadeToLightningSwap(...args: Parameters<Client$1["createArkadeToLightningSwap"]>): ReturnType<Client$1["createArkadeToLightningSwap"]>;
     /** Delegated to the legacy client (migration checkpoint). */
+    createEvmToLightningSwap(...args: Parameters<Client$1["createEvmToLightningSwap"]>): ReturnType<Client$1["createEvmToLightningSwap"]>;
+    /** Delegated to the legacy client (migration checkpoint). */
     createEvmToArkadeSwapGeneric(...args: Parameters<Client$1["createEvmToArkadeSwapGeneric"]>): ReturnType<Client$1["createEvmToArkadeSwapGeneric"]>;
     /** Delegated to the legacy client (migration checkpoint). */
     createEvmToBitcoinSwap(...args: Parameters<Client$1["createEvmToBitcoinSwap"]>): ReturnType<Client$1["createEvmToBitcoinSwap"]>;

package/dist/index.js

@@ -19,7 +19,8 @@ function deriveSwapActions(input) {
     serverChainNow,
     clientRefundLocktime,
     serverRefundLocktime,
-    clientFunds = true
+    clientFunds = true,
+    serverFunds = true
   } = input;
   switch (status) {
     case "pending": {
@@ -104,6 +105,36 @@ function deriveSwapActions(input) {
       return { recommended: "wait", actions: [wait, refund] };
     }
     case "serverfunded": {
+      if (!serverFunds) {
+        const refundUnlocked2 = clientChainNow >= clientRefundLocktime;
+        if (refundUnlocked2) {
+          const refund3 = {
+            id: "refund_unilateral",
+            recommended: true,
+            automation: "confirm",
+            reason: "Reclaim your deposit."
+          };
+          return { recommended: "refund_unilateral", actions: [refund3] };
+        }
+        const wait2 = {
+          id: "wait",
+          waitingOn: "server_funding",
+          recommended: true,
+          automation: "auto",
+          reason: "Waiting for the Lightning payment to settle."
+        };
+        const refund2 = {
+          id: "refund_unilateral",
+          recommended: false,
+          automation: "confirm",
+          reason: "Refund becomes available once the timelock passes.",
+          blockedBy: {
+            kind: "timelock_not_expired",
+            message: "The refund timelock has not passed yet."
+          }
+        };
+        return { recommended: "wait", actions: [wait2, refund2] };
+      }
       const claimWindowClosed = serverChainNow >= serverRefundLocktime;
       if (!claimWindowClosed) {
         const claim = {
@@ -1328,8 +1359,10 @@ var HintTracker = class {
       serverChainNow: now,
       clientRefundLocktime: swap.clientRefundLocktime,
       serverRefundLocktime: swap.serverRefundLocktime,
-      // Pay-on-Lightning swaps have no client-funded on-chain leg.
-      clientFunds: swap.clientHtlc !== void 0
+      // Pay-on-Lightning swaps have no client-funded on-chain leg;
+      // receive-on-Lightning swaps have no server-funded one.
+      clientFunds: swap.clientHtlc !== void 0,
+      serverFunds: swap.serverHtlc !== void 0
     });
     const previous = this.#lastActions.get(swap.swapId);
     if (!force && previous && JSON.stringify(previous) === JSON.stringify(actions))
@@ -1955,6 +1988,29 @@ function swapToTracked(stored) {
         // no on-chain client leg
         serverRefundLocktime: ms(r.vhtlc_refund_locktime)
       };
+    // Client funds the EVM HTLC (evm_expected_sats of the BTC-pegged token);
+    // the server pays the Lightning invoice off-chain and claims the HTLC —
+    // no server leg to watch.
+    case "evm_to_lightning":
+      return {
+        swapId: r.id,
+        clientHtlc: evmLeg({
+          chainId: r.evm_chain_id,
+          htlc: r.evm_htlc_address,
+          hashLock: r.hash_lock,
+          claimAddress: r.server_evm_address,
+          // the server claims the client's EVM HTLC
+          expectedSats: r.evm_expected_sats,
+          token: r.wbtc_address,
+          sender: r.evm_coordinator_address,
+          // the coordinator locks on the client's behalf
+          timelockSec: r.evm_refund_locktime,
+          createdAt: r.created_at
+        }),
+        clientRefundLocktime: ms(r.evm_refund_locktime),
+        serverRefundLocktime: 0
+        // no on-chain server leg
+      };
     // Client funds the Arkade VHTLC (source_amount); the server pays the
     // Lightning invoice off-chain and claims the VHTLC — no server leg to
     // watch.
@@ -2217,8 +2273,10 @@ var SwapTracker = class {
         serverChainNow,
         clientRefundLocktime: swap.clientRefundLocktime,
         serverRefundLocktime: swap.serverRefundLocktime,
-        // Pay-on-Lightning swaps have no client-funded on-chain leg.
-        clientFunds: swap.clientHtlc !== void 0
+        // Pay-on-Lightning swaps have no client-funded on-chain leg;
+        // receive-on-Lightning swaps have no server-funded one.
+        clientFunds: swap.clientHtlc !== void 0,
+        serverFunds: swap.serverHtlc !== void 0
       }),
       // Expose the raw observations so consumers can render progress from
       // chain facts (which leg is funded/spent) even when the server is
@@ -2510,6 +2568,12 @@ var Client = class {
     );
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  createEvmToLightningSwap(...args) {
+    return this.#trackAfterCreate(
+      this.#legacy.createEvmToLightningSwap(...args)
+    );
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   createEvmToArkadeSwapGeneric(...args) {
     return this.#trackAfterCreate(
       this.#legacy.createEvmToArkadeSwapGeneric(...args)