@chainstream-io/cli 0.0.17 → 0.0.19

package/dist/index.js

@@ -84,19 +84,8 @@ var init_config = __esm({
   }
 });
 
-// src/wallet/types.ts
-function toSdkChain(chain) {
-  return isSolanaChain(chain) ? "solana" : "evm";
-}
-var init_types = __esm({
-  "src/wallet/types.ts"() {
-    "use strict";
-    init_config();
-  }
-});
-
 // src/wallet/raw-wallet.ts
-import { privateKeyToAccount } from "viem/accounts";
+import { privateKeyToAccount, signTypedData as viemSignTypedData } from "viem/accounts";
 import { Keypair, VersionedTransaction } from "@solana/web3.js";
 import { sign as ed25519Sign } from "crypto";
 function bs58Decode(str) {
@@ -122,37 +111,64 @@ function bs58Decode(str) {
   }
   return new Uint8Array(result.reverse());
 }
-var RawKeyWallet;
+function toHexKey(key) {
+  return key.startsWith("0x") ? key : `0x${key}`;
+}
+function createRawKeyWallet(key, chain) {
+  return isEvmChain(chain) ? new RawEvmWallet(key, chain) : new RawSvmWallet(key, chain);
+}
+var RawEvmWallet, RawSvmWallet;
 var init_raw_wallet = __esm({
   "src/wallet/raw-wallet.ts"() {
     "use strict";
-    init_types();
     init_config();
-    RawKeyWallet = class {
-      chain;
+    RawEvmWallet = class {
+      chain = "evm";
       paymentChain;
       address;
       privateKey;
       constructor(key, chain) {
         this.paymentChain = chain;
-        this.chain = toSdkChain(chain);
         this.privateKey = key;
-        if (isEvmChain(this.paymentChain)) {
-          const hex = key.startsWith("0x") ? key : `0x${key}`;
-          const account = privateKeyToAccount(hex);
-          this.address = account.address;
-        } else {
-          const decoded = bs58Decode(key);
-          const keypair = Keypair.fromSecretKey(decoded);
-          this.address = keypair.publicKey.toBase58();
-        }
+        const account = privateKeyToAccount(toHexKey(key));
+        this.address = account.address;
+      }
+      async signMessage(message) {
+        const account = privateKeyToAccount(toHexKey(this.privateKey));
+        return account.signMessage({ message });
+      }
+      async signTransaction(serializedTx) {
+        const txBytes = Buffer.from(serializedTx, "base64");
+        const account = privateKeyToAccount(toHexKey(this.privateKey));
+        const signedHex = await account.signTransaction({ type: "legacy" });
+        return Buffer.from(signedHex.slice(2), "hex").toString("base64");
+      }
+      async signTypedData(typedData) {
+        return viemSignTypedData({
+          privateKey: toHexKey(this.privateKey),
+          ...typedData,
+          domain: typedData.domain,
+          types: typedData.types
+        });
+      }
+      async signRawHash(hash) {
+        const account = privateKeyToAccount(toHexKey(this.privateKey));
+        return account.sign({ hash });
+      }
+    };
+    RawSvmWallet = class {
+      chain = "solana";
+      paymentChain;
+      address;
+      privateKey;
+      constructor(key, chain) {
+        this.paymentChain = chain;
+        this.privateKey = key;
+        const decoded = bs58Decode(key);
+        const keypair = Keypair.fromSecretKey(decoded);
+        this.address = keypair.publicKey.toBase58();
       }
       async signMessage(message) {
-        if (isEvmChain(this.paymentChain)) {
-          const hex = this.privateKey.startsWith("0x") ? this.privateKey : `0x${this.privateKey}`;
-          const account = privateKeyToAccount(hex);
-          return account.signMessage({ message });
-        }
         const decoded = bs58Decode(this.privateKey);
         const secretKeyRaw = decoded.slice(0, 32);
         const pkcs8Prefix = Buffer.from("302e020100300506032b657004220420", "hex");
@@ -163,17 +179,11 @@ var init_raw_wallet = __esm({
       }
       async signTransaction(serializedTx) {
         const txBytes = Buffer.from(serializedTx, "base64");
-        if (!isEvmChain(this.paymentChain)) {
-          const tx = VersionedTransaction.deserialize(new Uint8Array(txBytes));
-          const decoded = bs58Decode(this.privateKey);
-          const keypair = Keypair.fromSecretKey(decoded);
-          tx.sign([keypair]);
-          return Buffer.from(tx.serialize()).toString("base64");
-        }
-        const hex = this.privateKey.startsWith("0x") ? this.privateKey : `0x${this.privateKey}`;
-        const account = privateKeyToAccount(hex);
-        const signedHex = await account.signTransaction({ type: "legacy" });
-        return Buffer.from(signedHex.slice(2), "hex").toString("base64");
+        const tx = VersionedTransaction.deserialize(new Uint8Array(txBytes));
+        const decoded = bs58Decode(this.privateKey);
+        const keypair = Keypair.fromSecretKey(decoded);
+        tx.sign([keypair]);
+        return Buffer.from(tx.serialize()).toString("base64");
       }
     };
   }
@@ -328,74 +338,131 @@ var init_turnkey = __esm({
 });
 
 // src/wallet/turnkey-wallet.ts
-var TurnkeyWallet;
+import { hashTypedData } from "viem";
+async function turnkeySignRawPayload(creds, address, payloadHex, hashFunction) {
+  const result = await turnkeyRequest(
+    "/public/v1/submit/sign_raw_payload",
+    {
+      type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
+      timestampMs: Date.now().toString(),
+      organizationId: creds.organizationId,
+      parameters: {
+        signWith: address,
+        payload: payloadHex,
+        encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
+        hashFunction
+      }
+    },
+    creds
+  );
+  const sig = result.activity?.result?.signRawPayloadResult;
+  if (!sig) throw new Error("Turnkey sign: no signature in response");
+  return sig;
+}
+function formatEvmSignature(sig) {
+  const v = sig.v === "00" ? "1b" : "1c";
+  return `0x${sig.r}${sig.s}${v}`;
+}
+async function createTurnkeyWallets(creds) {
+  const [evmAddr, solAddr] = await Promise.all([
+    getEvmAddress(creds),
+    getSolanaAddress(creds)
+  ]);
+  return {
+    base: new TurnkeyEvmWallet(creds, "base", evmAddr),
+    sol: new TurnkeySvmWallet(creds, "sol", solAddr)
+  };
+}
+var TurnkeyEvmWallet, TurnkeySvmWallet;
 var init_turnkey_wallet = __esm({
   "src/wallet/turnkey-wallet.ts"() {
     "use strict";
-    init_types();
-    init_config();
     init_turnkey();
-    TurnkeyWallet = class _TurnkeyWallet {
-      chain;
+    TurnkeyEvmWallet = class {
+      chain = "evm";
       paymentChain;
       address;
       creds;
       constructor(creds, chain, address) {
         this.creds = creds;
         this.paymentChain = chain;
-        this.chain = toSdkChain(chain);
         this.address = address;
       }
-      static async create(creds) {
-        const [evmAddr, solAddr] = await Promise.all([
-          getEvmAddress(creds),
-          getSolanaAddress(creds)
-        ]);
-        return {
-          base: new _TurnkeyWallet(creds, "base", evmAddr),
-          sol: new _TurnkeyWallet(creds, "sol", solAddr)
-        };
-      }
       async signMessage(message) {
-        let payloadHex;
-        let hashFunction;
-        if (isEvmChain(this.paymentChain)) {
-          const prefix = `Ethereum Signed Message:
+        const prefix = `Ethereum Signed Message:
 ${message.length}`;
-          const prefixed = Buffer.concat([Buffer.from(prefix, "utf-8"), Buffer.from(message, "utf-8")]);
-          payloadHex = prefixed.toString("hex");
-          hashFunction = "HASH_FUNCTION_KECCAK256";
-        } else {
-          payloadHex = Buffer.from(message, "utf-8").toString("hex");
-          hashFunction = "HASH_FUNCTION_NOT_APPLICABLE";
-        }
+        const prefixed = Buffer.concat([Buffer.from(prefix, "utf-8"), Buffer.from(message, "utf-8")]);
+        const sig = await turnkeySignRawPayload(
+          this.creds,
+          this.address,
+          prefixed.toString("hex"),
+          "HASH_FUNCTION_KECCAK256"
+        );
+        return formatEvmSignature(sig);
+      }
+      async signTransaction(serializedTx) {
+        const txBytes = Buffer.from(serializedTx, "base64");
         const result = await turnkeyRequest(
-          "/public/v1/submit/sign_raw_payload",
+          "/public/v1/submit/sign_transaction",
           {
-            type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
+            type: "ACTIVITY_TYPE_SIGN_TRANSACTION_V2",
             timestampMs: Date.now().toString(),
             organizationId: this.creds.organizationId,
             parameters: {
               signWith: this.address,
-              payload: payloadHex,
-              encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
-              hashFunction
+              unsignedTransaction: txBytes.toString("hex"),
+              type: "TRANSACTION_TYPE_ETHEREUM"
             }
           },
           this.creds
         );
-        const sigResult = result.activity?.result?.signRawPayloadResult;
-        if (!sigResult) throw new Error("Turnkey signMessage: no signature in response");
-        if (isEvmChain(this.paymentChain)) {
-          const v = sigResult.v === "00" ? "1b" : "1c";
-          return `0x${sigResult.r}${sigResult.s}${v}`;
-        }
-        return `${sigResult.r}${sigResult.s}`;
+        const signedHex = result.activity?.result?.signTransactionResult?.signedTransaction;
+        if (!signedHex) throw new Error("Turnkey signTransaction: no signed tx in response");
+        return Buffer.from(signedHex, "hex").toString("base64");
+      }
+      async signTypedData(typedData) {
+        const digest = hashTypedData(typedData);
+        const payloadHex = digest.slice(2);
+        const sig = await turnkeySignRawPayload(
+          this.creds,
+          this.address,
+          payloadHex,
+          "HASH_FUNCTION_NO_OP"
+        );
+        return formatEvmSignature(sig);
+      }
+      async signRawHash(hash) {
+        const payloadHex = hash.startsWith("0x") ? hash.slice(2) : hash;
+        const sig = await turnkeySignRawPayload(
+          this.creds,
+          this.address,
+          payloadHex,
+          "HASH_FUNCTION_NO_OP"
+        );
+        return formatEvmSignature(sig);
+      }
+    };
+    TurnkeySvmWallet = class {
+      chain = "solana";
+      paymentChain;
+      address;
+      creds;
+      constructor(creds, chain, address) {
+        this.creds = creds;
+        this.paymentChain = chain;
+        this.address = address;
+      }
+      async signMessage(message) {
+        const sig = await turnkeySignRawPayload(
+          this.creds,
+          this.address,
+          Buffer.from(message, "utf-8").toString("hex"),
+          "HASH_FUNCTION_NOT_APPLICABLE"
+        );
+        return `${sig.r}${sig.s}`;
       }
       async signTransaction(serializedTx) {
         const txBytes = Buffer.from(serializedTx, "base64");
-        const unsignedHex = txBytes.toString("hex");
-        const txType = isEvmChain(this.paymentChain) ? "TRANSACTION_TYPE_ETHEREUM" : "TRANSACTION_TYPE_SOLANA";
         const result = await turnkeyRequest(
           "/public/v1/submit/sign_transaction",
           {
@@ -404,8 +471,8 @@ ${message.length}`;
             organizationId: this.creds.organizationId,
             parameters: {
               signWith: this.address,
-              unsignedTransaction: unsignedHex,
-              type: txType
+              unsignedTransaction: txBytes.toString("hex"),
+              type: "TRANSACTION_TYPE_SOLANA"
             }
           },
           this.creds
@@ -426,7 +493,7 @@ __export(wallet_exports, {
 });
 function createWallet(config, mode) {
   if (mode === "raw" && config.rawWallet) {
-    return new RawKeyWallet(config.rawWallet.key, config.rawWallet.chain);
+    return createRawKeyWallet(config.rawWallet.key, config.rawWallet.chain);
   }
   if (mode === "turnkey" && config.turnkey) {
     const chain = config.walletChain ?? "base";
@@ -437,7 +504,7 @@ function createWallet(config, mode) {
 Please re-login to resolve addresses: chainstream login`
       );
     }
-    return new TurnkeyWallet(config.turnkey, chain, address);
+    return isEvmChain(chain) ? new TurnkeyEvmWallet(config.turnkey, chain, address) : new TurnkeySvmWallet(config.turnkey, chain, address);
   }
   throw new Error(
     "No wallet configured. Run:\n  chainstream login           # Create Turnkey wallet\n  chainstream wallet set-raw  # Use raw private key (dev)"
@@ -445,11 +512,11 @@ Please re-login to resolve addresses: chainstream login`
 }
 async function createWalletWithAddresses(config, mode) {
   if (mode === "raw" && config.rawWallet) {
-    const w = new RawKeyWallet(config.rawWallet.key, config.rawWallet.chain);
+    const w = createRawKeyWallet(config.rawWallet.key, config.rawWallet.chain);
     return isEvmChain(config.rawWallet.chain) ? { base: w } : { sol: w };
   }
   if (mode === "turnkey" && config.turnkey) {
-    const wallets = await TurnkeyWallet.create(config.turnkey);
+    const wallets = await createTurnkeyWallets(config.turnkey);
     return { base: wallets.base, sol: wallets.sol };
   }
   throw new Error("No wallet configured.");
@@ -468,6 +535,7 @@ var x402_exports = {};
 __export(x402_exports, {
   getPricing: () => getPricing,
   getX402Fetch: () => getX402Fetch,
+  selectPaymentMethod: () => selectPaymentMethod,
   selectPlanInteractive: () => selectPlanInteractive
 });
 import { x402Client } from "@x402/core/client";
@@ -475,7 +543,7 @@ import { wrapFetchWithPayment } from "@x402/fetch";
 import { ExactEvmScheme } from "@x402/evm/exact/client";
 import { ExactSvmScheme } from "@x402/svm/exact/client";
 import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
-import { hashTypedData } from "viem";
+import { hashTypedData as hashTypedData2 } from "viem";
 import { createKeyPairSignerFromBytes } from "@solana/kit";
 import * as readline from "readline/promises";
 function createTurnkeyPaymentAccount(creds) {
@@ -486,7 +554,7 @@ function createTurnkeyPaymentAccount(creds) {
     source: "custom",
     publicKey: "0x",
     async signTypedData(args) {
-      const digest = hashTypedData(args);
+      const digest = hashTypedData2(args);
       const result = await turnkeyRequest(
         "/public/v1/submit/sign_raw_payload",
         {
@@ -608,6 +676,15 @@ async function getPricing(baseUrl) {
   if (!resp.ok) throw new Error(`Failed to get pricing (${resp.status})`);
   return resp.json();
 }
+async function selectPaymentMethod() {
+  process.stderr.write("\n[chainstream] Choose payment method:\n");
+  process.stderr.write("  1. x402 (USDC on Base/Solana)\n");
+  process.stderr.write("  2. MPP Tempo (USDC.e on Tempo)\n\n");
+  const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+  const answer = await rl.question("Select method (1-2): ");
+  rl.close();
+  return answer.trim() === "2" ? "mpp" : "x402";
+}
 async function selectPlanInteractive(baseUrl) {
   const pricing = await getPricing(baseUrl);
   const plans = pricing.plans.sort((a, b) => a.priceUsd - b.priceUsd);
@@ -677,29 +754,35 @@ function createClient() {
     "Not authenticated. Run one of:\n  chainstream login                  # Create ChainStream Wallet (no email)\n  chainstream login --email          # Email OTP login\n  chainstream wallet set-raw         # Import private key (dev)\n  chainstream config set --key apiKey --value <key>  # API key only"
   );
 }
-function requireWallet() {
-  const config = loadConfig();
-  const walletMode = getWalletMode(config);
-  if (!walletMode) {
-    throw new Error(
-      "Wallet required for this operation. Run:\n  chainstream login           # Create ChainStream Wallet\n  chainstream wallet set-raw  # Dev: use raw private key"
-    );
-  }
-  return createClient();
-}
 async function callWithAutoPayment(fn, retried = false) {
   try {
     return await fn();
   } catch (err) {
     const paymentInfo = extractPaymentInfo(err);
-    if (paymentInfo && !retried && _wallet) {
+    if (paymentInfo && !retried) {
       const config = loadConfig();
       const chosenPlan = await selectPlanInteractive(config.baseUrl);
+      const method = _wallet ? await selectPaymentMethod() : "mpp";
+      if (method === "mpp") {
+        const mppUrl = `${config.baseUrl}/mpp/purchase?plan=${encodeURIComponent(chosenPlan)}`;
+        process.stderr.write(
+          `
+[chainstream] To purchase via MPP (USDC.e on Tempo), run:
+  tempo request ${mppUrl}
+
+After purchase, set the API key:
+  chainstream config set --key apiKey --value <key from response>
+
+`
+        );
+        throw err;
+      }
+      if (!_wallet) throw err;
       const purchaseUrl = replacePlanInUrl(
         resolvePurchaseUrl(config.baseUrl, paymentInfo),
         chosenPlan
       );
-      process.stderr.write(`[chainstream] Purchasing ${chosenPlan} plan...
+      process.stderr.write(`[chainstream] Purchasing ${chosenPlan} plan via x402...
 `);
       const x402Fetch = await getX402Fetch(config);
       const resp = await x402Fetch(purchaseUrl);
@@ -791,11 +874,6 @@ function validateAddress(address, chain) {
     throw new Error(`Invalid address for chain "${chain}": "${address}"`);
   }
 }
-function validateSlippage(value) {
-  if (value < 1e-3 || value > 0.5) {
-    throw new Error(`Invalid slippage: ${value}. Must be between 0.001 (0.1%) and 0.5 (50%).`);
-  }
-}
 function resolveCurrency(nameOrAddress, chain) {
   const upper = nameOrAddress.toUpperCase();
   const resolved = CURRENCY_MAP[chain]?.[upper];
@@ -804,13 +882,8 @@ function resolveCurrency(nameOrAddress, chain) {
 }
 
 // src/lib/output.ts
-var EXPLORERS = {
-  sol: "https://solscan.io/tx/",
-  bsc: "https://bscscan.com/tx/",
-  eth: "https://etherscan.io/tx/"
-};
-function printResult(data, raw) {
-  if (raw) {
+function printResult(data, json) {
+  if (json) {
     process.stdout.write(JSON.stringify(data) + "\n");
   } else {
     process.stdout.write(JSON.stringify(data, null, 2) + "\n");
@@ -828,27 +901,23 @@ function exitOnError(err) {
   }
   process.exit(1);
 }
-function explorerUrl(chain, txHash) {
-  const base = EXPLORERS[chain] ?? EXPLORERS["eth"];
-  return `${base}${txHash}`;
-}
 
 // src/commands/token.ts
 function registerTokenCommands(program2) {
   const token = program2.command("token").description("Token information and analytics");
-  token.command("search").description("Search tokens by keyword").requiredOption("--keyword <keyword>", "Search keyword (name, symbol, or address)").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").option("--limit <n>", "Max results", "20").option("--raw", "Single-line JSON output").action(async (opts) => {
+  token.command("search").description("Search tokens by keyword").requiredOption("--keyword <keyword>", "Search keyword (name, symbol, or address)").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").option("--limit <n>", "Max results", "20").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       const client = createClient();
       const result = await callWithAutoPayment(
         () => client.token.search({ q: opts.keyword, chains: [opts.chain], limit: Number(opts.limit) })
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  token.command("info").description("Get full token detail").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").option("--raw", "Single-line JSON output").action(async (opts) => {
+  token.command("info").description("Get full token detail").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -856,12 +925,12 @@ function registerTokenCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.token.getToken(opts.chain, opts.address)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  token.command("security").description("Check token security (honeypot, mint auth, freeze auth)").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").option("--raw", "Single-line JSON output").action(async (opts) => {
+  token.command("security").description("Check token security (honeypot, mint auth, freeze auth)").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -869,12 +938,12 @@ function registerTokenCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.token.getSecurity(opts.chain, opts.address)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  token.command("holders").description("Get top token holders").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").option("--limit <n>", "Max results", "20").option("--raw", "Single-line JSON output").action(async (opts) => {
+  token.command("holders").description("Get top token holders").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").option("--limit <n>", "Max results", "20").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -882,12 +951,12 @@ function registerTokenCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.token.getTopHolders(opts.chain, opts.address, { limit: Number(opts.limit) })
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  token.command("candles").description("Get OHLCV candlestick data").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").requiredOption("--resolution <res>", "Resolution: 1m/5m/15m/1h/4h/1d").option("--from <timestamp>", "Start time (Unix seconds)").option("--to <timestamp>", "End time (Unix seconds)").option("--limit <n>", "Max candles", "100").option("--raw", "Single-line JSON output").action(async (opts) => {
+  token.command("candles").description("Get OHLCV candlestick data").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").requiredOption("--resolution <res>", "Resolution: 1m/5m/15m/1h/4h/1d").option("--from <timestamp>", "Start time (Unix seconds)").option("--to <timestamp>", "End time (Unix seconds)").option("--limit <n>", "Max candles", "100").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -901,12 +970,12 @@ function registerTokenCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.token.getCandles(opts.chain, opts.address, params)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  token.command("pools").description("Get liquidity pools for a token").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").option("--raw", "Single-line JSON output").action(async (opts) => {
+  token.command("pools").description("Get liquidity pools for a token").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Token contract address").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -914,7 +983,7 @@ function registerTokenCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.token.getPools(opts.chain, opts.address)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
@@ -924,7 +993,7 @@ function registerTokenCommands(program2) {
 // src/commands/market.ts
 function registerMarketCommands(program2) {
   const market = program2.command("market").description("Market data and trending tokens");
-  market.command("trending").description("Get hot/trending tokens").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--duration <dur>", "Duration: 1h/6h/24h").option("--limit <n>", "Max results").option("--raw", "Single-line JSON output").action(async (opts) => {
+  market.command("trending").description("Get hot/trending tokens").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--duration <dur>", "Duration: 1h/6h/24h").option("--limit <n>", "Max results").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       const client = createClient();
@@ -933,12 +1002,12 @@ function registerMarketCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.ranking.getHotTokens(opts.chain, opts.duration, params)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  market.command("new").description("Get newly created tokens").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").option("--limit <n>", "Max results").option("--raw", "Single-line JSON output").action(async (opts) => {
+  market.command("new").description("Get newly created tokens").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").option("--limit <n>", "Max results").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       const client = createClient();
@@ -947,12 +1016,12 @@ function registerMarketCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.ranking.getNewTokens(opts.chain, params)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  market.command("trades").description("Get recent trades").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").option("--token <address>", "Filter by token address").option("--limit <n>", "Max results").option("--raw", "Single-line JSON output").action(async (opts) => {
+  market.command("trades").description("Get recent trades").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").option("--token <address>", "Filter by token address").option("--limit <n>", "Max results").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       const client = createClient();
@@ -962,7 +1031,7 @@ function registerMarketCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.trade.getTrades(opts.chain, params)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
@@ -973,8 +1042,25 @@ function registerMarketCommands(program2) {
 init_config();
 import * as readline2 from "readline/promises";
 function registerWalletCommands(program2) {
-  const wallet = program2.command("wallet").description("Wallet analytics and management");
-  wallet.command("profile").description("Wallet profile: PnL + net worth + top holdings").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Wallet address").option("--raw", "Single-line JSON output").action(async (opts) => {
+  const wallet = program2.command("wallet").description("Wallet analytics, management, and signing");
+  wallet.command("sign").description("Sign a serialized transaction").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--tx <base64>", "Base64-encoded unsigned transaction (serializedTx)").action(async (opts, cmd) => {
+    try {
+      validateChain(opts.chain);
+      const { createWallet: createWallet2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
+      const { getWalletMode: getWalletMode2, isSolanaChain: isSolanaChain2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+      const config = loadConfig();
+      const walletMode = getWalletMode2(config);
+      if (!walletMode) throw new Error("Wallet required for signing. Run: chainstream login");
+      const signChain = isSolanaChain2(opts.chain) ? "sol" : "base";
+      const signConfig = { ...config, walletChain: signChain };
+      const w = createWallet2(signConfig, walletMode);
+      const signedTx = await w.signTransaction(opts.tx);
+      printResult({ signedTx }, cmd.optsWithGlobals().json);
+    } catch (err) {
+      exitOnError(err);
+    }
+  });
+  wallet.command("profile").description("Wallet profile: PnL + net worth + top holdings").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Wallet address").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -986,12 +1072,12 @@ function registerWalletCommands(program2) {
           client.wallet.getTokensBalance(opts.chain, opts.address)
         ])
       );
-      printResult({ pnl, netWorth, balance }, opts.raw);
+      printResult({ pnl, netWorth, balance }, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  wallet.command("pnl").description("Get wallet PnL details").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Wallet address").option("--raw", "Single-line JSON output").action(async (opts) => {
+  wallet.command("pnl").description("Get wallet PnL details").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Wallet address").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -999,12 +1085,12 @@ function registerWalletCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.wallet.getPnl(opts.chain, opts.address)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  wallet.command("holdings").description("Get wallet token balances").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Wallet address").option("--limit <n>", "Max results").option("--raw", "Single-line JSON output").action(async (opts) => {
+  wallet.command("holdings").description("Get wallet token balances").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Wallet address").option("--limit <n>", "Max results").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -1014,12 +1100,12 @@ function registerWalletCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.wallet.getTokensBalance(opts.chain, opts.address, params)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  wallet.command("activity").description("Get wallet transfer history").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Wallet address").option("--limit <n>", "Max results").option("--raw", "Single-line JSON output").action(async (opts) => {
+  wallet.command("activity").description("Get wallet transfer history").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--address <address>", "Wallet address").option("--limit <n>", "Max results").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.address, opts.chain);
@@ -1029,42 +1115,46 @@ function registerWalletCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.wallet.getWalletTransfers(opts.chain, opts.address, params)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  wallet.command("address").description("Show current wallet addresses").action(async () => {
+  wallet.command("address").description("Show current wallet addresses").action(async (_opts, cmd) => {
     try {
+      const json = cmd.optsWithGlobals().json;
       const config = loadConfig();
       const walletMode = (await Promise.resolve().then(() => (init_config(), config_exports))).getWalletMode(config);
+      const addresses = {};
       if (walletMode === "turnkey" && config.turnkey) {
         if (config.turnkey.evmAddress || config.turnkey.solanaAddress) {
-          if (config.turnkey.evmAddress) process.stdout.write(`Base:   ${config.turnkey.evmAddress}
-`);
-          if (config.turnkey.solanaAddress) process.stdout.write(`Solana: ${config.turnkey.solanaAddress}
-`);
+          if (config.turnkey.evmAddress) addresses.base = config.turnkey.evmAddress;
+          if (config.turnkey.solanaAddress) addresses.solana = config.turnkey.solanaAddress;
         } else {
           const { createWalletWithAddresses: createWalletWithAddresses2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
           const wallets = await createWalletWithAddresses2(config, "turnkey");
-          if (wallets.base) process.stdout.write(`Base:   ${wallets.base.address}
-`);
-          if (wallets.sol) process.stdout.write(`Solana: ${wallets.sol.address}
-`);
+          if (wallets.base) addresses.base = wallets.base.address;
+          if (wallets.sol) addresses.solana = wallets.sol.address;
         }
       } else if (config.rawWallet) {
         const { createWallet: createWallet2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
         const w = createWallet2(config, "raw");
-        process.stdout.write(`${w.paymentChain.toUpperCase()}: ${w.address}
-`);
-      } else {
-        process.stdout.write("No wallet configured. Run: chainstream login\n");
+        addresses[w.paymentChain] = w.address;
+      }
+      if (Object.keys(addresses).length === 0) {
+        if (json) {
+          printResult({ error: "No wallet configured" }, true);
+        } else {
+          process.stdout.write("No wallet configured. Run: chainstream login\n");
+        }
+        return;
       }
+      printResult(addresses, json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  wallet.command("balance").description("Show current wallet balance").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").option("--raw", "Single-line JSON output").action(async (opts) => {
+  wallet.command("balance").description("Show current wallet balance").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       const config = loadConfig();
@@ -1086,34 +1176,38 @@ function registerWalletCommands(program2) {
       const result = await callWithAutoPayment(
         () => client.wallet.getTokensBalance(opts.chain, address)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  wallet.command("set-raw").description("Set raw private key (dev/testing only)").requiredOption("--chain <chain>", "Chain: base/sol").action(async (opts) => {
+  wallet.command("set-raw").description("Set raw private key (dev/testing only)").requiredOption("--chain <chain>", "Chain: base/sol").action(async (opts, cmd) => {
     try {
+      const json = cmd.optsWithGlobals().json;
       const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
-      process.stdout.write("\u26A0 WARNING: Raw private key will be stored in plaintext.\n");
-      process.stdout.write("  Use Turnkey (chainstream login) for production.\n\n");
-      const key = await rl.question("Enter private key: ");
+      if (!json) {
+        process.stdout.write("WARNING: Raw private key will be stored in plaintext.\n");
+        process.stdout.write("  Use Turnkey (chainstream login) for production.\n\n");
+      }
+      const key = await rl.question(json ? "" : "Enter private key: ");
       rl.close();
       if (!key.trim()) throw new Error("Empty key provided.");
       updateConfig({
         rawWallet: { key: key.trim(), chain: opts.chain }
       });
-      process.stdout.write(`Raw wallet set (${opts.chain}). Run 'chainstream wallet address' to verify.
-`);
+      const { createWallet: createWallet2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
+      const w = createWallet2(loadConfig(), "raw");
+      printResult({ chain: opts.chain, address: w.address }, json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  wallet.command("pricing").description("Show available x402 quota plans").option("--raw", "Single-line JSON output").action(async (opts) => {
+  wallet.command("pricing").description("Show available x402 quota plans").action(async (_opts, cmd) => {
     try {
       const config = loadConfig();
       const { getPricing: getPricing2 } = await Promise.resolve().then(() => (init_x402(), x402_exports));
       const plans = await getPricing2(config.baseUrl);
-      printResult(plans, opts.raw);
+      printResult(plans, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
@@ -1121,121 +1215,136 @@ function registerWalletCommands(program2) {
 }
 
 // src/commands/dex.ts
-import * as readline3 from "readline/promises";
 function registerDexCommands(program2) {
-  const dex = program2.command("dex").description("DEX swap, quote, and token creation");
-  dex.command("quote").description("Get swap quote (read-only)").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--input-token <addr>", "Input token (address or SOL/ETH/BNB/USDC)").requiredOption("--output-token <addr>", "Output token (address or SOL/ETH/BNB/USDC)").requiredOption("--amount <amount>", "Input amount (smallest unit)").option("--raw", "Single-line JSON output").action(async (opts) => {
+  const dex = program2.command("dex").description("DEX route, swap, and token creation (returns unsigned transactions)");
+  dex.command("route").description("Get aggregated route + build unsigned transaction").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--from <address>", "Sender wallet address").requiredOption("--input-token <addr>", "Input token (address or SOL/ETH/BNB/USDC)").requiredOption("--output-token <addr>", "Output token (address or SOL/ETH/BNB/USDC)").requiredOption("--amount <amount>", "Input amount (smallest unit)").option("--slippage <n>", "Slippage tolerance (0-100, e.g. 5 = 5%)", "5").option("--dex <dex>", "Specific DEX protocol (e.g. jupiter, kyberswap)").option("--recipient <addr>", "Recipient address (if different from sender)").option("--anti-mev", "Enable anti-MEV protection").option("--gas-price <n>", "Gas price (EVM, numeric string)").option("--gas-limit <n>", "Gas limit (EVM, numeric string)").option("--max-fee-per-gas <n>", "Max fee per gas (EVM EIP-1559)").option("--max-priority-fee-per-gas <n>", "Max priority fee per gas (EVM EIP-1559)").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
+      validateAddress(opts.from, opts.chain);
       const inputToken = resolveCurrency(opts.inputToken, opts.chain);
       const outputToken = resolveCurrency(opts.outputToken, opts.chain);
       const client = createClient();
+      const body = {
+        dex: opts.dex ?? "jupiter",
+        userAddress: opts.from,
+        inputMint: inputToken,
+        outputMint: outputToken,
+        amount: opts.amount,
+        swapMode: "ExactIn",
+        slippage: Number(opts.slippage)
+      };
+      if (opts.recipient) body.recipientAddress = opts.recipient;
+      if (opts.antiMev) body.isAntiMev = true;
+      if (opts.gasPrice) body.gasPrice = opts.gasPrice;
+      if (opts.gasLimit) body.gasLimit = opts.gasLimit;
+      if (opts.maxFeePerGas) body.maxFeePerGas = opts.maxFeePerGas;
+      if (opts.maxPriorityFeePerGas) body.maxPriorityFeePerGas = opts.maxPriorityFeePerGas;
       const result = await callWithAutoPayment(
-        () => client.dex.quote(opts.chain, {
-          inputMint: inputToken,
-          outputMint: outputToken,
-          amount: opts.amount
-        })
+        () => client.dex.route(opts.chain, body)
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  dex.command("swap").description("[FINANCIAL] Execute token swap (irreversible)").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--from <address>", "Sender wallet address").requiredOption("--input-token <addr>", "Input token (address or SOL/ETH/BNB/USDC)").requiredOption("--output-token <addr>", "Output token (address or SOL/ETH/BNB/USDC)").requiredOption("--amount <amount>", "Input amount (smallest unit)").option("--slippage <n>", "Slippage tolerance (e.g. 0.01 = 1%)", "0.01").option("--raw", "Single-line JSON output").option("--yes", "Skip confirmation prompt").action(async (opts) => {
+  dex.command("swap").description("Build unsigned swap transaction").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--from <address>", "Sender wallet address").requiredOption("--input-token <addr>", "Input token (address or SOL/ETH/BNB/USDC)").requiredOption("--output-token <addr>", "Output token (address or SOL/ETH/BNB/USDC)").requiredOption("--amount <amount>", "Input amount (smallest unit)").option("--slippage <n>", "Slippage tolerance (0-100, e.g. 5 = 5%)", "5").option("--dex <dex>", "Specific DEX protocol").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
       validateAddress(opts.from, opts.chain);
-      if (opts.slippage) validateSlippage(Number(opts.slippage));
       const inputToken = resolveCurrency(opts.inputToken, opts.chain);
       const outputToken = resolveCurrency(opts.outputToken, opts.chain);
-      const client = requireWallet();
-      process.stderr.write("Fetching quote...\n");
-      const quote = await callWithAutoPayment(
-        () => client.dex.quote(opts.chain, {
-          inputMint: inputToken,
-          outputMint: outputToken,
-          amount: opts.amount
-        })
-      );
-      process.stderr.write("\n--- Swap Summary ---\n");
-      process.stderr.write(`Chain:        ${opts.chain}
-`);
-      process.stderr.write(`Input:        ${inputToken}
-`);
-      process.stderr.write(`Output:       ${outputToken}
-`);
-      process.stderr.write(`Amount:       ${opts.amount}
-`);
-      process.stderr.write(`Slippage:     ${opts.slippage}
-`);
-      process.stderr.write(`Quote:        ${JSON.stringify(quote)}
-`);
-      process.stderr.write("--------------------\n\n");
-      if (!opts.yes) {
-        const rl = readline3.createInterface({ input: process.stdin, output: process.stderr });
-        const answer = await rl.question("Confirm swap? (y/N): ");
-        rl.close();
-        if (answer.toLowerCase() !== "y") {
-          process.stderr.write("Swap cancelled.\n");
-          return;
-        }
-      }
-      process.stderr.write("Building transaction...\n");
-      const swapResult = await callWithAutoPayment(
+      const client = createClient();
+      const result = await callWithAutoPayment(
         () => client.dex.swap(opts.chain, {
+          dex: opts.dex ?? "jupiter",
           userAddress: opts.from,
           inputMint: inputToken,
           outputMint: outputToken,
           amount: opts.amount,
+          swapMode: "ExactIn",
           slippage: Number(opts.slippage)
         })
       );
-      const { createWallet: createWallet2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
-      const { loadConfig: loadConfig2, getWalletMode: getWalletMode2 } = await Promise.resolve().then(() => (init_config(), config_exports));
-      const config = loadConfig2();
-      const walletMode = getWalletMode2(config);
-      if (!walletMode) throw new Error("Wallet required for swap.");
-      const wallet = createWallet2(config, walletMode);
-      process.stderr.write("Signing transaction...\n");
-      const signedTx = await wallet.signTransaction(swapResult.serializedTx);
-      process.stderr.write("Broadcasting transaction...\n");
-      const sendResult = await client.transaction.send(opts.chain, {
-        signedTx
-      });
-      if (sendResult.jobId) {
-        process.stderr.write(`Job ${sendResult.jobId} submitted. Waiting for confirmation...
-`);
-        const jobResult = await client.waitForJob(sendResult.jobId);
-        const result = {
-          ...jobResult,
-          explorer: explorerUrl(opts.chain, (sendResult.signature ?? jobResult.hash) || "")
-        };
-        printResult(result, opts.raw);
-      } else {
-        const result = {
-          ...sendResult,
-          explorer: explorerUrl(opts.chain, sendResult.signature ?? "")
-        };
-        printResult(result, opts.raw);
-      }
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  dex.command("create").description("[FINANCIAL] Create token on launchpad").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--name <name>", "Token name").requiredOption("--symbol <symbol>", "Token symbol").requiredOption("--uri <uri>", "Metadata URI (IPFS/HTTP)").option("--platform <platform>", "Launchpad: pumpfun/raydium").option("--raw", "Single-line JSON output").action(async (opts) => {
+  dex.command("create").description("Build unsigned token creation transaction").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--from <address>", "Creator wallet address").requiredOption("--name <name>", "Token name").requiredOption("--symbol <symbol>", "Token symbol").option("--dex <dex>", "Launchpad: pumpfun/raydium", "pumpfun").option("--uri <uri>", "Metadata URI (IPFS/HTTP)").option("--image <url>", "Token image URL").action(async (opts, cmd) => {
     try {
       validateChain(opts.chain);
-      const client = requireWallet();
+      validateAddress(opts.from, opts.chain);
+      const client = createClient();
       const result = await callWithAutoPayment(
         () => client.dex.createToken(opts.chain, {
+          dex: opts.dex,
+          userAddress: opts.from,
           name: opts.name,
           symbol: opts.symbol,
           uri: opts.uri,
-          platform: opts.platform
+          image: opts.image
         })
       );
-      printResult(result, opts.raw);
+      printResult(result, cmd.optsWithGlobals().json);
+    } catch (err) {
+      exitOnError(err);
+    }
+  });
+}
+
+// src/commands/transaction.ts
+var EVM_ONLY_CHAINS = /* @__PURE__ */ new Set(["eth", "bsc"]);
+function validateEvmChain(chain) {
+  validateChain(chain);
+  if (!EVM_ONLY_CHAINS.has(chain)) {
+    throw new Error(`Chain "${chain}" is not supported for this operation. Only EVM chains: ${[...EVM_ONLY_CHAINS].join(", ")}`);
+  }
+}
+function registerTransactionCommands(program2) {
+  const tx = program2.command("tx").description("Transaction broadcast, gas estimation");
+  tx.command("send").description("Broadcast a signed transaction").requiredOption("--chain <chain>", "Chain: sol/bsc/eth").requiredOption("--signed-tx <base64>", "Base64-encoded signed transaction").option("--submit-type <type>", "Submit type: default/priority", "default").option("--anti-mev", "Enable anti-MEV protection").action(async (opts, cmd) => {
+    try {
+      validateChain(opts.chain);
+      const client = createClient();
+      const body = {
+        signedTx: opts.signedTx
+      };
+      if (opts.submitType && opts.submitType !== "default") body.submitType = opts.submitType;
+      if (opts.antiMev) body.options = { isAntiMev: true };
+      const result = await callWithAutoPayment(
+        () => client.transaction.send(opts.chain, body)
+      );
+      printResult(result, cmd.optsWithGlobals().json);
+    } catch (err) {
+      exitOnError(err);
+    }
+  });
+  tx.command("gas-price").description("Get current gas price (EVM only)").requiredOption("--chain <chain>", "Chain: eth/bsc").action(async (opts, cmd) => {
+    try {
+      validateEvmChain(opts.chain);
+      const client = createClient();
+      const result = await callWithAutoPayment(
+        () => client.transaction.getGasPrice(opts.chain)
+      );
+      printResult(result, cmd.optsWithGlobals().json);
+    } catch (err) {
+      exitOnError(err);
+    }
+  });
+  tx.command("estimate-gas").description("Estimate gas limit for a transaction (EVM only)").requiredOption("--chain <chain>", "Chain: eth/bsc").requiredOption("--from <address>", "From address").requiredOption("--to <address>", "To address").requiredOption("--data <hex>", "Transaction data (hex)").option("--value <hex>", "Value in wei (hex string)", "0x0").action(async (opts, cmd) => {
+    try {
+      validateEvmChain(opts.chain);
+      const client = createClient();
+      const body = {
+        from: opts.from,
+        to: opts.to,
+        data: opts.data
+      };
+      if (opts.value && opts.value !== "0x0") body.value = opts.value;
+      const result = await callWithAutoPayment(
+        () => client.transaction.getGasLimit(opts.chain, body)
+      );
+      printResult(result, cmd.optsWithGlobals().json);
     } catch (err) {
       exitOnError(err);
     }
@@ -1245,8 +1354,9 @@ function registerDexCommands(program2) {
 // src/commands/job.ts
 function registerJobCommands(program2) {
   const job = program2.command("job").description("Job status polling");
-  job.command("status").description("Check job status").requiredOption("--id <jobId>", "Job ID").option("--wait", "Wait for job completion via SSE").option("--timeout <ms>", "Wait timeout in milliseconds", "60000").option("--raw", "Single-line JSON output").action(async (opts) => {
+  job.command("status").description("Check job status").requiredOption("--id <jobId>", "Job ID").option("--wait", "Wait for job completion via SSE").option("--timeout <ms>", "Wait timeout in milliseconds", "60000").action(async (opts, cmd) => {
     try {
+      const json = cmd.optsWithGlobals().json;
       const client = createClient();
       if (opts.wait) {
         process.stderr.write(`Waiting for job ${opts.id}...
@@ -1254,12 +1364,12 @@ function registerJobCommands(program2) {
         const result = await callWithAutoPayment(
           () => client.waitForJob(opts.id, Number(opts.timeout))
         );
-        printResult(result, opts.raw);
+        printResult(result, json);
       } else {
         const result = await callWithAutoPayment(
           () => client.job.get(opts.id)
         );
-        printResult(result, opts.raw);
+        printResult(result, json);
       }
     } catch (err) {
       exitOnError(err);
@@ -1328,7 +1438,7 @@ function saveKey(keyPair, profile = DEFAULT_PROFILE) {
 // src/commands/auth.ts
 init_turnkey();
 init_constants();
-import * as readline4 from "readline/promises";
+import * as readline3 from "readline/promises";
 async function resolveAndStoreAddresses(turnkeyCreds) {
   process.stderr.write("Resolving wallet addresses...\n");
   const [evmAddress, solanaAddress] = await Promise.all([
@@ -1358,14 +1468,22 @@ function registerAuthCommands(program2) {
       exitOnError(err);
     }
   });
-  program2.command("logout").description("Clear session (P-256 keys preserved)").action(() => {
+  program2.command("logout").description("Clear session (P-256 keys preserved)").action((_opts, cmd) => {
+    const json = cmd.optsWithGlobals().json;
     const config = loadConfig();
-    if (config.turnkey) {
+    const wasLoggedIn = !!config.turnkey;
+    if (wasLoggedIn) {
       updateConfig({ turnkey: void 0 });
-      process.stdout.write("Logged out. P-256 keys preserved in ~/.config/chainstream/keys/\n");
-      process.stdout.write("Run 'chainstream login' to re-authenticate.\n");
+    }
+    if (json) {
+      printResult({ success: true, wasLoggedIn }, true);
     } else {
-      process.stdout.write("Not logged in via Turnkey.\n");
+      if (wasLoggedIn) {
+        process.stdout.write("Logged out. P-256 keys preserved in ~/.config/chainstream/keys/\n");
+        process.stdout.write("Run 'chainstream login' to re-authenticate.\n");
+      } else {
+        process.stdout.write("Not logged in via Turnkey.\n");
+      }
     }
   });
   program2.command("bind-email").description("Bind an email to your wallet (for account recovery)").argument("[email]", "Email address to bind").action(async (emailArg) => {
@@ -1526,7 +1644,7 @@ async function doKeyLogin() {
 }
 async function doEmailLogin(email) {
   if (!email) {
-    const rl2 = readline4.createInterface({ input: process.stdin, output: process.stderr });
+    const rl2 = readline3.createInterface({ input: process.stdin, output: process.stderr });
     email = await rl2.question("Enter your email: ");
     rl2.close();
     if (!email?.trim()) throw new Error("Email required.");
@@ -1542,7 +1660,7 @@ async function doEmailLogin(email) {
 `);
     return;
   }
-  const rl = readline4.createInterface({ input: process.stdin, output: process.stderr });
+  const rl = readline3.createInterface({ input: process.stdin, output: process.stderr });
   const code = await rl.question("Enter OTP code: ");
   rl.close();
   if (!code?.trim()) throw new Error("OTP code required.");
@@ -1591,7 +1709,7 @@ async function doBindEmail(email) {
     throw new Error("No wallet found. Run 'chainstream login' first.");
   }
   if (!email) {
-    const rl2 = readline4.createInterface({ input: process.stdin, output: process.stderr });
+    const rl2 = readline3.createInterface({ input: process.stdin, output: process.stderr });
     email = await rl2.question("Enter email to bind: ");
     rl2.close();
     if (!email?.trim()) throw new Error("Email required.");
@@ -1607,7 +1725,7 @@ async function doBindEmail(email) {
 `);
     return;
   }
-  const rl = readline4.createInterface({ input: process.stdin, output: process.stderr });
+  const rl = readline3.createInterface({ input: process.stdin, output: process.stderr });
   const code = await rl.question("Enter verification code: ");
   rl.close();
   if (!code?.trim()) throw new Error("Verification code required.");
@@ -1628,70 +1746,60 @@ async function doBindEmail(email) {
 init_config();
 function registerConfigCommands(program2) {
   const config = program2.command("config").description("Configuration management");
-  config.command("set").description("Set a configuration value").requiredOption("--key <key>", "Config key (apiKey, baseUrl)").requiredOption("--value <value>", "Config value").action((opts) => {
+  config.command("set").description("Set a configuration value").requiredOption("--key <key>", "Config key (apiKey, baseUrl)").requiredOption("--value <value>", "Config value").action((opts, cmd) => {
     try {
+      const json = cmd.optsWithGlobals().json;
       const allowedKeys = ["apiKey", "baseUrl", "walletChain"];
       if (!allowedKeys.includes(opts.key)) {
         throw new Error(`Invalid key "${opts.key}". Allowed: ${allowedKeys.join(", ")}`);
       }
       updateConfig({ [opts.key]: opts.value });
-      process.stdout.write(`Set ${opts.key} = ${opts.key === "apiKey" ? "***" : opts.value}
-`);
+      printResult({ key: opts.key, value: opts.key === "apiKey" ? "(set)" : opts.value }, json);
     } catch (err) {
       exitOnError(err);
     }
   });
-  config.command("get").description("Show configuration").option("--key <key>", "Specific key to show").action((opts) => {
+  config.command("get").description("Show configuration").option("--key <key>", "Specific key to show").action((opts, cmd) => {
     try {
+      const json = cmd.optsWithGlobals().json;
       const cfg = loadConfig();
       if (opts.key) {
         const value = cfg[opts.key];
-        if (value === void 0) {
-          process.stdout.write(`${opts.key}: (not set)
-`);
-        } else if (opts.key === "apiKey" && typeof value === "string") {
-          process.stdout.write(`${opts.key}: ${value.slice(0, 8)}...${value.slice(-4)}
-`);
-        } else {
-          process.stdout.write(`${opts.key}: ${JSON.stringify(value)}
-`);
-        }
+        const displayValue = value === void 0 ? null : opts.key === "apiKey" && typeof value === "string" ? `${value.slice(0, 8)}...${value.slice(-4)}` : value;
+        printResult({ key: opts.key, value: displayValue }, json);
       } else {
         const display = {
-          apiKey: cfg.apiKey ? `${cfg.apiKey.slice(0, 8)}...` : void 0,
+          apiKey: cfg.apiKey ? `${cfg.apiKey.slice(0, 8)}...` : null,
           baseUrl: cfg.baseUrl,
-          walletMode: getWalletMode(cfg),
-          turnkey: cfg.turnkey ? { organizationId: cfg.turnkey.organizationId } : void 0,
-          rawWallet: cfg.rawWallet ? { chain: cfg.rawWallet.chain } : void 0
+          walletMode: getWalletMode(cfg) ?? null,
+          walletChain: cfg.walletChain ?? null
         };
-        process.stdout.write(JSON.stringify(display, null, 2) + "\n");
+        printResult(display, json);
       }
     } catch (err) {
       exitOnError(err);
     }
   });
-  config.command("auth").description("Show current authentication status").action(() => {
+  config.command("auth").description("Show current authentication status").action((_opts, cmd) => {
     try {
+      const json = cmd.optsWithGlobals().json;
       const cfg = loadConfig();
       const mode = getWalletMode(cfg);
+      const status = { mode: mode ?? "none" };
       if (mode === "turnkey") {
-        process.stdout.write(`Auth: Turnkey (org: ${cfg.turnkey.organizationId})
-`);
-        const expiry = new Date(cfg.turnkey.sessionExpiry * 1e3);
+        status.organizationId = cfg.turnkey.organizationId;
+        status.evmAddress = cfg.turnkey.evmAddress ?? null;
+        status.solanaAddress = cfg.turnkey.solanaAddress ?? null;
         const expired = Date.now() > cfg.turnkey.sessionExpiry * 1e3;
-        process.stdout.write(`Session: ${expired ? "expired" : "active"} (expires: ${expiry.toISOString()})
-`);
+        status.session = expired ? "expired" : "active";
+        status.sessionExpiry = new Date(cfg.turnkey.sessionExpiry * 1e3).toISOString();
       } else if (mode === "raw") {
-        process.stdout.write(`Auth: Raw Key (${cfg.rawWallet.chain})
-`);
+        status.chain = cfg.rawWallet.chain;
       } else if (cfg.apiKey) {
-        process.stdout.write(`Auth: API Key (${cfg.apiKey.slice(0, 8)}...)
-`);
-      } else {
-        process.stdout.write("Auth: Not configured\n");
-        process.stdout.write("  Run: chainstream login           # Turnkey wallet\n");
-        process.stdout.write("  Run: chainstream config set --key apiKey --value <key>  # API key\n");
+        status.mode = "apiKey";
+        status.apiKey = `${cfg.apiKey.slice(0, 8)}...`;
       }
+      printResult(status, json);
     } catch (err) {
       exitOnError(err);
     }
@@ -1700,11 +1808,12 @@ function registerConfigCommands(program2) {
 
 // src/index.ts
 var program = new Command();
-program.name("chainstream").version("0.1.0").description("ChainStream CLI \u2014 on-chain data and DeFi execution for AI agents");
+program.name("chainstream").version("0.0.19").description("ChainStream CLI \u2014 on-chain data and DeFi execution for AI agents").option("--json", "Output as single-line JSON (machine-readable)");
 registerTokenCommands(program);
 registerMarketCommands(program);
 registerWalletCommands(program);
 registerDexCommands(program);
+registerTransactionCommands(program);
 registerJobCommands(program);
 registerAuthCommands(program);
 registerConfigCommands(program);