Skip to content

Commit ef85bda

Browse files
mgacek-blockydevsmgacek-blockydevs
authored
Merge branch 'develop' into develop
2 parents 8ea5965 + ae56659 commit ef85bda

Some content is hidden

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

58 files changed

+4090
-1242
lines changed

‎.env.example

+4-3
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_
@@ -214,7 +215,7 @@ BIRDEYE_API_KEY=
214215
SOL_ADDRESS=So11111111111111111111111111111111111111112
215216
SLIPPAGE=1
216217
BASE_MINT=So11111111111111111111111111111111111111112
217-
RPC_URL=https://api.mainnet-beta.solana.com
218+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
218219
HELIUS_API_KEY=
219220

220221
# Telegram Configuration
@@ -345,7 +346,7 @@ NEAR_WALLET_SECRET_KEY=
345346
NEAR_WALLET_PUBLIC_KEY=
346347
NEAR_ADDRESS=
347348
SLIPPAGE=1
348-
RPC_URL=https://rpc.testnet.near.org
349+
NEAR_RPC_URL=https://rpc.testnet.near.org
349350
NEAR_NETWORK=testnet # or mainnet
350351

351352
# ZKsync Era Configuration

‎README_CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ BIRDEYE_API_KEY=
210210
211211
SOL_ADDRESS=So11111111111111111111111111111111111111112
212212
SLIPPAGE=1
213-
RPC_URL=https://api.mainnet-beta.solana.com
213+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
214214
HELIUS_API_KEY=
215215
216216

‎README_ES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ BIRDEYE_API_KEY=
120120
121121
SOL_ADDRESS=So11111111111111111111111111111111111111112
122122
SLIPPAGE=1
123-
RPC_URL=https://api.mainnet-beta.solana.com
123+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
124124
HELIUS_API_KEY=
125125
126126
## Telegram

‎README_JA.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ BIRDEYE_API_KEY=
119119
120120
SOL_ADDRESS=So11111111111111111111111111111111111111112
121121
SLIPPAGE=1
122-
RPC_URL=https://api.mainnet-beta.solana.com
122+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
123123
HELIUS_API_KEY=
124124
125125

‎README_PTBR.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ BIRDEYE_API_KEY=
121121
122122
SOL_ADDRESS=So11111111111111111111111111111111111111112
123123
SLIPPAGE=1
124-
RPC_URL=https://api.mainnet-beta.solana.com
124+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
125125
HELIUS_API_KEY=
126126
127127

‎README_RO.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ BIRDEYE_API_KEY=
121121
122122
SOL_ADDRESS=So11111111111111111111111111111111111111112
123123
SLIPPAGE=1
124-
RPC_URL=https://api.mainnet-beta.solana.com
124+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
125125
HELIUS_API_KEY=
126126
127127

‎README_RS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ BIRDEYE_API_KEY=
120120
121121
SOL_ADDRESS=So11111111111111111111111111111111111111112
122122
SLIPPAGE=1
123-
RPC_URL=https://api.mainnet-beta.solana.com
123+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
124124
HELIUS_API_KEY=
125125
126126
## Telegram

‎README_RU.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ BIRDEYE_API_KEY= # API-ключ для BirdEye
137137
138138
SOL_ADDRESS=So11111111111111111111111111111111111111112
139139
SLIPPAGE=1
140-
RPC_URL=https://api.mainnet-beta.solana.com
140+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
141141
HELIUS_API_KEY= # API-ключ Helius
142142
143143

‎agent/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"@elizaos/plugin-nft-generation": "workspace:*",
5252
"@elizaos/plugin-node": "workspace:*",
5353
"@elizaos/plugin-solana": "workspace:*",
54+
"@elizaos/plugin-solana-agentkit": "workspace:*",
5455
"@elizaos/plugin-starknet": "workspace:*",
5556
"@elizaos/plugin-stargaze": "workspace:*",
5657
"@elizaos/plugin-ton": "workspace:*",

‎agent/src/index.ts

