@elizaos/plugin-wallet 2.0.0-beta.1 → 2.0.3-beta.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elizaos/plugin-wallet",
-  "version": "2.0.0-beta.1",
-  "description": "Unified non-custodial wallet for elizaOS agents — EVM + Solana, ERC-6551 token-bound accounts, on-chain spend policies, x402 micropayments, CCTP bridge, Li.Fi swap routing, Jupiter routing, multi-DEX LP management (Raydium/Orca/Meteora on Solana, Uniswap/Aerodrome on EVM), Hyperliquid perps, Polymarket, Aave/Morpho lending, and Clanker token launches. Replaces plugin-evm + plugin-solana + plugin-raydium + plugin-orca + plugin-meteora + plugin-jupiter + plugin-lp-manager + plugin-clanker behind one canonical action+provider surface.",
+  "version": "2.0.3-beta.5",
+  "description": "Non-custodial wallet for elizaOS agents — EVM + Solana, ERC-6551 token-bound accounts, on-chain spend policies, x402 micropayments, CCTP bridge, Li.Fi swap routing, Jupiter routing, multi-DEX LP management (Raydium/Orca/Meteora on Solana, Uniswap/Aerodrome on EVM), Hyperliquid perps, Polymarket, Aave/Morpho lending, and Clanker token launches. Replaces plugin-evm + plugin-solana + plugin-raydium + plugin-orca + plugin-meteora + plugin-jupiter + plugin-lp-manager + plugin-clanker behind one canonical action+provider surface.",
   "type": "module",
   "license": "MIT",
   "homepage": "https://github.com/eliza-ai/eliza/tree/main/eliza/plugins/plugin-wallet",
@@ -11,16 +11,33 @@
     "directory": "eliza/plugins/plugin-wallet"
   },
   "main": "dist/index.mjs",
-  "types": "dist/index.d.mts",
+  "types": "dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "eliza-source": {
+        "types": "./src/index.ts",
+        "import": "./src/index.ts",
+        "default": "./src/index.ts"
+      },
       "import": "./dist/index.mjs",
