Removed tooling added

src/langchain/3land/create_collection.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import {
   CreateCollectionOptions,
   StoreInitOptions,

src/langchain/3land/create_single.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import {
   CreateSingleOptions,
   StoreInitOptions,

src/langchain/3land/index.ts

@@ -0,0 +1,2 @@
+export * from "./create_single";
+export * from "./create_collection";

src/langchain/adrena/close_trade.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { PerpTradeResponse } from "./types";
 
 export class SolanaPerpCloseTradeTool extends BaseSolanaTool {

src/langchain/adrena/index.ts

@@ -0,0 +1,2 @@
+export * from "./open_trade";
+export * from "./close_trade";

src/langchain/adrena/open_trade.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { PerpTradeResponse } from "./types";
 
 export class SolanaPerpOpenTradeTool extends BaseSolanaTool {

src/langchain/agent/create_image.ts

@@ -1,6 +1,6 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { CreateImageResponse } from "./types";
-import { create_image } from "../../../tools/agent";
+import { create_image } from "../../tools/agent";
 
 export class SolanaCreateImageTool extends BaseSolanaTool {
   name = "solana_create_image";

src/langchain/agent/index.ts

@@ -0,0 +1,2 @@
+export * from "./create_image";
+export * from "./wallet_address";

src/langchain/agent/wallet_address.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { WalletAddressResponse } from "./types";
 
 export class SolanaGetWalletAddressTool extends BaseSolanaTool {

src/langchain/bonfida/get_domain.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { DomainResponse } from "./types";
 
 export class SolanaGetDomainTool extends BaseSolanaTool {

src/langchain/bonfida/index.ts

@@ -0,0 +1,4 @@
+export * from "./register_domain";
+export * from "./resolve_domain";
+export * from "./get_domain";
+export * from "./main_domain";

src/langchain/bonfida/main_domain.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { DomainResponse } from "./types";
 
 export class SolanaGetMainDomain extends BaseSolanaTool {

src/langchain/bonfida/register_domain.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { RegisterDomainInput, RegisterDomainResponse } from "./types";
 
 export class SolanaRegisterDomainTool extends BaseSolanaTool {

src/langchain/bonfida/resolve_domain.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { ResolveDomainResponse } from "./types";
 
 export class SolanaResolveDomainTool extends BaseSolanaTool {

src/langchain/common/base.ts

@@ -1,5 +1,5 @@
 import { Tool } from "langchain/tools";
-import { SolanaAgentKit } from "../../../agent";
+import { SolanaAgentKit } from "../../agent";
 import { BaseToolResponse } from "./types";
 
 export abstract class BaseSolanaTool extends Tool {

src/langchain/common/index.ts

@@ -0,0 +1,2 @@
+export * from "./types";
+export * from "./base";

src/langchain/dexscreener/index.ts

@@ -0,0 +1 @@
+export * from "./token_data_ticker";

src/langchain/dexscreener/token_data_ticker.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 
 export class SolanaTokenDataByTickerTool extends BaseSolanaTool {
   name = "solana_token_data_by_ticker";

src/langchain/flash/flash_close.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { FlashCloseTradeInput, PerpTradeResponse } from "./types";
 
 export class SolanaFlashCloseTrade extends BaseSolanaTool {

src/langchain/flash/flash_open.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { FlashOpenTradeInput, PerpTradeResponse } from "./types";
 
 export class SolanaFlashOpenTrade extends BaseSolanaTool {

src/langchain/flash/index.ts

@@ -0,0 +1,3 @@
+export * from "./flash_open";
+export * from "./flash_close";
+export * from "./types";

src/langchain/gibwork/create_task.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { CreateGibworkTaskInput, GibworkTaskResponse } from "./types";
 
 export class SolanaCreateGibworkTask extends BaseSolanaTool {

src/langchain/gibwork/index.ts

@@ -0,0 +1,2 @@
+export * from "./create_task";
+export * from "./types";

src/langchain/index.ts

@@ -1,3 +1,29 @@
+export * from "./adrena";
+export * from "./onsol";
+export * from "./dexscreener";
+export * from "./onsol";
+export * from "./flash";
+export * from "./gibwork";
+export * from "./jupiter";
+export * from "./lulo";
+export * from "./manifest";
+export * from "./solana";
+export * from "./agent";
+export * from "./metaplex";
+export * from "./openbook";
+export * from "./orca";
+export * from "./pumpfun";
+export * from "./pyth";
+export * from "./raydium";
+export * from "./rugcheck";
+export * from "./sendarcade";
+export * from "./solayer";
+export * from "./tensor";
+export * from "./3land";
+export * from "./tiplink";
+export * from "./bonfida";
+export * from "./lightprotocol";
+
 import { SolanaAgentKit } from "../agent";
 import {
   SolanaBalanceTool,
@@ -57,7 +83,7 @@ import {
   SolanaPerpCloseTradeTool,
   SolanaFlashOpenTrade,
   SolanaFlashCloseTrade,
-} from "./tools/index";
+} from "./index";
 
 export function createSolanaTools(solanaKit: SolanaAgentKit) {
   return [

src/langchain/jupiter/fetch_price.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { PriceResponse } from "./types";
 
 export class SolanaFetchPriceTool extends BaseSolanaTool {

src/langchain/jupiter/index.ts

@@ -0,0 +1,5 @@
+export * from "./fetch_price";
+export * from "./token_data";
+export * from "./trade";
+export * from "./stake";
+export * from "./types";

src/langchain/jupiter/stake.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { StakeResponse } from "./types";
 
 export class SolanaStakeTool extends BaseSolanaTool {

src/langchain/jupiter/token_data.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 
 export class SolanaTokenDataTool extends BaseSolanaTool {
   name = "solana_token_data";

src/langchain/lightprotocol/compressed_airdrop.ts

@@ -1,5 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
-import { CompressedAirdropInput, CompressedAirdropResponse } from "./types";
+import { BaseSolanaTool } from "../common/base";
 
 export class SolanaCompressedAirdropTool extends BaseSolanaTool {
   name = "solana_compressed_airdrop";
@@ -15,7 +14,7 @@ export class SolanaCompressedAirdropTool extends BaseSolanaTool {
 
   protected async _call(input: string): Promise<string> {
     try {
-      const params: CompressedAirdropInput = JSON.parse(input);
+      const params = JSON.parse(input);
 
       const txs = await this.solanaKit.sendCompressedAirdrop(
         params.mintAddress,
@@ -30,7 +29,7 @@ export class SolanaCompressedAirdropTool extends BaseSolanaTool {
         status: "success",
         message: `Airdropped ${params.amount} tokens to ${params.recipients.length} recipients.`,
         transactionHashes: txs,
-      } as CompressedAirdropResponse);
+      });
     } catch (error: any) {
       return this.handleError(error);
     }

src/langchain/lightprotocol/index.ts

@@ -0,0 +1 @@
+export * from "./compressed_airdrop";

src/langchain/lulo/index.ts

@@ -0,0 +1,2 @@
+export * from "./lend_asset";
+export * from "./types";

src/langchain/lulo/lend_asset.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { LendAssetResponse } from "./types";
 
 export class SolanaLendAssetTool extends BaseSolanaTool {

src/langchain/manifest/batch_order.ts

@@ -1,6 +1,6 @@
 import { BaseSolanaTool } from "../common";
-import { OrderParams } from "../../../types";
-import { generateOrdersfromPattern } from "./../../../tools/manifest";
+import { OrderParams } from "../../types";
+import { generateOrdersfromPattern } from "../../tools/manifest";
 import { PublicKey } from "@solana/web3.js";
 
 export class SolanaBatchOrderTool extends BaseSolanaTool {

src/langchain/manifest/index.ts

@@ -0,0 +1,6 @@
+export * from "./manifest_market";
+export * from "./batch_order";
+export * from "./cancel_orders";
+export * from "./limit_order";
+export * from "./withdraw";
+export * from "./types";

src/langchain/manifest/manifest_market.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { ManifestMarketInput, ManifestMarketResponse } from "./types";
 
 export class SolanaManifestCreateMarket extends BaseSolanaTool {

src/langchain/metaplex/deploy_collection.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { DeployCollectionInput, DeployCollectionResponse } from "./types";
 
 export class SolanaDeployCollectionTool extends BaseSolanaTool {

src/langchain/metaplex/deploy_token.ts

@@ -1,5 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
-import { DeployTokenInput, DeployTokenResponse } from "./types";
+import { BaseSolanaTool } from "../common/base";
 
 export class SolanaDeployTokenTool extends BaseSolanaTool {
   name = "solana_deploy_token";
@@ -14,7 +13,7 @@ export class SolanaDeployTokenTool extends BaseSolanaTool {
 
   protected async _call(input: string): Promise<string> {
     try {
-      const params: DeployTokenInput = JSON.parse(input);
+      const params = JSON.parse(input);
 
       const result = await this.solanaKit.deployToken(
         params.name,
@@ -29,7 +28,7 @@ export class SolanaDeployTokenTool extends BaseSolanaTool {
         message: "Token deployed successfully",
         mintAddress: result.mint.toString(),
         decimals: params.decimals || 9,
-      } as DeployTokenResponse);
+      });
     } catch (error: any) {
       return this.handleError(error);
     }

src/langchain/metaplex/index.ts

@@ -0,0 +1,4 @@
+export * from "./deploy_collection";
+export * from "./mint_nft";
+export * from "./deploy_token";
+export * from "./types";

src/langchain/metaplex/mint_nft.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { MintNFTInput, MintNFTResponse } from "./types";
 
 export class SolanaMintNFTTool extends BaseSolanaTool {

src/langchain/onsol/index.ts

@@ -0,0 +1,5 @@
+export * from "./resolve_all_domains";
+export * from "./owned_domains";
+export * from "./tld_domains";
+export * from "./get_all_tld";
+export * from "./types";

src/langchain/onsol/owned_domains.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { DomainsListResponse } from "./types";
 
 export class SolanaGetOwnedDomains extends BaseSolanaTool {

src/langchain/onsol/resolve_all_domains.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { ResolveDomainResponse } from "./types";
 
 export class SolanaResolveAllDomainsTool extends BaseSolanaTool {

src/langchain/onsol/tld_domains.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { DomainsListResponse } from "./types";
 
 export class SolanaGetOwnedTldDomains extends BaseSolanaTool {

src/langchain/onsol/types.ts

@@ -0,0 +1,45 @@
+import { BaseToolResponse } from "../common/types";
+
+export interface RegisterDomainInput {
+  name: string;
+  spaceKB?: number;
+}
+
+export interface ResolveDomainInput {
+  domain: string;
+}
+
+export interface GetDomainInput {
+  account: string;
+}
+
+export interface OwnedDomainsInput {
+  owner: string;
+}
+
+export interface TldDomainsInput {
+  tld: string;
+}
+
+export interface RegisterDomainResponse extends BaseToolResponse {
+  transaction?: string;
+  domain?: string;
+  spaceKB?: number;
+}
+
+export interface ResolveDomainResponse extends BaseToolResponse {
+  publicKey?: string;
+  owner?: string;
+}
+
+export interface DomainResponse extends BaseToolResponse {
+  domain?: string | null;
+}
+
+export interface DomainsListResponse extends BaseToolResponse {
+  domains?: string[];
+}
+
+export interface TldsResponse extends BaseToolResponse {
+  tlds?: string[];
+}

src/langchain/openbook/index.ts

@@ -0,0 +1,2 @@
+export * from "./openbook_market";
+export * from "./types";

src/langchain/openbook/openbook_market.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { OpenbookMarketInput } from "./types";
 
 export class SolanaOpenbookCreateMarket extends BaseSolanaTool {

src/langchain/orca/index.ts

@@ -0,0 +1,7 @@
+export * from "./orca_clmm";
+export * from "./orca_single_sided_pool";
+export * from "./orca_position";
+export * from "./orca_fetch_positions";
+export * from "./orca_centered_position";
+export * from "./orca_single_sided_position";
+export * from "./types";

src/langchain/orca/orca_centered_position.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { Decimal } from "decimal.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { OrcaCenteredPositionInput, LiquidityResponse } from "./types";
 
 export class SolanaOrcaOpenCenteredPosition extends BaseSolanaTool {

src/langchain/orca/orca_clmm.ts

@@ -1,8 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
 import { Decimal } from "decimal.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { LiquidityResponse } from "./types";
-import { FEE_TIERS } from "../../../tools/orca";
+import { FEE_TIERS } from "../../tools/orca";
 
 export class SolanaOrcaCreateCLMM extends BaseSolanaTool {
   name = "orca_create_clmm";

src/langchain/orca/orca_fetch_positions.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { OrcaPositionsResponse } from "./types";
 
 export class SolanaOrcaFetchPositions extends BaseSolanaTool {

src/langchain/orca/orca_position.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { OrcaPositionInput, LiquidityResponse } from "./types";
 
 export class SolanaOrcaClosePosition extends BaseSolanaTool {

src/langchain/orca/orca_single_sided_pool.ts

@@ -1,8 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
 import { Decimal } from "decimal.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { LiquidityResponse } from "./types";
-import { FEE_TIERS } from "../../../tools/orca";
+import { FEE_TIERS } from "../../tools/orca";
 
 export class SolanaOrcaCreateSingleSidedPool extends BaseSolanaTool {
   name = "orca_create_single_sided_liquidity_pool";

src/langchain/orca/orca_single_sided_position.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { Decimal } from "decimal.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { OrcaSingleSidedPositionInput, LiquidityResponse } from "./types";
 
 export class SolanaOrcaOpenSingleSidedPosition extends BaseSolanaTool {

src/langchain/pumpfun/index.ts

@@ -0,0 +1 @@
+export * from "./launch_pumpfun_token";

src/langchain/pyth/index.ts

@@ -0,0 +1,2 @@
+export * from "./pyth_price";
+export * from "./types";

src/langchain/pyth/pyth_price.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { PythPriceResponse } from "./types";
 
 export class SolanaPythFetchPrice extends BaseSolanaTool {

src/langchain/raydium/index.ts

@@ -0,0 +1,4 @@
+export * from "./raydium_amm";
+export * from "./raydium_clmm";
+export * from "./raydium_cpmm";
+export * from "./types";

src/langchain/raydium/raydium_amm.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { BN } from "@coral-xyz/anchor";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { RaydiumAmmV4Input } from "./types";
 
 export class SolanaRaydiumCreateAmmV4 extends BaseSolanaTool {

src/langchain/raydium/raydium_clmm.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { BN } from "@coral-xyz/anchor";
 import { Decimal } from "decimal.js";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { RaydiumClmmInput } from "./types";
 
 export class SolanaRaydiumCreateClmm extends BaseSolanaTool {

src/langchain/raydium/raydium_cpmm.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { BN } from "@coral-xyz/anchor";
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { RaydiumCpmmInput } from "./types";
 
 export class SolanaRaydiumCreateCpmm extends BaseSolanaTool {

src/langchain/rugcheck/index.ts

@@ -0,0 +1,3 @@
+export * from "./token_report_summary";
+export * from "./token_report_detailed";
+export * from "./types";

src/langchain/rugcheck/token_report_detailed.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { TokenReportResponse } from "./types";
 
 export class SolanaFetchTokenDetailedReportTool extends BaseSolanaTool {

src/langchain/rugcheck/token_report_summary.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { TokenReportResponse } from "./types";
 
 export class SolanaFetchTokenReportSummaryTool extends BaseSolanaTool {

src/langchain/sendarcade/index.ts

@@ -0,0 +1,2 @@
+export * from "./rock_paper_scissors";
+export * from "./types";

src/langchain/sendarcade/rock_paper_scissors.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { RockPaperScissorsInput } from "./types";
 
 export class SolanaRockPaperScissorsTool extends BaseSolanaTool {

src/langchain/solana/balance.ts

@@ -1,6 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
-import { BalanceToolInput, BalanceToolResponse } from "./types";
+import { BaseSolanaTool } from "../common/base";
 
 export class SolanaBalanceTool extends BaseSolanaTool {
   name = "solana_balance";
@@ -14,7 +13,7 @@ export class SolanaBalanceTool extends BaseSolanaTool {
 
   protected async _call(input: string): Promise<string> {
     try {
-      const params: BalanceToolInput = input ? JSON.parse(input) : {};
+      const params = input ? JSON.parse(input) : {};
       const tokenAddress = params.tokenAddress
         ? new PublicKey(params.tokenAddress)
         : undefined;
@@ -24,7 +23,7 @@ export class SolanaBalanceTool extends BaseSolanaTool {
         status: "success",
         balance,
         token: params.tokenAddress || "SOL",
-      } as BalanceToolResponse);
+      });
     } catch (error: any) {
       return this.handleError(error);
     }

src/langchain/solana/balance_other.ts

@@ -1,6 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
-import { BalanceOtherToolInput, BalanceOtherToolResponse } from "./types";
+import { BaseSolanaTool } from "../common/base";
 
 export class SolanaBalanceOtherTool extends BaseSolanaTool {
   name = "solana_balance_other";
@@ -14,7 +13,7 @@ export class SolanaBalanceOtherTool extends BaseSolanaTool {
 
   protected async _call(input: string): Promise<string> {
     try {
-      const params: BalanceOtherToolInput = JSON.parse(input);
+      const params = JSON.parse(input);
       const tokenPubKey = params.tokenAddress
         ? new PublicKey(params.tokenAddress)
         : undefined;
@@ -29,7 +28,7 @@ export class SolanaBalanceOtherTool extends BaseSolanaTool {
         balance,
         wallet: params.walletAddress,
         token: params.tokenAddress || "SOL",
-      } as BalanceOtherToolResponse);
+      });
     } catch (error: any) {
       return this.handleError(error);
     }

src/langchain/solana/close_empty_accounts.ts

@@ -1,5 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
-import { CloseEmptyAccountsResponse } from "./types";
+import { BaseSolanaTool } from "../common/base";
 
 export class SolanaCloseEmptyTokenAccounts extends BaseSolanaTool {
   name = "close_empty_token_accounts";
@@ -15,7 +14,7 @@ export class SolanaCloseEmptyTokenAccounts extends BaseSolanaTool {
         message: `${size} accounts closed successfully. ${size === 48 ? "48 accounts can be closed in a single transaction try again to close more accounts" : ""}`,
         signature,
         size,
-      } as CloseEmptyAccountsResponse);
+      });
     } catch (error: any) {
       return this.handleError(error);
     }

src/langchain/solana/get_tps.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { TPSResponse } from "./types";
 
 export class SolanaTPSCalculatorTool extends BaseSolanaTool {

src/langchain/solana/index.ts

@@ -0,0 +1,7 @@
+export * from "./get_tps";
+export * from "./request_funds";
+export * from "./balance";
+export * from "./balance_other";
+export * from "./close_empty_accounts";
+export * from "./transfer";
+export * from "./types";

src/langchain/solana/request_funds.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { BaseToolResponse } from "../common/types";
 
 export class SolanaRequestFundsTool extends BaseSolanaTool {

src/langchain/solana/transfer.ts

@@ -1,6 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { BaseSolanaTool } from "../common/base.tool";
-import { TransferToolInput, TransferToolResponse } from "./types";
+import { BaseSolanaTool } from "../common/base";
 
 export class SolanaTransferTool extends BaseSolanaTool {
   name = "solana_transfer";
@@ -13,7 +12,7 @@ export class SolanaTransferTool extends BaseSolanaTool {
 
   protected async _call(input: string): Promise<string> {
     try {
-      const params: TransferToolInput = JSON.parse(input);
+      const params = JSON.parse(input);
 
       const recipient = new PublicKey(params.to);
       const mintAddress = params.mint ? new PublicKey(params.mint) : undefined;
@@ -31,7 +30,7 @@ export class SolanaTransferTool extends BaseSolanaTool {
         recipient: params.to,
         token: params.mint || "SOL",
         transaction: tx,
-      } as TransferToolResponse);
+      });
     } catch (error: any) {
       return this.handleError(error);
     }

src/langchain/solayer/index.ts

@@ -0,0 +1 @@
+export * from "./restake";

src/langchain/solayer/restake.ts

@@ -1,4 +1,4 @@
-import { BaseSolanaTool } from "../common/base.tool";
+import { BaseSolanaTool } from "../common/base";
 import { StakeResponse } from "./types";
 
 export class SolanaRestakeTool extends BaseSolanaTool {

src/langchain/squads_multisig/approve_proposal.ts

@@ -0,0 +1,33 @@
+import { BaseSolanaTool } from "../common";
+
+export class SolanaApproveProposal2by2Multisig extends BaseSolanaTool {
+  name = "approve_proposal_2by2_multisig";
+  description = `Approve a proposal to transfer funds from a 2-of-2 multisig account on Solana with the user and the agent, where both approvals will be required to run the transactions.
+  
+  If proposalIndex is not provided, the latest index will automatically be fetched and used.
+
+  Inputs (JSON string):
+  - proposalIndex: number, the index of the proposal (optional).`;
+
+  protected async _call(input: string): Promise<string> {
+    try {
+      const inputFormat = JSON.parse(input);
+      const proposalIndex = inputFormat.proposalIndex ?? undefined;
+
+      const tx = await this.solanaKit.approveMultisigProposal(proposalIndex);
+
+      return JSON.stringify({
+        status: "success",
+        message: "Proposal approved successfully",
+        transaction: tx,
+        proposalIndex: proposalIndex.toString(),
+      });
+    } catch (error: any) {
+      return JSON.stringify({
+        status: "error",
+        message: error.message,
+        code: error.code || "APPROVE_PROPOSAL_2BY2_MULTISIG_ERROR",
+      });
+    }
+  }
+}

src/langchain/squads_multisig/create_multisig.ts

@@ -0,0 +1,33 @@
+import { BaseSolanaTool } from "../common";
+import { PublicKey } from "@solana/web3.js";
+
+export class SolanaCreate2by2Multisig extends BaseSolanaTool {
+  name = "create_2by2_multisig";
+  description = `Create a 2-of-2 multisig account on Solana with the user and the agent, where both approvals will be required to run the transactions.
+  
+  Note: For one AI agent, only one 2-by-2 multisig can be created as it is pair-wise.
+
+  Inputs (JSON string):
+  - creator: string, the public key of the creator (required).`;
+
+  protected async _call(input: string): Promise<string> {
+    try {
+      const inputFormat = JSON.parse(input);
+      const creator = new PublicKey(inputFormat.creator);
+
+      const multisig = await this.solanaKit.createSquadsMultisig(creator);
+
+      return JSON.stringify({
+        status: "success",
+        message: "2-by-2 multisig account created successfully",
+        multisig,
+      });
+    } catch (error: any) {
+      return JSON.stringify({
+        status: "error",
+        message: error.message,
+        code: error.code || "CREATE_2BY2_MULTISIG_ERROR",
+      });
+    }
+  }
+}