tollkit-wallet 0.2.0 → 0.2.2

package/dist/holdings.js

@@ -0,0 +1,200 @@
+/**
+ * Every token the wallet holds, with prices and price history, for the dashboard.
+ *
+ * Finding tokens:
+ *   Solana   getParsedTokenAccountsByOwner for the SPL Token and Token-2022 programs (all mints held).
+ *   Ethereum Blockscout's public API, GET eth.blockscout.com/api/v2/addresses/{addr}/token-balances (ERC-20s).
+ *   Base     no free, key-less index works here (base.blockscout.com answers a Cloudflare challenge),
+ *            so the wallet tracks tokens it swaps into and tokens the owner adds by address.
+ * Prices and charts: DefiLlama's public coins API (no key):
+ *   GET coins.llama.fi/prices/current/{chain:address,...}  -> price, symbol, decimals
+ *   GET coins.llama.fi/chart/{coin}?span=&period=           -> price points
+ * Tokens with no price are counted as hidden (most airdropped spam has none).
+ * Only public addresses are sent to these services, never keys.
+ */
+import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import path from "node:path";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { Contract, JsonRpcProvider, formatUnits, getAddress } from "ethers";
+import { DEFAULT_RPC, EVM_CHAIN_ID, NATIVE_EVM, WSOL } from "./chains.js";
+import { KNOWN } from "./tokens.js";
+import { walletHome } from "./paths.js";
+const SPL_TOKEN = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"; // @solana/spl-token TOKEN_PROGRAM_ID
+const SPL_TOKEN_2022 = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"; // @solana/spl-token TOKEN_2022_PROGRAM_ID
+const LLAMA = "https://coins.llama.fi";
+const LLAMA_CHAIN = { base: "base", ethereum: "ethereum", solana: "solana" };
+const NATIVE_COIN = { base: "coingecko:ethereum", ethereum: "coingecko:ethereum", solana: "coingecko:solana" };
+const ERC20 = ["function balanceOf(address) view returns (uint256)", "function decimals() view returns (uint8)", "function symbol() view returns (string)", "function name() view returns (string)"];
+/** The DefiLlama id for a token: chain:address, or the coin itself for native ETH/SOL. */
+export function coinId(chain, address) {
+    if (address === NATIVE_EVM || address === WSOL)
+        return NATIVE_COIN[chain];
+    return `${LLAMA_CHAIN[chain]}:${address}`;
+}
+const isCore = (chain, addr) => Object.values(KNOWN[chain]).some((k) => k.address.toLowerCase() === addr.toLowerCase());
+/** Tokens the owner added or the wallet swapped into (EVM chains). */
+export class TokenList {
+    file;
+    constructor(dir) { this.file = path.join(walletHome(dir), "tokens.json"); }
+    list() { try {
+        return existsSync(this.file) ? JSON.parse(readFileSync(this.file, "utf8")) : {};
+    }
+    catch {
+        return {};
+    } }
+    add(chain, address) {
+        if (chain === "solana" || isCore(chain, address))
+            return; // Solana is found automatically; core tokens are always shown
+        const l = this.list(), a = getAddress(address);
+        if ((l[chain] ?? []).some((x) => x.toLowerCase() === a.toLowerCase()))
+            return;
+        l[chain] = [...(l[chain] ?? []), a];
+        const t = `${this.file}.${process.pid}.tmp`;
+        writeFileSync(t, JSON.stringify(l, null, 2));
+        renameSync(t, this.file);
+    }
+    remove(chain, address) {
+        const l = this.list();
+        l[chain] = (l[chain] ?? []).filter((x) => x.toLowerCase() !== address.toLowerCase());
+        const t = `${this.file}.${process.pid}.tmp`;
+        writeFileSync(t, JSON.stringify(l, null, 2));
+        renameSync(t, this.file);
+    }
+}
+/** Reads an ERC-20's symbol, name and decimals; throws if the address isn't one. */
+export async function erc20Info(chain, address, rpc = DEFAULT_RPC[chain]) {
+    const c = new Contract(getAddress(address), ERC20, new JsonRpcProvider(rpc, EVM_CHAIN_ID[chain], { staticNetwork: true }));
+    const [symbol, decimals, name] = await Promise.all([c.symbol(), c.decimals(), c.name().catch(() => undefined)]);
+    return { symbol: String(symbol), decimals: Number(decimals), name: name ? String(name) : undefined };
+}
+export class Holdings {
+    o;
+    snap = { tokens: [], hidden: 0, at: null, errors: [] };
+    timer = null;
+    list;
+    constructor(o) {
+        this.o = o;
+        this.list = new TokenList(o.dir);
+    }
+    get f() { return this.o.fetch ?? fetch; }
+    rpc(c) { return this.o.rpc?.[c] ?? DEFAULT_RPC[c]; }
+    snapshot() { return this.snap; }
+    async getJson(url, timeoutMs = 12_000) {
+        const r = await this.f(url, { headers: { accept: "application/json" }, signal: AbortSignal.timeout(timeoutMs) });
+        if (!r.ok)
+            throw new Error(`HTTP ${r.status}`);
+        return r.json();
+    }
+    async solana() {
+        const conn = new Connection(this.rpc("solana"), "confirmed"), owner = new PublicKey(this.o.solana);
+        const raw = new Map();
+        for (const prog of [SPL_TOKEN, SPL_TOKEN_2022]) {
+            const res = await conn.getParsedTokenAccountsByOwner(owner, { programId: new PublicKey(prog) });
+            for (const a of res.value) {
+                const info = a.account.data.parsed.info, amt = info.tokenAmount;
+                if (amt.amount === "0" || isCore("solana", info.mint))
+                    continue;
+                const prev = raw.get(info.mint);
+                raw.set(info.mint, { amount: (prev?.amount ?? 0n) + BigInt(amt.amount), decimals: amt.decimals });
+            }
+        }
+        return [...raw].map(([mint, v]) => ({ chain: "solana", address: mint, symbol: "", decimals: v.decimals, amount: formatUnits(v.amount, v.decimals) }));
+    }
+    async ethereumIndex() {
+        const rows = await this.getJson(`https://eth.blockscout.com/api/v2/addresses/${this.o.evm}/token-balances`, 25_000);
+        return rows.filter((r) => r.token?.type === "ERC-20" && r.value !== "0" && !isCore("ethereum", r.token.address_hash)).map((r) => ({
+            chain: "ethereum", address: getAddress(r.token.address_hash), symbol: String(r.token.symbol ?? ""), name: r.token.name ?? undefined,
+            decimals: Number(r.token.decimals ?? 18), amount: formatUnits(BigInt(r.value), Number(r.token.decimals ?? 18)), icon: r.token.icon_url ?? undefined,
+        }));
+    }
+    async tracked(chain) {
+        const addrs = this.list.list()[chain] ?? [];
+        const p = new JsonRpcProvider(this.rpc(chain), EVM_CHAIN_ID[chain], { staticNetwork: true });
+        const out = [];
+        await Promise.all(addrs.map(async (a) => {
+            try {
+                const c = new Contract(a, ERC20, p);
+                const [bal, decimals, symbol] = await Promise.all([c.balanceOf(this.o.evm), c.decimals(), c.symbol()]);
+                if (BigInt(bal) > 0n)
+                    out.push({ chain, address: a, symbol: String(symbol), decimals: Number(decimals), amount: formatUnits(BigInt(bal), Number(decimals)) });
+            }
+            catch { /* skip a token that doesn't answer */ }
+        }));
+        return out;
+    }
+    /** Finds holdings on the enabled chains and prices them. */
+    async refresh() {
+        const chains = this.o.chains(), errors = [];
+        const found = [];
+        const add = (rows) => { for (const r of rows)
+            if (!found.some((x) => x.chain === r.chain && x.address.toLowerCase() === r.address.toLowerCase()))
+                found.push(r); };
+        await Promise.all(chains.map(async (c) => {
+            try {
+                if (c === "solana")
+                    add(await this.solana());
+                else {
+                    if (c === "ethereum") {
+                        try {
+                            add(await this.ethereumIndex());
+                        }
+                        catch (e) {
+                            errors.push(`ethereum index: ${e.message}`);
+                        }
+                    }
+                    add(await this.tracked(c));
+                }
+            }
+            catch (e) {
+                errors.push(`${c}: ${e.message}`);
+            }
+        }));
+        let prices = {};
+        const ids = found.map((h) => coinId(h.chain, h.address));
+        for (let i = 0; i < ids.length; i += 60) {
+            try {
+                prices = { ...prices, ...(await this.getJson(`${LLAMA}/prices/current/${ids.slice(i, i + 60).join(",")}?searchWidth=6h`)).coins };
+            }
+            catch (e) {
+                errors.push(`prices: ${e.message}`);
+            }
+        }
+        // 24h change in percent (GET coins.llama.fi/percentage/{coins}?period=24h)
+        let pct = {};
+        const priced = ids.filter((id) => prices[id]?.price);
+        for (let i = 0; i < priced.length; i += 60) {
+            try {
+                pct = { ...pct, ...(await this.getJson(`${LLAMA}/percentage/${priced.slice(i, i + 60).join(",")}?period=24h`)).coins };
+            }
+            catch { /* change is optional */ }
+        }
+        const tokens = found.map((h) => {
+            const coin = coinId(h.chain, h.address), p = prices[coin];
+            const price = p?.price && p.price > 0 ? p.price : undefined;
+            return { ...h, coin, symbol: h.symbol || (p?.symbol ? String(p.symbol).toUpperCase() : `${h.address.slice(0, 4)}…`), price, usd: price !== undefined ? price * Number(h.amount) : undefined, ...(typeof pct[coin] === "number" ? { change_24h: pct[coin] / 100 } : {}) };
+        });
+        const shown = tokens.filter((t) => t.price !== undefined).sort((a, b) => (b.usd ?? 0) - (a.usd ?? 0));
+        this.snap = { tokens: shown, hidden: tokens.length - shown.length, at: new Date().toISOString(), errors };
+    }
+    start() { if (!this.timer) {
+        void this.refresh().catch(() => { });
+        this.timer = setInterval(() => void this.refresh().catch(() => { }), this.o.intervalMs ?? 60_000);
+    } }
+    stop() { if (this.timer)
+        clearInterval(this.timer); this.timer = null; }
+}
+/** Ranges for the price chart. DefiLlama span/period pairs, checked against the live API on 2026-10-14. */
+export const CHART_RANGES = { "1D": { span: 24, period: "1h" }, "1W": { span: 42, period: "4h" }, "1M": { span: 30, period: "1d" }, "1Y": { span: 52, period: "1w" } };
+export async function priceChart(coin, range, f = fetch) {
+    if (!/^(coingecko:[a-z0-9-]+|(base|ethereum|solana):[0-9A-Za-z]{32,44})$/.test(coin))
+        throw new Error("Unknown coin.");
+    const r = CHART_RANGES[range];
+    if (!r)
+        throw new Error("Pick 1D, 1W, 1M or 1Y.");
+    const res = await f(`${LLAMA}/chart/${coin}?span=${r.span}&period=${r.period}`, { headers: { accept: "application/json" }, signal: AbortSignal.timeout(12_000) });
+    if (!res.ok)
+        throw new Error(`Price history isn't available right now (HTTP ${res.status}).`);
+    const c = (await res.json())?.coins?.[coin];
+    return { coin, symbol: c?.symbol, range, points: (c?.prices ?? []).map((x) => ({ t: Number(x.timestamp), p: Number(x.price) })).filter((x) => x.p > 0) };
+}
+//# sourceMappingURL=holdings.js.map

