@blockrun/llm 3.8.4 → 3.9.0

package/dist/index.cjs

@@ -564,7 +564,7 @@ function getCostSummary() {
 }
 
 // src/version.ts
-var SDK_VERSION = "3.8.4";
+var SDK_VERSION = "3.9.0";
 var USER_AGENT = `blockrun-ts/${SDK_VERSION}`;
 
 // src/client.ts
@@ -4903,16 +4903,51 @@ async function createSolanaWallet() {
   };
 }
 async function solanaKeyToBytes(privateKey) {
+  const key = privateKey.trim();
+  if (key.startsWith("[")) {
+    let parsed;
+    try {
+      parsed = JSON.parse(key);
+    } catch {
+      throw new Error(
+        "Invalid Solana private key: looks like a JSON byte array but is not valid JSON"
+      );
+    }
+    if (!Array.isArray(parsed) || !parsed.every((n) => Number.isInteger(n) && n >= 0 && n <= 255)) {
+      throw new Error(
+        "Invalid Solana private key: JSON array must contain only byte values (0-255)"
+      );
+    }
+    if (parsed.length !== 64) {
+      throw new Error(
+        `Invalid Solana key length: expected 64 bytes, got ${parsed.length}`
+      );
+    }
+    return Uint8Array.from(parsed);
+  }
+  const hex = key.startsWith("0x") || key.startsWith("0X") ? key.slice(2) : key;
+  if (/^[0-9a-fA-F]+$/.test(hex) && (hex.length === 64 || hex.length === 128)) {
+    if (hex.length === 64) {
+      throw new Error(
+        "Invalid Solana private key: this is a 32-byte hex key \u2014 the EVM (Base) wallet format, not a Solana key. Solana keys are 64 bytes, usually base58-encoded (86-88 characters)."
+      );
+    }
+    const bytes = new Uint8Array(64);
+    for (let i = 0; i < 64; i++) bytes[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+    return bytes;
+  }
   try {
     const bs58 = await import("bs58");
-    const bytes = (bs58.default ?? bs58).decode(privateKey);
+    const bytes = (bs58.default ?? bs58).decode(key);
     if (bytes.length !== 64) {
       throw new Error(`Invalid Solana key length: expected 64 bytes, got ${bytes.length}`);
     }
     return bytes;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    throw new Error(`Invalid Solana private key: ${msg}`);
+    throw new Error(
+      `Invalid Solana private key: ${msg}. Expected a base58-encoded 64-byte key (standard Solana format), a 64-byte hex string, or a Solana CLI JSON byte array.`
+    );
   }
 }
 async function solanaPublicKey(privateKey) {
@@ -5052,16 +5087,27 @@ Your current wallet is backed up first. You can also set
 SOLANA_WALLET_KEY=<private-key> for a single run without changing anything.
 `;
 }
+async function solanaPublicKeyFrom(privateKey, source) {
+  try {
+    return await solanaPublicKey(privateKey);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(`${msg} (key loaded from ${source})`);
+  }
+}
 async function getOrCreateSolanaWallet() {
   const envKey = typeof process !== "undefined" && process.env ? process.env.SOLANA_WALLET_KEY : void 0;
   if (envKey) {
-    const address2 = await solanaPublicKey(envKey);
+    const address2 = await solanaPublicKeyFrom(
+      envKey,
+      "the SOLANA_WALLET_KEY environment variable"
+    );
     return { privateKey: envKey, address: address2, isNew: false };
   }
   if (fs3.existsSync(SOLANA_WALLET_FILE)) {
     const fileKey = fs3.readFileSync(SOLANA_WALLET_FILE, "utf-8").trim();
     if (fileKey) {
-      const address2 = await solanaPublicKey(fileKey);
+      const address2 = await solanaPublicKeyFrom(fileKey, SOLANA_WALLET_FILE);
       return { privateKey: fileKey, address: address2, isNew: false };
     }
   }

package/dist/index.d.cts

@@ -2860,8 +2860,11 @@ declare function createSolanaWallet(): Promise<{
     privateKey: string;
 }>;
 /**
- * Convert a bs58 private key string to Uint8Array (64 bytes).
- * Accepts: bs58-encoded 64-byte key (standard Solana format).
+ * Convert a Solana private key string to Uint8Array (64 bytes).
+ * Accepts: bs58-encoded 64-byte key (standard Solana format), the Solana CLI
+ * JSON byte-array format (~/.config/solana/id.json), or a 64-byte hex string
+ * (with or without 0x). A 32-byte hex key is rejected with an explicit hint
+ * that it is the EVM (Base) wallet format, not a Solana key.
  */
 declare function solanaKeyToBytes(privateKey: string): Promise<Uint8Array>;
 /**

package/dist/index.d.ts

@@ -2860,8 +2860,11 @@ declare function createSolanaWallet(): Promise<{
     privateKey: string;
 }>;
 /**
- * Convert a bs58 private key string to Uint8Array (64 bytes).
- * Accepts: bs58-encoded 64-byte key (standard Solana format).
+ * Convert a Solana private key string to Uint8Array (64 bytes).
+ * Accepts: bs58-encoded 64-byte key (standard Solana format), the Solana CLI
+ * JSON byte-array format (~/.config/solana/id.json), or a 64-byte hex string
+ * (with or without 0x). A 32-byte hex key is rejected with an explicit hint
+ * that it is the EVM (Base) wallet format, not a Solana key.
  */
 declare function solanaKeyToBytes(privateKey: string): Promise<Uint8Array>;
 /**

package/dist/index.js

@@ -451,7 +451,7 @@ function getCostSummary() {
 }
 
 // src/version.ts
-var SDK_VERSION = "3.8.4";
+var SDK_VERSION = "3.9.0";
 var USER_AGENT = `blockrun-ts/${SDK_VERSION}`;
 
 // src/client.ts
@@ -4790,16 +4790,51 @@ async function createSolanaWallet() {
   };
 }
 async function solanaKeyToBytes(privateKey) {
+  const key = privateKey.trim();
+  if (key.startsWith("[")) {
+    let parsed;
+    try {
+      parsed = JSON.parse(key);
+    } catch {
+      throw new Error(
+        "Invalid Solana private key: looks like a JSON byte array but is not valid JSON"
+      );
+    }
+    if (!Array.isArray(parsed) || !parsed.every((n) => Number.isInteger(n) && n >= 0 && n <= 255)) {
+      throw new Error(
+        "Invalid Solana private key: JSON array must contain only byte values (0-255)"
+      );
+    }
+    if (parsed.length !== 64) {
+      throw new Error(
+        `Invalid Solana key length: expected 64 bytes, got ${parsed.length}`
+      );
+    }
+    return Uint8Array.from(parsed);
+  }
+  const hex = key.startsWith("0x") || key.startsWith("0X") ? key.slice(2) : key;
+  if (/^[0-9a-fA-F]+$/.test(hex) && (hex.length === 64 || hex.length === 128)) {
+    if (hex.length === 64) {
+      throw new Error(
+        "Invalid Solana private key: this is a 32-byte hex key \u2014 the EVM (Base) wallet format, not a Solana key. Solana keys are 64 bytes, usually base58-encoded (86-88 characters)."
+      );
+    }
+    const bytes = new Uint8Array(64);
+    for (let i = 0; i < 64; i++) bytes[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+    return bytes;
+  }
   try {
     const bs58 = await import("bs58");
-    const bytes = (bs58.default ?? bs58).decode(privateKey);
+    const bytes = (bs58.default ?? bs58).decode(key);
     if (bytes.length !== 64) {
       throw new Error(`Invalid Solana key length: expected 64 bytes, got ${bytes.length}`);
     }
     return bytes;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    throw new Error(`Invalid Solana private key: ${msg}`);
+    throw new Error(
+      `Invalid Solana private key: ${msg}. Expected a base58-encoded 64-byte key (standard Solana format), a 64-byte hex string, or a Solana CLI JSON byte array.`
+    );
   }
 }
 async function solanaPublicKey(privateKey) {
@@ -4939,16 +4974,27 @@ Your current wallet is backed up first. You can also set
 SOLANA_WALLET_KEY=<private-key> for a single run without changing anything.
 `;
 }
+async function solanaPublicKeyFrom(privateKey, source) {
+  try {
+    return await solanaPublicKey(privateKey);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(`${msg} (key loaded from ${source})`);
+  }
+}
 async function getOrCreateSolanaWallet() {
   const envKey = typeof process !== "undefined" && process.env ? process.env.SOLANA_WALLET_KEY : void 0;
   if (envKey) {
-    const address2 = await solanaPublicKey(envKey);
+    const address2 = await solanaPublicKeyFrom(
+      envKey,
+      "the SOLANA_WALLET_KEY environment variable"
+    );
     return { privateKey: envKey, address: address2, isNew: false };
   }
   if (fs3.existsSync(SOLANA_WALLET_FILE)) {
     const fileKey = fs3.readFileSync(SOLANA_WALLET_FILE, "utf-8").trim();
     if (fileKey) {
-      const address2 = await solanaPublicKey(fileKey);
+      const address2 = await solanaPublicKeyFrom(fileKey, SOLANA_WALLET_FILE);
       return { privateKey: fileKey, address: address2, isNew: false };
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/llm",
-  "version": "3.8.4",
+  "version": "3.9.0",
   "type": "module",
   "description": "BlockRun SDK - Pay-per-request AI (LLM, Image, Video, Music, Voice) via x402 on Base and Solana",
   "main": "dist/index.cjs",