@anywalletkit/protocol-swap2-omniston 0.3.0 → 0.4.0

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 export { omniston } from './config.cjs';
-export { AssetId, ChainAddress, EscrowMessage, HtlcSecretStore, ObservableLike, OmnistonClientLike, OmnistonProviderOptions, OmnistonQuote, OmnistonQuoteStore, OrderEvent, OrderExecution, OrderSettlement, OrderSnapshot, QuoteRequest, RfqEvent, SwapSettlement, SwapTrackEvent, TON_SWAP_PROTOCOL_LAYOUTS, TonSwapCheckInput, TonSwapCheckResult, TonSwapLeg, TonSwapPayloadError, checkTonSwapPayload, encodeTypedMessage, inMemoryQuoteStore, inMemorySecretStore, omnistonPins, omnistonProvider, omnistonVerifyBuild, validateEvmToTonOrderExtension, validateEvmTypedOrder } from './provider.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-D6RXRgf-.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 { AssetId, ChainAddress, EscrowMessage, HtlcSecretStore, ObservableLike, OmnistonClientLike, OmnistonProviderOptions, OmnistonQuote, OmnistonQuoteStore, OrderEvent, OrderExecution, OrderSettlement, OrderSnapshot, QuoteRequest, RfqEvent, SwapSettlement, SwapTrackEvent, TON_SWAP_PROTOCOL_LAYOUTS, TonSwapCheckInput, TonSwapCheckResult, TonSwapLeg, TonSwapPayloadError, checkTonSwapPayload, encodeTypedMessage, inMemoryQuoteStore, inMemorySecretStore, omnistonPins, omnistonProvider, omnistonVerifyBuild, validateEvmToTonOrderExtension, validateEvmTypedOrder } from './provider.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-D6RXRgf-.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-CRYYP6X3.js";
+} from "./chunk-WL7BSEBR.js";
 import {
   TON_SWAP_PROTOCOL_LAYOUTS,
   TonSwapPayloadError,
@@ -13,7 +13,7 @@ import {
   omnistonVerifyBuild,
   validateEvmToTonOrderExtension,
   validateEvmTypedOrder
-} from "./chunk-JVFDD7PV.js";
+} from "./chunk-R6B2CV5Z.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

@@ -632,9 +632,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 +654,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 +721,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 +781,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;
@@ -1829,7 +1843,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",