-      "default": "./dist/index.mjs",
-      "types": "./dist/index.d.mts"
+      "default": "./dist/index.mjs"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./*.css": "./dist/*.css",
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "eliza-source": {
+        "types": "./src/*.ts",
+        "import": "./src/*.ts",
+        "default": "./src/*.ts"
+      },
+      "import": "./dist/*.js",
+      "default": "./dist/*.js"
+    }
   },
   "files": [
+    "registry-entry.json",
     "dist",
     "src",
     "auto-enable.ts",
@@ -37,28 +54,23 @@
     }
   },
   "scripts": {
-    "build": "tsdown --no-config src/index.ts --format esm --dts --clean -d dist && tsdown --no-config src/sdk/index.ts --format esm --dts --no-clean -d dist/sdk && tsdown --no-config src/wallet-action.ts --format esm --dts --no-clean -d dist && tsdown --no-config src/lib/server-wallet-trade.ts --format esm --dts --no-clean -d dist/lib && mv dist/index-*.d.ts dist/index.d.ts 2>/dev/null || true && mv dist/sdk/index-*.d.ts dist/sdk/index.d.ts 2>/dev/null || true && mv dist/wallet-action-*.d.ts dist/wallet-action.d.ts 2>/dev/null || true && mv dist/lib/server-wallet-trade-*.d.ts dist/lib/server-wallet-trade.d.ts 2>/dev/null || true",
+    "build": "bun run build.ts",
     "check": "tsc --noEmit",
     "lint": "bunx @biomejs/biome check --write --unsafe .",
     "test": "vitest run --config ./vitest.config.ts",
     "test:watch": "vitest --config ./vitest.config.ts",
-    "clean": "rm -rf dist"
+    "clean": "node ../../packages/scripts/rm-path-recursive.mjs dist"
   },
   "peerDependencies": {
-    "@elizaos/core": "2.0.0-beta.1",
-    "@elizaos/plugin-elizacloud": "2.0.0-beta.1"
+    "@elizaos/core": "2.0.3-beta.5",
+    "@elizaos/plugin-elizacloud": "2.0.3-beta.5"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.32.1",
-    "@elizaos/cloud-routing": "2.0.0-beta.1",
-    "@lifi/data-types": "^6.0.0",
+    "@elizaos/cloud-routing": "2.0.3-beta.5",
+    "@elizaos/shared": "2.0.3-beta.5",
     "@lifi/sdk": "^3.7.9",
-    "@lifi/types": "^17.18.0",
-    "@noble/hashes": "^1.8.0",
-    "@orca-so/whirlpools": "^2.2.0",
-    "@orca-so/whirlpools-client": "^6.2.1",
-    "@orca-so/whirlpools-core": "^3.1.0",
-    "@orca-so/whirlpools-sdk": "^0.20.0",
+    "@meteora-ag/dlmm": "^1.9.7",
     "@raydium-io/raydium-sdk": "^1.3.1-beta.58",
     "@solana/spl-token": "0.4.14",
     "@solana/spl-token-metadata": "^0.1.6",
@@ -66,7 +78,9 @@
     "@steerprotocol/sdk": "^3.0.7",
     "bignumber.js": "^11.0.0",
     "bs58": "^6.0.0",
+    "ethers": "^6.16.0",
     "tweetnacl": "^1.0.3",
+    "uuid": "^11.1.0",
     "viem": "^2.48.8",
     "zod": "^4.4.3"
   },
@@ -74,9 +88,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "@elizaos/core": "2.0.0-beta.1",
+    "@elizaos/core": "2.0.3-beta.5",
     "@types/node": "^24.0.0",
-    "tsdown": "^0.21.10",
     "typescript": "^6.0.3",
     "vitest": "^4.0.18"
   },
@@ -148,5 +161,6 @@
     "trading",
     "automation"
   ],
-  "packageType": "plugin"
+  "packageType": "plugin",
+  "gitHead": "ff6157011c9459670021cc28a6797592a78b8817"
 }

package/registry-entry.json

@@ -0,0 +1,134 @@
+{
+  "id": "evm",
+  "name": "Evm",
+  "description": "This plugin enables interaction with EVM-compatible chains, supporting token transfers, cross-chain bridging, and swaps via LiFi integration.",
+  "npmName": "@elizaos/plugin-wallet",
+  "version": "2.0.0-beta.0",
+  "source": "bundled",
+  "tags": ["crypto", "evm"],
+  "config": {
+    "EVM_PRIVATE_KEY": {
+      "type": "secret",
+      "required": true,
+      "sensitive": true,
+      "label": "Private Key",
+      "help": "Hex-encoded private key (starting with 0x) used by the WalletProvider to sign transactions.",
+      "advanced": false
+    },
+    "EVM_RPC_PROVIDER": {
+      "type": "string",
+      "required": false,
+      "sensitive": false,
+      "label": "Rpc Provider",
+      "help": "Preferred RPC provider: 'alchemy', 'infura', 'ankr', or 'elizacloud'. If set, this provider is used first for all chains it supports, with fallback to others.",
+      "advanced": false
+    },
+    "ALCHEMY_API_KEY": {
+      "type": "secret",
+      "required": false,
+      "sensitive": true,
+      "label": "Api Key",
+      "help": "Alchemy API key for RPC access. Supports Ethereum, Polygon, Arbitrum, Optimism, Base, Avalanche, BSC, and many more chains.",
+      "advanced": false
+    },
+    "INFURA_API_KEY": {
+      "type": "secret",
+      "required": false,
+      "sensitive": true,
+      "label": "Api Key",
+      "help": "Infura API key for RPC access. Supports Ethereum, Polygon, Arbitrum, Optimism, Base, Avalanche, Linea, and more.",
+      "advanced": false
+    },
+    "ANKR_API_KEY": {
+      "type": "secret",
+      "required": false,
+      "sensitive": true,
+      "label": "Api Key",
+      "help": "Ankr premium API key for RPC access. Supports the broadest range of EVM chains.",
+      "advanced": false
+    },
+    "ETHEREUM_PROVIDER_ETHEREUM": {
+      "type": "string",
+      "required": false,
+      "sensitive": false,
+      "label": "Provider Ethereum",
+      "help": "Custom RPC URL for Ethereum mainnet (overrides provider-based RPC). For other chains, set ETHEREUM_PROVIDER_<CHAINNAME> (or EVM_PROVIDER_<CHAINNAME>) in your .env.",
+      "advanced": false
+    },
+    "ETHEREUM_PROVIDER_BASE": {
+      "type": "string",
+      "required": false,
+      "sensitive": false,
+      "label": "Provider Base",
+      "help": "Custom RPC URL for Base mainnet (overrides provider-based RPC).",
+      "advanced": false
+    },
+    "ETHEREUM_PROVIDER_ARBITRUM": {
+      "type": "string",
+      "required": false,
+      "sensitive": false,
+      "label": "Provider Arbitrum",
+      "help": "Custom RPC URL for Arbitrum One (overrides provider-based RPC).",
+      "advanced": false
+    },
+    "ETHEREUM_PROVIDER_OPTIMISM": {
+      "type": "string",
+      "required": false,
+      "sensitive": false,
+      "label": "Provider Optimism",
+      "help": "Custom RPC URL for Optimism mainnet (overrides provider-based RPC).",
+      "advanced": false
+    },
+    "TEE_MODE": {
+      "type": "string",
+      "required": false,
+      "sensitive": false,
+      "default": "OFF",
+      "label": "Mode",
+      "help": "Controls whether Trusted Execution Environment (TEE) mode is enabled.",
+      "advanced": false
+    },
+    "WALLET_SECRET_SALT": {
+      "type": "secret",
+      "required": false,
+      "sensitive": true,
+      "label": "Secret Salt",
+      "help": "Salt value for TEE-derived wallet keypair.",
+      "advanced": false
+    },
+    "SEPOLIA_RPC_URL": {
+      "type": "url",
+      "required": false,
+      "sensitive": false,
+      "default": "https://ethereum-sepolia-rpc.publicnode.com",
+      "label": "Rpc Url",
+      "help": "RPC endpoint URL for Sepolia testnet.",
+      "advanced": false
+    },
+    "BASE_SEPOLIA_RPC_URL": {
+      "type": "url",
+      "required": false,
+      "sensitive": false,
+      "default": "https://sepolia.base.org",
+      "label": "Sepolia Rpc Url",
+      "help": "RPC endpoint URL for Base Sepolia testnet.",
+      "advanced": false
+    }
+  },
+  "render": {
+    "visible": true,
+    "pinTo": [],
+    "style": "card",
+    "icon": "Link",
+    "group": "blockchain",
+    "groupOrder": 4,
+    "actions": ["enable", "configure"]
+  },
+  "resources": {
+    "homepage": "https://github.com/elizaOS/eliza/tree/develop/plugins/plugin-wallet#readme",
+    "repository": "https://github.com/elizaOS/eliza"
+  },
+  "dependsOn": [],
+  "kind": "plugin",
+  "subtype": "blockchain"
+}

package/src/analytics/birdeye/actions/wallet-search-address.ts

@@ -1,9 +1,89 @@
-import { tokenInfoAction } from "../../token-info/action";
+import type {
+  ActionResult,
+  HandlerCallback,
+  HandlerOptions,
+  IAgentRuntime,
+  Memory,
+  State,
+} from "@elizaos/core";
+import { parseTokenInfoParams } from "../../token-info/params";
+import {
+  TOKEN_INFO_SERVICE_TYPE,
+  type TokenInfoService,
+} from "../../token-info/service";
+
+function unavailable(
+  callback: HandlerCallback | undefined,
+  text: string,
+  data: Record<string, unknown>,
+): ActionResult {
+  const dataAsContent = data as Parameters<HandlerCallback>[0]["data"];
+  callback?.({ text, actions: ["WALLET"], data: dataAsContent });
+  return {
+    success: false,
+    text,
+    error: String(data.error ?? "BIRDEYE_SEARCH_UNAVAILABLE"),
+    data: data as ActionResult["data"],
+  };
+}
 
 /**
- * Compatibility export for the old BIRDEYE_LOOKUP action module.
- * Birdeye lookup is now TOKEN_INFO with target="birdeye".
+ * Folded into WALLET as `action=search_address`. Forces the TokenInfoService
+ * route through the Birdeye provider with the `wallet` subaction so callers get
+ * Birdeye portfolio data for a wallet address.
  */
