Skip to content

Commit 483fbe6

Browse files
authored
Merge branch 'develop' into fix/jsdoc-automation
2 parents dc9c5e0 + cd61663 commit 483fbe6

File tree

327 files changed

+25481
-6710
lines changed

Some content is hidden

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

327 files changed

+25481
-6710
lines changed

.env.example

+34-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
CACHE_STORE=database # Defaults to database. Other available cache store: redis and filesystem
33
REDIS_URL= # Redis URL - could be a local redis instance or cloud hosted redis. Also support rediss:// urls
44

5+
PGLITE_DATA_DIR= #../pgLite/ if selecting a directory --- or memory:// if selecting in memory
6+
57
# Discord Configuration
68
DISCORD_APPLICATION_ID=
79
DISCORD_API_TOKEN= # Bot token
@@ -19,8 +21,9 @@ IMAGE_OPENAI_MODEL= # Default: dall-e-3
1921
# Eternal AI's Decentralized Inference API
2022
ETERNALAI_URL=
2123
ETERNALAI_MODEL= # Default: "neuralmagic/Meta-Llama-3.1-405B-Instruct-quantized.w4a16"
24+
ETERNALAI_CHAIN_ID=45762 #Default: "45762"
2225
ETERNALAI_API_KEY=
23-
ETERNAL_AI_LOG_REQUEST=false #Default: false
26+
ETERNALAI_LOG=false #Default: false
2427

2528
GROK_API_KEY= # GROK/xAI API Key
2629
GROQ_API_KEY= # Starts with gsk_
@@ -85,7 +88,6 @@ TWITTER_TARGET_USERS= # Comma separated list of Twitter user names to
8588
TWITTER_RETRY_LIMIT= # Maximum retry attempts for Twitter login
8689
TWITTER_SPACES_ENABLE=false # Enable or disable Twitter Spaces logic
8790

88-
X_SERVER_URL=
8991
XAI_API_KEY=
9092
XAI_MODEL=
9193

@@ -97,6 +99,8 @@ POST_IMMEDIATELY=
9799
# Twitter action processing configuration
98100
ACTION_INTERVAL= # Interval in minutes between action processing runs (default: 5 minutes)
99101
ENABLE_ACTION_PROCESSING=false # Set to true to enable the action processing loop
102+
MAX_ACTIONS_PROCESSING=1 # Maximum number of actions (e.g., retweets, likes) to process in a single cycle. Helps prevent excessive or uncontrolled actions.
103+
ACTION_TIMELINE_TYPE=foryou # Type of timeline to interact with. Options: "foryou" or "following". Default: "foryou"
100104

101105
# Feature Flags
102106
IMAGE_GEN= # Set to TRUE to enable image generation
@@ -195,6 +199,9 @@ EVM_PROVIDER_URL=
195199
AVALANCHE_PRIVATE_KEY=
196200
AVALANCHE_PUBLIC_KEY=
197201

202+
# Arthera
203+
ARTHERA_PRIVATE_KEY=
204+
198205
# Solana
199206
SOLANA_PRIVATE_KEY=
200207
SOLANA_PUBLIC_KEY=
@@ -213,7 +220,7 @@ BIRDEYE_API_KEY=
213220
SOL_ADDRESS=So11111111111111111111111111111111111111112
214221
SLIPPAGE=1
215222
BASE_MINT=So11111111111111111111111111111111111111112
216-
RPC_URL=https://api.mainnet-beta.solana.com
223+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
217224
HELIUS_API_KEY=
218225

219226
# Telegram Configuration
@@ -261,6 +268,9 @@ CHARITY_ADDRESS_ETH=0x750EF1D7a0b4Ab1c97B7A623D7917CcEb5ea779C
261268
CHARITY_ADDRESS_ARB=0x1234567890123456789012345678901234567890
262269
CHARITY_ADDRESS_POL=0x1234567890123456789012345678901234567890
263270

271+
# thirdweb
272+
THIRDWEB_SECRET_KEY= # Create key on thirdweb developer dashboard: https://thirdweb.com/
273+
264274
# Conflux Configuration
265275
CONFLUX_CORE_PRIVATE_KEY=
266276
CONFLUX_CORE_SPACE_RPC_URL=
@@ -293,6 +303,10 @@ MEDIUM_VENICE_MODEL= # Default: llama-3.3-70b
293303
LARGE_VENICE_MODEL= # Default: llama-3.1-405b
294304
IMAGE_VENICE_MODEL= # Default: fluently-xl
295305

306+
# Coin Price Configuration
307+
COINMARKETCAP_API_KEY=
308+
COINGECKO_API_KEY=
309+
296310
# Akash Chat API Configuration docs: https://chatapi.akash.network/documentation
297311
AKASH_CHAT_API_KEY= # Get from https://chatapi.akash.network/
298312
SMALL_AKASH_CHAT_API_MODEL= # Default: Meta-Llama-3-2-3B-Instruct
@@ -344,7 +358,7 @@ NEAR_WALLET_SECRET_KEY=
344358
NEAR_WALLET_PUBLIC_KEY=
345359
NEAR_ADDRESS=
346360
SLIPPAGE=1
347-
RPC_URL=https://rpc.testnet.near.org
361+
NEAR_RPC_URL=https://rpc.testnet.near.org
348362
NEAR_NETWORK=testnet # or mainnet
349363

350364
# ZKsync Era Configuration
@@ -385,6 +399,9 @@ STORY_API_BASE_URL= # Story API base URL
385399
STORY_API_KEY= # Story API key
386400
PINATA_JWT= # Pinata JWT for uploading files to IPFS
387401

