@satora/swap 1.5.0 → 1.6.1

package/dist/index.d.cts

@@ -313,6 +313,13 @@ type HtlcRef = {
      * → `invalid`, so the client never claims a short-funded leg.
      */
     expectedAmount: bigint;
+    /**
+     * Overrides {@link expectedAmount} as the `invalid` threshold, leaving the
+     * `isActive` tuple on the expected amount. For the client's own
+     * coordinator-locked leg, whose amount is DEX output: the server decides
+     * whether a short lock is acceptable, so the client doesn't second-guess it.
+     */
+    minAmount?: bigint;
     /** Expected token address; the funding is `invalid` if it locks another token. */
     expectedToken?: `0x${string}`;
     /**
@@ -666,6 +673,8 @@ declare class Client {
     /** Delegated to the legacy client (migration checkpoint). */
     claim(...args: Parameters<Client$1["claim"]>): ReturnType<Client$1["claim"]>;
     /** Delegated to the legacy client (migration checkpoint). */
+    claimEvmWithSigner(...args: Parameters<Client$1["claimEvmWithSigner"]>): ReturnType<Client$1["claimEvmWithSigner"]>;
+    /** Delegated to the legacy client (migration checkpoint). */
     claimViaGasless(...args: Parameters<Client$1["claimViaGasless"]>): ReturnType<Client$1["claimViaGasless"]>;
     /** Delegated to the legacy client (migration checkpoint). */
     claimArkade(...args: Parameters<Client$1["claimArkade"]>): ReturnType<Client$1["claimArkade"]>;

package/dist/index.d.ts

@@ -313,6 +313,13 @@ type HtlcRef = {
      * → `invalid`, so the client never claims a short-funded leg.
      */
     expectedAmount: bigint;
+    /**
+     * Overrides {@link expectedAmount} as the `invalid` threshold, leaving the
+     * `isActive` tuple on the expected amount. For the client's own
+     * coordinator-locked leg, whose amount is DEX output: the server decides
+     * whether a short lock is acceptable, so the client doesn't second-guess it.
+     */
+    minAmount?: bigint;
     /** Expected token address; the funding is `invalid` if it locks another token. */
     expectedToken?: `0x${string}`;
     /**
@@ -666,6 +673,8 @@ declare class Client {
     /** Delegated to the legacy client (migration checkpoint). */
     claim(...args: Parameters<Client$1["claim"]>): ReturnType<Client$1["claim"]>;
     /** Delegated to the legacy client (migration checkpoint). */
+    claimEvmWithSigner(...args: Parameters<Client$1["claimEvmWithSigner"]>): ReturnType<Client$1["claimEvmWithSigner"]>;
+    /** Delegated to the legacy client (migration checkpoint). */
     claimViaGasless(...args: Parameters<Client$1["claimViaGasless"]>): ReturnType<Client$1["claimViaGasless"]>;
     /** Delegated to the legacy client (migration checkpoint). */
     claimArkade(...args: Parameters<Client$1["claimArkade"]>): ReturnType<Client$1["claimArkade"]>;

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   electrumReader
-} from "./chunk-INWVLX4A.js";
+} from "./chunk-3ZMSZSAV.js";
 import {
   DEFAULT_ESPLORA_URLS,
   esploraReader,
@@ -630,7 +630,7 @@ var BitcoinContractManager = class _BitcoinContractManager {
     );
     if (config.electrumWsUrl) {
       const [{ electrumReader: electrumReader2 }, { ElectrumWsClient }] = await Promise.all([
-        import("./bitcoin-reader-electrum-Z2YCNDLB.js"),
+        import("./bitcoin-reader-electrum-KEI7VWW6.js"),
         import("@lendasat/lendaswap-sdk-pure")
       ]);
       reader = electrumReader2(new ElectrumWsClient(config.electrumWsUrl), {
@@ -815,7 +815,9 @@ var AVG_BLOCK_MS = {
   1: 12e3,
   137: 2100,
   42161: 250,
-  30: 3e4
+  30: 3e4,
+  31: 3e4
+  // Rootstock testnet: same merge-mined cadence
 };
 var SCAN_MARGIN_BLOCKS = 1000n;
 var EvmContractManager = class _EvmContractManager {
@@ -996,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);
@@ -1083,7 +1088,8 @@ var DEFAULT_EVM_RPCS = {
     "https://arbitrum-one-rpc.publicnode.com"
   ],
   // Rootstock: the public node, HTTP only (no WebSocket endpoint exists).
-  30: ["https://public-node.rsk.co"]
+  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)"
@@ -1284,7 +1290,8 @@ function createEvmRpcReader(rpcUrls, options = {}) {
   return evmReaderFromClient(client, options);
 }
 var EVM_LOG_RANGE_LIMITS = {
-  30: 2000n
+  30: 2000n,
+  31: 2000n
 };
 function defaultEvmReaders(overrides) {
   const chainIds = /* @__PURE__ */ new Set([
@@ -1757,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 {
@@ -1845,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,
@@ -1852,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",
@@ -1896,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)
       };
@@ -1945,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)
@@ -2629,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);
   }