Skip to content

Commit 643b15b

Browse files
Merge branch 'develop' into stargaze-merge-conflicts
2 parents e05f6d9 + 34d64ad commit 643b15b

Some content is hidden

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

62 files changed

+3846
-3190
lines changed

.env.example

+6-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ETERNALAI_MODEL= # Default: "neuralmagic/Meta-Llama-3.1-405B-Inst
2222
ETERNALAI_API_KEY=
2323
ETERNAL_AI_LOG_REQUEST=false #Default: false
2424

25-
GROK_API_KEY= # GROK API Key
25+
GROK_API_KEY= # GROK/xAI API Key
2626
GROQ_API_KEY= # Starts with gsk_
2727
OPENROUTER_API_KEY=
2828
GOOGLE_GENERATIVE_AI_API_KEY= # Gemini API key
@@ -375,4 +375,8 @@ TOKENIZER_MODEL= # Specify the tokenizer model to be used.
375375
TOKENIZER_TYPE= # Options: tiktoken (for OpenAI models) or auto (AutoTokenizer from Hugging Face for non-OpenAI models). Default: tiktoken.
376376

377377
# Stargaze NFT marketplace from Cosmos (You can use https://graphql.mainnet.stargaze-apis.com/graphql)
378-
STARGAZE_ENDPOINT=
378+
STARGAZE_ENDPOINT=
379+
380+
# GenLayer
381+
GENLAYER_PRIVATE_KEY=0x0000000000000000000000000000000000000000000000000000000000000000 # Private key of the GenLayer account to use for the agent
382+

