refactor: reorganize imports and clean up unused code in agent and plugin-solana

Author: mgunnin

agent/src/index.ts

@@ -34,19 +34,17 @@ import {
     stringToUuid,
     validateCharacterConfig,
 } from "@elizaos/core";
-import { TrustScoreDatabase } from "@elizaos/plugin-trustdb";
-// import { zgPlugin } from "@elizaos/plugin-0g";
 import { zgPlugin } from "@elizaos/plugin-0g";
 
 import { bootstrapPlugin } from "@elizaos/plugin-bootstrap";
 import createGoatPlugin from "@elizaos/plugin-goat";
 // import { intifacePlugin } from "@elizaos/plugin-intiface";
-import { DirectClient } from "@elizaos/client-direct";
 import { ThreeDGenerationPlugin } from "@elizaos/plugin-3d-generation";
 import { abstractPlugin } from "@elizaos/plugin-abstract";
 import { alloraPlugin } from "@elizaos/plugin-allora";
 import { aptosPlugin } from "@elizaos/plugin-aptos";
 import { artheraPlugin } from "@elizaos/plugin-arthera";
+import { autonomePlugin } from "@elizaos/plugin-autonome";
 import { availPlugin } from "@elizaos/plugin-avail";
 import { avalanchePlugin } from "@elizaos/plugin-avalanche";
 import { binancePlugin } from "@elizaos/plugin-binance";
@@ -58,8 +56,8 @@ import {
     tradePlugin,
     webhookPlugin,
 } from "@elizaos/plugin-coinbase";
-import { coinmarketcapPlugin } from "@elizaos/plugin-coinmarketcap";
 import { coingeckoPlugin } from "@elizaos/plugin-coingecko";
+import { coinmarketcapPlugin } from "@elizaos/plugin-coinmarketcap";
 import { confluxPlugin } from "@elizaos/plugin-conflux";
 import { createCosmosPlugin } from "@elizaos/plugin-cosmos";
 import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
@@ -78,7 +76,6 @@ import { obsidianPlugin } from "@elizaos/plugin-obsidian";
 import { sgxPlugin } from "@elizaos/plugin-sgx";
 import { solanaPlugin } from "@elizaos/plugin-solana";
 import { solanaAgentkitPlguin } from "@elizaos/plugin-solana-agentkit";
-import { autonomePlugin } from "@elizaos/plugin-autonome";
 import { storyPlugin } from "@elizaos/plugin-story";
 import { suiPlugin } from "@elizaos/plugin-sui";
 import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
@@ -88,23 +85,22 @@ import { tonPlugin } from "@elizaos/plugin-ton";
 import { webSearchPlugin } from "@elizaos/plugin-web-search";
 
 import { giphyPlugin } from "@elizaos/plugin-giphy";
+import { hyperliquidPlugin } from "@elizaos/plugin-hyperliquid";
 import { letzAIPlugin } from "@elizaos/plugin-letzai";
 import { thirdwebPlugin } from "@elizaos/plugin-thirdweb";
-import { hyperliquidPlugin } from "@elizaos/plugin-hyperliquid";
 import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
 
+import { akashPlugin } from "@elizaos/plugin-akash";
 import { OpacityAdapter } from "@elizaos/plugin-opacity";
 import { openWeatherPlugin } from "@elizaos/plugin-open-weather";
-import { stargazePlugin } from "@elizaos/plugin-stargaze";
-import { akashPlugin } from "@elizaos/plugin-akash";
 import { quaiPlugin } from "@elizaos/plugin-quai";
+import { stargazePlugin } from "@elizaos/plugin-stargaze";
 import Database from "better-sqlite3";
 import fs from "fs";
 import net from "net";
 import path from "path";
 import { fileURLToPath } from "url";
 import yargs from "yargs";
-import {dominosPlugin} from "@elizaos/plugin-dominos";
 
 const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
 const __dirname = path.dirname(__filename); // get the name of the directory