package/dist/holdings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"holdings.js","sourceRoot":"","sources":["../src/holdings.ts"],"names":[],"mappings":"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"}

package/dist/keystore.d.ts

@@ -3,6 +3,15 @@
  * EVM: the standard Ethereum JSON keystore (ethers v6, scrypt + AES-128-CTR).
  * Solana: the 64-byte secret key, scrypt-derived key + AES-256-GCM.
  * Tollkit never sees either key or the password.
+ *
+ * New wallets come from a 12-word BIP-39 recovery phrase, derived the way
+ * MetaMask and Phantom do it, so the same phrase restores the same addresses
+ * there too (checked 2026-10-14):
+ *   EVM    m/44'/60'/0'/0/0  (MetaMask: "default BIP-44 derivation path (m/44'/60'/0'/0)";
+ *                             Phantom default bip44Change "m/44'/60'/0'/0/${index}")
+ *   Solana m/44'/501'/0'/0'  (Phantom default bip44Change "m/44'/501'/${index}'/0'"),
+ *          ed25519 via SLIP-0010 (hardened only).
+ * The phrase is kept encrypted like the keys so the owner can view it again with the password.
  */
 import { Keypair } from "@solana/web3.js";
 import { Wallet, HDNodeWallet } from "ethers";
@@ -18,30 +27,67 @@ export interface KeystoreFile {
     evm_address: string;
     solana_address: string;
     evm: string;
-    solana: {
-        kdf: "scrypt";
-        N: number;
-        r: number;
-        p: number;
-        salt: string;
-        iv: string;
-        tag: string;
-        ct: string;
-    };
+    solana: Sealed;
+    /** The recovery phrase, sealed like the Solana key. Absent on wallets made before 0.2.2 (keys only). */
+    phrase?: Sealed;
 }
