@anywalletkit/protocol-swap2-curve 0.1.0 → 0.1.1

package/dist/protocol.js

@@ -1,7 +1,7 @@
 import {
   CurveSwap2Protocol
-} from "./chunk-IIPLIHNY.js";
-import "./chunk-FICPW2P2.js";
+} from "./chunk-JCWXGKPJ.js";
+import "./chunk-IFREGXMV.js";
 import "./chunk-RVBZFCRR.js";
 export {
   CurveSwap2Protocol

package/dist/provider.cjs

@@ -599,25 +599,56 @@ function checkRoute(chainId, deployment, table, args, tokenIn, tokenOut) {
 // src/rpc.ts
 var import_util2 = require("@anywalletkit/protocol-swap2-core/util");
 var RPC_BATCH_MAX = 10;
+var RPC_RATE_LIMIT_PAUSE_MS = 1e3;
+function isExecutionError(error) {
+  if (!error || typeof error !== "object") return false;
+  const { code, message } = error;
+  return code === 3 || typeof message === "string" && /revert|invalid opcode|out of gas/i.test(message);
+}
+function isRateLimit(error) {
+  if (!error || typeof error !== "object") return false;
+  const { code, message } = error;
+  return code === -32005 || code === -32007 || code === 429 || typeof message === "string" && /rate|limit|too many/i.test(message);
+}
+var errorText = (error) => {
+  const m = error && typeof error === "object" ? error.message : void 0;
+  return (0, import_util2.redactUrls)(typeof m === "string" ? m : JSON.stringify(error) ?? String(error)).slice(0, 160);
+};
 function rpcClient(rpcUrls) {
+  async function once(url, calls, signal) {
+    const res = await fetch(url, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify(calls.map((c, id) => ({ jsonrpc: "2.0", id, ...c }))),
+      signal: signal ?? (0, import_util2.timeoutSignal)(12e3)
+    });
+    if (!res.ok) throw Object.assign(new Error(`HTTP ${res.status}`), { limited: res.status === 429 });
+    const body = await res.json();
+    if (!Array.isArray(body)) throw Object.assign(new Error(body.error?.message ?? "batch refused"), { limited: isRateLimit(body.error) });
+    const out = calls.map(() => null);
+    const answered = /* @__PURE__ */ new Set();
+    for (const r of body) {
+      if (typeof r.id !== "number" || r.id < 0 || r.id >= out.length) continue;
+      if (r.error !== void 0 && r.error !== null && !isExecutionError(r.error)) throw Object.assign(new Error(errorText(r.error)), { limited: isRateLimit(r.error) });
+      answered.add(r.id);
+      if (r.error === void 0 || r.error === null) out[r.id] = r.result ?? null;
+    }
+    if (answered.size !== calls.length) throw new Error(`answered ${answered.size} of ${calls.length} calls`);
+    return out;
+  }
   async function batch(chainId, calls, signal) {
     let lastErr;
-    for (const url of rpcUrls[chainId] ?? []) {
-      try {
-        const res = await fetch(url, {
-          method: "POST",
-          headers: { "content-type": "application/json" },
-          body: JSON.stringify(calls.map((c, id) => ({ jsonrpc: "2.0", id, ...c }))),
-          signal: signal ?? (0, import_util2.timeoutSignal)(12e3)
-        });
-        if (!res.ok) throw new Error(`HTTP ${res.status}`);
-        const body = await res.json();
-        if (!Array.isArray(body)) throw new Error(body.error?.message ?? "batch refused");
-        const out = calls.map(() => null);
-        for (const r of body) if (typeof r.id === "number" && r.id >= 0 && r.id < out.length && r.error === void 0) out[r.id] = r.result ?? null;
-        return out;
-      } catch (e) {
-        lastErr = e;
+    for (let pass = 0; pass < 2; pass++) {
+      if (pass > 0) {
+        if (!lastErr?.limited || signal?.aborted) break;
+        await new Promise((r) => setTimeout(r, RPC_RATE_LIMIT_PAUSE_MS));
+      }
+      for (const url of rpcUrls[chainId] ?? []) {
+        try {
+          return await once(url, calls, signal);
+        } catch (e) {
+          lastErr = e;
+        }
       }
     }
     throw new Error(`curve: no RPC answered on chain ${chainId} (${lastErr instanceof Error ? lastErr.message : String(lastErr)})`);
@@ -630,11 +661,16 @@ function rpcClient(rpcUrls) {
   };
 }
 var ethCall = (to, data) => ({ method: "eth_call", params: [{ to, data }, "latest"] });
+function firstWord(raw) {
+  return typeof raw === "string" && raw.length >= 66 && /^0x(?:[0-9a-fA-F]{64})+$/.test(raw) ? raw.slice(2, 66).toLowerCase() : null;
+}
 function wordAddress(raw) {
-  return typeof raw === "string" && /^0x[0-9a-fA-F]{64}$/.test(raw) ? `0x${raw.slice(-40)}`.toLowerCase() : null;
+  const w = firstWord(raw);
+  return w !== null && /^0{24}/.test(w) ? `0x${w.slice(24)}` : null;
 }
 function wordUint(raw) {
-  return typeof raw === "string" && /^0x[0-9a-fA-F]{64}$/.test(raw) ? BigInt(raw) : null;
+  const w = firstWord(raw);
+  return w === null ? null : BigInt(`0x${w}`);
 }
 
 // src/slippage.ts
@@ -792,20 +828,32 @@ function curveOnChain(opts) {
     await verifyDeployment(chainId);
     const index = poolIndex(chainId, d2, own(pools, chainId));
     const hops = routePools(call).map((a) => index.get(lc2(a)));
-    const calls = [ethCall(d2.router, encodeGetDy(d2.family, call, call.amount))];
-    for (const pool of hops) {
-      calls.push({ method: "eth_getCode", params: [pool.address, "latest"] });
-      pool.coins.forEach((_, k) => calls.push(ethCall(pool.address, `${COINS_UINT}${k.toString(16).padStart(64, "0")}`)));
-    }
+    const reads = poolCalls(hops);
+    const calls = [ethCall(d2.router, encodeGetDy(d2.family, call, call.amount)), ...reads];
     const probeIn = call.amount / 1000n;
     const probeAt = calls.length;
     if (probe && probeIn > 0n) calls.push(ethCall(d2.router, encodeGetDy(d2.family, call, probeIn)));
     const res = await rpc(chainId, calls);
-    let at = 1;
+    const poolReason = await poolsReason(chainId, hops, res.slice(1, 1 + reads.length));
+    if (poolReason) return poolReason;
+    const out = wordUint(res[0]);
+    if (out === null) return "the router no longer quotes this route";
+    if (out < call.minDy) return `price moved \u2014 the pools now pay ${out}, under your minimum ${call.minDy}`;
+    return { out, probeOut: probe && probeIn > 0n ? wordUint(res[probeAt]) : null, amount: call.amount, minDy: call.minDy };
+  }
+  function poolCalls(list) {
+    return list.flatMap((pool) => [
+      { method: "eth_getCode", params: [pool.address, "latest"] },
+      ...pool.coins.map((_, k) => ethCall(pool.address, `${COINS_UINT}${k.toString(16).padStart(64, "0")}`))
+    ]);
+  }
+  async function poolsReason(chainId, list, res) {
+    let at = 0;
     const retry = [];
-    for (const pool of hops) {
+    for (const pool of list) {
       const code = res[at++];
-      if (typeof code !== "string" || code.length <= 2 || lc2((0, import_viem3.keccak256)(code)) !== lc2(pool.codeHash)) return `pool ${pool.name} (${pool.address}) is not the pinned code`;
+      if (typeof code !== "string") return `could not read pool ${pool.name} (${pool.address}) over RPC`;
+      if (code.length <= 2 || lc2((0, import_viem3.keccak256)(code)) !== lc2(pool.codeHash)) return `pool ${pool.name} (${pool.address}) is not the pinned code`;
       for (let k = 0; k < pool.coins.length; k++) {
         const coin = wordAddress(res[at++]);
         if (coin === null) retry.push({ pool, k });
@@ -819,12 +867,12 @@ function curveOnChain(opts) {
         if (coin !== lc2(pool.coins[k])) return `pool ${pool.name} does not report its pinned coin ${k}`;
       }
     }
-    const out = wordUint(res[0]);
-    if (out === null) return "the router no longer quotes this route";
-    if (out < call.minDy) return `price moved \u2014 the pools now pay ${out}, under your minimum ${call.minDy}`;
-    return { out, probeOut: probe && probeIn > 0n ? wordUint(res[probeAt]) : null, amount: call.amount, minDy: call.minDy };
+    return null;
+  }
+  async function checkPools(chainId, list) {
+    return list.length ? poolsReason(chainId, list, await rpc(chainId, poolCalls(list))) : null;
   }
-  return { rpc, verifyDeployment, checkSealed, inspectSealed };
+  return { rpc, verifyDeployment, checkSealed, inspectSealed, checkPools };
 }
 function lastToken(call) {
   let k = 0;