@blockrun/clawrouter 0.12.26 → 0.12.28

package/dist/cli.js

@@ -3621,13 +3621,6 @@ function deriveSolanaKeyBytes(mnemonic) {
   }
   return new Uint8Array(key);
 }
-function deriveSolanaKeyBytesLegacy(mnemonic) {
-  const seed = mnemonicToSeedSync(mnemonic);
-  const hdKey = HDKey.fromMasterSeed(seed);
-  const derived = hdKey.derive("m/44'/501'/0'/0'");
-  if (!derived.privateKey) throw new Error("Failed to derive legacy Solana private key");
-  return new Uint8Array(derived.privateKey);
-}
 function deriveAllKeys(mnemonic) {
   const { privateKey: evmPrivateKey, address: evmAddress } = deriveEvmKey(mnemonic);
   const solanaPrivateKeyBytes = deriveSolanaKeyBytes(mnemonic);
@@ -3753,32 +3746,6 @@ Then run: npx @blockrun/clawrouter`
     solanaPrivateKeyBytes: derived.solanaPrivateKeyBytes
   };
 }
-async function logMigrationWarning(legacyKeyBytes, newKeyBytes) {
-  try {
-    const { createKeyPairSignerFromPrivateKeyBytes } = await import("@solana/kit");
-    const [oldSigner, newSigner] = await Promise.all([
-      createKeyPairSignerFromPrivateKeyBytes(legacyKeyBytes),
-      createKeyPairSignerFromPrivateKeyBytes(newKeyBytes)
-    ]);
-    console.log(`[ClawRouter]`);
-    console.log(`[ClawRouter] \u26A0 SOLANA WALLET MIGRATION DETECTED`);
-    console.log(`[ClawRouter] \u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550`);
-    console.log(`[ClawRouter]   Old address (secp256k1): ${oldSigner.address}`);
-    console.log(`[ClawRouter]   New address (SLIP-10):   ${newSigner.address}`);
-    console.log(`[ClawRouter]`);
-    console.log(`[ClawRouter]   Your Solana wallet derivation has been fixed to use`);
-    console.log(`[ClawRouter]   SLIP-10 Ed25519 (Phantom/Solflare compatible).`);
-    console.log(`[ClawRouter]`);
-    console.log(`[ClawRouter]   If you had funds in the old wallet, run:`);
-    console.log(`[ClawRouter]     /wallet migrate-solana`);
-    console.log(`[ClawRouter]`);
-    console.log(`[ClawRouter]   The new wallet pays gas. Send ~0.005 SOL to:`);
-    console.log(`[ClawRouter]     ${newSigner.address}`);
-    console.log(`[ClawRouter] \u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550`);
-    console.log(`[ClawRouter]`);
-  } catch {
-  }
-}
 async function resolveOrGenerateWalletKey() {
   const saved = await loadSavedWallet();
   if (saved) {
@@ -3786,19 +3753,13 @@ async function resolveOrGenerateWalletKey() {
     const mnemonic = await loadMnemonic();
     if (mnemonic) {
       const solanaKeyBytes = deriveSolanaKeyBytes(mnemonic);
-      const result2 = {
+      return {
         key: saved,
         address: account.address,
         source: "saved",
         mnemonic,
         solanaPrivateKeyBytes: solanaKeyBytes
       };
-      const legacyKeyBytes = deriveSolanaKeyBytesLegacy(mnemonic);
-      if (Buffer.from(legacyKeyBytes).toString("hex") !== Buffer.from(solanaKeyBytes).toString("hex")) {
-        result2.legacySolanaKeyBytes = legacyKeyBytes;
-        await logMigrationWarning(legacyKeyBytes, solanaKeyBytes);
-      }
-      return result2;
     }
     return { key: saved, address: account.address, source: "saved" };
   }
@@ -3808,19 +3769,13 @@ async function resolveOrGenerateWalletKey() {
     const mnemonic = await loadMnemonic();
     if (mnemonic) {
       const solanaKeyBytes = deriveSolanaKeyBytes(mnemonic);
-      const result2 = {
+      return {
         key: envKey,
         address: account.address,
         source: "env",
         mnemonic,
         solanaPrivateKeyBytes: solanaKeyBytes
       };
-      const legacyKeyBytes = deriveSolanaKeyBytesLegacy(mnemonic);
-      if (Buffer.from(legacyKeyBytes).toString("hex") !== Buffer.from(solanaKeyBytes).toString("hex")) {
-        result2.legacySolanaKeyBytes = legacyKeyBytes;
-        await logMigrationWarning(legacyKeyBytes, solanaKeyBytes);
-      }
-      return result2;
     }
     return { key: envKey, address: account.address, source: "env" };
   }
@@ -5135,6 +5090,58 @@ function transformPaymentError(errorBody) {
         }
       }
     }
+    if (parsed.error === "Payment verification failed" && parsed.code === "PAYMENT_INVALID" && parsed.debug) {
+      const debugLower = parsed.debug.toLowerCase();
+      const wallet = parsed.payer || "unknown";
+      const shortWallet = wallet.length > 12 ? `${wallet.slice(0, 6)}...${wallet.slice(-4)}` : wallet;
+      if (debugLower.includes("insufficient")) {
+        return JSON.stringify({
+          error: {
+            message: "Insufficient Solana USDC balance.",
+            type: "insufficient_funds",
+            wallet,
+            help: `Fund wallet ${shortWallet} with USDC on Solana, or switch to Base: /wallet base`
+          }
+        });
+      }
+      if (debugLower.includes("transaction_simulation_failed") || debugLower.includes("simulation")) {
+        console.error(`[ClawRouter] Solana transaction simulation failed: ${parsed.debug}`);
+        return JSON.stringify({
+          error: {
+            message: "Solana payment simulation failed. Retrying with a different model.",
+            type: "transaction_simulation_failed",
+            help: "This is usually temporary. If it persists, try: /model free"
+          }
+        });
+      }
+      if (debugLower.includes("invalid signature") || debugLower.includes("invalid_signature")) {
+        return JSON.stringify({
+          error: {
+            message: "Solana payment signature invalid.",
+            type: "invalid_payload",
+            help: "Try again. If this persists, reinstall ClawRouter: curl -fsSL https://blockrun.ai/ClawRouter-update | bash"
+          }
+        });
+      }
+      if (debugLower.includes("expired")) {
+        return JSON.stringify({
+          error: {
+            message: "Solana payment expired. Retrying.",
+            type: "expired",
+            help: "This is usually temporary."
+          }
+        });
+      }
+      console.error(`[ClawRouter] Solana payment verification failed: ${parsed.debug} payer=${wallet}`);
+      return JSON.stringify({
+        error: {
+          message: `Solana payment verification failed: ${parsed.debug}`,
+          type: "payment_invalid",
+          wallet,
+          help: "Try again or switch to Base: /wallet base"
+        }
+      });
+    }
     if (parsed.error === "Settlement failed" || parsed.error === "Payment settlement failed" || parsed.details?.includes("Settlement failed") || parsed.details?.includes("transaction_simulation_failed")) {
       const details = parsed.details || "";
       const gasError = details.includes("unable to estimate gas");
@@ -5703,7 +5710,7 @@ async function startProxy(options) {
     const solanaSigner = await createKeyPairSignerFromPrivateKeyBytes(solanaPrivateKeyBytes);
     solanaAddress = solanaSigner.address;
     registerExactSvmScheme(x402, { signer: solanaSigner });
-    console.log(`[ClawRouter] Solana x402 scheme registered: ${solanaAddress}`);
+    console.log(`[ClawRouter] Solana wallet: ${solanaAddress}`);
   }
   x402.onAfterPaymentCreation(async (context) => {
     const network = context.selectedRequirements.network;