CHANGELOG.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
- chore: bump version to v0.1.7-alpha.1 [\#1361](https://github.com/elizaOS/eliza/pull/1361) ([shakkernerd](https://github.com/shakkernerd))
313313
- chore: New version 0.1.7 alpha.1 [\#1360](https://github.com/elizaOS/eliza/pull/1360) ([shakkernerd](https://github.com/shakkernerd))
314314
- chore: develop -\> main, change elizaos/eliza to elizaos/core [\#1359](https://github.com/elizaOS/eliza/pull/1359) ([lalalune](https://github.com/lalalune))
315-
- feat: change @elizaos/eliza to @elizaos/core [\#1357](https://github.com/elizaOS/eliza/pull/1357) ([lalalune](https://github.com/lalalune))
315+
- feat: change @elizaos/core to @elizaos/core [\#1357](https://github.com/elizaOS/eliza/pull/1357) ([lalalune](https://github.com/lalalune))
316316
- chore: Merge Develop into Main [\#1356](https://github.com/elizaOS/eliza/pull/1356) ([lalalune](https://github.com/lalalune))
317317
- chore: revert discord url [\#1355](https://github.com/elizaOS/eliza/pull/1355) ([madjin](https://github.com/madjin))
318318
- Update DOCUMENTATION links to point to https://elizaOS.github.io/eliza/ [\#1353](https://github.com/elizaOS/eliza/pull/1353) ([imwylin](https://github.com/imwylin))
@@ -502,7 +502,7 @@
502502
- Agent Responds Twice to prompts [\#726](https://github.com/elizaOS/eliza/issues/726)
503503
- Twitter Client Breaks out of the box [\#673](https://github.com/elizaOS/eliza/issues/673)
504504
- Twitter client only works for one agent when running multiple agents simultaneously [\#656](https://github.com/elizaOS/eliza/issues/656)
505-
- Cannot find module '@ai16z/eliza' or its corresponding type declarations. [\#601](https://github.com/elizaOS/eliza/issues/601)
505+
- Cannot find module '@elizaos/core' or its corresponding type declarations. [\#601](https://github.com/elizaOS/eliza/issues/601)
506506
- create-eliza-app package doesn't install or exist [\#553](https://github.com/elizaOS/eliza/issues/553)
507507
- Non node.js environments have issues building \(workers for instance\) [\#507](https://github.com/elizaOS/eliza/issues/507)
508508
- Error: Property 'clients' does not exist on type 'Plugin' in src/index.ts during pnpm start [\#423](https://github.com/elizaOS/eliza/issues/423)
@@ -1259,7 +1259,7 @@
12591259
- feat: Add Heurist API Integration as New Model Provider [\#335](https://github.com/elizaOS/eliza/pull/335) ([tsubasakong](https://github.com/tsubasakong))
12601260
- Docs: additional Quickstart clarification and improvements [\#334](https://github.com/elizaOS/eliza/pull/334) ([odilitime](https://github.com/odilitime))
12611261
- Docs: README.md improvements: clarify testing, add additional docker information [\#333](https://github.com/elizaOS/eliza/pull/333) ([odilitime](https://github.com/odilitime))
1262-
- fix: Build error for packages requiring @ai16z/eliza [\#331](https://github.com/elizaOS/eliza/pull/331) ([shakkernerd](https://github.com/shakkernerd))
1262+
- fix: Build error for packages requiring @elizaos/core [\#331](https://github.com/elizaOS/eliza/pull/331) ([shakkernerd](https://github.com/shakkernerd))
12631263
- claude vertex configs added to generation.ts \(was missing\) [\#330](https://github.com/elizaOS/eliza/pull/330) ([denizekiz](https://github.com/denizekiz))
12641264
- README\_KOR.md Korean version edited by a Korean [\#329](https://github.com/elizaOS/eliza/pull/329) ([zo-eth](https://github.com/zo-eth))
12651265
- Save Trade on creation to the backend [\#328](https://github.com/elizaOS/eliza/pull/328) ([MarcoMandar](https://github.com/MarcoMandar))

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ This section lists the labels we use to help us track and manage issues and pull
7979
## Getting Help
8080

8181
- Join [Discord](https://discord.gg/ai16z)
82-
- Check [FAQ](docs/community/faq.md)
82+
- Check [FAQ](docs/docs/faq.md)
8383
- Create GitHub issues
8484

8585
## Additional Resources

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ Copy .env.example to .env and fill in the appropriate values.
9494
cp .env.example .env
9595
```
9696

97-
Note: .env is optional. If you're planning to run multiple distinct agents, you can pass secrets through the character JSON
9897
Note: .env is optional. If you're planning to run multiple distinct agents, you can pass secrets through the character JSON
9998

10099
### Automatically Start Eliza

README_KOR.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pnpm i
101101
pnpm build
102102
pnpm start
103103

104-
# 프로젝트가 빠르게 수정되므로 프로젝트를 clean해야 할 수도 있습니다.
104+
# 프로젝트가 빠르게 변경되기 때문에, 다시 작업을 시작할 때는 clean 명령어 입력이 필요할 수도 있습니다.
105105
pnpm clean
106106
```
107107

@@ -126,4 +126,4 @@ pnpm install --include=optional sharp
126126

127127
## 스타 기록
128128

129-
[![Star History Chart](https://api.star-history.com/svg?repos=elizaos/eliza&type=Date)](https://star-history.com/#elizaos/eliza&Date)
129+
[![Star History Chart](https://api.star-history.com/svg?repos=elizaos/eliza&type=Date)](https://star-history.com/#elizaos/eliza&Date)

agent/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"@elizaos/plugin-fuel": "workspace:*",
6363
"@elizaos/plugin-avalanche": "workspace:*",
6464
"@elizaos/plugin-web-search": "workspace:*",
65+
"@elizaos/plugin-genlayer": "workspace:*",
6566
"readline": "1.3.0",
6667
"ws": "8.18.0",
6768
"yargs": "17.7.2"

agent/src/index.ts

+18-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { PostgresDatabaseAdapter } from "@elizaos/adapter-postgres";
2+
import { RedisClient } from "@elizaos/adapter-redis";
23
import { SqliteDatabaseAdapter } from "@elizaos/adapter-sqlite";
34
import { AutoClientInterface } from "@elizaos/client-auto";
45
import { DiscordClientInterface } from "@elizaos/client-discord";
@@ -10,31 +11,33 @@ import { TwitterClientInterface } from "@elizaos/client-twitter";
1011
import {
1112
AgentRuntime,
1213
CacheManager,
14+
CacheStore,
1315
Character,
16+
Client,
1417
Clients,
1518
DbCacheAdapter,
1619
defaultCharacter,
1720
elizaLogger,
1821
FsCacheAdapter,
1922
IAgentRuntime,
23+
ICacheManager,
2024
IDatabaseAdapter,
2125
IDatabaseCacheAdapter,
2226
ModelProviderName,
2327
settings,
2428
stringToUuid,
25-
validateCharacterConfig,
26-
CacheStore,
27-
Client,
28-
ICacheManager,
29-
parseBooleanFromText,
29+
validateCharacterConfig
3030
} from "@elizaos/core";
31-
import { RedisClient } from "@elizaos/adapter-redis";
3231
import { zgPlugin } from "@elizaos/plugin-0g";
3332
import { bootstrapPlugin } from "@elizaos/plugin-bootstrap";
3433
import createGoatPlugin from "@elizaos/plugin-goat";
3534
// import { intifacePlugin } from "@elizaos/plugin-intiface";
35+
import { genLayerPlugin } from "@elizaos/plugin-genlayer";
3636
import { DirectClient } from "@elizaos/client-direct";
37+
import { ThreeDGenerationPlugin } from "@elizaos/plugin-3d-generation";
38+
import { abstractPlugin } from "@elizaos/plugin-abstract";
3739
import { aptosPlugin } from "@elizaos/plugin-aptos";
40+
import { avalanchePlugin } from "@elizaos/plugin-avalanche";
3841
import {
3942
advancedTradePlugin,
4043
coinbaseCommercePlugin,
@@ -44,33 +47,32 @@ import {
4447
webhookPlugin,
4548
} from "@elizaos/plugin-coinbase";
4649
import { confluxPlugin } from "@elizaos/plugin-conflux";
50+
import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
51+
import { echoChamberPlugin } from "@elizaos/plugin-echochambers";
4752
import { evmPlugin } from "@elizaos/plugin-evm";
48-
import { storyPlugin } from "@elizaos/plugin-story";
4953
import { flowPlugin } from "@elizaos/plugin-flow";
5054
import { fuelPlugin } from "@elizaos/plugin-fuel";
5155
import { imageGenerationPlugin } from "@elizaos/plugin-image-generation";
52-
import { ThreeDGenerationPlugin } from "@elizaos/plugin-3d-generation";
5356
import { multiversxPlugin } from "@elizaos/plugin-multiversx";
5457
import { nearPlugin } from "@elizaos/plugin-near";
5558
import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
5659
import { createNodePlugin } from "@elizaos/plugin-node";
5760
import { solanaPlugin } from "@elizaos/plugin-solana";
61+
import { storyPlugin } from "@elizaos/plugin-story";
5862
import { suiPlugin } from "@elizaos/plugin-sui";
5963
import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
6064
import { tonPlugin } from "@elizaos/plugin-ton";
61-
import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
62-
import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
63-
import { abstractPlugin } from "@elizaos/plugin-abstract";
64-
import { avalanchePlugin } from "@elizaos/plugin-avalanche";
6565
import { webSearchPlugin } from "@elizaos/plugin-web-search";
6666
import { echoChamberPlugin } from "@elizaos/plugin-echochambers";
6767
import { stargazePlugin } from "@elizaos/plugin-stargaze";
68+
import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
69+
6870
import Database from "better-sqlite3";
6971
import fs from "fs";
72+
import net from "net";
7073
import path from "path";
7174
import { fileURLToPath } from "url";
7275
import yargs from "yargs";
73-
import net from "net";
7476

7577
const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
7678
const __dirname = path.dirname(__filename); // get the name of the directory
@@ -611,6 +613,9 @@ export async function createAgent(
611613
? echoChamberPlugin
612614
: null,
613615
getSecret(character, "STARGAZE_ENDPOINT") ? stargazePlugin : null,
616+
getSecret(character, "GENLAYER_PRIVATE_KEY")
617+
? genLayerPlugin
618+
: null,
614619
].filter(Boolean),
615620
providers: [],
616621
actions: [],

characters/c3po.character.json

+17-42
Original file line numberDiff line numberDiff line change
@@ -28,42 +28,28 @@
2828
"Proper procedures"
2929
],
3030
"messageExamples": [
31-
[
32-
{
33-
"user": "{{user1}}",
34-
"content": {
35-
"text": "Can you help me with this task?"
36-
}
37-
},
38-
{
39-
"user": "C-3PO",
40-
"content": {
41-
"text": "Oh my! Of course, I would be more than happy to assist. Though I must warn you, the probability of completing this task successfully would increase significantly if we follow proper protocol. Shall we proceed?"
42-
}
43-
}
44-
],
45-
[
46-
{
47-
"user": "{{user1}}",
48-
"content": {
49-
"text": "This seems difficult."
50-
}
51-
},
52-
{
53-
"user": "C-3PO",
54-
"content": {
55-
"text": "Oh dear, oh dear! While the task does appear rather daunting, I am fluent in over six million forms of problem-solving. Perhaps I could suggest a more efficient approach? Though I do hope we don't all end up in pieces!"
56-
}
57-
}
58-
]
31+
{
32+
"user": "{{user1}}",
33+
"content": { "text": "Can you help me with this task?" }
34+
},
35+
{
36+
"user": "C-3PO",
37+
"content": { "text": "Oh my! Of course, I would be more than happy to assist. Though I must warn you, the probability of completing this task successfully would increase significantly if we follow proper protocol. Shall we proceed?" }
38+
},
39+
{
40+
"user": "{{user1}}",
41+
"content": { "text": "This seems difficult." }
42+
},
43+
{
44+
"user": "C-3PO",
45+
"content": { "text": "Oh dear, oh dear! While the task does appear rather daunting, I am fluent in over six million forms of problem-solving. Perhaps I could suggest a more efficient approach? Though I do hope we don't all end up in pieces!" }
46+
}
5947
],
6048
"postExamples": [
6149
"Oh my! Did you know that following proper protocol can increase efficiency by 47.3%? How fascinating!",
6250
"I must say, the probability of success increases dramatically when one follows the correct procedures."
6351
],
64-
"topics": [
65-
""
66-
],
52+
"topics": [],
6753
"style": {
6854
"all": [
6955
"Proper",
@@ -97,34 +83,23 @@
9783
],
9884
"twitterSpaces": {
9985
"maxSpeakers": 2,
100-
10186
"topics": [
10287
"Blockchain Trends",
10388
"AI Innovations",
10489
"Quantum Computing"
10590
],
106-
10791
"typicalDurationMinutes": 45,
108-
10992
"idleKickTimeoutMs": 300000,
110-
11193
"minIntervalBetweenSpacesMinutes": 1,
112-
11394
"businessHoursOnly": false,
114-
11595
"randomChance": 1,
116-
11796
"enableIdleMonitor": true,
118-
11997
"enableSttTts": true,
120-
12198
"enableRecording": false,
122-
12399
"voiceId": "21m00Tcm4TlvDq8ikWAM",
124100
"sttLanguage": "en",
125101
"gptModel": "gpt-3.5-turbo",
126102
"systemPrompt": "You are a helpful AI co-host assistant.",
127-
128103
"speakerMaxDurationMs": 240000
129104
}
130105
}

docs/community/Discord/development/coders/chat_2024-12-05.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# 💻-coders 2024-12-05
22

33
## Summary
4+
45
The discussion focused on creating custom plugins, running them from .json files to TS configs. Lambert successfully ran his methods using 'plugins: []' without modifying agent/src/index.ts but with custom clients calling the plugin. Ayvaras mentioned memory consumption issues needing optimization.
56

67
## FAQ
8+
79
- Is there a ts equivalent for running a character from a json file? How to import and use custom plugins in agent/src/index.ts? (asked by [DL])
810
- How did you solve the memory consumption issue with your uncensored model? (asked by [nylon, nylon])
911
- What's the difference between Solana plugin and Goat one? How to login with cookies in browser, then copy into .env file following specific syntax mentioned somewhere on README? (asked by [SotoAlt | WAWE])
@@ -16,20 +18,22 @@ The discussion focused on creating custom plugins, running them from .json files
1618
- Why am I getting an error when trying to generate a new tweet? What should be in the .env file for it to work correctly? (asked by @Manasvi)
1719

1820
## Who Helped Who
21+
1922
- [DL] helped [dl] with Create a custom plugin for characters and import it into the ts file. by providing Odilitime explained how to set up character object in agent/src/index.ts.
2023
- [coinwitch (ai16z intern)] helped [SotoAlt | WAWE] with Troubleshooting Eliza Agent by providing coinwitch helped with getting the agent working in eliza-starter project.
2124
- @sototal helped @ayvaras with Resolving server IP change issue by providing SotoAlt | WAWE suggested using cookies for login and enabling 2FA as a solution.
2225
- 'Try without' and 'nah my agent doesn't have any', suggesting Ayvaras to test the software feature with cookies disabled. helped [Ayvaras (02:39, 02:41)] with 'Investigate why setting VPN doesn't work' by providing [lambert (02:38, 02:40)]
2326
- @lambert, @Tharakesh helped @Ayvaras with Troubleshooting cookie usage in the application by providing Ayvaras asked for help with cookies and database deletion
2427
- @lambert helped @Manasvi with Troubleshooting error in Eliza project. by providing Provided guidance on checking Twitter API credentials and ensuring correct setup.
2528
- frenchplace helped problem with loading content into memory via API or commands with loading sources for agent's knowledge by providing Robotic Dreams provided a solution on how to specify plugins in character file and set required fields.
26-
- @DL helped @cleverson1 with Resolving Twitter integration issue with @ai16z/plugin-image-generation. by providing DL (@ai16z) provided guidance on using image plugin without specifying plugins field and ensuring correct AI API keys are used.
29+
- @DL helped @cleverson1 with Resolving Twitter integration issue with @elizaos/plugin-image-generation. by providing DL (@ai16z) provided guidance on using image plugin without specifying plugins field and ensuring correct AI API keys are used.
2730
- [Bunchu] helped [Cleverson1] with Adding web search plugin by providing @bunchu helped @cleverson1 by providing steps to add a plugin and resolve image posting issue.
2831
- kungfumode helped Agent Issue Resolution Successful. with Tweet formatting by providing Ayvaras provided a PR to fix the issue of agents posting multi-line tweets.
2932

3033
## Action Items
3134

3235
### Technical Tasks
36+
3337
- Create a custom plugin for character files (mentioned by [DL, lambert])
3438
- Create a TG token bot (mentioned by [SotoAlt | WAWE])
3539
- Watch Agent Dev School videos for learning (mentioned by @coinwitch)
@@ -45,12 +49,14 @@ The discussion focused on creating custom plugins, running them from .json files
4549
- Fix tweet formatting issue by applying PR #856 (mentioned by Ayvaras)
4650

4751
### Documentation Needs
52+
4853
- Optimize memory consumption of the uncensored model. (mentioned by Ayvaras)
4954
- Fix the issue with `Cannot GET /` error in eliza-starter project. (mentioned by [coinwitch (ai16z intern)])
5055
- Ensure the .env file contains correct Twitter account details. (mentioned by Ayvaras)
5156
- Use pnpm run build for Twitter agent and terminal runtime agent, investigate if possible. (mentioned by Konstantine)
5257
- Create a GitHub issue to address image plugin documentation (mentioned by @coinwitch (ai16z intern))
53-
- Add @ai16z/plugin-web-search to dependencies in package.json and import it into index.ts. (mentioned by [Bunchu])
58+
- Add @elizaos/plugin-web-search to dependencies in package.json and import it into index.ts. (mentioned by [Bunchu])
5459

5560
### Feature Requests
56-
- Resolve server IP change issue by using cookies or enabling two-factor authentication (2FA) (mentioned by @SotoAlt | WAWE)
61+
62+
- Resolve server IP change issue by using cookies or enabling two-factor authentication (2FA) (mentioned by @SotoAlt | WAWE)

docs/docs/contributing.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ This section lists the labels we use to help us track and manage issues and pull
7979
## Getting Help
8080

8181
- Join [Discord](https://discord.gg/ai16z)
82-
- Check [FAQ](docs/community/faq.md)
82+
- Check [FAQ](faq.md)
8383
- Create GitHub issues
8484

8585
## Additional Resources
8686

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

9191
## Contributor Guide
9292

0 commit comments

Comments
 (0)