@anywalletkit/protocol-swap2-omniston 0.3.1 → 0.5.0

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.
@@ -62,6 +65,19 @@ Every route is fail-closed until its allowlists and validators are configured:
   engine then signs only an `Order` whose verifying contract is a pinned
   spender, whose maker is this account and that sells exactly the swap's input
   of the source token; a `Permit` or any other typed message is refused.
+  The rest of the order is the app's to check, and the engine signs a remote
+  typed order only with `verifyBuild`: `remoteProvider({name: "omniston",
+  baseUrl, ...omnistonPins(AUDITED_OMNISTON_EVM_ORDER_PROTOCOLS), verifyBuild:
+  omnistonVerifyBuild({...createOmnistonTonValidators()})})`. The build carries
+  the `orderExtension` the order's salt commits to, and `omnistonVerifyBuild`
+  opens both: the v4 domain on a trusted order protocol, the exact Order schema,
+  `takingAmount` at least the quote's minimum, a single-fill order with no
+  allowed sender and an expiry minutes away, the pinned v1beta8 auction and fee
+  terms, one trusted escrow factory (`trustedSettlementContracts`, default the
+  audited table) as the extension target, the whitelisted resolver as the
+  order's receiver, the destination chain and token, the audited timelocks, the
+  TON token and recipient and the quote id. The hashlock is the server's: the
+  server holds the HTLC secret. The same applies to EVM → EVM.
   `validateEvmTypedOrder` is exported for apps that hold the settlement data.
 - **EVM → EVM** (gasless order, same order protocol as EVM → TON): the signed
   extension's ExtraDataArgs name the destination chain, token and deposit and

package/dist/{chunk-HOTFZYSW.js → chunk-2DGCZD5K.js}

@@ -4,6 +4,10 @@ import {
 import {
   describeOmnistonActivity
 } from "./chunk-AIWAM7BS.js";
+import {
+  AUDITED_OMNISTON_EVM_ORDER_PROTOCOLS,
+  AUDITED_OMNISTON_SETTLEMENT_CONTRACTS
+} from "./chunk-JWYDIW4V.js";
 
 // src/provider.ts
 import { Address as TonAddress, Cell as TonCell } from "@ton/core";
@@ -390,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;
   }