+4
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import { nearPlugin } from "@elizaos/plugin-near";
6161
import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
6262
import { createNodePlugin } from "@elizaos/plugin-node";
6363
import { solanaPlugin } from "@elizaos/plugin-solana";
64+
import { solanaAgentkitPlguin } from "@elizaos/plugin-solana-agentkit";
6465
import { storyPlugin } from "@elizaos/plugin-story";
6566
import { suiPlugin } from "@elizaos/plugin-sui";
6667
import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
@@ -564,6 +565,9 @@ export async function createAgent(
564565
!getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
565566
? solanaPlugin
566567
: null,
568+
getSecret(character, "SOLANA_PRIVATE_KEY")
569+
? solanaAgentkitPlguin
570+
: null,
567571
(getSecret(character, "NEAR_ADDRESS") ||
568572
getSecret(character, "NEAR_WALLET_PUBLIC_KEY")) &&
569573
getSecret(character, "NEAR_WALLET_SECRET_KEY")

‎docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
- BIRDEYE_API_KEY=
2929
- SOL_ADDRESS=So11111111111111111111111111111111111111112
3030
- SLIPPAGE=1
31-
- RPC_URL=https://api.mainnet-beta.solana.com
31+
- SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
3232
- HELIUS_API_KEY=
3333
- SERVER_PORT=3000
3434
- WALLET_SECRET_SALT=secret_salt

‎docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/README_CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ BIRDEYE_API_KEY=
117117
118118
SOL_ADDRESS=So11111111111111111111111111111111111111112
119119
SLIPPAGE=1
120-
RPC_URL=https://api.mainnet-beta.solana.com
120+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
121121
HELIUS_API_KEY=
122122
123123

‎docs/README_DE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ BIRDEYE_API_KEY=
114114
115115
SOL_ADDRESS=So11111111111111111111111111111111111111112
116116
SLIPPAGE=1
117-
RPC_URL=https://api.mainnet-beta.solana.com
117+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
118118
HELIUS_API_KEY=
119119
120120
## Telegram

‎docs/README_ES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/README_FR.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/README_TH.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ BIRDEYE_API_KEY=
114114
115115
SOL_ADDRESS=So11111111111111111111111111111111111111112
116116
SLIPPAGE=1
117-
RPC_URL=https://api.mainnet-beta.solana.com
117+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
118118
HELIUS_API_KEY=
119119
120120

‎docs/api/functions/composeContext.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ The parameters for composing the context.
2222

2323
The state object containing values to replace the placeholders in the template.
2424

25-
• **params.template**: `string`
25+
• **params.template**: `string` | `Function`
2626

27-
The template string containing placeholders to be replaced with state values.
27+
The template string or function returning a string containing placeholders to be replaced with state values.
2828

2929
• **params.templatingEngine?**: `"handlebars"`
3030

‎docs/docs/advanced/eliza-in-tee.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ services:
272272
- BIRDEYE_API_KEY=$BIRDEYE_API_KEY
273273
- SOL_ADDRESS=So11111111111111111111111111111111111111112
274274
- SLIPPAGE=1
275-
- RPC_URL=https://api.mainnet-beta.solana.com
275+
- SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
276276
- HELIUS_API_KEY=$HELIUS_API_KEY
277277
- SERVER_PORT=3000
278278
- WALLET_SECRET_SALT=$WALLET_SECRET_SALT

‎docs/docs/api/_media/README_CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/docs/api/_media/README_FR.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/docs/api/_media/README_JA.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ BIRDEYE_API_KEY=
120120
121121
SOL_ADDRESS=So11111111111111111111111111111111111111112
122122
SLIPPAGE=1
123-
RPC_URL=https://api.mainnet-beta.solana.com
123+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
124124
HELIUS_API_KEY=
125125
126126

‎docs/docs/api/_media/README_KOR.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
118118
119119
SOL_ADDRESS=So11111111111111111111111111111111111111112
120120
SLIPPAGE=1
121-
RPC_URL=https://api.mainnet-beta.solana.com
121+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
122122
HELIUS_API_KEY=
123123
124124

‎docs/docs/api/functions/composeContext.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Composes a context string by replacing placeholders in a template with values fr
1010

1111
An object containing the following properties:
1212

13-
- **state**: `State`
13+
- **state**: `State`
1414
The state object containing key-value pairs for replacing placeholders in the template.
1515

16-
- **template**: `string`
17-
A string containing placeholders in the format `{{placeholder}}`.
16+
- **template**: `string | Function`
17+
A string or function returning a string containing placeholders in the format `{{placeholder}}`.
1818

1919
- **templatingEngine**: `"handlebars" | undefined` _(optional)_
2020
The templating engine to use. If set to `"handlebars"`, the Handlebars engine is used for template compilation. Defaults to `undefined` (simple string replacement).
@@ -51,7 +51,7 @@ const contextHandlebars = composeContext({
5151
```javascript
5252
const advancedTemplate = `
5353
{{#if userAge}}
54-
Hello, {{userName}}!
54+
Hello, {{userName}}!
5555
{{#if (gt userAge 18)}}You are an adult.{{else}}You are a minor.{{/if}}
5656
{{else}}
5757
Hello! We don't know your age.

‎docs/docs/api/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ BIRDEYE_API_KEY=
123123
124124
SOL_ADDRESS=So11111111111111111111111111111111111111112
125125
SLIPPAGE=1
126-
RPC_URL=https://api.mainnet-beta.solana.com
126+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
127127
HELIUS_API_KEY=
128128
129129
## Telegram

‎docs/docs/packages/plugins.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ runtime.character.settings.secrets = {
263263
**Example Call**
264264

265265
```typescript
266-
const response = await runtime.triggerAction("SEND_MASS_PAYOUT", {
266+
const response = await runtime.processAction("SEND_MASS_PAYOUT", {
267267
receivingAddresses: [
268268
"0xA0ba2ACB5846A54834173fB0DD9444F756810f06",
269269
"0xF14F2c49aa90BaFA223EE074C1C33b59891826bF",
@@ -388,7 +388,7 @@ All contract deployments and interactions are logged to a CSV file for record-ke
388388
1. **ERC20 Token**
389389

390390
```typescript
391-
const response = await runtime.triggerAction("DEPLOY_TOKEN_CONTRACT", {
391+
const response = await runtime.processAction("DEPLOY_TOKEN_CONTRACT", {
392392
contractType: "ERC20",
393393
name: "MyToken",
394394
symbol: "MTK",
@@ -400,7 +400,7 @@ All contract deployments and interactions are logged to a CSV file for record-ke
400400
2. **NFT Collection**
401401

402402
```typescript
403-
const response = await runtime.triggerAction("DEPLOY_TOKEN_CONTRACT", {
403+
const response = await runtime.processAction("DEPLOY_TOKEN_CONTRACT", {
404404
contractType: "ERC721",
405405
name: "MyNFT",
406406
symbol: "MNFT",
@@ -411,7 +411,7 @@ All contract deployments and interactions are logged to a CSV file for record-ke
411411

412412
3. **Multi-token Collection**
413413
```typescript
414-
const response = await runtime.triggerAction("DEPLOY_TOKEN_CONTRACT", {
414+
const response = await runtime.processAction("DEPLOY_TOKEN_CONTRACT", {
415415
contractType: "ERC1155",
416416
name: "MyMultiToken",
417417
symbol: "MMT",
@@ -423,7 +423,7 @@ All contract deployments and interactions are logged to a CSV file for record-ke
423423
**Contract Interaction Example:**
424424

425425
```typescript
426-
const response = await runtime.triggerAction("INVOKE_CONTRACT", {
426+
const response = await runtime.processAction("INVOKE_CONTRACT", {
427427
contractAddress: "0x123...",
428428
method: "transfer",
429429
abi: [...],
@@ -597,7 +597,7 @@ The Webhook Plugin enables Eliza to interact with the Coinbase SDK to create and
597597
To create a webhook:
598598

599599
```typescript
600-
const response = await runtime.triggerAction("CREATE_WEBHOOK", {
600+
const response = await runtime.processAction("CREATE_WEBHOOK", {
601601
networkId: "base",
602602
eventType: "transfers",
603603
notificationUri: "https://your-notification-uri.com",

‎packages/client-twitter/src/post.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import {
66
IAgentRuntime,
77
ModelClass,
88
stringToUuid,
9-
UUID,
9+
TemplateType,
10+
UUID
1011
} from "@elizaos/core";
1112
import { elizaLogger } from "@elizaos/core";
1213
import { ClientBase } from "./base.ts";
@@ -533,7 +534,7 @@ export class TwitterPostClient {
533534
private async generateTweetContent(
534535
tweetState: any,
535536
options?: {
536-
template?: string;
537+
template?: TemplateType;
537538
context?: string;
538539
}
539540
): Promise<string> {

‎packages/core/.env.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ TEST_DATABASE_CLIENT=sqlite
22
NODE_ENV=test
33
MAIN_WALLET_ADDRESS=TEST_MAIN_WALLET_ADDRESS_VALUE
44
OPENAI_API_KEY=TEST_OPENAI_API_KEY_VALUE
5-
RPC_URL=https://api.mainnet-beta.solana.com
5+
SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
66
WALLET_PUBLIC_KEY=2weMjPLLybRMMva1fM3U31goWWrCpF59CHWNhnCJ9Vyh

‎packages/core/generation.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ export async function generateText({
355355
const fetching = await runtime.fetch(url, options);
356356
if (
357357
parseBooleanFromText(
358-
runtime.getSetting("ETERNAL_AI_LOG_REQUEST")
358+
runtime.getSetting("ETERNALAI_LOG")
359359
)
360360
) {
361361
elizaLogger.info(

0 commit comments

Comments
 (0)