@anywalletkit/protocol-swap2-core 0.8.0 → 0.10.0

package/dist/swap2/base.d.cts

@@ -190,6 +190,24 @@ interface SerializedExecutionExpectation {
         token: string;
         maxAmount: string;
     };
+    /**
+     * Bridges: the destination chain (CAIP-2) and the reviewed recipient there. Value leaving the account may only go into
+     * the bridge (plus the provider's declared fee), and a bridge instruction whose recipient the account can read must
+     * name this one; an account that cannot prove where the funds go refuses the transaction. The engine also names the
+     * reviewed destination token (zero address = native), the quoted minimum in its base units with its decimals (the
+     * catalog's, else the caller's verified `toTokenDecimals`; never the quote's alone), and the slippage the plan allows, so a bridge
+     * order's own token and minimum can be held to them.
+     * Set on every cross-chain serialized leg. A Solana account maps the whole expectation with wallet-solana's
+     * `serializedGuardFromExecution`; a hand mapping that drops `bridgeOut` leaves the leg checked against the SOL ceiling only.
+     */
+    bridgeOut?: {
+        destChain: string;
+        recipient: string;
+        destToken: string;
+        minAmountOut: string;
+        destDecimals?: number;
+        slippageBps?: number;
+    };
 }
 /**
  * A bound wallet account, accepted opaquely: the write surface we need is

package/dist/swap2/base.d.ts

@@ -190,6 +190,24 @@ interface SerializedExecutionExpectation {
         token: string;
         maxAmount: string;
     };
+    /**
+     * Bridges: the destination chain (CAIP-2) and the reviewed recipient there. Value leaving the account may only go into
+     * the bridge (plus the provider's declared fee), and a bridge instruction whose recipient the account can read must
+     * name this one; an account that cannot prove where the funds go refuses the transaction. The engine also names the
+     * reviewed destination token (zero address = native), the quoted minimum in its base units with its decimals (the
+     * catalog's, else the caller's verified `toTokenDecimals`; never the quote's alone), and the slippage the plan allows, so a bridge
+     * order's own token and minimum can be held to them.
+     * Set on every cross-chain serialized leg. A Solana account maps the whole expectation with wallet-solana's
+     * `serializedGuardFromExecution`; a hand mapping that drops `bridgeOut` leaves the leg checked against the SOL ceiling only.
+     */
+    bridgeOut?: {
+        destChain: string;
+        recipient: string;
+        destToken: string;
+        minAmountOut: string;
+        destDecimals?: number;
+        slippageBps?: number;
+    };
 }
 /**
  * A bound wallet account, accepted opaquely: the write surface we need is

package/dist/swap2/base.js

@@ -7,8 +7,9 @@ import {
   nativeUnits,
   normalizeTypedDomain,
   swap2ChainId
-} from "../chunk-CRCDWV3L.js";
+} from "../chunk-PN76KVPT.js";
 import "../chunk-IVR3SREQ.js";
+import "../chunk-F5TRF52T.js";
 import "../chunk-2KC734UX.js";
 export {
   BaseSwap2Protocol,

package/dist/swap2/single.cjs

@@ -81,6 +81,70 @@ function tonRawAddress(address) {
   return `${wc}:${Array.from(bytes.subarray(2, 34), (b) => b.toString(16).padStart(2, "0")).join("")}`;
 }
 
+// src/validate.ts
+var SLIPPAGE_ROUNDING_BPS = 1;
+function slippageFloor(dest, slippageBps) {
+  const keep = 1e4 - slippageBps - SLIPPAGE_ROUNDING_BPS;
+  return keep <= 0 ? 0n : dest * BigInt(keep) / 10000n;
+}
+function validQuote(q, params, provider) {
+  try {
+    if (q.provider !== provider || q.sourceAmount !== params.amountIn) return false;
+    if (typeof q.intentId !== "string" || !q.intentId || typeof q.depositAddress !== "string" || q.depositMemo !== null && typeof q.depositMemo !== "string") return false;
+    if (![q.sourceAmount, q.destAmount, q.minDestAmount].every((value) => /^[0-9]+$/.test(value))) return false;
+    const source = BigInt(q.sourceAmount);
+    const dest = BigInt(q.destAmount);
+    const min = BigInt(q.minDestAmount);
+    if (source <= 0n || dest <= 0n || min <= 0n || min > dest) return false;
+    if (params.minAmountOut !== void 0) {
+      if (!/^[0-9]+$/.test(params.minAmountOut) || BigInt(params.minAmountOut) <= 0n || min < BigInt(params.minAmountOut)) return false;
+    }
+    if (params.slippageBps !== void 0) {
+      if (!Number.isInteger(params.slippageBps) || params.slippageBps < 0 || params.slippageBps >= 1e4) return false;
+      if (min < slippageFloor(dest, params.slippageBps)) return false;
+    }
+    if (!Number.isFinite(q.etaSeconds) || q.etaSeconds < 0) return false;
+    if (!Number.isFinite(q.reliability) || q.reliability < 0 || q.reliability > 1) return false;
+    if (!Number.isFinite(q.feeUsd) || q.feeUsd < 0) return false;
+    if (q.fees && (!Array.isArray(q.fees) || !q.fees.every(
+      (fee) => ["network", "protocol", "affiliate", "other"].includes(fee.type) && /^[0-9]+$/.test(fee.amount) && typeof fee.token === "string" && fee.token.length > 0 && typeof fee.included === "boolean" && (fee.description === void 0 || typeof fee.description === "string")
+    ))) return false;
+    if (q.providerData && (Array.isArray(q.providerData) || typeof q.providerData !== "object" || !Object.values(q.providerData).every((value) => typeof value === "string"))) return false;
+    const tx = q.txRequest;
+    if (tx) {
+      if (tx.value !== void 0 && !/^[0-9]+$/.test(tx.value)) return false;
+      if (tx.gasLimit !== void 0 && !/^[0-9]+$/.test(tx.gasLimit)) return false;
+      if (tx.chainId !== void 0 && (!Number.isSafeInteger(tx.chainId) || tx.chainId <= 0)) return false;
+      if ([tx.to, tx.data, tx.approvalAddress, tx.serializedTx].some((value) => value !== void 0 && typeof value !== "string")) return false;
+    }
+    if (!Number.isFinite(q.validUntilMs) || q.validUntilMs <= Date.now()) return false;
+    return true;
+  } catch {
+    return false;
+  }
+}
+function remotePinRefusal(provider, q, chain) {
+  if (provider.remote !== true) return null;
+  const tx = q.txRequest;
+  const plain = tx ? tx.data === void 0 && tx.serializedTx === void 0 : typeof q.depositAddress === "string" && q.depositAddress !== "";
+  if (plain && provider.depositAddressRoutes !== true) {
+    return `${provider.name}: the route pays ${tx?.to || q.depositAddress}, an address the backend named, and the app did not allow deposit-address routes for this provider (remoteProvider depositAddressRoutes)`;
+  }
+  if (!chain.startsWith("eip155:")) return null;
+  if (!tx || tx.serializedTx !== void 0) return null;
+  const pinned = (list, address) => (list ?? []).some((a) => typeof a === "string" && a.toLowerCase() === address.toLowerCase());
+  if (tx.approvalAddress && !pinned(provider.spenders?.(chain), tx.approvalAddress)) {
+    return `${provider.name}: the route approves ${tx.approvalAddress}, which the app did not pin as a spender on ${chain} (remoteProvider spenders)`;
+  }
+  if (tx.data !== void 0 && tx.to && !pinned(provider.callTargets?.(chain), tx.to)) {
+    return `${provider.name}: the route calls ${tx.to}, which the app did not pin as a call target on ${chain} (remoteProvider callTargets)`;
+  }
+  if (tx.data !== void 0 && provider.verifiesQuotes !== true && provider.verifiesBuilds !== true) {
+    return `${provider.name}: the route's calldata is not checked by the app (remoteProvider verifyQuote / verifyBuild) \u2014 a pinned target alone does not say whom it pays`;
+  }
+  return null;
+}
+
 // src/errors.ts
 var Swap2Error = class extends Error {
   constructor(message, code, options) {
@@ -310,16 +374,18 @@ function reviewedIdentity(plan) {
   return JSON.stringify(pinned, (_k, v) => typeof v === "bigint" ? v.toString() : v);
 }
 var SWAP2_ID_PREFIX = "awk1";
-function encodeId(provider, intentId, sourceTxHash, destTxHash) {
+var CONFIRMED_SEGMENT = "ok";
+function encodeId(provider, intentId, sourceTxHash, destTxHash, destTxConfirmed = false) {
   const enc = (v) => encodeURIComponent(v).replace(/\./g, "%2E");
-  const parts = [provider, intentId, ...sourceTxHash != null ? [sourceTxHash, ...destTxHash != null ? [destTxHash] : []] : []];
+  const dest = destTxHash != null ? [destTxHash, ...destTxConfirmed ? [CONFIRMED_SEGMENT] : []] : [];
+  const parts = [provider, intentId, ...sourceTxHash != null ? [sourceTxHash, ...dest] : []];
   return `${SWAP2_ID_PREFIX}.${parts.map(enc).join(".")}`;
 }
 function decodeId(id) {
   try {
     if (!id.startsWith(`${SWAP2_ID_PREFIX}.`)) throw new Error("unsupported id version");
     const parts = id.slice(SWAP2_ID_PREFIX.length + 1).split(".");
-    if (parts.length < 2 || parts.length > 4 || !parts[0] || !parts[1]) throw new Error("invalid id shape");
+    if (parts.length < 2 || parts.length > 5 || !parts[0] || !parts[1]) throw new Error("invalid id shape");
     const provider = decodeURIComponent(parts[0]);
     const intentId = decodeURIComponent(parts[1]);
     const sourceTxHash = parts[2] ? decodeURIComponent(parts[2]) : void 0;
@@ -327,7 +393,8 @@ function decodeId(id) {
     if (!/^[A-Za-z0-9_-]+$/.test(provider) || !intentId || parts[2] !== void 0 && !sourceTxHash || parts[3] !== void 0 && !destTxHash) {
       throw new Error("invalid id contents");
     }
-    return { provider, intentId, ...sourceTxHash ? { sourceTxHash } : {}, ...destTxHash ? { destTxHash } : {} };
+    if (parts[4] !== void 0 && parts[4] !== CONFIRMED_SEGMENT) throw new Error("invalid id contents");
+    return { provider, intentId, ...sourceTxHash ? { sourceTxHash } : {}, ...destTxHash ? { destTxHash } : {}, ...parts[4] !== void 0 ? { destTxConfirmed: true } : {} };
   } catch {
     throw new Swap2ValidationError("swap2: malformed swap2 status id");
   }
@@ -460,13 +527,30 @@ function assertQuoteConstraints(q, options) {
   }
   if (options.slippage !== void 0) {
     const scale = 1000000000n;
-    const permitted = BigInt(floorScaled(options.slippage, 1e9));
-    const required = nominal * (scale - permitted) / scale;
+    const permitted = BigInt(floorScaled(options.slippage, 1e9)) + BigInt(SLIPPAGE_ROUNDING_BPS) * 100000n;
+    const required = permitted >= scale ? 0n : nominal * (scale - permitted) / scale;
     if (guaranteed < required) {
       throw new Error(`swap2: quote exceeds caller slippage (${options.slippage})`);
     }
   }
 }
+function bridgeOutOf(params, q, toTokenDecimals) {
+  let decimals = (0, import_swap2_assets2.resolveAsset)(params.destChain, params.destToken)?.decimals;
+  if (decimals === void 0 && toTokenDecimals !== void 0) {
+    if (q.destDecimals !== void 0 && q.destDecimals !== toTokenDecimals) {
+      throw new Swap2ValidationError(`swap2: the quote's destDecimals ${q.destDecimals} do not match toTokenDecimals ${toTokenDecimals}`);
+    }
+    decimals = toTokenDecimals;
+  }
+  return {
+    destChain: params.destChain,
+    recipient: params.destAddress,
+    destToken: params.destToken,
+    minAmountOut: q.minDestAmount,
+    ...decimals !== void 0 ? { destDecimals: decimals } : {},
+    ...params.slippageBps !== void 0 ? { slippageBps: params.slippageBps } : {}
+  };
+}
 function requireExecutionFloor(options) {
   if (options.minAmountOut === void 0) {
     throw new Error("swap2: swap2() requires caller-supplied minAmountOut");
@@ -565,6 +649,10 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
     }
     const destChain = toCaip2(options.toChain, this.fromChain);
     const constraints = callerConstraints(options);
+    const toDecimals = options.toTokenDecimals;
+    if (toDecimals !== void 0 && (!Number.isInteger(toDecimals) || toDecimals < 0 || toDecimals > 36)) {
+      throw new Swap2ValidationError("swap2: toTokenDecimals must be whole decimals in 0..36");
+    }
     const amountIn = exactPositiveAmount(options.fromTokenAmount, "fromTokenAmount");
     const source = this.sourceAsset(options);
     const params = {
@@ -907,6 +995,8 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
         }
       } else if (remote && !pinnedTargets.includes(unsigned.to.toLowerCase())) {
         throw new Swap2ValidationError(`swap2: remote provider '${q.provider}' calls ${(0, import_viem.getAddress)(unsigned.to)} on ${this.fromChain}, which the app did not pin as a call target (remoteProvider callTargets) \u2014 refused`);
+      } else if (remote && provider.verifiesQuotes !== true && provider.verifiesBuilds !== true) {
+        throw new Swap2ValidationError(`swap2: remote provider '${q.provider}' calls ${(0, import_viem.getAddress)(unsigned.to)} with calldata the app does not check (remoteProvider verifyQuote / verifyBuild) \u2014 refused`);
       }
     }
     const needsApproval = !!unsigned.approvalAddress && !!source.contract;
@@ -1092,7 +1182,8 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
           maxValueOut: ((source.contract ? 0n : BigInt(q.sourceAmount)) + allowance).toString(),
           // Only a same-chain swap lands in this account; a bridge delivers elsewhere.
           ...params.destChain === this.fromChain ? { tokenIn: { token: params.destToken, minAmount: q.minDestAmount } } : {},
-          ...source.contract ? { source: { token: source.contract, maxAmount: q.sourceAmount } } : {}
+          ...source.contract ? { source: { token: source.contract, maxAmount: q.sourceAmount } } : {},
+          ...params.destChain !== this.fromChain ? { bridgeOut: bridgeOutOf(params, q, executionOptions.toTokenDecimals) } : {}
         };
         sent = await signer.sendSerializedTransaction(unsigned.serializedTx, expect);
       } else if (tokenId) {
@@ -1176,10 +1267,10 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
   }
   /** Status of a swap by the id `swap2()` returned, asked from the provider that executed it. */
   async getSwap2Status(id, _options) {
-    const { provider: name, intentId, sourceTxHash, destTxHash } = decodeId(id);
+    const { provider: name, intentId, sourceTxHash, destTxHash, destTxConfirmed } = decodeId(id);
     const provider = this.providerFor(name);
     if (!provider) throw new Error(`swap2: no swap2 found for id '${id}'`);
-    return mapStatus(await provider.trackIntent({ intentId, ...sourceTxHash != null ? { sourceTxHash } : {}, ...destTxHash != null ? { destTxHash } : {} }));
+    return mapStatus(await provider.trackIntent({ intentId, ...sourceTxHash != null ? { sourceTxHash } : {}, ...destTxHash != null ? { destTxHash, ...destTxConfirmed ? { destTxConfirmed } : {} } : {} }));
   }
   /**
    * Two-phase routes (CCTP-style burn-and-mint): once `getSwap2Status` reports
@@ -1252,7 +1343,21 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
     });
     if (!sent.hash) throw new Swap2ExecutionError("swap2: account did not return a claim transaction hash");
     this.emitPhase("broadcast", { hash: sent.hash });
-    return { hash: sent.hash, chain: unsigned.chain, id: encodeId(name, intentId, sourceTxHash, sent.hash) };
+    let confirmed = false;
+    if (typeof signer.waitForTransaction === "function") {
+      try {
+        await signer.waitForTransaction(sent.hash);
+        confirmed = true;
+      } catch (e) {
+        const err = e;
+        const timedOut = /timeout|timed out/i.test(String(err?.name ?? "")) || /timed out|timeout/i.test(String(err?.message ?? ""));
+        const reverted = err?.code === "reverted" || !timedOut && /\breverted\b/i.test(String(err?.message ?? ""));
+        if (reverted) {
+          throw new Swap2ExecutionError(`swap2: the claim transaction ${sent.hash} on ${unsigned.chain} reverted \u2014 poll the status of '${id}' and claim again if it is still action-required`, { cause: e });
+        }
+      }
+    }
+    return { hash: sent.hash, chain: unsigned.chain, id: encodeId(name, intentId, sourceTxHash, sent.hash, confirmed) };
   }
   /** The inherited bridge() has no floor field: quote first, then bind execution
    * to that quote's minimum so the inherited convenience API stays safe. */