+type Sealed = {
+    kdf: "scrypt";
+    N: number;
+    r: number;
+    p: number;
+    salt: string;
+    iv: string;
+    tag: string;
+    ct: string;
+};
+export declare const EVM_PATH = "m/44'/60'/0'/0/0";
+export declare const SOLANA_PATH = "m/44'/501'/0'/0'";
+/** SLIP-0010 ed25519 private key for a hardened-only path, from a BIP-39 seed. */
+export declare function slip10Ed25519(seed: Uint8Array, path: string): Uint8Array;
+/** Both keys from a recovery phrase. Throws on an invalid phrase. */
+export declare function keysFromPhrase(phrase: string): {
+    evm: HDNodeWallet;
+    solana: Keypair;
+    phrase: string;
+};
+export declare function newPhrase(): string;
 export interface Keys {
     evm: Wallet | HDNodeWallet;
     solana: Keypair;
 }
-/** Make a new wallet (or import keys). Refuses to overwrite an existing one. */
+/**
+ * Make a new wallet from a fresh recovery phrase, restore one from a phrase, or import raw keys.
+ * Refuses to overwrite an existing wallet unless `replace` is set, which keeps the old file as keystore.json.replaced-<time>.
+ */
 export declare function createKeystore(password: string, opts?: {
     dir?: string;
+    phrase?: string;
     evmPrivateKey?: string;
     solanaSecretKey?: Uint8Array;
     scrypt?: ScryptParams;
+    replace?: boolean;
 }): Promise<{
     evm: string;
     solana: string;
+    phrase: string | undefined;
+}>;
+/** Whether the owner has confirmed they wrote the backup down. */
+export declare function backupDone(dir?: string): boolean;
+export declare function markBackedUp(dir?: string): void;
+/** Is there a recovery phrase, or only keys (wallets made before 0.2.2)? */
+export declare function backupKind(dir?: string): "phrase" | "keys";
+/**
+ * What the owner writes down to restore the wallet: the phrase, or for older wallets
+ * the two private keys (EVM hex, Solana base58, the formats other wallets import).
+ */
+export declare function revealBackup(password: string, dir?: string): Promise<{
+    kind: "phrase";
+    phrase: string;
+} | {
+    kind: "keys";
+    evm_private_key: string;
+    solana_secret_key: string;
 }>;
 export declare function readKeystore(dir?: string): KeystoreFile;
 /** Public addresses only; no password needed. */
