Merge branch 'develop' into pr-1126

Author: shakkernerd

.env.example

@@ -9,6 +9,7 @@ DISCORD_VOICE_CHANNEL_ID=       # The ID of the voice channel the bot should joi
 
 # AI Model API Keys
 OPENAI_API_KEY=                 # OpenAI API key, starting with sk-
+OPENAI_API_URL=                 # OpenAI API Endpoint (optional), Default: https://api.openai.com/v1
 SMALL_OPENAI_MODEL=             # Default: gpt-4o-mini
 MEDIUM_OPENAI_MODEL=            # Default: gpt-4o
 LARGE_OPENAI_MODEL=             # Default: gpt-4o
@@ -35,6 +36,10 @@ SMALL_HYPERBOLIC_MODEL=         # Default: meta-llama/Llama-3.2-3B-Instruct
 MEDIUM_HYPERBOLIC_MODEL=        # Default: meta-llama/Meta-Llama-3.1-70B-Instruct
 LARGE_HYPERBOLIC_MODEL=         # Default: meta-llama/Meta-Llama-3.1-405-Instruct
 
+# Livepeer configuration
+LIVEPEER_GATEWAY_URL=           # Free inference gateways and docs: https://livepeer-eliza.com/
+LIVEPEER_IMAGE_MODEL=           # Default: ByteDance/SDXL-Lightning
+
 # Speech Synthesis
 ELEVENLABS_XI_API_KEY=          # API key from elevenlabs
 
@@ -161,6 +166,10 @@ USE_GAIANET_EMBEDDING=          # Set to TRUE for GAIANET/768, leave blank for l
 EVM_PRIVATE_KEY=
 EVM_PROVIDER_URL=
 
+# Avalanche
+AVALANCHE_PRIVATE_KEY=
+AVALANCHE_PUBLIC_KEY=
+
 # Solana
 SOLANA_PRIVATE_KEY=
 SOLANA_PUBLIC_KEY=
@@ -344,3 +353,6 @@ PINATA_JWT= # Pinata JWT for uploading files to IPFS
 # Cronos zkEVM
 CRONOSZKEVM_ADDRESS=
 CRONOSZKEVM_PRIVATE_KEY=
+
+# Fuel Ecosystem (FuelVM)
+FUEL_WALLET_PRIVATE_KEY=

agent/jest.config.js

