@anywalletkit/protocol-swap2-core 0.5.0 → 0.6.1

package/dist/index.cjs

@@ -266,7 +266,8 @@ function remoteProvider(opts) {
     },
     ...opts.supportsChain ? { supportsChain: opts.supportsChain.bind(opts) } : {},
     ...opts.supportsChainPair ? { supportsChainPair: opts.supportsChainPair.bind(opts) } : {},
-    ...opts.supportsSameChain !== void 0 ? { supportsSameChain: opts.supportsSameChain } : {}
+    ...opts.supportsSameChain !== void 0 ? { supportsSameChain: opts.supportsSameChain } : {},
+    ...opts.claimTargets ? { claimTargets: opts.claimTargets } : {}
   };
 }
 
@@ -297,12 +298,14 @@ var inFlightKey = (fromChain, o) => JSON.stringify(
   [fromChain, o.fromToken, o.toToken, o.toChain, o.recipient, o.refundAddress, o.fromTokenAmount, o.toTokenAmount, o.minAmountOut, o.slippage],
   (_k, v) => typeof v === "bigint" ? v.toString() : v
 );
+var LOST_ANSWER = /socket hang up|ECONNRESET|ECONNABORTED|ETIMEDOUT|EPIPE|ENETUNREACH|EHOSTUNREACH|EAI_AGAIN|UND_ERR_[A-Z_]+|timed? ?out|TimeoutError|request aborted|AbortError|connection (?:closed|reset)|fetch failed|failed to fetch|network request failed|other side closed/i;
 function maybeSent(error) {
-  for (let e = error, i = 0; e && typeof e === "object" && i < 5; e = e.cause, i++) {
-    if (e.maybeSent === true) return typeof e.hash === "string" && e.hash ? { hash: e.hash } : {};
-  }
-  const text = error instanceof Error ? error.message : String(error);
-  return /socket hang up|ECONNRESET|ETIMEDOUT|EPIPE|timed? ?out|request aborted|connection (?:closed|reset)/i.test(text) ? {} : null;
+  const chain = [];
+  for (let e = error, i = 0; e && typeof e === "object" && i < 6; e = e.cause, i++) chain.push(e);
+  for (const e of chain) if (e.maybeSent === true) return typeof e.hash === "string" && e.hash ? { hash: e.hash } : {};
+  if (chain.some((e) => e.answered === true)) return null;
+  const texts = chain.length ? chain.map((e) => [e.message, e.code, e.name].filter((x) => typeof x === "string").join(" ")) : [String(error)];
+  return texts.some((t) => LOST_ANSWER.test(t)) ? {} : null;
 }
 var NATIVE_DECIMALS = Object.freeze({
   "eip155:5042": 18
@@ -386,22 +389,24 @@ 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) {
+function encodeId(provider, intentId, sourceTxHash, destTxHash) {
   const enc = (v) => encodeURIComponent(v).replace(/\./g, "%2E");
-  return `${SWAP2_ID_PREFIX}.${[provider, intentId, sourceTxHash].filter((v) => v != null).map(enc).join(".")}`;
+  const parts = [provider, intentId, ...sourceTxHash != null ? [sourceTxHash, ...destTxHash != null ? [destTxHash] : []] : []];
+  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 > 3 || !parts[0] || !parts[1]) throw new Error("invalid id shape");
+    if (parts.length < 2 || parts.length > 4 || !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;
-    if (!/^[A-Za-z0-9_-]+$/.test(provider) || !intentId || parts[2] !== void 0 && !sourceTxHash) {
+    const destTxHash = parts[3] ? decodeURIComponent(parts[3]) : void 0;
+    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 } : {} };
+    return { provider, intentId, ...sourceTxHash ? { sourceTxHash } : {}, ...destTxHash ? { destTxHash } : {} };
   } catch {
     throw new Swap2ValidationError("swap2: malformed swap2 status id");
   }
@@ -453,13 +458,19 @@ function toCaip2(chain, fallback) {
   }
   return swap2ChainId(chain);
 }
