@elizaos/agent 2.0.0-alpha.98 → 2.0.0-beta.2

package/packages/agent/src/api/wallet-capability.js

@@ -0,0 +1,193 @@
+import { resolveEvmSigningCapability, } from "../services/evm-signing-capability.js";
+import { getWalletAddresses } from "./wallet.js";
+import { resolveWalletRpcReadiness } from "./wallet-rpc.js";
+/** Unified wallet package (bundles legacy EVM + Solana plugins). */
+export const EVM_PLUGIN_PACKAGE = "@elizaos/plugin-wallet";
+const EVM_PLUGIN_SERVICE_NAMES = ["evm", "evmService"];
+function readPrimaryWalletSource(config, chain) {
+    const wallet = config.wallet && typeof config.wallet === "object"
+        ? config.wallet
+        : null;
+    const primary = wallet?.primary && typeof wallet.primary === "object"
+        ? wallet.primary
+        : null;
+    const configured = primary?.[chain];
+    if (configured === "local" || configured === "cloud") {
+        return configured;
+    }
+    const envKey = chain === "evm"
+        ? process.env.WALLET_SOURCE_EVM
+        : process.env.WALLET_SOURCE_SOLANA;
+    return envKey === "local" || envKey === "cloud" ? envKey : null;
+}
+function hasRuntimeEvmService(runtime) {
+    if (!runtime ||
+        typeof runtime.getService !== "function") {
+        const services = runtime?.services;
+        if (services &&
+            typeof services === "object" &&
+            "get" in services &&
+            typeof services.get === "function") {
+            for (const serviceName of EVM_PLUGIN_SERVICE_NAMES) {
+                try {
+                    const instances = services.get(serviceName);
+                    if ((Array.isArray(instances) && instances.length > 0) ||
+                        (!Array.isArray(instances) && Boolean(instances))) {
+                        return true;
+                    }
+                }
+                catch { }
+            }
+        }
+        return false;
+    }
+    try {
+        const getService = runtime
+            .getService;
+        for (const serviceName of EVM_PLUGIN_SERVICE_NAMES) {
+            try {
+                if (getService(serviceName)) {
+                    return true;
+                }
+            }
+            catch { }
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+function getRuntimePlugins(runtime) {
+    const plugins = runtime?.plugins;
+    if (Array.isArray(plugins)) {
+        return plugins;
+    }
+    if (plugins &&
+        typeof plugins === "object" &&
+        "length" in plugins &&
+        typeof plugins.length === "number") {
+        return Array.from({ length: plugins.length }, (_, index) => {
+            return plugins[index];
+        });
+    }
+    if (plugins &&
+        typeof plugins === "object" &&
+        Symbol.iterator in plugins &&
+        typeof plugins[Symbol.iterator] === "function") {
+        try {
+            return Array.from(plugins);
+        }
+        catch {
+            return [];
+        }
+    }
+    return [];
+}
+function getPluginIdentifiers(plugin) {
+    if (!plugin || typeof plugin !== "object") {
+        return [];
+    }
+    const record = plugin;
+    return ["name", "id", "packageName", "npmName"]
+        .map((key) => record[key])
+        .filter((value) => typeof value === "string");
+}
+function isManagedEvmBridgeActive() {
+    return Boolean(process.env.ELIZA_MANAGED_EVM_ADDRESS?.trim() ||
+        process.env.ELIZA_CLOUD_EVM_ADDRESS?.trim());
+}
+export function isPluginLoadedByName(runtime, pluginName) {
+    const shortId = pluginName.replace("@elizaos/plugin-", "");
+    const packageSuffix = `plugin-${shortId}`;
+    return getRuntimePlugins(runtime).some((plugin) => {
+        return getPluginIdentifiers(plugin).some((identifier) => {
+            return (identifier === pluginName ||
+                identifier === shortId ||
+                identifier === packageSuffix ||
+                identifier.endsWith(`/${packageSuffix}`) ||
+                identifier.includes(shortId));
+        });
+    });
+}
+export function resolveWalletAutomationMode(config) {
+    const features = config.features && typeof config.features === "object"
+        ? config.features
+        : null;
+    const agentAutomation = features?.agentAutomation &&
+        typeof features.agentAutomation === "object" &&
+        !Array.isArray(features.agentAutomation)
+        ? features.agentAutomation
+        : null;
+    return agentAutomation?.mode === "connectors-only"
+        ? "connectors-only"
+        : "full";
+}
+export function resolvePluginEvmLoaded(runtime) {
+    return (isPluginLoadedByName(runtime, EVM_PLUGIN_PACKAGE) ||
+        hasRuntimeEvmService(runtime) ||
+        isManagedEvmBridgeActive());
+}
+export function resolveWalletCapabilityStatus(state) {
+    const addrs = (state.getWalletAddresses ?? getWalletAddresses)();
+    const rpcReadiness = resolveWalletRpcReadiness(state.config);
+    const automationMode = resolveWalletAutomationMode(state.config);
+    const evmSigning = (state.resolveEvmSigningCapability ?? resolveEvmSigningCapability)();
+    const localSignerAvailable = evmSigning.kind === "local";
+    const localSolanaSignerAvailable = Boolean(process.env.SOLANA_PRIVATE_KEY?.trim());
+    const hasWallet = Boolean(addrs.evmAddress || addrs.solanaAddress);
+    const hasEvm = Boolean(addrs.evmAddress);
+    const pluginEvmLoaded = resolvePluginEvmLoaded(state.runtime);
+    const pluginEvmRequired = hasEvm || localSignerAvailable;
+    const rpcReady = Boolean(rpcReadiness.managedBscRpcReady);
+    const primaryEvmSource = readPrimaryWalletSource(state.config, "evm");
+    const primarySolanaSource = readPrimaryWalletSource(state.config, "solana");
+    const hasCloudPrimary = primaryEvmSource === "cloud" || primarySolanaSource === "cloud";
+    const hasLocalPrimary = primaryEvmSource === "local" || primarySolanaSource === "local";
+    const walletSource = hasCloudPrimary
+        ? "managed"
+        : localSignerAvailable || localSolanaSignerAvailable || hasLocalPrimary
+            ? hasWallet || localSignerAvailable || localSolanaSignerAvailable
+                ? "local"
+                : "none"
+            : hasWallet
+                ? "managed"
+                : "none";
+    let executionBlockedReason = null;
+    if (!hasEvm) {
+        executionBlockedReason = "No EVM wallet is active yet.";
+    }
+    else if (evmSigning.kind === "cloud-view-only") {
+        // Prefer the explicit capability reason over a generic "plugin not loaded"
+        // so the UI can tell users the cloud wallet is visible but not signable.
+        executionBlockedReason = evmSigning.reason;
+    }
+    else if (!rpcReady) {
+        executionBlockedReason = "BSC RPC is not configured.";
+    }
+    else if (!pluginEvmLoaded) {
+        executionBlockedReason =
+            "@elizaos/plugin-wallet is not loaded, so EVM wallet execution is unavailable.";
+    }
+    else if (automationMode !== "full") {
+        executionBlockedReason =
+            "Agent automation is in connectors-only mode, so wallet execution is blocked in chat.";
+    }
+    return {
+        walletSource,
+        walletNetwork: rpcReadiness.walletNetwork,
+        evmAddress: addrs.evmAddress ?? null,
+        solanaAddress: addrs.solanaAddress ?? null,
+        hasWallet,
+        hasEvm,
+        localSignerAvailable,
+        rpcReady,
+        automationMode,
+        pluginEvmLoaded,
+        pluginEvmRequired,
+        executionReady: hasEvm && rpcReady && pluginEvmLoaded && automationMode === "full",
+        executionBlockedReason,
+        evmSigningCapability: evmSigning.kind,
+        evmSigningReason: evmSigning.reason,
+    };
+}

package/packages/agent/src/api/wallet-dex-prices.d.ts

@@ -1,6 +1,5 @@
 export declare const DEXSCREENER_CHAIN_MAP: Record<number, string>;
 export declare const DEXPAPRIKA_CHAIN_MAP: Record<number, string>;
-/** Wrapped native token addresses for pricing native balances via DEX APIs. */
 export declare const WRAPPED_NATIVE: Record<number, string>;
 export declare const DEX_PRICE_TIMEOUT_MS = 10000;
 export interface DexScreenerPair {
@@ -15,29 +14,12 @@ export interface DexScreenerPair {
         imageUrl?: string;
     };
 }
-/** Price + optional logo URL from DEX aggregators. */
 export interface DexTokenMeta {
     price: string;
     logoUrl?: string;
 }
-/**
- * Batch-fetch USD prices from DexScreener.
- * Returns a map of lowercased contract address → price USD string.
- */
 export declare function fetchDexScreenerPrices(chainId: number, addresses: string[]): Promise<Map<string, DexTokenMeta>>;
-/**
- * Fetch individual token prices from DexPaprika as fallback.
- * Only called for addresses that DexScreener couldn't price.
- */
 export declare function fetchDexPaprikaPrices(chainId: number, addresses: string[]): Promise<Map<string, DexTokenMeta>>;
-/**
- * Fetch USD prices for a list of token addresses using DexScreener (primary)
- * with DexPaprika fallback. Returns a map of lowercased address → price string.
- */
 export declare function fetchDexPrices(chainId: number, addresses: string[]): Promise<Map<string, DexTokenMeta>>;
-/**
- * Compute USD value from a formatted balance string and a price string.
- * Returns "0" if either value is invalid.
- */
 export declare function computeValueUsd(balance: string, priceUsd: string): string;
 //# sourceMappingURL=wallet-dex-prices.d.ts.map

package/packages/agent/src/api/wallet-dex-prices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-dex-prices.d.ts","sourceRoot":"","sources":["../../../../../src/api/wallet-dex-prices.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQxD,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQvD,CAAC;AAEF,+EAA+E;AAC/E,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQjD,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAI3C,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7B,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9B;AAED,sDAAsD;AACtD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAID;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAsDpC;AAID;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CA2BpC;AAID;;;GAGG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAgBpC;AAID;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAWzE"}
+{"version":3,"file":"wallet-dex-prices.d.ts","sourceRoot":"","sources":["../../../../../src/api/wallet-dex-prices.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQxD,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQvD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQjD,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAE3C,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7B,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAMD,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAqDpC;AAED,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CA4BpC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAcpC;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAYzE"}

package/packages/agent/src/api/wallet-dex-prices.js

@@ -1,11 +1,4 @@
-/**
- * DEX Price Oracle — DexScreener (primary) + DexPaprika (fallback).
- *
- * Fetches USD token prices from on-chain DEX aggregators.
- * Used by the wallet balance modules to annotate token rows with USD values.
- */
 import { logger } from "@elizaos/core";
-// ── Chain ID → DEX API slug mappings ──────────────────────────────────
 export const DEXSCREENER_CHAIN_MAP = {
     1: "ethereum",
     56: "bsc",
@@ -24,7 +17,6 @@ export const DEXPAPRIKA_CHAIN_MAP = {
     137: "polygon_pos",
     43114: "avalanche",
 };
-/** Wrapped native token addresses for pricing native balances via DEX APIs. */
 export const WRAPPED_NATIVE = {
     1: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
     56: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
@@ -35,17 +27,14 @@ export const WRAPPED_NATIVE = {
     43114: "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
 };
 export const DEX_PRICE_TIMEOUT_MS = 10_000;
-// ── DexScreener ───────────────────────────────────────────────────────
-/**
- * Batch-fetch USD prices from DexScreener.
- * Returns a map of lowercased contract address → price USD string.
- */
+function isRecord(value) {
+    return typeof value === "object" && value !== null;
+}
 export async function fetchDexScreenerPrices(chainId, addresses) {
     const results = new Map();
     const chain = DEXSCREENER_CHAIN_MAP[chainId];
     if (!chain || addresses.length === 0)
         return results;
-    // DexScreener supports up to 30 addresses per request.
     const batches = [];
     for (let i = 0; i < addresses.length; i += 30) {
         batches.push(addresses.slice(i, i + 30));
@@ -56,10 +45,10 @@ export async function fetchDexScreenerPrices(chainId, addresses) {
             const res = await fetch(`https://api.dexscreener.com/tokens/v1/${chain}/${joined}`, { signal: AbortSignal.timeout(DEX_PRICE_TIMEOUT_MS) });
             if (!res.ok)
                 return;
-            const pairs = await res.json();
-            if (!Array.isArray(pairs))
+            const rawPairs = await res.json();
+            if (!Array.isArray(rawPairs))
                 return;
-            // Group by base token address; pick the pair with highest liquidity.
+            const pairs = rawPairs;
             const best = new Map();
             for (const pair of pairs) {
                 const addr = pair.baseToken?.address?.toLowerCase();
@@ -80,16 +69,11 @@ export async function fetchDexScreenerPrices(chainId, addresses) {
             logger.info(`[wallet] DexScreener: ${best.size} prices for chain ${chain}`);
         }
         catch (err) {
-            logger.warn(`[wallet] DexScreener fetch failed for chain ${chain}: ${err instanceof Error ? err.message : err}`);
+            logger.warn(`[wallet] DexScreener fetch failed for chain ${chain}: ${String(err)}`);
         }
     }));
     return results;
 }
-// ── DexPaprika (fallback) ─────────────────────────────────────────────
-/**
- * Fetch individual token prices from DexPaprika as fallback.
- * Only called for addresses that DexScreener couldn't price.
- */
 export async function fetchDexPaprikaPrices(chainId, addresses) {
     const results = new Map();
     const network = DEXPAPRIKA_CHAIN_MAP[chainId];
@@ -101,29 +85,25 @@ export async function fetchDexPaprikaPrices(chainId, addresses) {
             if (!res.ok)
                 return;
             const data = await res.json();
+            if (!isRecord(data))
+                return;
             const price = Number(data.price_usd);
             if (Number.isFinite(price) && price > 0) {
                 results.set(addr.toLowerCase(), { price: price.toString() });
             }
         }
         catch (err) {
-            logger.warn(`[wallet] DexPaprika fetch failed for ${addr}: ${err instanceof Error ? err.message : err}`);
+            logger.warn(`[wallet] DexPaprika fetch failed for ${addr}: ${String(err)}`);
         }
     }));
     return results;
 }
-// ── Combined price fetcher ────────────────────────────────────────────
-/**
- * Fetch USD prices for a list of token addresses using DexScreener (primary)
- * with DexPaprika fallback. Returns a map of lowercased address → price string.
- */
 export async function fetchDexPrices(chainId, addresses) {
     if (addresses.length === 0)
         return new Map();
-    const lowerAddresses = addresses.map((a) => a.toLowerCase());
+    const lowerAddresses = addresses.map((address) => address.toLowerCase());
     const results = await fetchDexScreenerPrices(chainId, lowerAddresses);
-    // Fallback to DexPaprika for tokens DexScreener couldn't price.
-    const missing = lowerAddresses.filter((a) => !results.has(a));
+    const missing = lowerAddresses.filter((address) => !results.has(address));
     if (missing.length > 0) {
         const fallback = await fetchDexPaprikaPrices(chainId, missing);
         for (const [addr, meta] of fallback) {
@@ -132,18 +112,14 @@ export async function fetchDexPrices(chainId, addresses) {
     }
     return results;
 }
-// ── Helpers ───────────────────────────────────────────────────────────
-/**
- * Compute USD value from a formatted balance string and a price string.
- * Returns "0" if either value is invalid.
- */
 export function computeValueUsd(balance, priceUsd) {
     const bal = Number.parseFloat(balance);
     const price = Number.parseFloat(priceUsd);
     if (!Number.isFinite(bal) ||
         !Number.isFinite(price) ||
         bal <= 0 ||
-        price <= 0)
+        price <= 0) {
         return "0";
+    }
     return (bal * price).toFixed(2);
 }

package/packages/agent/src/api/wallet-env-sync.d.ts

@@ -0,0 +1,2 @@
+export declare function syncSolanaPublicKeyEnv(privateKey?: string): string | null;
+//# sourceMappingURL=wallet-env-sync.d.ts.map

package/packages/agent/src/api/wallet-env-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet-env-sync.d.ts","sourceRoot":"","sources":["../../../../../src/api/wallet-env-sync.ts"],"names":[],"mappings":"AAkGA,wBAAgB,sBAAsB,CACpC,UAAU,SAAiC,GAC1C,MAAM,GAAG,IAAI,CAcf"}

package/packages/agent/src/api/wallet-env-sync.js

@@ -0,0 +1,108 @@
+/**
+ * Lightweight Solana public-key env-sync helper extracted from wallet.ts
+ * to break the circular dependency: config/config.ts → api/wallet.ts →
+ * wallet-evm-balance.ts → wallet-rpc.ts → config/config.ts.
+ *
+ * This file must NOT import from ./wallet.ts or ../config/config.ts.
+ */
+import crypto from "node:crypto";
+// ── Base58 (Bitcoin alphabet) — duplicated from wallet.ts to stay leaf-level ─
+const B58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+function base58Encode(data) {
+    let num = BigInt(`0x${Buffer.from(data).toString("hex")}`);
+    const chars = [];
+    while (num > 0n) {
+        const digit = B58[Number(num % 58n)];
+        if (!digit) {
+            throw new Error("Invalid base58 digit");
+        }
+        chars.unshift(digit);
+        num /= 58n;
+    }
+    for (const byte of data) {
+        if (byte === 0)
+            chars.unshift("1");
+        else
+            break;
+    }
+    return chars.join("") || "1";
+}
+function base58Decode(str) {
+    if (str.length === 0)
+        return Buffer.alloc(0);
+    let num = 0n;
+    for (const c of str) {
+        const i = B58.indexOf(c);
+        if (i === -1)
+            throw new Error(`Invalid base58: ${c}`);
+        num = num * 58n + BigInt(i);
+    }
+    const hex = num.toString(16).padStart(2, "0");
+    const bytes = Buffer.from(hex.length % 2 ? `0${hex}` : hex, "hex");
+    let zeros = 0;
+    for (const c of str) {
+        if (c === "1")
+            zeros++;
+        else
+            break;
+    }
+    return zeros > 0 ? Buffer.concat([Buffer.alloc(zeros), bytes]) : bytes;
+}
+// ── Helpers duplicated from wallet.ts ────────────────────────────────────
+/** Sentinel values that appear as env placeholders — skip without error. */
+const PLACEHOLDER_RE = /^\[?\s*(REDACTED|PLACEHOLDER|T(?:O)D(?:O)|CHANGEME|EMPTY)\s*]?$/i;
+function decodeSolanaPrivateKey(key) {
+    if (PLACEHOLDER_RE.test(key)) {
+        throw new Error("placeholder value");
+    }
+    if (key.startsWith("[") && key.endsWith("]") && /^\[\s*\d/.test(key)) {
+        try {
+            const parsed = JSON.parse(key);
+            if (!Array.isArray(parsed) ||
+                !parsed.every((v) => typeof v === "number")) {
+                throw new Error("not a numeric array");
+            }
+            return Buffer.from(parsed);
+        }
+        catch {
+            throw new Error("Invalid JSON byte-array format");
+        }
+    }
+    return base58Decode(key);
+}
+function deriveSolanaAddress(privateKeyString) {
+    const secretBytes = decodeSolanaPrivateKey(privateKeyString);
+    if (secretBytes.length === 64)
+        return base58Encode(secretBytes.subarray(32));
+    if (secretBytes.length === 32) {
+        const keyObj = crypto.createPrivateKey({
+            key: Buffer.concat([
+                Buffer.from("302e020100300506032b657004220420", "hex"),
+                secretBytes,
+            ]),
+            format: "der",
+            type: "pkcs8",
+        });
+        const pubDer = crypto
+            .createPublicKey(keyObj)
+            .export({ type: "spki", format: "der" });
+        return base58Encode(pubDer.subarray(12, 44));
+    }
+    throw new Error(`Invalid Solana secret key length: ${secretBytes.length}`);
+}
+// ── Exported function ────────────────────────────────────────────────────
+export function syncSolanaPublicKeyEnv(privateKey = process.env.SOLANA_PRIVATE_KEY) {
+    const trimmed = privateKey?.trim();
+    if (!trimmed || PLACEHOLDER_RE.test(trimmed)) {
+        return null;
+    }
+    try {
+        const publicKey = deriveSolanaAddress(trimmed);
+        process.env.SOLANA_PUBLIC_KEY = publicKey;
+        process.env.WALLET_PUBLIC_KEY = publicKey;
+        return publicKey;
+    }
+    catch {
+        return null;
+    }
+}

package/packages/agent/src/api/wallet-evm-balance.d.ts

@@ -1,4 +1,10 @@
-import type { EvmChainBalance, EvmNft } from "../contracts/wallet";
+/**
+ * EVM balance fetching — Alchemy, Ankr, and direct-RPC fallback paths.
+ *
+ * Handles multi-chain EVM balance + NFT retrieval with provider-key resolution
+ * and automatic fallback to public RPC endpoints when premium APIs are unavailable.
+ */
+import type { EvmChainBalance, EvmNft } from "@elizaos/shared";
 type EvmChainProvider = "alchemy" | "ankr";
 export interface EvmChainConfig {
     name: string;
@@ -56,6 +62,7 @@ export interface AnkrTokenAsset {
 }
 export declare const DEFAULT_EVM_CHAINS: readonly EvmChainConfig[];
 export declare function resolveEvmProviderKeys(alchemyOrKeys: string | EvmProviderKeys | null | undefined, maybeAnkrKey?: string | null): EvmProviderKeyset;
+export declare function fetchEvmNativeBalanceViaRpc(rpcUrl: string, address: string): Promise<string>;
 export declare function fetchEvmBalances(address: string, alchemyOrKeys: string | EvmProviderKeys | null | undefined, maybeAnkrKey?: string | null, knownTokenAddresses?: string[]): Promise<EvmChainBalance[]>;
 export declare function fetchEvmNfts(address: string, alchemyOrKeys: string | EvmProviderKeys | null | undefined, maybeAnkrKey?: string | null): Promise<Array<{
     chain: string;

package/packages/agent/src/api/wallet-evm-balance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-evm-balance.d.ts","sourceRoot":"","sources":["../../../../../src/api/wallet-evm-balance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wallet-evm-balance.d.ts","sourceRoot":"","sources":["../../../../../src/api/wallet-evm-balance.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAqBhF,KAAK,gBAAgB,GAAG,SAAS,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gEAAgE;IAChE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,UAAU,iBAAiB;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAcD,MAAM,WAAW,cAAc;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAiBD,eAAO,MAAM,kBAAkB,EAAE,SAAS,cAAc,EAkD9C,CAAC;AAiCX,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,SAAS,EAC1D,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAC3B,iBAAiB,CAqEnB;AAoTD,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAyBjB;AA2PD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,SAAS,EAC1D,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAC5B,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,eAAe,EAAE,CAAC,CAmF5B;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,SAAS,EAC1D,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAC3B,OAAO,CAAC,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAAC,CAkCnD"}

package/packages/agent/src/api/wallet-evm-balance.js

@@ -5,8 +5,8 @@
  * and automatic fallback to public RPC endpoints when premium APIs are unavailable.
  */
 import { logger } from "@elizaos/core";
-import { computeValueUsd, fetchDexPrices, WRAPPED_NATIVE, } from "./wallet-dex-prices";
-import { resolveAvalancheRpcUrls, resolveBaseRpcUrls, resolveBscRpcUrls, resolveEthereumRpcUrls, } from "./wallet-rpc";
+import { computeValueUsd, fetchDexPrices, WRAPPED_NATIVE, } from "./wallet-dex-prices.js";
+import { resolveAvalancheRpcUrls, resolveBaseRpcUrls, resolveBscRpcUrls, resolveEthereumRpcUrls, } from "./wallet-rpc.js";
 // ── Constants ─────────────────────────────────────────────────────────
 const FETCH_TIMEOUT_MS = 15_000;
 const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
@@ -372,7 +372,7 @@ async function fetchAnkrChainBalances(chain, address, ankrKey) {
     };
 }
 // ── Direct RPC balance fetching ───────────────────────────────────────
-async function fetchNativeBalanceViaRpc(rpcUrl, address) {
+export async function fetchEvmNativeBalanceViaRpc(rpcUrl, address) {
     const data = await jsonOrThrow(await fetch(rpcUrl, rpcJsonRequest(JSON.stringify({
         jsonrpc: "2.0",
         id: 1,
@@ -463,7 +463,7 @@ async function fetchEvmChainBalancesViaRpc(chain, address, rpcUrls, knownTokenAd
     const errors = [];
     for (const rpcUrl of rpcUrls) {
         try {
-            const nativeBalance = await fetchNativeBalanceViaRpc(rpcUrl, address);
+            const nativeBalance = await fetchEvmNativeBalanceViaRpc(rpcUrl, address);
             // Query known ERC-20 tokens (e.g. from trade ledger).
             const tokens = [];
             if (knownTokenAddresses && knownTokenAddresses.length > 0) {
@@ -512,7 +512,7 @@ async function fetchEvmChainBalancesViaRpc(chain, address, rpcUrls, knownTokenAd
             };
         }
         catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
+            const msg = String(err);
             errors.push(`${describeRpcEndpoint(rpcUrl)}: ${msg}`);
         }
     }

package/packages/agent/src/api/wallet-routes.d.ts

@@ -1,15 +1,8 @@
 import type http from "node:http";
-import type { ElizaConfig } from "../config/config";
-import type { RouteHelpers, RouteRequestMeta } from "./route-helpers";
-import { fetchEvmBalances, fetchSolanaBalances, fetchSolanaNativeBalanceViaRpc, generateWalletForChain, getWalletAddresses, importWallet, validatePrivateKey } from "./wallet";
-interface WalletExportRequestBody {
-    confirm?: boolean;
-    exportToken?: string;
-}
-interface WalletExportRejectionLike {
-    status: 401 | 403;
-    reason: string;
-}
+import type { AgentRuntime, RouteRequestMeta } from "@elizaos/core";
+import type { RouteHelpers, WalletExportRejection as WalletExportRejectionLike, WalletExportRequestBody } from "@elizaos/shared";
+import type { ElizaConfig } from "../config/config.ts";
+import { fetchEvmBalances, fetchSolanaBalances, fetchSolanaNativeBalanceViaRpc, generateWalletForChain, getWalletAddresses, importWallet, validatePrivateKey } from "./wallet.ts";
 export interface WalletRouteDependencies {
     getWalletAddresses: typeof getWalletAddresses;
     fetchEvmBalances: typeof fetchEvmBalances;
@@ -20,14 +13,29 @@ export interface WalletRouteDependencies {
     generateWalletForChain: typeof generateWalletForChain;
 }
 export declare const DEFAULT_WALLET_ROUTE_DEPENDENCIES: WalletRouteDependencies;
+export type WalletSource = "local" | "cloud";
+export type WalletChainKind = "evm" | "solana";
+export type WalletProviderKind = "local" | "privy" | "steward";
+export interface WalletEntry {
+    source: WalletSource;
+    chain: WalletChainKind;
+    address: string;
+    provider: WalletProviderKind;
+    primary: boolean;
+}
+export interface WalletPrimaryMap {
+    evm: WalletSource;
+    solana: WalletSource;
+}
 export interface WalletRouteContext extends RouteRequestMeta, Pick<RouteHelpers, "readJsonBody" | "json" | "error"> {
     config: ElizaConfig;
     saveConfig: (config: ElizaConfig) => void;
     ensureWalletKeysInEnvAndConfig: (config: ElizaConfig) => boolean;
     resolveWalletExportRejection: (req: http.IncomingMessage, body: WalletExportRequestBody) => WalletExportRejectionLike | null;
+    restartRuntime?: (reason: string) => Promise<boolean>;
     scheduleRuntimeRestart?: (reason: string) => void;
     deps?: WalletRouteDependencies;
+    runtime?: AgentRuntime | null;
 }
 export declare function handleWalletRoutes(ctx: WalletRouteContext): Promise<boolean>;
-export {};
 //# sourceMappingURL=wallet-routes.d.ts.map

package/packages/agent/src/api/wallet-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/wallet-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAOpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,8BAA8B,EAC9B,sBAAsB,EACtB,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAInB,MAAM,UAAU,CAAC;AAOlB,UAAU,uBAAuB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,yBAAyB;IACjC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAmED,MAAM,WAAW,uBAAuB;IACtC,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;IAC1C,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,8BAA8B,EAAE,OAAO,8BAA8B,CAAC;IACtE,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;CACvD;AAED,eAAO,MAAM,iCAAiC,EAAE,uBAQ/C,CAAC;AAEF,MAAM,WAAW,kBACf,SAAQ,gBAAgB,EACtB,IAAI,CAAC,YAAY,EAAE,cAAc,GAAG,MAAM,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IAC1C,8BAA8B,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC;IACjE,4BAA4B,EAAE,CAC5B,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE,uBAAuB,KAC1B,yBAAyB,GAAG,IAAI,CAAC;IACtC,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,IAAI,CAAC,EAAE,uBAAuB,CAAC;CAChC;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,kBAAkB,GACtB,OAAO,CAAC,OAAO,CAAC,CAuSlB"}
+{"version":3,"file":"wallet-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/wallet-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAYpE,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,IAAI,yBAAyB,EAClD,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAMzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,8BAA8B,EAC9B,sBAAsB,EACtB,kBAAkB,EAClB,YAAY,EAEZ,kBAAkB,EAInB,MAAM,aAAa,CAAC;AAmFrB,MAAM,WAAW,uBAAuB;IACtC,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,gBAAgB,EAAE,OAAO,gBAAgB,CAAC;IAC1C,mBAAmB,EAAE,OAAO,mBAAmB,CAAC;IAChD,8BAA8B,EAAE,OAAO,8BAA8B,CAAC;IACtE,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;CACvD;AAED,eAAO,MAAM,iCAAiC,EAAE,uBAQ/C,CAAC;AAIF,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,OAAO,CAAC;AAC7C,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,CAAC;AAC/C,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;AAE/D,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,YAAY,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;CACtB;AAoKD,MAAM,WAAW,kBACf,SAAQ,gBAAgB,EACtB,IAAI,CAAC,YAAY,EAAE,cAAc,GAAG,MAAM,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IAC1C,8BAA8B,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC;IACjE,4BAA4B,EAAE,CAC5B,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE,uBAAuB,KAC1B,yBAAyB,GAAG,IAAI,CAAC;IACtC,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,IAAI,CAAC,EAAE,uBAAuB,CAAC;IAC/B,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAC/B;AAoBD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,kBAAkB,GACtB,OAAO,CAAC,OAAO,CAAC,CA+yBlB"}