Skip to content

Commit 85fefc2

Browse files
authored
Merge branch 'develop' into main
2 parents e193644 + c0d3f8d commit 85fefc2

File tree

228 files changed

+10802
-713
lines changed

Some content is hidden

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

228 files changed

+10802
-713
lines changed

.env.example

+11-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ REMOTE_CHARACTER_URLS=
2525
USE_CHARACTER_STORAGE=false
2626

2727
# Logging
28-
DEFAULT_LOG_LEVEL=warn
28+
DEFAULT_LOG_LEVEL=info
2929
LOG_JSON_FORMAT=false # Print everything in logger as json; false by default
3030

3131
###############################
@@ -75,6 +75,7 @@ TWITTER_SEARCH_ENABLE=FALSE # Enable timeline search, WARNING this greatly incre
7575
TWITTER_TARGET_USERS= # Comma separated list of Twitter user names to interact with
7676
TWITTER_RETRY_LIMIT= # Maximum retry attempts for Twitter login
7777
TWITTER_SPACES_ENABLE=false # Enable or disable Twitter Spaces logic
78+
ENABLE_TWITTER_POST_GENERATION=true # Set to true to enable automatic tweet generation. If false, the bot will not generate or post tweets.
7879
# Post Interval Settings (in minutes)
7980
POST_INTERVAL_MIN= # Default: 90
8081
POST_INTERVAL_MAX= # Default: 180
@@ -570,6 +571,10 @@ TEE_MARLIN_ATTESTATION_ENDPOINT= # Optional, default "http://127.0.0.1:1350"
570571
TON_PRIVATE_KEY= # Ton Mnemonic Seed Phrase Join With Empty String
571572
TON_RPC_URL= # ton rpc
572573
TON_RPC_API_KEY= # ton rpc api key
574+
TON_NFT_IMAGES_FOLDER= # Path to the folder containing the NFT images
575+
TON_NFT_METADATA_FOLDER= # Path to the folder containing the NFT metadata
576+
PINATA_API_KEY= # Pinata API key
577+
PINATA_API_SECRET= # Pinata API secret
573578

574579
# Sui
575580
SUI_PRIVATE_KEY= # Sui Mnemonic Seed Phrase (`sui keytool generate ed25519`) , Also support `suiprivatekeyxxxx` (sui keytool export --key-identity 0x63)
@@ -745,7 +750,8 @@ QUAI_PRIVATE_KEY=
745750
QUAI_RPC_URL=https://rpc.quai.network
746751

747752
# Chainbase
748-
CHAINBASE_API_KEY=demo # demo is a free tier key
753+
# demo is a free tier key
754+
CHAINBASE_API_KEY= # demo is a free tier key
749755

750756
# 0x
751757
ZERO_EX_API_KEY=
@@ -952,4 +958,7 @@ ARBITRAGE_EVM_PRIVATE_KEY= # Private key for the wallet executi
952958
FLASHBOTS_RELAY_SIGNING_KEY= # Signing key for Flashbots relay interactions
953959
BUNDLE_EXECUTOR_ADDRESS= # Address of the bundle executor contract
954960

961+
# DESK Exchange Plugin Configration
962+
DESK_EXCHANGE_PRIVATE_KEY= # Required for trading and cancelling orders
963+
DESK_EXCHANGE_NETWORK= # "mainnet" or "testnet
955964

.github/workflows/image.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- name: Checkout repository
2828
uses: actions/checkout@v4
29-
# Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
29+
# Uses the `docker/login-action` action to log in to the Container registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
3030
- name: Log in to the Container registry
3131
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
3232
with:

.github/workflows/pr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Check out the repository
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Validate PR title
1616
id: validate

.gitignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,10 @@ lit-config.json
9191

