@satora/swap 1.5.0 → 1.6.1

package/README.md

@@ -18,7 +18,7 @@ npm install @satora/swap
 
 ## Compatibility headers
 
-API requests include `X-Lendaswap-Client: <sdk-name>/<semver>` and `x-satora-server-version: <server-api-semver>`. The server-version header declares the server/API version this SDK was built against; the API logs it for diagnostics and does not enforce compatibility yet.
+API requests include `X-Lendaswap-Client: <sdk-name>/<semver>` and one `x-satora-<component>-version: <epoch>` header per protocol component (`bitcoin-htlc`, `arkade-vhtlc`, `lightning`, `evm-erc20-htlc`, `evm-native-htlc`). The server rejects a client whose epoch for a component the swap uses is too old.
 
 ## Supported swaps
 

package/dist/bitcoin-reader-electrum-KEI7VWW6.js

@@ -0,0 +1,8 @@
+import {
+  electrumReader
+} from "./chunk-3ZMSZSAV.js";
+import "./chunk-LSCRTQOS.js";
+export {
+  electrumReader
+};
+//# sourceMappingURL=bitcoin-reader-electrum-KEI7VWW6.js.map

package/dist/{chunk-INWVLX4A.js → chunk-3ZMSZSAV.js}

@@ -29,9 +29,11 @@ function scriptHashOf(script) {
 function electrumReader(client, opts) {
   const network = opts?.network ?? "mainnet";
   const fallback = opts?.fallback;
-  const scriptFor = (address) => btc.OutScript.encode(
-    btc.Address(toBtcSignerNetwork(network)).decode(address)
-  );
+  const scriptFor = (address) => {
+    const decoded = btc.Address(toBtcSignerNetwork(network)).decode(address);
+    if (!decoded) throw new Error(`Unrecognised Bitcoin address: ${address}`);
+    return btc.OutScript.encode(decoded);
+  };
   async function getHtlcFactsElectrum(address, required) {
     const script = scriptFor(address);
     const scripthash = scriptHashOf(script);
@@ -152,4 +154,4 @@ function electrumReader(client, opts) {
 export {
   electrumReader
 };
-//# sourceMappingURL=chunk-INWVLX4A.js.map
+//# sourceMappingURL=chunk-3ZMSZSAV.js.map

package/dist/chunk-3ZMSZSAV.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/contracts/bitcoin-reader-electrum.ts"],"sourcesContent":["/**\n * An Electrum-backed {@link BitcoinChainReader} — reads HTLC facts from our own\n * Fulcrum over WebSocket instead of public esplora REST endpoints.\n *\n * Two advantages over the esplora reader:\n *\n * - **Freshness**: our Fulcrum sees a transaction the moment its bitcoind\n *   accepts it, while public explorers index with a lag — the exact lag that\n *   made a server-funding hint's targeted verify come back \"absent\" and park\n *   the claim on the 60s at-risk poller.\n * - **Push**: implements the reader's optional `subscribe` capability via\n *   `blockchain.scripthash.subscribe`, so the manager reconciles the moment\n *   an HTLC address's history changes instead of waiting for a poll tick.\n *\n * Reads fall back to a wrapped reader (typically the esplora one) whenever the\n * Electrum server errors, so a Fulcrum outage degrades to today's behavior\n * rather than blinding the tracker.\n */\n\nimport { sha256 } from \"@noble/hashes/sha2.js\";\nimport { hex } from \"@scure/base\";\nimport * as btc from \"@scure/btc-signer\";\nimport type { BitcoinHtlcFacts } from \"./bitcoin.js\";\nimport type { BitcoinChainReader } from \"./bitcoin-manager.js\";\nimport {\n  type BitcoinReaderPolicy,\n  resolveMinConfirmations,\n} from \"./bitcoin-reader-esplora.js\";\n\n/** One entry of `blockchain.scripthash.get_history`. */\ntype ElectrumHistoryEntry = {\n  tx_hash: string;\n  /** Block height; 0 for mempool, -1 for mempool with unconfirmed parents. */\n  height: number;\n};\n\n/**\n * The Electrum client surface this reader needs. The pure SDK's\n * `ElectrumWsClient` satisfies it; tests inject a fake.\n */\nexport type ElectrumRpc = {\n  request<T>(method: string, params: unknown[]): Promise<T>;\n  subscribeScriptHash(\n    scripthash: string,\n    onChange: (status: string | null) => void,\n  ): Promise<string | null>;\n  unsubscribeScriptHash(\n    scripthash: string,\n    onChange: (status: string | null) => void,\n  ): void;\n};\n\nexport type ElectrumReaderNetwork =\n  | \"mainnet\"\n  | \"testnet\"\n  | \"signet\"\n  | \"regtest\";\n\n/** btc-signer only ships mainnet/testnet; regtest differs in bech32 prefix. */\nconst REGTEST_NETWORK = {\n  bech32: \"bcrt\",\n  pubKeyHash: 0x6f,\n  scriptHash: 0xc4,\n  wif: 0xef,\n} as const;\n\nfunction toBtcSignerNetwork(network: ElectrumReaderNetwork) {\n  switch (network) {\n    case \"mainnet\":\n      return btc.NETWORK;\n    case \"testnet\":\n    case \"signet\":\n      return btc.TEST_NETWORK;\n    case \"regtest\":\n      return REGTEST_NETWORK;\n  }\n}\n\n/** Electrum scripthash: sha256 of the output script, reversed, hex. */\nfunction scriptHashOf(script: Uint8Array): string {\n  return hex.encode(sha256(script).reverse());\n}\n\n/**\n * Build a {@link BitcoinChainReader} over an Electrum connection, with push\n * support and an optional fallback reader for outages.\n */\nexport function electrumReader(\n  client: ElectrumRpc,\n  opts?: BitcoinReaderPolicy & {\n    /** Network the HTLC addresses live on; defaults to mainnet. */\n    network?: ElectrumReaderNetwork;\n    /** Reader consulted when the Electrum server errors (e.g. esplora). */\n    fallback?: BitcoinChainReader;\n  },\n): BitcoinChainReader {\n  const network = opts?.network ?? \"mainnet\";\n  const fallback = opts?.fallback;\n\n  const scriptFor = (address: string): Uint8Array => {\n    const decoded = btc.Address(toBtcSignerNetwork(network)).decode(address);\n    if (!decoded) throw new Error(`Unrecognised Bitcoin address: ${address}`);\n    return btc.OutScript.encode(decoded);\n  };\n\n  async function getHtlcFactsElectrum(\n    address: string,\n    required: number,\n  ): Promise<BitcoinHtlcFacts> {\n    const script = scriptFor(address);\n    const scripthash = scriptHashOf(script);\n    const history = await client.request<ElectrumHistoryEntry[]>(\n      \"blockchain.scripthash.get_history\",\n      [scripthash],\n    );\n    if (!history || history.length === 0)\n      return { funding: \"absent\", fundedSats: 0 };\n\n    // HTLC addresses see at most a handful of txs (fund + resolve), so\n    // fetching each raw tx is cheap.\n    const txs = await Promise.all(\n      history.map(async (entry) => {\n        const raw = await client.request<string>(\"blockchain.transaction.get\", [\n          entry.tx_hash,\n        ]);\n        return {\n          entry,\n          tx: btc.Transaction.fromRaw(hex.decode(raw), {\n            allowUnknownOutputs: true,\n            allowUnknownInputs: true,\n            disableScriptCheck: true,\n          }),\n        };\n      }),\n    );\n\n    const scriptHex = hex.encode(script);\n    const outputIndicesPaying = (tx: btc.Transaction): number[] => {\n      const indices: number[] = [];\n      for (let i = 0; i < tx.outputsLength; i++) {\n        const out = tx.getOutput(i);\n        if (out.script && hex.encode(out.script) === scriptHex) indices.push(i);\n      }\n      return indices;\n    };\n\n    // Among all txs paying the address, the one paying the MOST is the\n    // funding candidate — same rule as the pure SDK's UTXO lookup. The\n    // address is public, so a stray dust payment (whether it landed before\n    // or after the real funding) must not be mistaken for the funding and\n    // observe the swap as underfunded/invalid.\n    let funding: (typeof txs)[number] | undefined;\n    let fundedSats = 0;\n    for (const candidate of txs) {\n      let paid = 0;\n      for (const i of outputIndicesPaying(candidate.tx))\n        paid += Number(candidate.tx.getOutput(i).amount ?? 0n);\n      if (paid > fundedSats) {\n        funding = candidate;\n        fundedSats = paid;\n      }\n    }\n    if (!funding) return { funding: \"absent\", fundedSats: 0 };\n    const fundedVouts = outputIndicesPaying(funding.tx);\n\n    // A tx spending one of the funding outputs is the resolving spend; its\n    // witness classifies claim vs refund.\n    for (const { tx } of txs) {\n      for (let i = 0; i < tx.inputsLength; i++) {\n        const input = tx.getInput(i);\n        if (\n          input.txid &&\n          hex.encode(input.txid) === funding.entry.tx_hash &&\n          input.index !== undefined &&\n          fundedVouts.includes(input.index)\n        ) {\n          return {\n            funding: \"confirmed\",\n            fundedSats: 0, // already spent — the amount no longer matters\n            spendWitness: (input.finalScriptWitness ?? []).map((item) =>\n              hex.encode(item),\n            ),\n          };\n        }\n      }\n    }\n\n    // Same depth policy as the esplora reader: 0/1 read straight off the\n    // confirmed flag; deeper policies need the tip to compute depth.\n    const height = funding.entry.height;\n    const isConfirmed = height > 0;\n    let deepEnough: boolean;\n    if (isConfirmed) {\n      if (required <= 1) {\n        deepEnough = true;\n      } else {\n        const tip = await client.request<{ height: number }>(\n          \"blockchain.headers.subscribe\",\n          [],\n        );\n        deepEnough = tip.height - height + 1 >= required;\n      }\n    } else {\n      deepEnough = required === 0;\n    }\n    return { funding: deepEnough ? \"confirmed\" : \"mempool\", fundedSats };\n  }\n\n  return {\n    async getHtlcFacts(address, minConfirmations) {\n      const required =\n        minConfirmations ?? resolveMinConfirmations(opts?.minConfirmations);\n      try {\n        return await getHtlcFactsElectrum(address, required);\n      } catch (error) {\n        if (!fallback) throw error;\n        console.warn(\n          \"electrumReader: falling back to secondary reader:\",\n          error instanceof Error ? error.message : error,\n        );\n        return fallback.getHtlcFacts(address, minConfirmations);\n      }\n    },\n\n    subscribe(address, onChange) {\n      // An address the configured network can't decode (e.g. a signet address\n      // under a mainnet-configured reader) must not throw out of register()\n      // and abort tracking — degrade to the poll cadence instead.\n      let scripthash: string;\n      try {\n        scripthash = scriptHashOf(scriptFor(address));\n      } catch (error) {\n        console.warn(\n          \"electrumReader: subscribe skipped (address decode failed):\",\n          error instanceof Error ? error.message : error,\n        );\n        return () => {};\n      }\n      const handler = () => onChange();\n      // Best-effort: if the subscription fails the tracker's poll cadence\n      // remains the backstop, so the error is logged, not thrown.\n      client.subscribeScriptHash(scripthash, handler).catch((error) => {\n        console.warn(\n          \"electrumReader: scripthash subscribe failed:\",\n          error instanceof Error ? error.message : error,\n        );\n      });\n      return () => client.unsubscribeScriptHash(scripthash, handler);\n    },\n  };\n}\n"],"mappings":"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","names":[]}

package/dist/index.cjs

@@ -149,9 +149,11 @@ function scriptHashOf(script) {
 function electrumReader(client, opts) {
   const network = opts?.network ?? "mainnet";
   const fallback2 = opts?.fallback;
-  const scriptFor = (address) => btc.OutScript.encode(
-    btc.Address(toBtcSignerNetwork(network)).decode(address)
-  );
+  const scriptFor = (address) => {
+    const decoded = btc.Address(toBtcSignerNetwork(network)).decode(address);
+    if (!decoded) throw new Error(`Unrecognised Bitcoin address: ${address}`);
+    return btc.OutScript.encode(decoded);
+  };
   async function getHtlcFactsElectrum(address, required) {
     const script = scriptFor(address);
     const scripthash = scriptHashOf(script);
@@ -671,7 +673,7 @@ function payOnLightningStatus(serverHtlc) {
 }
 
 // src/client.ts
-var import_lendaswap_sdk_pure2 = require("@lendasat/lendaswap-sdk-pure");
+var import_lendaswap_sdk_pure3 = require("@lendasat/lendaswap-sdk-pure");
 
 // src/contracts/arkade-manager.ts
 var import_sdk2 = require("@arkade-os/sdk");
@@ -1117,7 +1119,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 {
@@ -1298,7 +1302,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);
@@ -1375,7 +1382,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 = (0, import_viem.parseAbiItem)(
   "event SwapCreated(bytes32 indexed preimageHash, address indexed refundAddress, address indexed claimAddress, address token, uint256 amount, uint256 timelock, bytes32 key)"
@@ -1576,7 +1584,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([
@@ -2049,6 +2058,9 @@ function defaultWebSocketFactory(url) {
   return new WS(url);
 }
 
+// src/tracker/from-swap.ts
+var import_lendaswap_sdk_pure2 = require("@lendasat/lendaswap-sdk-pure");
+
 // src/contracts/arkade-vhtlc.ts
 var import_sdk3 = require("@arkade-os/sdk");
 var import_lendaswap_sdk_pure = require("@lendasat/lendaswap-sdk-pure");
@@ -2134,6 +2146,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,
@@ -2141,6 +2154,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",
@@ -2185,15 +2205,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" ? 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,
           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)
       };
@@ -2234,16 +2258,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)
@@ -2729,7 +2756,7 @@ var Client = class {
   /** Read per chain read, so it can change without rebuilding the client. */
   #bitcoinMinConfirmations;
   constructor(...args) {
-    if (args[0] instanceof import_lendaswap_sdk_pure2.Client) {
+    if (args[0] instanceof import_lendaswap_sdk_pure3.Client) {
       this.#legacy = args[0];
       this.#tracking = args[1] ?? {
         enabled: false
@@ -2737,7 +2764,7 @@ var Client = class {
       assertMinConfirmations(this.#tracking.bitcoinMinConfirmations);
       this.#bitcoinMinConfirmations = this.#tracking.bitcoinMinConfirmations;
     } else {
-      this.#legacy = new import_lendaswap_sdk_pure2.Client(
+      this.#legacy = new import_lendaswap_sdk_pure3.Client(
         ...args
       );
       this.#tracking = { enabled: false };
@@ -2918,6 +2945,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);
   }
@@ -3305,7 +3336,7 @@ var Client = class {
       "bitcoin",
       await BitcoinContractManager.create({
         esploraUrl: esploraUrl ? [esploraUrl] : DEFAULT_ESPLORA_URLS,
-        electrumWsUrl: electrumWsUrl ?? import_lendaswap_sdk_pure2.DEFAULT_ELECTRUM_WS_URLS[network],
+        electrumWsUrl: electrumWsUrl ?? import_lendaswap_sdk_pure3.DEFAULT_ELECTRUM_WS_URLS[network],
         network,
         chainTime,
         minConfirmations: () => this.#bitcoinMinConfirmations
@@ -3316,7 +3347,7 @@ var Client = class {
   }
 };
 var ClientBuilder = class {
-  #inner = import_lendaswap_sdk_pure2.Client.builder();
+  #inner = import_lendaswap_sdk_pure3.Client.builder();
   // Observe-mode tracking is on by default; the built client auto-builds its
   // managers from config unless disabled or given an explicit override.
   #trackingEnabled = true;