@satora/swap 1.7.2 → 1.8.0

package/dist/index.cjs

@@ -720,13 +720,10 @@ async function fetchArkadeSpend(source, spentByTxid, paymentHash) {
 
 // src/contracts/arkade-manager.ts
 function isFunded(vtxo) {
-  const { state } = vtxo.virtualStatus;
-  return state === "preconfirmed" || state === "settled";
+  return !vtxo.isSpent && !vtxo.isSwept;
 }
 function spendTxid(vtxos) {
-  const spent = vtxos.find(
-    (v) => v.arkTxId || v.spentBy || v.isSpent || v.virtualStatus.state === "spent"
-  );
+  const spent = vtxos.find((v) => v.arkTxId || v.spentBy || v.isSpent);
   return spent?.arkTxId ?? spent?.spentBy;
 }
 var ArkadeContractManager = class _ArkadeContractManager {
@@ -1772,6 +1769,17 @@ var SwapWorker = class {
       )
     );
   }
+  /**
+   * Put swaps on the hint feed as soon as they are tracked. {@link #onActions}
+   * subscribes a swap when its first action is emitted, but a swap whose leg
+   * cannot be classified yet (an unfunded lock on a chain without `eth_getLogs`)
+   * emits nothing, and without this it would never receive the server hint
+   * that its funding landed.
+   */
+  subscribe(swapIds) {
+    if (swapIds.length === 0) return;
+    this.#hintSource.subscribe(swapIds);
+  }
   /** Stop reacting, cancel pending retries, and close the hint feed. */
   stop() {
     this.#started = false;
@@ -1823,7 +1831,7 @@ var SwapWorker = class {
     const actionId = actions.recommended;
     if (!actionId) return;
     this.#executing.add(swapId);
-    void execute(swapId, actionId).then(() => this.#cancelRetry(swapId)).catch((error) => {
+    void execute(swapId, actionId, actions).then(() => this.#cancelRetry(swapId)).catch((error) => {
       if (needsWallet(error)) {
         this.#cancelRetry(swapId);
         this.#needsUser.add(swapId);
@@ -2236,7 +2244,7 @@ function swapToTracked(stored) {
           token: r.evm_htlc_kind === "native" ? import_lendaswap_sdk_pure2.NATIVE_TOKEN_ADDRESS : lockedTokenFallback(r.evm_chain_id, r.network),
           // The coordinator created the HTLC on the client's behalf, so it
           // is the lock's sender (refund address), as on evm_to_lightning.
-          sender: r.evm_coordinator_address,
+          sender: r.evm_htlc_kind === "native" && r.evm_coordinator_address.toLowerCase() === import_lendaswap_sdk_pure2.NATIVE_TOKEN_ADDRESS ? r.client_evm_address ?? void 0 : r.evm_coordinator_address,
           timelockSec: r.evm_refund_locktime,
           createdAt: r.created_at
         }),
@@ -2286,7 +2294,7 @@ function swapToTracked(stored) {
           token: r.wbtc_address,
           // The coordinator created the HTLC on the client's behalf, so it
           // is the lock's sender (refund address).
-          sender: r.evm_coordinator_address,
+          sender: r.evm_htlc_kind === "native" && r.evm_coordinator_address.toLowerCase() === import_lendaswap_sdk_pure2.NATIVE_TOKEN_ADDRESS ? r.client_evm_address ?? void 0 : r.evm_coordinator_address,
           timelockSec: r.evm_refund_locktime,
           createdAt: r.created_at
         }),
@@ -2381,7 +2389,7 @@ function swapToTracked(stored) {
           // the server claims the client's EVM HTLC
           expectedSats: r.evm_expected_sats,
           token: r.wbtc_address,
-          sender: r.evm_coordinator_address,
+          sender: r.evm_htlc_kind === "native" && r.evm_coordinator_address.toLowerCase() === import_lendaswap_sdk_pure2.NATIVE_TOKEN_ADDRESS ? r.client_evm_address ?? void 0 : r.evm_coordinator_address,
           // the coordinator locks on the client's behalf
           timelockSec: r.evm_refund_locktime,
           createdAt: r.created_at
@@ -3003,6 +3011,9 @@ var Client = class {
     return this.#legacy.claim(...args);
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  canSponsorClaim(...args) {
+    return this.#legacy.canSponsorClaim(...args);
+  }
   claimEvmWithSigner(...args) {
     return this.#legacy.claimEvmWithSigner(...args);
   }
@@ -3031,6 +3042,26 @@ var Client = class {
     return this.#legacy.buildCollabRefundEvmTypedData(...args);
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  getCollabRefundEvmSignature(...args) {
+    return this.#legacy.getCollabRefundEvmSignature(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
+  getRehashEvmParams(...args) {
+    return this.#legacy.getRehashEvmParams(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
+  signRehashEvm(...args) {
+    return this.#legacy.signRehashEvm(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
+  retrySwapWithInvoice(...args) {
+    return this.#legacy.retrySwapWithInvoice(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
+  retrySwapWithInvoiceWithSigner(...args) {
+    return this.#legacy.retrySwapWithInvoiceWithSigner(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   collabRefundEvmSwap(...args) {
     return this.#legacy.collabRefundEvmSwap(...args);
   }
@@ -3106,9 +3137,14 @@ var Client = class {
   getPermit2FundingParamsUnsigned(...args) {
     return this.#legacy.getPermit2FundingParamsUnsigned(...args);
   }
-  /** Delegated to the legacy client (migration checkpoint). */
-  fundSwap(...args) {
-    return this.#legacy.fundSwap(...args);
+  /**
+   * Fund the swap, then re-verify it against the chain so the lock shows up
+   * in the derived actions without waiting on a server hint.
+   */
+  async fundSwap(...args) {
+    const result = await this.#legacy.fundSwap(...args);
+    this.#reverifyAfterFunding(args[0]);
+    return result;
   }
   /** Delegated to the legacy client (migration checkpoint). */
   fundSwapFromSolana(...args) {
@@ -3135,6 +3171,10 @@ var Client = class {
     return this.#legacy.fundSwapGasless(...args);
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  getEvmFundingExpectation(...args) {
+    return this.#legacy.getEvmFundingExpectation(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   getSwapDepositorKey(...args) {
     return this.#legacy.getSwapDepositorKey(...args);
   }
@@ -3335,11 +3375,37 @@ var Client = class {
     for (const swap of swaps) {
       try {
         await tracker.track(swap);
+        if (tracker.trackedSwapIds().includes(swap.swapId))
+          this.#worker?.subscribe([swap.swapId]);
       } catch (error) {
         console.warn(`Client: tracking swap ${swap.swapId} failed:`, error);
       }
     }
   }
+  /**
+   * Re-verify a swap against the chain right after this client funded it.
+   * The funding is mined when `fundSwap` resolves, but nothing else tells the
+   * tracker so: a server hint arrives only after the server's own monitor
+   * sees the lock (on Rootstock, a 30 s poll plus confirmations), and the
+   * tracker's at-risk poll does not re-read an `absent` client leg. One
+   * targeted read moves the swap to `clientfunded` at once. Fire-and-forget:
+   * the funding succeeded whatever the re-verify does, and a swap that is not
+   * tracked is a no-op.
+   *
+   * Chain-verified tracking only: a hints-only tracker has no chain to read,
+   * its `applyHint` re-fetches the server's stored status, which lags the
+   * lock by the same server-side delay this works around.
+   */
+  #reverifyAfterFunding(swapId) {
+    if (typeof swapId !== "string" || !(this.#tracker instanceof SwapTracker))
+      return;
+    void this.#tracker.applyHint(swapId).catch((error) => {
+      console.warn(
+        `Client: re-verify after funding ${swapId} failed (the tracker's next read catches up):`,
+        error
+      );
+    });
+  }
   /**
    * Wire the server status WebSocket into a {@link SwapWorker} whenever a server
    * URL is configured: pushed status transitions trigger a targeted chain
@@ -3352,7 +3418,10 @@ var Client = class {
     const serverUrl = this.#tracking.serverUrl ?? legacyBaseUrl(this.#legacy);
     if (!serverUrl) return;
     const autoClaim = this.#tracking.autoClaim;
-    const hintSource = new WsStatusSource({ serverUrl });
+    const hintSource = new WsStatusSource({
+      serverUrl,
+      webSocketFactory: this.#tracking.webSocketFactory
+    });
     const worker = new SwapWorker({
       tracker,
       hintSource,