@@ -522,9 +544,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 = [];
@@ -544,54 +566,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 = getAddress(`0x${bytesToHex(field.slice(0, 20))}`);
-    if (!expected.trustedTarget(address) || target !== void 0 && getAddress(target) !== address) {
+    const field2 = fields[index];
+    if (field2.length <= 20) throw new Error("omniston: incomplete EVM order extension program");
+    const address = getAddress(`0x${bytesToHex(field2.slice(0, 20))}`);
+    if (target !== void 0 && 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 = bigintToNumber(readBigEndian(getter, cursor, 1));
+  const pointCount = 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 = bigintToNumber(readBigEndian(getter, cursor, 1));
+  const getterWhitelistCount = 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(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);
@@ -617,28 +633,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(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(getAddress(expected.outputTokenAddress)) : BigInt(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: Address2 } = await import("@ton/core");
-    const expectedTon = [expected.outputTokenAddress, expected.traderDstAddress].map((value) => Address2.parse(value));
+    const expectedTon = [expected.outputToken, expected.traderDst].map((value) => Address2.parse(value));
     for (let index = 0; index < expectedTon.length; index++) {
       const offset = index * 33;
       const workchain = customData[offset] === 255 ? -1 : customData[offset];
@@ -654,9 +693,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;
@@ -1108,8 +1144,101 @@ function omnistonPins(trustedEvmOrderProtocols) {
   const byChain = new Map(Object.entries(trustedEvmOrderProtocols).map(([chain, list]) => [chain, list.map((a) => getAddress(a))]));
   return Object.freeze({ callTargets: () => [], spenders: (chain) => byChain.get(chain) ?? [] });
 }
+var MAX_EVM_ORDER_LIFETIME_S = 900;
+async function checkRemoteEvmOrder(quote, tx, params, trusted) {
+  const chainId = evmRef(params.sourceChain);
+  if (chainId === null || !params.sourceChain.startsWith("eip155:")) return "a typed order needs an EVM source";
+  const intent = decodeIntent(quote.intentId.replace(/~[0-9a-f]{32}$/, ""));
+  if (!intent || intent.kind !== "order" || intent.srcChain !== params.sourceChain) return "the quote's intent is not an order from this chain";
+  if (!tx.orderExtension || !/^0x(?:[0-9a-fA-F]{2})+$/.test(tx.orderExtension)) return "the build carries no order extension to check";
+  const source = ccAsset(params.sourceChain, params.sourceToken);
+  if (!source?.contract) return "unknown source token";
+  const tonDest = isTon(params.destChain);
+  const destChainId = tonDest ? null : evmRef(params.destChain);
+  if (!tonDest && (destChainId === null || !params.destChain.startsWith("eip155:"))) return "the destination is neither TON nor an EVM chain";
+  const outputToken = ccAssetByToken(params.destChain, params.destToken)?.contract ?? params.destToken;
+  const listed = (table, chain, address) => typeof address === "string" && validEvmAddress(address) && (table[chain] ?? []).some((a) => validEvmAddress(a) && getAddress(a) === getAddress(address));
+  let td;
+  try {
+    td = JSON.parse(tx.typedData ?? "");
+  } catch {
+    return "the typed data is not JSON";
+  }
+  const domain = td.domain ?? {};
+  const contract = domain.verifyingContract;
+  if (domain.name !== "1inch Limit Order Protocol" || domain.version !== "4") return "the domain is not the 1inch Limit Order Protocol v4";
+  if (!listed(trusted.orderProtocols, params.sourceChain, contract) || !tx.approvalAddress || getAddress(tx.approvalAddress) !== getAddress(String(contract))) {
+    return `${String(contract)} is not a trusted order protocol on ${params.sourceChain}`;
+  }
+  if (Number(domain.chainId) !== chainId || tx.chainId !== void 0 && tx.chainId !== chainId) return "the domain chainId is not the source chain";
+  const order = td.types?.Order;
+  const message = td.message;
+  if (td.primaryType !== "Order" || !Array.isArray(order) || order.length !== ORDER_FIELDS.length || !order.every((field, i) => field.name === ORDER_FIELDS[i][0] && field.type === ORDER_FIELDS[i][1]) || !message || Object.keys(message).length !== ORDER_FIELDS.length || !ORDER_FIELDS.every(([name]) => Object.hasOwn(message, name)) || !ORDER_FIELDS.every(([name, type]) => type === "address" ? validEvmAddress(message[name]) : validUint256(message[name]))) {
+    return "the typed data is not exactly a v4 Order";
+  }
+  if (!validEvmAddress(intent.trader) || getAddress(String(message.maker)) !== getAddress(intent.trader)) return "the maker is not the trader";
+  if (getAddress(String(message.makerAsset)) !== getAddress(source.contract)) return "the makerAsset is not the source token";
+  if (BigInt(message.makingAmount) !== BigInt(quote.sourceAmount)) return "the makingAmount is not the input";
+  if (getAddress(String(message.takerAsset)) === getAddress(String(message.makerAsset))) return "the takerAsset is the makerAsset";
+  const floor = [quote.minDestAmount, params.minAmountOut ?? "0"].filter((v) => /^\d{1,80}$/.test(v)).map((v) => BigInt(v)).reduce((a, b) => a > b ? a : b, 0n);
+  if (floor <= 0n || BigInt(message.takingAmount) < floor) return `takingAmount ${String(message.takingAmount)} is below the quote's minimum ${floor}`;
+  const traits = BigInt(message.makerTraits);
+  const flags = traits & (1n << 56n) - 1n << 200n;
+  const baseFlags = 1n << 251n | 1n << 249n;
+  if (flags !== baseFlags && flags !== (baseFlags | 1n << 255n)) return "the makerTraits flags are not a single-fill order with its extension";
+  if ((traits & (1n << 80n) - 1n) !== 0n || (traits >> 160n & (1n << 40n) - 1n) !== 0n) return "the makerTraits restrict the taker or the series";
+  const now = BigInt(Math.floor(Date.now() / 1e3));
+  const expiration = traits >> 80n & (1n << 40n) - 1n;
+  if (expiration <= now || expiration > now + BigInt(MAX_EVM_ORDER_LIFETIME_S)) return "the order's expiry is not minutes away";
+  const extension = viemHexToBytes(tx.orderExtension);
+  const mask = (1n << 160n) - 1n;
+  if ((BigInt(message.salt) & mask) !== (BigInt(keccak256(extension)) & mask)) return "the salt does not commit the order extension";
+  let parsed;
+  try {
+    parsed = readEvmOrderExtension(extension);
+  } catch (e) {
+    return e instanceof Error ? e.message.replace(/^omniston: /, "") : String(e);
+  }
+  const { target, getter, post, extra, customData } = parsed;
+  if (!listed(trusted.factories, params.sourceChain, target)) return `the extension targets ${target}, not a trusted escrow factory on ${params.sourceChain}`;
+  const receiverLow80 = BigInt(getAddress(String(message.receiver))) & (1n << 80n) - 1n;
+  if (getter.resolver !== receiverLow80 || post.resolver !== receiverLow80) return "the order's receiver is not the resolver its extension whitelists";
+  if (getter.gasBump !== 0n || getter.gasPrice !== 0n || 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]) || getter.integratorFee !== 0n || getter.integratorShare !== 100n || getter.whitelistDiscount !== 50n || !within(getter.auctionStart, bigintToNumber(now), MAX_EVM_ORDER_LIFETIME_S, 60)) {
+    return "the amount-getter terms do not match the pinned v1beta8 profile";
+  }
+  if (!zeroBytes(post.integratorRecipient) || !(zeroBytes(post.protocolRecipient) || !tonDest && EVM_DEST_PROTOCOL_FEE_RECIPIENTS.has(`0x${bytesToHex(post.protocolRecipient)}`)) || post.integratorFee !== 0n || post.integratorShare !== 100n || post.resolverFee !== getter.resolverFee || post.discount !== 50n || post.resolverTimeDelta !== 0n || !within(post.allowedTime, bigintToNumber(getter.auctionStart), 60, 5)) {
+    return "the post-interaction terms do not match the pinned v1beta8 profile";
+  }
+  let dstToken;
+  try {
+    dstToken = tonDest ? BigInt(getAddress(String(message.takerAsset))) : BigInt(getAddress(outputToken));
+  } catch {
+    return "the destination token is not an EVM address";
+  }
+  if (extra[1] !== (tonDest ? 0n : BigInt(destChainId)) || extra[2] !== dstToken || extra[4] !== EVM_TIMELOCKS) {
+    return "the signed HTLC terms name another destination chain or token, or other timelocks";
+  }
+  try {
+    await checkOrderCustomData(customData, { evmDest: !tonDest, outputToken, traderDst: params.destAddress, quoteId: intent.quoteId });
+  } catch (e) {
+    return e instanceof Error ? e.message.replace(/^omniston: /, "") : String(e);
+  }
+  return null;
+}
 function omnistonVerifyBuild(hooks) {
+  const trusted = {
+    orderProtocols: hooks.trustedEvmOrderProtocols ?? AUDITED_OMNISTON_EVM_ORDER_PROTOCOLS,
+    factories: hooks.trustedSettlementContracts ?? AUDITED_OMNISTON_SETTLEMENT_CONTRACTS
+  };
   return async (quote, tx, params) => {
+    if (tx.typedData !== void 0) {
+      if (!params) return "the request this quote answered is unknown";
+      try {
+        return await checkRemoteEvmOrder(quote, tx, params, trusted);
+      } catch {
+        return "the typed order could not be checked";
+      }
+    }
     if (tx.bodyBoc === void 0) return null;
     if (!params) return "the request this quote answered is unknown";
     if (quote.providerData?.settlement !== "swap") {
@@ -1170,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;
   };
@@ -1316,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;
@@ -1369,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,
@@ -1389,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;
@@ -1417,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";
@@ -1496,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,
@@ -1529,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();
@@ -1628,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;
@@ -1799,7 +1937,7 @@ function omnistonProvider(opts = {}) {
       }
     });
     const orderProtocol = 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",
@@ -1908,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,
@@ -2086,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)) ?? [];
@@ -2094,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;
@@ -2192,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;
@@ -2221,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);
@@ -2273,4 +2425,4 @@ export {
   omnistonVerifyBuild,
   omnistonProvider
 };
-//# sourceMappingURL=chunk-HOTFZYSW.js.map
+//# sourceMappingURL=chunk-2DGCZD5K.js.map