@toon-protocol/client-mcp 0.16.0 → 0.17.0

package/dist/{chunk-XFUZJ4XF.js → chunk-6Q3RYIEE.js}

@@ -14,9 +14,10 @@ import {
   fundWallet,
   generateKeystore,
   isEventExpired,
+  mintExecutionCondition,
   parseIlpPeerInfo,
   readConfigFile
-} from "./chunk-P7YF72JB.js";
+} from "./chunk-UDHZEABQ.js";
 import {
   __require
 } from "./chunk-F22GNSF6.js";
@@ -360,8 +361,10 @@ import { readFile, stat } from "fs/promises";
 import { resolve, sep } from "path";
 import { generateSecretKey as generateSecretKey2 } from "nostr-tools/pure";
 
-// ../../node_modules/.pnpm/@toon-protocol+core@1.4.2_@toon-protocol+connector@3.13.0_typescript@5.9.3/node_modules/@toon-protocol/core/dist/nip34/index.js
+// ../../node_modules/.pnpm/@toon-protocol+core@2.0.1_typescript@5.9.3/node_modules/@toon-protocol/core/dist/nip34/index.js
 var REPOSITORY_ANNOUNCEMENT_KIND = 30617;
+var PATCH_KIND = 1617;
+var ISSUE_KIND = 1621;
 var STATUS_OPEN_KIND = 1630;
 var STATUS_APPLIED_KIND = 1631;
 var STATUS_CLOSED_KIND = 1632;
@@ -371,11 +374,6 @@ var STATUS_DRAFT_KIND = 1633;
 var MAX_OBJECT_SIZE = 95 * 1024;
 var EMPTY_BLOB_SHA = "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391";
 
-// ../../node_modules/.pnpm/@toon-protocol+core@2.0.1_typescript@5.9.3/node_modules/@toon-protocol/core/dist/nip34/index.js
-var REPOSITORY_ANNOUNCEMENT_KIND2 = 30617;
-var PATCH_KIND = 1617;
-var ISSUE_KIND = 1621;
-
 // ../rig/dist/chunk-3HRFDH7H.js
 import { decode as decodeToon } from "@toon-format/toon";
 var REPOSITORY_STATE_KIND = 30618;
