Merge branch 'develop' into sif-dev

packages/plugin-akash/src/actions/closeDeployment.ts

@@ -7,16 +7,16 @@ import { MsgCloseDeployment } from "@akashnetwork/akash-api/akash/deployment/v1b
 import { validateAkashConfig } from "../environment";
 import { fetchDeployments } from "./getDeploymentApi";
 import { AkashError, AkashErrorCode } from "../error/error";
-import { getCertificatePath } from "../utils/paths";
-import { inspectRuntime, isPluginLoaded } from "../runtime_inspect";
+// import { getCertificatePath } from "../utils/paths";
+import { isPluginLoaded } from "../runtime_inspect";
 
 interface CloseDeploymentContent extends Content {
     dseq?: string;
     closeAll?: boolean;
 }
 
 // Certificate file path
-const CERTIFICATE_PATH = getCertificatePath(import.meta.url);
+// const CERTIFICATE_PATH = getCertificatePath(import.meta.url);
 
 // Initialize wallet and client
 async function initializeClient(runtime: IAgentRuntime) {
@@ -312,7 +312,7 @@ export const closeDeploymentAction: Action = {
         runtime: IAgentRuntime,
         message: Memory,
         state: State | undefined,
-        options: { [key: string]: unknown } = {},
+        _options: { [key: string]: unknown } = {},
         callback?: HandlerCallback
     ): Promise<boolean> => {
         const actionId = Date.now().toString();

packages/plugin-akash/src/actions/createDeployment.ts

@@ -16,7 +16,7 @@ import { AkashError, AkashErrorCode, withRetry } from "../error/error";
 import * as fs from 'fs';
 import * as path from 'path';
 import { getCertificatePath, getDefaultSDLPath } from "../utils/paths";
-import { fileURLToPath } from 'url';
+// import { fileURLToPath } from 'url';
 import { inspectRuntime, isPluginLoaded } from "../runtime_inspect";
 import https from 'node:https';
 import axios from 'axios';
@@ -162,7 +162,8 @@ const loadSDLFromFile = (filePath: string): string => {
     }
 };
 
-const formatErrorMessage = (error: unknown): string => {
+// Preserved for future use
+/* const formatErrorMessage = (error: unknown): string => {
     if (error instanceof AkashError) {
         if (error.code === AkashErrorCode.WALLET_NOT_INITIALIZED) {
             return "Akash wallet not initialized";
@@ -196,7 +197,7 @@ const formatErrorMessage = (error: unknown): string => {
         return "Failed to parse SDL: Invalid format";
     }
     return message;
-};
+}; */
 
 async function initializeWallet(mnemonic: string) {
     elizaLogger.debug("=== Initializing Wallet ===", {
@@ -619,7 +620,7 @@ async function queryLeaseStatus(lease: any, providerUri: string, certificate: Ce
                         'Content-Type': 'application/json',
                         'Accept': 'application/json'
                     },
-                    // @ts-ignore - Node's fetch has agent support
+                    // @ts-expect-error - TypeScript's fetch types don't include Node's agent support, but it exists at runtime
                     agent,
                     signal: AbortSignal.timeout(10000)
                 });
@@ -1138,7 +1139,7 @@ export const createDeploymentAction: Action = {
         runtime: IAgentRuntime,
         message: Memory,
         state: State | undefined,
-        options: { [key: string]: unknown; } = {},
+        _options: { [key: string]: unknown; } = {},
         callback?: HandlerCallback
     ): Promise<boolean> => {
         const actionId = Date.now().toString();

packages/plugin-akash/src/actions/getDeploymentApi.ts

@@ -5,7 +5,7 @@ import { validateAkashConfig } from "../environment";
 import { AkashError, AkashErrorCode } from "../error/error";
 import * as fs from 'fs';
 import * as path from 'path';
-import { getCertificatePath, getDeploymentsPath } from "../utils/paths";
+import { getDeploymentsPath } from "../utils/paths";
 
 export interface DeploymentInfo {
     owner: string;
@@ -278,7 +278,6 @@ export async function loadDeploymentInfo(filePath: string): Promise<DeploymentIn
     elizaLogger.info("Loading deployment info", { filePath });
 
     try {
-        const fs = require('fs');
         if (!fs.existsSync(filePath)) {
             throw new AkashError(
                 `Deployment info file not found: ${filePath}`,
@@ -383,14 +382,14 @@ export const getDeploymentApiAction: Action = {
         runtime: IAgentRuntime,
         message: Memory,
         state: State | undefined,
-        options: { [key: string]: unknown } = {},
+        _options: { [key: string]: unknown } = {},
         callback?: HandlerCallback
     ): Promise<boolean> => {
         const actionId = Date.now().toString();
         elizaLogger.info("Starting deployment API request", { actionId });
 
         try {
-            const config = await validateAkashConfig(runtime);
+            // const config = await validateAkashConfig(runtime);
             const params = message.content as Partial<GetDeploymentsContent>;
 
             // Fetch deployments

packages/plugin-akash/src/actions/getDeploymentStatus.ts

@@ -144,7 +144,7 @@ export const getDeploymentStatusAction: Action = {
         runtime: IAgentRuntime,
         message: Memory,
         state: State | undefined,
-        options: { [key: string]: unknown } = {},
+        _options: { [key: string]: unknown } = {},
         callback?: HandlerCallback
     ): Promise<boolean> => {
         const actionId = Date.now().toString();

packages/plugin-akash/src/actions/getGPUPricing.ts

@@ -94,7 +94,7 @@ export const getGPUPricingAction: Action = {
         runtime: IAgentRuntime,
         message: Memory,
         state: State | undefined,
-        options: { [key: string]: unknown; } = {},
+        _options: { [key: string]: unknown; } = {},
         callback?: HandlerCallback
     ): Promise<boolean> => {
         const actionId = Date.now().toString();

packages/plugin-akash/src/actions/getManifest.ts

@@ -6,8 +6,8 @@ import { AkashError, AkashErrorCode } from "../error/error";
 import * as fs from 'fs';
 import * as path from 'path';
 import yaml from 'js-yaml';
-import { getAkashTypeRegistry } from "@akashnetwork/akashjs/build/stargate";
-import { getCertificatePath, getDefaultSDLPath } from "../utils/paths";
+// import { getAkashTypeRegistry } from "@akashnetwork/akashjs/build/stargate";
+import { getDefaultSDLPath } from "../utils/paths";
 
 interface GetManifestContent extends Content {
     sdl?: string;
@@ -121,10 +121,10 @@ const validateSDL = (sdlContent: string, validationLevel: string = "strict"): bo
         // });
         return true;
     } catch (error) {
-        // elizaLogger.error("SDL validation failed", {
-        //     error: error instanceof Error ? error.message : String(error),
-        //     validationLevel
-        // });
+        elizaLogger.error("SDL validation failed", {
+            error: error instanceof Error ? error.message : String(error),
+            validationLevel
+        });
         return false;
     }
 };
@@ -186,7 +186,7 @@ export const getManifestAction: Action = {
         runtime: IAgentRuntime,
         message: Memory,
         state: State | undefined,
-        options: { [key: string]: unknown; } = {},
+        _options: { [key: string]: unknown; } = {},
         callback?: HandlerCallback
     ): Promise<boolean> => {
         const actionId = Date.now().toString();

packages/plugin-akash/src/actions/getProvidersList.ts

@@ -211,7 +211,7 @@ export const getProvidersListAction: Action = {
         runtime: IAgentRuntime,
         message: Memory,
         state: State | undefined,
-        options: { [key: string]: unknown; } = {},
+        _options: { [key: string]: unknown; } = {},
         callback?: HandlerCallback
     ): Promise<boolean> => {
         const actionId = Date.now().toString();

packages/plugin-akash/src/error/error.ts

@@ -1,4 +1,3 @@
-import { elizaLogger } from "@elizaos/core";
 
 export enum AkashErrorCategory {
     WALLET = 'WALLET',

packages/plugin-akash/src/index.ts

@@ -1,4 +1,4 @@
-import { Plugin, elizaLogger } from "@elizaos/core";
+import { Plugin} from "@elizaos/core";
 import { createDeploymentAction } from "./actions/createDeployment";
 import { closeDeploymentAction } from "./actions/closeDeployment";
 import { getProviderInfoAction } from "./actions/getProviderInfo";

packages/plugin-akash/src/providers/wallet.ts

@@ -1,15 +1,14 @@
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
 import { SigningStargateClient } from "@cosmjs/stargate";
-import { elizaLogger } from "@elizaos/core";
-import { IAgentRuntime, Memory } from "@elizaos/core/src/types";
+import { elizaLogger, IAgentRuntime, Memory } from "@elizaos/core";
+// import { IAgentRuntime, Memory } from "@elizaos/core/src/types";
 import { validateAkashConfig } from "../environment";
 import { getAkashTypeRegistry } from "@akashnetwork/akashjs/build/stargate";
 import {
     AkashProvider,
     AkashWalletState,
     AkashError,
     AKASH_ERROR_CODES,
-    AkashRegistryTypes
 } from "../types";
 
 // Use a proper UUID for the wallet room

packages/plugin-akash/src/types.ts

@@ -1,10 +1,10 @@
-import { DirectSecp256k1HdWallet, Registry } from "@cosmjs/proto-signing";
+import { DirectSecp256k1HdWallet} from "@cosmjs/proto-signing";
 import { SigningStargateClient } from "@cosmjs/stargate";
-import { Provider } from "@elizaos/core";
+// import { Provider } from "@elizaos/core";
 import { IAgentRuntime, Memory } from "@elizaos/core";
 import { SDL } from "@akashnetwork/akashjs/build/sdl";
 import { MsgCreateDeployment } from "@akashnetwork/akash-api/akash/deployment/v1beta3";
-import { QueryBidsRequest, MsgCreateLease, BidID } from "@akashnetwork/akash-api/akash/market/v1beta4";
+import { MsgCreateLease} from "@akashnetwork/akash-api/akash/market/v1beta4";
 
 // Core wallet state type
 export interface AkashWalletState {

packages/plugin-akash/src/utils/paths.ts

@@ -2,7 +2,6 @@ import * as path from 'path';
 import { fileURLToPath } from 'url';
 import { elizaLogger } from "@elizaos/core";
 import { existsSync } from 'fs';
-import fs from 'fs';
 import { getConfig } from '../environment';
 
 export const getPluginRoot = (importMetaUrl: string) => {
@@ -81,7 +80,7 @@ export const getDefaultSDLPath = (importMetaUrl: string) => {
     const config = getConfig(process.env.AKASH_ENV);
     const sdlFileName = config.AKASH_SDL;
     const sdlPath = path.join(srcPath, 'sdl', sdlFileName);
-    const sdlDir = path.dirname(sdlPath);
+    // const sdlDir = path.dirname(sdlPath);
 
     // Only log if file doesn't exist as a warning
     if (!existsSync(sdlPath)) {

packages/plugin-starknet/package.json

@@ -20,6 +20,7 @@
     ],
     "dependencies": {
         "@elizaos/core": "workspace:*",
+        "@elizaos/plugin-trustdb": "workspace:*",
         "@avnu/avnu-sdk": "2.1.1",
         "@uniswap/sdk-core": "6.0.0",
         "unruggable-sdk": "1.4.0",

packages/plugin-starknet/src/providers/portfolioProvider.ts

@@ -119,4 +119,4 @@ const walletProvider: Provider = {
     },
 };
 
-export { walletProvider };
+export { walletProvider, TokenBalances };

packages/plugin-starknet/src/providers/token.ts

@@ -12,7 +12,7 @@ import {
     CalculatedBuyAmounts,
     Prices,
 } from "../types/trustDB.ts";
-import { WalletProvider, Item } from "./walletProvider.ts";
+import { WalletProvider, TokenBalances } from "./portfolioProvider.ts";
 import { num } from "starknet";
 import {
     analyzeHighSupplyHolders,
@@ -129,22 +129,35 @@ export class TokenProvider {
     }
 
     // TODO: Update to Starknet
-    async getTokensInWallet(runtime: IAgentRuntime): Promise<Item[]> {
-        const walletInfo =
-            await this.walletProvider.fetchPortfolioValue(runtime);
-        const items = walletInfo.items;
-        return items;
+    async getTokensInWallet(): Promise<TokenBalances> {
+        const tokenBalances =
+             await this.walletProvider.getWalletPortfolio();
+        return tokenBalances;
     }
 
     // check if the token symbol is in the wallet
-    async getTokenFromWallet(runtime: IAgentRuntime, tokenSymbol: string) {
+    async getTokenFromWallet(tokenSymbol: string) {
         try {
-            const items = await this.getTokensInWallet(runtime);
-            const token = items.find((item) => item.symbol === tokenSymbol);
+            // Find the token in the PORTFOLIO_TOKENS using the provided tokenSymbol
+            const portfolioToken = Object.values(PORTFOLIO_TOKENS).find(
+                (token) => token.coingeckoId === tokenSymbol
+            );
+
+            if (!portfolioToken) {
+                console.warn(`Token with symbol ${tokenSymbol} not found in PORTFOLIO_TOKENS`);
+                return null;
+            }
+
+            const tokenAddress = portfolioToken.address;
+
+            // Get the list of tokens in the wallet
+            const items = await this.getTokensInWallet();
 
-            if (token) {
-                return token.address;
+            // Check if the tokenAddress exists in the TokenBalances
+            if (items[tokenAddress]) {
+                return tokenAddress;
             } else {
+                console.warn(`Token with address ${tokenAddress} not found in wallet`);
                 return null;
             }
         } catch (error) {