Merge branch 'develop' into feature/add-coinmarketcap-plugin

Author: wtfsayo

.env.example

@@ -424,6 +424,9 @@ SPHERON_WALLET_ADDRESS=
 # Stargaze NFT marketplace from Cosmos (You can use https://graphql.mainnet.stargaze-apis.com/graphql)
 STARGAZE_ENDPOINT=
 
+# API key for giphy from https://developers.giphy.com/dashboard/
+GIPHY_API_KEY=
+
 # GenLayer
 GENLAYER_PRIVATE_KEY= # Private key of the GenLayer account to use for the agent in this format (0x0000000000000000000000000000000000000000000000000000000000000000)
 
@@ -433,3 +436,12 @@ OPEN_WEATHER_API_KEY=  # OpenWeather API key
 # Allora
 ALLORA_API_KEY= # Allora API key, format: UP-f8db7d6558ab432ca0d92716
 ALLORA_CHAIN_SLUG= # must be one of mainnet, testnet. If not specified, it will use testnet by default
+
+# Opacity zkTLS
+OPACITY_TEAM_ID=f309ac8ae8a9a14a7e62cd1a521b1c5f
+OPACITY_CLOUDFLARE_NAME=eigen-test
+OPACITY_PROVER_URL=https://opacity-ai-zktls-demo.vercel.app
+
+# Verifiable Inference Configuration
+VERIFIABLE_INFERENCE_ENABLED=false # Set to false to disable verifiable inference
+VERIFIABLE_INFERENCE_PROVIDER=opacity # Options: opacity

agent/package.json

@@ -58,6 +58,7 @@
         "@elizaos/plugin-solana-agentkit": "workspace:*",
         "@elizaos/plugin-starknet": "workspace:*",
         "@elizaos/plugin-stargaze": "workspace:*",
+        "@elizaos/plugin-giphy": "workspace:*",
         "@elizaos/plugin-ton": "workspace:*",
         "@elizaos/plugin-sui": "workspace:*",
         "@elizaos/plugin-tee": "workspace:*",
@@ -78,6 +79,7 @@
         "@elizaos/plugin-obsidian": "workspace:*",
         "@elizaos/plugin-arthera": "workspace:*",
         "@elizaos/plugin-allora": "workspace:*",
+        "@elizaos/plugin-opacity": "workspace:*",
         "readline": "1.3.0",
         "ws": "8.18.0",
         "yargs": "17.7.2"

agent/src/index.ts

@@ -79,13 +79,19 @@ import { teeMarlinPlugin } from "@elizaos/plugin-tee-marlin";
 import { thirdwebPlugin } from "@elizaos/plugin-thirdweb";
 import { tonPlugin } from "@elizaos/plugin-ton";
 import { webSearchPlugin } from "@elizaos/plugin-web-search";
+
+import { giphyPlugin } from "@elizaos/plugin-giphy";
+import { echoChamberPlugin } from "@elizaos/plugin-echochambers";
+import { thirdwebPlugin } from "@elizaos/plugin-thirdweb";
+
 import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
 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 { OpacityAdapter } from "@elizaos/plugin-opacity";
 
 const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
 const __dirname = path.dirname(__filename); // get the name of the directory
