Skip to content

Commit

Permalink
Merge branch 'develop' into stakesei
Browse files Browse the repository at this point in the history
  • Loading branch information
mj850 authored Feb 6, 2025
2 parents 4284b77 + 2dbf2cc commit 459f22b
Show file tree
Hide file tree
Showing 292 changed files with 13,677 additions and 8,846 deletions.
16 changes: 14 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ REMOTE_CHARACTER_URLS=
USE_CHARACTER_STORAGE=false

# Logging
DEFAULT_LOG_LEVEL=warn
DEFAULT_LOG_LEVEL=info
LOG_JSON_FORMAT=false # Print everything in logger as json; false by default

###############################
Expand Down Expand Up @@ -70,11 +70,18 @@ TWITTER_USERNAME= # Account username
TWITTER_PASSWORD= # Account password
TWITTER_EMAIL= # Account email
TWITTER_2FA_SECRET=

# Authentication cookies for Twitter session (this is for login using cookies and is optional)
TWITTER_COOKIES_AUTH_TOKEN=
TWITTER_COOKIES_CT0=
TWITTER_COOKIES_GUEST_ID=

TWITTER_POLL_INTERVAL=120 # How often (in seconds) the bot should check for interactions
TWITTER_SEARCH_ENABLE=FALSE # Enable timeline search, WARNING this greatly increases your chance of getting banned
TWITTER_TARGET_USERS= # Comma separated list of Twitter user names to interact with
TWITTER_RETRY_LIMIT= # Maximum retry attempts for Twitter login
TWITTER_SPACES_ENABLE=false # Enable or disable Twitter Spaces logic
ENABLE_TWITTER_POST_GENERATION=true # Set to true to enable automatic tweet generation. If false, the bot will not generate or post tweets.
# Post Interval Settings (in minutes)
POST_INTERVAL_MIN= # Default: 90
POST_INTERVAL_MAX= # Default: 180
Expand Down Expand Up @@ -570,6 +577,10 @@ TEE_MARLIN_ATTESTATION_ENDPOINT= # Optional, default "http://127.0.0.1:1350"
TON_PRIVATE_KEY= # Ton Mnemonic Seed Phrase Join With Empty String
TON_RPC_URL= # ton rpc
TON_RPC_API_KEY= # ton rpc api key
TON_NFT_IMAGES_FOLDER= # Path to the folder containing the NFT images
TON_NFT_METADATA_FOLDER= # Path to the folder containing the NFT metadata
PINATA_API_KEY= # Pinata API key
PINATA_API_SECRET= # Pinata API secret

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

# Chainbase
CHAINBASE_API_KEY=demo # demo is a free tier key
# demo is a free tier key
CHAINBASE_API_KEY= # demo is a free tier key

# 0x
ZERO_EX_API_KEY=
Expand Down
60 changes: 0 additions & 60 deletions .github/workflows/block-mini.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
# 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.
# 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.
- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Check out the repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Validate PR title
id: validate
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,10 @@ lit-config.json

# Configuration to exclude the extra and local_docs directories
extra
**/dist/**
**/dist/**

ton_nft_metadata/
ton_nft_metadata/*

ton_nft_images/
ton_nft_images/*
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ This section lists the labels we use to help us track and manage issues and pull

- Join [Discord](https://discord.gg/ai16z)
- Check [FAQ](docs/docs/faq.md)
- Create GitHub issues
- Create [GitHub issues](https://github.com/elizaOS/eliza/issues)

## Additional Resources

- [Local Development Guide](docs/guides/local-development.md)
- [Configuration Guide](docs/guides/configuration.md)
- [Local Development Guide](docs/docs/guides/local-development.md)
- [Configuration Guide](docs/docs/guides/configuration.md)
- [API Documentation](docs/api)

## Contributor Guide
Expand Down
48 changes: 24 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
FROM node:23.3.0-slim AS builder

# Install pnpm globally and necessary build tools
RUN npm install -g pnpm@9.4.0 && \
RUN npm install -g pnpm@9.15.4 && \
apt-get update && \
apt-get upgrade -y && \
apt-get install -y \
git \
python3 \
python3-pip \
curl \
node-gyp \
ffmpeg \
libtool-bin \
autoconf \
automake \
libopus-dev \
make \
g++ \
build-essential \
libcairo2-dev \
libjpeg-dev \
libpango1.0-dev \
libgif-dev \
openssl \
libssl-dev && \
git \
python3 \
python3-pip \
curl \
node-gyp \
ffmpeg \
libtool-bin \
autoconf \
automake \
libopus-dev \
make \
g++ \
build-essential \
libcairo2-dev \
libjpeg-dev \
libpango1.0-dev \
libgif-dev \
openssl \
libssl-dev libsecret-1-dev && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

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

# Install runtime dependencies
RUN npm install -g pnpm@9.4.0 && \
RUN npm install -g pnpm@9.15.4 && \
apt-get update && \
apt-get install -y \
git \
python3 \
ffmpeg && \
git \
python3 \
ffmpeg && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion agent/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elizaos/agent",
"version": "0.1.9",
"version": "0.25.6-alpha.1",
"main": "src/index.ts",
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion agent/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1525,7 +1525,7 @@ const startAgents = async () => {
elizaLogger.log(`Server started on alternate port ${serverPort}`);
}

elizaLogger.log(
elizaLogger.info(
"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`"
);
};
Expand Down
Loading

0 comments on commit 459f22b

Please sign in to comment.