@anywalletkit/protocol-swap2-omniston 0.4.0 → 0.5.1

package/README.md

@@ -25,20 +25,23 @@ TRON needs its own order path and is not wired yet.
 Every route is fail-closed until its allowlists and validators are configured:
 
 - **TON → TON** (DEX swap): `trustedSettlementContracts["ton:-239"]`,
-  `validateTonJettonWallet`, `validateTonSwapTarget`. The built message's DEX
+  `validateTonJettonWallet`, `validateTonSwapTarget`, `validateTonSwapLeg`. The built message's DEX
   call is decoded in the package (STON.fi v1/v2 incl. pTON and cross-swap,
   DeDust v1, DeDust CPMM v2): receiver = destination, refunds/excess = trader,
   on-chain minimum ≥ the quote's, no foreign referral; unknown layouts and
   split/multi-route quotes are refused by name. `validateTonSwapLeg`
   (supplied by `createOmnistonTonValidators`) confirms the routers' ask
   wallets, pTON wallet ownership and DeDust pool pairs on chain.
-  `tonSwapPayloadCheck: "report"` traces `ton-swap-payload <reason>` instead
-  of refusing (default `"enforce"`).
+  Without it the decoder cannot tell which token the DEX pays out, so the
+  route is not advertised. `tonSwapPayloadCheck: "report"` traces
+  `ton-swap-payload <reason>` (incl. `legs-unverified`) instead of refusing
+  (default `"enforce"`) — an explicit rollout opt-in.
   Behind `remoteProvider`, the app checks the built body itself:
   `remoteProvider({name: "omniston", baseUrl, verifyBuild: omnistonVerifyBuild({...createOmnistonTonValidators()})})`.
   A TON → TON swap body is opened with `checkTonSwapPayload` against the app's own request (receiver,
   refund, on-chain minimum, input; the quote carries `routeSteps`) and the DEX it pays is confirmed with
-  the app's validators. A TON → EVM escrow body goes to `verifyTonEscrowBuild`: the jetton amount, the
+  the app's validators — `validateTonSwapTarget` and `validateTonSwapLeg`; without the leg check a TON swap body
+  is refused. A TON → EVM escrow body goes to `verifyTonEscrowBuild`: the jetton amount, the
   trader as owner, the destination chain, address and token and the quote's minimum delivery come from
   the app, the protocol contract from `trustedProtocolAddresses`, and the escrow code, authority key and
   timelocks are the audited ones. Without `verifyBuild` the engine refuses remote cell bodies.

package/dist/{chunk-WL7BSEBR.js → chunk-2E6CVWD6.js}

@@ -1,6 +1,6 @@
 import {
   omnistonProvider
-} from "./chunk-R6B2CV5Z.js";
+} from "./chunk-4JOTKQOT.js";
 import {
   omniston
 } from "./chunk-QDXFC6BC.js";