-export const walletSearchAddressAction = tokenInfoAction;
+export async function walletSearchAddressHandler(
+  runtime: IAgentRuntime,
+  message: Memory,
+  state?: State,
+  options?: HandlerOptions | Record<string, unknown>,
+  callback?: HandlerCallback,
+): Promise<ActionResult> {
+  const service = runtime.getService(
+    TOKEN_INFO_SERVICE_TYPE,
+  ) as TokenInfoService | null;
+  if (!service || typeof service.route !== "function") {
+    return unavailable(callback, "Token info service is not available.", {
+      actionName: "WALLET",
+      subaction: "search_address",
+      error: "SERVICE_UNAVAILABLE",
+    });
+  }
+
+  const baseParams = parseTokenInfoParams(message, state, options);
+  const params = {
+    ...baseParams,
+    target: "birdeye",
+    subaction: "wallet" as const,
+  };
+
+  const routed = await service.route({
+    runtime,
+    message,
+    state,
+    options,
+    params,
+    callback,
+  });
+
+  if (routed.ok) {
+    const result = routed.result;
+    return {
+      ...result,
+      data: {
+        ...(result.data ?? {}),
+        actionName: "WALLET",
+        subaction: "search_address",
+        target: routed.provider.name,
+      },
+    };
+  }
 
-export default tokenInfoAction;
+  return unavailable(callback, routed.detail, {
+    actionName: "WALLET",
+    subaction: "search_address",
+    error: routed.error,
+    detail: routed.detail,
+    providers: routed.providers,
+  });
+}

