Merge branch 'develop' into feat/mint-NFT-with-collection-address

xwxtwd · web-flow · commit eb9d749d9a39 · 2024-12-26T19:51:32.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -45,7 +45,6 @@ packages/core/src/providers/cache
 packages/core/src/providers/cache/*
 cache/*
 packages/plugin-coinbase/src/plugins/transactions.csv
-packages/plugin-coinbase/package-lock.json
 
 tsup.config.bundled_*.mjs
 
diff --git a/agent/src/index.ts b/agent/src/index.ts
@@ -179,6 +179,25 @@ export async function loadCharacters(
                 const character = JSON.parse(content);
                 validateCharacterConfig(character);
 
+                // .id isn't really valid
+                const characterId = character.id || character.name;
+                const characterPrefix = `CHARACTER.${characterId.toUpperCase().replace(/ /g, '_')}.`;
+
+                const characterSettings = Object.entries(process.env)
+                    .filter(([key]) => key.startsWith(characterPrefix))
+                    .reduce((settings, [key, value]) => {
+                        const settingKey = key.slice(characterPrefix.length);
+                        return { ...settings, [settingKey]: value };
+                    }, {});
+
+                if (Object.keys(characterSettings).length > 0) {
+                    character.settings = character.settings || {};
+                    character.settings.secrets = {
+                        ...characterSettings,
+                        ...character.settings.secrets
+                    };
+                }
+
                 // Handle plugins
                 if (isAllStrings(character.plugins)) {
                     elizaLogger.info("Plugins are: ", character.plugins);
diff --git a/docs/README.md b/docs/README.md
@@ -67,7 +67,7 @@ You can run Grok models by setting the `XAI_MODEL` environment variable to `grok
 
 ### Run with OpenAI
 
-You can run OpenAI models by setting the `XAI_MODEL` environment variable to `gpt-4o-mini` or `gpt-4o`
+You can run OpenAI models by setting the `XAI_MODEL` environment variable to `gpt-4-mini` or `gpt-4o`
 
 ## Additional Requirements
 
diff --git a/docs/docs/guides/secrets-management.md b/docs/docs/guides/secrets-management.md
@@ -12,9 +12,10 @@ A comprehensive guide for managing secrets, API keys, and sensitive configuratio
 
 Eliza uses a hierarchical environment variable system:
 
-1. Character-specific secrets (highest priority)
-2. Environment variables
-3. Default values (lowest priority)
+1. Character-specific namespaced environment variables (highest priority)
+2. Character-specific secrets
+3. Environment variables
+4. Default values (lowest priority)
 
 ### Secret Types
 
@@ -96,6 +97,8 @@ Define secrets in character files:
 }
 ```
 
+Alternatively, you can use the `CHARACTER.YOUR_CHARACTER_NAME.SECRET_NAME` format inside your `.env` file.
+
 Access secrets in code:
 
 ```typescript
diff --git a/docs/docs/packages/agent.md b/docs/docs/packages/agent.md
@@ -160,6 +160,15 @@ export async function initializeClients(
 
 ### Token Management
 
+Tokens can be configured in two ways:
+
+1. Using namespaced environment variables:
+```env
+CHARACTER.YOUR_CHARACTER_NAME.OPENAI_API_KEY=sk-...
+CHARACTER.YOUR_CHARACTER_NAME.ANTHROPIC_API_KEY=sk-...
+```
+
+2. Using character settings:
 ```typescript
 export function getTokenForProvider(
     provider: ModelProviderName,
@@ -181,6 +190,11 @@ export function getTokenForProvider(
 }
 ```
 
+The system will check for tokens in the following order:
+1. Character-specific namespaced env variables
+2. Character settings from JSON
+3. Global environment variables
+
 ### Database Selection
 
 ```typescript
diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts
@@ -146,11 +146,22 @@ export async function generateText({
 
     elizaLogger.info("Selected model:", model);
 
-    const temperature = models[provider].settings.temperature;
-    const frequency_penalty = models[provider].settings.frequency_penalty;
-    const presence_penalty = models[provider].settings.presence_penalty;
-    const max_context_length = models[provider].settings.maxInputTokens;
-    const max_response_length = models[provider].settings.maxOutputTokens;
+    const modelConfiguration = runtime.character?.settings?.modelConfig;
+    const temperature =
+        modelConfiguration?.temperature ||
+        models[provider].settings.temperature;
+    const frequency_penalty =
+        modelConfiguration?.frequency_penalty ||
+        models[provider].settings.frequency_penalty;
+    const presence_penalty =
+        modelConfiguration?.presence_penalty ||
+        models[provider].settings.presence_penalty;
+    const max_context_length =
+        modelConfiguration?.maxInputTokens ||
+        models[provider].settings.maxInputTokens;
+    const max_response_length =
+        modelConfiguration.max_response_length ||
+        models[provider].settings.maxOutputTokens;
 
     const apiKey = runtime.token;
 
diff --git a/packages/core/src/settings.ts b/packages/core/src/settings.ts
@@ -22,6 +22,10 @@ interface Settings {
     [key: string]: string | undefined;
 }
 
+interface NamespacedSettings {
+    [namespace: string]: Settings;
+}
+
 let environmentSettings: Settings = {};
 
 /**
@@ -91,6 +95,15 @@ export function loadEnvConfig(): Settings {
     if (!result.error) {
         console.log(`Loaded .env file from: ${envPath}`);
     }
+
+    // Parse namespaced settings
+    const namespacedSettings = parseNamespacedSettings(process.env as Settings);
+
+    // Attach to process.env for backward compatibility
+    Object.entries(namespacedSettings).forEach(([namespace, settings]) => {
+        process.env[`__namespaced_${namespace}`] = JSON.stringify(settings);
+    });
+
     return process.env as Settings;
 }
 
@@ -135,3 +148,21 @@ elizaLogger.info("Parsed settings:", {
 });
 
 export default settings;
+
+// Add this function to parse namespaced settings
+function parseNamespacedSettings(env: Settings): NamespacedSettings {
+    const namespaced: NamespacedSettings = {};
+
+    for (const [key, value] of Object.entries(env)) {
+        if (!value) continue;
+
+        const [namespace, ...rest] = key.split('.');
+        if (!namespace || rest.length === 0) continue;
+
+        const settingKey = rest.join('.');
+        namespaced[namespace] = namespaced[namespace] || {};
+        namespaced[namespace][settingKey] = value;
+    }
+
+    return namespaced;
+}
diff --git a/packages/core/src/tests/defaultCharacters.test.ts b/packages/core/src/tests/defaultCharacters.test.ts
@@ -43,7 +43,7 @@ describe("defaultCharacter", () => {
     });
 
     it("should have a topics array with at least one broad topic", () => {
-        expect(defaultCharacter.topics).toContain("Learning");
+        expect(defaultCharacter.topics).toContain("Classical art");
     });
 
     it('should have style settings with "all" array', () => {
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -626,6 +626,14 @@ export interface IAgentConfig {
     [key: string]: string;
 }
 
+export interface ModelConfiguration {
+    temperature?: number;
+    max_response_length?: number;
+    frequency_penalty?: number;
+    presence_penalty?: number;
+    maxInputTokens?: number;
+}
+
 /**
  * Configuration for an agent character
  */