@@ -24,4 +24,4 @@ var OmnistonSwap2Protocol = class extends SingleProviderSwap2 {
 export {
   OmnistonSwap2Protocol
 };
-//# sourceMappingURL=chunk-WL7BSEBR.js.map
+//# sourceMappingURL=chunk-2E6CVWD6.js.map

package/dist/{chunk-R6B2CV5Z.js → chunk-4JOTKQOT.js}

@@ -394,18 +394,36 @@ function toChainAddress(caip2, address) {
   if (!$case) return null;
   return { chain: { $case, value: getAddress(address) } };
 }
-function encodeIntent(quoteId, trader, dest, srcChain, kind = "order") {
-  return [INTENT_PREFIX, quoteId, trader, dest, srcChain, ...kind === "swap" ? ["swap"] : []].map(encodeURIComponent).join("|");
+var QUOTE_DIGEST_SKIP = /* @__PURE__ */ new Set(["rfqId", "resolverName", "estimatedSettlementDuration", "estimatedGasConsumption"]);
+function canonicalJson(value) {
+  if (Array.isArray(value)) return `[${value.map(canonicalJson).join(",")}]`;
+  if (value && typeof value === "object") {
+    return `{${Object.keys(value).sort().map((k) => `${JSON.stringify(k)}:${canonicalJson(value[k])}`).join(",")}}`;
+  }
+  return JSON.stringify(value) ?? "null";
+}
+function quoteDigest(q) {
+  const terms = JSON.parse(JSON.stringify(q));
+  for (const key of QUOTE_DIGEST_SKIP) delete terms[key];
+  return sha256(new TextEncoder().encode(canonicalJson(terms))).slice(2, 34);
+}
+var QUOTE_DIGEST = /^[0-9a-f]{32}$/;
+function encodeIntent(quoteId, trader, dest, srcChain, kind, digest) {
+  return [INTENT_PREFIX, quoteId, trader, `${dest}#${digest}`, srcChain, ...kind === "swap" ? ["swap"] : []].map(encodeURIComponent).join("|");
 }
 var QUOTE_ID = /^[0-9a-fA-F]{48,64}$/;
 function decodeIntent(intentId) {
   try {
     const parts = intentId.split("|");
     if (parts.length !== 5 && parts.length !== 6 || parts[0] !== INTENT_PREFIX) return null;
-    const [, quoteId = "", trader = "", dest = "", srcChain = "", kindPart = ""] = parts.map(decodeURIComponent);
+    const [, quoteId = "", trader = "", destPart = "", srcChain = "", kindPart = ""] = parts.map(decodeURIComponent);
+    const mark = destPart.lastIndexOf("#");
+    const dest = mark < 0 ? destPart : destPart.slice(0, mark);
+    const digest = mark < 0 ? void 0 : destPart.slice(mark + 1);
+    if (digest !== void 0 && !QUOTE_DIGEST.test(digest)) return null;
     if (!QUOTE_ID.test(quoteId) || !trader || !dest || !srcChain) return null;
     if (parts.length === 6 && kindPart !== "swap") return null;
-    return { quoteId, trader, dest, srcChain, kind: parts.length === 6 ? "swap" : "order" };
+    return { quoteId, trader, dest, srcChain, kind: parts.length === 6 ? "swap" : "order", ...digest ? { digest } : {} };
   } catch {
     return null;
   }
@@ -1281,16 +1299,15 @@ function omnistonVerifyBuild(hooks) {
     } catch {
       return "the swap target could not be checked";
     }
-    if (hooks.validateTonSwapLeg) {
-      for (const leg of checked.legs) {
-        let ok = false;
-        try {
-          ok = await hooks.validateTonSwapLeg(leg);
-        } catch {
-          ok = false;
-        }
-        if (!ok) return `${leg.kind} v${leg.version} leg not verified`;
+    if (!hooks.validateTonSwapLeg) return "a TON swap body needs validateTonSwapLeg (createOmnistonTonValidators)";
+    for (const leg of checked.legs) {
+      let ok = false;
+      try {
+        ok = await hooks.validateTonSwapLeg(leg);
+      } catch {
+        ok = false;
       }
+      if (!ok) return `${leg.kind} v${leg.version} leg not verified`;
     }
     return null;
   };
@@ -1427,7 +1444,7 @@ function omnistonProvider(opts = {}) {
       return true;
     }
     const a = existing.bound, b = entry.bound;
-    const same = !!a && !!b && a.kind === b.kind && a.srcChain === b.srcChain && sameIntentAddress(a.trader, b.trader) && sameIntentAddress(a.dest, b.dest);
+    const same = !!a && !!b && a.kind === b.kind && a.srcChain === b.srcChain && sameIntentAddress(a.trader, b.trader) && sameIntentAddress(a.dest, b.dest) && quoteDigest(existing.quote) === quoteDigest(entry.quote);
     if (!same) return false;
     await quotes.save(quoteId, json);
     return true;
@@ -1480,10 +1497,19 @@ function omnistonProvider(opts = {}) {
       throw new Error(`omniston: intent id does not match the quote it was issued for (${bound.field})`);
     }
     if (bound.legacy) trace("legacy-intent", { where });
+    if (!decoded.digest) {
+      trace("intent-mismatch", { where, field: "digest-missing" });
+      throw new Error("omniston: this quote was issued before an update \u2014 request a fresh quote");
+    }
+    if (decoded.digest !== quoteDigest(entry.quote)) {
+      trace("intent-mismatch", { where, field: "digest" });
+      throw new Error("omniston: quote was replaced \u2014 request a fresh quote");
+    }
     return bound.ref;
   }
   const bindKey = (quoteId) => `${quoteId}#bind`;
   const disclosedKey = (quoteId) => `${quoteId}#disclosed`;
+  const disclosedIndicesKey = (quoteId) => `${quoteId}#disclosed-indices`;
   function orderBinding(ref, q) {
     return sha256(new TextEncoder().encode(JSON.stringify([
       ref.quoteId,
@@ -1500,6 +1526,7 @@ function omnistonProvider(opts = {}) {
     await store.clear(quoteId);
     await store.clear(bindKey(quoteId));
     await store.clear(disclosedKey(quoteId));
+    await store.clear(disclosedIndicesKey(quoteId));
   }
   async function secretsFor(ref, q, count) {
     const quoteId = ref.quoteId;
@@ -1528,7 +1555,7 @@ function omnistonProvider(opts = {}) {
     return !!existing && existing.length > 0;
   }
   const SWAP_SLIPPAGE_PIPS_DEFAULT = 5e3;
-  const sameChainTonReady = () => typeof opts.validateTonJettonWallet === "function" && typeof opts.validateTonSwapTarget === "function";
+  const sameChainTonReady = () => typeof opts.validateTonJettonWallet === "function" && typeof opts.validateTonSwapTarget === "function" && (typeof opts.validateTonSwapLeg === "function" || opts.tonSwapPayloadCheck === "report");
   const tonSourceReady = (from, to) => omniston.supports(from, to) && trustedContracts.has(from) && trustedContracts.has(to) && typeof opts.validateTonJettonWallet === "function" && typeof opts.validateTonEscrowPayload === "function" && typeof opts.validateEvmOutputPosition === "function";
   const evmSourceReady = (from, to) => omniston.supports(from, to) && trustedOrderProtocols.has(from) && trustedContracts.has(from) && trustedContracts.has(to) && typeof opts.validateEvmInputPosition === "function" && typeof opts.validateTonOutputPosition === "function";
   const evmToEvmReady = (from, to) => omniston.supports(from, to) && trustedOrderProtocols.has(from) && trustedContracts.has(from) && trustedContracts.has(to) && typeof opts.validateEvmInputPosition === "function" && typeof opts.validateEvmOutputPosition === "function";
@@ -1607,7 +1634,7 @@ function omnistonProvider(opts = {}) {
     const feeUsd = stableOut ? feeUnits / 10 ** dest.decimals : 0;
     return {
       provider: "omniston",
-      intentId: encodeIntent(q.quoteId, trader, params.destAddress, params.sourceChain, "swap"),
+      intentId: encodeIntent(q.quoteId, trader, params.destAddress, params.sourceChain, "swap", quoteDigest(q)),
       depositAddress: "",
       // swap settlement — the built message pays the DEX directly
       depositMemo: null,
@@ -1640,7 +1667,7 @@ function omnistonProvider(opts = {}) {
     if (!isTon(ref.srcChain) || q.inputAsset.chain.$case !== "ton" || q.outputAsset.chain.$case !== "ton") {
       throw new Error("omniston: swap quote is not a TON same-chain swap");
     }
-    if (!sameChainTonReady()) throw new Error("omniston: TON same-chain swaps need independent jetton-wallet and swap-target validators");
+    if (!sameChainTonReady()) throw new Error("omniston: TON same-chain swaps need independent jetton-wallet, swap-target and swap-leg validators");
     const owner = { chain: { $case: "ton", value: ref.trader } };
     const receiver = { chain: { $case: "ton", value: ref.dest } };
     const omni = await getClient();
@@ -1739,7 +1766,7 @@ function omnistonProvider(opts = {}) {
     }
     if (checked) {
       if (typeof opts.validateTonSwapLeg !== "function") {
-        trace("ton-swap-payload", { reason: "legs-unverified", detail: "no validateTonSwapLeg hook", mode, legs: checked.legs.length });
+        payloadRefusal("legs-unverified", `no validateTonSwapLeg hook for ${checked.legs.length} leg(s)`);
       } else {
         for (const leg of checked.legs) {
           let ok = false;
@@ -2019,13 +2046,13 @@ function omnistonProvider(opts = {}) {
       if (outputScaled * 2n < inputScaled || outputScaled > inputScaled * 2n) return refuse2("quoted output is outside 0.5x\u20132x of the input");
       if (await quoteIdInUse(q.quoteId)) return refuse2("the platform reused a quote id that already belongs to an order");
       if (!await claimBuilt(q.quoteId, { quote: q, at: Date.now(), bound: { trader, dest: params.destAddress, srcChain: params.sourceChain, kind: "order" } })) {
-        return refuse2("the platform reused a quote id that already holds another user's quote");
+        return refuse2("the platform reused a quote id that already holds another quote");
       }
       const feeUnits = Number(q.protocolFeeUnits || "0") + Number(q.integratorFeeUnits || "0");
       const feeUsd = feeUnits / 10 ** dest.decimals;
       return {
         provider: "omniston",
-        intentId: encodeIntent(q.quoteId, trader, params.destAddress, params.sourceChain),
+        intentId: encodeIntent(q.quoteId, trader, params.destAddress, params.sourceChain, "order", quoteDigest(q)),
         depositAddress: "",
         // order settlement — no static deposit address
         depositMemo: null,
@@ -2197,6 +2224,7 @@ function omnistonProvider(opts = {}) {
       );
       if (!order) return { state: "pending" };
       let secretsHex = await store.load(decoded.quoteId);
+      const storedSecrets = secretsHex?.length ?? 0;
       if (!secretsHex || cached?.quote.settlementData.$case !== "order") trace("disclosure-skipped", { gate: "context", secrets: !!secretsHex, cached: !!cached, feedStatus: order.status });
       if (secretsHex && cached?.quote.settlementData.$case === "order") {
         const [lockedTo] = await store.load(bindKey(decoded.quoteId)) ?? [];
@@ -2205,6 +2233,7 @@ function omnistonProvider(opts = {}) {
           secretsHex = void 0;
         }
       }
+      const disclosedNow = /* @__PURE__ */ new Set();
       if (secretsHex && cached?.quote.settlementData.$case === "order") {
         const q = cached.quote;
         const settlement = q.settlementData.value;
@@ -2303,11 +2332,15 @@ function omnistonProvider(opts = {}) {
             }
             await omni.orderDiscloseHtlcSecret({ quoteId: decoded.quoteId, executionIndex: i, secret: secretBytes }).then(async () => {
               trace("secret-disclosed", { index: i });
+              disclosedNow.add(i);
               await store.save(disclosedKey(decoded.quoteId), ["1"]);
             }, (error) => trace("disclose-failed", { index: i, error: error instanceof Error ? error.message : String(error) }));
           })
         );
       }
+      const disclosedBefore = (await store.load(disclosedIndicesKey(decoded.quoteId)) ?? []).map(Number).filter(Number.isSafeInteger);
+      const disclosedAll = /* @__PURE__ */ new Set([...disclosedBefore, ...disclosedNow]);
+      if (disclosedNow.size > 0) await store.save(disclosedIndicesKey(decoded.quoteId), [...disclosedAll].sort((a, b) => a - b).map(String));
       const status = mapOrderStatus(order);
       const delivered = order.executions[0]?.outputPositionAddress;
       const outCase = cached?.quote.outputAsset.chain.$case;
@@ -2332,6 +2365,14 @@ function omnistonProvider(opts = {}) {
         }).catch(() => null);
         if (hash) status.destTxHash = hash;
       }
+      if (status.state === "completed" && storedSecrets > 0 && !status.destTxHash) {
+        const legacyDisclosed = disclosedBefore.length === 0 && storedSecrets === 1 && (await store.load(disclosedKey(decoded.quoteId)) ?? []).length > 0;
+        const allDisclosed = legacyDisclosed || (order.executions.length > 0 ? order.executions.every((execution) => disclosedAll.has(execution.index)) : disclosedAll.size > 0);
+        if (!allDisclosed) {
+          trace("completion-unproven", { feedStatus: order.status, executions: order.executions.length, disclosed: disclosedAll.size });
+          return { state: "pending", depositReceived: order.executions.length > 0 || disclosedAll.size > 0 };
+        }
+      }
       if (status.state === "completed") {
         await clearSecrets(decoded.quoteId);
         await quotes.clear(decoded.quoteId);
@@ -2384,4 +2425,4 @@ export {
   omnistonVerifyBuild,
   omnistonProvider
 };
-//# sourceMappingURL=chunk-R6B2CV5Z.js.map
+//# sourceMappingURL=chunk-4JOTKQOT.js.map