402+
# Cosmos
403+
COSMOS_RECOVERY_PHRASE= # 12 words recovery phrase (need to be in quotes, because of spaces)
404+
COSMOS_AVAILABLE_CHAINS= # mantrachaintestnet2,cosmos # Array of chains
388405
# Cronos zkEVM
389406
CRONOSZKEVM_ADDRESS=
390407
CRONOSZKEVM_PRIVATE_KEY=
@@ -396,9 +413,21 @@ FUEL_WALLET_PRIVATE_KEY=
396413
TOKENIZER_MODEL= # Specify the tokenizer model to be used.
397414
TOKENIZER_TYPE= # Options: tiktoken (for OpenAI models) or auto (AutoTokenizer from Hugging Face for non-OpenAI models). Default: tiktoken.
398415

416+
417+
# Spheron
418+
SPHERON_PRIVATE_KEY=
419+
SPHERON_PROVIDER_PROXY_URL=
420+
SPHERON_WALLET_ADDRESS=
421+
399422
# Stargaze NFT marketplace from Cosmos (You can use https://graphql.mainnet.stargaze-apis.com/graphql)
400423
STARGAZE_ENDPOINT=
401424

402425
# GenLayer
403-
GENLAYER_PRIVATE_KEY=0x0000000000000000000000000000000000000000000000000000000000000000 # Private key of the GenLayer account to use for the agent
426+
GENLAYER_PRIVATE_KEY= # Private key of the GenLayer account to use for the agent in this format (0x0000000000000000000000000000000000000000000000000000000000000000)
427+
428+
# OpenWeather
429+
OPEN_WEATHER_API_KEY= # OpenWeather API key
404430

431+
# Allora
432+
ALLORA_API_KEY= # Allora API key, format: UP-f8db7d6558ab432ca0d92716
433+
ALLORA_CHAIN_SLUG= # must be one of mainnet, testnet. If not specified, it will use testnet by default

.github/workflows/integrationTests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717

1818
- uses: pnpm/action-setup@v3
1919
with:
20-
version: 9.4.0
20+
version: 9.15.0
2121

2222
- uses: actions/setup-node@v4
2323
with:
24-
node-version: "23"
24+
node-version: "23.3.0"
2525
cache: "pnpm"
2626

2727
- name: Clean up

.github/workflows/smoke-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515

1616
- uses: pnpm/action-setup@v3
1717
with:
18-
version: 9.4.0
18+
version: 9.15.0
1919

2020
- uses: actions/setup-node@v4
2121
with:
22-
node-version: "23"
22+
node-version: "23.3.0"
2323
cache: "pnpm"
2424

2525
- name: Run smoke tests

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ packages/plugin-buttplug/intiface-engine
1515
dist/
1616
# Allow models directory but ignore model files
1717
models/*.gguf
18+
pgLite/
1819

1920
cookies.json
2021

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@
11681168
- Abstract transcript provider [\#73](https://github.com/elizaOS/eliza/issues/73)
11691169
- 🤖 Confidence Level Implementation [\#50](https://github.com/elizaOS/eliza/issues/50)
11701170
- 📈 Trading Assistant Implementation [\#48](https://github.com/elizaOS/eliza/issues/48)
1171-
- swap Dao action initital [\#196](https://github.com/elizaOS/eliza/pull/196) ([MarcoMandar](https://github.com/MarcoMandar))
1171+
- swap Dao action initial [\#196](https://github.com/elizaOS/eliza/pull/196) ([MarcoMandar](https://github.com/MarcoMandar))
11721172

11731173
**Fixed bugs:**
11741174

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
## 🌍 README Translations
1414

15-
[中文说明](./README_CN.md) | [日本語の説明](./README_JA.md) | [한국어 설명](./README_KOR.md) | [Français](./README_FR.md) | [Português](./README_PTBR.md) | [Türkçe](./README_TR.md) | [Русский](./README_RU.md) | [Español](./README_ES.md) | [Italiano](./README_IT.md) | [ไทย](./README_TH.md) | [Deutsch](./README_DE.md) | [Tiếng Việt](./README_VI.md) | [עִברִית](https://github.com/elizaos/Elisa/blob/main/README_HE.md) | [Tagalog](./README_TG.md) | [Polski](./README_PL.md) | [Arabic](./README_AR.md) | [Hungarian](./README_HU.md) | [Srpski](./README_RS.md) | [Română](./README_RO.md)
15+
[中文说明](./README_CN.md) | [日本語の説明](./README_JA.md) | [한국어 설명](./README_KOR.md) | [Français](./README_FR.md) | [Português](./README_PTBR.md) | [Türkçe](./README_TR.md) | [Русский](./README_RU.md) | [Español](./README_ES.md) | [Italiano](./README_IT.md) | [ไทย](./README_TH.md) | [Deutsch](./README_DE.md) | [Tiếng Việt](./README_VI.md) | [עִברִית](https://github.com/elizaos/Elisa/blob/main/README_HE.md) | [Tagalog](./README_TG.md) | [Polski](./README_PL.md) | [Arabic](./README_AR.md) | [Hungarian](./README_HU.md) | [Srpski](./README_RS.md) | [Română](./README_RO.md) | [Nederlands](./README_NL.md)
1616

1717
## 🚩 Overview
1818

1919
<div align="center">
20-
<img src="./docs/static/img/eliza_diagram.jpg" alt="Eliza Diagram" width="100%" />
20+
<img src="./docs/static/img/eliza_diagram.png" alt="Eliza Diagram" width="100%" />
2121
</div>
2222

2323
## ✨ Features

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

0 commit comments

Comments
 (0)