Merge branch 'main' into feat/squads_multisig

src/agent/index.ts

@@ -6,6 +6,7 @@ import {
   deploy_collection,
   deploy_token,
   get_balance,
+  get_balance_other,
   getTPS,
   resolveSolDomain,
   getPrimaryDomain,
@@ -66,12 +67,12 @@ export class SolanaAgentKit {
   public connection: Connection;
   public wallet: Keypair;
   public wallet_address: PublicKey;
-  public openai_api_key: string;
+  public openai_api_key: string | null;
 
   constructor(
     private_key: string,
     rpc_url = "https://api.mainnet-beta.solana.com",
-    openai_api_key: string,
+    openai_api_key: string | null = null,
   ) {
     this.connection = new Connection(rpc_url);
     this.wallet = Keypair.fromSecretKey(bs58.decode(private_key));
@@ -104,6 +105,13 @@ export class SolanaAgentKit {
     return get_balance(this, token_address);
   }
 
+  async getBalanceOther(
+    walletAddress: PublicKey,
+    tokenAddress?: PublicKey,
+  ): Promise<number> {
+    return get_balance_other(this, walletAddress, tokenAddress);
+  }
+
   async mintNFT(
     collectionMint: PublicKey,
     metadata: Parameters<typeof mintCollectionNFT>[2],

src/langchain/index.ts

@@ -9,7 +9,6 @@ import {
 import { create_image } from "../tools/create_image";
 import { BN } from "@coral-xyz/anchor";
 import { FEE_TIERS } from "../tools";
-import { toJSON } from "../utils/toJSON";
 
 export class SolanaBalanceTool extends Tool {
   name = "solana_balance";
@@ -18,7 +17,7 @@ export class SolanaBalanceTool extends Tool {
   If you want to get the balance of your wallet, you don't need to provide the tokenAddress.
   If no tokenAddress is provided, the balance will be in SOL.
 
-  Inputs:
+  Inputs ( input is a JSON string ):
   tokenAddress: string, eg "So11111111111111111111111111111111111111112" (optional)`;
 
   constructor(private solanaKit: SolanaAgentKit) {
@@ -32,7 +31,7 @@ export class SolanaBalanceTool extends Tool {
 
       return JSON.stringify({
         status: "success",
-        balance: balance,
+        balance,
         token: input || "SOL",
       });
     } catch (error: any) {
@@ -45,6 +44,49 @@ export class SolanaBalanceTool extends Tool {
   }
 }
 
+export class SolanaBalanceOtherTool extends Tool {
+  name = "solana_balance_other";
+  description = `Get the balance of a Solana wallet or token account different from the agent's wallet.
+
+  If no tokenAddress is provided, the SOL balance of the wallet will be returned.
+
+  Inputs ( input is a JSON string ):
+  walletAddress: string, eg "GDEkQF7UMr7RLv1KQKMtm8E2w3iafxJLtyXu3HVQZnME" (required)
+  tokenAddress: string, eg "SENDdRQtYMWaQrBroBrJ2Q53fgVuq95CV9UPGEvpCxa" (optional)`;
+
+  constructor(private solanaKit: SolanaAgentKit) {
+    super();
+  }
+
+  protected async _call(input: string): Promise<string> {
+    try {
+      const { walletAddress, tokenAddress } = JSON.parse(input);
+
+      const tokenPubKey = tokenAddress
+        ? new PublicKey(tokenAddress)
+        : undefined;
+
+      const balance = await this.solanaKit.getBalanceOther(
+        new PublicKey(walletAddress),
+        tokenPubKey,
+      );
+
+      return JSON.stringify({
+        status: "success",
+        balance,
+        wallet: walletAddress,
+        token: tokenAddress || "SOL",
+      });
+    } catch (error: any) {
+      return JSON.stringify({
+        status: "error",
+        message: error.message,
+        code: error.code || "UNKNOWN_ERROR",
+      });
+    }
+  }
+}
+
 export class SolanaTransferTool extends Tool {
   name = "solana_transfer";
   description = `Transfer tokens or SOL to another address ( also called as wallet address ).
@@ -318,7 +360,7 @@ export class SolanaRegisterDomainTool extends Tool {
 
   protected async _call(input: string): Promise<string> {
     try {
-      const parsedInput = toJSON(input);
+      const parsedInput = JSON.parse(input);
       this.validateInput(parsedInput);
 
       const tx = await this.solanaKit.registerDomain(
@@ -555,7 +597,7 @@ export class SolanaLendAssetTool extends Tool {
         status: "success",
         message: "Asset lent successfully",
         transaction: tx,
-        amount: amount,
+        amount,
       });
     } catch (error: any) {
       return JSON.stringify({
@@ -669,7 +711,7 @@ export class SolanaTokenDataTool extends Tool {
 
       return JSON.stringify({
         status: "success",
-        tokenData: tokenData,
+        tokenData,
       });
     } catch (error: any) {
       return JSON.stringify({
@@ -698,7 +740,7 @@ export class SolanaTokenDataByTickerTool extends Tool {
       const tokenData = await this.solanaKit.getTokenDataByTicker(ticker);
       return JSON.stringify({
         status: "success",
-        tokenData: tokenData,
+        tokenData,
       });
     } catch (error: any) {
       return JSON.stringify({
@@ -1005,7 +1047,7 @@ export class SolanaPythFetchPrice extends Tool {
       const response: PythFetchPriceResponse = {
         status: "success",
         priceFeedID: input,
-        price: price,
+        price,
       };
       return JSON.stringify(response);
     } catch (error: any) {
@@ -1079,7 +1121,7 @@ export class SolanaGetOwnedDomains extends Tool {
       return JSON.stringify({
         status: "success",
         message: "Owned domains fetched successfully",
-        domains: domains,
+        domains,
       });
     } catch (error: any) {
       return JSON.stringify({
@@ -1109,7 +1151,7 @@ export class SolanaGetOwnedTldDomains extends Tool {
       return JSON.stringify({
         status: "success",
         message: "TLD domains fetched successfully",
-        domains: domains,
+        domains,
       });
     } catch (error: any) {
       return JSON.stringify({
@@ -1136,7 +1178,7 @@ export class SolanaGetAllTlds extends Tool {
       return JSON.stringify({
         status: "success",
         message: "TLDs fetched successfully",
-        tlds: tlds,
+        tlds,
       });
     } catch (error: any) {
       return JSON.stringify({
@@ -1255,14 +1297,14 @@ export class SolanaRockPaperScissorsTool extends Tool {
 
   protected async _call(input: string): Promise<string> {
     try {
-      const parsedInput = toJSON(input);
+      const parsedInput = JSON.parse(input);
       this.validateInput(parsedInput);
       const result = await this.solanaKit.rockPaperScissors(
         Number(parsedInput['"amount"']),
         parsedInput['"choice"'].replace(/^"|"$/g, "") as
-          | "rock"
-          | "paper"
-          | "scissors",
+        | "rock"
+        | "paper"
+        | "scissors",
       );
 
       return JSON.stringify({
@@ -1329,6 +1371,7 @@ export class SolanaTipLinkTool extends Tool {
 export function createSolanaTools(solanaKit: SolanaAgentKit) {
   return [
     new SolanaBalanceTool(solanaKit),
+    new SolanaBalanceOtherTool(solanaKit),
     new SolanaTransferTool(solanaKit),
     new SolanaDeployTokenTool(solanaKit),
     new SolanaDeployCollectionTool(solanaKit),

src/tools/get_balance_other.ts

@@ -0,0 +1,50 @@
+import {
+  LAMPORTS_PER_SOL,
+  ParsedAccountData,
+  PublicKey,
+} from "@solana/web3.js";
+import { SolanaAgentKit } from "../index";
+
+/**
+ * Get the balance of SOL or an SPL token for the specified wallet address (other than the agent's wallet)
+ * @param agent - SolanaAgentKit instance
+ * @param wallet_address - Public key of the wallet to check balance for
+ * @param token_address - Optional SPL token mint address. If not provided, returns SOL balance
+ * @returns Promise resolving to the balance as a number (in UI units) or 0 if account doesn't exist
+ */
+export async function get_balance_other(
+  agent: SolanaAgentKit,
+  wallet_address: PublicKey,
+  token_address?: PublicKey,
+): Promise<number> {
+  try {
+    if (!token_address) {
+      return (
+        (await agent.connection.getBalance(wallet_address)) / LAMPORTS_PER_SOL
+      );
+    }
+
+    const tokenAccounts = await agent.connection.getTokenAccountsByOwner(
+      wallet_address,
+      { mint: token_address },
+    );
+
+    if (tokenAccounts.value.length === 0) {
+      console.warn(
+        `No token accounts found for wallet ${wallet_address.toString()} and token ${token_address.toString()}`,
+      );
+      return 0;
+    }
+
+    const tokenAccount = await agent.connection.getParsedAccountInfo(
+      tokenAccounts.value[0].pubkey,
+    );
+    const tokenData = tokenAccount.value?.data as ParsedAccountData;
+
+    return tokenData.parsed?.info?.tokenAmount?.uiAmount || 0;
+  } catch (error) {
+    throw new Error(
+      `Error fetching on-chain balance for ${token_address?.toString()}: ${error}`,
+    );
+  }
+}

src/tools/index.ts

@@ -2,6 +2,7 @@ export * from "./request_faucet_funds";
 export * from "./deploy_token";
 export * from "./deploy_collection";
 export * from "./get_balance";
+export * from "./get_balance_other";
 export * from "./mint_nft";
 export * from "./transfer";
 export * from "./trade";

src/tools/trade.ts

@@ -1,11 +1,7 @@
-import {
-  VersionedTransaction,
-  PublicKey,
-  LAMPORTS_PER_SOL,
-} from "@solana/web3.js";
+import { VersionedTransaction, PublicKey } from "@solana/web3.js";
 import { SolanaAgentKit } from "../index";
 import { TOKENS, DEFAULT_OPTIONS, JUP_API } from "../constants";
-
+import { getMint } from "@solana/spl-token";
 /**
  * Swap tokens using Jupiter Exchange
  * @param agent SolanaAgentKit instance
@@ -23,12 +19,23 @@ export async function trade(
   slippageBps: number = DEFAULT_OPTIONS.SLIPPAGE_BPS,
 ): Promise<string> {
   try {
+    // Check if input token is native SOL
+    const isNativeSol = inputMint.equals(TOKENS.SOL);
+
+    // For native SOL, we use LAMPORTS_PER_SOL, otherwise fetch mint info
+    const inputDecimals = isNativeSol
+      ? 9 // SOL always has 9 decimals
+      : (await getMint(agent.connection, inputMint)).decimals;
+
+    // Calculate the correct amount based on actual decimals
+    const scaledAmount = inputAmount * Math.pow(10, inputDecimals);
+
     const quoteResponse = await (
       await fetch(
         `${JUP_API}/quote?` +
-          `inputMint=${inputMint.toString()}` +
+          `inputMint=${isNativeSol ? TOKENS.SOL.toString() : inputMint.toString()}` +
           `&outputMint=${outputMint.toString()}` +
-          `&amount=${inputAmount * LAMPORTS_PER_SOL}` +
+          `&amount=${scaledAmount}` +
           `&slippageBps=${slippageBps}` +
           `&onlyDirectRoutes=true` +
           `&maxAccounts=20`,

src/utils/toJSON.ts

@@ -1,26 +0,0 @@
-export const toJSON = (str: string): any => {
-  try {
-    // Remove curly braces and split by comma
-    const pairs = str.trim().slice(1, -1).split(",");
-
-    // Convert to object with explicit type
-    const obj: Record<string, any> = {};
-
-    pairs.forEach((pair) => {
-      const [key, value] = pair
-        .trim()
-        .split(":")
-        .map((s) => s.trim());
-
-      if (!key || value === undefined) {
-        throw new Error("Invalid key-value pair format");
-      }
-
-      obj[key] = isNaN(Number(value)) ? value : Number(value);
-    });
-
-    return JSON.parse(JSON.stringify(obj));
-  } catch (error) {
-    throw new Error(`Failed to parse string to JSON: ${error}`);
-  }
-};