@blockrun/llm 3.24.9 → 3.24.10

package/README.md

@@ -635,7 +635,10 @@ console.log(res.costUsd, res.settlement);        // what you paid, and the tx
 ```
 
 `costUsd`, `settlement` and the per-call `timeout` work the same on `LLMClient`
-(Base / Arc). `costUsd` is what the call added to `getSpending()`: the signed
+(Base / Arc). Both clients default to a 600 s request timeout
+(`BLOCKRUN_CHAT_TIMEOUT`, in seconds, overrides it; the `timeout` option, in
+ms, overrides both): a call aborted after its payment was sent may already be
+charged, so a batch payment ends unresolved rather than paid again. `costUsd` is what the call added to `getSpending()`: the signed
 price under `exact`, the metered `extra.chargedAmount` under batch settlement,
 `0` for a free model; it is undefined in API-key mode (billed to the account).
 When the gateway answers a paid request from a free fallback model it skips
@@ -1695,7 +1698,7 @@ const configured = new LLMClient({
 | `SOLANA_RPC_URL` | Solana RPC for payments and balance (also `rpcUrl`) |
 | `SOLANA_RPC_API_KEY` / `SOLANA_RPC_HEADERS` | Header auth for that RPC (also `rpcHeaders`) |
 | `BASE_RPC_URL` | Base RPC tried first by `LLMClient.getBalance()` |
-| `BLOCKRUN_CHAT_TIMEOUT` | `LLMClient` default timeout, in **seconds** (default 600) |
+| `BLOCKRUN_CHAT_TIMEOUT` | `LLMClient` and `SolanaLLMClient` default timeout, in **seconds** (default 600) |
 | `BLOCKRUN_HOME` | Base directory for the Base wallet files (security-sensitive, see [Wallets](#one-wallet-across-every-blockrun-product)) |
 
 `BLOCKRUN_SOL_OPERATOR` is **not** an environment variable or a secret. It is

package/dist/index.cjs

@@ -5120,7 +5120,7 @@ function getCostSummary() {
 }
 
 // src/version.ts
-var SDK_VERSION = "3.24.9";
+var SDK_VERSION = "3.24.10";
 var USER_AGENT = `blockrun-ts/${SDK_VERSION}`;
 
 // src/client.ts
@@ -10902,6 +10902,38 @@ function withoutClientSignedBatch(paymentRequired) {
   const accepts = paymentRequired.accepts ?? [];
   return accepts.some(clientSignedBatch) ? { ...paymentRequired, accepts: accepts.filter((accept) => !clientSignedBatch(accept)) } : paymentRequired;
 }
+var DEPOSIT_BLOCKHASH_TTL_MS = 1e4;
+var MAX_DEPOSIT_BLOCKHASH_ENDPOINTS = 8;
+var depositBlockhashes = /* @__PURE__ */ new Map();
+async function finalizedBlockhash(rpcUrl, rpcHeaders) {
+  const cached = depositBlockhashes.get(rpcUrl);
+  if (cached && Date.now() - cached.fetchedAt < DEPOSIT_BLOCKHASH_TTL_MS) return cached;
+  const result = await rpcRequest(rpcUrl, "getLatestBlockhash", [{ commitment: "finalized" }], rpcHeaders);
+  const blockhash = result.value?.blockhash;
+  if (typeof blockhash !== "string" || !blockhash) throw new Error("getLatestBlockhash returned no blockhash");
+  const entry = {
+    blockhash,
+    lastValidBlockHeight: rpcInteger(result.value?.lastValidBlockHeight, "getLatestBlockhash lastValidBlockHeight"),
+    fetchedAt: Date.now()
+  };
+  depositBlockhashes.delete(rpcUrl);
+  depositBlockhashes.set(rpcUrl, entry);
+  while (depositBlockhashes.size > MAX_DEPOSIT_BLOCKHASH_ENDPOINTS) {
+    depositBlockhashes.delete(depositBlockhashes.keys().next().value);
+  }
+  return entry;
+}
+function withDepositBlockhash(paymentRequired, blockhash) {
+  const accepts = paymentRequired.accepts ?? [];
+  const lacking = (accept) => accept.scheme === BATCH_SCHEME && !accept.extra?.recentBlockhash;
+  if (!accepts.some(lacking)) return paymentRequired;
+  return {
+    ...paymentRequired,
+    accepts: accepts.map(
+      (accept) => lacking(accept) ? { ...accept, extra: { ...accept.extra, recentBlockhash: blockhash.blockhash, lastValidBlockHeight: blockhash.lastValidBlockHeight } } : accept
+    )
+  };
+}
 var PAYMENT_IDENTIFIER = "payment-identifier";
 function withPaymentIdentifier(paymentRequired) {
   const declared = paymentRequired.extensions?.[PAYMENT_IDENTIFIER];
@@ -12391,7 +12423,8 @@ var SolanaBatchPayer = class {
       const http = (await this.build(wallet)).http;
       try {
         await this.prepareTopUp(wallet, paymentRequired);
-        return { http, payload: await http.createPaymentPayload(withPaymentIdentifier(withoutClientSignedBatch(paymentRequired))) };
+        const required = await this.withDepositBlockhash(wallet, withoutClientSignedBatch(paymentRequired));
+        return { http, payload: await http.createPaymentPayload(withPaymentIdentifier(required)) };
       } catch (err) {
         if (pass > 0 || !isResyncRequired(err) || wallet.resyncs.size === 0) throw err;
       } finally {
@@ -12399,6 +12432,34 @@ var SolanaBatchPayer = class {
       }
     }
   }
+  /**
+   * The 402 to build this payment from: with a finalized blockhash
+   * ({@link withDepositBlockhash}) when the payment will likely carry a
+   * deposit (no usable record for the trusted accept's channel, so an open,
+   * or a top-up {@link prepareTopUp} just sized). An authorization signs no
+   * transaction and costs no RPC read. Best effort: a failed read leaves the
+   * 402 as it is, and `@x402/svm` fetches its own blockhash.
+   */
+  async withDepositBlockhash(wallet, paymentRequired) {
+    const accept = trustedBatchAccept(paymentRequired, this.init.options.operators);
+    const key = accept ? channelKeyOf(accept) : void 0;
+    if (!accept || accept.extra?.recentBlockhash) return paymentRequired;
+    let deposit = wallet.topUp !== void 0;
+    if (!deposit) {
+      try {
+        const record = key ? await wallet.book.base.get(key) : void 0;
+        deposit = !record || typeof record.channelId !== "string" || record.pending !== void 0;
+      } catch {
+        deposit = true;
+      }
+    }
+    if (!deposit) return paymentRequired;
+    try {
+      return withDepositBlockhash(paymentRequired, await finalizedBlockhash(this.init.rpcUrl, this.init.rpcHeaders));
+    } catch {
+      return paymentRequired;
+    }
+  }
   /**
    * Queue a re-read of a stored channel whose account is gone at finalized
    * and at confirmed commitment (closed, its account reclaimed), anchored at
@@ -12705,7 +12766,6 @@ var SolanaBatchPayer = class {
 // src/solana-client.ts
 var SOLANA_API_URL = "https://sol.blockrun.ai/api";
 var DEFAULT_MAX_TOKENS2 = 1024;
-var DEFAULT_TIMEOUT14 = 6e4;
 var STALE_BLOCKHASH_RETRY_BACKOFFS_MS = [500, 2e3];
 var MAX_PAYMENT_FAILURE_BYTES = 64 * 1024;
 var DEFAULT_VIDEO_MODEL = "xai/grok-imagine-video";
@@ -12873,7 +12933,7 @@ var SolanaLLMClient = class {
     const rpc = resolveRpcConfig(options.rpcUrl, options.rpcHeaders);
     this.rpcUrl = rpc.url;
     this.rpcHeaders = rpc.headers;
-    this.timeout = options.timeout || DEFAULT_TIMEOUT14;
+    this.timeout = options.timeout || DEFAULT_TIMEOUT;
     if (options.batch && !this.apiAuth) {
       this.batchPayer = new SolanaBatchPayer({
         options: options.batch,

package/dist/index.d.cts

@@ -3508,6 +3508,15 @@ declare class SolanaBatchPayer {
      * once.
      */
     private createPayload;
+    /**
+     * The 402 to build this payment from: with a finalized blockhash
+     * ({@link withDepositBlockhash}) when the payment will likely carry a
+     * deposit (no usable record for the trusted accept's channel, so an open,
+     * or a top-up {@link prepareTopUp} just sized). An authorization signs no
+     * transaction and costs no RPC read. Best effort: a failed read leaves the
+     * 402 as it is, and `@x402/svm` fetches its own blockhash.
+     */
+    private withDepositBlockhash;
     /**
      * Queue a re-read of a stored channel whose account is gone at finalized
      * and at confirmed commitment (closed, its account reclaimed), anchored at
@@ -3647,7 +3656,12 @@ interface SolanaLLMClientOptions extends ApiKeyOptions {
      * (shortcut for `{ "x-api-key": "..." }`) env vars when omitted.
      */
     rpcHeaders?: Record<string, string>;
-    /** Request timeout in milliseconds (default: 60000) */
+    /**
+     * Request timeout in milliseconds. Default: `BLOCKRUN_CHAT_TIMEOUT` (in
+     * seconds) when set, else 600000, the same as `LLMClient`: a reasoning
+     * model's long turn can take minutes, and a batch payment whose call is
+     * aborted after it was sent ends unresolved.
+     */
     timeout?: number;
     /**
      * Opt in to x402 batch-settlement (metered billing) for chat completions.

package/dist/index.d.ts

@@ -3508,6 +3508,15 @@ declare class SolanaBatchPayer {
      * once.
      */
     private createPayload;
+    /**
+     * The 402 to build this payment from: with a finalized blockhash
+     * ({@link withDepositBlockhash}) when the payment will likely carry a
+     * deposit (no usable record for the trusted accept's channel, so an open,
+     * or a top-up {@link prepareTopUp} just sized). An authorization signs no
+     * transaction and costs no RPC read. Best effort: a failed read leaves the
+     * 402 as it is, and `@x402/svm` fetches its own blockhash.
+     */
+    private withDepositBlockhash;
     /**
      * Queue a re-read of a stored channel whose account is gone at finalized
      * and at confirmed commitment (closed, its account reclaimed), anchored at
@@ -3647,7 +3656,12 @@ interface SolanaLLMClientOptions extends ApiKeyOptions {
      * (shortcut for `{ "x-api-key": "..." }`) env vars when omitted.
      */
     rpcHeaders?: Record<string, string>;
-    /** Request timeout in milliseconds (default: 60000) */
+    /**
+     * Request timeout in milliseconds. Default: `BLOCKRUN_CHAT_TIMEOUT` (in
+     * seconds) when set, else 600000, the same as `LLMClient`: a reasoning
+     * model's long turn can take minutes, and a batch payment whose call is
+     * aborted after it was sent ends unresolved.
+     */
     timeout?: number;
     /**
      * Opt in to x402 batch-settlement (metered billing) for chat completions.

package/dist/index.js

@@ -4989,7 +4989,7 @@ function getCostSummary() {
 }
 
 // src/version.ts
-var SDK_VERSION = "3.24.9";
+var SDK_VERSION = "3.24.10";
 var USER_AGENT = `blockrun-ts/${SDK_VERSION}`;
 
 // src/client.ts
@@ -10771,6 +10771,38 @@ function withoutClientSignedBatch(paymentRequired) {
   const accepts = paymentRequired.accepts ?? [];
   return accepts.some(clientSignedBatch) ? { ...paymentRequired, accepts: accepts.filter((accept) => !clientSignedBatch(accept)) } : paymentRequired;
 }
+var DEPOSIT_BLOCKHASH_TTL_MS = 1e4;
+var MAX_DEPOSIT_BLOCKHASH_ENDPOINTS = 8;
+var depositBlockhashes = /* @__PURE__ */ new Map();
+async function finalizedBlockhash(rpcUrl, rpcHeaders) {
+  const cached = depositBlockhashes.get(rpcUrl);
+  if (cached && Date.now() - cached.fetchedAt < DEPOSIT_BLOCKHASH_TTL_MS) return cached;
+  const result = await rpcRequest(rpcUrl, "getLatestBlockhash", [{ commitment: "finalized" }], rpcHeaders);
+  const blockhash = result.value?.blockhash;
+  if (typeof blockhash !== "string" || !blockhash) throw new Error("getLatestBlockhash returned no blockhash");
+  const entry = {
+    blockhash,
+    lastValidBlockHeight: rpcInteger(result.value?.lastValidBlockHeight, "getLatestBlockhash lastValidBlockHeight"),
+    fetchedAt: Date.now()
+  };
+  depositBlockhashes.delete(rpcUrl);
+  depositBlockhashes.set(rpcUrl, entry);
+  while (depositBlockhashes.size > MAX_DEPOSIT_BLOCKHASH_ENDPOINTS) {
+    depositBlockhashes.delete(depositBlockhashes.keys().next().value);
+  }
+  return entry;
+}
+function withDepositBlockhash(paymentRequired, blockhash) {
+  const accepts = paymentRequired.accepts ?? [];
+  const lacking = (accept) => accept.scheme === BATCH_SCHEME && !accept.extra?.recentBlockhash;
+  if (!accepts.some(lacking)) return paymentRequired;
+  return {
+    ...paymentRequired,
+    accepts: accepts.map(
+      (accept) => lacking(accept) ? { ...accept, extra: { ...accept.extra, recentBlockhash: blockhash.blockhash, lastValidBlockHeight: blockhash.lastValidBlockHeight } } : accept
+    )
+  };
+}
 var PAYMENT_IDENTIFIER = "payment-identifier";
 function withPaymentIdentifier(paymentRequired) {
   const declared = paymentRequired.extensions?.[PAYMENT_IDENTIFIER];
@@ -12260,7 +12292,8 @@ var SolanaBatchPayer = class {
       const http = (await this.build(wallet)).http;
       try {
         await this.prepareTopUp(wallet, paymentRequired);
-        return { http, payload: await http.createPaymentPayload(withPaymentIdentifier(withoutClientSignedBatch(paymentRequired))) };
+        const required = await this.withDepositBlockhash(wallet, withoutClientSignedBatch(paymentRequired));
+        return { http, payload: await http.createPaymentPayload(withPaymentIdentifier(required)) };
       } catch (err) {
         if (pass > 0 || !isResyncRequired(err) || wallet.resyncs.size === 0) throw err;
       } finally {
@@ -12268,6 +12301,34 @@ var SolanaBatchPayer = class {
       }
     }
   }
+  /**
+   * The 402 to build this payment from: with a finalized blockhash
+   * ({@link withDepositBlockhash}) when the payment will likely carry a
+   * deposit (no usable record for the trusted accept's channel, so an open,
+   * or a top-up {@link prepareTopUp} just sized). An authorization signs no
+   * transaction and costs no RPC read. Best effort: a failed read leaves the
+   * 402 as it is, and `@x402/svm` fetches its own blockhash.
+   */
+  async withDepositBlockhash(wallet, paymentRequired) {
+    const accept = trustedBatchAccept(paymentRequired, this.init.options.operators);
+    const key = accept ? channelKeyOf(accept) : void 0;
+    if (!accept || accept.extra?.recentBlockhash) return paymentRequired;
+    let deposit = wallet.topUp !== void 0;
+    if (!deposit) {
+      try {
+        const record = key ? await wallet.book.base.get(key) : void 0;
+        deposit = !record || typeof record.channelId !== "string" || record.pending !== void 0;
+      } catch {
+        deposit = true;
+      }
+    }
+    if (!deposit) return paymentRequired;
+    try {
+      return withDepositBlockhash(paymentRequired, await finalizedBlockhash(this.init.rpcUrl, this.init.rpcHeaders));
+    } catch {
+      return paymentRequired;
+    }
+  }
   /**
    * Queue a re-read of a stored channel whose account is gone at finalized
    * and at confirmed commitment (closed, its account reclaimed), anchored at
@@ -12574,7 +12635,6 @@ var SolanaBatchPayer = class {
 // src/solana-client.ts
 var SOLANA_API_URL = "https://sol.blockrun.ai/api";
 var DEFAULT_MAX_TOKENS2 = 1024;
-var DEFAULT_TIMEOUT14 = 6e4;
 var STALE_BLOCKHASH_RETRY_BACKOFFS_MS = [500, 2e3];
 var MAX_PAYMENT_FAILURE_BYTES = 64 * 1024;
 var DEFAULT_VIDEO_MODEL = "xai/grok-imagine-video";
@@ -12742,7 +12802,7 @@ var SolanaLLMClient = class {
     const rpc = resolveRpcConfig(options.rpcUrl, options.rpcHeaders);
     this.rpcUrl = rpc.url;
     this.rpcHeaders = rpc.headers;
-    this.timeout = options.timeout || DEFAULT_TIMEOUT14;
+    this.timeout = options.timeout || DEFAULT_TIMEOUT;
     if (options.batch && !this.apiAuth) {
       this.batchPayer = new SolanaBatchPayer({
         options: options.batch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/llm",
-  "version": "3.24.9",
+  "version": "3.24.10",
   "type": "module",
   "description": "TypeScript SDK for BlockRun - every frontier model behind one OpenAI-compatible client. Pay with a BlockRun API key or per-call in USDC. Smart routing picks the cheapest capable model. No rate limits.",
   "main": "dist/index.cjs",