Merge branch 'feat/simulation-sell-types' of http://github.com/ai16z/…

…eliza into HEAD

packages/plugin-solana/src/actions/swapDao.ts

@@ -64,7 +64,7 @@ export const executeSwapForDAO: Action = {
 
         try {
             const connection = new Connection(
-                "https://api.mainnet-beta.solana.com" // better if we use a better rpc
+                runtime.getSetting("RPC_URL") as string
             );
             const authority = Keypair.fromSecretKey(
                 Uint8Array.from(

packages/plugin-solana/src/evaluators/trust.ts

@@ -147,7 +147,10 @@ async function handler(runtime: IAgentRuntime, message: Memory) {
     for (const rec of filteredRecommendations) {
         // create the wallet provider and token provider
         const walletProvider = new WalletProvider(
-            new Connection("https://api.mainnet-beta.solana.com"),
+            new Connection(
+                runtime.getSetting("RPC_URL") ||
+                    "https://api.mainnet-beta.solana.com"
+            ),
             new PublicKey(
                 runtime.getSetting("SOLANA_PUBLIC_KEY") ??
                 runtime.getSetting("WALLET_PUBLIC_KEY")

packages/plugin-solana/src/providers/simulationSellingService.ts

@@ -2,8 +2,7 @@ import {
     TrustScoreDatabase,
     TokenPerformance,
     // TradePerformance,
-    // TokenRecommendation,
-    ProcessedTokenData,
+    TokenRecommendation,
 } from "@ai16z/plugin-trustdb";
 import { Connection, PublicKey } from "@solana/web3.js";
 // Assuming TokenProvider and IAgentRuntime are available
@@ -12,6 +11,7 @@ import { TokenProvider } from "./token.ts";
 import { IAgentRuntime } from "@ai16z/eliza";
 import { WalletProvider } from "./wallet.ts";
 import * as amqp from "amqplib";
+import { ProcessedTokenData } from "../types/token.ts";
 
 interface SellDetails {
     sell_amount: number;
@@ -133,7 +133,7 @@ export class SimulationSellingService {
 
         try {
             console.log(
-                `Executing sell for token ${tokenPerformance.tokenSymbol}: ${amountToSell}`
+                `Executing sell for token ${tokenPerformance.symbol}: ${amountToSell}`
             );
 
             // Update the sell details
@@ -151,7 +151,7 @@ export class SimulationSellingService {
             // Update sell details in the database
             const sellDetailsData = await this.updateSellDetails(
                 tokenAddress,
-                tokenPerformance.recommenderId,
+                sell_recommender_id,
                 sellTimeStamp,
                 sellDetails,
                 true, // isSimulation
@@ -209,15 +209,21 @@ export class SimulationSellingService {
             );
             // const shouldTrade = await tokenProvider.shouldTradeToken();
             // if (shouldTrade) {
+            const tokenRecommendations: TokenRecommendation[] =
+                this.trustScoreDb.getRecommendationsByToken(
+                    tokenPerformance.tokenAddress
+                );
+            const tokenRecommendation: TokenRecommendation =
+                tokenRecommendations[0];
             const balance = tokenPerformance.balance;
-            const sell_recommender_id = tokenPerformance.recommenderId;
+            const sell_recommender_id = tokenRecommendation.recommenderId;
             const tokenAddress = tokenPerformance.tokenAddress;
             const process = await this.startProcessInTheSonarBackend(
                 tokenAddress,
                 balance,
                 true,
                 sell_recommender_id,
-                tokenPerformance.initial_mc
+                tokenPerformance.initialMarketCap
             );
             if (process) {
                 this.runningProcesses.add(tokenAddress);
@@ -226,7 +232,10 @@ export class SimulationSellingService {
         });
     }
 
-    public processTokenPerformance(tokenAddress: string) {
+    public processTokenPerformance(
+        tokenAddress: string,
+        recommenderId: string
+    ) {
         try {
             const runningProcesses = this.runningProcesses;
             // check if token is already being processed
@@ -236,20 +245,21 @@ export class SimulationSellingService {
             }
             const tokenPerformance =
                 this.trustScoreDb.getTokenPerformance(tokenAddress);
+
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const tokenProvider = new TokenProvider(
                 tokenPerformance.tokenAddress,
                 this.walletProvider,
                 this.runtime.cacheManager
             );
             const balance = tokenPerformance.balance;
-            const sell_recommender_id = tokenPerformance.recommenderId;
+            const sell_recommender_id = recommenderId;
             const process = this.startProcessInTheSonarBackend(
                 tokenAddress,
                 balance,
                 true,
                 sell_recommender_id,
-                tokenPerformance.initial_mc
+                tokenPerformance.initialMarketCap
             );
             if (process) {
                 this.runningProcesses.add(tokenAddress);

packages/plugin-solana/src/providers/trustScoreProvider.ts

@@ -416,6 +416,7 @@ export class TrustScoreManager {
 
         this.trustScoreDb.upsertTokenPerformance({
             tokenAddress: tokenAddress,
+            symbol: processedData.tokenCodex.symbol,
             priceChange24h: processedData.tradeData.price_change_24h_percent,
             volumeChange24h: processedData.tradeData.volume_24h,
             trade_24h_change: processedData.tradeData.trade_24h_change_percent,
@@ -453,7 +454,10 @@ export class TrustScoreManager {
             };
             this.trustScoreDb.addTransaction(transaction);
         }
-        this.simulationSellingService.processTokenPerformance(tokenAddress);
+        this.simulationSellingService.processTokenPerformance(
+            tokenAddress,
+            recommenderId
+        );
         // api call to update trade performance
         this.createTradeInBe(tokenAddress, recommenderId, username, data);
         return creationData;
@@ -531,7 +535,7 @@ export class TrustScoreManager {
         const processedData: ProcessedTokenData =
             await this.tokenProvider.getProcessedTokenData();
         const wallet = new WalletProvider(
-            new Connection("https://api.mainnet-beta.solana.com"),
+            this.connection,
             new PublicKey(Wallet!)
         );
         const prices = await wallet.fetchPrices(runtime);

packages/plugin-trustdb/src/adapters/trustScoreDatabase.ts

@@ -27,6 +27,7 @@ export interface RecommenderMetrics {
 
 export interface TokenPerformance {
     tokenAddress: string;
+    symbol: string;
     priceChange24h: number;
     volumeChange24h: number;
     trade_24h_change: number;
@@ -109,6 +110,7 @@ interface RecommenderMetricsRow {
 
 interface TokenPerformanceRow {
     token_address: string;
+    symbol: string;
     price_change_24h: number;
     volume_change_24h: number;
     trade_24h_change: number;
@@ -193,6 +195,7 @@ export class TrustScoreDatabase {
         this.db.exec(`
             CREATE TABLE IF NOT EXISTS token_performance (
                 token_address TEXT PRIMARY KEY,
+                symbol TEXT,
                 price_change_24h REAL,
                 volume_change_24h REAL,
                 trade_24h_change REAL,
@@ -818,6 +821,7 @@ export class TrustScoreDatabase {
 
         return {
             tokenAddress: row.token_address,
+            symbol: row.symbol,
             priceChange24h: row.price_change_24h,
             volumeChange24h: row.volume_change_24h,
             trade_24h_change: row.trade_24h_change,
@@ -852,6 +856,7 @@ export class TrustScoreDatabase {
 
         return rows.map((row) => ({
             tokenAddress: row.token_address,
+            symbol: row.symbol,
             priceChange24h: row.price_change_24h,
             volumeChange24h: row.volume_change_24h,
             trade_24h_change: row.trade_24h_change,