Merge branch 'main' of http://github.com/ai16z/eliza into HEAD

elizaOS · Nov 28, 2024 · e1fdeba · e1fdeba
2 parents 94e1332 + 881240b
commit e1fdeba
Show file tree

Hide file tree

Showing 116 changed files with 2,383 additions and 737 deletions.
diff --git a/.env.example b/.env.example
@@ -72,9 +72,18 @@ MEDIUM_HEURIST_LANGUAGE_MODEL=
 LARGE_HEURIST_LANGUAGE_MODEL=
 HEURIST_IMAGE_MODEL=
 
-# Wallet Configuration
+# EVM
+EVM_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+EVM_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Solana
+SOLANA_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+SOLANA_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Fallback Wallet Configuration (deprecated)
 WALLET_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
 WALLET_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
 BIRDEYE_API_KEY=
 
 # Solana Configuration

diff --git a/README_CN.md b/README_CN.md
@@ -104,6 +104,15 @@ XAI_MODEL=
 # For asking Claude stuff
 ANTHROPIC_API_KEY=
 
+# EVM
+EVM_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+EVM_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Solana
+SOLANA_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+SOLANA_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Fallback Wallet Configuration (deprecated)
 WALLET_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
 WALLET_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
 

diff --git a/README_ES.md b/README_ES.md
@@ -107,6 +107,15 @@ XAI_MODEL=
 # Para consultar a Claude
 ANTHROPIC_API_KEY=
 
+# EVM
+EVM_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+EVM_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Solana
+SOLANA_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+SOLANA_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Fallback Wallet Configuration (deprecated)
 WALLET_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
 WALLET_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
 

diff --git a/README_JA.md b/README_JA.md
@@ -106,6 +106,15 @@ XAI_MODEL=
 # Claudeに質問するため
 ANTHROPIC_API_KEY=
 
+# EVM
+EVM_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+EVM_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Solana
+SOLANA_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+SOLANA_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Fallback Wallet Configuration (deprecated)
 WALLET_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
 WALLET_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
 

diff --git a/README_KOR.md b/README_KOR.md
@@ -108,6 +108,15 @@ XAI_MODEL=
 # For asking Claude stuff
 ANTHROPIC_API_KEY=
 
+# EVM
+EVM_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+EVM_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Solana
+SOLANA_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+SOLANA_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Fallback Wallet Configuration (deprecated)
 WALLET_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
 WALLET_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
 

diff --git a/README_PTBR.md b/README_PTBR.md
@@ -108,6 +108,15 @@ XAI_MODEL=
 # Para perguntar coisas ao Claude
 ANTHROPIC_API_KEY=
 
+# EVM
+EVM_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+EVM_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Solana
+SOLANA_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+SOLANA_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Fallback Wallet Configuration (deprecated)
 WALLET_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
 WALLET_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
 

diff --git a/README_RU.md b/README_RU.md
@@ -124,6 +124,15 @@ XAI_MODEL=
 # Для запросов к Claude
 ANTHROPIC_API_KEY=
 
+# EVM
+EVM_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+EVM_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Solana
+SOLANA_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+SOLANA_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Fallback Wallet Configuration (deprecated)
 WALLET_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
 WALLET_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
 

diff --git a/agent/package.json b/agent/package.json
@@ -32,6 +32,7 @@
         "@ai16z/plugin-coinbase": "workspace:*",
         "readline": "1.3.0",
         "ws": "8.18.0",
+        "@ai16z/plugin-evm": "workspace:*",
         "yargs": "17.7.2"
     },
     "devDependencies": {

diff --git a/agent/src/index.ts b/agent/src/index.ts
@@ -24,16 +24,18 @@ import {
 } from "@ai16z/eliza";
 import { zgPlugin } from "@ai16z/plugin-0g";
 import { bootstrapPlugin } from "@ai16z/plugin-bootstrap";
-import { buttplugPlugin } from "@ai16z/plugin-buttplug";
+// import { buttplugPlugin } from "@ai16z/plugin-buttplug";
 import {
     coinbaseCommercePlugin,
     coinbaseMassPaymentsPlugin,
 } from "@ai16z/plugin-coinbase";
 import { confluxPlugin } from "@ai16z/plugin-conflux";
+import { evmPlugin } from "@ai16z/plugin-evm";
 import { createNodePlugin } from "@ai16z/plugin-node";
 import { solanaPlugin } from "@ai16z/plugin-solana";
 import { teePlugin } from "@ai16z/plugin-tee";
 
+import buttplugPlugin from "@ai16z/plugin-buttplug";
 import Database from "better-sqlite3";
 import fs from "fs";
 import path from "path";
@@ -283,7 +285,7 @@ export function createAgent(
         character.name
     );
 
-    nodePlugin ??= createNodePlugin();
+    nodePlugin ??= createNodePlugin()
 
     return new AgentRuntime({
         databaseAdapter: db,
@@ -297,7 +299,16 @@ export function createAgent(
                 ? confluxPlugin
                 : null,
             nodePlugin,
-            getSecret(character, "WALLET_PUBLIC_KEY") ? solanaPlugin : null,
+            getSecret(character, "SOLANA_PUBLIC_KEY") ||
+                getSecret(character, "WALLET_PUBLIC_KEY") &&
+                !getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x")
+                ? solanaPlugin
+                : null,
+            getSecret(character, "EVM_PUBLIC_KEY") ||
+                getSecret(character, "WALLET_PUBLIC_KEY") &&
+                !getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x")
+                ? evmPlugin
+                : null,
             getSecret(character, "ZEROG_PRIVATE_KEY") ? zgPlugin : null,
             getSecret(character, "COINBASE_COMMERCE_KEY")
                 ? coinbaseCommercePlugin

diff --git a/docs/README_CN.md b/docs/README_CN.md
@@ -104,6 +104,15 @@ XAI_MODEL=
 # For asking Claude stuff
 ANTHROPIC_API_KEY=
 
+# EVM
+EVM_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+EVM_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Solana
+SOLANA_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
+SOLANA_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY
+
+# Fallback Wallet Configuration (deprecated)
 WALLET_PRIVATE_KEY=EXAMPLE_WALLET_PRIVATE_KEY
 WALLET_PUBLIC_KEY=EXAMPLE_WALLET_PUBLIC_KEY