thaifi-wallet-cli 0.3.1 → 0.3.3

package/dist/chain.js

@@ -3,6 +3,7 @@ import { http, defineChain } from "viem";
 import { createClient, tempoActions } from "viem/tempo";
 import { Actions, Account, Addresses, Chain as TempoChains } from "viem/tempo";
 import { CONFIG } from "./config.js";
+import { PATHUSD, TOKENS } from "./tokens.js";
 /** ThaiFi chain 17 — clone of the tempo chain definition (formatters/serializers) with our ids. */
 export const thaiFi = defineChain({
     ...TempoChains.mainnet,
@@ -17,7 +18,7 @@ export const thaiFi = defineChain({
 });
 /** The account keychain precompile (access keys, TIP-1011). */
 export const accountKeychain = Addresses.accountKeychain;
-export function createAgentClient(store) {
+export function createAgentClient(store, feeToken) {
     if (!store.userAddress)
         throw new Error("Not paired yet — run `thaifi login` first.");
     const account = Account.fromP256(store.privateKey, {
@@ -26,10 +27,24 @@ export function createAgentClient(store) {
     return createClient({
         account,
         chain: thaiFi,
-        feeToken: CONFIG.pathUsd,
+        feeToken: feeToken ?? CONFIG.pathUsd,
         transport: http(store.rpcUrl),
     }).extend(tempoActions());
 }
+/** Min balance that makes a token usable as gas (~0.01; gas ≈ 0.003/tx). */
+const GAS_MIN_UNITS = 10000n;
+/**
+ * Pick the gas token by balance: pathUSD → THCFI → THCOC. The chain swaps the
+ * chosen token to the validator's pathUSD through the protocol FeeAMM.
+ */
+export async function pickFeeToken(client, userAddress) {
+    for (const t of TOKENS) {
+        const bal = await tokenBalance(client, t.address, userAddress).catch(() => 0n);
+        if (bal >= GAS_MIN_UNITS)
+            return t;
+    }
+    return PATHUSD;
+}
 export async function tokenBalance(client, token, address) {
     return client.readContract({
         address: token,

package/dist/commands/request.js

@@ -1,9 +1,10 @@
 /** `thaifi request <url>` — curl-like HTTP client with MPP/x402 auto-payments. */
 import { concatHex, keccak256, slice, stringToBytes } from "viem";
 import { loadStore } from "../store.js";
-import { createAgentClient } from "../chain.js";
+import { createAgentClient, pickFeeToken } from "../chain.js";
 import { buildAgentAuthCredential } from "../agentAuth.js";
 import { CONFIG, PATHUSD_DECIMALS } from "../config.js";
+import { PATHUSD, resolveToken } from "../tokens.js";
 function b64uDecode(s) {
     return Buffer.from(s.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf8");
 }
@@ -250,7 +251,27 @@ export async function request(url, options) {
         }
         const token = (challenge.token ?? CONFIG.pathUsd);
         console.log("402 — paying $" + usd + " to " + challenge.payTo + " …");
-        const client = createAgentClient(store);
+        // Gas token: --fee-token to force one, otherwise auto-pick by balance
+        // (pathUSD → THCFI → THCOC; the chain swaps it to pathUSD via FeeAMM).
+        const baseClient = createAgentClient(store);
+        let fee = PATHUSD;
+        if (options.feeToken) {
+            try {
+                fee = resolveToken(options.feeToken);
+            }
+            catch (err) {
+                console.error(err instanceof Error ? err.message : String(err));
+                process.exitCode = 1;
+                return;
+            }
+        }
+        else {
+            fee = await pickFeeToken(baseClient, store.userAddress);
+        }
+        const client = fee.address.toLowerCase() === PATHUSD.address.toLowerCase()
+            ? baseClient
+            : createAgentClient(store, fee.address);
+        console.log("Gas:   " + fee.symbol);
         const hash = await client.token.transfer({
             to: challenge.payTo,
             amount: challenge.amount,

package/dist/commands/transfer.js

@@ -1,7 +1,7 @@
 /** `thaifi transfer <to> <amount> [--token <symbol|address>]` — TIP-20 transfer signed by the agent access key. */
 import { parseUnits } from "viem";
 import { loadStore } from "../store.js";
-import { createAgentClient, tokenBalance } from "../chain.js";
+import { createAgentClient, pickFeeToken } from "../chain.js";
 import { PATHUSD, resolveToken } from "../tokens.js";
 export async function transfer(to, amount, options = {}) {
     const store = loadStore();
@@ -24,19 +24,29 @@ export async function transfer(to, amount, options = {}) {
         process.exitCode = 1;
         return;
     }
-    const client = createAgentClient(store);
     const userAddress = store.userAddress;
-    const rawAmount = parseUnits(amount, token.decimals);
-    // Gas is always paid in pathUSD — a non-pathUSD transfer with an empty
-    // pathUSD balance can never land.
-    if (token.address.toLowerCase() !== PATHUSD.address.toLowerCase()) {
-        const gasBalance = await tokenBalance(client, PATHUSD.address, userAddress).catch(() => null);
-        if (gasBalance !== null && gasBalance <= 0n) {
-            console.error(`✗ pathUSD balance is 0 — gas is paid in pathUSD, so this ${token.symbol} transfer would fail. Receive some pathUSD first.`);
+    const baseClient = createAgentClient(store);
+    // Gas token: --fee-token to force one, otherwise auto-pick by balance
+    // (pathUSD → THCFI → THCOC; the chain swaps it to pathUSD via FeeAMM).
+    let fee = PATHUSD;
+    if (options.feeToken) {
+        try {
+            fee = resolveToken(options.feeToken);
+        }
+        catch (err) {
+            console.error(err instanceof Error ? err.message : String(err));
             process.exitCode = 1;
             return;
         }
     }
+    else {
+        fee = await pickFeeToken(baseClient, userAddress);
+    }
+    const client = fee.address.toLowerCase() === PATHUSD.address.toLowerCase()
+        ? baseClient
+        : createAgentClient(store, fee.address);
+    const rawAmount = parseUnits(amount, token.decimals);
+    console.log("Gas:    " + fee.symbol);
     console.log("Token:  " + token.symbol + " (" + token.address + ")");
     console.log("To:     " + to);
     console.log("Amount: " + amount + " (raw " + rawAmount + ")");

package/dist/index.js

@@ -43,6 +43,7 @@ program
     .argument("<to>", "Recipient address (0x…)")
     .argument("<amount>", "Amount in human units (e.g. 1.5)")
     .option("--token <symbol|address>", "Token symbol or contract address (default: pathUSD)")
+    .option("--fee-token <symbol|address>", "Gas token (default: auto — pathUSD, else THCFI/THCOC by balance)")
     .action(transfer);
 program
     .command("fund")
@@ -59,6 +60,7 @@ program
     .option("--json <json>", "JSON body shorthand (sets method POST + content-type)")
     .option("--dry-run", "Print the request without sending")
     .option("--max-spend <usd>", "Maximum automatic payment (USD)", Number)
+    .option("--fee-token <symbol|address>", "Gas token for the payment tx (default: auto — pathUSD, else THCFI/THCOC by balance)")
     .action(async (url, opts) => {
     const headers = {};
     for (const h of opts.header ?? []) {

package/dist/tokens.js

@@ -6,14 +6,16 @@ export const PATHUSD = {
     name: "pathUSD",
     decimals: 6,
 };
+// System TIP-20 tokens (native factory, 2026-09-24) — can pay gas fees via
+// FeeAMM (FeeManager.setUserToken). Old factory tokens are test-only deprecated.
 export const THCFI = {
-    address: "0xfe76fedcfb6a7dfe7f10ecc518150ace70bd6994",
+    address: "0x20c000000000000000000000c82102FFe7064362",
     symbol: "THCFI",
     name: "ThaiCoin ThaiFi",
     decimals: 6,
 };
 export const THCOC = {
-    address: "0xadda91c4b336285ec732da4ae905f5ab3b4333b3",
+    address: "0x20C0000000000000000000007c24a0c628e8A940",
     symbol: "THCOC",
     name: "ThaiCoin OpenCraft",
     decimals: 6,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thaifi-wallet-cli",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "ThaiFi Wallet CLI for AI agents — pair with wallet.thaifi.com, sign with on-chain access keys (spending limits enforced on-chain), x402/MPP payments",
   "type": "module",
   "bin": {