@anywalletkit/protocol-swap2-omniston 0.2.8 → 0.3.1

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, omnistonProvider, validateEvmToTonOrderExtension } 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-BBG2zhpu.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, omnistonProvider, validateEvmToTonOrderExtension } 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-BBG2zhpu.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-KVDPDEJB.js";
+} from "./chunk-RW4XZWNC.js";
 import {
   TON_SWAP_PROTOCOL_LAYOUTS,
   TonSwapPayloadError,
@@ -8,9 +8,12 @@ import {
   encodeTypedMessage,
   inMemoryQuoteStore,
   inMemorySecretStore,
+  omnistonPins,
   omnistonProvider,
-  validateEvmToTonOrderExtension
-} from "./chunk-KNT2XSQU.js";
+  omnistonVerifyBuild,
+  validateEvmToTonOrderExtension,
+  validateEvmTypedOrder
+} from "./chunk-HOTFZYSW.js";
 import {
   omniston
 } from "./chunk-QDXFC6BC.js";
@@ -34,7 +37,10 @@ export {
   inMemoryQuoteStore,
   inMemorySecretStore,
   omniston,
+  omnistonPins,
   omnistonProvider,
-  validateEvmToTonOrderExtension
+  omnistonVerifyBuild,
+  validateEvmToTonOrderExtension,
+  validateEvmTypedOrder
 };
 //# sourceMappingURL=index.js.map

package/dist/protocol.cjs