@@ -51,3 +97,4 @@ export declare function addresses(dir?: string): {
 };
 /** Unlock both keys. Throws "wrong password" on a bad password. */
 export declare function unlock(password: string, dir?: string): Promise<Keys>;
+export {};

package/dist/keystore.js

@@ -3,22 +3,64 @@
  * EVM: the standard Ethereum JSON keystore (ethers v6, scrypt + AES-128-CTR).
  * Solana: the 64-byte secret key, scrypt-derived key + AES-256-GCM.
  * Tollkit never sees either key or the password.
+ *
+ * New wallets come from a 12-word BIP-39 recovery phrase, derived the way
+ * MetaMask and Phantom do it, so the same phrase restores the same addresses
+ * there too (checked 2026-10-14):
+ *   EVM    m/44'/60'/0'/0/0  (MetaMask: "default BIP-44 derivation path (m/44'/60'/0'/0)";
+ *                             Phantom default bip44Change "m/44'/60'/0'/0/${index}")
+ *   Solana m/44'/501'/0'/0'  (Phantom default bip44Change "m/44'/501'/${index}'/0'"),
+ *          ed25519 via SLIP-0010 (hardened only).
+ * The phrase is kept encrypted like the keys so the owner can view it again with the password.
  */
 import { Keypair } from "@solana/web3.js";