@@ -0,0 +1,17 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  extensionsToTreatAsEsm: ['.ts'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+  transform: {
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
+};

agent/package.json

@@ -6,7 +6,8 @@
     "scripts": {
         "start": "node --loader ts-node/esm src/index.ts",
         "dev": "node --loader ts-node/esm src/index.ts",
-        "check-types": "tsc --noEmit"
+        "check-types": "tsc --noEmit",
+        "test": "jest"
     },
     "nodemonConfig": {
         "watch": [
@@ -56,11 +57,16 @@
         "@elizaos/plugin-twitter": "workspace:*",
         "@elizaos/plugin-cronoszkevm": "workspace:*",
         "@elizaos/plugin-3d-generation": "workspace:*",
+        "@elizaos/plugin-fuel": "workspace:*",
+        "@elizaos/plugin-avalanche": "workspace:*",
         "readline": "1.3.0",
         "ws": "8.18.0",
         "yargs": "17.7.2"
     },
     "devDependencies": {
+        "@types/jest": "^29.5.14",
+        "jest": "^29.7.0",
+        "ts-jest": "^29.2.5",
         "ts-node": "10.9.2",
         "tsup": "8.3.5"
     }

agent/src/__tests__/client-type-identification.test.ts

@@ -0,0 +1,53 @@
+import { Client, IAgentRuntime } from "@elizaos/core";
+import { describe, it, expect } from '@jest/globals';
+
+// Helper function to identify client types
+function determineClientType(client: Client): string {
+    // Check if client has a direct type identifier
+    if ('type' in client) {
+        return (client as any).type;
+    }
+
+    // Check constructor name
+    const constructorName = client.constructor?.name;
+    if (constructorName && !constructorName.includes('Object')) {
+        return constructorName.toLowerCase().replace('client', '');
+    }
+
+    // Fallback: Generate a unique identifier
+    return `client_${Date.now()}`;
+}
+
+// Mock client implementations for testing
+class MockNamedClient implements Client {
+    type = "named-client";
+    async start(_runtime?: IAgentRuntime) { return this; }
+    async stop(_runtime?: IAgentRuntime) { }
+}
+
+class MockConstructorClient implements Client {
+    async start(_runtime?: IAgentRuntime) { return this; }
+    async stop(_runtime?: IAgentRuntime) { }
+}
+
+const mockPlainClient: Client = {
+    async start(_runtime?: IAgentRuntime) { return {}; },
+    async stop(_runtime?: IAgentRuntime) { }
+};
+
+describe("Client Type Identification", () => {
+    it("should identify client type from type property", () => {
+        const client = new MockNamedClient();
+        expect(determineClientType(client)).toBe("named-client");
+    });
+
+    it("should identify client type from constructor name", () => {
+        const client = new MockConstructorClient();
+        expect(determineClientType(client)).toBe("mockconstructor");
+    });
+
+    it("should generate fallback identifier for plain objects", () => {
+        const result = determineClientType(mockPlainClient);
+        expect(result).toMatch(/^client_\d+$/);
+    });
+});

agent/src/index.ts

@@ -17,14 +17,15 @@ import {
     elizaLogger,
     FsCacheAdapter,
     IAgentRuntime,
-    ICacheManager,
     IDatabaseAdapter,
     IDatabaseCacheAdapter,
     ModelProviderName,
     settings,
     stringToUuid,
     validateCharacterConfig,
     CacheStore,
+    Client,
+    ICacheManager,
 } from "@elizaos/core";
 import { RedisClient } from "@elizaos/adapter-redis";
 import { zgPlugin } from "@elizaos/plugin-0g";
@@ -45,6 +46,7 @@ import { confluxPlugin } from "@elizaos/plugin-conflux";
 import { evmPlugin } from "@elizaos/plugin-evm";
 import { storyPlugin } from "@elizaos/plugin-story";
 import { flowPlugin } from "@elizaos/plugin-flow";
+import { fuelPlugin } from "@elizaos/plugin-fuel";
 import { imageGenerationPlugin } from "@elizaos/plugin-image-generation";
 import { ThreeDGenerationPlugin } from "@elizaos/plugin-3d-generation";
 import { multiversxPlugin } from "@elizaos/plugin-multiversx";
@@ -58,6 +60,7 @@ import { tonPlugin } from "@elizaos/plugin-ton";
 import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
 import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
 import { abstractPlugin } from "@elizaos/plugin-abstract";
+import { avalanchePlugin } from "@elizaos/plugin-avalanche";
 import Database from "better-sqlite3";
 import fs from "fs";
 import path from "path";
@@ -437,12 +440,32 @@ export async function initializeClients(
         if (slackClient) clients.slack = slackClient; // Use object property instead of push
     }
 
+    function determineClientType(client: Client): string {
+        // Check if client has a direct type identifier
+        if ("type" in client) {
+            return (client as any).type;
+        }
+
+        // Check constructor name
+        const constructorName = client.constructor?.name;
+        if (constructorName && !constructorName.includes("Object")) {
+            return constructorName.toLowerCase().replace("client", "");
+        }
+
+        // Fallback: Generate a unique identifier
+        return `client_${Date.now()}`;
+    }
+
     if (character.plugins?.length > 0) {
         for (const plugin of character.plugins) {
             if (plugin.clients) {
                 for (const client of plugin.clients) {
                     const startedClient = await client.start(runtime);
-                    clients[client.name] = startedClient; // Assuming client has a name property
+                    const clientType = determineClientType(client);
+                    elizaLogger.debug(
+                        `Initializing client of type: ${clientType}`
+                    );
+                    clients[clientType] = startedClient;
                 }
             }
         }
@@ -534,7 +557,8 @@ export async function createAgent(
             getSecret(character, "FAL_API_KEY") ||
             getSecret(character, "OPENAI_API_KEY") ||
             getSecret(character, "VENICE_API_KEY") ||
-            getSecret(character, "HEURIST_API_KEY")
+            getSecret(character, "HEURIST_API_KEY") ||
+            getSecret(character, "LIVEPEER_GATEWAY_URL")
                 ? imageGenerationPlugin
                 : null,
             getSecret(character, "FAL_API_KEY") ? ThreeDGenerationPlugin : null,
@@ -572,6 +596,10 @@ export async function createAgent(
             getSecret(character, "TON_PRIVATE_KEY") ? tonPlugin : null,
             getSecret(character, "SUI_PRIVATE_KEY") ? suiPlugin : null,
             getSecret(character, "STORY_PRIVATE_KEY") ? storyPlugin : null,
+            getSecret(character, "FUEL_PRIVATE_KEY") ? fuelPlugin : null,
+            getSecret(character, "AVALANCHE_PRIVATE_KEY")
+                ? avalanchePlugin
+                : null,
         ].filter(Boolean),
         providers: [],
         actions: [],

agent/tsconfig.json

@@ -6,7 +6,8 @@
         "module": "ESNext",
         "moduleResolution": "Bundler",
         "types": [
-            "node"
+            "node",
+            "jest"
         ]
     },
     "ts-node": {

client/tsconfig.app.json

@@ -1,30 +1,36 @@
 {
     "compilerOptions": {
+        "incremental": true,
         "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
         "target": "ES2020",
         "useDefineForClassFields": true,
-        "lib": ["ES2020", "DOM", "DOM.Iterable"],
+        "lib": [
+            "ES2020",
+            "DOM",
+            "DOM.Iterable"
+        ],
         "module": "ESNext",
         "skipLibCheck": true,
-
         /* Bundler mode */
         "moduleResolution": "Bundler",
         "allowImportingTsExtensions": true,
         "isolatedModules": true,
         "moduleDetection": "force",
         "noEmit": true,
         "jsx": "react-jsx",
-
         /* Linting */
         "strict": true,
         "noUnusedLocals": true,
         "noUnusedParameters": true,
         "noFallthroughCasesInSwitch": true,
-        "noUncheckedSideEffectImports": true,
         "baseUrl": ".",
         "paths": {
-            "@/*": ["./src/*"]
+            "@/*": [
+                "./src/*"
+            ]
         }
     },
-    "include": ["src"]
-}
+    "include": [
+        "src"
+    ]
+}

client/tsconfig.node.json

@@ -1,24 +1,26 @@
 {
     "compilerOptions": {
+        "incremental": true,
         "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
         "target": "ES2022",
-        "lib": ["ES2023"],
+        "lib": [
+            "ES2023"
+        ],
         "module": "ESNext",
         "skipLibCheck": true,
-
         /* Bundler mode */
         "moduleResolution": "Bundler",
         "allowImportingTsExtensions": true,
         "isolatedModules": true,
         "moduleDetection": "force",
         "noEmit": true,
-
         /* Linting */
         "strict": true,
         "noUnusedLocals": true,
         "noUnusedParameters": true,
-        "noFallthroughCasesInSwitch": true,
-        "noUncheckedSideEffectImports": true
+        "noFallthroughCasesInSwitch": true
     },
-    "include": ["vite.config.ts"]
-}
+    "include": [
+        "vite.config.ts"
+    ]
+}

docs/api/enumerations/ModelProviderName.md

@@ -233,3 +233,13 @@ Available model providers
 #### Defined in
 
 [packages/core/src/types.ts:240](https://github.com/elizaOS/eliza/blob/main/packages/core/src/types.ts#L240)
+
+***
+
+### LIVEPEER
+
+> **LIVEPEER**: `"livepeer"`
+
+#### Defined in
+
+[packages/core/src/types.ts:241](https://github.com/elizaOS/eliza/blob/main/packages/core/src/types.ts#L241)

docs/api/type-aliases/Models.md

@@ -100,6 +100,10 @@ Model configurations by provider
 
 > **akash\_chat\_api**: [`Model`](Model.md)
 
+### livepeer
+
+> **livepeer**: [`Model`](Model.md)
+
 ## Defined in
 
 [packages/core/src/types.ts:188](https://github.com/elizaOS/eliza/blob/main/packages/core/src/types.ts#L188)

docs/docs/advanced/fine-tuning.md

@@ -60,11 +60,11 @@ Models are categorized into different classes based on their capabilities:
 
 ```typescript
 enum ModelClass {
-    SMALL,    // Fast, efficient for simple tasks
-    MEDIUM,   // Balanced performance and capability
-    LARGE,    // Most capable but slower/more expensive
-    EMBEDDING // Specialized for vector embeddings
-    IMAGE     // Image generation capabilities
+    SMALL,     // Fast, efficient for simple tasks
+    MEDIUM,    // Balanced performance and capability
+    LARGE,     // Most capable but slower/more expensive
+    EMBEDDING, // Specialized for vector embeddings
+    IMAGE      // Image generation capabilities
 }
 ```
 

docs/docs/api/enumerations/ModelProviderName.md

@@ -119,3 +119,13 @@
 #### Defined in
 
 [packages/core/src/types.ts:132](https://github.com/elizaos/eliza/blob/4d1e66cbf7deea87a8a67525670a963cd00108bc/packages/core/src/types.ts#L132)
+
+---
+
+### LIVEPEER
+
+> **LIVEPEER**: `"livepeer"`
+
+#### Defined in
+
+[packages/core/src/types.ts:133](https://github.com/elizaos/eliza/blob/4d1e66cbf7deea87a8a67525670a963cd00108bc/packages/core/src/types.ts#L133)

docs/docs/api/type-aliases/Models.md

@@ -52,6 +52,10 @@
 
 > **heurist**: [`Model`](Model.md)
 
+### livepeer
+
+> **livepeer**: [`Model`](Model.md)
+
 ## Defined in
 
 [packages/core/src/types.ts:105](https://github.com/elizaos/eliza/blob/7fcf54e7fb2ba027d110afcc319c0b01b3f181dc/packages/core/src/types.ts#L105)

docs/docs/guides/configuration.md

@@ -72,6 +72,9 @@ TOGETHER_API_KEY=
 # Heurist Settings
 HEURIST_API_KEY=
 
+# Livepeer Settings
+LIVEPEER_GATEWAY_URL=
+
 # Local Model Settings
 XAI_MODEL=meta-llama/Llama-3.1-7b-instruct
 ```