Merge branch 'v2-develop' of https://github.com/elizaOS/eliza into v2-develop

Author: lalalune

Dockerfile

@@ -30,7 +30,6 @@ COPY packages ./packages
 
 # Install dependencies
 RUN bun install
-RUN bun add better-sqlite3
 
 # Build the project
 RUN bun run build
@@ -63,7 +62,7 @@ COPY --from=builder /app/scripts ./scripts
 ENV NODE_ENV=production
 
 # Expose any necessary ports (if needed)
-EXPOSE 3000 5173
+EXPOSE 3000
 
 # Start the application
 CMD ["bun", "run", "start"] 

packages/cli/src/commands/create.ts

@@ -79,6 +79,99 @@ async function installDependencies(targetDir: string) {
   }
 }
 
+/**
+ * Stores Postgres URL in the global .env file
+ * @param url The Postgres URL to store
+ */
+async function storePostgresUrl(url: string): Promise<void> {
+  if (!url) return;
+
+  try {
+    const homeDir = os.homedir();
+    const globalEnvPath = path.join(homeDir, '.eliza', '.env');
+
+    await fs.writeFile(globalEnvPath, `POSTGRES_URL=${url}\n`, { flag: 'a' });
+    logger.success('Postgres URL saved to configuration');
+  } catch (error) {
+    logger.warn('Error saving database configuration:', error);
+  }
+}
+
+/**
+ * Validates a Postgres URL format
+ * @param url The URL to validate
+ * @returns True if the URL appears valid
+ */
+function isValidPostgresUrl(url: string): boolean {
+  if (!url) return false;
+
+  // Basic pattern: postgresql://user:password@host:port/dbname
+  const basicPattern = /^postgresql:\/\/[^:]+:[^@]+@[^:]+:\d+\/\w+$/;
+
+  // More permissive pattern (allows missing password, different formats)
+  const permissivePattern = /^postgresql:\/\/.*@.*:\d+\/.*$/;
+
+  return basicPattern.test(url) || permissivePattern.test(url);
+}
+
+/**
+ * Prompts the user for a Postgres URL, validates it, and stores it
+ * @returns The configured Postgres URL or null if user skips
+ */
+async function promptAndStorePostgresUrl(): Promise<string | null> {
+  let isValidUrl = false;
+  let userUrl = '';
+
+  while (!isValidUrl) {
+    // Prompt for postgres url with simpler message
+    const reply = await prompts({
+      type: 'text',
+      name: 'postgresUrl',
+      message: 'Enter your Postgres URL:',
+      validate: (value) => value.trim() !== '' || 'Postgres URL cannot be empty',
+    });
+
+    // Handle cancellation
+    if (!reply.postgresUrl) {
+      const { continueAnyway } = await prompts({
+        type: 'confirm',
+        name: 'continueAnyway',
+        message: 'Continue without configuring Postgres?',
+        initial: false,
+      });
+
+      if (continueAnyway) return null;
+      continue;
+    }
+
+    userUrl = reply.postgresUrl;
+
+    // Validate URL format
+    if (!isValidPostgresUrl(userUrl)) {
+      logger.warn("The URL format doesn't appear to be valid.");
+      logger.info('Expected format: postgresql://user:password@host:port/dbname');
+
+      const { useAnyway } = await prompts({
+        type: 'confirm',
+        name: 'useAnyway',
+        message: 'Use this URL anyway? (Choose Yes if you have a custom setup)',
+        initial: false,
+      });
+
+      if (!useAnyway) continue;
+    }
+
+    isValidUrl = true;
+  }
+
+  if (userUrl) {
+    await storePostgresUrl(userUrl);
+    return userUrl;
+  }
+
+  return null;
+}
+
 /**
  * Initialize a new project or plugin.
  *
@@ -288,13 +381,7 @@ export const create = new Command()
       }
 
       if (database === 'postgres' && !postgresUrl) {
-        // prompt for postgres url
-        const reply = await prompts({
-          type: 'text',
-          name: 'postgresUrl',
-          message: 'Enter your postgres url',
-        });
-        postgresUrl = reply.postgresUrl;
+        postgresUrl = await promptAndStorePostgresUrl();
       }
 
       // Set up src directory

packages/core/src/types.ts

@@ -1167,21 +1167,6 @@ export interface IFileService extends Service {
   generateSignedUrl(fileName: string, expiresIn: number): Promise<string>;
 }
 
-export interface ITeeLogService extends Service {
-  log(
-    agentId: string,
-    roomId: string,
-    entityId: string,
-    type: string,
-    content: string
-  ): Promise<boolean>;
-
-  generateAttestation<T>(reportData: string, hashAlgorithm?: T | any): Promise<string>;
-  getAllAgents(): Promise<TeeAgent[]>;
-  getAgent(agentId: string): Promise<TeeAgent | null>;
-  getLogs(query: TeeLogQuery, page: number, pageSize: number): Promise<TeePageQuery<TeeLog[]>>;
-}
-
 export interface TestCase {
   name: string;
   fn: (runtime: IAgentRuntime) => Promise<void> | void;
@@ -1192,28 +1177,6 @@ export interface TestSuite {
   tests: TestCase[];
 }
 
-// Represents a log entry in the TeeLog table, containing details about agent activities.
-export interface TeeLog {
-  id: string;
-  agentId: string;
-  roomId: string;
-  entityId: string;
-  type: string;
-  content: string;
-  timestamp: number;
-  signature: string;
-}
-
-export interface TeeLogQuery {
-  agentId?: string;
-  roomId?: string;
-  entityId?: string;
-  type?: string;
-  containsContent?: string;
-  startTimestamp?: number;
-  endTimestamp?: number;
-}
-
 // Represents an agent in the TeeAgent table, containing details about the agent.
 export interface TeeAgent {
   id: string; // Primary key
@@ -1227,33 +1190,6 @@ export interface TeeAgent {
   attestation: string;
 }
 
-export interface TeePageQuery<Result = any> {
-  page: number;
-  pageSize: number;
-  total?: number;
-  data?: Result;
-}
-
-export abstract class TeeLogDAO<DB = any> {
-  db: DB;
-
-  abstract initialize(): Promise<void>;
-
-  abstract addLog(log: TeeLog): Promise<boolean>;
-
-  abstract getPagedLogs(
-    query: TeeLogQuery,
-    page: number,
-    pageSize: number
-  ): Promise<TeePageQuery<TeeLog[]>>;
-
-  abstract addAgent(agent: TeeAgent): Promise<boolean>;
-
-  abstract getAgent(agentId: string): Promise<TeeAgent>;
-
-  abstract getAllAgents(): Promise<TeeAgent[]>;
-}
-
 export enum TEEMode {
   OFF = 'OFF',
   LOCAL = 'LOCAL', // For local development with simulator
@@ -1282,13 +1218,7 @@ export interface RemoteAttestationMessage {
   };
 }
 
-export interface SgxAttestation {
-  quote: string;
-  timestamp: number;
-}
-
 export enum TeeType {
-  SGX_GRAMINE = 'sgx_gramine',
   TDX_DSTACK = 'tdx_dstack',
 }
 

packages/plugin-tee/package.json

@@ -6,10 +6,9 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@elizaos/core": "^1.0.0-alpha.67",
-    "@phala/dstack-sdk": "^0.1.7",
-    "@solana/web3.js": "^1.98.0",
-    "better-sqlite3": "11.8.1",
-    "elliptic": "6.6.1"
+    "@phala/dstack-sdk": "0.1.11",
+    "@solana/web3.js": "1.98.0",
+    "viem": "2.23.11"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

packages/plugin-tee/src/actions/remoteAttestationAction.ts

@@ -128,65 +128,3 @@ https://proof.t16z.com/reports/${data.checksum}`,
     ],
   ],
 };
-
-/**
- * Marlin Remote Attestation action.
- *
- * This action allows generating a remote attestation to prove that the agent is running in a Trusted Execution Environment (TEE).
- *
- * @type {{
- *   name: string,
- *   similes: string[],
- *   description: string,
- *   handler: (runtime: IAgentRuntime, _message: Memory, _state: State, _options: Record<string, unknown>, callback: HandlerCallback) => Promise<boolean>,
- *   validate: (runtime: IAgentRuntime) => Promise<boolean>,
- *   examples: { name: string, content: { text: string, actions: string[] } }[][]
- * }}
- */
-export const marlinRemoteAttestationAction = {
-  name: 'REMOTE_ATTESTATION',
-  similes: ['REMOTE_ATTESTATION', 'TEE_REMOTE_ATTESTATION', 'TEE_ATTESTATION'],
-  description: 'Generate a remote attestation to prove that the agent is running in a TEE',
-  handler: async (
-    runtime: IAgentRuntime,
-    _message: Memory,
-    _state: State,
-    _options: Record<string, unknown>, // Replaced any with Record<string, unknown>
-    callback: HandlerCallback
-  ) => {
-    try {
-      const endpoint =
-        runtime.getSetting('TEE_MARLIN_ATTESTATION_ENDPOINT') ?? 'http://127.0.0.1:1350';
-      const response = await fetch(`${endpoint}/attestation/hex`);
-      callback({
-        text: `Here you go - ${await response.text()}`,
-        actions: ['NONE'],
-      });
-      return true;
-    } catch (error) {
-      console.error('Failed to fetch remote attestation: ', error);
-      return false;
-    }
-  },
-  validate: async (_runtime: IAgentRuntime) => {
-    return true;
-  },
-  examples: [
-    [
-      {
-        name: 'user',
-        content: {
-          text: 'Attest yourself',
-          actions: ['REMOTE_ATTESTATION'],
-        },
-      },
-      {
-        name: 'user',
-        content: {
-          text: 'Generate a remote attestation',
-          actions: ['REMOTE_ATTESTATION'],
-        },
-      },
-    ],
-  ],
-};