9292
# Configuration to exclude the extra and local_docs directories
9393
extra
94-
**/dist/**
94+
**/dist/**
95+
96+
ton_nft_metadata/
97+
ton_nft_metadata/*
98+
99+
ton_nft_images/
100+
ton_nft_images/*

Dockerfile

+24-24
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
FROM node:23.3.0-slim AS builder
33

44
# Install pnpm globally and necessary build tools
5-
RUN npm install -g pnpm@9.4.0 && \
5+
RUN npm install -g pnpm@9.15.4 && \
66
apt-get update && \
77
apt-get upgrade -y && \
88
apt-get install -y \
9-
git \
10-
python3 \
11-
python3-pip \
12-
curl \
13-
node-gyp \
14-
ffmpeg \
15-
libtool-bin \
16-
autoconf \
17-
automake \
18-
libopus-dev \
19-
make \
20-
g++ \
21-
build-essential \
22-
libcairo2-dev \
23-
libjpeg-dev \
24-
libpango1.0-dev \
25-
libgif-dev \
26-
openssl \
27-
libssl-dev && \
9+
git \
10+
python3 \
11+
python3-pip \
12+
curl \
13+
node-gyp \
14+
ffmpeg \
15+
libtool-bin \
16+
autoconf \
17+
automake \
18+
libopus-dev \
19+
make \
20+
g++ \
21+
build-essential \
22+
libcairo2-dev \
23+
libjpeg-dev \
24+
libpango1.0-dev \
25+
libgif-dev \
26+
openssl \
27+
libssl-dev && \
2828
apt-get clean && \
2929
rm -rf /var/lib/apt/lists/*
3030

@@ -47,12 +47,12 @@ RUN pnpm run build && pnpm prune --prod
4747
FROM node:23.3.0-slim
4848

4949
# Install runtime dependencies
50-
RUN npm install -g pnpm@9.4.0 && \
50+
RUN npm install -g pnpm@9.15.4 && \
5151
apt-get update && \
5252
apt-get install -y \
53-
git \
54-
python3 \
55-
ffmpeg && \
53+
git \
54+
python3 \
55+
ffmpeg && \
5656
apt-get clean && \
5757
rm -rf /var/lib/apt/lists/*
5858

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
## ✨ Features
2424

25-
- 🛠️ Full-featured Discord, Twitter and Telegram connectors
25+
- 🛠️ Full-featured Discord, X (Twitter) and Telegram connectors
2626
- 🔗 Support for every model (Llama, Grok, OpenAI, Anthropic, Gemini, etc.)
2727
- 👥 Multi-agent and room support
2828
- 📚 Easily ingest and interact with your documents

agent/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@
5555
"@elizaos/plugin-coinmarketcap": "workspace:*",
5656
"@elizaos/plugin-conflux": "workspace:*",
5757
"@elizaos/plugin-cosmos": "workspace:*",
58+
"@elizaos/plugin-desk-exchange": "workspace:*",
5859
"@elizaos/plugin-echochambers": "workspace:*",
5960
"@elizaos/plugin-evm": "workspace:*",
61+
"@elizaos/plugin-edwin": "workspace:*",
6062
"@elizaos/plugin-flow": "workspace:*",
6163
"@elizaos/plugin-gelato": "workspace:*",
6264
"@elizaos/plugin-giphy": "workspace:*",
@@ -66,9 +68,7 @@
6668
"@elizaos/plugin-icp": "workspace:*",
6769
"@elizaos/plugin-initia": "workspace:*",
6870
"@elizaos/plugin-image-generation": "workspace:*",
69-
"@elizaos/plugin-intiface": "workspace:*",
7071
"@elizaos/plugin-lens-network": "workspace:*",
71-
"@elizaos/plugin-letzai": "workspace:*",
7272
"@elizaos/plugin-lit": "workspace:*",
7373
"@elizaos/plugin-massa": "workspace:*",
7474
"@elizaos/plugin-mind-network": "workspace:*",

agent/src/index.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ import { coinmarketcapPlugin } from "@elizaos/plugin-coinmarketcap";
8484
import { confluxPlugin } from "@elizaos/plugin-conflux";
8585
import { createCosmosPlugin } from "@elizaos/plugin-cosmos";
8686
import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
87+
import { deskExchangePlugin } from "@elizaos/plugin-desk-exchange";
8788
import { evmPlugin } from "@elizaos/plugin-evm";
89+
import { edwinPlugin } from "@elizaos/plugin-edwin";
8890
import { flowPlugin } from "@elizaos/plugin-flow";
8991
import { fuelPlugin } from "@elizaos/plugin-fuel";
9092
import { genLayerPlugin } from "@elizaos/plugin-genlayer";
@@ -1067,6 +1069,10 @@ export async function createAgent(
10671069
getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
10681070
? evmPlugin
10691071
: null,
1072+
(getSecret(character, "EVM_PRIVATE_KEY") ||
1073+
getSecret(character, "SOLANA_PRIVATE_KEY"))
1074+
? edwinPlugin
1075+
: null,
10701076
(getSecret(character, "EVM_PUBLIC_KEY") ||
10711077
getSecret(character, "INJECTIVE_PUBLIC_KEY")) &&
10721078
getSecret(character, "INJECTIVE_PRIVATE_KEY")
@@ -1295,6 +1301,10 @@ export async function createAgent(
12951301
getSecret(character, "ARBITRAGE_BUNDLE_EXECUTOR_ADDRESS")
12961302
? arbitragePlugin
12971303
: null,
1304+
getSecret(character, "DESK_EXCHANGE_PRIVATE_KEY") ||
1305+
getSecret(character, "DESK_EXCHANGE_NETWORK")
1306+
? deskExchangePlugin
1307+
: null,
12981308
]
12991309
.flat()
13001310
.filter(Boolean),
@@ -1515,7 +1525,7 @@ const startAgents = async () => {
15151525
elizaLogger.log(`Server started on alternate port ${serverPort}`);
15161526
}
15171527

1518-
elizaLogger.log(
1528+
elizaLogger.info(
15191529
"Run `pnpm start:client` to start the client and visit the outputted URL (http://localhost:5173) to chat with your agents. When running multiple agents, use client with different port `SERVER_PORT=3001 pnpm start:client`"
15201530
);
15211531
};

0 commit comments

Comments
 (0)