fix: merge

elizaOS · Nov 23, 2024 · b905ca1 · b905ca1
1 parent 4f84331
commit b905ca1
Show file tree

Hide file tree

Showing 5 changed files with 579 additions and 569 deletions.
diff --git a/agent/src/index.ts b/agent/src/index.ts
@@ -34,6 +34,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { character } from "./character.ts";
 import type { DirectClient } from "@ai16z/client-direct";
+import blobert from "./blobert.ts";
 
 const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
 const __dirname = path.dirname(__filename); // get the name of the directory
@@ -317,7 +318,7 @@ const startAgents = async () => {
 
     let charactersArg = args.characters || args.character;
 
-    let characters = [character];
+    let characters = [blobert];
 
     if (charactersArg) {
         characters = await loadCharacters(charactersArg);

diff --git a/packages/adapter-postgres/src/index.ts b/packages/adapter-postgres/src/index.ts
@@ -5,7 +5,6 @@ import pg, {
     QueryConfigValues,
     QueryResult,
     QueryResultRow,
-    DatabaseError,
 } from "pg";
 import {
     Account,
@@ -24,6 +23,8 @@ import fs from "fs";
 import { fileURLToPath } from "url";
 import path from "path";
 
+const { DatabaseError } = pg;
+
 const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
 const __dirname = path.dirname(__filename); // get the name of the directory
 

diff --git a/packages/plugin-bootstrap/src/evaluators/goal.ts b/packages/plugin-bootstrap/src/evaluators/goal.ts
@@ -58,6 +58,7 @@ async function handler(
     // get goals
     let goalsData = await getGoals({
         runtime,
+        agentId: runtime.agentId,
         roomId: message.roomId,
         onlyInProgress: options.onlyInProgress as boolean,
     });
@@ -81,6 +82,7 @@ async function handler(
     // get goals
     goalsData = await getGoals({
         runtime,
+        agentId: runtime.agentId,
         roomId: message.roomId,
         onlyInProgress: true,
     });
@@ -146,6 +148,7 @@ export const goalEvaluator: Evaluator = {
         // Check if there are active goals that could potentially be updated
         const goals = await getGoals({
             runtime,
+            agentId: runtime.agentId,
             count: 1,
             onlyInProgress: true,
             roomId: message.roomId,

diff --git a/packages/plugin-starknet/src/actions/generate.ts b/packages/plugin-starknet/src/actions/generate.ts