@anywalletkit/protocol-swap2-core 0.3.2 → 0.4.1

package/dist/swap2/base.cjs

@@ -188,17 +188,22 @@ function declaredNativeFee(q, chain) {
   if (fee > cap) throw new Error(`swap2: quoted native fee ${fee} exceeds the cap ${cap} for ${chain}`);
   return fee;
 }
+var safeChainId = (v) => v >= 0n && v <= BigInt(Number.MAX_SAFE_INTEGER) ? Number(v.toString()) : void 0;
 function normalizeTypedDomain(domain) {
   if (!domain || typeof domain !== "object") return domain;
   const raw = domain.chainId;
   let chainId;
   if (typeof raw === "number") chainId = raw;
-  else if (typeof raw === "bigint") chainId = Number(raw);
+  else if (typeof raw === "bigint") chainId = safeChainId(raw);
   else if (typeof raw === "string" && /^\d+$/.test(raw)) chainId = Number(raw);
-  else if (typeof raw === "string" && /^0x[0-9a-fA-F]+$/.test(raw)) chainId = Number(BigInt(raw));
+  else if (typeof raw === "string" && /^0x[0-9a-fA-F]+$/.test(raw)) chainId = safeChainId(BigInt(raw));
   return chainId === void 0 || !Number.isSafeInteger(chainId) ? domain : { ...domain, chainId };
 }
 var DEFAULT_SERIALIZED_NATIVE_ALLOWANCE = 20000000n;
+function reviewedIdentity(plan) {
+  const { feeUsd: _fee, etaSeconds: _eta, validUntilMs: _valid, approvals: _approvals, destAmount: _dest, requoted: _requoted, ...pinned } = plan;
+  return JSON.stringify(pinned, (_k, v) => typeof v === "bigint" ? v.toString() : v);
+}
 var SWAP2_ID_PREFIX = "awk1";
 function encodeId(provider, intentId, sourceTxHash) {
   const enc = (v) => encodeURIComponent(v).replace(/\./g, "%2E");
@@ -341,7 +346,7 @@ function assertQuoteConstraints(q, options) {
   }
   if (options.slippage !== void 0) {
     const scale = 1000000000n;
-    const permitted = BigInt(floorScaled(options.slippage, Number(scale)));
+    const permitted = BigInt(floorScaled(options.slippage, 1e9));
     const required = nominal * (scale - permitted) / scale;
     if (guaranteed < required) {
       throw new Error(`swap2: quote exceeds caller slippage (${options.slippage})`);
@@ -710,7 +715,8 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
       approvalAmounts = current === approvalAmount ? [] : [...usdtMainnet && current !== 0n ? [0n] : [], approvalAmount];
     }
     const review = this._config.reviewExecution;
-    if (review && !carried) {
+    let reviewed;
+    if (review && (!carried || carried.reviewed)) {
       const chainId = unsigned.chainId !== void 0 ? { chainId: unsigned.chainId } : {};
       const approvals = approvalAmounts.map((amount) => ({ token: source.contract, spender: unsigned.approvalAddress, amount, ...chainId }));
       const plan = {
@@ -738,12 +744,28 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
           ...cellBody !== void 0 ? { cellBody: true } : {}
         }
       };
-      await review(deepFreeze(structuredCloneSafe(plan)));
-      if (q.validUntilMs > 0 && q.validUntilMs <= Date.now()) {
-        throw new Swap2QuoteError("swap2: quote expired during review \u2014 nothing was signed");
+      const previous = carried?.reviewed;
+      if (!previous || reviewedIdentity(previous) !== reviewedIdentity(plan) || plan.destAmount < previous.destAmount) {
+        try {
+          reviewed = deepFreeze(structuredCloneSafe(previous ? { ...plan, requoted: true } : plan));
+          await review(reviewed);
+          if (q.validUntilMs > 0 && q.validUntilMs <= Date.now()) {
+            throw new Swap2QuoteError(`swap2: quote expired during review \u2014 ${previous ? "the allowance was revoked" : "nothing was signed"}`);
+          }
+        } catch (error) {
+          if (previous) await revokeApproval?.().catch(() => {
+          });
+          throw error;
+        }
       }
     }
-    await this.assertNativeGas(signer, unsigned, approvalAmounts, source.contract ?? void 0, !!unsigned.typedData || serialized || !!tokenId);
+    try {
+      await this.assertNativeGas(signer, unsigned, approvalAmounts, source.contract ?? void 0, !!unsigned.typedData || serialized || !!tokenId);
+    } catch (error) {
+      if (carried) await revokeApproval?.().catch(() => {
+      });
+      throw error;
+    }
     if (approvalAmounts.length) {
       const approve = async (amount) => {
         const sent2 = await signer.sendTransaction({
@@ -772,7 +794,7 @@ var BaseSwap2Protocol = class extends import_core.Swap2Protocol {
     if (q.validUntilMs > 0 && q.validUntilMs <= Date.now()) {
       if (!carried && approvalAmounts.length && revokeApproval) {
         this.emitPhase("requoting");
-        const handoff = { token: source.contract, spender: unsigned.approvalAddress, amount: approvalAmount, revoke: revokeApproval, adopted: false };
+        const handoff = { token: source.contract, spender: unsigned.approvalAddress, amount: approvalAmount, revoke: revokeApproval, adopted: false, ...reviewed ? { reviewed } : {} };
         try {
           return await this.executeSwap2(signer, snapshot, config, handoff);
         } catch (error) {