@anywalletkit/protocol-swap2-omniston 0.3.1 → 0.5.0

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 export { omniston } from './config.cjs';
-export { A as AssetId, C as ChainAddress, E as EscrowMessage, H as HtlcSecretStore, O as ObservableLike, a as OmnistonClientLike, b as OmnistonProviderOptions, c as OmnistonQuote, d as OmnistonQuoteStore, e as OrderEvent, f as OrderExecution, g as OrderSettlement, h as OrderSnapshot, Q as QuoteRequest, R as RfqEvent, S as SwapSettlement, i as SwapTrackEvent, T as TON_SWAP_PROTOCOL_LAYOUTS, j as TonSwapCheckInput, k as TonSwapCheckResult, l as TonSwapLeg, m as TonSwapPayloadError, n as checkTonSwapPayload, o as encodeTypedMessage, p as inMemoryQuoteStore, q as inMemorySecretStore, r as omnistonPins, s as omnistonProvider, t as omnistonVerifyBuild, v as validateEvmToTonOrderExtension, u as validateEvmTypedOrder } from './provider-BBG2zhpu.cjs';
+export { A as AssetId, C as ChainAddress, E as EscrowMessage, H as HtlcSecretStore, O as ObservableLike, a as OmnistonClientLike, b as OmnistonProviderOptions, c as OmnistonQuote, d as OmnistonQuoteStore, e as OrderEvent, f as OrderExecution, g as OrderSettlement, h as OrderSnapshot, Q as QuoteRequest, R as RfqEvent, S as SwapSettlement, i as SwapTrackEvent, T as TON_SWAP_PROTOCOL_LAYOUTS, j as TonSwapCheckInput, k as TonSwapCheckResult, l as TonSwapLeg, m as TonSwapPayloadError, n as checkTonSwapPayload, o as encodeTypedMessage, p as inMemoryQuoteStore, q as inMemorySecretStore, r as omnistonPins, s as omnistonProvider, t as omnistonVerifyBuild, v as validateEvmToTonOrderExtension, u as validateEvmTypedOrder } from './provider-CcCZB-Cj.cjs';
 export { OmnistonSwap2Config, OmnistonSwap2Protocol, OmnistonSwap2Protocol as default } from './protocol.cjs';
 export { OMNISTON_ESCROWS, OMNISTON_MODULE, STONFI_ROUTERS, describeOmnistonActivity } from './activity.cjs';
 import '@anywalletkit/protocol-swap2-core/types';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { omniston } from './config.js';
-export { A as AssetId, C as ChainAddress, E as EscrowMessage, H as HtlcSecretStore, O as ObservableLike, a as OmnistonClientLike, b as OmnistonProviderOptions, c as OmnistonQuote, d as OmnistonQuoteStore, e as OrderEvent, f as OrderExecution, g as OrderSettlement, h as OrderSnapshot, Q as QuoteRequest, R as RfqEvent, S as SwapSettlement, i as SwapTrackEvent, T as TON_SWAP_PROTOCOL_LAYOUTS, j as TonSwapCheckInput, k as TonSwapCheckResult, l as TonSwapLeg, m as TonSwapPayloadError, n as checkTonSwapPayload, o as encodeTypedMessage, p as inMemoryQuoteStore, q as inMemorySecretStore, r as omnistonPins, s as omnistonProvider, t as omnistonVerifyBuild, v as validateEvmToTonOrderExtension, u as validateEvmTypedOrder } from './provider-BBG2zhpu.js';
+export { A as AssetId, C as ChainAddress, E as EscrowMessage, H as HtlcSecretStore, O as ObservableLike, a as OmnistonClientLike, b as OmnistonProviderOptions, c as OmnistonQuote, d as OmnistonQuoteStore, e as OrderEvent, f as OrderExecution, g as OrderSettlement, h as OrderSnapshot, Q as QuoteRequest, R as RfqEvent, S as SwapSettlement, i as SwapTrackEvent, T as TON_SWAP_PROTOCOL_LAYOUTS, j as TonSwapCheckInput, k as TonSwapCheckResult, l as TonSwapLeg, m as TonSwapPayloadError, n as checkTonSwapPayload, o as encodeTypedMessage, p as inMemoryQuoteStore, q as inMemorySecretStore, r as omnistonPins, s as omnistonProvider, t as omnistonVerifyBuild, v as validateEvmToTonOrderExtension, u as validateEvmTypedOrder } from './provider-CcCZB-Cj.js';
 export { OmnistonSwap2Config, OmnistonSwap2Protocol, OmnistonSwap2Protocol as default } from './protocol.js';
 export { OMNISTON_ESCROWS, OMNISTON_MODULE, STONFI_ROUTERS, describeOmnistonActivity } from './activity.js';
 import '@anywalletkit/protocol-swap2-core/types';

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   OmnistonSwap2Protocol
-} from "./chunk-RW4XZWNC.js";
+} from "./chunk-4MKR2SUZ.js";
 import {
   TON_SWAP_PROTOCOL_LAYOUTS,
   TonSwapPayloadError,
@@ -13,7 +13,7 @@ import {
   omnistonVerifyBuild,
   validateEvmToTonOrderExtension,
   validateEvmTypedOrder
-} from "./chunk-HOTFZYSW.js";
+} from "./chunk-2DGCZD5K.js";
 import {
   omniston
 } from "./chunk-QDXFC6BC.js";
