Skip to content

Commit ee5c869

Browse files
authored
Merge branch 'develop' into 1213-fix-chat-stuck-loop-bug
2 parents 8e8686d + ae56659 commit ee5c869

File tree

163 files changed

+11709
-3402
lines changed

Some content is hidden

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

163 files changed

+11709
-3402
lines changed

.devcontainer/Dockerfile

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
ARG NODE_VER=23.5.0
2+
ARG BASE_IMAGE=node:${NODE_VER}
3+
FROM $BASE_IMAGE
4+
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
7+
# Install pnpm globally and install necessary build tools
8+
RUN apt-get update \
9+
&& apt-get install -y \
10+
git \
11+
python3 \
12+
make \
13+
g++ \
14+
nano \
15+
vim \
16+
&& apt-get clean \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
ARG PNPM_VER=9.15.2
20+
RUN npm install -g pnpm@${PNPM_VER}
21+
22+
# Set Python 3 as the default python
23+
RUN ln -s /usr/bin/python3 /usr/bin/python
24+
ENV DEBIAN_FRONTEND=dialog

.devcontainer/devcontainer.json

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
2+
{
3+
"name": "elizaos-dev",
4+
"dockerFile": "Dockerfile",
5+
"build": {
6+
"args": {
7+
"NODE_VER": "23.5.0",
8+
"PNPM_VER": "9.15.2"
9+
}
10+
},
11+
"privileged": true,
12+
"runArgs": [
13+
"-p=3000:3000", // Add port for server api
14+
"-p=5173:5173", // Add port for client
15+
//"--volume=/usr/lib/wsl:/usr/lib/wsl", // uncomment for WSL
16+
//"--volume=/mnt/wslg:/mnt/wslg", // uncomment for WSL
17+
"--gpus=all", // ! uncomment for vGPU
18+
//"--device=/dev/dxg", // uncomment this for vGPU under WSL
19+
"--device=/dev/dri"
20+
],
21+
"containerEnv": {
22+
//"MESA_D3D12_DEFAULT_ADAPTER_NAME": "NVIDIA", // uncomment for WSL
23+
//"LD_LIBRARY_PATH": "/usr/lib/wsl/lib" // uncomment for WSL
24+
},
25+
"customizations": {
26+
"vscode": {
27+
"extensions": [
28+
"vscode.json-language-features",
29+
"vscode.css-language-features",
30+
// "foxundermoon.shell-format",
31+
// "dbaeumer.vscode-eslint",
32+
// "esbenp.prettier-vscode"
33+
"ms-python.python"
34+
]
35+
}
36+
},
37+
"features": {}
38+
}

.env.example

+8-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

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

101103
# Feature Flags
102104
IMAGE_GEN= # Set to TRUE to enable image generation
@@ -213,7 +215,7 @@ BIRDEYE_API_KEY=
213215
SOL_ADDRESS=So11111111111111111111111111111111111111112
214216
SLIPPAGE=1
215217
BASE_MINT=So11111111111111111111111111111111111111112
216-
RPC_URL=https://api.mainnet-beta.solana.com
218+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
217219
HELIUS_API_KEY=
218220

219221
# Telegram Configuration
@@ -344,7 +346,7 @@ NEAR_WALLET_SECRET_KEY=
344346
NEAR_WALLET_PUBLIC_KEY=
345347
NEAR_ADDRESS=
346348
SLIPPAGE=1
347-
RPC_URL=https://rpc.testnet.near.org
349+
NEAR_RPC_URL=https://rpc.testnet.near.org
348350
NEAR_NETWORK=testnet # or mainnet
349351

350352
# ZKsync Era Configuration
@@ -402,3 +404,5 @@ STARGAZE_ENDPOINT=
402404
# GenLayer
403405
GENLAYER_PRIVATE_KEY=0x0000000000000000000000000000000000000000000000000000000000000000 # Private key of the GenLayer account to use for the agent
404406

407+
# OpenWeather
408+
OPEN_WEATHER_API_KEY= # OpenWeather API key

.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
@@ -50,6 +50,7 @@ tsup.config.bundled_*.mjs
5050

5151
.turbo
5252
.cursorrules
53+
.pnpm-store
5354

5455
coverage
5556
.eslintcache

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

0 commit comments

Comments
 (0)