@@ -626,8 +622,7 @@ export async function createAgent(
     character: Character,
     db: IDatabaseAdapter,
     cache: ICacheManager,
-    token: string,
-    trustDb: TrustScoreDatabase
+    token: string
 ): Promise<AgentRuntime> {
     elizaLogger.log(`Creating runtime for character ${character.name}`);
 
@@ -707,15 +702,15 @@ export async function createAgent(
         databaseAdapter: db,
         token,
         modelProvider: character.modelProvider,
+        evaluators: [],
         character,
         // character.plugins are handled when clients are added
         plugins: [
             bootstrapPlugin,
-            twitterPlugin,
-            // getSecret(character, "CONFLUX_CORE_PRIVATE_KEY")
-            //     ? confluxPlugin
-            //     : null,
-            // nodePlugin,
+            getSecret(character, "CONFLUX_CORE_PRIVATE_KEY")
+                ? confluxPlugin
+                : null,
+            nodePlugin,
             getSecret(character, "TAVILY_API_KEY") ? webSearchPlugin : null,
             getSecret(character, "SOLANA_PUBLIC_KEY") ||
             (getSecret(character, "WALLET_PUBLIC_KEY") &&
@@ -726,11 +721,11 @@ export async function createAgent(
                 ? solanaAgentkitPlguin
                 : null,
             getSecret(character, "AUTONOME_JWT_TOKEN") ? autonomePlugin : null,
-            // (getSecret(character, "NEAR_ADDRESS") ||
-            //     getSecret(character, "NEAR_WALLET_PUBLIC_KEY")) &&
-            // getSecret(character, "NEAR_WALLET_SECRET_KEY")
-            //     ? nearPlugin
-            //     : null,
+            (getSecret(character, "NEAR_ADDRESS") ||
+                getSecret(character, "NEAR_WALLET_PUBLIC_KEY")) &&
+            getSecret(character, "NEAR_WALLET_SECRET_KEY")
+                ? nearPlugin
+                : null,
             getSecret(character, "EVM_PUBLIC_KEY") ||
             (getSecret(character, "WALLET_PUBLIC_KEY") &&
                 getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
@@ -749,7 +744,7 @@ export async function createAgent(
             getSecret(character, "SOLANA_ADMIN_PRIVATE_KEY")
                 ? nftGenerationPlugin
                 : null,
-            // getSecret(character, "ZEROG_PRIVATE_KEY") ? zgPlugin : null,
+            getSecret(character, "ZEROG_PRIVATE_KEY") ? zgPlugin : null,
             getSecret(character, "COINMARKETCAP_API_KEY")
                 ? coinmarketcapPlugin
                 : null,
@@ -764,7 +759,7 @@ export async function createAgent(
             getSecret(character, "LIVEPEER_GATEWAY_URL")
                 ? imageGenerationPlugin
                 : null,
-            // getSecret(character, "FAL_API_KEY") ? ThreeDGenerationPlugin : null,
+            getSecret(character, "FAL_API_KEY") ? ThreeDGenerationPlugin : null,
             ...(getSecret(character, "COINBASE_API_KEY") &&
             getSecret(character, "COINBASE_PRIVATE_KEY")
                 ? [
@@ -858,8 +853,7 @@ export async function createAgent(
                 ? quaiPlugin
                 : null,
         ].filter(Boolean),
-        evaluators: [whaleDataEvaluator, trustScoreEvaluator],
-        providers: [whaleDataProvider, trustScoreProvider],
+        providers: [],
         actions: [],
         services: [],
         managers: [],
@@ -944,9 +938,7 @@ async function startAgent(
     character: Character,
     directClient: DirectClient
 ): Promise<AgentRuntime> {
-    let dbAdapter: IDatabaseAdapter & IDatabaseCacheAdapter;
-    let trustDb: TrustScoreDatabase;
-
+    let db: IDatabaseAdapter & IDatabaseCacheAdapter;
     try {
         character.id ??= stringToUuid(character.name);
         character.username ??= character.name;
@@ -958,25 +950,22 @@ async function startAgent(
             fs.mkdirSync(dataDir, { recursive: true });
         }
 
-        const { db, trustDb: tdb } = initializeDatabase(dataDir) as any;
-        dbAdapter = db;
-        trustDb = tdb;
+        db = initializeDatabase(dataDir) as IDatabaseAdapter &
+            IDatabaseCacheAdapter;
 
-        await dbAdapter.init();
+        await db.init();
 
         const cache = initializeCache(
             process.env.CACHE_STORE ?? CacheStore.DATABASE,
             character,
             "",
-            dbAdapter
-        );
-
+            db
+        ); // "" should be replaced with dir for file system caching. THOUGHTS: might probably make this into an env
         const runtime: AgentRuntime = await createAgent(
             character,
-            dbAdapter,
+            db,
             cache,
-            token,
-            trustDb
+            token
         );
 
         // start services/plugins/process knowledge
@@ -998,8 +987,8 @@ async function startAgent(
             error
         );
         elizaLogger.error(error);
-        if (dbAdapter) {
-            await dbAdapter.close();
+        if (db) {
+            await db.close();
         }
         throw error;
     }
@@ -1074,4 +1063,4 @@ const startAgents = async () => {
 startAgents().catch((error) => {
     elizaLogger.error("Unhandled error in startAgents:", error);
     process.exit(1);
-});
+});

packages/plugin-solana/src/keypairUtils.ts

@@ -1,7 +1,7 @@
-import { IAgentRuntime, elizaLogger } from "@elizaos/core";
-import { DeriveKeyProvider, TEEMode } from "@elizaos/plugin-tee";
 import { Keypair, PublicKey } from "@solana/web3.js";
+import { DeriveKeyProvider, TEEMode } from "@elizaos/plugin-tee";
 import bs58 from "bs58";
+import { IAgentRuntime, elizaLogger } from "@elizaos/core";
 
 export interface KeypairResult {
     keypair?: Keypair;