@@ -1329,7 +1434,10 @@ function structuredCloneSafe(value) {
   if (value === null || typeof value !== "object") return value;
   if (Array.isArray(value)) return value.map((v) => structuredCloneSafe(v));
   const out = {};
-  for (const [k, v] of Object.entries(value)) out[k] = structuredCloneSafe(v);
+  for (const [k, v] of Object.entries(value)) {
+    if (k === "__proto__") Object.defineProperty(out, k, { value: structuredCloneSafe(v), writable: true, enumerable: true, configurable: true });
+    else out[k] = structuredCloneSafe(v);
+  }
   return out;
 }
 function deepFreeze(value) {
@@ -1340,63 +1448,6 @@ function deepFreeze(value) {
   return value;
 }
 
-// src/validate.ts
-function validQuote(q, params, provider) {
-  try {
-    if (q.provider !== provider || q.sourceAmount !== params.amountIn) return false;
-    if (typeof q.intentId !== "string" || !q.intentId || typeof q.depositAddress !== "string" || q.depositMemo !== null && typeof q.depositMemo !== "string") return false;
-    if (![q.sourceAmount, q.destAmount, q.minDestAmount].every((value) => /^[0-9]+$/.test(value))) return false;
-    const source = BigInt(q.sourceAmount);
-    const dest = BigInt(q.destAmount);
-    const min = BigInt(q.minDestAmount);
-    if (source <= 0n || dest <= 0n || min <= 0n || min > dest) return false;
-    if (params.minAmountOut !== void 0) {
-      if (!/^[0-9]+$/.test(params.minAmountOut) || BigInt(params.minAmountOut) <= 0n || min < BigInt(params.minAmountOut)) return false;
-    }
-    if (params.slippageBps !== void 0) {
-      if (!Number.isInteger(params.slippageBps) || params.slippageBps < 0 || params.slippageBps >= 1e4) return false;
-      const required = dest * BigInt(1e4 - params.slippageBps) / 10000n;
-      if (min < required) return false;
-    }
-    if (!Number.isFinite(q.etaSeconds) || q.etaSeconds < 0) return false;
-    if (!Number.isFinite(q.reliability) || q.reliability < 0 || q.reliability > 1) return false;
-    if (!Number.isFinite(q.feeUsd) || q.feeUsd < 0) return false;
-    if (q.fees && (!Array.isArray(q.fees) || !q.fees.every(
-      (fee) => ["network", "protocol", "affiliate", "other"].includes(fee.type) && /^[0-9]+$/.test(fee.amount) && typeof fee.token === "string" && fee.token.length > 0 && typeof fee.included === "boolean" && (fee.description === void 0 || typeof fee.description === "string")
-    ))) return false;
-    if (q.providerData && (Array.isArray(q.providerData) || typeof q.providerData !== "object" || !Object.values(q.providerData).every((value) => typeof value === "string"))) return false;
-    const tx = q.txRequest;
-    if (tx) {
-      if (tx.value !== void 0 && !/^[0-9]+$/.test(tx.value)) return false;
-      if (tx.gasLimit !== void 0 && !/^[0-9]+$/.test(tx.gasLimit)) return false;
-      if (tx.chainId !== void 0 && (!Number.isSafeInteger(tx.chainId) || tx.chainId <= 0)) return false;
-      if ([tx.to, tx.data, tx.approvalAddress, tx.serializedTx].some((value) => value !== void 0 && typeof value !== "string")) return false;
-    }
-    if (!Number.isFinite(q.validUntilMs) || q.validUntilMs <= Date.now()) return false;
-    return true;
-  } catch {
-    return false;
-  }
-}
-function remotePinRefusal(provider, q, chain) {
-  if (provider.remote !== true) return null;
-  const tx = q.txRequest;
-  const plain = tx ? tx.data === void 0 && tx.serializedTx === void 0 : typeof q.depositAddress === "string" && q.depositAddress !== "";
-  if (plain && provider.depositAddressRoutes !== true) {
-    return `${provider.name}: the route pays ${tx?.to || q.depositAddress}, an address the backend named, and the app did not allow deposit-address routes for this provider (remoteProvider depositAddressRoutes)`;
-  }
-  if (!chain.startsWith("eip155:")) return null;
-  if (!tx || tx.serializedTx !== void 0) return null;
-  const pinned = (list, address) => (list ?? []).some((a) => typeof a === "string" && a.toLowerCase() === address.toLowerCase());
-  if (tx.approvalAddress && !pinned(provider.spenders?.(chain), tx.approvalAddress)) {
-    return `${provider.name}: the route approves ${tx.approvalAddress}, which the app did not pin as a spender on ${chain} (remoteProvider spenders)`;
-  }
-  if (tx.data !== void 0 && tx.to && !pinned(provider.callTargets?.(chain), tx.to)) {
-    return `${provider.name}: the route calls ${tx.to}, which the app did not pin as a call target on ${chain} (remoteProvider callTargets)`;
-  }
-  return null;
-}
-
 // src/swap2/single.ts
 var SingleProviderSwap2 = class extends BaseSwap2Protocol {
   /** Why the last resolveQuote came back empty — the provider's own reason, like the router's. */