-import { Wallet, encryptKeystoreJson } from "ethers";
+import { Wallet, HDNodeWallet, Mnemonic, encryptKeystoreJson, computeHmac, getBytes, concat, toBeArray, zeroPadValue, encodeBase58, randomBytes as ethersRandom } from "ethers";
 import { createCipheriv, createDecipheriv, randomBytes, scrypt as scryptCb } from "node:crypto";
 import { existsSync, readFileSync, writeFileSync, renameSync } from "node:fs";
 import { files, walletHome } from "./paths.js";
+import path from "node:path";
 export const DEFAULT_SCRYPT = { N: 1 << 17, r: 8, p: 1 };
+export const EVM_PATH = "m/44'/60'/0'/0/0";
+export const SOLANA_PATH = "m/44'/501'/0'/0'";
+/** SLIP-0010 ed25519 private key for a hardened-only path, from a BIP-39 seed. */
+export function slip10Ed25519(seed, path) {
+    if (!/^m(\/\d+')*$/.test(path))
+        throw new Error("ed25519 paths must be fully hardened, e.g. m/44'/501'/0'/0'");
+    let I = getBytes(computeHmac("sha512", new TextEncoder().encode("ed25519 seed"), seed));
+    let key = I.slice(0, 32), chain = I.slice(32);
+    for (const seg of path.split("/").slice(1)) {
+        const index = (Number(seg.slice(0, -1)) + 0x80000000) >>> 0;
+        const data = concat([new Uint8Array([0]), key, zeroPadValue(toBeArray(index), 4)]);
+        I = getBytes(computeHmac("sha512", chain, data));
+        key = I.slice(0, 32);
+        chain = I.slice(32);
+    }
+    return key;
+}
+/** Both keys from a recovery phrase. Throws on an invalid phrase. */
+export function keysFromPhrase(phrase) {
+    const clean = phrase.trim().toLowerCase().split(/\s+/).join(" ");
+    let m;
+    try {
+        m = Mnemonic.fromPhrase(clean);
+    }
+    catch {
+        throw new Error("That recovery phrase isn't valid. Check the words and their order.");
+    }
+    const evm = HDNodeWallet.fromMnemonic(m, EVM_PATH);
+    const solana = Keypair.fromSeed(slip10Ed25519(getBytes(m.computeSeed()), SOLANA_PATH));
+    return { evm, solana, phrase: m.phrase };
+}
+export function newPhrase() { return Mnemonic.fromEntropy(ethersRandom(16)).phrase; }
 const scrypt = (pw, salt, s) => new Promise((res, rej) => scryptCb(pw, salt, 32, { N: s.N, r: s.r, p: s.p, maxmem: 256 * 1024 * 1024 }, (e, k) => (e ? rej(e) : res(k))));
-async function sealSolana(secret, pw, s) {
+async function seal(secret, pw, s) {
     const salt = randomBytes(16), iv = randomBytes(12);
     const key = await scrypt(pw, salt, s);
     const c = createCipheriv("aes-256-gcm", key, iv);
     const ct = Buffer.concat([c.update(Buffer.from(secret)), c.final()]);
     return { kdf: "scrypt", ...s, salt: salt.toString("hex"), iv: iv.toString("hex"), tag: c.getAuthTag().toString("hex"), ct: ct.toString("hex") };
 }
-async function openSolana(box, pw) {
+async function openSealed(box, pw) {
     const key = await scrypt(pw, Buffer.from(box.salt, "hex"), { N: box.N, r: box.r, p: box.p });
     const d = createDecipheriv("aes-256-gcm", key, Buffer.from(box.iv, "hex"));
     d.setAuthTag(Buffer.from(box.tag, "hex"));
@@ -29,21 +71,38 @@ async function openSolana(box, pw) {
     catch {
         throw new Error("wrong password");
     }
-    return Keypair.fromSecretKey(new Uint8Array(secret));
+    return secret;
 }
+const openSolana = async (box, pw) => Keypair.fromSecretKey(new Uint8Array(await openSealed(box, pw)));
 function checkPassword(pw) {
     if (typeof pw !== "string" || pw.length < 12)
         throw new Error("Use a password of at least 12 characters.");
 }
-/** Make a new wallet (or import keys). Refuses to overwrite an existing one. */
+/**
+ * Make a new wallet from a fresh recovery phrase, restore one from a phrase, or import raw keys.
+ * Refuses to overwrite an existing wallet unless `replace` is set, which keeps the old file as keystore.json.replaced-<time>.
+ */
 export async function createKeystore(password, opts = {}) {
     checkPassword(password);
     const f = files(walletHome(opts.dir));
-    if (existsSync(f.keystore))
-        throw new Error(`A wallet already exists at ${f.keystore}. Back it up and remove it first if you want a new one.`);
+    if (existsSync(f.keystore)) {
+        if (!opts.replace)
+            throw new Error(`A wallet already exists at ${f.keystore}. Back it up and remove it first if you want a new one.`);
+        // Keep the old wallet's files (renamed, never deleted). Its limits and saved password were sealed with the old password.
+        const stamp = new Date().toISOString().replace(/[:.]/g, "-");
+        for (const old of [f.keystore, f.policy, f.backup, path.join(walletHome(opts.dir), "password")])
+            if (existsSync(old))
+                renameSync(old, `${old}.replaced-${stamp}`);
+    }
     const s = opts.scrypt ?? DEFAULT_SCRYPT;
-    const evm = opts.evmPrivateKey ? new Wallet(opts.evmPrivateKey) : Wallet.createRandom();
-    const sol = opts.solanaSecretKey ? Keypair.fromSecretKey(opts.solanaSecretKey) : Keypair.generate();
+    const importing = !!(opts.evmPrivateKey || opts.solanaSecretKey);
+    if (importing && opts.phrase)
+        throw new Error("Give a recovery phrase or keys, not both.");
+    if (importing && !(opts.evmPrivateKey && opts.solanaSecretKey))
+        throw new Error("Importing keys needs both the EVM private key and the Solana secret key.");
+    const fromPhrase = importing ? null : keysFromPhrase(opts.phrase ?? newPhrase());
+    const evm = fromPhrase ? fromPhrase.evm : new Wallet(opts.evmPrivateKey);
+    const sol = fromPhrase ? fromPhrase.solana : Keypair.fromSecretKey(opts.solanaSecretKey);
     const evmJson = await encryptKeystoreJson({ address: evm.address, privateKey: evm.privateKey }, password, { scrypt: { N: s.N, r: s.r, p: s.p } });
     const ks = {
         version: 1,
@@ -51,12 +110,29 @@ export async function createKeystore(password, opts = {}) {
         evm_address: evm.address,
         solana_address: sol.publicKey.toBase58(),
         evm: evmJson,
-        solana: await sealSolana(sol.secretKey, password, s),
+        solana: await seal(sol.secretKey, password, s),
+        ...(fromPhrase ? { phrase: await seal(new TextEncoder().encode(fromPhrase.phrase), password, s) } : {}),
     };
     const tmp = f.keystore + ".tmp";
     writeFileSync(tmp, JSON.stringify(ks, null, 2), { mode: 0o600 });
     renameSync(tmp, f.keystore);
-    return { evm: ks.evm_address, solana: ks.solana_address };
+    return { evm: ks.evm_address, solana: ks.solana_address, phrase: fromPhrase?.phrase };
+}
+/** Whether the owner has confirmed they wrote the backup down. */
+export function backupDone(dir) { return existsSync(files(walletHome(dir)).backup); }
+export function markBackedUp(dir) { writeFileSync(files(walletHome(dir)).backup, JSON.stringify({ confirmed_at: new Date().toISOString() }) + "\n", { mode: 0o600 }); }
+/** Is there a recovery phrase, or only keys (wallets made before 0.2.2)? */
+export function backupKind(dir) { return readKeystore(dir).phrase ? "phrase" : "keys"; }
+/**
+ * What the owner writes down to restore the wallet: the phrase, or for older wallets
+ * the two private keys (EVM hex, Solana base58, the formats other wallets import).
+ */
+export async function revealBackup(password, dir) {
+    const ks = readKeystore(dir);
+    if (ks.phrase)
+        return { kind: "phrase", phrase: new TextDecoder().decode(await openSealed(ks.phrase, password)) };
+    const k = await unlock(password, dir);
+    return { kind: "keys", evm_private_key: k.evm.privateKey, solana_secret_key: encodeBase58(k.solana.secretKey) };
 }
 export function readKeystore(dir) {
     const f = files(walletHome(dir));

package/dist/keystore.js.map

@@ -1 +1 @@
-{"version":3,"file":"keystore.js","sourceRoot":"","sources":["../src/keystore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"keystore.js","sourceRoot":"","sources":["../src/keystore.ts"],"names":[],"mappings":"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"}

package/dist/ledger.d.ts

@@ -1,5 +1,5 @@
 import type { Policy } from "./policy.js";
-export type Kind = "trade" | "payment" | "withdrawal";
+export type Kind = "trade" | "payment" | "withdrawal" | "stake" | "move" | "dapp";
 export type Status = "pending" | "done" | "failed";
 export interface Entry {
     id: string;

package/dist/mcp.d.ts

@@ -1,8 +1,13 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { TollkitWallet } from "./wallet.js";
-export declare const VERSION = "0.2.0";
+/** The only tools the wallet's built-in AI chat gets: read, look at prices, and suggest rules for the owner to turn on. */
+export declare const ADVISOR_TOOLS: string[];
+export declare const VERSION = "0.2.2";
 export declare function passwordFromEnv(): string;
-export declare function buildServer(w: TollkitWallet): McpServer;
+export declare function buildServer(w: TollkitWallet, o?: {
+    advisor?: boolean;
+}): McpServer;
 export declare function serveStdio(o?: {
     dir?: string;
+    advisor?: boolean;
 }): Promise<void>;

package/dist/mcp.js

@@ -10,8 +10,10 @@ import { readFileSync } from "node:fs";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { TollkitWallet } from "./wallet.js";
-import { ACTIONS } from "./actions.js";
-export const VERSION = "0.2.0";
+import { ACTIONS, proposeRules } from "./actions.js";
+/** The only tools the wallet's built-in AI chat gets: read, look at prices, and suggest rules for the owner to turn on. */
+export const ADVISOR_TOOLS = ["wallet_status", "wallet_balances", "swap_quote", "receipts", "market_prices", "price_history", "autopilot_rules", "autopilot_propose", "paper_status"];
+export const VERSION = "0.2.2";
 export function passwordFromEnv() {
     const file = process.env.TOLLKIT_WALLET_PASSWORD_FILE;
     if (file)
@@ -22,21 +24,25 @@ export function passwordFromEnv() {
     return pw;
 }
 const json = (v) => ({ content: [{ type: "text", text: JSON.stringify(v, null, 2) }] });
-export function buildServer(w) {
+export function buildServer(w, o = {}) {
     const s = new McpServer({ name: "tollkit-wallet", version: VERSION });
     for (const a of ACTIONS) {
+        if (o.advisor && !ADVISOR_TOOLS.includes(a.name))
+            continue;
+        // In advisor mode suggestions always wait for the owner, whatever agent_rules says.
+        const run = o.advisor && a.name === "autopilot_propose" ? (ww, args) => proposeRules(ww, args, { neverAuto: true }) : a.run;
         s.registerTool(a.name, {
             description: a.description,
             inputSchema: a.schema.shape,
             annotations: a.spends ? { destructiveHint: true, openWorldHint: true, idempotentHint: false }
                 : /^autopilot_(propose|cancel)$/.test(a.name) ? { readOnlyHint: false, destructiveHint: a.name === "autopilot_propose", openWorldHint: true }
                     : { readOnlyHint: true, openWorldHint: !["wallet_status", "receipts", "autopilot_rules", "paper_status"].includes(a.name) },
-        }, async (args) => json(await a.run(w, args ?? {})));
+        }, async (args) => json(await run(w, args ?? {})));
     }
     return s;
 }
 export async function serveStdio(o = {}) {
     const w = await TollkitWallet.open(passwordFromEnv(), { dir: o.dir });
-    await buildServer(w).connect(new StdioServerTransport());
+    await buildServer(w, { advisor: o.advisor }).connect(new StdioServerTransport());
 }
 //# sourceMappingURL=mcp.js.map

package/dist/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAE/B,MAAM,UAAU,eAAe;IAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC;IACtD,IAAI,IAAI;QAAE,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IAC/C,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,uFAAuF,CAAC,CAAC;IAClH,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,IAAI,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAE1G,MAAM,UAAU,WAAW,CAAC,CAAgB;IAC1C,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACtE,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE;YACrB,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,WAAW,EAAG,CAAC,CAAC,MAAc,CAAC,KAAK;YACpC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE;gBAC3F,CAAC,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,IAAI,KAAK,mBAAmB,EAAE,aAAa,EAAE,IAAI,EAAE;oBAC7I,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,eAAe,EAAE,UAAU,EAAE,iBAAiB,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;SAC9H,EAAE,KAAK,EAAE,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAO,CAAC,CAAC,GAAW,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAsB,EAAE;IACvD,MAAM,CAAC,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACtE,MAAM,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;AAC3D,CAAC"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"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"}

package/dist/netguard.d.ts

@@ -0,0 +1,8 @@
+/** Keeping agent-driven requests on the public internet. */
+/** This computer and private networks (so an agent can't reach the local dashboard or devices). */
+export declare function isLocalUrl(u: string): boolean;
+/**
+ * fetch that refuses this computer and private networks, on the first URL and on every redirect
+ * (Node's fetch would otherwise follow a redirect to 127.0.0.1 with the same method and headers).
+ */
+export declare function publicFetch(f?: typeof fetch): typeof fetch;