@@ -554,6 +560,28 @@ export async function createAgent(
     //     });
     //     elizaLogger.log("Verifiable inference adapter initialized");
     // }
+    // Initialize Opacity adapter if environment variables are present
+    let verifiableInferenceAdapter;
+    if (
+        process.env.OPACITY_TEAM_ID &&
+        process.env.OPACITY_CLOUDFLARE_NAME &&
+        process.env.OPACITY_PROVER_URL &&
+        process.env.VERIFIABLE_INFERENCE_ENABLED === "true"
+    ) {
+        verifiableInferenceAdapter = new OpacityAdapter({
+            teamId: process.env.OPACITY_TEAM_ID,
+            teamName: process.env.OPACITY_CLOUDFLARE_NAME,
+            opacityProverUrl: process.env.OPACITY_PROVER_URL,
+            modelProvider: character.modelProvider,
+            token: token,
+        });
+        elizaLogger.log("Verifiable inference adapter initialized");
+        elizaLogger.log("teamId", process.env.OPACITY_TEAM_ID);
+        elizaLogger.log("teamName", process.env.OPACITY_CLOUDFLARE_NAME);
+        elizaLogger.log("opacityProverUrl", process.env.OPACITY_PROVER_URL);
+        elizaLogger.log("modelProvider", character.modelProvider);
+        elizaLogger.log("token", token);
+    }
 
     return new AgentRuntime({
         databaseAdapter: db,
@@ -663,6 +691,7 @@ export async function createAgent(
                 ? echoChambersPlugin
                 : null,
             getSecret(character, "STARGAZE_ENDPOINT") ? stargazePlugin : null,
+            getSecret(character, "GIPHY_API_KEY") ? giphyPlugin : null,
             getSecret(character, "GENLAYER_PRIVATE_KEY")
                 ? genLayerPlugin
                 : null,
@@ -685,7 +714,7 @@ export async function createAgent(
         managers: [],
         cacheManager: cache,
         fetch: logFetch,
-        // verifiableInferenceAdapter,
+        verifiableInferenceAdapter,
     });
 }
 

packages/client-telegram/src/messageManager.ts

@@ -678,8 +678,11 @@ export class MessageManager {
     ): Promise<Message.TextMessage[]> {
         if (content.attachments && content.attachments.length > 0) {
             content.attachments.map(async (attachment: Media) => {
-                if (attachment.contentType.startsWith("image")) {
-                    this.sendImage(ctx, attachment.url, attachment.description);
+                if (attachment.contentType === "image/gif") {
+                    // Handle GIFs specifically
+                    await this.sendAnimation(ctx, attachment.url, attachment.description);
+                } else if (attachment.contentType.startsWith("image")) {
+                    await this.sendImage(ctx, attachment.url, attachment.description);
                 }
             });
         } else {
@@ -743,6 +746,42 @@ export class MessageManager {
         }
     }
 
+    private async sendAnimation(
+        ctx: Context,
+        animationPath: string,
+        caption?: string
+    ): Promise<void> {
+        try {
+            if (/^(http|https):\/\//.test(animationPath)) {
+                // Handle HTTP URLs
+                await ctx.telegram.sendAnimation(ctx.chat.id, animationPath, {
+                    caption,
+                });
+            } else {
+                // Handle local file paths
+                if (!fs.existsSync(animationPath)) {
+                    throw new Error(`File not found: ${animationPath}`);
+                }
+
+                const fileStream = fs.createReadStream(animationPath);
+
+                await ctx.telegram.sendAnimation(
+                    ctx.chat.id,
+                    {
+                        source: fileStream,
+                    },
+                    {
+                        caption,
+                    }
+                );
+            }
+
+            elizaLogger.info(`Animation sent successfully: ${animationPath}`);
+        } catch (error) {
+            elizaLogger.error("Error sending animation:", error);
+        }
+    }
+
     // Split message into smaller parts
     private splitMessage(text: string): string[] {
         const chunks: string[] = [];

packages/core/src/generation.ts

@@ -212,17 +212,18 @@ export async function generateText({
         model: modelClass,
         verifiableInference,
     });
-
+    elizaLogger.log("Using provider:", runtime.modelProvider);
     // If verifiable inference is requested and adapter is provided, use it
     if (verifiableInference && runtime.verifiableInferenceAdapter) {
+        elizaLogger.log("Using verifiable inference adapter:", runtime.verifiableInferenceAdapter);
         try {
-            const result =
+            const result: VerifiableInferenceResult =
                 await runtime.verifiableInferenceAdapter.generateText(
                     context,
                     modelClass,
                     verifiableInferenceOptions
                 );
-
+            elizaLogger.log("Verifiable inference result:", result);
             // Verify the proof
             const isValid =
                 await runtime.verifiableInferenceAdapter.verifyProof(result);

packages/core/src/types.ts

@@ -1415,7 +1415,7 @@ export interface ISlackService extends Service {
  * Available verifiable inference providers
  */
 export enum VerifiableInferenceProvider {
-    RECLAIM = "reclaim",
+    OPACITY = "opacity",
 }
 
 /**
@@ -1436,8 +1436,10 @@ export interface VerifiableInferenceOptions {
 export interface VerifiableInferenceResult {
     /** Generated text */
     text: string;
-    /** Proof data */
-    proof: unknown;
+    /** Proof */
+    proof: any;
+    /** Proof id */
+    id?: string;
     /** Provider information */
     provider: VerifiableInferenceProvider;
     /** Timestamp */
@@ -1448,6 +1450,7 @@ export interface VerifiableInferenceResult {
  * Interface for verifiable inference adapters
  */
 export interface IVerifiableInferenceAdapter {
+    options: any;
     /**
      * Generate text with verifiable proof
      * @param context The input text/prompt

packages/plugin-giphy/README.md

@@ -0,0 +1,48 @@
+# Plugin Giphy
+
+A plugin for sending GIFs in response to user messages.
+
+## Overview
+
+The **Plugin Giphy** enhances your agent's interactions by enabling it to respond with relevant GIFs based on user inputs. Leveraging the [Giphy API](https://developers.giphy.com/), this plugin detects specific triggers in user messages and responds with appropriate GIFs to make conversations more engaging and expressive.
+
+## Installation
+
+```bash
+pnpm add @elizaos/plugin-giphy
+```
+
+## Configuration
+
+Set up your environment with the required Giphy API key:
+
+| Variable Name | Description |
+|--------------|-------------|
+| `GIPHY_API_KEY` | Giphy API key for authenticating requests |
+
+You need to obtain an API key by signing up at [Giphy Developers](https://developers.giphy.com/).
+
+## Usage
+
+```typescript
+import { giphyPlugin } from "@elizaos/plugin-giphy";
+
+// Initialize the plugin
+const plugin = giphyPlugin;
+
+// Add the plugin to your agent's plugin list
+const plugins = [
+  giphyPlugin,
+  // ... other plugins
+];
+
+// Initialize your agent with the plugins
+// Example:
+// const agent = new Agent({ plugins, ...otherConfig });
+```
+
+The plugin provides the `SEND_GIF` action, which automatically responds with a GIF based on the context of user messages. No additional setup is required beyond installing and configuring the plugin.
+
+## License
+
+MIT

packages/plugin-giphy/package.json

@@ -0,0 +1,18 @@
+{
+    "name": "@elizaos/plugin-giphy",
+    "version": "0.1.0",
+    "main": "dist/index.js",
+    "type": "module",
+    "types": "dist/index.d.ts",
+    "dependencies": {
+        "@elizaos/core": "workspace:*",
+        "axios": "^1.6.7",
+        "tsup": "^8.3.5",
+        "zod": "^3.22.4"
+    },
+    "scripts": {
+        "build": "tsup --format esm --dts",
+        "dev": "tsup --format esm --dts --watch",
+        "test": "vitest run"
+    }
+}