+function nonEmptyRef(ref, side) {
+  if (typeof ref !== "string" || ref.trim() === "") throw new Swap2ValidationError(`swap2: ${side} token must not be empty (pass the symbol or the contract address)`);
+  return ref;
+}
 function toSymbol(caip2, ref) {
+  nonEmptyRef(ref, "source");
   const byToken = ref.startsWith("0x") || ref.length > 20 ? (0, import_swap2_assets2.ccAssetByToken)(caip2, ref) : void 0;
   if (byToken) return byToken.symbol;
   if ((0, import_swap2_assets2.ccAsset)(caip2, ref)) return ref;
   return ref;
 }
 function toDestAddress(caip2, ref, allowUnlisted = false) {
+  nonEmptyRef(ref, "destination");
   if (ref.startsWith("0x")) return ref;
   const asset = (0, import_swap2_assets2.ccAssetByToken)(caip2, ref) ?? (0, import_swap2_assets2.ccAsset)(caip2, ref);
   if (!asset) {
@@ -827,7 +838,7 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
         throw new Error("swap2: provider build does not match the validated quote transaction");
       }
     } else if (!unsigned.bodyBoc && !unsigned.typedData) {
-      if (!q.depositAddress || unsigned.to !== q.depositAddress || (unsigned.memo ?? null) !== q.depositMemo) {
+      if (!q.depositAddress || unsigned.to !== q.depositAddress || (unsigned.memo ?? null) !== q.depositMemo || unsigned.data !== void 0 || unsigned.approvalAddress !== void 0 || unsigned.serializedTx !== void 0) {
         throw new Error("swap2: provider build does not match the validated quote deposit");
       }
     }
@@ -1182,10 +1193,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 } = decodeId(id);
+    const { provider: name, intentId, sourceTxHash, destTxHash } = decodeId(id);
     const provider = this.providerFor(name);
     if (!provider) throw new Error(`swap2: no swap2 found for id '${id}'`);
-    return mapStatus(await provider.trackIntent(sourceTxHash == null ? { intentId } : { intentId, sourceTxHash }));
+    return mapStatus(await provider.trackIntent({ intentId, ...sourceTxHash != null ? { sourceTxHash } : {}, ...destTxHash != null ? { destTxHash } : {} }));
   }
   /**
    * Two-phase routes (CCTP-style burn-and-mint): once `getSwap2Status` reports
@@ -1231,6 +1242,17 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
     if (unsigned.chainId !== void 0 && String(unsigned.chainId) !== expectedId) {
       throw new Error(`swap2: claim chainId ${unsigned.chainId} does not match ${unsigned.chain}`);
     }
+    if (typeof provider.claimTargets !== "function") {
+      throw new Swap2UnsupportedOperationError(`swap2: provider '${name}' declares no claimTargets \u2014 a claim may only call contracts the provider names for its chain`);
+    }
+    const targets = provider.claimTargets(unsigned.chain).map((a) => a.toLowerCase());
+    if (!targets.includes(unsigned.to.toLowerCase())) {
+      throw new Swap2ValidationError(`swap2: claim target ${unsigned.to} is not a contract '${name}' declares for ${unsigned.chain} \u2014 refused`);
+    }
+    const claimCall = (0, import_tx_preview_evm.decodeCall)({ to: unsigned.to, data: unsigned.data, value: 0n });
+    if (claimCall.transfer || claimCall.approval) {
+      throw new Swap2ValidationError(`swap2: claim calldata (${claimCall.method}) moves tokens or grants an allowance \u2014 refused`);
+    }
     const actual = await readAccountChain(signer);
     if (actual == null) throw new Error(`swap2: destination account chain identity is unavailable for ${unsigned.chain}`);
     const actualText = typeof actual === "string" ? actual : String(actual);
@@ -1246,7 +1268,7 @@ 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 };
+    return { hash: sent.hash, chain: unsigned.chain, id: encodeId(name, intentId, sourceTxHash, sent.hash) };
   }
   /** The inherited bridge() has no floor field: quote first, then bind execution
    * to that quote's minimum so the inherited convenience API stays safe. */
@@ -1306,7 +1328,9 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
       if ((wantFrom || wantTo) && c.caip2 !== wantFrom && c.caip2 !== wantTo) continue;
       for (const a of c.assets) {
         out.push({
-          token: a.assetId,
+          // What quoteSwap2 takes back: the contract, or the symbol of the native coin — never the
+          // provider-specific assetId, which is "" for most catalog entries (round 3, M25).
+          token: a.contract ?? a.symbol,
           chain: c.caip2,
           symbol: a.symbol,
           decimals: a.decimals,