@@ -23,6 +23,7 @@ import {
   STONFI_ROUTERS,
   describeOmnistonActivity
 } from "./chunk-AIWAM7BS.js";
+import "./chunk-JWYDIW4V.js";
 export {
   OMNISTON_ESCROWS,
   OMNISTON_MODULE,

package/dist/protocol.cjs

@@ -500,18 +500,36 @@ function toChainAddress(caip2, address) {
   if (!$case) return null;
   return { chain: { $case, value: (0, import_viem.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 (0, import_viem.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;
   }
@@ -632,9 +650,9 @@ function validEvmAddress(value) {
   }
 }
 var EVM_DEST_PROTOCOL_FEE_RECIPIENTS = /* @__PURE__ */ new Set(["0x076268146b4ec6d21fc49c27586cfa91b9079a00"]);
-async function validateEvmToTonOrderExtension(extension, expected) {
-  const evmDest = expected.dstChainId !== void 0;
-  if (evmDest && (!Number.isSafeInteger(expected.dstChainId) || expected.dstChainId <= 0)) throw new Error("omniston: invalid EVM destination chain id");
+var EVM_AUCTION_POINTS = [[800000n, 100n], [700000n, 100n], [600000n, 100n], [500000n, 100n], [400000n, 100n]];
+var EVM_TIMELOCKS = [1n, 120n, 240n, 300n, 1n, 120n, 180n, 0n].reduce((packed, value, index) => packed | value << BigInt(index * 32), 0n);
+function readEvmOrderExtension(extension) {
   if (extension.length < 32) throw new Error("omniston: malformed EVM order extension");
   const view = new DataView(extension.buffer, extension.byteOffset, extension.byteLength);
   const fields = [];
@@ -654,54 +672,48 @@ async function validateEvmToTonOrderExtension(extension, expected) {
   }
   let target;
   for (const index of [2, 3, 7]) {
-    const field = fields[index];
-    if (field.length <= 20) throw new Error("omniston: incomplete EVM order extension program");
-    const address = (0, import_viem.getAddress)(`0x${bytesToHex(field.slice(0, 20))}`);
-    if (!expected.trustedTarget(address) || target !== void 0 && (0, import_viem.getAddress)(target) !== address) {
+    const field2 = fields[index];
+    if (field2.length <= 20) throw new Error("omniston: incomplete EVM order extension program");
+    const address = (0, import_viem.getAddress)(`0x${bytesToHex(field2.slice(0, 20))}`);
+    if (target !== void 0 && (0, import_viem.getAddress)(target) !== address) {
       throw new Error("omniston: EVM order extension target is not independently trusted");
     }
     target = address;
   }
-  const getter = fields[2];
+  const field = fields[2];
   let cursor = 20;
-  const gasBump = readBigEndian(getter, cursor, 3);
+  const gasBump = readBigEndian(field, cursor, 3);
   cursor += 3;
-  const gasPrice = readBigEndian(getter, cursor, 4);
+  const gasPrice = readBigEndian(field, cursor, 4);
   cursor += 4;
-  const auctionStart = readBigEndian(getter, cursor, 4);
+  const auctionStart = readBigEndian(field, cursor, 4);
   cursor += 4;
-  const duration = readBigEndian(getter, cursor, 3);
+  const duration = readBigEndian(field, cursor, 3);
   cursor += 3;
-  const initialRateBump = readBigEndian(getter, cursor, 3);
+  const initialRateBump = readBigEndian(field, cursor, 3);
   cursor += 3;
-  const pointCount = (0, import_core4.bigintToNumber)(readBigEndian(getter, cursor, 1));
+  const pointCount = (0, import_core4.bigintToNumber)(readBigEndian(field, cursor, 1));
   cursor += 1;
   if (pointCount !== 5) throw new Error("omniston: unsupported EVM auction profile");
   const points = [];
   for (let index = 0; index < pointCount; index++) {
-    points.push([readBigEndian(getter, cursor, 3), readBigEndian(getter, cursor + 3, 2)]);
+    points.push([readBigEndian(field, cursor, 3), readBigEndian(field, cursor + 3, 2)]);
     cursor += 5;
   }
-  const integratorFee = readBigEndian(getter, cursor, 2);
+  const integratorFee = readBigEndian(field, cursor, 2);
   cursor += 2;
-  const integratorShare = readBigEndian(getter, cursor, 1);
+  const integratorShare = readBigEndian(field, cursor, 1);
   cursor += 1;
-  const resolverFee = readBigEndian(getter, cursor, 2);
+  const resolverFee = readBigEndian(field, cursor, 2);
   cursor += 2;
-  const whitelistDiscount = readBigEndian(getter, cursor, 1);
+  const whitelistDiscount = readBigEndian(field, cursor, 1);
   cursor += 1;
-  const getterWhitelistCount = (0, import_core4.bigintToNumber)(readBigEndian(getter, cursor, 1));
+  const getterWhitelistCount = (0, import_core4.bigintToNumber)(readBigEndian(field, cursor, 1));
   cursor += 1;
-  if (getterWhitelistCount !== 1 || cursor + getterWhitelistCount * 10 !== getter.length) {
+  if (getterWhitelistCount !== 1 || cursor + getterWhitelistCount * 10 !== field.length) {
     throw new Error("omniston: malformed EVM amount-getter whitelist");
   }
-  const getterResolver = readBigEndian(getter, cursor, 10);
-  const expectedPoints = [[800000n, 100n], [700000n, 100n], [600000n, 100n], [500000n, 100n], [400000n, 100n]];
-  const quoteResolverFee = expected.protocolFeePips % 10 === 0 ? BigInt(expected.protocolFeePips / 10) : -1n;
-  const resolverLow80 = BigInt((0, import_viem.getAddress)(expected.initialResolverAddress)) & (1n << 80n) - 1n;
-  if (gasBump !== 0n || gasPrice !== 0n || !within(auctionStart, expected.quoteTimestamp, 5, 5) || duration !== 1800n || initialRateBump !== 900000n || points.some((point, index) => point[0] !== expectedPoints[index][0] || point[1] !== expectedPoints[index][1]) || expected.integratorFeePips !== 0 || integratorFee !== 0n || integratorShare !== 100n || quoteResolverFee < 0n || resolverFee !== quoteResolverFee || whitelistDiscount !== 50n || getterResolver !== resolverLow80) {
-    throw new Error("omniston: EVM amount-getter terms do not match the pinned v1beta8 profile");
-  }
+  const getter = { gasBump, gasPrice, auctionStart, duration, initialRateBump, points, integratorFee, integratorShare, resolverFee, whitelistDiscount, resolver: readBigEndian(field, cursor, 10) };
   const post = fields[7];
   cursor = 20;
   const integratorRecipient = post.slice(cursor, cursor + 20);
@@ -727,28 +739,51 @@ async function validateEvmToTonOrderExtension(extension, expected) {
   cursor += 10;
   const resolverTimeDelta = readBigEndian(post, cursor, 2);
   cursor += 2;
-  if (!zeroBytes(integratorRecipient) || !(zeroBytes(protocolRecipient) || evmDest && EVM_DEST_PROTOCOL_FEE_RECIPIENTS.has(`0x${bytesToHex(protocolRecipient)}`)) || postIntegratorFee !== 0n || postIntegratorShare !== 100n || postResolverFee !== quoteResolverFee || postDiscount !== 50n || !within(allowedTime, expected.quoteTimestamp, 60, 5) || postResolver !== resolverLow80 || resolverTimeDelta !== 0n) {
-    throw new Error("omniston: EVM post-interaction terms do not match the pinned v1beta8 profile");
-  }
   const extra = Array.from({ length: 5 }, () => {
     const value = readBigEndian(post, cursor, 32);
     cursor += 32;
     return value;
   });
+  const customData = extension.slice(32 + begin);
+  if (customData.length !== 131) throw new Error("omniston: malformed EVM order extension custom data");
+  return {
+    target,
+    getter,
+    post: { integratorRecipient, protocolRecipient, integratorFee: postIntegratorFee, integratorShare: postIntegratorShare, resolverFee: postResolverFee, discount: postDiscount, allowedTime, resolver: postResolver, resolverTimeDelta },
+    extra,
+    customData
+  };
+}
+async function validateEvmToTonOrderExtension(extension, expected) {
+  const evmDest = expected.dstChainId !== void 0;
+  if (evmDest && (!Number.isSafeInteger(expected.dstChainId) || expected.dstChainId <= 0)) throw new Error("omniston: invalid EVM destination chain id");
+  const { target, getter, post, extra, customData } = readEvmOrderExtension(extension);
+  if (!expected.trustedTarget(target)) throw new Error("omniston: EVM order extension target is not independently trusted");
+  const quoteResolverFee = expected.protocolFeePips % 10 === 0 ? BigInt(expected.protocolFeePips / 10) : -1n;
+  const resolverLow80 = BigInt((0, import_viem.getAddress)(expected.initialResolverAddress)) & (1n << 80n) - 1n;
+  if (getter.gasBump !== 0n || getter.gasPrice !== 0n || !within(getter.auctionStart, expected.quoteTimestamp, 5, 5) || getter.duration !== 1800n || getter.initialRateBump !== 900000n || getter.points.some((point, index) => point[0] !== EVM_AUCTION_POINTS[index][0] || point[1] !== EVM_AUCTION_POINTS[index][1]) || expected.integratorFeePips !== 0 || getter.integratorFee !== 0n || getter.integratorShare !== 100n || quoteResolverFee < 0n || getter.resolverFee !== quoteResolverFee || getter.whitelistDiscount !== 50n || getter.resolver !== resolverLow80) {
+    throw new Error("omniston: EVM amount-getter terms do not match the pinned v1beta8 profile");
+  }
+  if (!zeroBytes(post.integratorRecipient) || !(zeroBytes(post.protocolRecipient) || evmDest && EVM_DEST_PROTOCOL_FEE_RECIPIENTS.has(`0x${bytesToHex(post.protocolRecipient)}`)) || post.integratorFee !== 0n || post.integratorShare !== 100n || post.resolverFee !== quoteResolverFee || post.discount !== 50n || !within(post.allowedTime, expected.quoteTimestamp, 60, 5) || post.resolver !== resolverLow80 || post.resolverTimeDelta !== 0n) {
+    throw new Error("omniston: EVM post-interaction terms do not match the pinned v1beta8 profile");
+  }
   const hashlock2 = readBigEndian(expected.secretHash, 0, expected.secretHash.length);
   const dstToken = evmDest ? BigInt((0, import_viem.getAddress)(expected.outputTokenAddress)) : BigInt((0, import_viem.getAddress)(expected.takerAsset));
   const deposits = BigInt(expected.srcSecurityDepositUnits) << 128n | BigInt(expected.dstSecurityDepositUnits);
-  const timelocks = [1n, 120n, 240n, 300n, 1n, 120n, 180n, 0n].reduce((packed, value, index) => packed | value << BigInt(index * 32), 0n);
-  if (expected.secretHash.length !== 32 || extra[0] !== hashlock2 || extra[1] !== (evmDest ? BigInt(expected.dstChainId) : 0n) || extra[2] !== dstToken || extra[3] !== deposits || extra[4] !== timelocks) {
+  if (expected.secretHash.length !== 32 || extra[0] !== hashlock2 || extra[1] !== (evmDest ? BigInt(expected.dstChainId) : 0n) || extra[2] !== dstToken || extra[3] !== deposits || extra[4] !== EVM_TIMELOCKS) {
     throw new Error("omniston: signed EVM HTLC terms do not match the validated order details");
   }
-  const customData = extension.slice(32 + begin);
-  if (customData.length !== 131) throw new Error("omniston: malformed EVM order extension custom data");
-  if (evmDest) {
+  await checkOrderCustomData(customData, { evmDest, outputToken: expected.outputTokenAddress, traderDst: expected.traderDstAddress, quoteId: expected.quoteId });
+  if (expected.tradeStartDeadline < expected.quoteTimestamp) {
+    throw new Error("omniston: invalid EVM order quote deadline");
+  }
+}
+async function checkOrderCustomData(customData, expected) {
+  if (expected.evmDest) {
     if (!zeroBytes(customData.slice(0, 66))) throw new Error("omniston: unexpected TON addresses in an EVM-destination order");
   } else {
     const { Address: Address3 } = await import("@ton/core");
-    const expectedTon = [expected.outputTokenAddress, expected.traderDstAddress].map((value) => Address3.parse(value));
+    const expectedTon = [expected.outputToken, expected.traderDst].map((value) => Address3.parse(value));
     for (let index = 0; index < expectedTon.length; index++) {
       const offset = index * 33;
       const workchain = customData[offset] === 255 ? -1 : customData[offset];
@@ -764,9 +799,6 @@ async function validateEvmToTonOrderExtension(extension, expected) {
   if (!QUOTE_ID.test(quoteId) || !sliceEqual(customData.slice(99), hexToBytes(quoteId.padStart(64, "0")))) {
     throw new Error("omniston: EVM order extension custom data is not bound to the quote id");
   }
-  if (expected.tradeStartDeadline < expected.quoteTimestamp) {
-    throw new Error("omniston: invalid EVM order quote deadline");
-  }
 }
 function validateEvmTypedOrder(td, expected) {
   const value = td;
@@ -1346,7 +1378,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;
@@ -1399,10 +1431,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 (0, import_viem.sha256)(new TextEncoder().encode(JSON.stringify([
       ref.quoteId,
@@ -1419,6 +1460,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;
@@ -1447,7 +1489,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";
@@ -1526,7 +1568,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,
@@ -1559,7 +1601,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();
@@ -1658,7 +1700,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;
@@ -1829,7 +1871,7 @@ function omnistonProvider(opts = {}) {
       }
     });
     const orderProtocol = (0, import_viem.getAddress)(protocol.chain.value);
-    return { chain: srcChain, to: orderProtocol, value: "0", chainId, approvalAddress: orderProtocol, typedData };
+    return { chain: srcChain, to: orderProtocol, value: "0", chainId, approvalAddress: orderProtocol, typedData, orderExtension: `0x${bytesToHex(payload.orderExtension)}` };
   }
   return {
     name: "omniston",
@@ -1938,13 +1980,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,
@@ -2116,6 +2158,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)) ?? [];
@@ -2124,6 +2167,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;
@@ -2222,11 +2266,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;
@@ -2251,6 +2299,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);