changes

Author: bryan-eastwood3

typescript/packages/core/src/index.ts

@@ -1,60 +1,60 @@
 import type { Plugin } from "./plugins/plugins";
 import { sendETH } from "./plugins/send-eth";
-import { sendSOL } from "./plugins/send-sol";
+import { sendSOL } from "./plugins/solana/send-sol";
 import {
-    type DeferredTool,
-    type GetDeferredToolsParams,
-    type GetToolsParams,
-    type Tool,
-    getDeferredTools,
-    getTools,
+	type DeferredTool,
+	type GetDeferredToolsParams,
+	type GetToolsParams,
+	type Tool,
+	getDeferredTools,
+	getTools,
 } from "./tools";
 import { addParametersToDescription, parametersToJsonExample } from "./utils";
 import type {
-    Balance,
-    Chain,
-    ChainForWalletClient,
-    EVMReadRequest,
-    EVMSmartWalletClient,
-    EVMTransaction,
-    EVMTypedData,
-    EVMWalletClient,
-    Signature,
-    SolanaReadRequest,
-    SolanaTransaction,
-    SolanaWalletClient,
-    WalletClient,
-    isEVMSmartWalletClient,
-    isEVMWalletClient,
-    isSolanaWalletClient,
+	Balance,
+	Chain,
+	ChainForWalletClient,
+	EVMReadRequest,
+	EVMSmartWalletClient,
+	EVMTransaction,
+	EVMTypedData,
+	EVMWalletClient,
+	Signature,
+	SolanaReadRequest,
+	SolanaTransaction,
+	SolanaWalletClient,
+	WalletClient,
+	isEVMSmartWalletClient,
+	isEVMWalletClient,
+	isSolanaWalletClient,
 } from "./wallets";
 
 export {
-    getTools,
-    getDeferredTools,
-    sendETH,
-    sendSOL,
-    addParametersToDescription,
-    parametersToJsonExample,
-    type Tool,
-    type DeferredTool,
-    type GetToolsParams,
-    type GetDeferredToolsParams,
-    type Plugin,
-    type WalletClient,
-    type EVMTransaction,
-    type EVMReadRequest,
-    type EVMWalletClient,
-    type EVMSmartWalletClient,
-    type SolanaTransaction,
-    type SolanaReadRequest,
-    type SolanaWalletClient,
-    type Signature,
-    type Balance,
-    type EVMTypedData,
-    type isEVMWalletClient,
-    type isEVMSmartWalletClient,
-    type isSolanaWalletClient,
-    type Chain,
-    type ChainForWalletClient,
+	getTools,
+	getDeferredTools,
+	sendETH,
+	sendSOL,
+	addParametersToDescription,
+	parametersToJsonExample,
+	type Tool,
+	type DeferredTool,
+	type GetToolsParams,
+	type GetDeferredToolsParams,
+	type Plugin,
+	type WalletClient,
+	type EVMTransaction,
+	type EVMReadRequest,
+	type EVMWalletClient,
+	type EVMSmartWalletClient,
+	type SolanaTransaction,
+	type SolanaReadRequest,
+	type SolanaWalletClient,
+	type Signature,
+	type Balance,
+	type EVMTypedData,
+	type isEVMWalletClient,
+	type isEVMSmartWalletClient,
+	type isSolanaWalletClient,
+	type Chain,
+	type ChainForWalletClient,
 };

typescript/packages/core/src/plugins/send-sol.ts

@@ -1,9 +1,7 @@
-import { Connection, PublicKey } from "@solana/web3.js";
-import { parseUnits } from "viem";
-import type { SolanaWalletClient } from "../wallets";
-import type { Plugin } from "./plugins";
+import { PublicKey } from "@solana/web3.js";
+import type { SolanaWalletClient } from "../../wallets";
+import type { Plugin } from "../plugins";
 import { z } from "zod";
-import { SystemProgram } from "@solana/web3.js";
 import {
 	mplBubblegum,
 	getAssetWithProof,
@@ -15,9 +13,9 @@ import {
 	toWeb3JsInstruction,
 } from "@metaplex-foundation/umi-web3js-adapters";
 
-export function transferNFT(): Plugin<SolanaWalletClient> {
+export function nfts(): Plugin<SolanaWalletClient> {
 	return {
-		name: "transfer_nft",
+		name: "nft_actions",
 		supportsSmartWallets: () => true,
 		supportsChain: (chain) => chain.type === "solana",
 		getTools: async () => {

typescript/packages/core/src/plugins/send-nft.ts typescript/packages/core/src/plugins/solana/nfts.ts

@@ -0,0 +1,56 @@
+import { PublicKey } from "@solana/web3.js";
+import { SystemProgram } from "@solana/web3.js";
+import { parseUnits } from "viem";
+import { z } from "zod";
+import type { SolanaWalletClient } from "../../wallets";
+import type { Plugin } from "../plugins";
+
+export function sendSOL(): Plugin<SolanaWalletClient> {
+	return {
+		name: "send_sol",
+		supportsSmartWallets: () => true,
+		supportsChain: (chain) => chain.type === "solana",
+		getTools: async () => {
+			return [
+				{
+					name: "send_sol",
+					description:
+						"This {{tool}} sends SOL to an address on a Solana chain.",
+					parameters: sendSOLParametersSchema,
+					method: sendSOLMethod,
+				},
+			];
+		},
+	};
+}
+
+const sendSOLParametersSchema = z.object({
+	to: z.string().describe("The address to send SOL to"),
+	amount: z.string().describe("The amount of SOL to send"),
+});
+
+async function sendSOLMethod(
+	walletClient: SolanaWalletClient,
+	parameters: z.infer<typeof sendSOLParametersSchema>,
+): Promise<string> {
+	try {
+		const { to, amount } = parameters;
+
+		const senderAddress = walletClient.getAddress();
+		const lamports = parseUnits(amount, 9);
+
+		const transferInstruction = SystemProgram.transfer({
+			fromPubkey: new PublicKey(senderAddress),
+			toPubkey: new PublicKey(to),
+			lamports,
+		});
+
+		const txResult = await walletClient.sendTransaction({
+			instructions: [transferInstruction],
+		});
+
+		return txResult.hash;
+	} catch (error) {
+		throw new Error(`Failed to send SOL: ${error}`);
+	}
+}