@satora/swap 1.4.0 → 1.6.0

package/dist/index.js

@@ -1,11 +1,12 @@
+import {
+  electrumReader
+} from "./chunk-3ZMSZSAV.js";
 import {
   DEFAULT_ESPLORA_URLS,
   esploraReader,
-  htlcFactsFromEsploraTxs
-} from "./chunk-THI4UO6R.js";
-import {
-  electrumReader
-} from "./chunk-FTPIQSRW.js";
+  htlcFactsFromEsploraTxs,
+  resolveMinConfirmations
+} from "./chunk-LSCRTQOS.js";
 
 // src/index.ts
 export * from "@lendasat/lendaswap-sdk-pure";
@@ -621,7 +622,7 @@ var BitcoinContractManager = class _BitcoinContractManager {
     return new _BitcoinContractManager(deps);
   }
   static async create(config) {
-    const { esploraReader: esploraReader2 } = await import("./bitcoin-reader-esplora-ZLPMM5FF.js");
+    const { esploraReader: esploraReader2 } = await import("./bitcoin-reader-esplora-B2BDEI6Z.js");
     let reader = esploraReader2(
       config.esploraUrl,
       void 0,
@@ -629,7 +630,7 @@ var BitcoinContractManager = class _BitcoinContractManager {
     );
     if (config.electrumWsUrl) {
       const [{ electrumReader: electrumReader2 }, { ElectrumWsClient }] = await Promise.all([
-        import("./bitcoin-reader-electrum-PY7DHD6T.js"),
+        import("./bitcoin-reader-electrum-KEI7VWW6.js"),
         import("@lendasat/lendaswap-sdk-pure")
       ]);
       reader = electrumReader2(new ElectrumWsClient(config.electrumWsUrl), {
@@ -813,7 +814,10 @@ function refQueryKey(ref) {
 var AVG_BLOCK_MS = {
   1: 12e3,
   137: 2100,
-  42161: 250
+  42161: 250,
+  30: 3e4,
+  31: 3e4
+  // Rootstock testnet: same merge-mined cadence
 };
 var SCAN_MARGIN_BLOCKS = 1000n;
 var EvmContractManager = class _EvmContractManager {
@@ -994,7 +998,10 @@ var EvmContractManager = class _EvmContractManager {
     for (const ref of refs) {
       const { observation, preimage } = evmObservation(
         events.get(refQueryKey(ref)) ?? [],
-        { amount: ref.expectedAmount, token: ref.expectedToken }
+        {
+          amount: ref.minAmount ?? ref.expectedAmount,
+          token: ref.expectedToken
+        }
       );
       const key = htlcKey(ref);
       if (preimage) this.#preimages.set(key, preimage);
@@ -1079,7 +1086,10 @@ var DEFAULT_EVM_RPCS = {
     "https://arb1.arbitrum.io/rpc",
     "https://arbitrum.drpc.org",
     "https://arbitrum-one-rpc.publicnode.com"
-  ]
+  ],
+  // Rootstock: the public node, HTTP only (no WebSocket endpoint exists).
+  30: ["https://public-node.rsk.co"],
+  31: ["https://public-node.testnet.rsk.co"]
 };
 var SWAP_CREATED = parseAbiItem(
   "event SwapCreated(bytes32 indexed preimageHash, address indexed refundAddress, address indexed claimAddress, address token, uint256 amount, uint256 timelock, bytes32 key)"
@@ -1112,25 +1122,52 @@ function activeKey(q) {
     }
   });
 }
-function evmReaderFromClient(client) {
+function evmReaderFromClient(client, options = {}) {
+  const { maxBlockRange } = options;
+  async function getLogs(filter, fromBlock) {
+    if (maxBlockRange === void 0) {
+      return client.request({
+        method: "eth_getLogs",
+        params: [{ ...filter, fromBlock: numberToHex(fromBlock) }]
+      });
+    }
+    const latest = (await client.getBlock()).number;
+    if (latest === null) {
+      throw new Error("latest block has no number");
+    }
+    const logs = [];
+    for (let from = fromBlock; from <= latest; from += maxBlockRange) {
+      const to = from + maxBlockRange - 1n < latest ? from + maxBlockRange - 1n : latest;
+      logs.push(
+        ...await client.request({
+          method: "eth_getLogs",
+          params: [
+            {
+              ...filter,
+              fromBlock: numberToHex(from),
+              toBlock: numberToHex(to)
+            }
+          ]
+        })
+      );
+    }
+    return logs;
+  }
   return {
     async getHtlcEventsBatch(queries, fromBlock = 0n) {
       const results = /* @__PURE__ */ new Map();
       if (queries.length === 0) return results;
       for (const q of queries) results.set(htlcQueryKey(q), []);
-      const logs = await client.request({
-        method: "eth_getLogs",
-        params: [
-          {
-            address: unique(queries.map((q) => q.htlc)),
-            topics: [
-              HTLC_EVENT_TOPICS,
-              unique(queries.map((q) => q.preimageHash))
-            ],
-            fromBlock: numberToHex(fromBlock)
-          }
-        ]
-      });
+      const logs = await getLogs(
+        {
+          address: unique(queries.map((q) => q.htlc)),
+          topics: [
+            HTLC_EVENT_TOPICS,
+            unique(queries.map((q) => q.preimageHash))
+          ]
+        },
+        fromBlock
+      );
       const grouped = /* @__PURE__ */ new Map();
       for (const log of logs) {
         const decoded = tryDecode(log);
@@ -1246,12 +1283,16 @@ function toHtlcEvent(decoded, query) {
 function unique(values) {
   return [...new Set(values)];
 }
-function createEvmRpcReader(rpcUrls) {
+function createEvmRpcReader(rpcUrls, options = {}) {
   const urls = Array.isArray(rpcUrls) ? rpcUrls : [rpcUrls];
   const transport = urls.length > 1 ? fallback(urls.map((url) => http(url))) : http(urls[0]);
   const client = createPublicClient({ transport });
-  return evmReaderFromClient(client);
+  return evmReaderFromClient(client, options);
 }
+var EVM_LOG_RANGE_LIMITS = {
+  30: 2000n,
+  31: 2000n
+};
 function defaultEvmReaders(overrides) {
   const chainIds = /* @__PURE__ */ new Set([
     ...Object.keys(DEFAULT_EVM_RPCS).map(Number),
@@ -1262,7 +1303,13 @@ function defaultEvmReaders(overrides) {
     const override = overrides?.[chainId];
     const defaults = DEFAULT_EVM_RPCS[chainId] ?? [];
     const urls = override ? [override, ...defaults] : defaults;
-    if (urls.length > 0) readers.set(chainId, createEvmRpcReader(urls));
+    if (urls.length > 0)
+      readers.set(
+        chainId,
+        createEvmRpcReader(urls, {
+          maxBlockRange: EVM_LOG_RANGE_LIMITS[chainId]
+        })
+      );
   }
   return readers;
 }
@@ -1717,6 +1764,11 @@ function defaultWebSocketFactory(url) {
   return new WS(url);
 }
 
+// src/tracker/from-swap.ts
+import {
+  NATIVE_TOKEN_ADDRESS
+} from "@lendasat/lendaswap-sdk-pure";
+
 // src/contracts/arkade-vhtlc.ts
 import { VHTLCContractHandler } from "@arkade-os/sdk";
 import {
@@ -1805,6 +1857,7 @@ function evmLeg(args) {
     preimageHash: ensure0x(args.hashLock),
     claimAddress: ensure0x(args.claimAddress),
     expectedAmount: BigInt(args.expectedSats),
+    minAmount: args.minAmount,
     expectedToken: args.token ? ensure0x(args.token) : void 0,
     sender: args.sender ? ensure0x(args.sender) : void 0,
     timelockSec: args.timelockSec,
@@ -1812,6 +1865,13 @@ function evmLeg(args) {
   };
 }
 var CLIENT_FUNDING_MIN_CONFIRMATIONS = 1;
+var FEE_ROUNDING_SLACK_SATS = 2;
+function minServerPayout(r) {
+  return Math.max(
+    0,
+    Number(r.target_amount) - r.fee_sats - FEE_ROUNDING_SLACK_SATS
+  );
+}
 function bitcoinLeg(address, hashLock, expectedSats, minConfirmations) {
   return {
     ledger: "bitcoin",
@@ -1856,15 +1916,19 @@ function swapToTracked(stored) {
           claimAddress: r.server_evm_address,
           // the server claims the client's EVM HTLC
           expectedSats: r.evm_expected_sats,
-          // evm_to_arkade doesn't expose the locked token — fall back to the
-          // per-chain mainnet constant so the isActive tuple is complete.
-          token: lockedTokenFallback(r.evm_chain_id, r.network),
-          sender: r.client_evm_address,
-          // the client funded it
+          minAmount: 0n,
+          // see SHORT_LOCK_RULE
+          // A native lock's asset word is zero; an ERC20 lock's token is not
+          // on this response yet, so fall back to the per-chain mainnet
+          // constant to complete the isActive tuple.
+          token: r.evm_htlc_kind === "native" ? 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,
           timelockSec: r.evm_refund_locktime,
           createdAt: r.created_at
         }),
-        serverHtlc: arkadeLeg(r, r.btc_vhtlc_address, Number(r.target_amount)),
+        serverHtlc: arkadeLeg(r, r.btc_vhtlc_address, minServerPayout(r)),
         clientRefundLocktime: ms(r.evm_refund_locktime),
         serverRefundLocktime: ms(r.vhtlc_refund_locktime)
       };
@@ -1905,16 +1969,19 @@ function swapToTracked(stored) {
           claimAddress: r.server_evm_address,
           // the server claims the client's EVM HTLC
           expectedSats: r.evm_expected_sats,
+          minAmount: 0n,
+          // see SHORT_LOCK_RULE
           token: r.wbtc_address,
-          sender: r.client_evm_address,
-          // the client funded it
+          // The coordinator created the HTLC on the client's behalf, so it
+          // is the lock's sender (refund address).
+          sender: r.evm_coordinator_address,
           timelockSec: r.evm_refund_locktime,
           createdAt: r.created_at
         }),
         serverHtlc: bitcoinLeg(
           r.btc_htlc_address,
           r.evm_hash_lock,
-          Number(r.target_amount)
+          minServerPayout(r)
         ),
         clientRefundLocktime: ms(r.evm_refund_locktime),
         serverRefundLocktime: ms(r.btc_refund_locktime)
@@ -2032,21 +2099,38 @@ function swapToTracked(stored) {
 }
 
 // src/tracker/swap-tracker.ts
+var CLAIM_SUBMITTED = /* @__PURE__ */ new Set([
+  "clientredeeming",
+  "clientredeemed",
+  "serverredeemed"
+]);
+var DEFAULT_AT_RISK_RECONCILE_INTERVAL_MS = 6e4;
+var RETRY_UNREGISTERED_INTERVAL_MS = 6e4;
 var SwapTracker = class {
   #managers;
   #swaps = /* @__PURE__ */ new Map();
+  /**
+   * Swaps whose startup registration failed (a chain read that errored).
+   * Retried every minute; dropping them would leave an active swap
+   * unwatched for the whole session with no claim or refund surfaced.
+   */
+  #unregistered = /* @__PURE__ */ new Map();
   /** Last actions emitted per swap — for dedupe and the subscribe-time snapshot. */
   #lastActions = /* @__PURE__ */ new Map();
+  /** The latest server status hint per swap, for {@link #withClaimHint}. */
+  #hintStatuses = /* @__PURE__ */ new Map();
   #subscribers = /* @__PURE__ */ new Set();
   #refreshIntervalMs;
   #atRiskReconcileIntervalMs;
   #lastAtRiskReconcileAt = 0;
+  #lastRetryAt = 0;
   #eventUnsubs = [];
   #timer;
   constructor(managers, options) {
     this.#managers = managers;
     this.#refreshIntervalMs = options?.refreshIntervalMs ?? 0;
-    this.#atRiskReconcileIntervalMs = options?.atRiskReconcileIntervalMs ?? 6e4;
+    const atRisk = options?.atRiskReconcileIntervalMs ?? DEFAULT_AT_RISK_RECONCILE_INTERVAL_MS;
+    this.#atRiskReconcileIntervalMs = typeof atRisk === "function" ? atRisk : () => atRisk;
   }
   /**
    * Whether every on-chain leg of `swap` is observable — i.e. the tracker can
@@ -2069,7 +2153,22 @@ var SwapTracker = class {
         continue;
       }
       this.#swaps.set(swap.swapId, swap);
-      for (const leg of legsOf(swap)) await this.#managerFor(leg).register(leg);
+      const registered = [];
+      try {
+        for (const leg of legsOf(swap)) {
+          await this.#managerFor(leg).register(leg);
+          registered.push(leg);
+        }
+      } catch (error) {
+        this.#swaps.delete(swap.swapId);
+        for (const leg of registered)
+          void this.#managerFor(leg).unregister(leg);
+        this.#unregistered.set(swap.swapId, swap);
+        console.warn(
+          `SwapTracker: swap ${swap.swapId} not tracked yet, registering its legs failed (will retry):`,
+          error
+        );
+      }
     }
     for (const manager of new Set(this.#managers.values())) {
       this.#eventUnsubs.push(manager.onEvent(() => this.#recomputeAll()));
@@ -2077,6 +2176,7 @@ var SwapTracker = class {
     await this.#refreshManagers();
     this.#recomputeAll();
     this.#lastAtRiskReconcileAt = Date.now();
+    this.#lastRetryAt = this.#lastAtRiskReconcileAt;
     if (this.#refreshIntervalMs > 0)
       this.#timer = setInterval(
         () => void this.#tick(),
@@ -2126,7 +2226,11 @@ var SwapTracker = class {
    */
   async #tick() {
     const now = Date.now();
-    if (now - this.#lastAtRiskReconcileAt >= this.#atRiskReconcileIntervalMs) {
+    if (now - this.#lastRetryAt >= RETRY_UNREGISTERED_INTERVAL_MS) {
+      this.#lastRetryAt = now;
+      await this.#retryUnregistered();
+    }
+    if (now - this.#lastAtRiskReconcileAt >= this.#atRiskReconcileIntervalMs()) {
       this.#lastAtRiskReconcileAt = now;
       const legs = [...this.#swaps.values()].filter((swap) => this.#isAtRisk(swap)).flatMap((swap) => legsOf(swap));
       await Promise.all(
@@ -2139,6 +2243,25 @@ var SwapTracker = class {
     }
     this.#recomputeAll();
   }
+  /**
+   * Second attempt at swaps whose startup registration failed, on its own
+   * cadence so a slow at-risk interval can't delay it. `track` is idempotent
+   * and rolls back on failure, so a chain that is still down just leaves the
+   * swap here for the next round.
+   */
+  async #retryUnregistered() {
+    for (const [swapId, swap] of this.#unregistered) {
+      try {
+        await this.track(swap);
+        this.#unregistered.delete(swapId);
+      } catch (error) {
+        console.warn(
+          `SwapTracker: retrying registration of ${swapId} failed:`,
+          error
+        );
+      }
+    }
+  }
   /**
    * Whether a swap needs chain-verified monitoring independent of the server:
    * its client leg holds (or held) funds on-chain, so knowing when a refund
@@ -2198,6 +2321,7 @@ var SwapTracker = class {
   async applyHint(swapId, opts) {
     const swap = this.#swaps.get(swapId);
     if (!swap) return;
+    if (opts?.status !== void 0) this.#hintStatuses.set(swapId, opts.status);
     const legs = legsOf(swap);
     const results = await Promise.allSettled(
       legs.map((leg) => this.#managerFor(leg).reconcile(leg))
@@ -2234,6 +2358,7 @@ var SwapTracker = class {
       for (const leg of legsOf(swap))
         void this.#managerFor(leg).unregister(leg);
     this.#swaps.clear();
+    this.#unregistered.clear();
     this.#subscribers.clear();
   }
   #managerFor(ref) {
@@ -2245,6 +2370,28 @@ var SwapTracker = class {
   #recomputeAll() {
     for (const swap of this.#swaps.values()) this.#recompute(swap);
   }
+  /**
+   * A server hint that the claim was submitted overrides a chain view that
+   * still says "claim now". The claim is relayed by the server, so once it
+   * reports the redeem in flight, another claim can only be refused; and a
+   * chain that cannot be read (no `eth_getLogs` on the public Rootstock RPCs)
+   * keeps its stale pre-claim observation for good. The chain still wins once
+   * it moves: a fresh `spent_claim` derives past the hint on its own, and a
+   * refund observed on chain is not overridden.
+   *
+   * The override lasts only while the server's claim window is open. Once the
+   * server can refund its leg, the chain view is what protects the client: the
+   * `serverfunded` rules never claim then and lead to the client's own refund
+   * at its timelock. A claim that really landed shows up on chain long before
+   * that; a hint that never did must not hide the refund.
+   */
+  #withClaimHint(swap, derived, serverChainNow) {
+    const hint = this.#hintStatuses.get(swap.swapId);
+    if (hint === void 0 || !CLAIM_SUBMITTED.has(hint)) return derived;
+    if (derived !== "serverfunded") return derived;
+    const claimWindowOpen = serverChainNow < swap.serverRefundLocktime;
+    return claimWindowOpen ? hint : derived;
+  }
   #recompute(swap, force = false) {
     let clientHtlc;
     let serverHtlc;
@@ -2264,8 +2411,9 @@ var SwapTracker = class {
       if (serverHtlc === void 0 || now === void 0) return;
       serverChainNow = now;
     }
-    const status = deriveSwapStatus({ clientHtlc, serverHtlc });
-    if (status === void 0) return;
+    const derived = deriveSwapStatus({ clientHtlc, serverHtlc });
+    if (derived === void 0) return;
+    const status = this.#withClaimHint(swap, derived, serverChainNow);
     const actions = {
       ...deriveSwapActions({
         status,
@@ -2316,12 +2464,16 @@ var Client = class {
   #startPromise;
   /** Swap ids whose settled status was already re-fetched this session. */
   #settledSyncDone = /* @__PURE__ */ new Set();
+  /** Read per chain read, so it can change without rebuilding the client. */
+  #bitcoinMinConfirmations;
   constructor(...args) {
     if (args[0] instanceof LegacyClient) {
       this.#legacy = args[0];
       this.#tracking = args[1] ?? {
         enabled: false
       };
+      assertMinConfirmations(this.#tracking.bitcoinMinConfirmations);
+      this.#bitcoinMinConfirmations = this.#tracking.bitcoinMinConfirmations;
     } else {
       this.#legacy = new LegacyClient(
         ...args
@@ -2504,6 +2656,10 @@ var Client = class {
     return this.#legacy.claim(...args);
   }
   /** Delegated to the legacy client (migration checkpoint). */
+  claimEvmWithSigner(...args) {
+    return this.#legacy.claimEvmWithSigner(...args);
+  }
+  /** Delegated to the legacy client (migration checkpoint). */
   claimViaGasless(...args) {
     return this.#legacy.claimViaGasless(...args);
   }
@@ -2632,6 +2788,22 @@ var Client = class {
     return this.#legacy.hasReceivedVtxo(...args);
   }
   // --- Satora-native features go below ---
+  /** Confirmations a server-funded Bitcoin HTLC needs before it is claimable. */
+  getBitcoinMinConfirmations() {
+    return this.#bitcoinMinConfirmations;
+  }
+  /**
+   * At `0` the claim goes out against a mempool funding, trusting the funder
+   * not to replace it once the claim reveals the preimage.
+   *
+   * Only the chain monitors read a depth, so this does nothing unless the
+   * client was built with {@link ClientBuilder.withChainVerifiedTracking}.
+   * Takes effect on subsequent reads, including swaps already tracked.
+   */
+  setBitcoinMinConfirmations(minConfirmations) {
+    assertMinConfirmations(minConfirmations);
+    this.#bitcoinMinConfirmations = minConfirmations;
+  }
   /**
    * Start observing the user's active swaps and deriving each one's next action.
    *
@@ -2660,8 +2832,18 @@ var Client = class {
   async #doStartTracking() {
     try {
       const chainVerified = this.#tracking.chainVerified || this.#tracking.managers !== void 0;
+      if (!chainVerified && (this.#bitcoinMinConfirmations ?? 0) > 0)
+        console.warn(
+          "Client: bitcoinMinConfirmations is set but tracking follows server hints, which carry no depth. Build with ClientBuilder.withChainVerifiedTracking() for the depth to gate the claim."
+        );
       const tracker = chainVerified ? new SwapTracker(await this.#ensureManagers(), {
-        refreshIntervalMs: this.#tracking.refreshIntervalMs ?? 5e3
+        refreshIntervalMs: this.#tracking.refreshIntervalMs ?? 5e3,
+        // Depth is only re-derived on a chain read, and nothing pushes on a
+        // new block (an Electrum scripthash status doesn't change once the
+        // funding is in a block), so a deep policy would otherwise sit out
+        // the default interval after the block that satisfied it. Read per
+        // tick, like the depth itself, so a setter call after start counts.
+        atRiskReconcileIntervalMs: () => (this.#bitcoinMinConfirmations ?? 0) > 1 ? 15e3 : DEFAULT_AT_RISK_RECONCILE_INTERVAL_MS
       }) : new HintTracker({
         fetchStatus: async (swapId) => (await this.getSwap(swapId, { updateStorage: true })).status,
         refreshIntervalMs: this.#tracking.refreshIntervalMs ?? 5e3
@@ -2847,8 +3029,7 @@ var Client = class {
       evmRpcUrls,
       esploraUrl,
       electrumWsUrl,
-      bitcoinNetwork,
-      bitcoinMinConfirmations
+      bitcoinNetwork
     } = this.#tracking;
     const chainTime = async () => (await this.getMtp()).mtp * 1e3;
     const arkadeUrl = arkadeServerUrl ?? defaultArkadeServerUrl("bitcoin");
@@ -2869,7 +3050,7 @@ var Client = class {
         electrumWsUrl: electrumWsUrl ?? DEFAULT_ELECTRUM_WS_URLS[network],
         network,
         chainTime,
-        minConfirmations: bitcoinMinConfirmations
+        minConfirmations: () => this.#bitcoinMinConfirmations
       })
     );
     this.#managers = managers;
@@ -2990,9 +3171,11 @@ var ClientBuilder = class {
    * funding hits the mempool, which TRUSTS the funder not to double-spend it
    * (claiming publishes the preimage, so a funder that then replaced its
    * funding could take both legs). Set `1` (or more) for a block-depth policy
-   * that doesn't rely on the funder's good behaviour.
+   * that doesn't rely on the funder's good behaviour. Read only by the chain
+   * monitors, so it needs {@link withChainVerifiedTracking} to have any effect.
    */
   withBitcoinMinConfirmations(minConfirmations) {
+    assertMinConfirmations(minConfirmations);
     this.#bitcoinMinConfirmations = minConfirmations;
     return this;
   }
@@ -3049,6 +3232,13 @@ var ClientBuilder = class {
     });
   }
 };
+function assertMinConfirmations(value) {
+  if (value === void 0) return;
+  if (!Number.isInteger(value) || value < 0)
+    throw new Error(
+      `bitcoinMinConfirmations must be a non-negative integer, got ${value}`
+    );
+}
 function legacyBaseUrl(legacy) {
   try {
     return legacy.baseUrl;
@@ -3092,6 +3282,7 @@ export {
   htlcFactsFromEsploraTxs,
   htlcKey,
   htlcQueryKey,
+  resolveMinConfirmations,
   swapToTracked
 };
 //# sourceMappingURL=index.js.map