@blazephoenix/sdk 1.2.0 → 1.2.1

package/dist/index.d.cts

@@ -183,8 +183,10 @@ interface ExactQuote {
     tokenIn: Address;
     tokenOut: Address;
     amountIn: bigint;
-    /** Execution-grade NET output (every concentrated leg dry-run on the pool). */
+    /** Execution-grade NET output (every concentrated leg dry-run on its venue), net of the protocol fee. */
     exactOut: bigint;
+    /** The scalar exactly as the Quoter returned it (gross of the fee on 1.x Quoters). */
+    quoterOut: bigint;
     route: Route;
     quotedAt: number;
 }

package/dist/index.d.ts

@@ -183,8 +183,10 @@ interface ExactQuote {
     tokenIn: Address;
     tokenOut: Address;
     amountIn: bigint;
-    /** Execution-grade NET output (every concentrated leg dry-run on the pool). */
+    /** Execution-grade NET output (every concentrated leg dry-run on its venue), net of the protocol fee. */
     exactOut: bigint;
+    /** The scalar exactly as the Quoter returned it (gross of the fee on 1.x Quoters). */
+    quoterOut: bigint;
     route: Route;
     quotedAt: number;
 }

package/dist/index.js

@@ -4766,7 +4766,8 @@ var CHAINS = {
     explorer: "https://robinhoodchain.blockscout.com",
     weth: "0x0Bd7D308f8E1639FAb988df18A8011f41EAcAD73",
     usdc: "0x5fc5360D0400a0Fd4f2af552ADD042D716F1d168",
-    blockTime: 2
+    blockTime: 0.104
+    // measured ~0.104 s/block
   }
 };
 var ALIASES = {
@@ -4831,7 +4832,7 @@ function urlTransport(url, o) {
     throw new BlazeError("bad_request", `refusing RPC URL "${redact(url)}": use https:// or wss:// (http/ws only for localhost)`);
   }
   const u = url.trim();
-  return u.startsWith("ws") ? webSocket(u, { timeout: o.timeoutMs, retryCount: o.retries }) : http(u, { timeout: o.timeoutMs, retryCount: o.retries, batch: o.batch });
+  return u.startsWith("ws") ? webSocket(u, { timeout: o.timeoutMs, retryCount: o.retries }) : http(u, { timeout: o.timeoutMs, retryCount: o.retries, batch: o.batch, fetchOptions: { redirect: "error" } });
 }
 function redact(url) {
   try {
@@ -4979,6 +4980,9 @@ function scrubCause(c, depth = 0) {
   out.name = c.name;
   return out;
 }
+function untrustedText(t, max = 120) {
+  return (t ?? "").replace(/[^\x20-\x7e]+/g, " ").replace(/\s+/g, " ").trim().slice(0, max);
+}
 var BlazeError = class extends Error {
   code;
   details;
@@ -5810,6 +5814,20 @@ var BlazePhoenix = class {
       if (typeof req.amountIn === "bigint") v = req.amountIn;
       else if (INT.test(String(req.amountIn).trim())) v = BigInt(String(req.amountIn).trim());
       else throw new BlazeError("bad_request", 'amountIn must be an integer in base units \u2014 use `amount` for human units ("1.5")');
+      if (req.amount !== void 0 && req.amount !== null && req.amount !== "") {
+        const d = await this.decimalsOf(client, chainId, tIn).catch((e) => {
+          throw new BlazeError("bad_request", "amount and amountIn are both set and the decimals could not be read to compare them \u2014 pass only one", { cause: e });
+        });
+        let human;
+        try {
+          human = toBaseUnits(req.amount, d);
+        } catch (e) {
+          throw new BlazeError("bad_request", e.message);
+        }
+        if (human !== v) {
+          throw new BlazeError("bad_request", `amount and amountIn disagree (${human} vs ${v} base units): pass only one`);
+        }
+      }
     } else if (req.amount !== void 0) {
       const d = await this.decimalsOf(client, chainId, tIn).catch((e) => {
         throw new BlazeError("bad_request", `could not read decimals of ${tIn.address} on your RPC \u2014 pass amountIn in base units`, { cause: e });
@@ -5917,13 +5935,15 @@ var BlazePhoenix = class {
         args: [tIn.address, tOut.address, amountIn],
         ...req.blockNumber !== void 0 ? { blockNumber: req.blockNumber } : {}
       });
+      const net = featuresOf(ctx.dep.version).previewAndEncode ? exactOut : exactOut - (exactOut * BigInt(FEE_BPS) + 9999n) / 10000n;
       return {
         chainId: ctx.chainId,
         version: ctx.dep.version,
         tokenIn: tIn.address,
         tokenOut: tOut.address,
         amountIn,
-        exactOut,
+        exactOut: net,
+        quoterOut: exactOut,
         route,
         quotedAt: Date.now()
       };
@@ -6188,7 +6208,7 @@ var BlazePhoenix = class {
     } catch (e) {
       if (isTransportError(e)) throw new BlazeError("rpc_error", `simulation: your RPC failed (${e?.message?.split("\n")[0]})`, { cause: e });
       const d = decodeBlazeError(e);
-      return { ok: false, error: d ?? { contract: "unknown", name: "revert", reason: e?.message?.split("\n")[0] ?? "execution reverted" } };
+      return { ok: false, error: d ?? { contract: "unknown", name: "revert", reason: untrustedText(e?.message?.split("\n")[0]) || "execution reverted" } };
     }
   }
   /**