@@ -416,7 +414,7 @@ function buildRepoAnnouncement(repoId, name, description, maintainers = []) {
     tags.push([MAINTAINERS_TAG, ...declared]);
   }
   return {
-    kind: REPOSITORY_ANNOUNCEMENT_KIND2,
+    kind: REPOSITORY_ANNOUNCEMENT_KIND,
     content: "",
     tags,
     created_at: Math.floor(Date.now() / 1e3)
@@ -443,7 +441,7 @@ function buildRepoRefs(repoId, refs, arweaveMap = {}) {
 }
 function buildIssue(repoOwnerPubkey, repoId, title, body, labels = []) {
   const tags = [
-    ["a", `${REPOSITORY_ANNOUNCEMENT_KIND2}:${repoOwnerPubkey}:${repoId}`],
+    ["a", `${REPOSITORY_ANNOUNCEMENT_KIND}:${repoOwnerPubkey}:${repoId}`],
     ["p", repoOwnerPubkey],
     ["subject", title],
     ...labels.map((label) => ["t", label])
@@ -460,7 +458,7 @@ function buildComment(repoOwnerPubkey, repoId, issueOrPrEventId, authorPubkey, b
     kind: COMMENT_KIND,
     content: body,
     tags: [
-      ["a", `${REPOSITORY_ANNOUNCEMENT_KIND2}:${repoOwnerPubkey}:${repoId}`],
+      ["a", `${REPOSITORY_ANNOUNCEMENT_KIND}:${repoOwnerPubkey}:${repoId}`],
       ["e", issueOrPrEventId, "", marker],
       ["p", authorPubkey]
     ],
@@ -469,7 +467,7 @@ function buildComment(repoOwnerPubkey, repoId, issueOrPrEventId, authorPubkey, b
 }
 function buildPatch(repoOwnerPubkey, repoId, title, commits, branchTag, content = "", description) {
   const tags = [
-    ["a", `${REPOSITORY_ANNOUNCEMENT_KIND2}:${repoOwnerPubkey}:${repoId}`],
+    ["a", `${REPOSITORY_ANNOUNCEMENT_KIND}:${repoOwnerPubkey}:${repoId}`],
     ["p", repoOwnerPubkey],
     ["subject", title]
   ];
@@ -739,7 +737,7 @@ async function fetchRemoteState(options) {
     throw new Error("fetchRemoteState: repoId is required");
   }
   const filter = {
-    kinds: [REPOSITORY_ANNOUNCEMENT_KIND2, REPOSITORY_STATE_KIND],
+    kinds: [REPOSITORY_ANNOUNCEMENT_KIND, REPOSITORY_STATE_KIND],
     authors: [ownerPubkey],
     "#d": [repoId]
   };
@@ -771,7 +769,7 @@ async function fetchRemoteState(options) {
     events.filter((e) => e.kind === REPOSITORY_STATE_KIND)
   );
   const announceEvent = latestReplaceable(
-    events.filter((e) => e.kind === REPOSITORY_ANNOUNCEMENT_KIND2)
+    events.filter((e) => e.kind === REPOSITORY_ANNOUNCEMENT_KIND)
   );
   const { refs, headSymref, shaToTxId } = refsEvent ? parseRefsEvent(refsEvent) : {
     refs: /* @__PURE__ */ new Map(),
@@ -1474,7 +1472,7 @@ async function executePush(options) {
   };
 }
 
-// ../../node_modules/.pnpm/@toon-protocol+sdk@0.5.1_@toon-protocol+connector@3.13.0_mina-signer@3.1.0_typescript@5.9.3/node_modules/@toon-protocol/sdk/dist/chunk-UP2VWCW5.js
+// ../../node_modules/.pnpm/@toon-protocol+sdk@2.0.1_mina-signer@3.1.0_typescript@5.9.3/node_modules/@toon-protocol/sdk/dist/chunk-UP2VWCW5.js
 var __require2 = /* @__PURE__ */ ((x) => typeof __require !== "undefined" ? __require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof __require !== "undefined" ? __require : a)[b]
 }) : x)(function(x) {
@@ -1482,7 +1480,7 @@ var __require2 = /* @__PURE__ */ ((x) => typeof __require !== "undefined" ? __re
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../../node_modules/.pnpm/@toon-protocol+sdk@0.5.1_@toon-protocol+connector@3.13.0_mina-signer@3.1.0_typescript@5.9.3/node_modules/@toon-protocol/sdk/dist/chunk-XTHUXP63.js
+// ../../node_modules/.pnpm/@toon-protocol+sdk@2.0.1_mina-signer@3.1.0_typescript@5.9.3/node_modules/@toon-protocol/sdk/dist/chunk-Z6S56VPV.js
 import { getPublicKey } from "nostr-tools/pure";
 import { generateSecretKey, getPublicKey as getPublicKey2 } from "nostr-tools/pure";
 import { createRumor, createSeal, createWrap } from "nostr-tools/nip59";
@@ -1813,9 +1811,9 @@ function decodeFulfillMetadata(data, chain) {
   if (typeof recipient === "string" && recipient.length > 0) {
     result.recipient = recipient;
   }
-  const millSignerAddress = obj["millSignerAddress"];
-  if (typeof millSignerAddress === "string" && (!chain || validateChainAddress(millSignerAddress, chain, "address"))) {
-    result.millSignerAddress = millSignerAddress;
+  const swapSignerAddress = obj["swapSignerAddress"];
+  if (typeof swapSignerAddress === "string" && (!chain || validateChainAddress(swapSignerAddress, chain, "address"))) {
+    result.swapSignerAddress = swapSignerAddress;
   }
   return result;
 }
@@ -1898,10 +1896,10 @@ function validateParams(params) {
       "senderSecretKey must be a 32-byte Uint8Array"
     );
   }
-  if (typeof params.millPubkey !== "string" || !HEX64_REGEX.test(params.millPubkey)) {
+  if (typeof params.swapPubkey !== "string" || !HEX64_REGEX.test(params.swapPubkey)) {
     throw new StreamSwapError(
       "INVALID_STATE",
-      "millPubkey must be a 64-char lowercase hex string"
+      "swapPubkey must be a 64-char lowercase hex string"
     );
   }
   if (!params.pair || typeof params.pair !== "object") {
@@ -2083,8 +2081,8 @@ async function runLoop(params, pair, schedule, senderPubkey, logger, getState, s
       const wrapped = wrapSwapPacketToToon({
         rumor,
         senderSecretKey: params.senderSecretKey,
-        recipientPubkey: params.millPubkey,
-        destination: params.millIlpAddress,
+        recipientPubkey: params.swapPubkey,
+        destination: params.swapIlpAddress,
         amount: sourceAmount
       });
       toonData = new Uint8Array(Buffer.from(wrapped.ilpPrepare.data, "base64"));
@@ -2103,7 +2101,7 @@ async function runLoop(params, pair, schedule, senderPubkey, logger, getState, s
     let sendResult;
     try {
       sendResult = await params.client.sendSwapPacket({
-        destination: params.millIlpAddress,
+        destination: params.swapIlpAddress,
         amount: sourceAmount,
         toonData,
         timeout: params.packetTimeoutMs ?? 3e4,
@@ -2161,8 +2159,8 @@ async function runLoop(params, pair, schedule, senderPubkey, logger, getState, s
       rejections.push({
         packetIndex,
         sourceAmount,
-        code: "MILL_RECIPIENT_MISMATCH",
-        message: `Mill echoed recipient ${metadata.recipient} but sender expected ${params.chainRecipient}`
+        code: "SWAP_RECIPIENT_MISMATCH",
+        message: `Swap echoed recipient ${metadata.recipient} but sender expected ${params.chainRecipient}`
       });
       continue;
     }
@@ -2223,7 +2221,7 @@ async function runLoop(params, pair, schedule, senderPubkey, logger, getState, s
       sourceAmount,
       targetAmount,
       claimBytes,
-      millEphemeralPubkey: metadata.ephemeralPubkey,
+      swapEphemeralPubkey: metadata.ephemeralPubkey,
       pair,
       receivedAt: Date.now()
     };
@@ -2235,8 +2233,8 @@ async function runLoop(params, pair, schedule, senderPubkey, logger, getState, s
       accumulated.cumulativeAmount = metadata.cumulativeAmount;
     if (metadata.recipient !== void 0)
       accumulated.recipient = metadata.recipient;
-    if (metadata.millSignerAddress !== void 0)
-      accumulated.millSignerAddress = metadata.millSignerAddress;
+    if (metadata.swapSignerAddress !== void 0)
+      accumulated.swapSignerAddress = metadata.swapSignerAddress;
     claims.push(accumulated);
     logger.debug({
       event: "stream_swap.packet_accepted",
@@ -3465,15 +3463,36 @@ var ClientRunner = class {
     }
     throw new Error(`Channel "${channelId}" is not tracked by any apex.`);
   }
-  /** Swap source→target asset against a swap peer via the selected apex. */
+  /**
+   * Swap source→target asset against a swap peer via the selected apex.
+   *
+   * sdk ≥2.0.0 (the `mill`→`swap` vocabulary rename, toon commit `af4cd24`):
+   * `streamSwap` takes `swapPubkey`/`swapIlpAddress` and accumulated claims
+   * carry `swapSignerAddress`. The rename has NO wire back-compat — a
+   * pre-rename (sdk ≤1.x) swap peer still emits `millSignerAddress` in its
+   * FULFILL settlement metadata, which `decodeFulfillMetadata` silently drops
+   * as an unknown field. That skew would otherwise surface only much later as
+   * `MISSING_SETTLEMENT_METADATA` in `buildSettlementTx`, so we detect it
+   * here (accepted claims with no `swapSignerAddress`) and surface a loud
+   * `warning` on the response at swap time (#349).
+   *
+   * With `req.senderConditions` set, every swap packet is sent with a FRESH
+   * sender-minted execution condition (`C_i = sha256(P_i)`, one per packet —
+   * toon-client#350, rolling-swap spec §3 R1/R2) and the transport verifies
+   * each FULFILL's preimage; a mismatch counts the packet failed. This
+   * requires a maker/connector implementing the sender-chosen fulfillment
+   * contract (connector#309) — the deployed claim-issuing mill cannot satisfy
+   * it — so it is opt-in and the default stays the legacy zero condition.
+   */
   async swap(req) {
     const apex = this.selectApex(req.btpUrl);
     this.assertApexReady(apex);
     const senderSecretKey = generateSecretKey2();
+    const swapClient = req.senderConditions ? this.withSenderConditions(apex.client) : apex.client;
     const result = await streamSwap({
-      client: apex.client,
-      millPubkey: req.swapPubkey,
-      millIlpAddress: req.destination,
+      client: swapClient,
+      swapPubkey: req.swapPubkey,
+      swapIlpAddress: req.destination,
       pair: req.pair,
       senderSecretKey,
       chainRecipient: req.chainRecipient,
@@ -3481,25 +3500,60 @@ var ClientRunner = class {
       packetCount: req.packetCount ?? 1
     });
     const firstReject = result.rejections[0];
+    const claims = result.claims.map((c) => ({
+      sourceAmount: c.sourceAmount.toString(),
+      targetAmount: c.targetAmount.toString(),
+      claim: Buffer.from(c.claimBytes).toString("base64"),
+      ...c.channelId ? { channelId: c.channelId } : {},
+      ...c.recipient ? { recipient: c.recipient } : {},
+      ...c.swapSignerAddress ? { swapSignerAddress: c.swapSignerAddress } : {},
+      ...c.claimId ? { claimId: c.claimId } : {},
+      ...c.nonce ? { nonce: c.nonce } : {},
+      ...c.cumulativeAmount ? { cumulativeAmount: c.cumulativeAmount } : {}
+    }));
+    const missingSettlementSigner = claims.length > 0 && claims.every((c) => !c.swapSignerAddress);
+    if (missingSettlementSigner) {
+      this.log(
+        "[runner] swap: accepted claims are missing swapSignerAddress settlement metadata \u2014 swap peer is likely pre-rename (sdk <2.0.0)"
+      );
+    }
     return {
       accepted: result.claims.length > 0,
       packetsAccepted: result.claims.length,
-      claims: result.claims.map((c) => ({
-        sourceAmount: c.sourceAmount.toString(),
-        targetAmount: c.targetAmount.toString(),
-        claim: Buffer.from(c.claimBytes).toString("base64"),
-        ...c.channelId ? { channelId: c.channelId } : {},
-        ...c.recipient ? { recipient: c.recipient } : {},
-        ...c.millSignerAddress ? { swapSignerAddress: c.millSignerAddress } : {},
-        ...c.claimId ? { claimId: c.claimId } : {},
-        ...c.nonce ? { nonce: c.nonce } : {},
-        ...c.cumulativeAmount ? { cumulativeAmount: c.cumulativeAmount } : {}
-      })),
+      claims,
       cumulativeSource: result.cumulativeSource.toString(),
       cumulativeTarget: result.cumulativeTarget.toString(),
       state: result.state,
-      ...firstReject ? { code: firstReject.code, message: firstReject.message } : {}
+      ...firstReject ? { code: firstReject.code, message: firstReject.message } : {},
+      ...missingSettlementSigner ? {
+        warning: "Accepted claims are missing `swapSignerAddress` settlement metadata, so settling them will fail with MISSING_SETTLEMENT_METADATA. The swap peer is likely running a pre-rename SDK (<2.0.0, emits `millSignerAddress`, which sdk \u22652 silently drops). Upgrade the swap peer before settling."
+      } : {}
+    };
+  }
+  /**
+   * Wrap an apex client so each `sendSwapPacket` call carries a freshly
+   * minted sender-chosen execution condition (one preimage per packet, spec
+   * R1 — reuse would let an observer of packet *i* fulfill packet *i+1*).
+   * `streamSwap` calls `sendSwapPacket` once per packet, so minting here
+   * yields exactly one condition per packet. The transports verify each
+   * FULFILL's preimage against the condition and fail the packet on mismatch.
+   *
+   * NOTE: the minted preimage is intentionally NOT retained yet — leg-B
+   * receive-side ingestion (where the sender reveals `P_i`) is a separate
+   * rolling-swap workstream (toon-meta docs/rolling-swap.md §3.2). Until a
+   * maker implements the connector#309 contract end-to-end, packets sent with
+   * conditions will fail closed rather than settle unverified.
+   */
+  withSenderConditions(client) {
+    const wrapped = Object.create(client);
+    wrapped.sendSwapPacket = (params) => {
+      const { condition } = mintExecutionCondition();
+      return client.sendSwapPacket({
+        ...params,
+        executionCondition: condition
+      });
     };
+    return wrapped;
   }
   /**
    * Payment-aware HTTP fetch through an apex's client. The client issues the
@@ -4376,4 +4430,4 @@ export {
   PublishRejectedError,
   registerRoutes
 };
-//# sourceMappingURL=chunk-XFUZJ4XF.js.map
+//# sourceMappingURL=chunk-6Q3RYIEE.js.map