package/src/analytics/birdeye/birdeye-task.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck -- legacy wallet sync task from absorbed Birdeye plugin; strict types pending cleanup
 import {
   type Content,
   createUniqueUuid,
@@ -15,6 +14,11 @@ import type {
 } from "./types/shared";
 import { extractChain } from "./utils";
 
+const settingAsString = (
+  value: string | number | boolean | null,
+): string | undefined =>
+  typeof value === "string" && value.trim().length > 0 ? value : undefined;
+
 export interface SentimentContent extends Content {
   text: string;
   source: "sentiment-analysis";
@@ -39,7 +43,7 @@ export default class Birdeye {
   beService!: BirdeyeService;
 
   constructor(runtime: IAgentRuntime) {
-    this.apiKey = runtime.getSetting("BIRDEYE_API_KEY");
+    this.apiKey = settingAsString(runtime.getSetting("BIRDEYE_API_KEY")) ?? "";
     this.sentimentRoomId = createUniqueUuid(runtime, "sentiment-analysis");
     this.twitterFeedRoomId = createUniqueUuid(runtime, "twitter-feed");
     this.runtime = runtime;
@@ -69,13 +73,21 @@ export default class Birdeye {
         publicKey,
       );
 
-      const transactions: TransactionHistory[] = birdeyeData.map(
-        (tx: { txHash: string; blockTime: number | string }) => ({
+      if (!Array.isArray(birdeyeData)) {
+        return [];
+      }
+
+      const transactions: TransactionHistory[] = [];
+      for (const tx of birdeyeData) {
+        if (typeof tx.txHash !== "string" || typeof tx.blockTime !== "string") {
+          continue;
+        }
+        transactions.push({
           txHash: tx.txHash,
           blockTime: new Date(tx.blockTime),
           data: tx,
-        }),
-      );
+        });
+      }
 
       try {
         const cachedTxs = await this.runtime.getCache<TransactionHistory[]>(
@@ -150,12 +162,16 @@ export default class Birdeye {
   }
 
   async syncWallet() {
-    const walletAddr = this.runtime.getSetting("BIRDEYE_WALLET_ADDR");
+    const walletAddr = settingAsString(
+      this.runtime.getSetting("BIRDEYE_WALLET_ADDR"),
+    );
     if (!walletAddr) {
       return;
     }
 
-    const explicitChain = this.runtime.getSetting("BIRDEYE_CHAIN");
+    const explicitChain = settingAsString(
+      this.runtime.getSetting("BIRDEYE_CHAIN"),
+    );
 
     try {
       const chain = extractChain(walletAddr, explicitChain);
@@ -164,7 +180,7 @@ export default class Birdeye {
 
       return true;
     } catch (error) {
-      this.runtime.logger?.error(
+      this.runtime.logger.error(
         `Failed to sync wallet: ${
           error instanceof Error ? error.message : String(error)
         }`,

package/src/analytics/birdeye/birdeye.ts

@@ -1,5 +1,4 @@
-// @ts-nocheck — legacy code from absorbed plugins (lp-manager, lpinfo, dexscreener, defi-news, birdeye); strict types pending cleanup
-import { elizaLogger } from "@elizaos/core";
+import { elizaLogger, type IAgentRuntime } from "@elizaos/core";
 import {
   API_BASE_URL,
   BIRDEYE_ENDPOINTS,
@@ -162,11 +161,11 @@ class HttpError extends Error {
 // extends BaseCachedProvider
 // really more like a service
 export class BirdeyeProvider {
-  private runtime: unknown;
+  private runtime: Pick<IAgentRuntime, "getCache" | "setCache">;
   private maxRetries: number;
 
   constructor(
-    runtime,
+    runtime: Pick<IAgentRuntime, "getCache" | "setCache">,
     //cacheManager: ICacheManager,
     _symbolMap?: Record<string, string>,
     maxRetries?: number,
@@ -184,10 +183,10 @@ export class BirdeyeProvider {
     options: RequestInit = {},
   ): Promise<T> {
     let attempts = 0;
+    const headers = new Headers(options.headers);
 
     // allow the user to override the chain
-    const chain =
-      options.headers?.["x-chain"] || settings.BIRDEYE_CHAIN || "solana";
+    const chain = headers.get("x-chain") || settings.BIRDEYE_CHAIN || "solana";
 
     while (attempts < this.maxRetries) {
       attempts++;
@@ -278,7 +277,7 @@ export class BirdeyeProvider {
         : `${url}:${JSON.stringify(params)}`;
 
     // Check cache first
-    const cachedVal = await this.runtime.getCache(cacheKey);
+    const cachedVal = await this.runtime.getCache<T>(cacheKey);
     if (cachedVal) return cachedVal as T;
 
     const urlWithParams =

package/src/analytics/birdeye/constants.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — legacy code from absorbed plugins (lp-manager, lpinfo, dexscreener, defi-news, birdeye); strict types pending cleanup
 export const DEFAULT_MAX_RETRIES = 3;
 
 export const BIRDEYE_SERVICE_NAME = "birdeye";

package/src/analytics/birdeye/providers/agent-portfolio-provider.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — legacy code from absorbed plugins (lp-manager, lpinfo, dexscreener, defi-news, birdeye); strict types pending cleanup
 import {
   createBirdeyePortfolioProvider,
   formatPortfolio,

package/src/analytics/birdeye/providers/market.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck — legacy code from absorbed plugins (lp-manager, lpinfo, dexscreener, defi-news, birdeye); strict types pending cleanup
 import type { IAgentRuntime, Memory, Provider, State } from "@elizaos/core";
 //import { addHeader, composeActionExamples, formatActionNames, formatActions } from '@elizaos/core';
 //import type { IToken } from '../types';
@@ -8,6 +7,30 @@ import { formatJsonScalar, formatJsonTable } from "../utils";
 
 const MARKET_ROW_LIMIT = 12;
 
+type MarketTokenSnapshot = {
+  symbol?: string;
+  priceUsd: number;
+  priceChange24h: number;
+  liquidity: number;
+  marketCapUsd?: number;
+};
+
+type MarketRow = {
+  chain: string;
+  address: string;
+  symbol: string;
+  priceUsd: string;
+  marketCapUsd: string;
+  change24hPct: string;
+  liquidityUsd: string;
+};
+
+function formatUsd(value: number | undefined): string {
+  return typeof value === "number" && Number.isFinite(value)
+    ? value.toFixed(2)
+    : "unknown";
+}
+
 export async function getCacheTimed<T>(
   runtime: IAgentRuntime,
   key: string,
@@ -30,12 +53,6 @@ export async function getCacheTimed<T>(
 /**
  * Provider for Birdeye market data
  *
- * @typedef {import('./Provider').Provider} Provider
- * @typedef {import('./Runtime').IAgentRuntime} IAgentRuntime
- * @typedef {import('./Memory').Memory} Memory
- * @typedef {import('./State').State} State
- * @typedef {import('./Action').Action} Action
- *
  * @type {Provider}
  * @property {string} name - The name of the provider
  * @property {string} description - Description of the provider
@@ -62,15 +79,14 @@ export const marketProvider: Provider = {
     try {
       //console.log('BIRDEYE_CRYPTOCURRENCY_MARKET_DATA getting');
 
-      // define the market
-      // FIXME: get out of runtime.getSettings
+      // Static Solana market addresses used for the Birdeye overview.
       const TOKEN_ADDRESSES = {
         SOL: "So11111111111111111111111111111111111111112",
         BTC: "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh", // wBTC
         ETH: "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs", // wETH
       };
 
-      const hardcodedSolanaCA2SymbolMap = {
+      const hardcodedSolanaCA2SymbolMap: Record<string, string> = {
         So11111111111111111111111111111111111111112: "SOL",
         "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh": "BTC", // wBTC
         "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs": "ETH", // wETH
@@ -85,17 +101,8 @@ export const marketProvider: Provider = {
             getTokensMarketData?: (
               chain: string,
               addresses: string[],
-            ) => Promise<
-              Record<
-                string,
-                {
-                  symbol: string;
-                  priceUsd: number;
-                  priceChange24h: number;
-                  liquidity: number;
-                }
-              >
-            >;
+              options?: GetCacheTimedOptions,
+            ) => Promise<Record<string, MarketTokenSnapshot | undefined>>;
           }
         | undefined;
       // want this for custom symbols
@@ -112,7 +119,7 @@ export const marketProvider: Provider = {
         !birdeyeService ||
         typeof birdeyeService.getTokensMarketData !== "function"
       ) {
-        runtime.logger?.error(
+        runtime.logger.error(
           "Birdeye service is unavailable or does not have getTokensMarketData method",
         );
         return {
@@ -126,23 +133,21 @@ export const marketProvider: Provider = {
         };
       }
 
-      // FIXME: cache (how fresh does this have to be? 5 mins? 1 min?)
       // get data
-      const ps = [birdeyeService.getTokensMarketData("solana", CAs)];
-      if (
-        solanaService &&
-        typeof solanaService.getTokensSymbols === "function"
-      ) {
-        ps.push(solanaService.getTokensSymbols(CAs));
-      }
+      const tokenSymbolsPromise =
+        solanaService && typeof solanaService.getTokensSymbols === "function"
+          ? solanaService.getTokensSymbols(CAs)
+          : Promise.resolve({} as Record<string, string>);
 
-      const results = await Promise.all(ps);
+      const [result, tokenSymbols] = await Promise.all([
+        birdeyeService.getTokensMarketData("solana", CAs, {
+          notOlderThan: 30 * 1000,
+        }),
+        tokenSymbolsPromise,
+      ]);
 
-      const result = results[0]; // birdeye Results
-      const rows = [];
+      const rows: MarketRow[] = [];
 
-      // FIXME: Market cap column is currently not populated from Birdeye API response
-      // Need to calculate or fetch market cap data separately
       for (const ca of CAs) {
         // Check if result[ca] exists before accessing it
         if (!result[ca]) {
@@ -159,20 +164,21 @@ export const marketProvider: Provider = {
         }
 
         const t = result[ca];
-        t.symbol =
-          solanaService && results[1]
-            ? results[1][ca]
-            : (hardcodedSolanaCA2SymbolMap[ca] ?? "(Not available)");
+        let symbol =
+          tokenSymbols[ca] ??
+          t.symbol ??
+          hardcodedSolanaCA2SymbolMap[ca] ??
+          "(Not available)";
         // unwrap symbols
-        if (t.symbol === "WBTC") t.symbol = "BTC";
-        if (t.symbol === "WETH") t.symbol = "ETH";
+        if (symbol === "WBTC") symbol = "BTC";
+        if (symbol === "WETH") symbol = "ETH";
         //console.log('t', t)
         rows.push({
           chain: "solana",
           address: ca,
-          symbol: t.symbol,
+          symbol,
           priceUsd: t.priceUsd.toFixed(4),
-          marketCapUsd: "unknown",
+          marketCapUsd: formatUsd(t.marketCapUsd),
           change24hPct: t.priceChange24h.toFixed(2),
           liquidityUsd: t.liquidity.toFixed(2),
         });
@@ -183,7 +189,7 @@ export const marketProvider: Provider = {
       const boundedRows = rows.slice(0, MARKET_ROW_LIMIT);
       const data = {
         tokens: Object.fromEntries(
-          Object.entries(results[0] ?? {}).slice(0, MARKET_ROW_LIMIT),
+          Object.entries(result).slice(0, MARKET_ROW_LIMIT),
         ),
       };
 
@@ -210,7 +216,7 @@ export const marketProvider: Provider = {
         text,
       };
     } catch (err) {
-      runtime.logger?.error(
+      runtime.logger.error(
         `Error fetching Birdeye market data: ${err instanceof Error ? err.message : String(err)}`,
       );
       return {