Skip to content

Commit 069a643

Browse files
wtfsayowtfsayo
authored
Merge branch 'develop' into plugin-arthera-alpha
2 parents 53b7638 + ae56659 commit 069a643

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+4502
-1479
lines changed

‎.env.example

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ IMAGE_OPENAI_MODEL= # Default: dall-e-3
1919
# Eternal AI's Decentralized Inference API
2020
ETERNALAI_URL=
2121
ETERNALAI_MODEL= # Default: "neuralmagic/Meta-Llama-3.1-405B-Instruct-quantized.w4a16"
22+
ETERNALAI_CHAIN_ID=45762 #Default: "45762"
2223
ETERNALAI_API_KEY=
23-
ETERNAL_AI_LOG_REQUEST=false #Default: false
24+
ETERNALAI_LOG=false #Default: false
2425

2526
GROK_API_KEY= # GROK/xAI API Key
2627
GROQ_API_KEY= # Starts with gsk_
@@ -85,7 +86,6 @@ TWITTER_TARGET_USERS= # Comma separated list of Twitter user names to
8586
TWITTER_RETRY_LIMIT= # Maximum retry attempts for Twitter login
8687
TWITTER_SPACES_ENABLE=false # Enable or disable Twitter Spaces logic
8788

88-
X_SERVER_URL=
8989
XAI_API_KEY=
9090
XAI_MODEL=
9191

@@ -218,7 +218,7 @@ BIRDEYE_API_KEY=
218218
SOL_ADDRESS=So11111111111111111111111111111111111111112
219219
SLIPPAGE=1
220220
BASE_MINT=So11111111111111111111111111111111111111112
221-
RPC_URL=https://api.mainnet-beta.solana.com
221+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
222222
HELIUS_API_KEY=
223223

224224
# Telegram Configuration
@@ -349,7 +349,7 @@ NEAR_WALLET_SECRET_KEY=
349349
NEAR_WALLET_PUBLIC_KEY=
350350
NEAR_ADDRESS=
351351
SLIPPAGE=1
352-
RPC_URL=https://rpc.testnet.near.org
352+
NEAR_RPC_URL=https://rpc.testnet.near.org
353353
NEAR_NETWORK=testnet # or mainnet
354354

355355
# ZKsync Era Configuration

‎README_CN.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ TWITTER_USERNAME= # Account username
188188
TWITTER_PASSWORD= # Account password
189189
TWITTER_EMAIL= # Account email
190190
191-
X_SERVER_URL=
192191
XAI_API_KEY=
193192
XAI_MODEL=
194193
@@ -211,7 +210,7 @@ BIRDEYE_API_KEY=
211210
212211
SOL_ADDRESS=So11111111111111111111111111111111111111112
213212
SLIPPAGE=1
214-
RPC_URL=https://api.mainnet-beta.solana.com
213+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
215214
HELIUS_API_KEY=
216215
217216
@@ -237,7 +236,7 @@ npx --no node-llama-cpp source download --gpu cuda
237236
### 本地运行
238237