@@ -738,6 +746,7 @@ export type Character = {
             };
         };
         model?: string;
+        modelConfig?: ModelConfiguration;
         embeddingModel?: string;
         chains?: {
             evm?: any[];
diff --git a/packages/plugin-3d-generation/package.json b/packages/plugin-3d-generation/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@elizaos/core": "workspace:*",
-    "tsup": "8.3.5"
+    "tsup": "8.3.5",
+    "whatwg-url": "7.1.0"
   },
   "scripts": {
     "build": "tsup --format esm --dts",
diff --git a/packages/plugin-starknet/package.json b/packages/plugin-starknet/package.json
@@ -9,6 +9,7 @@
         "@elizaos/plugin-trustdb": "workspace:*",
         "@avnu/avnu-sdk": "2.1.1",
         "@uniswap/sdk-core": "6.0.0",
+        "unruggable-sdk": "1.4.0",
         "@unruggable_starknet/core": "0.1.0",
         "starknet": "6.18.0",
         "tsup": "8.3.5",
diff --git a/packages/plugin-starknet/src/actions/unruggable.ts b/packages/plugin-starknet/src/actions/unruggable.ts
@@ -9,8 +9,12 @@ import {
     Memory,
     ModelClass,
     State,
+    type Action,
 } from "@elizaos/core";
 import { Percent } from "@uniswap/sdk-core";
+import { createMemecoin, launchOnEkubo } from "unruggable-sdk";
+import { constants } from "starknet";
+
 import {
     getStarknetAccount,
     getStarknetProvider,
@@ -22,9 +26,20 @@ import { AMM, QUOTE_TOKEN_SYMBOL } from "@unruggable_starknet/core/constants";
 import { ACCOUNTS, TOKENS } from "../utils/constants.ts";
 import { validateStarknetConfig } from "../environment.ts";
 
-export function isDeployTokenContent(
-    content: DeployData
-): content is DeployData {
+interface SwapContent {
+    sellTokenAddress: string;
+    buyTokenAddress: string;
+    sellAmount: string;
+}
+
+interface DeployTokenContent {
+    name: string;
+    symbol: string;
+    owner: string;
+    initialSupply: string;
+}
+
+export function isDeployTokenContent(content: DeployTokenContent) {
     // Validate types
     const validTypes =
         typeof content.name === "string" &&
@@ -122,77 +137,62 @@ export const deployToken: Action = {
             const provider = getStarknetProvider(runtime);
             const account = getStarknetAccount(runtime);
 
-            const factory = new Factory({
-                provider,
-                chainId: await provider.getChainId(),
-            });
+            const chainId = await provider.getChainId();
+            const config = {
+                starknetChainId: chainId,
+                starknetProvider: provider,
+            };
 
-            const { tokenAddress, calls: deployCalls } =
-                factory.getDeployCalldata({
-                    name: response.name,
-                    symbol: response.symbol,
-                    owner: response.owner,
-                    initialSupply: response.initialSupply,
-                });
-
-            const data = await factory.getMemecoinLaunchData(tokenAddress);
-
-            const { calls: launchCalls } = await factory.getEkuboLaunchCalldata(
+            const { tokenAddress, transactionHash } = await createMemecoin(
+                config,
                 {
-                    address: tokenAddress,
                     name: response.name,
                     symbol: response.symbol,
                     owner: response.owner,
-                    totalSupply: response.initialSupply,
-                    decimals: 18,
-                    ...data,
-                },
-                {
-                    fees: parseFormatedPercentage("3"),
-                    amm: AMM.EKUBO,
-                    teamAllocations: [
-                        {
-                            address: ACCOUNTS.ELIZA,
-                            amount: new Percent(
-                                2.5,
-                                response.initialSupply
-                            ).toFixed(0),
-                        },
-                        {
-                            address: ACCOUNTS.BLOBERT,
-                            amount: new Percent(
-                                2.5,
-                                response.initialSupply
-                            ).toFixed(0),
-                        },
-                    ],
-                    holdLimit: parseFormatedPercentage("2"),
-                    antiBotPeriod: 3600,
-                    quoteToken: {
-                        address: TOKENS.LORDS,
-                        symbol: "LORDS" as QUOTE_TOKEN_SYMBOL,
-                        name: "Lords",
-                        decimals: 18,
-                        camelCased: false,
-                    },
-                    startingMarketCap: parseFormatedAmount("5000"),
+                    initialSupply: response.initialSupply,
+                    starknetAccount: account,
                 }
             );
 
             elizaLogger.log(
-                "Deployment has been initiated for coin: " +
+                "Token deployment initiated for: " +
                     response.name +
                     " at address: " +
                     tokenAddress
             );
-            const tx = await account.execute([...deployCalls, ...launchCalls]);
+
+            await launchOnEkubo(config, {
+                antiBotPeriodInSecs: 3600,
+                currencyAddress: TOKENS.LORDS,
+                fees: "3",
+                holdLimit: "2",
+                memecoinAddress: tokenAddress,
+                starknetAccount: account,
+                startingMarketCap: "5000",
+                teamAllocations: [
+                    {
+                        address: ACCOUNTS.ELIZA,
+                        amount: new Percent(
+                            2.5,
+                            response.initialSupply
+                        ).toFixed(0),
+                    },
+                    {
+                        address: ACCOUNTS.BLOBERT,
+                        amount: new Percent(
+                            2.5,
+                            response.initialSupply
+                        ).toFixed(0),
+                    },
+                ],
+            });
 
             callback?.({
                 text:
                     "Token Deployment completed successfully!" +
                     response.symbol +
                     " deployed in tx: " +
-                    tx.transaction_hash,
+                    transactionHash,
             });
 
             return true;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
