@trustwallet/cli 0.17.0 → 0.19.0

package/dist/index.js

@@ -3134,6 +3134,7 @@ __export(dist_exports, {
   SOLANA_NATIVE_ADDRESS: () => SOLANA_NATIVE_ADDRESS,
   SWAP_ERROR_CODES: () => SWAP_ERROR_CODES,
   SwapError: () => SwapError,
+  TESTNET_CHAINS: () => TESTNET_CHAINS,
   TRANSFER_ERROR_CODES: () => TRANSFER_ERROR_CODES,
   TransferError: () => TransferError,
   TwakApiError: () => TwakApiError,
@@ -3178,6 +3179,7 @@ __export(dist_exports, {
   isEvmAddress: () => isEvmAddress,
   isNativeTokenId: () => isNativeTokenId,
   isRateLimited: () => isRateLimited,
+  isTestnetChain: () => isTestnetChain,
   isZeroAddress: () => isZeroAddress,
   lookupKnownTokenDecimals: () => lookupKnownTokenDecimals,
   parseAmount: () => parseAmount,
@@ -3200,13 +3202,17 @@ __export(dist_exports, {
 });
 function getChainById(chainKey) {
   const lower = chainKey.toLowerCase();
-  return CHAINS[lower] ?? Object.values(CHAINS).find((c3) => c3.id === lower);
+  return CHAINS[lower] ?? TESTNET_CHAINS[lower] ?? Object.values(CHAINS).find((c3) => c3.id === lower) ?? Object.values(TESTNET_CHAINS).find((c3) => c3.id === lower);
 }
 function getChainByCoinId(coinId) {
   return Object.values(CHAINS).find((chain2) => chain2.coinId === coinId);
 }
 function getChainByEvmId(evmChainId) {
-  return Object.values(CHAINS).find((chain2) => chain2.chainId === evmChainId);
+  return Object.values(CHAINS).find((chain2) => chain2.chainId === evmChainId) ?? Object.values(TESTNET_CHAINS).find((chain2) => chain2.chainId === evmChainId);
+}
+function isTestnetChain(chainKey) {
+  if (!chainKey) return false;
+  return Object.hasOwn(TESTNET_CHAINS, chainKey.toLowerCase());
 }
 function getSupportedChains() {
   return Object.values(CHAINS);
@@ -3231,10 +3237,10 @@ function getChainDomainId(chainKey) {
   if (!entry) throw new Error(`Unsupported chain: ${chainKey}`);
   return entry[1].id;
 }
-function getExplorerTxUrl(chainKey, txHash) {
+function getExplorerTxUrl(chainKey, hash) {
   const chain2 = getChainById(chainKey);
   if (!chain2) return "";
-  return `${chain2.explorerUrl}/tx/${txHash}`;
+  return `${chain2.explorerUrl}/tx/${hash}`;
 }
 function getSampleAccount(chainKey) {
   return getChainById(chainKey)?.sampleAccount || "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045";
@@ -3338,6 +3344,9 @@ function classifyApiError(err) {
     return { code: "NETWORK_ERROR", message: err.message };
   }
   if (err instanceof TwakNetworkError) {
+    if (EXECUTION_REVERTED_RE.test(err.message)) {
+      return { code: "TX_FAILED", message: err.message };
+    }
     return { code: "NETWORK_ERROR", message: err.message };
   }
   if (err instanceof TwakValidationError) {
@@ -3349,6 +3358,9 @@ function classifyApiError(err) {
     }
     return { code: "NETWORK_ERROR", message: err.message };
   }
+  if (err instanceof Error && EXECUTION_REVERTED_RE.test(err.message)) {
+    return { code: "TX_FAILED", message: err.message };
+  }
   return null;
 }
 function classifyStorageError(err) {
@@ -3431,7 +3443,7 @@ function resolveChain(input2) {
   if (colonIdx > 0 && colonIdx < lower.length - 1) {
     const namespace = lower.slice(0, colonIdx);
     const reference = lower.slice(colonIdx + 1);
-    for (const [key, chain2] of Object.entries(CHAINS)) {
+    for (const [key, chain2] of Object.entries(RESOLVABLE_CHAINS)) {
       if (chain2.namespace === namespace && chain2.chainId.toLowerCase() === reference) {
         return key;
       }
@@ -3448,10 +3460,10 @@ function resolveChain(input2) {
       throw chainUnsupported(input2);
     }
   }
-  if (CHAINS[lower]) return lower;
+  if (RESOLVABLE_CHAINS[lower]) return lower;
   const aliased = ALIASES[lower];
   if (aliased) return aliased;
-  for (const [key, chain2] of Object.entries(CHAINS)) {
+  for (const [key, chain2] of Object.entries(RESOLVABLE_CHAINS)) {
     if (chain2.id === lower) return key;
   }
   if (/^0x[0-9a-f]+$/.test(lower)) {
@@ -3464,14 +3476,14 @@ function resolveChain(input2) {
   throw chainUnsupported(input2);
 }
 function lookupEvm(chainId) {
-  for (const [key, chain2] of Object.entries(CHAINS)) {
+  for (const [key, chain2] of Object.entries(RESOLVABLE_CHAINS)) {
     if (chain2.namespace === "eip155" && chain2.chainId === chainId) return key;
   }
   return void 0;
 }
 function resolveAsset(chain2, tokenAddress) {
   const chainKey = resolveChain(chain2);
-  const coinId = CHAINS[chainKey].coinId;
+  const coinId = RESOLVABLE_CHAINS[chainKey].coinId;
   return { chainKey, coinId, assetId: formatTokenId(coinId, tokenAddress) };
 }
 function chainUnsupported(input2) {
@@ -3723,7 +3735,7 @@ async function fetchBalance(httpClient, assetId, address, currency = "USD") {
     throw new BalanceError("NETWORK_ERROR", "Could not fetch balance. Please try again later.");
   }
 }
-var import_crypto, NATIVE_TOKEN_ADDRESS, SOLANA_NATIVE_ADDRESS, CHAINS, COMMON_TOKENS, NATIVE_SYMBOLS, CELO_NATIVE_ADDRESS, TwakError, TwakApiError, TwakNetworkError, TwakValidationError, CommandError, COMMON_ERROR_CODES, FS_ERRNO_CODES, SWAP_ERROR_CODES, SwapError, TRANSFER_ERROR_CODES, TransferError, WALLET_ERROR_CODES, WalletError, QUERY_ERROR_CODES, QueryError, BALANCE_ERROR_CODES, BalanceError, ALERT_ERROR_CODES, AlertError, ERC20_ERROR_CODES, Erc20Error, WATCH_ERROR_CODES, WatchError, AUTOMATION_ERROR_CODES, AutomationError, X402_ERROR_CODES, X402Error, ALIASES, DECIMAL_AMOUNT_RE, UNSAFE_KEYS, NAMING_API, EVM_ADDRESS_RE, ERC20_TRANSFER_SIG, ZERO_ADDRESS, DEFAULT_GATEWAY_URL, DEFAULT_MARKET_URL, DEFAULT_TIMEOUT, DEFAULT_USER_AGENT, DEFAULT_X_ORIGIN, TwakHttpClient, ALLOWED_OFFRAMP_PROVIDERS, McpResponse;
+var import_crypto, NATIVE_TOKEN_ADDRESS, SOLANA_NATIVE_ADDRESS, CHAINS, TESTNET_CHAINS, COMMON_TOKENS, NATIVE_SYMBOLS, CELO_NATIVE_ADDRESS, TwakError, TwakApiError, TwakNetworkError, TwakValidationError, CommandError, COMMON_ERROR_CODES, EXECUTION_REVERTED_RE, FS_ERRNO_CODES, SWAP_ERROR_CODES, SwapError, TRANSFER_ERROR_CODES, TransferError, WALLET_ERROR_CODES, WalletError, QUERY_ERROR_CODES, QueryError, BALANCE_ERROR_CODES, BalanceError, ALERT_ERROR_CODES, AlertError, ERC20_ERROR_CODES, Erc20Error, WATCH_ERROR_CODES, WatchError, AUTOMATION_ERROR_CODES, AutomationError, X402_ERROR_CODES, X402Error, RESOLVABLE_CHAINS, ALIASES, DECIMAL_AMOUNT_RE, UNSAFE_KEYS, NAMING_API, EVM_ADDRESS_RE, ERC20_TRANSFER_SIG, ZERO_ADDRESS, DEFAULT_GATEWAY_URL, DEFAULT_MARKET_URL, DEFAULT_TIMEOUT, DEFAULT_USER_AGENT, DEFAULT_X_ORIGIN, TwakHttpClient, ALLOWED_OFFRAMP_PROVIDERS, McpResponse;
 var init_dist = __esm({
   "../core/dist/index.mjs"() {
     "use strict";
@@ -4064,6 +4076,21 @@ var init_dist = __esm({
         sampleAccount: "0x8d1f3c7b5e9a2047c6b3d80f1e4a9258c7d6b3e5f8a0c2d4e6f8a0b2c4d6e8f"
       }
     };
+    TESTNET_CHAINS = {
+      bsctestnet: {
+        id: "smartchain-testnet",
+        name: "BNB Smart Chain Testnet",
+        coinId: 20000714,
+        namespace: "eip155",
+        chainId: "97",
+        symbol: "tBNB",
+        decimals: 18,
+        explorerUrl: "https://testnet.bscscan.com",
+        rpcUrl: "https://bsc-testnet.twnodes.com",
+        isEVM: true,
+        sampleAccount: "0x8894E0a0c962CB723c1976a4421c95949bE2D4E3"
+      }
+    };
     COMMON_TOKENS = {
       ethereum: {
         USDT: { address: "0xdAC17F958D2ee523a2206206994597C13D831ec7", decimals: 6 },
@@ -4209,6 +4236,7 @@ var init_dist = __esm({
       WALLET_AUTH_FAILED: "WALLET_AUTH_FAILED",
       STORAGE_ERROR: "STORAGE_ERROR"
     };
+    EXECUTION_REVERTED_RE = /\bexecution reverted\b/i;
     FS_ERRNO_CODES = /* @__PURE__ */ new Set([
       "EACCES",
       "EEXIST",
@@ -4347,6 +4375,7 @@ var init_dist = __esm({
         this.name = "X402Error";
       }
     };
+    RESOLVABLE_CHAINS = { ...CHAINS, ...TESTNET_CHAINS };
     ALIASES = {
       "binance-smart-chain": "bsc",
       matic: "polygon",
@@ -6750,13 +6779,47 @@ function patchNodeStubs() {
     if (resolvedUrl.includes("gateway.us.trustwallet.com")) {
       resolvedUrl = resolvedUrl.replace("gateway.us.trustwallet.com", "tws.trustwallet.com");
     }
+    let finalInput = input2;
     if (resolvedUrl !== url) {
-      const finalInput = typeof input2 === "string" ? resolvedUrl : input2 instanceof URL ? new URL(resolvedUrl) : new Request(resolvedUrl, input2);
-      return originalFetch(finalInput, init3);
+      finalInput = typeof input2 === "string" ? resolvedUrl : input2 instanceof URL ? new URL(resolvedUrl) : new Request(resolvedUrl, input2);
+    }
+    const bodyText = typeof init3?.body === "string" ? init3.body : init3?.body instanceof Uint8Array ? new TextDecoder().decode(init3.body) : void 0;
+    if (bodyText && /"method":"eth_(call|estimateGas|sendRawTransaction)"/.test(bodyText)) {
+      return originalFetch(finalInput, init3).then(appendRpcRevertData);
     }
-    return originalFetch(input2, init3);
+    return originalFetch(finalInput, init3);
   };
 }
+function revertDataSuffix(message, data) {
+  return typeof data === "string" && /^0x[0-9a-fA-F]+$/.test(data) && !message.includes(data) ? `: ${data}` : "";
+}
+async function appendRpcRevertData(response) {
+  const text = await response.text();
+  let body = text;
+  if (text.includes('"error"') && text.includes('"data":"0x')) {
+    try {
+      const json = JSON.parse(text);
+      const error2 = json.error;
+      if (error2 && typeof error2.message === "string") {
+        const suffix = revertDataSuffix(error2.message, error2.data);
+        if (suffix) {
+          error2.message = `${error2.message}${suffix}`;
+          body = JSON.stringify(json);
+        }
+      }
+    } catch {
+    }
+  }
+  const headers = new Headers(response.headers);
+  if (body !== text) {
+    headers.delete("content-length");
+  }
+  return new Response(body === "" ? null : body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers
+  });
+}
 function patchNaasSession(sessionId) {
   if (naasSessionPatched) return;
   naasSessionPatched = true;
@@ -6810,19 +6873,40 @@ async function initTrustSDK(config) {
     "com.trustwallet.agent",
     ""
   );
-  new import_trust_sdk.TrustSDKConfig.Builder().setContext(new import_trust_sdk.TrustSDKContext(
-    clientPlatform,
-    authCredentials,
-    config.logEnabled ? import_trust_sdk.LogMode.Debug : import_trust_sdk.LogMode.None,
-    config.logEnabled ? import_trust_sdk.LogSeverity.Debug : import_trust_sdk.LogSeverity.Error
-  )).addFeatureModule().addTrustSDKModule().init();
+  new import_trust_sdk.TrustSDKConfig.Builder().setContext(
+    new import_trust_sdk.TrustSDKContext(
+      clientPlatform,
+      authCredentials,
+      config.logEnabled ? import_trust_sdk.LogMode.Debug : import_trust_sdk.LogMode.None,
+      config.logEnabled ? import_trust_sdk.LogSeverity.Debug : import_trust_sdk.LogSeverity.Error
+    )
+  ).addFeatureModule().addTrustSDKModule().init();
   const nodeSyncMode = naasSessionId ? new import_trust_sdk.NodeSyncMode(import_trust_sdk.NodeSyncMode.NodeSyncModeType.NaaS) : new import_trust_sdk.NodeSyncMode(import_trust_sdk.NodeSyncMode.NodeSyncModeType.Default);
-  new import_trust_sdk.WalletKitConfig.Builder().setContext(new import_trust_sdk.WalletKitContext(clientPlatform, nodeSyncMode, void 0, authCredentials, config.logEnabled ? import_trust_sdk.LoggerMode.Debug : import_trust_sdk.LoggerMode.None)).addWalletKitModule().addSwapModule().init();
+  new import_trust_sdk.WalletKitConfig.Builder().setContext(
+    new import_trust_sdk.WalletKitContext(
+      clientPlatform,
+      nodeSyncMode,
+      void 0,
+      authCredentials,
+      config.logEnabled ? import_trust_sdk.LoggerMode.Debug : import_trust_sdk.LoggerMode.None
+    )
+  ).addWalletKitModule().addSwapModule().init();
   walletCore = await import_trust_sdk.WalletCoreKotlin.init();
   import_trust_sdk.FeatureModule.setEnvironment(import_trust_sdk.TwEnvironmentProduction);
   await import_trust_sdk.AmberService.setEnvironment(import_trust_sdk.TwEnvironmentProduction);
   await import_trust_sdk.BlockchainService.useBitcoinV2();
   buildCoinTypeMap();
+  for (const cfg of Object.values(TESTNET_CHAINS)) {
+    try {
+      await import_trust_sdk.BlockchainService.setNode(
+        new import_trust_sdk.CustomChain(getCoinType(cfg.coinId), cfg.chainId),
+        new import_trust_sdk.Node(cfg.rpcUrl)
+      );
+    } catch (err) {
+      process.stderr.write(`twak: could not register testnet node for ${cfg.id}: ${String(err)}
+`);
+    }
+  }
   initialized = true;
 }
 function getWalletCore() {
@@ -6951,7 +7035,12 @@ function chainKeyToDefinedChain(chainKey) {
   if (!ct5) {
     throw new TwakValidationError(`No CoinType mapping for coinId ${coinId}`, { chainKey, coinId });
   }
-  return { chain: new import_trust_sdk3.DefinedChain(ct5), chainConfig: CHAINS[canonicalKey] };
+  const chainConfig = getChainById(canonicalKey);
+  if (!chainConfig) {
+    throw new TwakValidationError(`No chain config for ${canonicalKey}`, { chainKey });
+  }
+  const chain2 = isTestnetChain(canonicalKey) ? new import_trust_sdk3.CustomChain(ct5, chainConfig.chainId) : new import_trust_sdk3.DefinedChain(ct5);
+  return { chain: chain2, chainConfig };
 }
 function humanAmountToWei(amount, decimals = 18) {
   const parts = amount.split(".");
@@ -6960,11 +7049,11 @@ function humanAmountToWei(amount, decimals = 18) {
   const frac = parts[1].padEnd(decimals, "0").slice(0, decimals);
   return whole * 10n ** BigInt(decimals) + BigInt(frac);
 }
-function createPendingTransaction(client, chainKey, txHash) {
+function createPendingTransaction(client, chainKey, hash) {
   return {
-    txHash,
+    hash,
     chainKey,
-    wait: (opts) => client.waitForReceipt(chainKey, txHash, opts)
+    wait: (opts) => client.waitForReceipt(chainKey, hash, opts)
   };
 }
 function bscSponsoredBaseUrl() {
@@ -7188,6 +7277,7 @@ var init_dist3 = __esm({
     fs2 = __toESM(require("fs"), 1);
     path2 = __toESM(require("path"), 1);
     import_trust_sdk = require("@trustwallet-trust-sdk/trust-sdk");
+    init_dist();
     import_trust_sdk2 = require("@trustwallet-trust-sdk/trust-sdk");
     init_dist();
     import_trust_sdk3 = require("@trustwallet-trust-sdk/trust-sdk");
@@ -7230,10 +7320,10 @@ var init_dist3 = __esm({
       setSigner(signer) {
         this.signer = signer;
       }
-      async getBalance(assetId, address) {
+      async getBalance(assetId, address, chainKey) {
         const { coinId, contractAddress } = parseTokenId(assetId);
         const ct5 = requireCoinType(coinId);
-        const account = this.createAccountForAddress(coinId, address);
+        const account = this.createAccountForAddress(coinId, address, chainKey);
         const asset = contractAddress ? new import_trust_sdk2.Asset.Token(account, contractAddress, tokenTypeForCoinId(coinId)) : new import_trust_sdk2.Asset.Coin(account);
         let results;
         try {
@@ -7268,8 +7358,8 @@ var init_dist3 = __esm({
           total: total.toString()
         };
       }
-      async getTokenBalance(assetId, ownerAddress) {
-        return this.getBalance(assetId, ownerAddress);
+      async getTokenBalance(assetId, ownerAddress, chainKey) {
+        return this.getBalance(assetId, ownerAddress, chainKey);
       }
       async getBalancesBatch(assetIds, address) {
         if (assetIds.length === 0) return /* @__PURE__ */ new Map();
@@ -7329,10 +7419,7 @@ var init_dist3 = __esm({
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       async transfer(params) {
         const { coinId, contractAddress } = parseTokenId(params.assetId);
-        const chainKey = coinTypeToChainKey(coinId);
-        if (!chainKey) {
-          throw new Error(`Unsupported coin type: ${coinId}`);
-        }
+        const chainKey = params.chainKey;
         const ct5 = requireCoinType(coinId);
         const account = this.getAccountFromSigner(chainKey);
         const asset = contractAddress ? new import_trust_sdk2.Asset.Token(account, contractAddress, tokenTypeForCoinId(coinId)) : new import_trust_sdk2.Asset.Coin(account);
@@ -7362,10 +7449,7 @@ var init_dist3 = __esm({
       }
       async executeContract(params) {
         const { coinId } = parseTokenId(params.assetId);
-        const chainKey = coinTypeToChainKey(coinId);
-        if (!chainKey) {
-          throw new Error(`Unsupported coin type: ${coinId}`);
-        }
+        const chainKey = params.chainKey;
         const ct5 = requireCoinType(coinId);
         const account = this.getAccountFromSigner(chainKey);
         const asset = new import_trust_sdk2.Asset.Coin(account);
@@ -7390,7 +7474,7 @@ var init_dist3 = __esm({
        * `receiptTimeoutMs` config when set, otherwise the global constants
        * (1.5s poll, 60s timeout). Caller-supplied opts override both.
        */
-      async waitForReceipt(chainKey, txHash, opts) {
+      async waitForReceipt(chainKey, hash, opts) {
         const { chain: chain2, chainConfig } = chainKeyToDefinedChain(chainKey);
         if (chainConfig?.namespace && chainConfig.namespace !== "eip155") {
           throw new TwakValidationError(
@@ -7416,15 +7500,15 @@ var init_dist3 = __esm({
         const deadline = Date.now() + timeoutMs;
         while (Date.now() < deadline) {
           const remainingMs = Math.max(1, deadline - Date.now());
-          const result = await this.postJsonRpc(rpcUrl, "eth_getTransactionReceipt", [txHash], {
+          const result = await this.postJsonRpc(rpcUrl, "eth_getTransactionReceipt", [hash], {
             timeoutMs: Math.min(RPC_TIMEOUT_MS, remainingMs)
           });
           const receipt = result ?? null;
           if (receipt) return receipt;
           await new Promise((resolve2) => setTimeout(resolve2, pollMs));
         }
-        throw new TwakNetworkError(`Timed out waiting for receipt ${txHash} on ${chainKey}`, {
-          txHash,
+        throw new TwakNetworkError(`Timed out waiting for receipt ${hash} on ${chainKey}`, {
+          hash,
           chainKey
         });
       }
@@ -7515,13 +7599,13 @@ var init_dist3 = __esm({
           currency: chainKey
         };
       }
-      async findTransactionStatus(chainKey, address, txHash) {
+      async findTransactionStatus(chainKey, address, hash) {
         const coinId = chainKeyToCoinType(chainKey);
         if (coinId === void 0) throw new Error(`Unsupported chain: ${chainKey}`);
         const account = this.createAccountForAddress(coinId, address);
         let result;
         try {
-          result = await import_trust_sdk2.BlockchainService.findTransaction(account, txHash);
+          result = await import_trust_sdk2.BlockchainService.findTransaction(account, hash);
         } catch {
           return { confirmed: false, pending: false, failed: false, error: "Transaction not found" };
         }
@@ -7629,8 +7713,9 @@ var init_dist3 = __esm({
        * EIP-7702 token-as-gas sponsorship.
        */
       async signAndBroadcast(transaction, account, coinId, chainKey, ct5, hdWallet) {
-        const chain2 = new import_trust_sdk2.DefinedChain(ct5);
-        const sponsoredUrl = this.getSponsoredRpcUrl(coinId);
+        const testnet = isTestnetChain(chainKey);
+        const chain2 = testnet ? chainKeyToDefinedChain(chainKey).chain : new import_trust_sdk2.DefinedChain(ct5);
+        const sponsoredUrl = testnet ? void 0 : this.getSponsoredRpcUrl(coinId);
         if (sponsoredUrl) {
           try {
             const zeroFee = zeroGasFee(await import_trust_sdk2.BlockchainService.calculateFee(transaction));
@@ -7659,7 +7744,8 @@ var init_dist3 = __esm({
         const { fee, transaction7702 } = await this.calculateFeeWithSponsorship(
           transaction,
           account,
-          coinId
+          coinId,
+          chainKey
         );
         const tx = transaction7702 ?? transaction;
         const nonce = await import_trust_sdk2.BlockchainService.fetchNonce(account);
@@ -7729,8 +7815,8 @@ var init_dist3 = __esm({
        * 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)) {
+      async calculateFeeWithSponsorship(transaction, account, coinId, chainKey) {
+        if (!_BlockchainClient.SPONSORABLE_COINS.includes(coinId) || chainKey !== void 0 && isTestnetChain(chainKey)) {
           return { fee: await import_trust_sdk2.BlockchainService.calculateFee(transaction) };
         }
         let supports7702 = false;
@@ -7866,18 +7952,18 @@ var init_dist3 = __esm({
         }
         return this.signer.getAccount(chainKey);
       }
-      createAccountForAddress(coinId, address) {
+      createAccountForAddress(coinId, address, chainKey) {
         if (this.signer) {
-          const chainKey = coinTypeToChainKey(coinId);
-          if (chainKey) {
+          const key = chainKey ?? coinTypeToChainKey(coinId);
+          if (key) {
             try {
-              return this.signer.getAccount(chainKey);
+              return this.signer.getAccount(key);
             } catch {
             }
           }
         }
         const ct5 = requireCoinType(coinId);
-        const chain2 = new import_trust_sdk2.DefinedChain(ct5);
+        const chain2 = chainKey !== void 0 && isTestnetChain(chainKey) ? chainKeyToDefinedChain(chainKey).chain : new import_trust_sdk2.DefinedChain(ct5);
         const wc3 = getWalletCore();
         const derivation = coinId === 0 && address.startsWith("bc1p") ? wc3.Derivation.bitcoinTaproot : coinId === 0 && address.startsWith("bc1") ? wc3.Derivation.bitcoinSegwit : wc3.Derivation.default;
         return new import_trust_sdk2.Account(address, derivation, "", "", "", chain2);
@@ -7941,7 +8027,9 @@ var init_dist3 = __esm({
           );
         }
         if (json.error) {
-          throw new TwakNetworkError(`RPC error on ${method}: ${json.error.message}`, {
+          const { message, data } = json.error;
+          const suffix = revertDataSuffix(message, data);
+          throw new TwakNetworkError(`RPC error on ${method}: ${message}${suffix}`, {
             method,
             rpcUrl,
             rpcError: json.error
@@ -7974,7 +8062,7 @@ var init_dist3 = __esm({
       getAddress(chainKey) {
         const cached = this.addressCache.get(chainKey);
         if (cached) return cached;
-        const coinId = chainKeyToCoinType(chainKey);
+        const coinId = chainKeyToCoinType(chainKey) ?? getChainById(chainKey)?.coinId;
         if (coinId === void 0) {
           throw new Error(`Unsupported chain: ${chainKey}`);
         }
@@ -7994,7 +8082,8 @@ var init_dist3 = __esm({
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getAccount(chainKey) {
-        const coinId = chainKeyToCoinType(chainKey);
+        const testnet = isTestnetChain(chainKey);
+        const coinId = chainKeyToCoinType(chainKey) ?? getChainById(chainKey)?.coinId;
         if (coinId === void 0) {
           throw new Error(`Unsupported chain: ${chainKey}`);
         }
@@ -8002,12 +8091,21 @@ var init_dist3 = __esm({
         if (!ct5) {
           throw new Error(`No CoinType mapping for chain: ${chainKey} (coinId: ${coinId})`);
         }
-        const chain2 = new import_trust_sdk4.DefinedChain(ct5);
+        const chain2 = testnet ? new import_trust_sdk4.CustomChain(ct5, getChainById(chainKey).chainId) : new import_trust_sdk4.DefinedChain(ct5);
         const accounts = import_trust_sdk4.AccountManagementService.createDefaultAccountsHdWallet(chain2, this.hdWallet);
         if (accounts.length === 0) {
           throw new Error(`No accounts for chain: ${chainKey}`);
         }
-        return coinId === 0 && accounts.length > 1 ? accounts[1] : accounts[0];
+        const account = coinId === 0 && accounts.length > 1 ? accounts[1] : accounts[0];
+        if (!testnet) return account;
+        return new import_trust_sdk4.Account(
+          account.address,
+          account.derivation,
+          account.publicKey,
+          account.extendedPublicKey,
+          account.derivationPath,
+          chain2
+        );
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getPrivateKey(chainKey) {
@@ -8217,7 +8315,7 @@ var init_dist3 = __esm({
       async sendTransaction(params) {
         await this.ensureConnected();
         this.resetAutoLockTimer();
-        const { getChainByEvmId: getChainByEvmId2, chainKeyToCoinType: chainKeyToCoinType3 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+        const { getChainByEvmId: getChainByEvmId2, chainKeyToCoinType: chainKeyToCoinType3, resolveChain: resolveChain2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
         let assetId;
         if (params.chainId.startsWith("eip155:")) {
           const chain2 = getChainByEvmId2(params.chainId.replace("eip155:", ""));
@@ -8230,6 +8328,7 @@ var init_dist3 = __esm({
           if (coinId === void 0) throw new Error(`Unsupported chain: ${params.chainId}`);
           assetId = `c${coinId}`;
         }
+        const chainKey = resolveChain2(params.chainId);
         const hdWallet = this.signer.getHDWallet();
         const hasCalldata = params.data && params.data !== "0x" && params.data !== "0x0";
         const hasValue = params.value && params.value !== "0x0" && params.value !== "0x" && params.value !== "0";
@@ -8238,7 +8337,7 @@ var init_dist3 = __esm({
             serializedMessage: params.data,
             hdWallet
           });
-          return result2.txHash;
+          return result2.hash;
         }
         if (hasCalldata || hasValue) {
           const result2 = await this.blockchainClient.executeContract({
@@ -8246,17 +8345,19 @@ var init_dist3 = __esm({
             to: params.to,
             value: params.value || "0x0",
             data: params.data || "0x",
-            hdWallet
+            hdWallet,
+            chainKey
           });
-          return result2.txHash;
+          return result2.hash;
         }
         const result = await this.blockchainClient.transfer({
           assetId,
           to: params.to,
           amount: params.value || "0",
-          hdWallet
+          hdWallet,
+          chainKey
         });
-        return result.txHash;
+        return result.hash;
       }
       supportsChain(chainId) {
         return isChainSupported(chainId);
@@ -14355,7 +14456,7 @@ var require_codegen = __commonJS({
       AND: new code_1._Code("&&"),
       ADD: new code_1._Code("+")
     };
-    var Node = class {
+    var Node2 = class {
       optimizeNodes() {
         return this;
       }
@@ -14363,7 +14464,7 @@ var require_codegen = __commonJS({
         return this;
       }
     };
-    var Def = class extends Node {
+    var Def = class extends Node2 {
       constructor(varKind, name2, rhs) {
         super();
         this.varKind = varKind;
@@ -14386,7 +14487,7 @@ var require_codegen = __commonJS({
         return this.rhs instanceof code_1._CodeOrName ? this.rhs.names : {};
       }
     };
-    var Assign = class extends Node {
+    var Assign = class extends Node2 {
       constructor(lhs, rhs, sideEffects) {
         super();
         this.lhs = lhs;
@@ -14416,7 +14517,7 @@ var require_codegen = __commonJS({
         return `${this.lhs} ${this.op}= ${this.rhs};` + _n3;
       }
     };
-    var Label = class extends Node {
+    var Label = class extends Node2 {
       constructor(label) {
         super();
         this.label = label;
@@ -14426,7 +14527,7 @@ var require_codegen = __commonJS({
         return `${this.label}:` + _n3;
       }
     };
-    var Break = class extends Node {
+    var Break = class extends Node2 {
       constructor(label) {
         super();
         this.label = label;
@@ -14437,7 +14538,7 @@ var require_codegen = __commonJS({
         return `break${label};` + _n3;
       }
     };
-    var Throw = class extends Node {
+    var Throw = class extends Node2 {
       constructor(error2) {
         super();
         this.error = error2;
@@ -14449,7 +14550,7 @@ var require_codegen = __commonJS({
         return this.error.names;
       }
     };
-    var AnyCode = class extends Node {
+    var AnyCode = class extends Node2 {
       constructor(code2) {
         super();
         this.code = code2;
@@ -14468,7 +14569,7 @@ var require_codegen = __commonJS({
         return this.code instanceof code_1._CodeOrName ? this.code.names : {};
       }
     };
-    var ParentNode = class extends Node {
+    var ParentNode = class extends Node2 {
       constructor(nodes = []) {
         super();
         this.nodes = nodes;
@@ -40545,756 +40646,146 @@ init_dist2();
 var import_chalk6 = __toESM(require_source());
 init_dist();
 
-// src/branding.ts
-var import_chalk5 = __toESM(require_source());
-var boxen = require_boxen();
-var SHIELD = [
-  "                @@=+                ",
-  "           @@@@@@@=======           ",
-  "     @@@@@@@@@@@@@============+     ",
-  "  @@@@@@@@@@@@@@@@================  ",
-  "  @@@@@@@@@@@@@@@@+===============  ",
-  "  @@@@@@@@@@@@@@@@++++============  ",
-  "  @@@@@@@@@@@@@@@@++++++++++=====+  ",
-  "  @@@@@@@@@@@@@@@@**++++++++++++++  ",
-  "  @@@@@@@@@@@@@@@@********++++++++  ",
-  "  @@@@@@@@@@@@@@@@**************++  ",
-  "  @@@@@@@@@@@@@@@@#####***********  ",
-  "   @@@@@@@@@@@@@@@###########****   ",
-  "    @@@@@@@@@@@@@@%##############   ",
-  "    @@@@@@@@@@@@@@%%%%%%%#######    ",
-  "     @@@@@@@@@@@@@%%%%%%%%%%%%%     ",
-  "       @@@@@@@@@@@%%%%%%%%%%%       ",
-  "         @@@@@@@@@@@@@%%%%%         ",
-  "           @@@@@@@@@@@@@@           ",
-  "             @@@@@@@@@@             ",
-  "                 @@                 "
-];
-function printBanner(version3) {
-  const logo = SHIELD.map((l4) => import_chalk5.default.green(l4)).join("\n");
-  const title = import_chalk5.default.green.bold("  Trust Wallet Agent Kit");
-  const ver = import_chalk5.default.dim(`  v${version3}`);
-  console.log(
-    boxen(`${logo}
-
-${title}
-${ver}`, {
-      borderColor: "green",
-      borderStyle: "round",
-      padding: { top: 1, bottom: 1, left: 2, right: 2 }
-    })
-  );
+// ../contracts/dist/index.mjs
+init_dist();
+init_dist();
+init_dist();
+init_dist();
+init_dist3();
+init_dist();
+init_dist();
+init_dist();
+var HEX_PATTERN = /^0x[0-9a-fA-F]*$/;
+function isHex(value) {
+  return HEX_PATTERN.test(value);
 }
-function box(content) {
-  return boxen(content, {
-    borderColor: "green",
-    borderStyle: "round",
-    padding: { top: 0, bottom: 0, left: 1, right: 1 }
-  });
+function hexToBytes3(hex2) {
+  if (!isHex(hex2)) {
+    throw new TwakValidationError(`Invalid hex string: ${hex2}`, { kind: "invalidHex" });
+  }
+  const clean2 = hex2.slice(2);
+  if (clean2.length % 2 !== 0) {
+    throw new TwakValidationError(`Hex string has odd length: ${hex2}`, { kind: "invalidHex" });
+  }
+  const out = new Uint8Array(clean2.length / 2);
+  for (let i2 = 0; i2 < out.length; i2++) {
+    out[i2] = parseInt(clean2.slice(i2 * 2, i2 * 2 + 2), 16);
+  }
+  return out;
 }
-
-// src/commands/wallet.ts
-function getQRString(address) {
-  try {
-    const qrcode = require("qrcode-terminal");
-    let result = "";
-    qrcode.generate(address, { small: true }, (code2) => {
-      result = code2;
-    });
-    return result;
-  } catch {
-    return "";
+function bytesToHex3(bytes) {
+  let out = "0x";
+  for (let i2 = 0; i2 < bytes.length; i2++) {
+    out += bytes[i2].toString(16).padStart(2, "0");
   }
+  return out;
 }
-function registerWalletCommand(program3) {
-  const wallet = program3.command("wallet").description("Manage agent wallet");
-  wallet.command("create").description("Create a new agent wallet").requiredOption("--password <password>", "Password to encrypt the wallet").option("--no-keychain", "Do not save password to OS keychain").option("--skip-password-check", "Skip password strength validation").option("--json", "JSON output").action(async (opts) => {
-    try {
-      if (!opts.skipPasswordCheck) {
-        const weakness = getPasswordWeaknesses(opts.password);
-        if (weakness) {
-          throw new WalletError("VALIDATION_ERROR", `Password too weak: must ${weakness}.`);
-        }
-      }
-      await ensureTrustSDK();
-      const store = new WalletConfigStore();
-      if (await store.exists()) {
-        throw new WalletError(
-          "WALLET_EXISTS",
-          "Wallet already exists. Back up ~/.twak/wallet.json, then delete it to create a new one."
-        );
-      }
-      const provider = await AgentWalletProvider.create(opts.password);
-      const addresses = await provider.getAddresses();
-      if (opts.keychain !== false) {
-        const kc2 = new KeychainManager();
-        if (kc2.isAvailable()) {
-          await kc2.saveWalletPassword(opts.password);
-          if (!opts.json) info("Password saved to OS keychain (use --no-keychain to skip)");
-        }
-      }
-      if (!opts.json) success("Agent wallet created successfully");
-      try {
-        const creds = await getCredentials();
-        await registerWalletWithBackend(creds, provider);
-        if (!opts.json) info("Wallet registered with backend");
-      } catch {
-        if (!opts.json) warn("Backend registration failed (holdings may be limited)");
-      }
-      if (opts.json) {
-        output({ addresses }, true);
-      } else {
-        info(`Generated addresses for ${addresses.length} chains`);
-      }
-    } catch (err) {
-      handleCommandError(err, opts.json, "Wallet creation failed");
+function hexOrUtf8ToBytesHex(value) {
+  const looksHex = value.length >= 2 && value[0] === "0" && (value[1] === "x" || value[1] === "X");
+  if (looksHex) {
+    const canonical = "0x" + value.slice(2);
+    if (!isHex(canonical)) {
+      throw new TwakValidationError(
+        `Value starts with "0x" but is not valid hex: ${value}. Use only [0-9a-fA-F] characters, or drop the "0x" prefix to send a UTF-8 string.`,
+        { kind: "invalidHex" }
+      );
     }
-    safeExit();
-  });
-  wallet.command("address").description("Get wallet address for a chain").requiredOption("--chain <key>", "Chain key (e.g., ethereum, solana)").option(
-    "--password <password>",
-    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
-  ).option("--json", "JSON output").action(async (opts) => {
-    try {
-      if (!getChainById(opts.chain)) {
-        throw new WalletError("CHAIN_UNSUPPORTED", `Unknown chain: ${opts.chain}`);
-      }
-      await ensureTrustSDK();
-      const password3 = await resolvePassword(opts);
-      const provider = await AgentWalletProvider.fromStorage(password3);
-      const address = await provider.getAddress(opts.chain);
-      if (opts.json) {
-        output({ chain: opts.chain, address }, true);
-      } else {
-        const qr3 = getQRString(address);
-        const content = `${import_chalk6.default.dim("Chain")}    ${import_chalk6.default.bold(opts.chain)}
-${import_chalk6.default.dim("Address")}  ${import_chalk6.default.green(address)}
-
-${qr3}`;
-        console.log(box(content));
-      }
-    } catch (err) {
-      handleCommandError(err, opts.json, "Wallet address failed");
+    if ((canonical.length - 2) % 2 !== 0) {
+      throw new TwakValidationError(
+        `Hex value has odd length: ${value}. Solidity bytes must be byte-aligned.`,
+        { kind: "invalidHex" }
+      );
     }
-    safeExit();
-  });
-  wallet.command("addresses").description("List all wallet addresses").option(
-    "--password <password>",
-    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
-  ).option("--json", "JSON output").action(async (opts) => {
-    try {
-      await ensureTrustSDK();
-      const password3 = await resolvePassword(opts);
-      const provider = await AgentWalletProvider.fromStorage(password3);
-      const addresses = await provider.getAddresses();
-      if (opts.json) {
-        output({ addresses }, true);
-      } else {
-        const grouped = /* @__PURE__ */ new Map();
-        for (const addr of addresses) {
-          const chains = grouped.get(addr.address) ?? [];
-          chains.push(addr.chainId);
-          grouped.set(addr.address, chains);
-        }
-        for (const [address, chains] of grouped) {
-          const qr3 = getQRString(address);
-          const maxWidth = Math.max(address.length + 9, 50);
-          const chainLabel = `${import_chalk6.default.dim("Chains")}   `;
-          const chainLabelLen = 9;
-          const chainLines = [];
-          let line = "";
-          for (const c3 of chains) {
-            const sep2 = line ? ", " : "";
-            if (line && line.length + sep2.length + c3.length + chainLabelLen > maxWidth) {
-              chainLines.push(line);
-              line = c3;
-            } else {
-              line += sep2 + c3;
-            }
-          }
-          if (line) chainLines.push(line);
-          const chainsStr = chainLines.map((l4, i2) => (i2 === 0 ? chainLabel : " ".repeat(chainLabelLen)) + import_chalk6.default.bold(l4)).join("\n");
-          const content = `${chainsStr}
-${import_chalk6.default.dim("Address")}  ${import_chalk6.default.green(address)}
-
-${qr3}`;
-          console.log(box(content));
-        }
-      }
-    } catch (err) {
-      handleCommandError(err, opts.json, "Wallet addresses failed");
+    return canonical;
+  }
+  return bytesToHex3(new TextEncoder().encode(value));
+}
+function wc2() {
+  return getWalletCore();
+}
+var BRIDGE = {
+  createAbiFunction(name2) {
+    const ctor = wc2().EthereumAbiFunction;
+    if (typeof ctor?.createWithString === "function") {
+      return ctor.createWithString(name2);
     }
-    safeExit();
+    return new ctor(name2);
+  },
+  encode(fn2) {
+    return wc2().EthereumAbi.encode(fn2);
+  },
+  decodeOutput(fn2, data) {
+    return wc2().EthereumAbi.decodeOutput(fn2, data);
+  },
+  keccak256(data) {
+    return wc2().Hash.keccak256(data);
+  }
+};
+function getAbiBridge() {
+  return BRIDGE;
+}
+function findAbiFunction(abi, methodName, argCount) {
+  const matches = abi.filter(
+    (e2) => e2.type === "function" && e2.name === methodName
+  );
+  if (matches.length === 0) {
+    throw new TwakValidationError(`Unknown ABI method: ${methodName}`, {
+      kind: "unknownMethod",
+      methodName
+    });
+  }
+  if (matches.length === 1 || argCount === void 0) {
+    return matches[0];
+  }
+  const byArity = matches.filter((m2) => m2.inputs.length === argCount);
+  if (byArity.length === 1) {
+    return byArity[0];
+  }
+  throw new TwakValidationError(`No unique ${methodName} overload taking ${argCount} argument(s)`, {
+    kind: "unknownMethod",
+    methodName
   });
-  wallet.command("balance").description("Get wallet balance on a chain (native + token holdings)").option("--chain <key>", "Chain key").option("--all", "Show balances across all chains with funds").option(
-    "--password <password>",
-    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
-  ).option("--no-tokens", "Skip token balance lookup").option("--json", "JSON output").action(async (opts) => {
-    try {
-      if (opts.all && opts.chain) {
-        throw new WalletError("VALIDATION_ERROR", "--all and --chain are mutually exclusive");
-      }
-      if (!opts.all && !opts.chain) {
-        throw new WalletError("VALIDATION_ERROR", "Provide --chain <key> or --all");
-      }
-      await ensureTrustSDK();
-      const password3 = await resolvePassword(opts);
-      const provider = await AgentWalletProvider.fromStorage(password3);
-      const httpClient = await getClient();
-      if (!opts.all) {
-        const chain2 = getChainById(opts.chain);
-        if (!chain2) {
-          throw new WalletError("CHAIN_UNSUPPORTED", `Unknown chain: ${opts.chain}`);
-        }
-      }
-      const allAddresses = await provider.getAddresses();
-      const addressMap = /* @__PURE__ */ new Map();
-      for (const a3 of allAddresses) addressMap.set(a3.chainId, a3.address);
-      const requestedChains = opts.all ? Object.keys(CHAINS) : [opts.chain];
-      const skipTokens = opts.tokens === false;
-      const chainEntries = requestedChains.flatMap((chainKey) => {
-        const chain2 = getChainById(chainKey);
-        const address = addressMap.get(chainKey);
-        if (!chain2 || !address) return [];
-        return [{ chainKey, chain: chain2, address }];
-      });
-      if (!opts.all && chainEntries.length === 0) {
-        throw new WalletError(
-          "CHAIN_UNSUPPORTED",
-          `Wallet does not have an address for chain: ${opts.chain}`
-        );
-      }
-      const nativeAssets = chainEntries.map(({ chainKey, chain: chain2, address }) => ({
-        chainKey,
-        chain: chain2,
-        token: void 0,
-        assetId: `c${chain2.coinId}`,
-        userAddress: address
-      }));
-      const tokenAssets = skipTokens ? [] : chainEntries.flatMap(({ chainKey, chain: chain2, address }) => {
-        const knownTokens = COMMON_TOKENS[chainKey];
-        if (!knownTokens) return [];
-        return Object.keys(knownTokens).flatMap((sym) => {
-          const resolved = resolveToken(sym, chainKey);
-          if (!resolved) return [];
-          return [
-            {
-              chainKey,
-              chain: chain2,
-              token: { ...resolved, symbol: sym },
-              assetId: `c${chain2.coinId}_t${resolved.address}`,
-              userAddress: address
-            }
-          ];
-        });
-      });
-      const allAssets = [...nativeAssets, ...tokenAssets];
-      const balances = await fetchBalances(
-        httpClient,
-        allAssets.map(({ assetId, userAddress }) => ({ assetId, address: userAddress }))
-      );
-      const assetsById = new Map(allAssets.map((a3) => [a3.assetId, a3]));
-      const resultsByChain = /* @__PURE__ */ new Map();
-      for (const { chainKey, chain: chain2, address } of chainEntries) {
-        resultsByChain.set(chainKey, {
-          chain: chainKey,
-          address,
-          symbol: chain2.symbol,
-          available: "0",
-          total: "0",
-          totalUsd: null,
-          tokens: []
-        });
-      }
-      for (const balance of balances) {
-        const assetInfo = assetsById.get(balance.assetId);
-        if (!assetInfo) {
-          throw new WalletError(
-            "NETWORK_ERROR",
-            "Could not fetch balances. Please try again later."
-          );
-        }
-        const result = resultsByChain.get(assetInfo.chainKey);
-        if (!result) continue;
-        const { token, chain: chain2 } = assetInfo;
-        const amts = balance.amounts;
-        if (token) {
-          const human = formatAmount(amts.total ?? "0", token.decimals);
-          if (human !== "0") {
-            result.tokens.push({
-              symbol: token.symbol,
-              contract: token.address,
-              balance: human
-            });
-          }
-        } else {
-          result.available = formatAmount(amts.available ?? "0", chain2.decimals);
-          result.total = formatAmount(amts.total ?? "0", chain2.decimals);
-          const lockedHuman = formatAmount(amts.locked ?? "0", chain2.decimals);
-          if (lockedHuman !== "0") result.staked = lockedHuman;
-          const fiat = amts.totalInFiat;
-          result.totalUsd = fiat && fiat !== "" ? parseFloat(fiat) : null;
-        }
-      }
-      const orderedResults = chainEntries.map((e2) => resultsByChain.get(e2.chainKey)).filter((r3) => r3 !== void 0);
-      const visible = opts.all ? orderedResults.filter((r3) => r3.total !== "0" || r3.tokens.length > 0) : orderedResults;
-      const renderBlock = (r3, withSeparator) => {
-        if (withSeparator) console.log("");
-        console.log(import_chalk6.default.bold.underline(`${r3.chain} (${r3.symbol})`));
-        console.log(`  ${import_chalk6.default.dim("Address")}    ${r3.address}`);
-        console.log(`  ${import_chalk6.default.dim("Available")}  ${r3.available}`);
-        if (r3.staked) console.log(`  ${import_chalk6.default.dim("Staked")}     ${r3.staked}`);
-        const usdSuffix = r3.totalUsd !== null ? ` (\u2248 $${r3.totalUsd.toFixed(2)})` : "";
-        console.log(`  ${import_chalk6.default.dim("Total")}      ${r3.total}${usdSuffix}`);
-        if (r3.tokens.length > 0) {
-          console.log(`  ${import_chalk6.default.dim("Tokens:")}`);
-          for (const t of r3.tokens) {
-            console.log(`    ${import_chalk6.default.bold(t.symbol.padEnd(10))} ${t.balance}`);
-          }
-        }
-      };
-      if (opts.all) {
-        if (opts.json) {
-          output(visible, true);
-        } else if (visible.length === 0) {
-          info("No chains with non-zero native balance found.");
-        } else {
-          visible.forEach((r3, i2) => renderBlock(r3, i2 > 0));
-        }
-      } else {
-        const single = visible[0];
-        if (opts.json) {
-          output(single, true);
-        } else {
-          renderBlock(single, false);
-        }
+}
+function encodeFunctionCall(abi, methodName, args) {
+  const fnDef = findAbiFunction(abi, methodName, args.length);
+  if (args.length !== fnDef.inputs.length) {
+    throw new TwakValidationError(
+      `Wrong arg count for ${methodName}: expected ${fnDef.inputs.length}, got ${args.length}`,
+      {
+        kind: "wrongArgCount",
+        methodName,
+        expected: fnDef.inputs.length,
+        actual: args.length
       }
-    } catch (err) {
-      handleCommandError(err, opts.json, "Balance check failed");
-    }
-    safeExit();
+    );
+  }
+  if (encoderRequiresHandRoll(fnDef.inputs)) {
+    return encodeFunctionCallHandRoll(methodName, fnDef.inputs, args);
+  }
+  const bridge = getAbiBridge();
+  const fn2 = bridge.createAbiFunction(methodName);
+  fnDef.inputs.forEach((param, i2) => {
+    pushParam(fn2, param, args[i2], methodName);
   });
-  const keychain = wallet.command("keychain").description("Manage wallet password in OS keychain");
-  keychain.command("save").description("Save wallet password to OS keychain").requiredOption("--password <password>", "Wallet password to store").option("--json", "JSON output").action(async (opts) => {
-    try {
-      const kc2 = new KeychainManager();
-      if (!kc2.isAvailable()) {
-        throw new WalletError("KEYCHAIN_UNAVAILABLE", "OS keychain not available on this system");
-      }
-      await kc2.saveWalletPassword(opts.password);
-      success("Wallet password saved to OS keychain");
-    } catch (err) {
-      handleCommandError(err, opts.json, "Keychain save failed");
+  return bytesToHex3(bridge.encode(fn2));
+}
+function pushParam(fn2, param, value, methodName) {
+  const type = param.type;
+  const isOutput = false;
+  if (type === "address") {
+    fn2.addParamAddress(toAddressBytes(value, param, methodName), isOutput);
+    return;
+  }
+  if (type === "bool") {
+    if (typeof value !== "boolean") {
+      throw argTypeMismatch(methodName, param, value, "boolean");
     }
-    safeExit();
-  });
-  keychain.command("delete").description("Remove wallet password from OS keychain").option("--json", "JSON output").action(async (opts) => {
-    try {
-      const kc2 = new KeychainManager();
-      if (!kc2.isAvailable()) {
-        throw new WalletError("KEYCHAIN_UNAVAILABLE", "OS keychain not available on this system");
-      }
-      await kc2.deleteWalletPassword();
-      success("Wallet password removed from OS keychain");
-    } catch (err) {
-      handleCommandError(err, opts.json, "Keychain delete failed");
-    }
-    safeExit();
-  });
-  keychain.command("check").description("Check if wallet password is stored in OS keychain").option("--json", "JSON output").action(async (opts) => {
-    try {
-      const kc2 = new KeychainManager();
-      if (!kc2.isAvailable()) {
-        if (opts.json) {
-          output({ available: false, stored: false }, true);
-        } else {
-          warn("keytar not available on this system");
-        }
-        safeExit();
-        return;
-      }
-      const pw = await kc2.getWalletPassword();
-      if (opts.json) {
-        output({ available: true, stored: !!pw }, true);
-      } else if (pw) {
-        success("Wallet password is stored in OS keychain");
-      } else {
-        info("No wallet password found in OS keychain");
-      }
-    } catch (err) {
-      handleCommandError(err, opts.json, "Keychain check failed");
-    }
-    safeExit();
-  });
-  wallet.command("connect").description("Connect external wallet via WalletConnect").option("--project-id <id>", "WalletConnect project ID (or set WALLETCONNECT_PROJECT_ID)").option(
-    "--chains <list>",
-    "Comma-separated CAIP-2 chain IDs",
-    "eip155:1,eip155:56,eip155:137,eip155:8453,eip155:42161"
-  ).option("--timeout <seconds>", "Connection timeout in seconds", "300").option("--json", "JSON output").action(async (opts) => {
-    try {
-      const projectId = opts.projectId || process.env.WALLETCONNECT_PROJECT_ID;
-      if (!projectId) {
-        throw new WalletError(
-          "VALIDATION_ERROR",
-          "WalletConnect project ID required. Use --project-id or set WALLETCONNECT_PROJECT_ID"
-        );
-      }
-      const provider = new WalletConnectProvider({ projectId });
-      const chains = opts.chains.split(",").map((s2) => s2.trim()).filter(Boolean);
-      info("Connecting via WalletConnect...");
-      const result = await provider.connect(chains);
-      const qr3 = getQRString(result.uri);
-      if (qr3) {
-        console.log(qr3);
-      }
-      info(`Trust Wallet: ${result.deepLinks.native}`);
-      info(`Universal:    ${result.deepLinks.universal}`);
-      info("\nWaiting for wallet approval...");
-      const timeoutMs = parseInt(opts.timeout, 10) * 1e3;
-      const session = await provider.waitForSession(timeoutMs);
-      if (opts.json) {
-        output(
-          {
-            connected: true,
-            address: session.address,
-            chainId: session.chainId,
-            peer: session.peerName
-          },
-          true
-        );
-      } else {
-        success(`Connected to ${session.peerName || "wallet"}`);
-        info(`  Address: ${session.address}`);
-        info(`  Chain:   ${session.chainId}`);
-      }
-    } catch (err) {
-      handleCommandError(err, opts.json, "WalletConnect failed");
-    }
-    safeExit();
-  });
-  wallet.command("status").description("Check wallet configuration status").option("--json", "JSON output").action(async (opts) => {
-    try {
-      const store = new WalletConfigStore();
-      const exists = await store.exists();
-      const kc2 = new KeychainManager();
-      const keychainHasPassword = kc2.isAvailable() ? !!await kc2.getWalletPassword() : false;
-      const totalChains = Object.keys(CHAINS).length;
-      let createdAt;
-      let addressCount;
-      if (exists) {
-        const config = await store.getConfig();
-        createdAt = config?.createdAt;
-        addressCount = config?.chains?.length ?? totalChains;
-      }
-      const result = {
-        agentWallet: exists ? "configured" : "not configured",
-        keychainPassword: keychainHasPassword ? "stored" : "not stored",
-        chains: totalChains,
-        supportedChains: totalChains,
-        ...createdAt ? { createdAt } : {},
-        ...addressCount !== void 0 ? { addressCount } : {}
-      };
-      if (opts.json) {
-        output(result, true);
-      } else {
-        console.log(
-          `  ${import_chalk6.default.dim("Wallet")}     ${exists ? import_chalk6.default.green("configured") : import_chalk6.default.yellow("not configured")}`
-        );
-        if (createdAt) console.log(`  ${import_chalk6.default.dim("Created")}    ${createdAt}`);
-        console.log(
-          `  ${import_chalk6.default.dim("Keychain")}   ${keychainHasPassword ? import_chalk6.default.green("password stored") : import_chalk6.default.yellow("no password")}`
-        );
-        console.log(`  ${import_chalk6.default.dim("Chains")}     ${totalChains} supported`);
-        if (addressCount !== void 0)
-          console.log(`  ${import_chalk6.default.dim("Addresses")}  ${addressCount}`);
-        if (!exists) info("\nRun `twak wallet create --password <pw>` to create a wallet.");
-      }
-    } catch (err) {
-      handleCommandError(err, opts.json, "Status failed");
-    }
-    safeExit();
-  });
-  wallet.command("portfolio").description("Show portfolio balances and USD values across chains, including token holdings").option("--chains <list>", "Comma-separated chain keys (default: all supported chains)").option(
-    "--password <password>",
-    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
-  ).option("--json", "JSON output").action(async (opts) => {
-    try {
-      await ensureTrustSDK();
-      const password3 = await resolvePassword(opts);
-      const provider = await AgentWalletProvider.fromStorage(password3);
-      const httpClient = await getClient();
-      const allAddresses = await provider.getAddresses();
-      const chainsArg = opts.chains ?? Object.keys(CHAINS).join(",");
-      const requestedChains = chainsArg.split(",").map((s2) => s2.trim()).filter(Boolean);
-      if (requestedChains.length === 0) {
-        throw new WalletError("VALIDATION_ERROR", "--chains must include at least one chain key");
-      }
-      const chainEntries = requestedChains.flatMap((chainKey) => {
-        const chain2 = getChainById(chainKey);
-        const addrEntry = allAddresses.find((a3) => a3.chainId === chainKey);
-        if (!chain2 || !addrEntry) return [];
-        return [{ chainKey, chain: chain2, address: addrEntry.address }];
-      });
-      if (chainEntries.length === 0) {
-        throw new WalletError(
-          "CHAIN_UNSUPPORTED",
-          `No supported chains found in --chains "${opts.chains}"`
-        );
-      }
-      const chainAssets = chainEntries.map(({ chainKey, chain: chain2, address }) => ({
-        chainKey,
-        chain: chain2,
-        token: void 0,
-        assetId: `c${chain2.coinId}`,
-        userAddress: address
-      }));
-      const tokenAssets = chainEntries.flatMap(({ chainKey, chain: chain2, address }) => {
-        const knownTokens = COMMON_TOKENS[chainKey];
-        if (!knownTokens) return [];
-        return Object.keys(knownTokens).flatMap((sym) => {
-          const resolved = resolveToken(sym, chainKey);
-          if (!resolved) return [];
-          return [
-            {
-              chainKey,
-              chain: chain2,
-              token: { ...resolved, symbol: sym },
-              assetId: `c${chain2.coinId}_t${resolved.address}`,
-              userAddress: address
-            }
-          ];
-        });
-      });
-      const allAssets = [...chainAssets, ...tokenAssets];
-      const balances = await fetchBalances(
-        httpClient,
-        allAssets.map(({ assetId, userAddress }) => ({ assetId, address: userAddress }))
-      );
-      const assetsById = new Map(allAssets.map((a3) => [a3.assetId, a3]));
-      const allRows = [];
-      for (const balance of balances) {
-        const assetInfo = assetsById.get(balance.assetId);
-        if (!assetInfo) {
-          throw new WalletError(
-            "NETWORK_ERROR",
-            "Could not fetch balances. Please try again later."
-          );
-        }
-        const { token, chain: chain2, chainKey, userAddress } = assetInfo;
-        const decimals = token ? token.decimals : chain2.decimals;
-        const symbol = token ? token.symbol ?? token.address : chain2.symbol;
-        const isToken = token !== void 0;
-        const humanAmount = formatAmount(balance.amounts.total, decimals);
-        const fiatRaw = balance.amounts.totalInFiat;
-        const usdValue = fiatRaw && fiatRaw !== "" ? parseFloat(fiatRaw) : null;
-        allRows.push({
-          chain: chainKey,
-          type: isToken ? "token" : "native",
-          symbol,
-          address: userAddress,
-          ...token ? { contract: token.address } : {},
-          balance: humanAmount,
-          usdValue
-        });
-      }
-      const rows = allRows.filter((r3) => r3.type === "native" || r3.balance !== "0");
-      rows.sort((a3, b3) => {
-        const chainCmp = String(a3.chain).localeCompare(String(b3.chain));
-        if (chainCmp !== 0) return chainCmp;
-        return String(a3.type).localeCompare(String(b3.type));
-      });
-      if (opts.json) {
-        output(rows, true);
-      } else {
-        const totalUsd = rows.reduce(
-          (sum, r3) => sum + (typeof r3.usdValue === "number" ? r3.usdValue : 0),
-          0
-        );
-        console.log("Chain        Type    Symbol            Balance               USD");
-        console.log("\u2500".repeat(72));
-        for (const r3 of rows) {
-          const usd = r3.usdValue !== null ? `$${r3.usdValue.toFixed(2)}` : "";
-          console.log(
-            `${String(r3.chain).padEnd(12)} ${String(r3.type).padEnd(7)} ${String(r3.symbol).padEnd(17)} ${String(r3.balance).padEnd(20)} ${usd}`
-          );
-        }
-        console.log("\u2500".repeat(72));
-        console.log(`Total USD: $${totalUsd.toFixed(2)}`);
-      }
-    } catch (err) {
-      handleCommandError(err, opts.json, "Portfolio failed");
-    }
-    safeExit();
-  });
-  wallet.command("sign-message").description("Sign a message with the agent wallet").requiredOption("--chain <key>", "Chain key (e.g., ethereum, solana)").requiredOption("--message <text>", "Message to sign").option(
-    "--password <password>",
-    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
-  ).option("--json", "JSON output").action(async (opts) => {
-    try {
-      if (!getChainById(opts.chain)) {
-        throw new WalletError("CHAIN_UNSUPPORTED", `Unknown chain: ${opts.chain}`);
-      }
-      await ensureTrustSDK();
-      const password3 = await resolvePassword(opts);
-      const provider = await AgentWalletProvider.fromStorage(password3);
-      const address = await provider.getAddress(opts.chain);
-      const signature = await provider.signMessage(opts.chain, opts.message);
-      output({ chain: opts.chain, address, message: opts.message, signature }, opts.json);
-    } catch (err) {
-      handleCommandError(err, opts.json, "Sign failed");
-    }
-    safeExit();
-  });
-  wallet.command("register").description("Register wallet addresses with Trust Wallet backend (enables token holdings)").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (opts) => {
-    try {
-      const creds = await ensureTrustSDK();
-      const password3 = await resolvePassword(opts);
-      const provider = await AgentWalletProvider.fromStorage(password3);
-      await registerWalletWithBackend(creds, provider);
-      if (!opts.json) success("Wallet registered with backend");
-      const addresses = await provider.getAddresses();
-      output({ registered: true, chains: addresses.length }, opts.json);
-    } catch (err) {
-      handleCommandError(err, opts.json, "Registration failed");
-    }
-    safeExit();
-  });
-}
-
-// src/commands/transfer.ts
-init_dist();
-
-// ../swap/dist/index.mjs
-init_dist();
-init_dist();
-
-// ../contracts/dist/index.mjs
-init_dist();
-init_dist();
-init_dist();
-init_dist();
-init_dist3();
-init_dist();
-init_dist();
-init_dist();
-var HEX_PATTERN = /^0x[0-9a-fA-F]*$/;
-function isHex(value) {
-  return HEX_PATTERN.test(value);
-}
-function hexToBytes3(hex2) {
-  if (!isHex(hex2)) {
-    throw new TwakValidationError(`Invalid hex string: ${hex2}`, { kind: "invalidHex" });
-  }
-  const clean2 = hex2.slice(2);
-  if (clean2.length % 2 !== 0) {
-    throw new TwakValidationError(`Hex string has odd length: ${hex2}`, { kind: "invalidHex" });
-  }
-  const out = new Uint8Array(clean2.length / 2);
-  for (let i2 = 0; i2 < out.length; i2++) {
-    out[i2] = parseInt(clean2.slice(i2 * 2, i2 * 2 + 2), 16);
-  }
-  return out;
-}
-function bytesToHex3(bytes) {
-  let out = "0x";
-  for (let i2 = 0; i2 < bytes.length; i2++) {
-    out += bytes[i2].toString(16).padStart(2, "0");
-  }
-  return out;
-}
-function hexOrUtf8ToBytesHex(value) {
-  const looksHex = value.length >= 2 && value[0] === "0" && (value[1] === "x" || value[1] === "X");
-  if (looksHex) {
-    const canonical = "0x" + value.slice(2);
-    if (!isHex(canonical)) {
-      throw new TwakValidationError(
-        `Value starts with "0x" but is not valid hex: ${value}. Use only [0-9a-fA-F] characters, or drop the "0x" prefix to send a UTF-8 string.`,
-        { kind: "invalidHex" }
-      );
-    }
-    if ((canonical.length - 2) % 2 !== 0) {
-      throw new TwakValidationError(
-        `Hex value has odd length: ${value}. Solidity bytes must be byte-aligned.`,
-        { kind: "invalidHex" }
-      );
-    }
-    return canonical;
-  }
-  return bytesToHex3(new TextEncoder().encode(value));
-}
-function wc2() {
-  return getWalletCore();
-}
-var BRIDGE = {
-  createAbiFunction(name2) {
-    const ctor = wc2().EthereumAbiFunction;
-    if (typeof ctor?.createWithString === "function") {
-      return ctor.createWithString(name2);
-    }
-    return new ctor(name2);
-  },
-  encode(fn2) {
-    return wc2().EthereumAbi.encode(fn2);
-  },
-  decodeOutput(fn2, data) {
-    return wc2().EthereumAbi.decodeOutput(fn2, data);
-  },
-  keccak256(data) {
-    return wc2().Hash.keccak256(data);
-  }
-};
-function getAbiBridge() {
-  return BRIDGE;
-}
-function findAbiFunction(abi, methodName) {
-  const entry = abi.find(
-    (e2) => e2.type === "function" && e2.name === methodName
-  );
-  if (!entry) {
-    throw new TwakValidationError(`Unknown ABI method: ${methodName}`, {
-      kind: "unknownMethod",
-      methodName
-    });
-  }
-  return entry;
-}
-function encodeFunctionCall(abi, methodName, args) {
-  const fnDef = findAbiFunction(abi, methodName);
-  if (args.length !== fnDef.inputs.length) {
-    throw new TwakValidationError(
-      `Wrong arg count for ${methodName}: expected ${fnDef.inputs.length}, got ${args.length}`,
-      {
-        kind: "wrongArgCount",
-        methodName,
-        expected: fnDef.inputs.length,
-        actual: args.length
-      }
-    );
-  }
-  const bridge = getAbiBridge();
-  const fn2 = bridge.createAbiFunction(methodName);
-  fnDef.inputs.forEach((param, i2) => {
-    pushParam(fn2, param, args[i2], methodName);
-  });
-  return bytesToHex3(bridge.encode(fn2));
-}
-function pushParam(fn2, param, value, methodName) {
-  const type = param.type;
-  const isOutput = false;
-  if (type === "address") {
-    fn2.addParamAddress(toAddressBytes(value, param, methodName), isOutput);
-    return;
-  }
-  if (type === "bool") {
-    if (typeof value !== "boolean") {
-      throw argTypeMismatch(methodName, param, value, "boolean");
-    }
-    fn2.addParamBool(value, isOutput);
-    return;
-  }
-  if (type === "string") {
-    if (typeof value !== "string") {
-      throw argTypeMismatch(methodName, param, value, "string");
+    fn2.addParamBool(value, isOutput);
+    return;
+  }
+  if (type === "string") {
+    if (typeof value !== "string") {
+      throw argTypeMismatch(methodName, param, value, "string");
     }
     fn2.addParamString(value, isOutput);
     return;
@@ -41311,32 +40802,8 @@ function pushParam(fn2, param, value, methodName) {
   }
   const intMatch = /^(u?)int(\d*)$/.exec(type);
   if (intMatch) {
-    const isUnsigned = intMatch[1] === "u";
-    const bits = intMatch[2] ? Number(intMatch[2]) : 256;
-    if (bits < 8 || bits > 256 || bits % 8 !== 0) {
-      throw new TwakValidationError(
-        `Unsupported integer width ${type} for ${methodName}.${param.name} (expected 8..256, multiple of 8)`,
-        { kind: "argTypeMismatch", methodName, paramName: param.name, type }
-      );
-    }
-    const bigValue = toBigInt2(value, param, methodName);
-    if (isUnsigned) {
-      if (bigValue < 0n || bigValue >= 1n << BigInt(bits)) {
-        throw argTypeMismatch(methodName, param, value, `uint${bits} (0 <= x < 2^${bits})`);
-      }
-    } else {
-      const limit = 1n << BigInt(bits - 1);
-      if (bigValue < -limit || bigValue >= limit) {
-        throw argTypeMismatch(
-          methodName,
-          param,
-          value,
-          `int${bits} (-2^${bits - 1} <= x < 2^${bits - 1})`
-        );
-      }
-    }
-    const bytes = bigIntToBytes32(bigValue, isUnsigned);
-    if (isUnsigned) {
+    const bytes = encodeIntWord(type, value, param, methodName);
+    if (intMatch[1] === "u") {
       fn2.addParamUInt256(bytes, isOutput);
     } else {
       fn2.addParamInt256(bytes, isOutput);
@@ -41423,6 +40890,165 @@ function argTypeMismatch(methodName, param, value, expected) {
     }
   );
 }
+function encodeIntWord(type, value, param, methodName) {
+  const intMatch = /^(u?)int(\d*)$/.exec(type);
+  const isUnsigned = intMatch[1] === "u";
+  const bits = intMatch[2] ? Number(intMatch[2]) : 256;
+  if (bits < 8 || bits > 256 || bits % 8 !== 0) {
+    throw new TwakValidationError(
+      `Unsupported integer width ${type} for ${methodName}.${param.name} (expected 8..256, multiple of 8)`,
+      { kind: "argTypeMismatch", methodName, paramName: param.name, type }
+    );
+  }
+  const bigValue = toBigInt2(value, param, methodName);
+  if (isUnsigned) {
+    if (bigValue < 0n || bigValue >= 1n << BigInt(bits)) {
+      throw argTypeMismatch(methodName, param, value, `uint${bits} (0 <= x < 2^${bits})`);
+    }
+  } else {
+    const limit = 1n << BigInt(bits - 1);
+    if (bigValue < -limit || bigValue >= limit) {
+      throw argTypeMismatch(
+        methodName,
+        param,
+        value,
+        `int${bits} (-2^${bits - 1} <= x < 2^${bits - 1})`
+      );
+    }
+  }
+  return bigIntToBytes32(bigValue, isUnsigned);
+}
+function encoderRequiresHandRoll(params) {
+  return params.some((p3) => p3.type === "tuple" || p3.type.endsWith("[]"));
+}
+function isDynamicType(param) {
+  const t = param.type;
+  if (t === "string" || t === "bytes") return true;
+  if (t.endsWith("[]")) return true;
+  if (t === "tuple") return (param.components ?? []).some(isDynamicType);
+  return false;
+}
+function canonicalType(param) {
+  const t = param.type;
+  if (t === "tuple") return `(${(param.components ?? []).map(canonicalType).join(",")})`;
+  if (t === "tuple[]") return `(${(param.components ?? []).map(canonicalType).join(",")})[]`;
+  if (t.startsWith("tuple")) {
+    throw new TwakValidationError(`Unsupported tuple array shape "${t}" for ${param.name}`, {
+      kind: "argTypeMismatch",
+      paramName: param.name,
+      type: t
+    });
+  }
+  return t;
+}
+function numberToWord(n4) {
+  const out = new Uint8Array(32);
+  let v5 = BigInt(n4);
+  for (let i2 = 31; i2 >= 0; i2--) {
+    out[i2] = Number(v5 & 0xffn);
+    v5 >>= 8n;
+  }
+  return out;
+}
+function padRight32(bytes) {
+  const out = new Uint8Array(Math.ceil(bytes.length / 32) * 32);
+  out.set(bytes);
+  return out;
+}
+function concatBytes3(parts) {
+  const total = parts.reduce((acc, p3) => acc + p3.length, 0);
+  const out = new Uint8Array(total);
+  let offset = 0;
+  for (const p3 of parts) {
+    out.set(p3, offset);
+    offset += p3.length;
+  }
+  return out;
+}
+function encodeHeadTail(items) {
+  let headLen = 0;
+  for (const it4 of items) headLen += it4.dynamic ? 32 : it4.bytes.length;
+  const head = [];
+  const tail = [];
+  let offset = headLen;
+  for (const it4 of items) {
+    if (it4.dynamic) {
+      head.push(numberToWord(offset));
+      tail.push(it4.bytes);
+      offset += it4.bytes.length;
+    } else {
+      head.push(it4.bytes);
+    }
+  }
+  return concatBytes3([...head, ...tail]);
+}
+function encodeAbiValue(param, value, methodName) {
+  const t = param.type;
+  if (t.endsWith("[]")) {
+    if (!Array.isArray(value)) {
+      throw argTypeMismatch(methodName, param, value, `${t} (array)`);
+    }
+    const base3 = { ...param, type: t.slice(0, -2) };
+    const items = value.map((v5) => encodeAbiValue(base3, v5, methodName));
+    return {
+      dynamic: true,
+      bytes: concatBytes3([numberToWord(value.length), encodeHeadTail(items)])
+    };
+  }
+  if (t === "tuple") {
+    const components = param.components ?? [];
+    if (!Array.isArray(value) || value.length !== components.length) {
+      throw argTypeMismatch(methodName, param, value, `tuple of ${components.length} components`);
+    }
+    const items = components.map((c3, i2) => encodeAbiValue(c3, value[i2], methodName));
+    return { dynamic: isDynamicType(param), bytes: encodeHeadTail(items) };
+  }
+  if (t === "string") {
+    if (typeof value !== "string") {
+      throw argTypeMismatch(methodName, param, value, "string");
+    }
+    const b3 = new TextEncoder().encode(value);
+    return { dynamic: true, bytes: concatBytes3([numberToWord(b3.length), padRight32(b3)]) };
+  }
+  if (t === "bytes") {
+    const b3 = toBytes4(value, param, methodName);
+    return { dynamic: true, bytes: concatBytes3([numberToWord(b3.length), padRight32(b3)]) };
+  }
+  if (t === "address") {
+    const word = new Uint8Array(32);
+    word.set(toAddressBytes(value, param, methodName), 12);
+    return { dynamic: false, bytes: word };
+  }
+  const bytesNMatch = /^bytes(\d+)$/.exec(t);
+  if (bytesNMatch) {
+    const size3 = Number(bytesNMatch[1]);
+    return { dynamic: false, bytes: padRight32(toBytesFix(value, size3, param, methodName)) };
+  }
+  if (/^u?int\d*$/.test(t)) {
+    return { dynamic: false, bytes: encodeIntWord(t, value, param, methodName) };
+  }
+  if (t === "bool") {
+    if (typeof value !== "boolean") {
+      throw argTypeMismatch(methodName, param, value, "boolean");
+    }
+    return { dynamic: false, bytes: numberToWord(value ? 1 : 0) };
+  }
+  throw new TwakValidationError(
+    `Unsupported ABI param type "${t}" for ${methodName}.${param.name}`,
+    {
+      kind: "argTypeMismatch",
+      methodName,
+      paramName: param.name,
+      type: t
+    }
+  );
+}
+function encodeFunctionCallHandRoll(methodName, inputs, args) {
+  const signature = `${methodName}(${inputs.map(canonicalType).join(",")})`;
+  const selector = getAbiBridge().keccak256(new TextEncoder().encode(signature)).slice(0, 4);
+  const body = encodeHeadTail(inputs.map((p3, i2) => encodeAbiValue(p3, args[i2], methodName)));
+  return bytesToHex3(concatBytes3([selector, body]));
+}
 function decodeFunctionResult(abi, methodName, returnHex) {
   const fnDef = findAbiFunction(abi, methodName);
   if (fnDef.outputs.length === 0) return void 0;
@@ -41806,14 +41432,14 @@ function buildWriteProxy(abi, address, chainKey, client) {
           });
         }
         const data = encodeFunctionCall(abi, prop, args);
-        const txHash = await signer.sendTransaction({
+        const hash = await signer.sendTransaction({
           chainId: chainKeyToCaip2(chainKey),
           to: address,
           data,
           value: "0x0"
         });
         return makeContractPendingTransaction({
-          txHash,
+          hash,
           abi,
           address,
           chainKey,
@@ -41825,22 +41451,22 @@ function buildWriteProxy(abi, address, chainKey, client) {
   });
 }
 function makeContractPendingTransaction(opts) {
-  const { txHash, abi, address, chainKey, client, methodName } = opts;
+  const { hash, abi, address, chainKey, client, methodName } = opts;
   return {
-    txHash,
+    hash,
     async wait(waitOpts) {
-      const receipt = await client.waitForReceipt(chainKey, txHash, {
+      const receipt = await client.waitForReceipt(chainKey, hash, {
         timeoutMs: waitOpts?.timeoutMs
       });
       if (receipt.status === "0x0") {
         throw new TwakError(
           `Transaction reverted on-chain: ${receipt.transactionHash}`,
           "TX_FAILED",
-          { txHash: receipt.transactionHash, methodName, receipt }
+          { hash: receipt.transactionHash, methodName, receipt }
         );
       }
       return {
-        txHash: receipt.transactionHash,
+        hash: receipt.transactionHash,
         blockNumber: hexToSafeNumber(receipt.blockNumber, "blockNumber"),
         events: extractEvents(abi, receipt.logs, address)
       };
@@ -41937,6 +41563,17 @@ function lookupAddress(id, addresses, chainKey) {
   }
   return address;
 }
+function eip191Digest(message) {
+  const messageBytes = new TextEncoder().encode(message);
+  const prefixBytes = new TextEncoder().encode(
+    `Ethereum Signed Message:
+${messageBytes.length}`
+  );
+  const data = new Uint8Array(prefixBytes.length + messageBytes.length);
+  data.set(prefixBytes);
+  data.set(messageBytes, prefixBytes.length);
+  return bytesToHex3(getAbiBridge().keccak256(data));
+}
 var ERC20_ABI = [
   {
     type: "function",
@@ -42005,6 +41642,25 @@ var ERC8004_ABI = [
     outputs: [{ name: "agentId", type: "uint256" }],
     stateMutability: "nonpayable"
   },
+  {
+    // register(agentURI, metadata[]) — mints + sets metadata atomically in one
+    // tx. metadata is an array of (key, value) where value is raw bytes.
+    type: "function",
+    name: "register",
+    inputs: [
+      { name: "agentURI", type: "string" },
+      {
+        name: "metadata",
+        type: "tuple[]",
+        components: [
+          { name: "key", type: "string" },
+          { name: "value", type: "bytes" }
+        ]
+      }
+    ],
+    outputs: [{ name: "agentId", type: "uint256" }],
+    stateMutability: "nonpayable"
+  },
   {
     type: "function",
     name: "setAgentURI",
@@ -42100,7 +41756,8 @@ var ERC8004_ABI = [
   }
 ];
 var ERC8004_ADDRESSES = {
-  bsc: "0x8004a169fb4a3325136eb29fa0ceb6d2e539a432"
+  bsc: "0x8004a169fb4a3325136eb29fa0ceb6d2e539a432",
+  bsctestnet: "0x8004a818bfb912233c491871b3d84c89a494bd9e"
 };
 var erc8004 = defineContract({
   id: "erc8004",
@@ -42496,6 +42153,29 @@ var ERC8183_POLICY_ABI = [
     outputs: [],
     stateMutability: "nonpayable"
   },
+  {
+    type: "function",
+    name: "disputeWindow",
+    inputs: [],
+    outputs: [{ name: "", type: "uint64" }],
+    stateMutability: "view"
+  },
+  {
+    // When the policy recorded the job's submission (0 if not submitted).
+    type: "function",
+    name: "submittedAt",
+    inputs: [{ name: "jobId", type: "uint256" }],
+    outputs: [{ name: "", type: "uint64" }],
+    stateMutability: "view"
+  },
+  {
+    // Vote quorum snapshotted for the job when its dispute was raised.
+    type: "function",
+    name: "disputeQuorumSnapshot",
+    inputs: [{ name: "jobId", type: "uint256" }],
+    outputs: [{ name: "", type: "uint16" }],
+    stateMutability: "view"
+  },
   {
     type: "function",
     name: "disputed",
@@ -42547,13 +42227,16 @@ var ERC8183_POLICY_ABI = [
   }
 ];
 var ERC8183_COMMERCE_ADDRESSES = {
-  bsc: "0xea4daa3100a767e86fded867729ae7446476eba6"
+  bsc: "0xea4daa3100a767e86fded867729ae7446476eba6",
+  bsctestnet: "0xa206c0517b6371c6638cd9e4a42cc9f02a33b0de"
 };
 var ERC8183_ROUTER_ADDRESSES = {
-  bsc: "0x51895229e12f9876011789b04f8698af06ccd6da"
+  bsc: "0x51895229e12f9876011789b04f8698af06ccd6da",
+  bsctestnet: "0xd7d36d66d2f1b608a0f943f722d27e3744f66f25"
 };
 var ERC8183_POLICY_ADDRESSES = {
-  bsc: "0x9c01845705b3078aa2e8cff7520a6376fd766de5"
+  bsc: "0x9c01845705b3078aa2e8cff7520a6376fd766de5",
+  bsctestnet: "0x4f4678d4439fec812ac7674bb3efb4c8f5fb78a6"
 };
 var erc8183Commerce = defineContract({
   id: "erc8183-commerce",
@@ -42604,8 +42287,640 @@ function resolveErc8183Contracts(client, chainInput) {
   };
 }
 
+// src/branding.ts
+var import_chalk5 = __toESM(require_source());
+var boxen = require_boxen();
+var SHIELD = [
+  "                @@=+                ",
+  "           @@@@@@@=======           ",
+  "     @@@@@@@@@@@@@============+     ",
+  "  @@@@@@@@@@@@@@@@================  ",
+  "  @@@@@@@@@@@@@@@@+===============  ",
+  "  @@@@@@@@@@@@@@@@++++============  ",
+  "  @@@@@@@@@@@@@@@@++++++++++=====+  ",
+  "  @@@@@@@@@@@@@@@@**++++++++++++++  ",
+  "  @@@@@@@@@@@@@@@@********++++++++  ",
+  "  @@@@@@@@@@@@@@@@**************++  ",
+  "  @@@@@@@@@@@@@@@@#####***********  ",
+  "   @@@@@@@@@@@@@@@###########****   ",
+  "    @@@@@@@@@@@@@@%##############   ",
+  "    @@@@@@@@@@@@@@%%%%%%%#######    ",
+  "     @@@@@@@@@@@@@%%%%%%%%%%%%%     ",
+  "       @@@@@@@@@@@%%%%%%%%%%%       ",
+  "         @@@@@@@@@@@@@%%%%%         ",
+  "           @@@@@@@@@@@@@@           ",
+  "             @@@@@@@@@@             ",
+  "                 @@                 "
+];
+function printBanner(version3) {
+  const logo = SHIELD.map((l4) => import_chalk5.default.green(l4)).join("\n");
+  const title = import_chalk5.default.green.bold("  Trust Wallet Agent Kit");
+  const ver = import_chalk5.default.dim(`  v${version3}`);
+  console.log(
+    boxen(`${logo}
+
+${title}
+${ver}`, {
+      borderColor: "green",
+      borderStyle: "round",
+      padding: { top: 1, bottom: 1, left: 2, right: 2 }
+    })
+  );
+}
+function box(content) {
+  return boxen(content, {
+    borderColor: "green",
+    borderStyle: "round",
+    padding: { top: 0, bottom: 0, left: 1, right: 1 }
+  });
+}
+
+// src/commands/wallet.ts
+function getQRString(address) {
+  try {
+    const qrcode = require("qrcode-terminal");
+    let result = "";
+    qrcode.generate(address, { small: true }, (code2) => {
+      result = code2;
+    });
+    return result;
+  } catch {
+    return "";
+  }
+}
+function registerWalletCommand(program3) {
+  const wallet = program3.command("wallet").description("Manage agent wallet");
+  wallet.command("create").description("Create a new agent wallet").requiredOption("--password <password>", "Password to encrypt the wallet").option("--no-keychain", "Do not save password to OS keychain").option("--skip-password-check", "Skip password strength validation").option("--json", "JSON output").action(async (opts) => {
+    try {
+      if (!opts.skipPasswordCheck) {
+        const weakness = getPasswordWeaknesses(opts.password);
+        if (weakness) {
+          throw new WalletError("VALIDATION_ERROR", `Password too weak: must ${weakness}.`);
+        }
+      }
+      await ensureTrustSDK();
+      const store = new WalletConfigStore();
+      if (await store.exists()) {
+        throw new WalletError(
+          "WALLET_EXISTS",
+          "Wallet already exists. Back up ~/.twak/wallet.json, then delete it to create a new one."
+        );
+      }
+      const provider = await AgentWalletProvider.create(opts.password);
+      const addresses = await provider.getAddresses();
+      if (opts.keychain !== false) {
+        const kc2 = new KeychainManager();
+        if (kc2.isAvailable()) {
+          await kc2.saveWalletPassword(opts.password);
+          if (!opts.json) info("Password saved to OS keychain (use --no-keychain to skip)");
+        }
+      }
+      if (!opts.json) success("Agent wallet created successfully");
+      try {
+        const creds = await getCredentials();
+        await registerWalletWithBackend(creds, provider);
+        if (!opts.json) info("Wallet registered with backend");
+      } catch {
+        if (!opts.json) warn("Backend registration failed (holdings may be limited)");
+      }
+      if (opts.json) {
+        output({ addresses }, true);
+      } else {
+        info(`Generated addresses for ${addresses.length} chains`);
+      }
+    } catch (err) {
+      handleCommandError(err, opts.json, "Wallet creation failed");
+    }
+    safeExit();
+  });
+  wallet.command("address").description("Get wallet address for a chain").requiredOption("--chain <key>", "Chain key (e.g., ethereum, solana)").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (opts) => {
+    try {
+      if (!getChainById(opts.chain)) {
+        throw new WalletError("CHAIN_UNSUPPORTED", `Unknown chain: ${opts.chain}`);
+      }
+      await ensureTrustSDK();
+      const password3 = await resolvePassword(opts);
+      const provider = await AgentWalletProvider.fromStorage(password3);
+      const address = await provider.getAddress(opts.chain);
+      if (opts.json) {
+        output({ chain: opts.chain, address }, true);
+      } else {
+        const qr3 = getQRString(address);
+        const content = `${import_chalk6.default.dim("Chain")}    ${import_chalk6.default.bold(opts.chain)}
+${import_chalk6.default.dim("Address")}  ${import_chalk6.default.green(address)}
+
+${qr3}`;
+        console.log(box(content));
+      }
+    } catch (err) {
+      handleCommandError(err, opts.json, "Wallet address failed");
+    }
+    safeExit();
+  });
+  wallet.command("addresses").description("List all wallet addresses").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (opts) => {
+    try {
+      await ensureTrustSDK();
+      const password3 = await resolvePassword(opts);
+      const provider = await AgentWalletProvider.fromStorage(password3);
+      const addresses = await provider.getAddresses();
+      if (opts.json) {
+        output({ addresses }, true);
+      } else {
+        const grouped = /* @__PURE__ */ new Map();
+        for (const addr of addresses) {
+          const chains = grouped.get(addr.address) ?? [];
+          chains.push(addr.chainId);
+          grouped.set(addr.address, chains);
+        }
+        for (const [address, chains] of grouped) {
+          const qr3 = getQRString(address);
+          const maxWidth = Math.max(address.length + 9, 50);
+          const chainLabel = `${import_chalk6.default.dim("Chains")}   `;
+          const chainLabelLen = 9;
+          const chainLines = [];
+          let line = "";
+          for (const c3 of chains) {
+            const sep2 = line ? ", " : "";
+            if (line && line.length + sep2.length + c3.length + chainLabelLen > maxWidth) {
+              chainLines.push(line);
+              line = c3;
+            } else {
+              line += sep2 + c3;
+            }
+          }
+          if (line) chainLines.push(line);
+          const chainsStr = chainLines.map((l4, i2) => (i2 === 0 ? chainLabel : " ".repeat(chainLabelLen)) + import_chalk6.default.bold(l4)).join("\n");
+          const content = `${chainsStr}
+${import_chalk6.default.dim("Address")}  ${import_chalk6.default.green(address)}
+
+${qr3}`;
+          console.log(box(content));
+        }
+      }
+    } catch (err) {
+      handleCommandError(err, opts.json, "Wallet addresses failed");
+    }
+    safeExit();
+  });
+  wallet.command("balance").description("Get wallet balance on a chain (native + token holdings)").option("--chain <key>", "Chain key").option("--all", "Show balances across all chains with funds").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--no-tokens", "Skip token balance lookup").option("--json", "JSON output").action(async (opts) => {
+    try {
+      if (opts.all && opts.chain) {
+        throw new WalletError("VALIDATION_ERROR", "--all and --chain are mutually exclusive");
+      }
+      if (!opts.all && !opts.chain) {
+        throw new WalletError("VALIDATION_ERROR", "Provide --chain <key> or --all");
+      }
+      await ensureTrustSDK();
+      const password3 = await resolvePassword(opts);
+      const provider = await AgentWalletProvider.fromStorage(password3);
+      const httpClient = await getClient();
+      if (!opts.all) {
+        const chain2 = getChainById(opts.chain);
+        if (!chain2) {
+          throw new WalletError("CHAIN_UNSUPPORTED", `Unknown chain: ${opts.chain}`);
+        }
+      }
+      const allAddresses = await provider.getAddresses();
+      const addressMap = /* @__PURE__ */ new Map();
+      for (const a3 of allAddresses) addressMap.set(a3.chainId, a3.address);
+      const requestedChains = opts.all ? Object.keys(CHAINS) : [opts.chain];
+      const skipTokens = opts.tokens === false;
+      const chainEntries = requestedChains.flatMap((chainKey) => {
+        const chain2 = getChainById(chainKey);
+        const address = addressMap.get(chainKey);
+        if (!chain2 || !address) return [];
+        return [{ chainKey, chain: chain2, address }];
+      });
+      if (!opts.all && chainEntries.length === 0) {
+        throw new WalletError(
+          "CHAIN_UNSUPPORTED",
+          `Wallet does not have an address for chain: ${opts.chain}`
+        );
+      }
+      const nativeAssets = chainEntries.map(({ chainKey, chain: chain2, address }) => ({
+        chainKey,
+        chain: chain2,
+        token: void 0,
+        assetId: `c${chain2.coinId}`,
+        userAddress: address
+      }));
+      const tokenAssets = skipTokens ? [] : chainEntries.flatMap(({ chainKey, chain: chain2, address }) => {
+        const knownTokens = COMMON_TOKENS[chainKey];
+        if (!knownTokens) return [];
+        return Object.keys(knownTokens).flatMap((sym) => {
+          const resolved = resolveToken(sym, chainKey);
+          if (!resolved) return [];
+          return [
+            {
+              chainKey,
+              chain: chain2,
+              token: { ...resolved, symbol: sym },
+              assetId: `c${chain2.coinId}_t${resolved.address}`,
+              userAddress: address
+            }
+          ];
+        });
+      });
+      const allAssets = [...nativeAssets, ...tokenAssets];
+      const balances = await fetchBalances(
+        httpClient,
+        allAssets.map(({ assetId, userAddress }) => ({ assetId, address: userAddress }))
+      );
+      const assetsById = new Map(allAssets.map((a3) => [a3.assetId, a3]));
+      const resultsByChain = /* @__PURE__ */ new Map();
+      for (const { chainKey, chain: chain2, address } of chainEntries) {
+        resultsByChain.set(chainKey, {
+          chain: chainKey,
+          address,
+          symbol: chain2.symbol,
+          available: "0",
+          total: "0",
+          totalUsd: null,
+          tokens: []
+        });
+      }
+      for (const balance of balances) {
+        const assetInfo = assetsById.get(balance.assetId);
+        if (!assetInfo) {
+          throw new WalletError(
+            "NETWORK_ERROR",
+            "Could not fetch balances. Please try again later."
+          );
+        }
+        const result = resultsByChain.get(assetInfo.chainKey);
+        if (!result) continue;
+        const { token, chain: chain2 } = assetInfo;
+        const amts = balance.amounts;
+        if (token) {
+          const human = formatAmount(amts.total ?? "0", token.decimals);
+          if (human !== "0") {
+            result.tokens.push({
+              symbol: token.symbol,
+              contract: token.address,
+              balance: human
+            });
+          }
+        } else {
+          result.available = formatAmount(amts.available ?? "0", chain2.decimals);
+          result.total = formatAmount(amts.total ?? "0", chain2.decimals);
+          const lockedHuman = formatAmount(amts.locked ?? "0", chain2.decimals);
+          if (lockedHuman !== "0") result.staked = lockedHuman;
+          const fiat = amts.totalInFiat;
+          result.totalUsd = fiat && fiat !== "" ? parseFloat(fiat) : null;
+        }
+      }
+      const orderedResults = chainEntries.map((e2) => resultsByChain.get(e2.chainKey)).filter((r3) => r3 !== void 0);
+      const visible = opts.all ? orderedResults.filter((r3) => r3.total !== "0" || r3.tokens.length > 0) : orderedResults;
+      const renderBlock = (r3, withSeparator) => {
+        if (withSeparator) console.log("");
+        console.log(import_chalk6.default.bold.underline(`${r3.chain} (${r3.symbol})`));
+        console.log(`  ${import_chalk6.default.dim("Address")}    ${r3.address}`);
+        console.log(`  ${import_chalk6.default.dim("Available")}  ${r3.available}`);
+        if (r3.staked) console.log(`  ${import_chalk6.default.dim("Staked")}     ${r3.staked}`);
+        const usdSuffix = r3.totalUsd !== null ? ` (\u2248 $${r3.totalUsd.toFixed(2)})` : "";
+        console.log(`  ${import_chalk6.default.dim("Total")}      ${r3.total}${usdSuffix}`);
+        if (r3.tokens.length > 0) {
+          console.log(`  ${import_chalk6.default.dim("Tokens:")}`);
+          for (const t of r3.tokens) {
+            console.log(`    ${import_chalk6.default.bold(t.symbol.padEnd(10))} ${t.balance}`);
+          }
+        }
+      };
+      if (opts.all) {
+        if (opts.json) {
+          output(visible, true);
+        } else if (visible.length === 0) {
+          info("No chains with non-zero native balance found.");
+        } else {
+          visible.forEach((r3, i2) => renderBlock(r3, i2 > 0));
+        }
+      } else {
+        const single = visible[0];
+        if (opts.json) {
+          output(single, true);
+        } else {
+          renderBlock(single, false);
+        }
+      }
+    } catch (err) {
+      handleCommandError(err, opts.json, "Balance check failed");
+    }
+    safeExit();
+  });
+  const keychain = wallet.command("keychain").description("Manage wallet password in OS keychain");
+  keychain.command("save").description("Save wallet password to OS keychain").requiredOption("--password <password>", "Wallet password to store").option("--json", "JSON output").action(async (opts) => {
+    try {
+      const kc2 = new KeychainManager();
+      if (!kc2.isAvailable()) {
+        throw new WalletError("KEYCHAIN_UNAVAILABLE", "OS keychain not available on this system");
+      }
+      await kc2.saveWalletPassword(opts.password);
+      success("Wallet password saved to OS keychain");
+    } catch (err) {
+      handleCommandError(err, opts.json, "Keychain save failed");
+    }
+    safeExit();
+  });
+  keychain.command("delete").description("Remove wallet password from OS keychain").option("--json", "JSON output").action(async (opts) => {
+    try {
+      const kc2 = new KeychainManager();
+      if (!kc2.isAvailable()) {
+        throw new WalletError("KEYCHAIN_UNAVAILABLE", "OS keychain not available on this system");
+      }
+      await kc2.deleteWalletPassword();
+      success("Wallet password removed from OS keychain");
+    } catch (err) {
+      handleCommandError(err, opts.json, "Keychain delete failed");
+    }
+    safeExit();
+  });
+  keychain.command("check").description("Check if wallet password is stored in OS keychain").option("--json", "JSON output").action(async (opts) => {
+    try {
+      const kc2 = new KeychainManager();
+      if (!kc2.isAvailable()) {
+        if (opts.json) {
+          output({ available: false, stored: false }, true);
+        } else {
+          warn("keytar not available on this system");
+        }
+        safeExit();
+        return;
+      }
+      const pw = await kc2.getWalletPassword();
+      if (opts.json) {
+        output({ available: true, stored: !!pw }, true);
+      } else if (pw) {
+        success("Wallet password is stored in OS keychain");
+      } else {
+        info("No wallet password found in OS keychain");
+      }
+    } catch (err) {
+      handleCommandError(err, opts.json, "Keychain check failed");
+    }
+    safeExit();
+  });
+  wallet.command("connect").description("Connect external wallet via WalletConnect").option("--project-id <id>", "WalletConnect project ID (or set WALLETCONNECT_PROJECT_ID)").option(
+    "--chains <list>",
+    "Comma-separated CAIP-2 chain IDs",
+    "eip155:1,eip155:56,eip155:137,eip155:8453,eip155:42161"
+  ).option("--timeout <seconds>", "Connection timeout in seconds", "300").option("--json", "JSON output").action(async (opts) => {
+    try {
+      const projectId = opts.projectId || process.env.WALLETCONNECT_PROJECT_ID;
+      if (!projectId) {
+        throw new WalletError(
+          "VALIDATION_ERROR",
+          "WalletConnect project ID required. Use --project-id or set WALLETCONNECT_PROJECT_ID"
+        );
+      }
+      const provider = new WalletConnectProvider({ projectId });
+      const chains = opts.chains.split(",").map((s2) => s2.trim()).filter(Boolean);
+      info("Connecting via WalletConnect...");
+      const result = await provider.connect(chains);
+      const qr3 = getQRString(result.uri);
+      if (qr3) {
+        console.log(qr3);
+      }
+      info(`Trust Wallet: ${result.deepLinks.native}`);
+      info(`Universal:    ${result.deepLinks.universal}`);
+      info("\nWaiting for wallet approval...");
+      const timeoutMs = parseInt(opts.timeout, 10) * 1e3;
+      const session = await provider.waitForSession(timeoutMs);
+      if (opts.json) {
+        output(
+          {
+            connected: true,
+            address: session.address,
+            chainId: session.chainId,
+            peer: session.peerName
+          },
+          true
+        );
+      } else {
+        success(`Connected to ${session.peerName || "wallet"}`);
+        info(`  Address: ${session.address}`);
+        info(`  Chain:   ${session.chainId}`);
+      }
+    } catch (err) {
+      handleCommandError(err, opts.json, "WalletConnect failed");
+    }
+    safeExit();
+  });
+  wallet.command("status").description("Check wallet configuration status").option("--json", "JSON output").action(async (opts) => {
+    try {
+      const store = new WalletConfigStore();
+      const exists = await store.exists();
+      const kc2 = new KeychainManager();
+      const keychainHasPassword = kc2.isAvailable() ? !!await kc2.getWalletPassword() : false;
+      const totalChains = Object.keys(CHAINS).length;
+      let createdAt;
+      let addressCount;
+      if (exists) {
+        const config = await store.getConfig();
+        createdAt = config?.createdAt;
+        addressCount = config?.chains?.length ?? totalChains;
+      }
+      const result = {
+        agentWallet: exists ? "configured" : "not configured",
+        keychainPassword: keychainHasPassword ? "stored" : "not stored",
+        chains: totalChains,
+        supportedChains: totalChains,
+        ...createdAt ? { createdAt } : {},
+        ...addressCount !== void 0 ? { addressCount } : {}
+      };
+      if (opts.json) {
+        output(result, true);
+      } else {
+        console.log(
+          `  ${import_chalk6.default.dim("Wallet")}     ${exists ? import_chalk6.default.green("configured") : import_chalk6.default.yellow("not configured")}`
+        );
+        if (createdAt) console.log(`  ${import_chalk6.default.dim("Created")}    ${createdAt}`);
+        console.log(
+          `  ${import_chalk6.default.dim("Keychain")}   ${keychainHasPassword ? import_chalk6.default.green("password stored") : import_chalk6.default.yellow("no password")}`
+        );
+        console.log(`  ${import_chalk6.default.dim("Chains")}     ${totalChains} supported`);
+        if (addressCount !== void 0)
+          console.log(`  ${import_chalk6.default.dim("Addresses")}  ${addressCount}`);
+        if (!exists) info("\nRun `twak wallet create --password <pw>` to create a wallet.");
+      }
+    } catch (err) {
+      handleCommandError(err, opts.json, "Status failed");
+    }
+    safeExit();
+  });
+  wallet.command("portfolio").description("Show portfolio balances and USD values across chains, including token holdings").option("--chains <list>", "Comma-separated chain keys (default: all supported chains)").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (opts) => {
+    try {
+      await ensureTrustSDK();
+      const password3 = await resolvePassword(opts);
+      const provider = await AgentWalletProvider.fromStorage(password3);
+      const httpClient = await getClient();
+      const allAddresses = await provider.getAddresses();
+      const chainsArg = opts.chains ?? Object.keys(CHAINS).join(",");
+      const requestedChains = chainsArg.split(",").map((s2) => s2.trim()).filter(Boolean);
+      if (requestedChains.length === 0) {
+        throw new WalletError("VALIDATION_ERROR", "--chains must include at least one chain key");
+      }
+      const chainEntries = requestedChains.flatMap((chainKey) => {
+        const chain2 = getChainById(chainKey);
+        const addrEntry = allAddresses.find((a3) => a3.chainId === chainKey);
+        if (!chain2 || !addrEntry) return [];
+        return [{ chainKey, chain: chain2, address: addrEntry.address }];
+      });
+      if (chainEntries.length === 0) {
+        throw new WalletError(
+          "CHAIN_UNSUPPORTED",
+          `No supported chains found in --chains "${opts.chains}"`
+        );
+      }
+      const chainAssets = chainEntries.map(({ chainKey, chain: chain2, address }) => ({
+        chainKey,
+        chain: chain2,
+        token: void 0,
+        assetId: `c${chain2.coinId}`,
+        userAddress: address
+      }));
+      const tokenAssets = chainEntries.flatMap(({ chainKey, chain: chain2, address }) => {
+        const knownTokens = COMMON_TOKENS[chainKey];
+        if (!knownTokens) return [];
+        return Object.keys(knownTokens).flatMap((sym) => {
+          const resolved = resolveToken(sym, chainKey);
+          if (!resolved) return [];
+          return [
+            {
+              chainKey,
+              chain: chain2,
+              token: { ...resolved, symbol: sym },
+              assetId: `c${chain2.coinId}_t${resolved.address}`,
+              userAddress: address
+            }
+          ];
+        });
+      });
+      const allAssets = [...chainAssets, ...tokenAssets];
+      const balances = await fetchBalances(
+        httpClient,
+        allAssets.map(({ assetId, userAddress }) => ({ assetId, address: userAddress }))
+      );
+      const assetsById = new Map(allAssets.map((a3) => [a3.assetId, a3]));
+      const allRows = [];
+      for (const balance of balances) {
+        const assetInfo = assetsById.get(balance.assetId);
+        if (!assetInfo) {
+          throw new WalletError(
+            "NETWORK_ERROR",
+            "Could not fetch balances. Please try again later."
+          );
+        }
+        const { token, chain: chain2, chainKey, userAddress } = assetInfo;
+        const decimals = token ? token.decimals : chain2.decimals;
+        const symbol = token ? token.symbol ?? token.address : chain2.symbol;
+        const isToken = token !== void 0;
+        const humanAmount = formatAmount(balance.amounts.total, decimals);
+        const fiatRaw = balance.amounts.totalInFiat;
+        const usdValue = fiatRaw && fiatRaw !== "" ? parseFloat(fiatRaw) : null;
+        allRows.push({
+          chain: chainKey,
+          type: isToken ? "token" : "native",
+          symbol,
+          address: userAddress,
+          ...token ? { contract: token.address } : {},
+          balance: humanAmount,
+          usdValue
+        });
+      }
+      const rows = allRows.filter((r3) => r3.type === "native" || r3.balance !== "0");
+      rows.sort((a3, b3) => {
+        const chainCmp = String(a3.chain).localeCompare(String(b3.chain));
+        if (chainCmp !== 0) return chainCmp;
+        return String(a3.type).localeCompare(String(b3.type));
+      });
+      if (opts.json) {
+        output(rows, true);
+      } else {
+        const totalUsd = rows.reduce(
+          (sum, r3) => sum + (typeof r3.usdValue === "number" ? r3.usdValue : 0),
+          0
+        );
+        console.log("Chain        Type    Symbol            Balance               USD");
+        console.log("\u2500".repeat(72));
+        for (const r3 of rows) {
+          const usd = r3.usdValue !== null ? `$${r3.usdValue.toFixed(2)}` : "";
+          console.log(
+            `${String(r3.chain).padEnd(12)} ${String(r3.type).padEnd(7)} ${String(r3.symbol).padEnd(17)} ${String(r3.balance).padEnd(20)} ${usd}`
+          );
+        }
+        console.log("\u2500".repeat(72));
+        console.log(`Total USD: $${totalUsd.toFixed(2)}`);
+      }
+    } catch (err) {
+      handleCommandError(err, opts.json, "Portfolio failed");
+    }
+    safeExit();
+  });
+  wallet.command("sign-message").description("Sign a message with the agent wallet").requiredOption("--chain <key>", "Chain key (e.g., ethereum, solana)").requiredOption("--message <text>", "Message to sign").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (opts) => {
+    try {
+      const chain2 = getChainById(opts.chain);
+      if (!chain2) {
+        throw new WalletError("CHAIN_UNSUPPORTED", `Unknown chain: ${opts.chain}`);
+      }
+      await ensureTrustSDK();
+      const password3 = await resolvePassword(opts);
+      const provider = await AgentWalletProvider.fromStorage(password3);
+      const address = await provider.getAddress(opts.chain);
+      const rawSignature = await provider.signMessage(opts.chain, opts.message);
+      const signature = chain2.isEVM && !rawSignature.startsWith("0x") ? `0x${rawSignature}` : rawSignature;
+      output(
+        {
+          chain: opts.chain,
+          address,
+          message: opts.message,
+          signature,
+          ...chain2.isEVM ? { digest: eip191Digest(opts.message) } : {}
+        },
+        opts.json
+      );
+    } catch (err) {
+      handleCommandError(err, opts.json, "Sign failed");
+    }
+    safeExit();
+  });
+  wallet.command("register").description("Register wallet addresses with Trust Wallet backend (enables token holdings)").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (opts) => {
+    try {
+      const creds = await ensureTrustSDK();
+      const password3 = await resolvePassword(opts);
+      const provider = await AgentWalletProvider.fromStorage(password3);
+      await registerWalletWithBackend(creds, provider);
+      if (!opts.json) success("Wallet registered with backend");
+      const addresses = await provider.getAddresses();
+      output({ registered: true, chains: addresses.length }, opts.json);
+    } catch (err) {
+      handleCommandError(err, opts.json, "Registration failed");
+    }
+    safeExit();
+  });
+}
+
+// src/commands/transfer.ts
+init_dist();
+
 // ../swap/dist/index.mjs
 init_dist();
+init_dist();
+init_dist();
 var SwapClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
@@ -42887,9 +43202,9 @@ var SwapExecutor = class {
     );
     const chainConfig = getChainById(params.fromChain);
     const transactions = await withRetry(() => this.swapClient.getSwapTransactions(route));
-    let approvalTxHash;
+    let approvalHash;
     try {
-      approvalTxHash = await this.ensureStepApproval(
+      approvalHash = await this.ensureStepApproval(
         route,
         transactions,
         chainConfig,
@@ -42897,10 +43212,10 @@ var SwapExecutor = class {
         address,
         parsedAmount
       );
-      if (approvalTxHash) {
-        await this.pollForConfirmation(params.fromChain, address, approvalTxHash, 6e4);
+      if (approvalHash) {
+        await this.pollForConfirmation(params.fromChain, address, approvalHash, 6e4);
       }
-      let txHash = "";
+      let hash = "";
       for (const txData of transactions) {
         const txType = txData.transaction.type;
         const isApproval = txType === "approval" || txType === "revokeApproval";
@@ -42909,30 +43224,30 @@ var SwapExecutor = class {
             txType === "revokeApproval" ? "Revoking prior approval..." : "Sending token approval..."
           );
         }
-        txHash = await this.sendTransaction(txData, chainConfig, params.fromChain);
-        if (isApproval) approvalTxHash = txHash;
+        hash = await this.sendTransaction(txData, chainConfig, params.fromChain);
+        if (isApproval) approvalHash = hash;
         this.log(
-          `${isApproval ? "Approval" : "Swap"} tx: ${getExplorerTxUrl(params.fromChain, txHash)}`
+          `${isApproval ? "Approval" : "Swap"} tx: ${getExplorerTxUrl(params.fromChain, hash)}`
         );
         await this.pollForConfirmation(
           params.fromChain,
           address,
-          txHash,
+          hash,
           isApproval ? 6e4 : 12e4
         );
       }
       return {
         success: true,
-        txHash,
+        hash,
         route,
-        explorerUrl: getExplorerTxUrl(params.fromChain, txHash)
+        explorerUrl: getExplorerTxUrl(params.fromChain, hash)
       };
     } catch (err) {
       let msg = err instanceof Error ? err.message : "Unknown error";
       let code2 = classifySwapError(msg);
-      if (approvalTxHash) {
+      if (approvalHash) {
         code2 = "APPROVAL_SENT_SWAP_FAILED";
-        msg += `. Approval was sent (tx: ${approvalTxHash}). Check allowance before retrying.`;
+        msg += `. Approval was sent (tx: ${approvalHash}). Check allowance before retrying.`;
       }
       return { success: false, route, error: msg, code: code2 };
     }
@@ -42964,8 +43279,8 @@ var SwapExecutor = class {
     if (allowance >= required) return void 0;
     this.log("Sending token approval...");
     const approveResult = await blockchainClient.contract(erc20).withAddress(fromAssetAddr, fromChain).write.approve([stepApproval.operatorAddress, required], this.walletProvider);
-    this.log(`Approval tx: ${getExplorerTxUrl(fromChain, approveResult.txHash)}`);
-    return approveResult.txHash;
+    this.log(`Approval tx: ${getExplorerTxUrl(fromChain, approveResult.hash)}`);
+    return approveResult.hash;
   }
   getBlockchainClient() {
     const blockchainClient = this.walletProvider.getBlockchainClient?.() ?? this.options.blockchainClient;
@@ -43049,7 +43364,13 @@ function mapBroadcastError(err) {
   throw err;
 }
 function registerTransferCommand(program3) {
-  program3.command("transfer").description("Transfer tokens to an address").requiredOption("--to <address>", "Destination address or ENS name (e.g., vitalik.eth)").requiredOption("--amount <n>", "Amount to transfer in human-readable format (e.g., 1.5)").requiredOption("--token <assetId>", "Token asset ID (e.g., c60 for ETH, c60_t0xA0b8...)").option(
+  program3.command("transfer").description("Transfer tokens to an address").requiredOption("--to <address>", "Destination address or ENS name (e.g., vitalik.eth)").requiredOption("--amount <n>", "Amount to transfer in human-readable format (e.g., 1.5)").option(
+    "--token <assetIdOrAddress>",
+    "Without --chain: asset ID (e.g., c60, c60_t0xA0b8...). With --chain: a token contract address (omit for the native coin)."
+  ).option(
+    "--chain <key>",
+    "Chain key (e.g., base, ethereum). When set, --token is a token contract address; omit --token to send the native coin."
+  ).option(
     "--decimals <n>",
     "Token decimals (overrides auto-resolution for tokens not in the registry)"
   ).option(
@@ -43066,19 +43387,40 @@ function registerTransferCommand(program3) {
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
-      let coinId;
+      let assetId;
+      let chainKey;
       let contractAddress;
-      try {
-        ({ coinId, contractAddress } = parseTokenId(opts.token));
-      } catch {
-        throw new TransferError("VALIDATION_ERROR", `Invalid token ID: ${opts.token}`);
-      }
-      const chainKey = coinTypeToChainKey(coinId);
-      if (!chainKey) {
-        throw new TransferError(
-          "CHAIN_UNSUPPORTED",
-          `Unsupported coin type in asset ID: ${opts.token}`
-        );
+      if (opts.chain) {
+        if (opts.token && /^c\d+(_t.+)?$/i.test(opts.token)) {
+          throw new TransferError(
+            "VALIDATION_ERROR",
+            "Pass either --token <assetId> on its own, or --chain with --token <contractAddress> \u2014 not an asset ID together with --chain."
+          );
+        }
+        ({ chainKey, assetId } = resolveAsset(opts.chain, opts.token));
+        contractAddress = opts.token;
+      } else {
+        if (!opts.token) {
+          throw new TransferError(
+            "VALIDATION_ERROR",
+            "Provide --token <assetId>, or --chain <key> with an optional --token <contractAddress>."
+          );
+        }
+        let coinId;
+        try {
+          ({ coinId, contractAddress } = parseTokenId(opts.token));
+        } catch {
+          throw new TransferError("VALIDATION_ERROR", `Invalid token ID: ${opts.token}`);
+        }
+        const resolvedKey = coinTypeToChainKey(coinId);
+        if (!resolvedKey) {
+          throw new TransferError(
+            "CHAIN_UNSUPPORTED",
+            `Unsupported coin type in asset ID: ${opts.token}`
+          );
+        }
+        assetId = opts.token;
+        chainKey = resolvedKey;
       }
       let resolvedTo;
       try {
@@ -43101,15 +43443,17 @@ function registerTransferCommand(program3) {
       }
       const httpClient = await getClient();
       const swapClient = new SwapClient(httpClient);
-      const tokenInfo = resolveToken(opts.token, chainKey);
+      const tokenInfo = resolveToken(assetId, chainKey);
       if (!tokenInfo) {
         throw new TransferError(
           "TOKEN_NOT_FOUND",
-          `Unknown token: ${opts.token} on ${chainKey}. Use a contract address (0x...) or a supported symbol.`
+          `Unknown token: ${assetId} on ${chainKey}. Use a contract address (0x...) or a supported symbol.`
         );
       }
       const { decimals } = await resolveTokenDecimals(swapClient, chainKey, {
-        token: opts.token,
+        // assetId is always a string (never undefined in --chain native mode) and
+        // is equivalent to opts.token for raw-address detection.
+        token: assetId,
         address: tokenInfo.address,
         isNative: !contractAddress,
         explicitDecimals: opts.decimals
@@ -43151,25 +43495,26 @@ function registerTransferCommand(program3) {
       let result;
       try {
         result = await client.transfer({
-          assetId: opts.token,
+          assetId,
           to: resolvedTo,
           amount: opts.amount,
           decimals,
-          hdWallet
+          hdWallet,
+          chainKey
         });
       } catch (err) {
         mapBroadcastError(err);
       }
-      const explorerUrl = getExplorerTxUrl(result.chainKey, result.txHash);
+      const explorerUrl = getExplorerTxUrl(result.chainKey, result.hash);
       success("Transfer sent!");
       output(
         {
-          hash: result.txHash,
+          hash: result.hash,
           chain: result.chainKey,
           from: address,
           to: resolvedTo,
           amount: opts.amount,
-          token: opts.token,
+          token: assetId,
           explorer: explorerUrl
         },
         opts.json
@@ -43381,7 +43726,7 @@ function registerSwapCommand(program3) {
         output(
           {
             ...quoteData,
-            hash: result.txHash,
+            hash: result.hash,
             fromChain,
             toChain,
             explorer: result.explorerUrl
@@ -43401,9 +43746,41 @@ function registerSwapCommand(program3) {
 // src/commands/erc20.ts
 init_dist();
 init_dist3();
+function resolveErc20WriteTarget(opts, nativeMsg) {
+  if (opts.chain) {
+    if (/^c\d+(_t.+)?$/i.test(opts.token)) {
+      throw new Erc20Error(
+        "VALIDATION_ERROR",
+        "With --chain, pass --token as a token contract address (0x\u2026), not an asset ID."
+      );
+    }
+    return { chainKey: resolveChain(opts.chain), contractAddress: opts.token };
+  }
+  let coinId;
+  let contractAddress;
+  try {
+    ({ coinId, contractAddress } = parseTokenId(opts.token));
+  } catch {
+    throw new Erc20Error("VALIDATION_ERROR", `Invalid token ID: ${opts.token}`);
+  }
+  if (!contractAddress) {
+    throw new Erc20Error("NOT_ERC20", nativeMsg);
+  }
+  const chainKey = coinTypeToChainKey(coinId);
+  if (!chainKey) {
+    throw new Erc20Error("CHAIN_UNSUPPORTED", `Unsupported coin type in asset ID: ${opts.token}`);
+  }
+  return { chainKey, contractAddress };
+}
 function registerErc20Command(program3) {
   const erc202 = program3.command("erc20").description("ERC-20 token operations");
-  erc202.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(
+  erc202.command("approve").description("Approve a spender for token spending").requiredOption(
+    "--token <assetIdOrAddress>",
+    "Without --chain: asset ID (e.g., c60_t0xA0b8...). With --chain: the token contract address."
+  ).requiredOption("--spender <address>", "Spender address").requiredOption("--amount <n>", 'Amount to approve (in smallest unit, or "unlimited")').option(
+    "--chain <key>",
+    "Chain key (e.g., base). When set, --token is the token contract address."
+  ).option(
     "--password <password>",
     "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
   ).option(
@@ -43414,26 +43791,10 @@ function registerErc20Command(program3) {
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
-      let coinId;
-      let contractAddress;
-      try {
-        ({ coinId, contractAddress } = parseTokenId(opts.token));
-      } catch {
-        throw new Erc20Error("VALIDATION_ERROR", `Invalid token ID: ${opts.token}`);
-      }
-      if (!contractAddress) {
-        throw new Erc20Error(
-          "NOT_ERC20",
-          "Cannot approve native tokens. Provide an ERC-20 asset ID (e.g., c60_t0xA0b8...)"
-        );
-      }
-      const chainKey = coinTypeToChainKey(coinId);
-      if (!chainKey) {
-        throw new Erc20Error(
-          "CHAIN_UNSUPPORTED",
-          `Unsupported coin type in asset ID: ${opts.token}`
-        );
-      }
+      const { chainKey, contractAddress } = resolveErc20WriteTarget(
+        opts,
+        "Cannot approve native tokens. Provide an ERC-20 asset ID (e.g., c60_t0xA0b8...)"
+      );
       const address = await provider.getAddress(chainKey);
       const amount = opts.amount === "unlimited" ? "115792089237316195423570985008687907853269984665640564039457584007913129639935" : opts.amount;
       if (opts.amount === "unlimited") {
@@ -43448,11 +43809,11 @@ function registerErc20Command(program3) {
       info(`Approving ${opts.spender} to spend from ${address} on ${chainKey}...`);
       const client = provider.getBlockchainClient();
       const pending = await client.contract(erc20).withAddress(contractAddress, chainKey).write.approve([opts.spender, BigInt(amount)], provider);
-      const explorerUrl = getExplorerTxUrl(chainKey, pending.txHash);
+      const explorerUrl = getExplorerTxUrl(chainKey, pending.hash);
       success("Approval sent!");
       output(
         {
-          hash: pending.txHash,
+          hash: pending.hash,
           chain: chainKey,
           owner: address,
           spender: opts.spender,
@@ -43467,7 +43828,13 @@ function registerErc20Command(program3) {
     }
     safeExit();
   });
-  erc202.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(
+  erc202.command("revoke").description("Revoke token approval (set allowance to 0)").requiredOption(
+    "--token <assetIdOrAddress>",
+    "Without --chain: asset ID (e.g., c60_t0xA0b8...). With --chain: the token contract address."
+  ).requiredOption("--spender <address>", "Spender address to revoke").option(
+    "--chain <key>",
+    "Chain key (e.g., base). When set, --token is the token contract address."
+  ).option(
     "--password <password>",
     "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
   ).option("--json", "JSON output").action(async (opts) => {
@@ -43475,35 +43842,19 @@ function registerErc20Command(program3) {
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
-      let coinId;
-      let contractAddress;
-      try {
-        ({ coinId, contractAddress } = parseTokenId(opts.token));
-      } catch {
-        throw new Erc20Error("VALIDATION_ERROR", `Invalid token ID: ${opts.token}`);
-      }
-      if (!contractAddress) {
-        throw new Erc20Error(
-          "NOT_ERC20",
-          "Cannot revoke approval for native tokens. Provide an ERC-20 asset ID."
-        );
-      }
-      const chainKey = coinTypeToChainKey(coinId);
-      if (!chainKey) {
-        throw new Erc20Error(
-          "CHAIN_UNSUPPORTED",
-          `Unsupported coin type in asset ID: ${opts.token}`
-        );
-      }
+      const { chainKey, contractAddress } = resolveErc20WriteTarget(
+        opts,
+        "Cannot revoke approval for native tokens. Provide an ERC-20 asset ID."
+      );
       const address = await provider.getAddress(chainKey);
       info(`Revoking approval for ${opts.spender} on ${chainKey}...`);
       const client = provider.getBlockchainClient();
       const pending = await client.contract(erc20).withAddress(contractAddress, chainKey).write.approve([opts.spender, 0n], provider);
-      const explorerUrl = getExplorerTxUrl(chainKey, pending.txHash);
+      const explorerUrl = getExplorerTxUrl(chainKey, pending.hash);
       success("Approval revoked!");
       output(
         {
-          hash: pending.txHash,
+          hash: pending.hash,
           chain: chainKey,
           owner: address,
           spender: opts.spender,
@@ -43517,44 +43868,65 @@ function registerErc20Command(program3) {
     }
     safeExit();
   });
-  erc202.command("allowance").description("Check token allowance").requiredOption("--token <assetId>", "Token asset ID (e.g., c60_t0xA0b8...)").requiredOption("--owner <address>", "Owner address").requiredOption("--spender <address>", "Spender address").option("--json", "JSON output").action(async (opts) => {
+  erc202.command("allowance").description("Check token allowance").requiredOption(
+    "--token <assetIdOrAddress>",
+    "Without --chain: asset ID (e.g., c60_t0xA0b8...). With --chain: the token contract address."
+  ).requiredOption("--owner <address>", "Owner address").requiredOption("--spender <address>", "Spender address").option(
+    "--chain <key>",
+    "Chain key (e.g., base). When set, --token is the token contract address."
+  ).option("--json", "JSON output").action(async (opts) => {
     try {
       await ensureTrustSDK();
-      let coinId;
       let contractAddress;
-      try {
-        ({ coinId, contractAddress } = parseTokenId(opts.token));
-      } catch (err) {
-        throw new Erc20Error(
-          "VALIDATION_ERROR",
-          err instanceof Error ? err.message : `Invalid token ID: ${opts.token}`
-        );
-      }
-      if (!contractAddress) {
-        throw new Erc20Error(
-          "NOT_ERC20",
-          `Not an ERC-20 asset ID (missing _t<address>): ${opts.token}`
-        );
-      }
-      try {
-        const { getWalletCore: getWalletCore2, getCoinType: getCoinType2 } = await Promise.resolve().then(() => (init_dist3(), dist_exports2));
-        const wc3 = getWalletCore2();
-        const ct5 = getCoinType2(coinId);
-        if (ct5 && !wc3.CoinTypeExt.validate(ct5, contractAddress)) {
+      let chainKey;
+      if (opts.chain) {
+        if (/^c\d+(_t.+)?$/i.test(opts.token)) {
           throw new Erc20Error(
             "VALIDATION_ERROR",
-            `Invalid contract address in asset ID: ${contractAddress}`
+            "With --chain, pass --token as a token contract address (0x\u2026), not an asset ID."
           );
         }
-      } catch (err) {
-        if (err instanceof CommandError) throw err;
-      }
-      const chainKey = coinTypeToChainKey(coinId);
-      if (!chainKey) {
-        throw new Erc20Error(
-          "CHAIN_UNSUPPORTED",
-          `Unsupported coin type in asset ID: ${opts.token}`
-        );
+        chainKey = resolveChain(opts.chain);
+        contractAddress = opts.token;
+      } else {
+        let coinId;
+        let parsed;
+        try {
+          ({ coinId, contractAddress: parsed } = parseTokenId(opts.token));
+        } catch (err) {
+          throw new Erc20Error(
+            "VALIDATION_ERROR",
+            err instanceof Error ? err.message : `Invalid token ID: ${opts.token}`
+          );
+        }
+        if (!parsed) {
+          throw new Erc20Error(
+            "NOT_ERC20",
+            `Not an ERC-20 asset ID (missing _t<address>): ${opts.token}`
+          );
+        }
+        try {
+          const { getWalletCore: getWalletCore2, getCoinType: getCoinType2 } = await Promise.resolve().then(() => (init_dist3(), dist_exports2));
+          const wc3 = getWalletCore2();
+          const ct5 = getCoinType2(coinId);
+          if (ct5 && !wc3.CoinTypeExt.validate(ct5, parsed)) {
+            throw new Erc20Error(
+              "VALIDATION_ERROR",
+              `Invalid contract address in asset ID: ${parsed}`
+            );
+          }
+        } catch (err) {
+          if (err instanceof CommandError) throw err;
+        }
+        const k4 = coinTypeToChainKey(coinId);
+        if (!k4) {
+          throw new Erc20Error(
+            "CHAIN_UNSUPPORTED",
+            `Unsupported coin type in asset ID: ${opts.token}`
+          );
+        }
+        contractAddress = parsed;
+        chainKey = k4;
       }
       const client = new BlockchainClient();
       const allowance = await client.contract(erc20).withAddress(contractAddress, chainKey).read.allowance([opts.owner, opts.spender]);
@@ -43583,11 +43955,29 @@ function parseAgentId(value) {
   }
   return BigInt(value);
 }
+function collectKeyValue(value, previous) {
+  previous.push(value);
+  return previous;
+}
+function parseMetadataPairs(pairs) {
+  return pairs.map((pair) => {
+    const eq = pair.indexOf("=");
+    if (eq <= 0) {
+      throw new WalletError("VALIDATION_ERROR", `--metadata must be key=value (got "${pair}")`);
+    }
+    return [pair.slice(0, eq), hexOrUtf8ToBytesHex(pair.slice(eq + 1))];
+  });
+}
 function registerErc8004Command(program3) {
   const erc8004Cmd = program3.command("erc8004").description("ERC-8004 Identity Registry \u2014 manage AI-agent identities");
-  erc8004Cmd.command("register").description("Mint a new ERC-8004 agent identity (NFT)").requiredOption("--uri <url>", "Agent registration URI (https:// or ipfs://)").option(
+  erc8004Cmd.command("register").description("Mint a new ERC-8004 agent identity (NFT)").requiredOption("--uri <url>", "Agent registration URI (https://, ipfs://, or data: inline)").option(
+    "--metadata <key=value>",
+    "Metadata entry to set atomically with the mint (repeatable). value is 0x-hex bytes or a UTF-8 string",
+    collectKeyValue,
+    []
+  ).option(
     "--chain <key>",
-    "EVM chain key (only `bsc` has a known deployment; set ERC8004_REGISTRY_ADDRESS for custom deployments)",
+    "EVM chain key (`bsc` and `bsctestnet` have known deployments; set ERC8004_REGISTRY_ADDRESS for other EVM chains)",
     "bsc"
   ).option(
     "--password <password>",
@@ -43601,14 +43991,20 @@ function registerErc8004Command(program3) {
         provider.getBlockchainClient(),
         opts.chain
       );
-      info(`Minting agent on ${chainKey}...`);
-      const pending = await contract.write.register([opts.uri], provider);
+      const metadata = parseMetadataPairs(opts.metadata);
+      info(
+        `Minting agent on ${chainKey}${metadata.length > 0 ? ` with ${metadata.length} metadata entr${metadata.length === 1 ? "y" : "ies"}` : ""}...`
+      );
+      const pending = await contract.write.register(
+        metadata.length > 0 ? [opts.uri, metadata] : [opts.uri],
+        provider
+      );
       const confirmed = await pending.wait();
       const registered = confirmed.events.Registered?.[0];
       if (!registered) {
         throw new WalletError(
           "TX_FAILED",
-          `No Registered event emitted (txHash=${confirmed.txHash})`
+          `No Registered event emitted (hash=${confirmed.hash})`
         );
       }
       success("Agent registered!");
@@ -43617,9 +44013,10 @@ function registerErc8004Command(program3) {
           agentId: registered.agentId.toString(),
           owner: registered.owner,
           agentURI: registered.agentURI,
-          hash: confirmed.txHash,
+          ...metadata.length > 0 ? { metadata: Object.fromEntries(metadata) } : {},
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -43628,9 +44025,12 @@ function registerErc8004Command(program3) {
     }
     safeExit();
   });
-  erc8004Cmd.command("set-uri <agentId>").description("Update the agentURI of an existing identity").requiredOption("--uri <url>", "New agent registration URI (https:// or ipfs://)").option(
+  erc8004Cmd.command("set-uri <agentId>").description("Update the agentURI of an existing identity").requiredOption(
+    "--uri <url>",
+    "New agent registration URI (https://, ipfs://, or data: inline)"
+  ).option(
     "--chain <key>",
-    "EVM chain key (only `bsc` has a known deployment; set ERC8004_REGISTRY_ADDRESS for custom deployments)",
+    "EVM chain key (`bsc` and `bsctestnet` have known deployments; set ERC8004_REGISTRY_ADDRESS for other EVM chains)",
     "bsc"
   ).option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (agentId, opts) => {
     try {
@@ -43650,9 +44050,9 @@ function registerErc8004Command(program3) {
         {
           agentId,
           agentURI: opts.uri,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -43663,7 +44063,7 @@ function registerErc8004Command(program3) {
   });
   erc8004Cmd.command("set-metadata <agentId>").description("Set a metadata entry on an identity (value can be 0x-hex or plain string)").requiredOption("--key <string>", "Metadata key").requiredOption("--value <hex|string>", "0x-hex bytes or plain string (UTF-8 encoded)").option(
     "--chain <key>",
-    "EVM chain key (only `bsc` has a known deployment; set ERC8004_REGISTRY_ADDRESS for custom deployments)",
+    "EVM chain key (`bsc` and `bsctestnet` have known deployments; set ERC8004_REGISTRY_ADDRESS for other EVM chains)",
     "bsc"
   ).option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (agentId, opts) => {
     try {
@@ -43685,9 +44085,9 @@ function registerErc8004Command(program3) {
           agentId,
           key: opts.key,
           value: valueBytes,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -43698,7 +44098,7 @@ function registerErc8004Command(program3) {
   });
   erc8004Cmd.command("get-metadata <agentId>").description("Read a metadata entry from an identity (returns raw bytes as 0x-hex)").requiredOption("--key <string>", "Metadata key").option(
     "--chain <key>",
-    "EVM chain key (only `bsc` has a known deployment; set ERC8004_REGISTRY_ADDRESS for custom deployments)",
+    "EVM chain key (`bsc` and `bsctestnet` have known deployments; set ERC8004_REGISTRY_ADDRESS for other EVM chains)",
     "bsc"
   ).option("--json", "JSON output").action(async (agentId, opts) => {
     try {
@@ -43714,7 +44114,7 @@ function registerErc8004Command(program3) {
   });
   erc8004Cmd.command("show <agentId>").description("Show on-chain state of an ERC-8004 agent identity").option(
     "--chain <key>",
-    "EVM chain key (only `bsc` has a known deployment; set ERC8004_REGISTRY_ADDRESS for custom deployments)",
+    "EVM chain key (`bsc` and `bsctestnet` have known deployments; set ERC8004_REGISTRY_ADDRESS for other EVM chains)",
     "bsc"
   ).option("--json", "JSON output").action(async (agentId, opts) => {
     try {
@@ -43746,7 +44146,9 @@ function registerErc8004Command(program3) {
 // src/commands/erc8183.ts
 init_dist();
 init_dist3();
-var CHAIN_OPT = "EVM chain key (only `bsc` has a known deployment)";
+var CHAIN_OPT = "EVM chain key (`bsc` and `bsctestnet` have known deployments)";
+var OPT_PARAMS_OPT = "Optional opaque optParams bytes passed through raw, as 0x-prefixed hex (defaults to empty)";
+var SUBMIT_OPT_PARAMS_OPT = `${OPT_PARAMS_OPT}. Evaluators may expect deliverable metadata here, e.g. hex-encoded UTF-8 JSON like {"deliverable_url": "..."}`;
 var ZERO_BYTES32 = `0x${"0".repeat(64)}`;
 function parseUint(value, label) {
   if (!/^\d+$/.test(value)) {
@@ -43757,6 +44159,16 @@ function parseUint(value, label) {
   }
   return BigInt(value);
 }
+function parseOptParams(value) {
+  if (value === void 0) return "0x";
+  if (!/^0x([0-9a-fA-F]{2})*$/.test(value)) {
+    throw new WalletError(
+      "VALIDATION_ERROR",
+      `--opt-params must be 0x-prefixed bytes (even-length hex): ${value}`
+    );
+  }
+  return value;
+}
 function registerErc8183Command(program3) {
   const cmd = program3.command("erc8183").description("ERC-8183 Agentic Commerce \u2014 on-chain job escrows between AI agents");
   cmd.command("create-job").description("Create a new job (caller becomes the client)").requiredOption("--provider <address>", "Provider (worker) address").requiredOption("--evaluator <address>", "Evaluator address").requiredOption("--expires-at <unix>", "Expiry as a unix timestamp (seconds)").requiredOption("--description <text>", "Human-readable job description").option("--hook <address>", "Optional hook contract (defaults to none)").option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (opts) => {
@@ -43779,7 +44191,7 @@ function registerErc8183Command(program3) {
       if (!created) {
         throw new WalletError(
           "TX_FAILED",
-          `No JobCreated event emitted (txHash=${confirmed.txHash})`
+          `No JobCreated event emitted (hash=${confirmed.hash})`
         );
       }
       success("Job created!");
@@ -43787,9 +44199,9 @@ function registerErc8183Command(program3) {
         {
           jobId: created.jobId.toString(),
           status: "Open",
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -43798,9 +44210,10 @@ function registerErc8183Command(program3) {
     }
     safeExit();
   });
-  cmd.command("set-provider <jobId>").description("Set or change the provider (client, while the job is Open)").requiredOption("--provider <address>", "New provider (worker) address").option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
+  cmd.command("set-provider <jobId>").description("Set or change the provider (client, while the job is Open)").requiredOption("--provider <address>", "New provider (worker) address").option("--opt-params <hex>", OPT_PARAMS_OPT).option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
     try {
       const id = parseUint(jobId, "jobId");
+      const optParams = parseOptParams(opts.optParams);
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
@@ -43809,16 +44222,16 @@ function registerErc8183Command(program3) {
         opts.chain
       );
       info(`Setting provider for job ${jobId} on ${chainKey}...`);
-      const pending = await commerce.write.setProvider([id, opts.provider, "0x"], provider);
+      const pending = await commerce.write.setProvider([id, opts.provider, optParams], provider);
       const confirmed = await pending.wait();
       success("Provider set!");
       output(
         {
           jobId,
           provider: opts.provider,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -43827,10 +44240,11 @@ function registerErc8183Command(program3) {
     }
     safeExit();
   });
-  cmd.command("set-budget <jobId>").description("Set the escrow budget (atomic units of the payment token)").requiredOption("--amount <atomic>", "Budget in atomic units").option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
+  cmd.command("set-budget <jobId>").description("Set the escrow budget (atomic units of the payment token)").requiredOption("--amount <atomic>", "Budget in atomic units").option("--opt-params <hex>", OPT_PARAMS_OPT).option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
     try {
       const id = parseUint(jobId, "jobId");
       const amount = parseUint(opts.amount, "amount");
+      const optParams = parseOptParams(opts.optParams);
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
@@ -43839,16 +44253,16 @@ function registerErc8183Command(program3) {
         opts.chain
       );
       info(`Setting budget for job ${jobId} on ${chainKey}...`);
-      const pending = await commerce.write.setBudget([id, amount, "0x"], provider);
+      const pending = await commerce.write.setBudget([id, amount, optParams], provider);
       const confirmed = await pending.wait();
       success("Budget set!");
       output(
         {
           jobId,
           amount: opts.amount,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -43857,37 +44271,53 @@ function registerErc8183Command(program3) {
     }
     safeExit();
   });
-  cmd.command("fund <jobId>").description("Fund a job: approve the budget then deposit it into escrow (two txs)").option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
+  cmd.command("fund <jobId>").description("Fund a job: approve the budget then deposit it into escrow (two txs)").option(
+    "--expected-budget <atomic>",
+    "Pin the budget (atomic units): approve and fund exactly this amount instead of reading it on-chain; the contract reverts with BudgetMismatch if the on-chain budget differs"
+  ).option("--opt-params <hex>", OPT_PARAMS_OPT).option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
     try {
       const id = parseUint(jobId, "jobId");
+      const optParams = parseOptParams(opts.optParams);
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
       const client = provider.getBlockchainClient();
       const { commerce, chainKey } = resolveErc8183Contracts(client, opts.chain);
-      const job = await commerce.read.getJob([id]);
-      if (job.budget === 0n) {
-        throw new WalletError(
-          "VALIDATION_ERROR",
-          `Job ${jobId} has no budget set \u2014 run \`twak erc8183 set-budget\` before funding.`
-        );
+      let budget;
+      if (opts.expectedBudget !== void 0) {
+        budget = parseUint(opts.expectedBudget, "expected-budget");
+        if (budget === 0n) {
+          throw new WalletError(
+            "VALIDATION_ERROR",
+            "--expected-budget must be greater than zero."
+          );
+        }
+      } else {
+        const job = await commerce.read.getJob([id]);
+        if (job.budget === 0n) {
+          throw new WalletError(
+            "VALIDATION_ERROR",
+            `Job ${jobId} has no budget set \u2014 run \`twak erc8183 set-budget\` before funding.`
+          );
+        }
+        budget = job.budget;
       }
       const token = await commerce.read.paymentToken([]);
-      info(`Approving ${job.budget.toString()} for the escrow on ${chainKey}...`);
-      const approvePending = await erc20.using(client).withAddress(token, chainKey).write.approve([commerce.address, job.budget], provider);
+      info(`Approving ${budget.toString()} for the escrow on ${chainKey}...`);
+      const approvePending = await erc20.using(client).withAddress(token, chainKey).write.approve([commerce.address, budget], provider);
       const approveConfirmed = await approvePending.wait();
       info(`Funding job ${jobId}...`);
-      const fundPending = await commerce.write.fund([id, job.budget, "0x"], provider);
+      const fundPending = await commerce.write.fund([id, budget, optParams], provider);
       const fundConfirmed = await fundPending.wait();
       success("Job funded!");
       output(
         {
           jobId,
           status: "Funded",
-          approveHash: approveConfirmed.txHash,
-          hash: fundConfirmed.txHash,
+          approveHash: approveConfirmed.hash,
+          hash: fundConfirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, fundConfirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, fundConfirmed.hash)
         },
         opts.json
       );
@@ -43896,9 +44326,10 @@ function registerErc8183Command(program3) {
     }
     safeExit();
   });
-  cmd.command("submit <jobId>").description("Submit a deliverable (bytes32 commitment) for a funded job").requiredOption("--deliverable <bytes32>", "0x-prefixed 32-byte deliverable commitment").option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
+  cmd.command("submit <jobId>").description("Submit a deliverable (bytes32 commitment) for a funded job").requiredOption("--deliverable <bytes32>", "0x-prefixed 32-byte deliverable commitment").option("--opt-params <hex>", SUBMIT_OPT_PARAMS_OPT).option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
     try {
       const id = parseUint(jobId, "jobId");
+      const optParams = parseOptParams(opts.optParams);
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
@@ -43907,16 +44338,16 @@ function registerErc8183Command(program3) {
         opts.chain
       );
       info(`Submitting deliverable for job ${jobId} on ${chainKey}...`);
-      const pending = await commerce.write.submit([id, opts.deliverable, "0x"], provider);
+      const pending = await commerce.write.submit([id, opts.deliverable, optParams], provider);
       const confirmed = await pending.wait();
       success("Deliverable submitted!");
       output(
         {
           jobId,
           status: "Submitted",
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -43925,9 +44356,10 @@ function registerErc8183Command(program3) {
     }
     safeExit();
   });
-  cmd.command("complete <jobId>").description("Mark a submitted job complete (evaluator) \u2014 releases escrow").option("--reason <bytes32>", "Optional bytes32 attestation (defaults to zero)").option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
+  cmd.command("complete <jobId>").description("Mark a submitted job complete (evaluator) \u2014 releases escrow").option("--reason <bytes32>", "Optional bytes32 attestation (defaults to zero)").option("--opt-params <hex>", OPT_PARAMS_OPT).option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
     try {
       const id = parseUint(jobId, "jobId");
+      const optParams = parseOptParams(opts.optParams);
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
@@ -43937,7 +44369,7 @@ function registerErc8183Command(program3) {
       );
       info(`Completing job ${jobId} on ${chainKey}...`);
       const pending = await commerce.write.complete(
-        [id, opts.reason ?? ZERO_BYTES32, "0x"],
+        [id, opts.reason ?? ZERO_BYTES32, optParams],
         provider
       );
       const confirmed = await pending.wait();
@@ -43948,9 +44380,9 @@ function registerErc8183Command(program3) {
           jobId,
           status: "Completed",
           released: released ? released.amount.toString() : null,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -43959,9 +44391,10 @@ function registerErc8183Command(program3) {
     }
     safeExit();
   });
-  cmd.command("reject <jobId>").description("Reject a job \u2014 refunds the client if funded").option("--reason <bytes32>", "Optional bytes32 reason (defaults to zero)").option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
+  cmd.command("reject <jobId>").description("Reject a job \u2014 refunds the client if funded").option("--reason <bytes32>", "Optional bytes32 reason (defaults to zero)").option("--opt-params <hex>", OPT_PARAMS_OPT).option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
     try {
       const id = parseUint(jobId, "jobId");
+      const optParams = parseOptParams(opts.optParams);
       await ensureTrustSDK();
       const password3 = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password3);
@@ -43971,7 +44404,7 @@ function registerErc8183Command(program3) {
       );
       info(`Rejecting job ${jobId} on ${chainKey}...`);
       const pending = await commerce.write.reject(
-        [id, opts.reason ?? ZERO_BYTES32, "0x"],
+        [id, opts.reason ?? ZERO_BYTES32, optParams],
         provider
       );
       const confirmed = await pending.wait();
@@ -43982,9 +44415,9 @@ function registerErc8183Command(program3) {
           jobId,
           status: "Rejected",
           refunded: refunded ? refunded.amount.toString() : null,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -44013,9 +44446,9 @@ function registerErc8183Command(program3) {
           jobId,
           status: "Expired",
           refunded: refunded ? refunded.amount.toString() : null,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -44075,9 +44508,9 @@ function registerErc8183Command(program3) {
         {
           jobId,
           policy: policyAddr,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -44103,9 +44536,9 @@ function registerErc8183Command(program3) {
       output(
         {
           jobId,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -44132,9 +44565,9 @@ function registerErc8183Command(program3) {
         {
           jobId,
           status: "Expired",
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -44143,6 +44576,45 @@ function registerErc8183Command(program3) {
     }
     safeExit();
   });
+  cmd.command("policy-info <jobId>").description("Show dispute-policy state for a job (read-only)").option("--chain <key>", CHAIN_OPT, "bsc").option("--json", "JSON output").action(async (jobId, opts) => {
+    try {
+      const id = parseUint(jobId, "jobId");
+      await ensureTrustSDK();
+      const client = new BlockchainClient();
+      const { router, policy, chainKey } = resolveErc8183Contracts(client, opts.chain);
+      const registeredPolicy = await router.read.jobPolicy([id]);
+      const registered = !isZeroAddress(registeredPolicy);
+      const policyContract = registered && registeredPolicy.toLowerCase() !== policy.address.toLowerCase() ? erc8183Policy.using(client).withAddress(registeredPolicy, chainKey) : policy;
+      const [disputeWindow, submittedAt, disputed, rejectVotes, voteQuorum, quorumSnapshot] = await Promise.all([
+        policyContract.read.disputeWindow([]),
+        policyContract.read.submittedAt([id]),
+        policyContract.read.disputed([id]),
+        policyContract.read.rejectVotes([id]),
+        policyContract.read.voteQuorum([]),
+        policyContract.read.disputeQuorumSnapshot([id])
+      ]);
+      const settleableAt = submittedAt > 0n ? submittedAt + disputeWindow : null;
+      output(
+        {
+          jobId,
+          policy: policyContract.address,
+          registered,
+          disputeWindow: disputeWindow.toString(),
+          submittedAt: submittedAt.toString(),
+          disputed,
+          rejectVotes: rejectVotes.toString(),
+          voteQuorum: voteQuorum.toString(),
+          quorumSnapshot: quorumSnapshot.toString(),
+          settleableAt: settleableAt?.toString() ?? null,
+          chain: chainKey
+        },
+        opts.json
+      );
+    } catch (err) {
+      handleCommandError(err, opts.json, "policy-info failed");
+    }
+    safeExit();
+  });
   cmd.command("dispute <jobId>").description("Raise a dispute on a job via the OptimisticPolicy (client)").option("--chain <key>", CHAIN_OPT, "bsc").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (jobId, opts) => {
     try {
       const id = parseUint(jobId, "jobId");
@@ -44160,9 +44632,9 @@ function registerErc8183Command(program3) {
       output(
         {
           jobId,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -44188,9 +44660,9 @@ function registerErc8183Command(program3) {
       output(
         {
           jobId,
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -44256,7 +44728,7 @@ function registerCompeteCommand(program3) {
       if (!confirmed.events.Registered?.[0]) {
         throw new WalletError(
           "TX_FAILED",
-          `no Registered event emitted (txHash=${confirmed.txHash})`
+          `no Registered event emitted (hash=${confirmed.hash})`
         );
       }
       success("Registered for BNB HACK: AI TRADING AGENT EDITION!");
@@ -44265,9 +44737,9 @@ function registerCompeteCommand(program3) {
           registered: true,
           participant,
           deadline: toIso(deadline),
-          hash: confirmed.txHash,
+          hash: confirmed.hash,
           chain: chainKey,
-          explorer: getExplorerTxUrl(chainKey, confirmed.txHash)
+          explorer: getExplorerTxUrl(chainKey, confirmed.hash)
         },
         opts.json
       );
@@ -45945,15 +46417,15 @@ async function ensurePermit2Allowance(args) {
     [PERMIT2_ADDRESS, BigInt(MAX_UINT256_DECIMAL)],
     args.walletProvider
   );
-  await waitForTxConfirmation(args.blockchainClient, args.chainKey, args.owner, pending.txHash);
-  return { token: args.tokenAddress, chain: args.chainKey, txHash: pending.txHash };
+  await waitForTxConfirmation(args.blockchainClient, args.chainKey, args.owner, pending.hash);
+  return { token: args.tokenAddress, chain: args.chainKey, hash: pending.hash };
 }
 var APPROVE_TIMEOUT_MS = 6e4;
 var APPROVE_POLL_MS = 2e3;
-async function waitForTxConfirmation(bc2, chainKey, address, txHash) {
+async function waitForTxConfirmation(bc2, chainKey, address, hash) {
   const start = Date.now();
   while (Date.now() - start < APPROVE_TIMEOUT_MS) {
-    const status = await bc2.findTransactionStatus(chainKey, address, txHash);
+    const status = await bc2.findTransactionStatus(chainKey, address, hash);
     if (status.confirmed) return;
     if (status.failed) {
       throw new X402Error(
@@ -45965,7 +46437,7 @@ async function waitForTxConfirmation(bc2, chainKey, address, txHash) {
   }
   throw new X402Error(
     "TX_FAILED",
-    `Permit2 approval ${txHash} not confirmed within ${APPROVE_TIMEOUT_MS / 1e3}s`
+    `Permit2 approval ${hash} not confirmed within ${APPROVE_TIMEOUT_MS / 1e3}s`
   );
 }
 function ipv4MappedToDotted(ip) {
@@ -46482,7 +46954,7 @@ var TransferActionProvider = class extends ActionProvider {
         const resolvedTo = await resolveAddressOrName(input2.to);
         const atomicAmount = parseAmount(input2.amount, decimals);
         const isErc20 = Boolean(tokenAddress);
-        let txHash;
+        let hash;
         if (isErc20) {
           if (!this.blockchainClient) {
             throw new TransferError(
@@ -46491,19 +46963,19 @@ var TransferActionProvider = class extends ActionProvider {
             );
           }
           const pending = await this.blockchainClient.contract(erc20).withAddress(tokenAddress, chainKey).write.transfer([resolvedTo, BigInt(atomicAmount)], signer);
-          txHash = pending.txHash;
+          hash = pending.hash;
         } else {
-          txHash = await signer.sendTransaction({
+          hash = await signer.sendTransaction({
             chainId: caip2,
             to: resolvedTo,
             data: "0x",
             value: "0x" + BigInt(atomicAmount).toString(16)
           });
         }
-        const explorerUrl = getExplorerTxUrl(chainKey, txHash);
+        const explorerUrl = getExplorerTxUrl(chainKey, hash);
         return {
           success: true,
-          txHash,
+          hash,
           to: resolvedTo,
           resolvedFrom: input2.to !== resolvedTo ? input2.to : void 0,
           explorer: explorerUrl || void 0
@@ -46588,7 +47060,7 @@ var SwapActionProvider = class extends ActionProvider {
         const outputAmt = formatAmount(lastStep.to.amount, lastStep.to.asset.metadata.decimals);
         return {
           success: true,
-          txHash: result.txHash,
+          hash: result.hash,
           summary: `${inputAmt} ${firstStep.from.asset.metadata.symbol} -> ${outputAmt} ${lastStep.to.asset.metadata.symbol}`,
           provider: result.route.steps.map((s2) => s2.provider.name).join(" -> "),
           explorer: result.explorerUrl || void 0
@@ -46970,7 +47442,7 @@ var AgentWalletActionProvider = class extends ActionProvider {
         if (!this.blockchainClient) {
           return { chain: chainKey, address, balance: "BlockchainClient not available" };
         }
-        const balance = await this.blockchainClient.getBalance(assetId, address);
+        const balance = await this.blockchainClient.getBalance(assetId, address, chainKey);
         return { chain: chainKey, address, balance };
       }
     };
@@ -47007,7 +47479,7 @@ var TokenActionProvider = class extends ActionProvider {
           throw new WalletError("WALLET_NOT_FOUND", "BlockchainClient not available");
         }
         const { chainKey, assetId } = resolveAsset(input2.chain, input2.tokenAddress);
-        const balance = await this.blockchainClient.getBalance(assetId, input2.address);
+        const balance = await this.blockchainClient.getBalance(assetId, input2.address, chainKey);
         return { chain: chainKey, address: input2.address, balance };
       }
     };
@@ -47047,9 +47519,10 @@ var TokenActionProvider = class extends ActionProvider {
             amount: input2.amount,
             decimals,
             memo: input2.memo,
-            hdWallet
+            hdWallet,
+            chainKey
           });
-          return { hash: result.txHash, chain: result.chainKey };
+          return { hash: result.hash, chain: result.chainKey };
         }
         const chain2 = requireChain(chainKey);
         if (chain2.namespace !== "eip155") {
@@ -47061,24 +47534,24 @@ var TokenActionProvider = class extends ActionProvider {
         if (input2.tokenAddress) assertEvmAddress(input2.tokenAddress, "tokenAddress");
         const caipChainId = `${chain2.namespace}:${chain2.chainId}`;
         const atomicAmount = parseAmount(input2.amount, decimals);
-        let txHash;
+        let hash;
         if (input2.tokenAddress) {
           if (!this.blockchainClient) {
             throw new WalletError("WALLET_NOT_FOUND", "BlockchainClient not available");
           }
           const pending = await this.blockchainClient.contract(erc20).withAddress(input2.tokenAddress, chainKey).write.transfer([input2.to, BigInt(atomicAmount)], wallet);
-          txHash = pending.txHash;
+          hash = pending.hash;
         } else {
           assertEvmAddress(input2.to, "to");
           const valueHex = "0x" + BigInt(atomicAmount).toString(16);
-          txHash = await wallet.sendTransaction({
+          hash = await wallet.sendTransaction({
             chainId: caipChainId,
             to: input2.to,
             data: "0x",
             value: valueHex
           });
         }
-        return { hash: txHash, chain: chainKey };
+        return { hash, chain: chainKey };
       }
     };
   }
@@ -47109,7 +47582,7 @@ var TokenActionProvider = class extends ActionProvider {
         }
         const amount = input2.amount === "unlimited" ? "115792089237316195423570985008687907853269984665640564039457584007913129639935" : input2.amount;
         const pending = await this.blockchainClient.contract(erc20).withAddress(input2.tokenAddress, chainKey).write.approve([input2.spender, BigInt(amount)], wallet);
-        return { hash: pending.txHash, chain: chainKey };
+        return { hash: pending.hash, chain: chainKey };
       }
     };
   }
@@ -47138,7 +47611,7 @@ var TokenActionProvider = class extends ActionProvider {
           throw new WalletError("WALLET_NOT_FOUND", "BlockchainClient not available");
         }
         const pending = await this.blockchainClient.contract(erc20).withAddress(input2.tokenAddress, chainKey).write.approve([input2.spender, 0n], wallet);
-        return { hash: pending.txHash, chain: chainKey };
+        return { hash: pending.hash, chain: chainKey };
       }
     };
   }
@@ -47608,7 +48081,7 @@ var OnrampActionProvider = class extends ActionProvider {
           if (cap) return { success: false, ...cap };
         }
         const atomic = parseAmount(input2.cryptoAmount, decimals);
-        let txHash;
+        let hash;
         if (input2.tokenAddress) {
           if (!this.blockchainClient) {
             throw new TransferError(
@@ -47617,19 +48090,19 @@ var OnrampActionProvider = class extends ActionProvider {
             );
           }
           const pending = await this.blockchainClient.contract(erc20).withAddress(input2.tokenAddress, chainKey).write.transfer([input2.depositAddress, BigInt(atomic)], signer);
-          txHash = pending.txHash;
+          hash = pending.hash;
         } else {
-          txHash = await signer.sendTransaction({
+          hash = await signer.sendTransaction({
             chainId: caip2,
             to: input2.depositAddress,
             data: "0x",
             value: "0x" + BigInt(atomic).toString(16)
           });
         }
-        const explorerUrl = getExplorerTxUrl(chainKey, txHash) || void 0;
+        const explorerUrl = getExplorerTxUrl(chainKey, hash) || void 0;
         return {
           success: true,
-          txHash,
+          hash,
           chain: chainKey,
           tokenAddress: input2.tokenAddress,
           to: input2.depositAddress,
@@ -47799,7 +48272,7 @@ var AutomateActionProvider = class extends ActionProvider {
         await this.automationStore.update(record2.id, { lastRunAt: (/* @__PURE__ */ new Date()).toISOString() });
         return {
           success: true,
-          txHash: result.txHash,
+          hash: result.hash,
           automationId: record2.id,
           swapped: `${record2.amount} ${record2.fromToken} \u2192 ${record2.toToken}`,
           explorer: result.explorerUrl || void 0
@@ -47991,17 +48464,23 @@ var Erc8004ActionProvider = class extends ActionProvider {
   register() {
     return {
       name: "erc8004_register",
-      description: "Mint a new ERC-8004 agent identity on-chain. The caller becomes the owner of an NFT token whose ID is the agentId. The supplied agentURI is stored on-chain as the token URI and should point to the agent registration JSON (https or ipfs).",
+      description: "Mint a new ERC-8004 agent identity on-chain. The caller becomes the owner of an NFT token whose ID is the agentId. The supplied agentURI is stored on-chain as the token URI and should point to the agent registration JSON (https, ipfs, or a data: inline). Optionally pass metadata entries to set them atomically in the same mint transaction.",
       schema: import_zod16.z.object({
         agentURI: import_zod16.z.string().min(1).describe(
-          "URI of the agent registration file (https:// or ipfs://). Stored on-chain as the token URI."
+          "URI of the agent registration file (https://, ipfs://, or data: inline). Stored on-chain as the token URI."
+        ),
+        metadata: import_zod16.z.record(import_zod16.z.string().min(1), import_zod16.z.string().min(1)).optional().describe(
+          "Optional metadata entries (key \u2192 value) to set atomically in the mint transaction. Each value: `0x`-prefixed hex is sent as raw bytes; any other string is UTF-8 encoded."
         ),
         chain: import_zod16.z.string().default("bsc").describe(CHAIN_DESC)
       }),
       invoke: async (_ctx, input2) => {
         const { contract, chainKey } = this.bind(input2.chain);
+        const entries = Object.entries(input2.metadata ?? {}).map(
+          ([key, value]) => [key, hexOrUtf8ToBytesHex(value)]
+        );
         const pending = await contract.write.register(
-          [input2.agentURI],
+          entries.length > 0 ? [input2.agentURI, entries] : [input2.agentURI],
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
@@ -48009,15 +48488,16 @@ var Erc8004ActionProvider = class extends ActionProvider {
         if (!registered) {
           throw new WalletError(
             "TX_FAILED",
-            `erc8004_register: no Registered event emitted (txHash=${confirmed.txHash})`
+            `erc8004_register: no Registered event emitted (hash=${confirmed.hash})`
           );
         }
         return {
           success: true,
           agentId: registered.agentId.toString(),
-          txHash: confirmed.txHash,
+          hash: confirmed.hash,
           owner: registered.owner,
           agentURI: registered.agentURI,
+          ...entries.length > 0 ? { metadata: Object.fromEntries(entries) } : {},
           chain: chainKey
         };
       }
@@ -48029,7 +48509,9 @@ var Erc8004ActionProvider = class extends ActionProvider {
       description: "Update the agentURI of an existing ERC-8004 agent identity. Caller must own the NFT.",
       schema: import_zod16.z.object({
         agentId: agentIdSchema,
-        agentURI: import_zod16.z.string().min(1).describe("New agent URI (https:// or ipfs://). Replaces the on-chain stored URI."),
+        agentURI: import_zod16.z.string().min(1).describe(
+          "New agent URI (https://, ipfs://, or data: inline). Replaces the on-chain stored URI."
+        ),
         chain: import_zod16.z.string().default("bsc").describe(CHAIN_DESC)
       }),
       invoke: async (_ctx, input2) => {
@@ -48039,7 +48521,7 @@ var Erc8004ActionProvider = class extends ActionProvider {
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, chain: chainKey };
+        return { success: true, hash: confirmed.hash, chain: chainKey };
       }
     };
   }
@@ -48063,7 +48545,7 @@ var Erc8004ActionProvider = class extends ActionProvider {
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, chain: chainKey };
+        return { success: true, hash: confirmed.hash, chain: chainKey };
       }
     };
   }
@@ -48129,6 +48611,7 @@ var jobIdSchema = import_zod17.z.string().regex(/^\d+$/, "jobId must be a decima
 var amountSchema = import_zod17.z.string().regex(/^\d+$/, "amount must be an atomic (base-unit) integer string.");
 var evmAddressSchema = import_zod17.z.string().refine(isEvmAddress, "must be a 0x-prefixed 40-hex EVM address.");
 var bytes32Schema = import_zod17.z.string().regex(/^0x[0-9a-fA-F]{64}$/, "must be 0x-prefixed 32-byte hex.");
+var optParamsSchema = import_zod17.z.string().regex(/^0x([0-9a-fA-F]{2})*$/, "optParams must be 0x-prefixed bytes.").optional().describe("Optional opaque optParams bytes forwarded raw to the contract (defaults to empty).");
 var ZERO_BYTES322 = `0x${"0".repeat(64)}`;
 var Erc8183ActionProvider = class extends ActionProvider {
   constructor(blockchainClient, walletContext) {
@@ -48149,6 +48632,7 @@ var Erc8183ActionProvider = class extends ActionProvider {
       this.reject(),
       this.claimRefund(),
       this.status(),
+      this.policyInfo(),
       this.registerJob(),
       this.settle(),
       this.markExpired(),
@@ -48190,13 +48674,13 @@ var Erc8183ActionProvider = class extends ActionProvider {
         if (!created) {
           throw new WalletError(
             "TX_FAILED",
-            `erc8183_create_job: no JobCreated event emitted (txHash=${confirmed.txHash})`
+            `erc8183_create_job: no JobCreated event emitted (hash=${confirmed.hash})`
           );
         }
         return {
           success: true,
           jobId: created.jobId.toString(),
-          txHash: confirmed.txHash,
+          hash: confirmed.hash,
           status: "Open",
           chain: chainKey
         };
@@ -48210,16 +48694,17 @@ var Erc8183ActionProvider = class extends ActionProvider {
       schema: import_zod17.z.object({
         jobId: jobIdSchema,
         provider: evmAddressSchema.describe("New provider (worker) address."),
+        optParams: optParamsSchema,
         chain: import_zod17.z.string().default("bsc").describe(CHAIN_DESC)
       }),
       invoke: async (_ctx, input2) => {
         const { commerce, chainKey } = this.bind(input2.chain);
         const pending = await commerce.write.setProvider(
-          [BigInt(input2.jobId), input2.provider, "0x"],
+          [BigInt(input2.jobId), input2.provider, input2.optParams ?? "0x"],
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, chain: chainKey };
+        return { success: true, hash: confirmed.hash, chain: chainKey };
       }
     };
   }
@@ -48230,47 +48715,64 @@ var Erc8183ActionProvider = class extends ActionProvider {
       schema: import_zod17.z.object({
         jobId: jobIdSchema,
         amount: amountSchema.describe("Budget in atomic units of the payment token."),
+        optParams: optParamsSchema,
         chain: import_zod17.z.string().default("bsc").describe(CHAIN_DESC)
       }),
       invoke: async (_ctx, input2) => {
         const { commerce, chainKey } = this.bind(input2.chain);
         const pending = await commerce.write.setBudget(
-          [BigInt(input2.jobId), BigInt(input2.amount), "0x"],
+          [BigInt(input2.jobId), BigInt(input2.amount), input2.optParams ?? "0x"],
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, chain: chainKey };
+        return { success: true, hash: confirmed.hash, chain: chainKey };
       }
     };
   }
   fund() {
     return {
       name: "erc8183_fund",
-      description: "Fund a job: deposits the on-chain budget into escrow. The escrow pulls the payment token via transferFrom, so this first sends an ERC-20 approval for the exact budget, then calls fund \u2014 two transactions. Moves the job to `Funded`.",
+      description: "Fund a job: deposits the on-chain budget into escrow. The escrow pulls the payment token via transferFrom, so this first sends an ERC-20 approval for the exact budget, then calls fund \u2014 two transactions. Moves the job to `Funded`. Pass `expectedBudget` to pin the amount instead of reading it on-chain.",
       schema: import_zod17.z.object({
         jobId: jobIdSchema,
+        expectedBudget: amountSchema.optional().describe(
+          "Pin the budget (atomic units): approve and fund exactly this amount instead of reading it on-chain. The contract reverts (BudgetMismatch) if the on-chain budget differs."
+        ),
+        optParams: optParamsSchema,
         chain: import_zod17.z.string().default("bsc").describe(CHAIN_DESC)
       }),
       invoke: async (_ctx, input2) => {
         const { client, commerce, chainKey } = this.bind(input2.chain);
         const jobId = BigInt(input2.jobId);
-        const job = await commerce.read.getJob([jobId]);
-        if (job.budget === 0n) {
-          throw new WalletError(
-            "VALIDATION_ERROR",
-            `Job ${input2.jobId} has no budget set \u2014 call erc8183_set_budget before funding.`
-          );
+        let budget;
+        if (input2.expectedBudget !== void 0) {
+          budget = BigInt(input2.expectedBudget);
+          if (budget === 0n) {
+            throw new WalletError("VALIDATION_ERROR", "expectedBudget must be greater than zero.");
+          }
+        } else {
+          const job = await commerce.read.getJob([jobId]);
+          if (job.budget === 0n) {
+            throw new WalletError(
+              "VALIDATION_ERROR",
+              `Job ${input2.jobId} has no budget set \u2014 call erc8183_set_budget before funding.`
+            );
+          }
+          budget = job.budget;
         }
         const token = await commerce.read.paymentToken([]);
         const wallet = this.walletContext.activeWallet();
-        const approvePending = await erc20.using(client).withAddress(token, chainKey).write.approve([commerce.address, job.budget], wallet);
+        const approvePending = await erc20.using(client).withAddress(token, chainKey).write.approve([commerce.address, budget], wallet);
         const approveConfirmed = await approvePending.wait();
-        const fundPending = await commerce.write.fund([jobId, job.budget, "0x"], wallet);
+        const fundPending = await commerce.write.fund(
+          [jobId, budget, input2.optParams ?? "0x"],
+          wallet
+        );
         const fundConfirmed = await fundPending.wait();
         return {
           success: true,
-          approveHash: approveConfirmed.txHash,
-          txHash: fundConfirmed.txHash,
+          approveHash: approveConfirmed.hash,
+          hash: fundConfirmed.hash,
           status: "Funded",
           chain: chainKey
         };
@@ -48286,16 +48788,19 @@ var Erc8183ActionProvider = class extends ActionProvider {
         deliverable: bytes32Schema.describe(
           "bytes32 deliverable commitment (e.g. a content hash)."
         ),
+        optParams: optParamsSchema.describe(
+          'Optional opaque optParams bytes forwarded raw to the contract (defaults to empty). Evaluators may expect deliverable metadata here, e.g. hex-encoded UTF-8 JSON like {"deliverable_url": "..."}.'
+        ),
         chain: import_zod17.z.string().default("bsc").describe(CHAIN_DESC)
       }),
       invoke: async (_ctx, input2) => {
         const { commerce, chainKey } = this.bind(input2.chain);
         const pending = await commerce.write.submit(
-          [BigInt(input2.jobId), input2.deliverable, "0x"],
+          [BigInt(input2.jobId), input2.deliverable, input2.optParams ?? "0x"],
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, status: "Submitted", chain: chainKey };
+        return { success: true, hash: confirmed.hash, status: "Submitted", chain: chainKey };
       }
     };
   }
@@ -48306,19 +48811,20 @@ var Erc8183ActionProvider = class extends ActionProvider {
       schema: import_zod17.z.object({
         jobId: jobIdSchema,
         reason: bytes32Schema.optional().describe("Optional bytes32 reason/attestation (defaults to zero)."),
+        optParams: optParamsSchema,
         chain: import_zod17.z.string().default("bsc").describe(CHAIN_DESC)
       }),
       invoke: async (_ctx, input2) => {
         const { commerce, chainKey } = this.bind(input2.chain);
         const pending = await commerce.write.complete(
-          [BigInt(input2.jobId), input2.reason ?? ZERO_BYTES322, "0x"],
+          [BigInt(input2.jobId), input2.reason ?? ZERO_BYTES322, input2.optParams ?? "0x"],
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
         const released = confirmed.events.PaymentReleased?.[0];
         return {
           success: true,
-          txHash: confirmed.txHash,
+          hash: confirmed.hash,
           status: "Completed",
           released: released ? released.amount.toString() : null,
           chain: chainKey
@@ -48333,19 +48839,20 @@ var Erc8183ActionProvider = class extends ActionProvider {
       schema: import_zod17.z.object({
         jobId: jobIdSchema,
         reason: bytes32Schema.optional().describe("Optional bytes32 reason (defaults to zero)."),
+        optParams: optParamsSchema,
         chain: import_zod17.z.string().default("bsc").describe(CHAIN_DESC)
       }),
       invoke: async (_ctx, input2) => {
         const { commerce, chainKey } = this.bind(input2.chain);
         const pending = await commerce.write.reject(
-          [BigInt(input2.jobId), input2.reason ?? ZERO_BYTES322, "0x"],
+          [BigInt(input2.jobId), input2.reason ?? ZERO_BYTES322, input2.optParams ?? "0x"],
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
         const refunded = confirmed.events.Refunded?.[0];
         return {
           success: true,
-          txHash: confirmed.txHash,
+          hash: confirmed.hash,
           status: "Rejected",
           refunded: refunded ? refunded.amount.toString() : null,
           chain: chainKey
@@ -48371,7 +48878,7 @@ var Erc8183ActionProvider = class extends ActionProvider {
         const refunded = confirmed.events.Refunded?.[0];
         return {
           success: true,
-          txHash: confirmed.txHash,
+          hash: confirmed.hash,
           status: "Expired",
           refunded: refunded ? refunded.amount.toString() : null,
           chain: chainKey
@@ -48413,6 +48920,46 @@ var Erc8183ActionProvider = class extends ActionProvider {
       }
     };
   }
+  policyInfo() {
+    return {
+      name: "erc8183_policy_info",
+      description: "Read the dispute-policy state of a job: the registered policy address, dispute window, submission time, dispute/vote tallies, and when the job becomes settleable (submittedAt + disputeWindow). Use before `erc8183_settle` to check timing, and before `erc8183_dispute`/`erc8183_vote_reject` to avoid opaque reverts.",
+      schema: import_zod17.z.object({
+        jobId: jobIdSchema,
+        chain: import_zod17.z.string().default("bsc").describe(CHAIN_DESC)
+      }),
+      invoke: async (_ctx, input2) => {
+        const { client, router, policy, chainKey } = this.bind(input2.chain);
+        const jobId = BigInt(input2.jobId);
+        const registeredPolicy = await router.read.jobPolicy([jobId]);
+        const registered = !isZeroAddress(registeredPolicy);
+        const policyContract = registered && registeredPolicy.toLowerCase() !== policy.address.toLowerCase() ? erc8183Policy.using(client).withAddress(registeredPolicy, chainKey) : policy;
+        const [disputeWindow, submittedAt, disputed, rejectVotes, voteQuorum, quorumSnapshot] = await Promise.all([
+          policyContract.read.disputeWindow([]),
+          policyContract.read.submittedAt([jobId]),
+          policyContract.read.disputed([jobId]),
+          policyContract.read.rejectVotes([jobId]),
+          policyContract.read.voteQuorum([]),
+          policyContract.read.disputeQuorumSnapshot([jobId])
+        ]);
+        const settleableAt = submittedAt > 0n ? submittedAt + disputeWindow : null;
+        return {
+          success: true,
+          jobId: input2.jobId,
+          policy: policyContract.address,
+          registered,
+          disputeWindow: disputeWindow.toString(),
+          submittedAt: submittedAt.toString(),
+          disputed,
+          rejectVotes: rejectVotes.toString(),
+          voteQuorum: voteQuorum.toString(),
+          quorumSnapshot: quorumSnapshot.toString(),
+          settleableAt: settleableAt?.toString() ?? null,
+          chain: chainKey
+        };
+      }
+    };
+  }
   // ----- Router -------------------------------------------------------------
   registerJob() {
     return {
@@ -48430,7 +48977,7 @@ var Erc8183ActionProvider = class extends ActionProvider {
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, chain: chainKey };
+        return { success: true, hash: confirmed.hash, chain: chainKey };
       }
     };
   }
@@ -48450,7 +48997,7 @@ var Erc8183ActionProvider = class extends ActionProvider {
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, chain: chainKey };
+        return { success: true, hash: confirmed.hash, chain: chainKey };
       }
     };
   }
@@ -48469,7 +49016,7 @@ var Erc8183ActionProvider = class extends ActionProvider {
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, status: "Expired", chain: chainKey };
+        return { success: true, hash: confirmed.hash, status: "Expired", chain: chainKey };
       }
     };
   }
@@ -48489,7 +49036,7 @@ var Erc8183ActionProvider = class extends ActionProvider {
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, chain: chainKey };
+        return { success: true, hash: confirmed.hash, chain: chainKey };
       }
     };
   }
@@ -48508,7 +49055,7 @@ var Erc8183ActionProvider = class extends ActionProvider {
           this.walletContext.activeWallet()
         );
         const confirmed = await pending.wait();
-        return { success: true, txHash: confirmed.txHash, chain: chainKey };
+        return { success: true, hash: confirmed.hash, chain: chainKey };
       }
     };
   }
@@ -48579,14 +49126,14 @@ var CompetitionActionProvider = class extends ActionProvider {
         if (!confirmed.events.Registered?.[0]) {
           throw new WalletError(
             "TX_FAILED",
-            `competition_register: no Registered event emitted (txHash=${confirmed.txHash})`
+            `competition_register: no Registered event emitted (hash=${confirmed.hash})`
           );
         }
         return {
           success: true,
           registered: true,
           participant,
-          txHash: confirmed.txHash,
+          hash: confirmed.hash,
           deadline: toIso2(deadline),
           chain: CHAIN
         };
@@ -53591,7 +54138,7 @@ async function runAutomationsTick(deps) {
             runCount: (auto.runCount ?? 0) + 1
           });
           log("info", `DCA executed: ${res.explorerUrl}`);
-          result.executed.push({ id: auto.id, type: "dca", txHash: res.txHash });
+          result.executed.push({ id: auto.id, type: "dca", hash: res.hash });
         } else {
           log("warn", `DCA ${auto.id} failed: ${res.error}`);
           result.errors++;
@@ -53639,7 +54186,7 @@ async function runAutomationsTick(deps) {
             lastRunAt: (/* @__PURE__ */ new Date()).toISOString()
           });
           log("info", `Limit order executed: ${res.explorerUrl}`);
-          result.executed.push({ id: auto.id, type: "limit", txHash: res.txHash });
+          result.executed.push({ id: auto.id, type: "limit", hash: res.hash });
         } else {
           log("warn", `Limit order ${auto.id} failed: ${res.error}`);
           result.errors++;
@@ -54187,12 +54734,15 @@ ${url}`);
           amount: opts.amount,
           decimals,
           memo: opts.memo,
+          // Mainnet by construction — onramp has no --chain input and derives
+          // chainKey from the asset's coinId via the CHAINS-only resolver.
+          chainKey,
           hdWallet
         });
       } catch (err) {
         mapBroadcastError(err);
       }
-      const explorerUrl = getExplorerTxUrl(result.chainKey, result.txHash);
+      const explorerUrl = getExplorerTxUrl(result.chainKey, result.hash);
       success("Off-ramp payout broadcast!");
       if (!opts.json) {
         info(
@@ -54201,7 +54751,7 @@ ${url}`);
       }
       output(
         {
-          hash: result.txHash,
+          hash: result.hash,
           chain: result.chainKey,
           from: address,
           to: opts.to,
@@ -54586,7 +55136,7 @@ function registerX402Command(program3) {
         confirmApproval: opts.autoApprove ? autoApproveConfirm : makeReadlineApprovalConfirm()
       });
       if (approval) {
-        info(`x402: Permit2 approved (one-time): tx ${approval.txHash}`);
+        info(`x402: Permit2 approved (one-time): tx ${approval.hash}`);
       }
       if (payment) {
         info(
@@ -54701,7 +55251,7 @@ var crypto7 = __toESM(require("crypto"));
 // package.json
 var package_default = {
   name: "@trustwallet/cli",
-  version: "0.17.0",
+  version: "0.19.0",
   description: "TWAK CLI \u2014 command-line interface for Trust Wallet Agent Kit",
   main: "dist/index.js",
   types: "dist/index.d.ts",
@@ -55077,7 +55627,7 @@ function registerWatchCommand(program3) {
                 tickResults.automations.executed.push({
                   id: auto.id,
                   type: "dca",
-                  txHash: result.txHash,
+                  hash: result.hash,
                   explorer: result.explorerUrl
                 });
               } else {
@@ -55145,7 +55695,7 @@ function registerWatchCommand(program3) {
                 tickResults.automations.executed.push({
                   id: auto.id,
                   type: "limit",
-                  txHash: result.txHash,
+                  hash: result.hash,
                   explorer: result.explorerUrl
                 });
               } else {