@@ -452,7 +452,12 @@ function inMemoryQuoteStore() {
   return {
     save: (id, v) => void map.set(id, v),
     load: (id) => map.get(id),
-    clear: (id) => void map.delete(id)
+    clear: (id) => void map.delete(id),
+    claim: (id, v) => {
+      if (map.has(id)) return false;
+      map.set(id, v);
+      return true;
+    }
   };
 }
 function inMemorySecretStore() {
@@ -1026,6 +1031,13 @@ function validSwapSettlement(q) {
   const v = q.settlementData.value;
   return Array.isArray(v.routes) && v.routes.length > 0 && v.routes.every((route) => Array.isArray(route?.steps) && route.steps.length > 0 && route.steps.every((step) => Array.isArray(step?.chunks) && step.chunks.length > 0 && step.chunks.every((chunk) => typeof chunk?.protocol === "string" && chunk.protocol.length > 0 && isPositiveInteger(chunk.inputUnits) && isPositiveInteger(chunk.outputUnits)))) && isPositiveInteger(v.minOutputAmount) && BigInt(v.minOutputAmount) <= BigInt(q.outputUnits) && (v.recommendedMinOutputAmount === void 0 || isPositiveInteger(v.recommendedMinOutputAmount) && BigInt(v.recommendedMinOutputAmount) <= BigInt(q.outputUnits)) && (q.gasBudget === void 0 || isPositiveInteger(q.gasBudget));
 }
+function swapSteps(v) {
+  if (v.routes.length !== 1) return [{ protocol: `${v.routes.length}-routes`, inputJetton: void 0, outputJetton: void 0 }];
+  return v.routes[0].steps.map((step) => {
+    if (step.chunks.length !== 1) return { protocol: `split(${step.chunks.map((c) => c.protocol).join("|")})`, inputJetton: void 0, outputJetton: void 0 };
+    return { protocol: step.chunks[0].protocol, inputJetton: stepJetton(step.inputAsset), outputJetton: stepJetton(step.outputAsset) };
+  });
+}
 function swapProtocols(v) {
   const names = /* @__PURE__ */ new Set();
   for (const route of v.routes) for (const step of route.steps) for (const chunk of step.chunks) names.add(chunk.protocol);
@@ -1319,6 +1331,26 @@ function omnistonProvider(opts = {}) {
   async function saveBuilt(quoteId, entry) {
     await quotes.save(quoteId, JSON.stringify(entry));
   }
+  async function claimBuilt(quoteId, entry) {
+    const json = JSON.stringify(entry);
+    if (typeof quotes.claim === "function") {
+      if (await quotes.claim(quoteId, json)) return true;
+    } else if (!await quotes.load(quoteId)) {
+      await quotes.save(quoteId, json);
+      return true;
+    }
+    const existing = await loadBuilt(quoteId);
+    if (!existing) {
+      if (typeof quotes.claim === "function") return await quotes.claim(quoteId, json);
+      await quotes.save(quoteId, json);
+      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);
+    if (!same) return false;
+    await quotes.save(quoteId, json);
+    return true;
+  }
   async function loadBuilt(quoteId) {
     const raw2 = await quotes.load(quoteId);
     if (!raw2) return void 0;
@@ -1485,7 +1517,10 @@ function omnistonProvider(opts = {}) {
     if (BigInt(swap.minOutputAmount) < requiredMin(q.outputUnits)) return null;
     if (q.gasBudget !== void 0 && BigInt(q.gasBudget) > BigInt(maxTonExecutionNano)) return null;
     const minOut = swap.minOutputAmount;
-    await saveBuilt(q.quoteId, { quote: q, at: Date.now(), bound: { trader, dest: params.destAddress, srcChain: params.sourceChain, kind: "swap" } });
+    if (!await claimBuilt(q.quoteId, { quote: q, at: Date.now(), bound: { trader, dest: params.destAddress, srcChain: params.sourceChain, kind: "swap" } })) {
+      traceFor(q.quoteId)("quote-id-reused", { kind: "swap" });
+      return null;
+    }
     const feeUnits = Number(q.protocolFeeUnits || "0") + Number(q.integratorFeeUnits || "0");
     const stableOut = /^(USDT|USDC|USD₮|jUSDT)$/.test(dest.symbol);
     const feeUsd = stableOut ? feeUnits / 10 ** dest.decimals : 0;
@@ -1512,6 +1547,8 @@ function omnistonProvider(opts = {}) {
       providerData: {
         settlement: "swap",
         protocols: swapProtocols(swap).join(","),
+        // For the app's own check of a remote build (omnistonVerifyBuild): the route the body must follow.
+        routeSteps: JSON.stringify(swapSteps(swap)),
         ...q.gasBudget ? { gasBudget: q.gasBudget } : {},
         ...q.estimatedGasConsumption ? { gasEstimate: q.estimatedGasConsumption } : {}
       }
@@ -1612,10 +1649,7 @@ function omnistonProvider(opts = {}) {
         minOutputAmount: swap.minOutputAmount,
         inputJetton,
         outputJetton: assetContract(q.outputAsset),
-        steps: swap.routes.length === 1 ? routeSteps.map((step) => {
-          if (step.chunks.length !== 1) return { protocol: `split(${step.chunks.map((c) => c.protocol).join("|")})`, inputJetton: void 0, outputJetton: void 0 };
-          return { protocol: step.chunks[0].protocol, inputJetton: stepJetton(step.inputAsset), outputJetton: stepJetton(step.outputAsset) };
-        }) : [{ protocol: `${swap.routes.length}-routes`, inputJetton: void 0, outputJetton: void 0 }],
+        steps: swapSteps(swap),
         integratorAddress: q.integratorAddress?.chain.$case === "ton" ? q.integratorAddress.chain.value : null
       });
     } catch (error) {
@@ -1903,7 +1937,9 @@ function omnistonProvider(opts = {}) {
       const outputScaled = BigInt(q.outputUnits) * 10n ** BigInt(source.decimals);
       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");
-      await saveBuilt(q.quoteId, { quote: q, at: Date.now(), bound: { trader, dest: params.destAddress, srcChain: params.sourceChain, kind: "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");
+      }
       const feeUnits = Number(q.protocolFeeUnits || "0") + Number(q.integratorFeeUnits || "0");
       const feeUsd = feeUnits / 10 ** dest.decimals;
       return {
@@ -2035,6 +2071,7 @@ function omnistonProvider(opts = {}) {
         await forget();
         throw error;
       }
+      await saveBuilt(ref.quoteId, { quote: q, at: Date.now(), ...cached.bound ? { bound: cached.bound } : {} });
       return {
         chain: srcChain,
         to: message.targetAddress,
@@ -2078,8 +2115,15 @@ function omnistonProvider(opts = {}) {
         })
       );
       if (!order) return { state: "pending" };
-      const secretsHex = await store.load(decoded.quoteId);
+      let secretsHex = await store.load(decoded.quoteId);
       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)) ?? [];
+        if (lockedTo !== orderBinding(bound, cached.quote)) {
+          trace("disclosure-skipped", { gate: "binding", bound: lockedTo !== void 0, feedStatus: order.status });
+          secretsHex = void 0;
+        }
+      }
       if (secretsHex && cached?.quote.settlementData.$case === "order") {
         const q = cached.quote;
         const settlement = q.settlementData.value;