@trustwallet/cli 0.6.9 → 0.6.11

package/dist/commands/alert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alert.d.ts","sourceRoot":"","sources":["../../src/commands/alert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuI3D"}
+{"version":3,"file":"alert.d.ts","sourceRoot":"","sources":["../../src/commands/alert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoL3D"}

package/dist/commands/erc20.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"erc20.d.ts","sourceRoot":"","sources":["../../src/commands/erc20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA8K3D"}
+{"version":3,"file":"erc20.d.ts","sourceRoot":"","sources":["../../src/commands/erc20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAgL3D"}

package/dist/commands/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/commands/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmBpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAshB3D"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/commands/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmBpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAskB3D"}

package/dist/commands/swap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swap.d.ts","sourceRoot":"","sources":["../../src/commands/swap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA8O1D"}
+{"version":3,"file":"swap.d.ts","sourceRoot":"","sources":["../../src/commands/swap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkS1D"}

package/dist/commands/wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/commands/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4BpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA+sB5D"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/commands/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4BpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA8tB5D"}

package/dist/config-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../src/config-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,cAAc,EAAwB,MAAM,YAAY,CAAC;AAEpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGnD,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,gBAAgB,IAAI,cAAc,CAWjD;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAiB3D;AAED,wBAAsB,SAAS,IAAI,OAAO,CAAC,cAAc,CAAC,CAGzD;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAQ3D;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,mBAAmB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAef;AAED,wBAAsB,eAAe,CAAC,IAAI,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAgBnF"}
+{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../src/config-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,cAAc,EAAwB,MAAM,YAAY,CAAC;AAEpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAYnD,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,gBAAgB,IAAI,cAAc,CAWjD;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAiB3D;AAED,wBAAsB,SAAS,IAAI,OAAO,CAAC,cAAc,CAAC,CAGzD;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAQ3D;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,mBAAmB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAef;AAED,wBAAsB,eAAe,CAAC,IAAI,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAgBnF"}

package/dist/index.js

@@ -6167,6 +6167,9 @@ function patchNodeStubs() {
       parsed.pathname = `/naas/session/${_naasSessionId}${parsed.pathname}`;
       resolvedUrl = parsed.toString();
     }
+    if (resolvedUrl.includes("aag") || resolvedUrl.includes("account-abstraction")) {
+      console.error("[AAG]", init3?.method || "GET", resolvedUrl.slice(0, 200));
+    }
     if (resolvedUrl.includes("gateway.us.trustwallet.com")) {
       resolvedUrl = resolvedUrl.replace("gateway.us.trustwallet.com", "tws.trustwallet.com");
     }
@@ -6406,7 +6409,7 @@ function registerShutdownHandlers(providers, onBeforeExit) {
     process.removeListener("SIGTERM", handler);
   };
 }
-var fs2, path2, import_trust_sdk, import_trust_sdk2, import_trust_sdk3, import_trust_sdk4, import_crypto2, __require2, polyfillsApplied, _credentials, _naasSessionId, nodeStubsPatched, NAAS_SESSION_RE, naasSessionPatched, coinTypeByValue, walletCore, initialized, BlockchainClient, WalletCoreSigner, domainsByCoinId, GATEWAY_URL, WALLET_ID_SUFFIX, WALLET_ID_LENGTH, EVM_COIN_IDS, MAINTAINED_COIN_IDS, WalletProvider, AgentWalletProvider, SHUTDOWN_TIMEOUT_MS;
+var fs2, path2, import_trust_sdk, import_trust_sdk2, import_trust_sdk3, import_trust_sdk4, import_crypto2, __require2, polyfillsApplied, _credentials, _naasSessionId, nodeStubsPatched, NAAS_SESSION_RE, naasSessionPatched, coinTypeByValue, walletCore, initialized, SPONSORED_RPC, BlockchainClient, WalletCoreSigner, domainsByCoinId, GATEWAY_URL, WALLET_ID_SUFFIX, WALLET_ID_LENGTH, EVM_COIN_IDS, MAINTAINED_COIN_IDS, WalletProvider, AgentWalletProvider, SHUTDOWN_TIMEOUT_MS;
 var init_dist3 = __esm({
   "../wallet-core/dist/index.mjs"() {
     "use strict";
@@ -6436,7 +6439,11 @@ var init_dist3 = __esm({
     coinTypeByValue = null;
     walletCore = null;
     initialized = false;
-    BlockchainClient = class {
+    SPONSORED_RPC = {
+      20000714: "https://bsc-sponsored.twnodes.com",
+      60: "https://ethereum-sponsored.twnodes.com"
+    };
+    BlockchainClient = class _BlockchainClient {
       signer;
       constructor(signer) {
         this.signer = signer;
@@ -6553,14 +6560,15 @@ var init_dist3 = __esm({
         const asset = contractAddress ? new import_trust_sdk2.Asset.Token(account, contractAddress, tokenTypeForCoinId(coinId)) : new import_trust_sdk2.Asset.Coin(account);
         const decimals = params.decimals !== void 0 ? params.decimals : contractAddress ? resolveToken(params.assetId, chainKey).decimals : getCoinDecimals(coinId);
         const amountWei = humanAmountToWei(params.amount, decimals);
-        const transaction = new import_trust_sdk2.TransactionTransfer(
+        let transaction = new import_trust_sdk2.TransactionTransfer(
           params.to,
           asset,
           amountWei.toString(),
           false,
           params.memo || null
         );
-        const fee = await import_trust_sdk2.BlockchainService.calculateFee(transaction);
+        const { fee, transaction7702 } = await this.calculateFeeWithSponsorship(transaction, account, coinId);
+        if (transaction7702) transaction = transaction7702;
         const nonce = await import_trust_sdk2.BlockchainService.fetchNonce(account);
         let encodedTx;
         try {
@@ -6584,7 +6592,7 @@ var init_dist3 = __esm({
             }
           }
         }
-        const hash = await import_trust_sdk2.BlockchainService.sendTransactionV2(chain2, encodedTx);
+        const hash = await this.sendTransactionWithSponsorship(chain2, encodedTx, coinId);
         return { hash, chainKey };
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -6602,13 +6610,14 @@ var init_dist3 = __esm({
         const account = this.getAccountFromSigner(chainKey);
         const asset = new import_trust_sdk2.Asset.Token(account, contractAddress, tokenTypeForCoinId(coinId));
         const approveData = this.encodeApproveCalldata(params.spender, params.amount);
-        const transaction = new import_trust_sdk2.TransactionSmartContract(
+        let transaction = new import_trust_sdk2.TransactionSmartContract(
           asset,
           contractAddress,
           "0",
           approveData
         );
-        const fee = await import_trust_sdk2.BlockchainService.calculateFee(transaction);
+        const { fee, transaction7702 } = await this.calculateFeeWithSponsorship(transaction, account, coinId);
+        if (transaction7702) transaction = transaction7702;
         const nonce = await import_trust_sdk2.BlockchainService.fetchNonce(account);
         let encodedTx;
         try {
@@ -6632,7 +6641,7 @@ var init_dist3 = __esm({
             }
           }
         }
-        const hash = await import_trust_sdk2.BlockchainService.sendTransactionV2(chain2, encodedTx);
+        const hash = await this.sendTransactionWithSponsorship(chain2, encodedTx, coinId);
         return { hash, chainKey };
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -6647,8 +6656,9 @@ var init_dist3 = __esm({
         const account = this.getAccountFromSigner(chainKey);
         const asset = new import_trust_sdk2.Asset.Coin(account);
         const valueWei = params.value && params.value !== "0x0" && params.value !== "0x" ? BigInt(params.value).toString() : "0";
-        const transaction = new import_trust_sdk2.TransactionSmartContract(asset, params.to, valueWei, params.data);
-        const fee = await import_trust_sdk2.BlockchainService.calculateFee(transaction);
+        let transaction = new import_trust_sdk2.TransactionSmartContract(asset, params.to, valueWei, params.data);
+        const { fee, transaction7702 } = await this.calculateFeeWithSponsorship(transaction, account, coinId);
+        if (transaction7702) transaction = transaction7702;
         const nonce = await import_trust_sdk2.BlockchainService.fetchNonce(account);
         let encodedTx;
         try {
@@ -6667,7 +6677,7 @@ var init_dist3 = __esm({
             }
           }
         }
-        const hash = await import_trust_sdk2.BlockchainService.sendTransactionV2(chain2, encodedTx);
+        const hash = await this.sendTransactionWithSponsorship(chain2, encodedTx, coinId);
         return { hash, chainKey };
       }
       async getAllowance(params) {
@@ -6828,6 +6838,193 @@ var init_dist3 = __esm({
         const chain2 = new import_trust_sdk2.DefinedChain(ct5);
         await import_trust_sdk2.BlockchainService.setNode(chain2, new import_trust_sdk2.Node(rpcUrl));
       }
+      // EIP-7702 sponsorship-eligible chain coin IDs
+      static SPONSORABLE_COINS = [60, 20000714];
+      /**
+       * Build the sponsored RPC URL with NaaS session if available.
+       */
+      getSponsoredRpcUrl(coinId) {
+        const base3 = SPONSORED_RPC[coinId];
+        if (!base3) return void 0;
+        const sessionId = process.env.TWAK_NAAS_SESSION_ID;
+        return sessionId ? `${base3}/naas/session/${sessionId}/` : base3;
+      }
+      /**
+       * Try sending via sponsored RPC first (checks pm_isSponsorable, then
+       * eth_sendRawTransaction). Falls back to regular BlockchainService.
+       */
+      async sendTransactionWithSponsorship(chain2, encodedTx, coinId) {
+        const sponsoredUrl = this.getSponsoredRpcUrl(coinId);
+        if (sponsoredUrl) {
+          try {
+            let rlpStart = 0;
+            if (encodedTx[0] === 10) {
+              let offset = 1;
+              while (offset < encodedTx.length && (encodedTx[offset] & 128) !== 0) offset++;
+              offset++;
+              rlpStart = offset;
+            }
+            const rawRlp = "0x" + Array.from(encodedTx.slice(rlpStart)).map((b3) => b3.toString(16).padStart(2, "0")).join("");
+            const resp = await fetch(sponsoredUrl, {
+              method: "POST",
+              headers: { "Content-Type": "application/json" },
+              body: JSON.stringify({ id: 0, jsonrpc: "2.0", method: "eth_sendRawTransaction", params: [rawRlp] }),
+              signal: AbortSignal.timeout(3e4)
+            });
+            const json = await resp.json();
+            if (json.result) return json.result;
+          } catch {
+          }
+        }
+        return import_trust_sdk2.BlockchainService.sendTransactionV2(chain2, encodedTx);
+      }
+      // Known stablecoins to try as gas payment tokens when getSupportedTokens returns empty
+      static FALLBACK_GAS_TOKENS = {
+        20000714: [
+          // BSC
+          "0x55d398326f99059fF775485246999027B3197955",
+          // USDT
+          "0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d"
+          // USDC
+        ],
+        60: [
+          // ETH
+          "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+          // USDT
+          "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+          // USDC
+        ]
+      };
+      /**
+       * Find a token the wallet holds that can pay for gas on this chain.
+       * Tries SmartWalletConfig.getSupportedTokens() first, then falls back
+       * to known stablecoins (USDT/USDC).
+       */
+      async findGasToken(account, coinId) {
+        const ct5 = requireCoinType(coinId);
+        const chain2 = new import_trust_sdk2.DefinedChain(ct5);
+        const candidates = [];
+        try {
+          const supportedTokens = await import_trust_sdk2.SmartWalletConfig.getSupportedTokens(chain2);
+          if (supportedTokens?.length) {
+            for (const t of supportedTokens) {
+              if (t.address) candidates.push(t.address);
+            }
+          }
+        } catch {
+        }
+        const seen = new Set(candidates.map((a3) => a3.toLowerCase()));
+        for (const addr of _BlockchainClient.FALLBACK_GAS_TOKENS[coinId] || []) {
+          if (!seen.has(addr.toLowerCase())) candidates.push(addr);
+        }
+        if (candidates.length === 0) return void 0;
+        const tokenAssets = candidates.map((addr) => new import_trust_sdk2.Asset.Token(account, addr, import_trust_sdk2.TokenType.Erc20));
+        try {
+          const balances = await import_trust_sdk2.BlockchainService.loadBalances(ct5, tokenAssets);
+          for (let i2 = 0; i2 < balances.length; i2++) {
+            const avail = balances[i2]?.balances?.find(
+              (b3) => b3.type === import_trust_sdk2.BalanceType.Available
+            );
+            if (avail && BigInt(avail.amount || "0") > 0n) {
+              return tokenAssets[i2];
+            }
+          }
+        } catch {
+        }
+        return void 0;
+      }
+      /**
+       * Calculate fee, falling back to EIP-7702 smart wallet sponsorship
+       * when the wallet can't afford native gas (BSC/ETH only).
+       *
+       * Sets is7702=true and energy=tokenAsset on the transaction so the
+       * Trust SDK routes through the Smart Wallet fee service internally.
+       */
+      async calculateFeeWithSponsorship(transaction, account, coinId) {
+        if (!_BlockchainClient.SPONSORABLE_COINS.includes(coinId)) {
+          return { fee: await import_trust_sdk2.BlockchainService.calculateFee(transaction) };
+        }
+        let supports7702 = false;
+        try {
+          const ct5 = requireCoinType(coinId);
+          supports7702 = await import_trust_sdk2.SmartWalletConfig.supports7702(ct5);
+        } catch {
+        }
+        if (!supports7702) {
+          return { fee: await import_trust_sdk2.BlockchainService.calculateFee(transaction) };
+        }
+        const fee = await import_trust_sdk2.BlockchainService.calculateFee(transaction);
+        const feeAmount = BigInt(fee.amount || "0");
+        if (feeAmount <= 0n) return { fee };
+        let canAfford = true;
+        try {
+          const ct5 = requireCoinType(coinId);
+          const energy = new import_trust_sdk2.Asset.Coin(account);
+          const balanceResults = await import_trust_sdk2.BlockchainService.loadBalances(ct5, [energy]);
+          const available = balanceResults[0]?.balances?.find(
+            (b3) => b3.type === import_trust_sdk2.BalanceType.Available
+          );
+          const nativeBalance = BigInt(available?.amount || "0");
+          canAfford = nativeBalance >= feeAmount;
+        } catch {
+          canAfford = false;
+        }
+        if (canAfford) return { fee };
+        const nativeEnergy = new import_trust_sdk2.Asset.Coin(account);
+        let tx7702 = transaction;
+        if (transaction instanceof import_trust_sdk2.TransactionSmartContract) {
+          tx7702 = transaction.copy(void 0, void 0, void 0, void 0, nativeEnergy, true);
+        } else if (transaction instanceof import_trust_sdk2.TransactionTransfer) {
+          tx7702 = transaction.copy(void 0, void 0, void 0, void 0, void 0, void 0, nativeEnergy, true);
+        } else if (transaction instanceof import_trust_sdk2.TransactionTrade) {
+          tx7702 = transaction.copy(void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, nativeEnergy, true);
+        }
+        let baseFee;
+        try {
+          baseFee = await import_trust_sdk2.BlockchainService.calculateFee(tx7702);
+          process.stderr.write(`[7702] baseFee ok, amount:${baseFee.amount} type:${baseFee.constructor?.name}
+`);
+        } catch (e2) {
+          process.stderr.write(`[7702] baseFee FAILED: ${e2 instanceof Error ? e2.message : String(e2)}
+`);
+          return { fee };
+        }
+        const userOpData = baseFee.data;
+        if (!userOpData) {
+          return { fee: baseFee, transaction7702: tx7702 };
+        }
+        const gasToken = await this.findGasToken(account, coinId);
+        if (!gasToken) {
+          return { fee: baseFee, transaction7702: tx7702 };
+        }
+        try {
+          const int8Data = typeof userOpData === "string" ? new Int8Array(Buffer.from(userOpData.replace("0x", ""), "hex")) : new Int8Array(userOpData);
+          const { EthereumAaService } = await import("@trustwallet-trust-sdk/trust-sdk");
+          const paymasters = await EthereumAaService.getFeeQuotes(
+            tx7702,
+            nativeEnergy,
+            int8Data,
+            [gasToken]
+          );
+          if (paymasters && paymasters.length > 0) {
+            const finalFee = await EthereumAaService.simulatePaymasterTransaction(
+              tx7702,
+              paymasters[0]
+            );
+            let txWithToken = transaction;
+            if (transaction instanceof import_trust_sdk2.TransactionSmartContract) {
+              txWithToken = transaction.copy(void 0, void 0, void 0, void 0, gasToken, true);
+            } else if (transaction instanceof import_trust_sdk2.TransactionTransfer) {
+              txWithToken = transaction.copy(void 0, void 0, void 0, void 0, void 0, void 0, gasToken, true);
+            } else if (transaction instanceof import_trust_sdk2.TransactionTrade) {
+              txWithToken = transaction.copy(void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, void 0, gasToken, true);
+            }
+            return { fee: finalFee, transaction7702: txWithToken };
+          }
+        } catch {
+        }
+        return { fee: baseFee, transaction7702: tx7702 };
+      }
       getAccountFromSigner(chainKey) {
         if (!this.signer) {
           throw new Error("BlockchainClient requires a signer for this operation");
@@ -12616,7 +12813,17 @@ var init_dist5 = __esm({
         } catch (err) {
           const msg = err instanceof Error ? err.message : String(err);
           const details = err?.details;
-          const detailsStr = details ? JSON.stringify(details) : "";
+          let detailsStr = "";
+          if (details != null) {
+            try {
+              detailsStr = JSON.stringify(details);
+            } catch {
+              try {
+                detailsStr = String(details);
+              } catch {
+              }
+            }
+          }
           if (msg.includes("GraphQL") || msg.includes("Failed to decode") || detailsStr.includes("GraphQL") || detailsStr.includes("Failed to decode")) {
             return { valid: false, message: "Invalid address format" };
           }
@@ -22167,6 +22374,12 @@ var import_chalk2 = __toESM(require_source());
 init_dist2();
 init_dist4();
 init_dist();
+var EMBEDDED_NAAS_SESSION_ID = "NDVjMWRjY2MtYTYwNy00NGNhLWIxZGUtMmJiZDIyNmEyODQ4";
+function resolveNaasSessionId() {
+  if (process.env.TWAK_NAAS_SESSION_ID) return process.env.TWAK_NAAS_SESSION_ID;
+  if (EMBEDDED_NAAS_SESSION_ID && !EMBEDDED_NAAS_SESSION_ID.startsWith("__")) return EMBEDDED_NAAS_SESSION_ID;
+  return void 0;
+}
 async function getCredentials() {
   const envAccessId = process.env.TWAK_ACCESS_ID;
   const envSecret = process.env.TWAK_HMAC_SECRET;
@@ -22191,7 +22404,7 @@ async function ensureTrustSDK() {
   await initTrustSDK({
     accessId: creds.accessId,
     hmacSecret: creds.hmacSecret,
-    naasSessionId: process.env.TWAK_NAAS_SESSION_ID
+    naasSessionId: resolveNaasSessionId()
   });
   return creds;
 }
@@ -38907,6 +39120,7 @@ ${qr3}`;
     const result = {
       agentWallet: exists ? "configured" : "not configured",
       keychainPassword: keychainHasPassword ? "stored" : "not stored",
+      chains: totalChains,
       supportedChains: totalChains,
       ...createdAt ? { createdAt } : {},
       ...addressCount !== void 0 ? { addressCount } : {}
@@ -38940,6 +39154,18 @@ ${qr3}`;
         return [{ chainKey, chain: chain2, address: addrEntry.address }];
       });
       const suppress = (fn2) => fn2();
+      const pMap = async (items, fn2, concurrency) => {
+        const results = new Array(items.length);
+        let idx = 0;
+        const run = async () => {
+          while (idx < items.length) {
+            const i2 = idx++;
+            results[i2] = await fn2(items[i2]);
+          }
+        };
+        await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, () => run()));
+        return results;
+      };
       const toHuman = (raw, decimals) => {
         const big = BigInt(raw);
         const div = 10n ** BigInt(decimals);
@@ -38950,14 +39176,14 @@ ${qr3}`;
       };
       const holdingsAssets = chainEntries.map(({ chain: chain2, address }) => ({ coin: chain2.coinId, address }));
       const [nativeResults, holdings] = await Promise.all([
-        Promise.all(chainEntries.map(async ({ chainKey, chain: chain2, address }) => {
+        pMap(chainEntries, async ({ chainKey, chain: chain2, address }) => {
           try {
             const balance = await suppress(() => blockchainClient.getBalance(`c${chain2.coinId}`, address));
             return { chainKey, chain: chain2, address, balance };
           } catch {
             return { chainKey, chain: chain2, address, balance: null };
           }
-        })),
+        }, 5),
         (async () => {
           try {
             return await new SecurityService2(httpClient).getTokenHoldings(holdingsAssets);
@@ -38988,7 +39214,7 @@ ${qr3}`;
           if (t.contract) tokenJobs.push({ chainKey, coinId: chain2.coinId, address, ...t });
         }
       }
-      const tokenBalances = await Promise.all(tokenJobs.map(async (job) => {
+      const tokenBalances = await pMap(tokenJobs, async (job) => {
         const fallback = job.balance ?? "0";
         try {
           const assetId = `c${job.coinId}_t${job.contract}`;
@@ -38997,7 +39223,7 @@ ${qr3}`;
         } catch {
           return { ...job, rawBalance: fallback };
         }
-      }));
+      }, 5);
       const nativeAssetIds = nativeResults.map(({ chain: chain2 }) => `c${chain2.coinId}`);
       const nonZeroTokens = tokenBalances.filter((t) => {
         const dec = t.decimals ?? 18;
@@ -39502,6 +39728,55 @@ function registerSwapCommand(program3) {
       const transactions = await swapClient.getSwapTransactions(route);
       let txHash = "";
       const blockchainClient = provider.getBlockchainClient();
+      const hasApprovalTx = transactions.some((t) => t.transaction.type === "approval");
+      if (!hasApprovalTx && chainConfig?.isEVM) {
+        const stepApproval = firstStep.approval;
+        if (stepApproval && stepApproval.operatorAddress) {
+          const fromAssetAddr = firstStep.from.asset.address;
+          const isNative = !fromAssetAddr || fromAssetAddr === NATIVE_TOKEN_ADDRESS;
+          if (!isNative && chainConfig.coinId) {
+            const assetId = formatTokenId(chainConfig.coinId, fromAssetAddr);
+            try {
+              const allowance = await blockchainClient.getAllowance({
+                assetId,
+                owner: walletAddress,
+                spender: stepApproval.operatorAddress
+              });
+              const requiredAmount = BigInt(stepApproval.minAmount || parsedAmount);
+              if (allowance < requiredAmount) {
+                info("Sending token approval...");
+                const hdWallet = provider.getSigner().getHDWallet();
+                const approveResult = await blockchainClient.approve({
+                  assetId,
+                  spender: stepApproval.operatorAddress,
+                  amount: requiredAmount.toString(),
+                  hdWallet
+                });
+                info(`Approval tx: ${getExplorerTxUrl(fromChain, approveResult.hash)}`);
+                const approvalDeadline = Date.now() + 6e4;
+                while (Date.now() < approvalDeadline) {
+                  await new Promise((r3) => setTimeout(r3, 2e3));
+                  try {
+                    const status = await blockchainClient.findTransactionStatus(fromChain, walletAddress, approveResult.hash);
+                    if (status.confirmed) break;
+                    if (status.failed) throw new Error("Approval transaction failed");
+                  } catch (e2) {
+                    const err = e2 instanceof Error ? e2 : new Error(String(e2));
+                    if (err.message.startsWith("Approval transaction failed")) throw err;
+                  }
+                }
+              }
+            } catch (e2) {
+              const msg = e2 instanceof Error ? e2.message : String(e2);
+              if (msg.includes("insufficient funds")) {
+                throw new Error(`Insufficient ${chainConfig?.symbol || "native token"} for approval gas. Fund your wallet with ${chainConfig?.symbol || "native tokens"} first.`);
+              }
+              if (msg.includes("failed")) throw e2;
+              info(`Warning: could not check/send approval: ${msg}`);
+            }
+          }
+        }
+      }
       const pollForConfirmation = async (hash, timeoutMs) => {
         const deadline = Date.now() + timeoutMs;
         while (Date.now() < deadline) {
@@ -39574,10 +39849,11 @@ init_dist2();
 init_dist4();
 function registerErc20Command(program3) {
   const erc20 = program3.command("erc20").description("ERC-20 token operations");
-  erc20.command("approve").description("Approve a spender for token spending").requiredOption("--token <assetId>", "Token asset ID (e.g., c60_t0xA0b8...)").requiredOption("--spender <address>", "Spender address").requiredOption("--amount <n>", 'Amount to approve (in smallest unit, or "unlimited")').requiredOption("--password <password>", "Wallet password").option("--confirm-unlimited", "Required when --amount unlimited to acknowledge the security risk").option("--json", "JSON output").action(async (opts) => {
+  erc20.command("approve").description("Approve a spender for token spending").requiredOption("--token <assetId>", "Token asset ID (e.g., c60_t0xA0b8...)").requiredOption("--spender <address>", "Spender address").requiredOption("--amount <n>", 'Amount to approve (in smallest unit, or "unlimited")').option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--confirm-unlimited", "Required when --amount unlimited to acknowledge the security risk").option("--json", "JSON output").action(async (opts) => {
     try {
       await ensureTrustSDK();
-      const provider = await AgentWalletProvider.fromStorage(opts.password);
+      const password = await resolvePassword(opts);
+      const provider = await AgentWalletProvider.fromStorage(password);
       const { coinId, contractAddress } = parseTokenId(opts.token);
       if (!contractAddress) {
         const msg = "Cannot approve native tokens. Provide an ERC-20 asset ID (e.g., c60_t0xA0b8...)";
@@ -39637,10 +39913,11 @@ function registerErc20Command(program3) {
     }
     process.exit();
   });
-  erc20.command("revoke").description("Revoke token approval (set allowance to 0)").requiredOption("--token <assetId>", "Token asset ID (e.g., c60_t0xA0b8...)").requiredOption("--spender <address>", "Spender address to revoke").requiredOption("--password <password>", "Wallet password").option("--json", "JSON output").action(async (opts) => {
+  erc20.command("revoke").description("Revoke token approval (set allowance to 0)").requiredOption("--token <assetId>", "Token asset ID (e.g., c60_t0xA0b8...)").requiredOption("--spender <address>", "Spender address to revoke").option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--json", "JSON output").action(async (opts) => {
     try {
       await ensureTrustSDK();
-      const provider = await AgentWalletProvider.fromStorage(opts.password);
+      const password = await resolvePassword(opts);
+      const provider = await AgentWalletProvider.fromStorage(password);
       const { coinId, contractAddress } = parseTokenId(opts.token);
       if (!contractAddress) {
         const msg = "Cannot revoke approval for native tokens. Provide an ERC-20 asset ID.";
@@ -39728,7 +40005,7 @@ function resolveTokenLabel(tokenId) {
 function registerAlertCommand(program3) {
   const alert = program3.command("alert").description("Manage price alerts");
   const alertStore = new AlertStore();
-  alert.command("create").description("Create a price alert").requiredOption("--token <tokenId>", "Token ID (e.g., c60, c20000714)").requiredOption("--chain <key>", "Chain key").option("--above <price>", "Alert when price goes above").option("--below <price>", "Alert when price goes below").option("--json", "JSON output").action(async (opts) => {
+  alert.command("create").description("Create a price alert").requiredOption("--token <tokenId>", "Token symbol (e.g., ETH, BTC) or asset ID (e.g., c60)").option("--chain <key>", "Chain key (auto-detected for native tokens like ETH, BNB, SOL)").option("--above <price>", "Alert when price goes above").option("--below <price>", "Alert when price goes below").option("--json", "JSON output").action(async (opts) => {
     const aboveProvided = typeof opts.above !== "undefined";
     const belowProvided = typeof opts.below !== "undefined";
     if (aboveProvided && belowProvided || !aboveProvided && !belowProvided) {
@@ -39745,23 +40022,73 @@ function registerAlertCommand(program3) {
       process.exitCode = 1;
       return;
     }
-    if (!isChainSupported(opts.chain)) {
-      error(`Unknown chain: ${opts.chain}. Run \`twak chains\` to see supported chains.`);
-      if (opts.json) output({ error: `Unknown chain: ${opts.chain}` }, true);
-      process.exitCode = 1;
-      return;
-    }
+    let resolvedTokenId = opts.token;
+    let resolvedChain = opts.chain;
     try {
       parseTokenId(opts.token);
+      if (!resolvedChain) {
+        resolvedChain = tokenIdToChain(opts.token);
+        if (!resolvedChain) {
+          error("Could not detect chain from asset ID. Provide --chain.");
+          if (opts.json) output({ error: "Chain required for this asset ID" }, true);
+          process.exitCode = 1;
+          return;
+        }
+      }
     } catch {
-      error(`Invalid token ID format: ${opts.token}. Expected format: c60 or c60_t0xABC...`);
-      if (opts.json) output({ error: `Invalid token ID: ${opts.token}` }, true);
+      const sym = opts.token.toUpperCase();
+      const NATIVE_SYMBOLS2 = {
+        ETH: "ethereum",
+        BNB: "bsc",
+        SOL: "solana",
+        BTC: "bitcoin",
+        MATIC: "polygon",
+        AVAX: "avalanche",
+        FTM: "fantom",
+        TRX: "tron",
+        DOT: "polkadot",
+        ATOM: "cosmos",
+        NEAR: "near",
+        APT: "aptos",
+        TON: "ton",
+        SUI: "sui",
+        LTC: "litecoin",
+        DOGE: "dogecoin",
+        CELO: "celo",
+        S: "sonic"
+      };
+      if (!resolvedChain && NATIVE_SYMBOLS2[sym]) {
+        resolvedChain = NATIVE_SYMBOLS2[sym];
+      }
+      if (!resolvedChain) {
+        error(`Cannot resolve "${opts.token}" without --chain. Provide --chain or use asset ID format (c60).`);
+        if (opts.json) output({ error: "Chain required" }, true);
+        process.exitCode = 1;
+        return;
+      }
+      const chain2 = getChainById(resolvedChain);
+      if (!chain2) {
+        error(`Unknown chain: ${resolvedChain}. Run \`twak chains\` to see supported chains.`);
+        if (opts.json) output({ error: `Unknown chain: ${resolvedChain}` }, true);
+        process.exitCode = 1;
+        return;
+      }
+      const resolved = resolveToken(sym, resolvedChain);
+      if (resolved.address === NATIVE_TOKEN_ADDRESS || resolved.address === sym) {
+        resolvedTokenId = formatTokenId(chain2.coinId);
+      } else {
+        resolvedTokenId = formatTokenId(chain2.coinId, resolved.address);
+      }
+    }
+    if (!isChainSupported(resolvedChain)) {
+      error(`Unknown chain: ${resolvedChain}. Run \`twak chains\` to see supported chains.`);
+      if (opts.json) output({ error: `Unknown chain: ${resolvedChain}` }, true);
       process.exitCode = 1;
       return;
     }
     const record2 = await alertStore.create({
-      tokenId: opts.token,
-      chainKey: opts.chain,
+      tokenId: resolvedTokenId,
+      chainKey: resolvedChain,
       condition,
       targetPrice
     });
@@ -39902,7 +40229,7 @@ function handleError(err, json) {
   process.exitCode = 1;
 }
 function registerQueryCommand(program3) {
-  program3.command("price <token>").description("Get token price").option("--chain <id>", "Chain").option("--history <period>", "Price history period: hour, day, week, month, year, all").option("--json", "JSON output").action(async (token, opts) => {
+  program3.command("price <token>").description("Get token price").option("--chain <id>", "Chain").option("--history [period]", "Price history period: hour, day, week, month, year, all (default: week)").option("--json", "JSON output").action(async (token, opts) => {
     try {
       const client = await getClient();
       const swapClient = new SwapClient(client);
@@ -39968,7 +40295,8 @@ function registerQueryCommand(program3) {
         process.exitCode = 1;
         return;
       }
-      if (opts.history) {
+      if (opts.history !== void 0) {
+        const period = typeof opts.history === "string" ? opts.history : "week";
         const chainInfo = getChainById(chain2);
         if (!chainInfo) throw new Error(`Unknown chain: ${chain2}`);
         const isNative = !tokenInfo.address || tokenInfo.address === NATIVE_TOKEN_ADDRESS || tokenInfo.address === SOLANA_NATIVE_ADDRESS;
@@ -39977,7 +40305,7 @@ function registerQueryCommand(program3) {
           "GET",
           `/v1/market/charts/${assetId}`,
           void 0,
-          `currency=USD&period=${opts.history}`
+          `currency=USD&period=${period}`
         );
         output({ token: token.toUpperCase(), chain: chain2, priceUsd: price, history: chartData.prices }, opts.json);
         return;
@@ -39992,14 +40320,24 @@ function registerQueryCommand(program3) {
       handleError(err, opts.json);
     }
   });
-  program3.command("search <query>").description("Search for tokens").option("--networks <ids>", "Comma-separated coin IDs").option("--limit <n>", "Max results", "10").option("--json", "JSON output").action(async (query, opts) => {
+  program3.command("search <query>").description("Search for tokens").option("--networks <names>", "Comma-separated chain names or coin IDs (e.g., ethereum,bsc)").option("--limit <n>", "Max results", "10").option("--json", "JSON output").action(async (query, opts) => {
     try {
       const client = await getClient();
       const swapClient = new SwapClient(client);
+      let networks;
+      if (opts.networks) {
+        networks = opts.networks.split(",").map((n4) => {
+          const trimmed = n4.trim();
+          if (/^\d+$/.test(trimmed)) return trimmed;
+          const chain2 = getChainById(trimmed);
+          if (chain2) return String(chain2.coinId);
+          throw new Error(`Unknown network "${trimmed}". Use a supported chain name or numeric coin ID.`);
+        }).join(",");
+      }
       const result = await swapClient.searchTokens({
         query,
         limit: parseInt(opts.limit, 10),
-        ...opts.networks ? { networks: opts.networks } : {}
+        ...networks ? { networks } : {}
       });
       output(result, opts.json);
     } catch (err) {
@@ -40126,9 +40464,19 @@ function registerQueryCommand(program3) {
       }
     }
   });
-  program3.command("balance").description("Get native token balance for an address via NaaS").requiredOption("--address <address>", "Wallet address").requiredOption("--coin <coinId>", "SLIP44 coin ID").option("--json", "JSON output").action(async (opts) => {
+  program3.command("balance").description("Get token balance for an address (native or ERC-20)").requiredOption("--address <address>", "Wallet address").option("--coin <coinId>", "SLIP44 coin ID (for native token)").option("--chain <key>", "Chain key (e.g., ethereum, bsc)").option("--token <address>", "Token contract address (for ERC-20)").option("--json", "JSON output").action(async (opts) => {
     try {
-      const coinId = parseInt(opts.coin);
+      let coinId;
+      if (opts.coin) {
+        coinId = Number(opts.coin);
+        if (!Number.isInteger(coinId)) throw new Error(`Invalid coin ID: ${opts.coin}`);
+      } else if (opts.chain) {
+        const chainInfo = getChainById(opts.chain);
+        if (!chainInfo) throw new Error(`Unknown chain: ${opts.chain}`);
+        coinId = chainInfo.coinId;
+      } else {
+        throw new Error("Provide --coin or --chain");
+      }
       const chain2 = getChainByCoinId(coinId);
       if (!chain2) throw new Error(`Unknown coin ID: ${coinId}`);
       try {
@@ -40142,17 +40490,35 @@ function registerQueryCommand(program3) {
       } catch (err) {
         if (err instanceof Error && err.message.startsWith("Invalid address")) throw err;
       }
+      const assetId = opts.token ? `c${coinId}_t${opts.token}` : `c${coinId}`;
       const client = new BlockchainClient();
-      const balance = await client.getBalance(`c${coinId}`, opts.address);
+      const balance = await client.getBalance(assetId, opts.address);
+      let decimals = chain2.decimals;
+      let symbol = chain2.symbol;
+      if (opts.token) {
+        const apiClient = await getClient();
+        const swapClient = new SwapClient(apiClient);
+        const chainKey = opts.chain || Object.entries(CHAINS).find(([, c3]) => c3.coinId === coinId)?.[0] || "";
+        const tokens = await swapClient.searchTokens({ query: opts.token, chains: [chainKey], limit: 1 });
+        if (tokens.length > 0) {
+          decimals = tokens[0].decimals ?? 18;
+          symbol = tokens[0].symbol ?? opts.token;
+        } else {
+          decimals = 18;
+          symbol = opts.token;
+        }
+      }
       const fmt = (raw) => {
         const big = BigInt(raw);
-        const div = 10n ** BigInt(chain2.decimals);
-        return `${big / div}.${(big % div).toString().padStart(chain2.decimals, "0").slice(0, 6)}`;
+        if (decimals === 0) return big.toString();
+        const div = 10n ** BigInt(decimals);
+        return `${big / div}.${(big % div).toString().padStart(decimals, "0").slice(0, 6)}`;
       };
       output({
         address: opts.address,
         chain: chain2.id,
-        symbol: chain2.symbol,
+        symbol,
+        ...opts.token ? { token: opts.token } : {},
         available: fmt(balance.available),
         ...balance.staked ? { staked: fmt(balance.staked) } : {},
         ...balance.pending ? { pending: fmt(balance.pending) } : {},
@@ -54352,7 +54718,7 @@ var crypto5 = __toESM(require("crypto"));
 // package.json
 var package_default = {
   name: "@trustwallet/cli",
-  version: "0.6.9",
+  version: "0.6.11",
   description: "TWAK CLI \u2014 command-line interface for Trust Wallet Agent Kit",
   main: "dist/index.js",
   types: "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trustwallet/cli",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "TWAK CLI — command-line interface for Trust Wallet Agent Kit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,17 +27,17 @@
     "ora": "5.4.1",
     "tsup": "8.5.1",
     "typescript": "5.7.3",
-    "@twak/actions": "0.6.9",
-    "@twak/blockchain": "0.6.9",
-    "@twak/core": "0.6.9",
-    "@twak/mcp": "0.6.9",
-    "@twak/security": "0.6.9",
-    "@twak/storage": "0.6.9",
-    "@twak/transactions": "0.6.9",
-    "@twak/wallet": "0.6.9",
-    "@twak/walletconnect": "0.6.9",
-    "@twak/wallet-core": "0.6.9",
-    "@twak/swap": "0.6.9"
+    "@twak/core": "0.6.11",
+    "@twak/mcp": "0.6.11",
+    "@twak/security": "0.6.11",
+    "@twak/storage": "0.6.11",
+    "@twak/actions": "0.6.11",
+    "@twak/swap": "0.6.11",
+    "@twak/transactions": "0.6.11",
+    "@twak/wallet": "0.6.11",
+    "@twak/wallet-core": "0.6.11",
+    "@twak/blockchain": "0.6.11",
+    "@twak/walletconnect": "0.6.11"
   },
   "publishConfig": {
     "access": "public"