239238
添加 XAI_MODEL 并将其设置为上述 [使用 Llama 运行](#run-with-llama) 中的选项之一
240-
您可以将 X_SERVER_URL 和 XAI_API_KEY 留空，它会从 huggingface 下载模型并在本地查询
239+
您可以将 XAI_API_KEY 留空，它会从 huggingface 下载模型并在本地查询
241240

242241
# 客户端
243242

‎README_ES.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ TWITTER_USERNAME= # Nombre de usuario de la cuenta
9999
TWITTER_PASSWORD= # Contraseña de la cuenta
100100
TWITTER_EMAIL= # Correo electrónico de la cuenta
101101
102-
X_SERVER_URL=
103102
XAI_API_KEY=
104103
XAI_MODEL=
105104
@@ -121,7 +120,7 @@ BIRDEYE_API_KEY=
121120
122121
SOL_ADDRESS=So11111111111111111111111111111111111111112
123122
SLIPPAGE=1
124-
RPC_URL=https://api.mainnet-beta.solana.com
123+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
125124
HELIUS_API_KEY=
126125
127126
## Telegram
@@ -145,7 +144,7 @@ Asegúrese de tener instalado el CUDA Toolkit, incluyendo cuDNN y cuBLAS.
145144

146145
### Ejecución local
147146

148-
Agregue XAI_MODEL y configúrelo con una de las opciones de [Ejecutar con Llama](#ejecutar-con-llama) - puede dejar X_SERVER_URL y XAI_API_KEY en blanco, descargará el modelo de HuggingFace y realizará consultas localmente
147+
Agregue XAI_MODEL y configúrelo con una de las opciones de [Ejecutar con Llama](#ejecutar-con-llama) - puede dejar XAI_API_KEY en blanco, descargará el modelo de HuggingFace y realizará consultas localmente
149148

150149
# Clientes
151150

‎README_JA.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ TWITTER_USERNAME= # アカウントのユーザー名
9797
TWITTER_PASSWORD= # アカウントのパスワード
9898
TWITTER_EMAIL= # アカウントのメール
9999
100-
X_SERVER_URL=
101100
XAI_API_KEY=
102101
XAI_MODEL=
103102
@@ -120,7 +119,7 @@ BIRDEYE_API_KEY=
120119
121120
SOL_ADDRESS=So11111111111111111111111111111111111111112
122121
SLIPPAGE=1
123-
RPC_URL=https://api.mainnet-beta.solana.com
122+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
124123
HELIUS_API_KEY=
125124
126125
@@ -145,7 +144,7 @@ CUDA Toolkit、cuDNN、cuBLASをインストールしていることを確認し
145144

146145
### ローカルでの実行
147146

148-
XAI_MODELを追加し、[Llamaでの実行](#run-with-llama)のオプションのいずれかに設定 - X_SERVER_URLとXAI_API_KEYを空白のままにしておくと、huggingfaceからモデルをダウンロードし、ローカルでクエリを実行します。
147+
XAI_MODELを追加し、[Llamaでの実行](#run-with-llama)のオプションのいずれかに設定 - XAI_API_KEYを空白のままにしておくと、huggingfaceからモデルをダウンロードし、ローカルでクエリを実行します。
149148

150149
# クライアント
151150

‎README_PTBR.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ TWITTER_USERNAME= # Nome de usuário da conta
9999
TWITTER_PASSWORD= # Senha da conta
100100
TWITTER_EMAIL= # Email da conta
101101
102-
X_SERVER_URL=
103102
XAI_API_KEY=
104103
XAI_MODEL=
105104
@@ -122,7 +121,7 @@ BIRDEYE_API_KEY=
122121
123122
SOL_ADDRESS=So11111111111111111111111111111111111111112
124123
SLIPPAGE=1
125-
RPC_URL=https://api.mainnet-beta.solana.com
124+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
126125
HELIUS_API_KEY=
127126
128127
@@ -147,7 +146,7 @@ Certifique-se de ter instalado o CUDA Toolkit, incluindo cuDNN e cuBLAS.
147146

148147
### Executando localmente
149148

150-
Adicione XAI_MODEL e configure-o para uma das opções acima de [Executar com Llama](#executar-com-llama) - você pode deixar X_SERVER_URL e XAI_API_KEY em branco, ele baixa o modelo do huggingface e faz consultas localmente
149+
Adicione XAI_MODEL e configure-o para uma das opções acima de [Executar com Llama](#executar-com-llama) - você pode deixar XAI_API_KEY em branco, ele baixa o modelo do huggingface e faz consultas localmente
151150

152151
# Clientes
153152

‎README_RO.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ TWITTER_USERNAME= # Nome de usuário da conta
9999
TWITTER_PASSWORD= # Senha da conta
100100
TWITTER_EMAIL= # Email da conta
101101
102-
X_SERVER_URL=
103102
XAI_API_KEY=
104103
XAI_MODEL=
105104
@@ -122,7 +121,7 @@ BIRDEYE_API_KEY=
122121
123122
SOL_ADDRESS=So11111111111111111111111111111111111111112
124123
SLIPPAGE=1
125-
RPC_URL=https://api.mainnet-beta.solana.com
124+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
126125
HELIUS_API_KEY=
127126
128127
@@ -147,7 +146,7 @@ Asigurați-vă că ați instalat CUDA Toolkit, inclusiv cuDNN și cuBLAS.
147146

148147
### Rularea locală
149148

150-
Adăugați `XAI_MODEL` și setați-l la una dintre opțiunile de mai sus din [Rularea cu Llama](#rularea-cu-llama) – puteți lăsa `X_SERVER_URL` și `XAI_API_KEY` necompletate, modelul va fi descărcat de pe Hugging Face și interogările vor fi făcute local.
149+
Adăugați `XAI_MODEL` și setați-l la una dintre opțiunile de mai sus din [Rularea cu Llama](#rularea-cu-llama) – puteți lăsa `XAI_API_KEY` necompletate, modelul va fi descărcat de pe Hugging Face și interogările vor fi făcute local.
151150

152151
# Clienți
153152

‎README_RS.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ TWITTER_USERNAME= # Korisničko ime naloga
9999
TWITTER_PASSWORD= # Lozinka naloga
100100
TWITTER_EMAIL= # Email naloga
101101
102-
X_SERVER_URL=
103102
XAI_API_KEY=
104103
XAI_MODEL=
105104
@@ -121,7 +120,7 @@ BIRDEYE_API_KEY=
121120
122121
SOL_ADDRESS=So11111111111111111111111111111111111111112
123122
SLIPPAGE=1
124-
RPC_URL=https://api.mainnet-beta.solana.com
123+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
125124
HELIUS_API_KEY=
126125
127126
## Telegram
@@ -145,7 +144,7 @@ Uverite se da imate instaliran CUDA Toolkit, uključujući cuDNN i cuBLAS.
145144

146145
### Lokalno Pokretanje
147146

148-
Dodajte XAI_MODEL i konfigurišite ga sa jednom od opcija iz [Pokretanje sa Llama](#pokretanje-sa-llama) - možete ostaviti X_SERVER_URL i XAI_API_KEY praznim, preuzeće model sa HuggingFace i izvršiti upite lokalno
147+
Dodajte XAI_MODEL i konfigurišite ga sa jednom od opcija iz [Pokretanje sa Llama](#pokretanje-sa-llama) - možete ostaviti XAI_API_KEY praznim, preuzeće model sa HuggingFace i izvršiti upite lokalno
149148

150149
# Klijenti
151150

‎README_RU.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ TWITTER_USERNAME= # Имя пользователя аккаунта
115115
TWITTER_PASSWORD= # Пароль аккаунта
116116
TWITTER_EMAIL= # Email аккаунта
117117
118-
X_SERVER_URL=
119118
XAI_API_KEY=
120119
XAI_MODEL=
121120
@@ -138,7 +137,7 @@ BIRDEYE_API_KEY= # API-ключ для BirdEye
138137
139138
SOL_ADDRESS=So11111111111111111111111111111111111111112
140139
SLIPPAGE=1
141-
RPC_URL=https://api.mainnet-beta.solana.com
140+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
142141
HELIUS_API_KEY= # API-ключ Helius
143142
144143
@@ -164,7 +163,7 @@ npx --no node-llama-cpp source download --gpu cuda
164163

165164
### Локальный запуск
166165

167-
Добавьте `XAI_MODEL` и установите его в одно из вышеуказанных значений из [Запуск с Llama](#run-with-llama). Вы можете оставить `X_SERVER_URL` и `XAI_API_KEY` пустыми — модель будет загружена с huggingface и обработана локально.
166+
Добавьте `XAI_MODEL` и установите его в одно из вышеуказанных значений из [Запуск с Llama](#run-with-llama). Вы можете оставить `XAI_API_KEY` пустыми — модель будет загружена с huggingface и обработана локально.
168167

169168
# Клиенты
170169

‎agent/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"@elizaos/plugin-nft-generation": "workspace:*",
5252
"@elizaos/plugin-node": "workspace:*",
5353
"@elizaos/plugin-solana": "workspace:*",
54+
"@elizaos/plugin-solana-agentkit": "workspace:*",
5455
"@elizaos/plugin-starknet": "workspace:*",
5556
"@elizaos/plugin-stargaze": "workspace:*",
5657
"@elizaos/plugin-ton": "workspace:*",

‎agent/src/index.ts

+4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import { nearPlugin } from "@elizaos/plugin-near";
6060
import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
6161
import { createNodePlugin } from "@elizaos/plugin-node";
6262
import { solanaPlugin } from "@elizaos/plugin-solana";
63+
import { solanaAgentkitPlguin } from "@elizaos/plugin-solana-agentkit";
6364
import { storyPlugin } from "@elizaos/plugin-story";
6465
import { suiPlugin } from "@elizaos/plugin-sui";
6566
import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
@@ -566,6 +567,9 @@ export async function createAgent(
566567
!getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
567568
? solanaPlugin
568569
: null,
570+
getSecret(character, "SOLANA_PRIVATE_KEY")
571+
? solanaAgentkitPlguin
572+
: null,
569573
(getSecret(character, "NEAR_ADDRESS") ||
570574
getSecret(character, "NEAR_WALLET_PUBLIC_KEY")) &&
571575
getSecret(character, "NEAR_WALLET_SECRET_KEY")

‎docker-compose.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ services:
2525
- TWITTER_USERNAME=
2626
- TWITTER_PASSWORD=
2727
- TWITTER_EMAIL=
28-
- X_SERVER_URL=https://api.red-pill.ai/v1
2928
- BIRDEYE_API_KEY=
3029
- SOL_ADDRESS=So11111111111111111111111111111111111111112
3130
- SLIPPAGE=1
32-
- RPC_URL=https://api.mainnet-beta.solana.com
31+
- SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
3332
- HELIUS_API_KEY=
3433
- SERVER_PORT=3000
3534
- WALLET_SECRET_SALT=secret_salt

‎docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/README_CN.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ TWITTER_USERNAME= # Account username
9595
TWITTER_PASSWORD= # Account password
9696
TWITTER_EMAIL= # Account email
9797
98-
X_SERVER_URL=
9998
XAI_API_KEY=
10099
XAI_MODEL=
101100
@@ -118,7 +117,7 @@ BIRDEYE_API_KEY=
118117
119118
SOL_ADDRESS=So11111111111111111111111111111111111111112
120119
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
120+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122121
HELIUS_API_KEY=
123122
124123

‎docs/README_DE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ BIRDEYE_API_KEY=
114114
115115
SOL_ADDRESS=So11111111111111111111111111111111111111112
116116
SLIPPAGE=1
117-
RPC_URL=https://api.mainnet-beta.solana.com
117+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
118118
HELIUS_API_KEY=
119119
120120
## Telegram

‎docs/README_ES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/README_FR.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/README_TH.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ BIRDEYE_API_KEY=
114114
115115
SOL_ADDRESS=So11111111111111111111111111111111111111112
116116
SLIPPAGE=1
117-
RPC_URL=https://api.mainnet-beta.solana.com
117+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
118118
HELIUS_API_KEY=
119119
120120

‎docs/api/functions/composeContext.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ The parameters for composing the context.
2222

2323
The state object containing values to replace the placeholders in the template.
2424

25-
• **params.template**: `string`
25+
• **params.template**: `string` | `Function`
2626

27-
The template string containing placeholders to be replaced with state values.
27+
The template string or function returning a string containing placeholders to be replaced with state values.
2828

2929
• **params.templatingEngine?**: `"handlebars"`
3030

0 commit comments

Comments
 (0)