Merge branch 'main' into feat/drift-tool

src/tools/3land/create_3land_collectible.ts

@@ -37,7 +37,8 @@ export async function createSingle(
   optionsWithBase58: StoreInitOptions,
   collectionAccount: string,
   createItemOptions: CreateSingleOptions,
-  isMainnet: boolean,
+  isMainnet: boolean = false,
+  withPool: boolean = false,
 ) {
   try {
     const landStore = isMainnet
@@ -49,6 +50,8 @@ export async function createSingle(
       landStore,
       collectionAccount,
       createItemOptions,
+      true, //isAI
+      withPool,
     );
     return singleEditionTx;
   } catch (error: any) {

src/tools/index.ts

@@ -25,3 +25,4 @@ export * from "./tiplink";
 export * from "./lightprotocol";
 export * from "./squads";
 export * from "./helius";
+export * from "./voltr";

src/tools/lulo/index.ts

@@ -1 +1,3 @@
 export * from "./lend";
+export * from "./lulo_lend";
+export * from "./lulo_withdraw";

src/tools/lulo/lulo_lend.ts

@@ -0,0 +1,64 @@
+import { VersionedTransaction } from "@solana/web3.js";
+import { SolanaAgentKit } from "../../index";
+
+/**
+ * Lend tokens for yields using Lulo
+ * @param agent SolanaAgentKit instance
+ * @param mintAddress SPL Mint address
+ * @param amount Amount to lend
+ * @returns Transaction signature
+ */
+export async function luloLend(
+  agent: SolanaAgentKit,
+  mintAddress: string,
+  amount: number,
+): Promise<string> {
+  try {
+    const response = await fetch(
+      `https://api.flexlend.fi/generate/account/deposit?priorityFee=50000`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "x-wallet-pubkey": agent.wallet.publicKey.toBase58(),
+          "x-api-key": process.env.FLEXLEND_API_KEY!
+        },
+        body: JSON.stringify({
+          owner: agent.wallet.publicKey.toBase58(),
+          mintAddress: mintAddress,
+          depositAmount: amount.toString(),
+        }),
+      },
+    );
+    const { data: { transactionMeta } } = await response.json()
+
+    // Deserialize the transaction
+    const luloTxn = VersionedTransaction.deserialize(
+      Buffer.from(transactionMeta[0].transaction, "base64"),
+    );
+
+    // Get a recent blockhash and set it
+    const { blockhash } = await agent.connection.getLatestBlockhash();
+    luloTxn.message.recentBlockhash = blockhash;
+
+    // Sign and send transaction
+    luloTxn.sign([agent.wallet]);
+
+    const signature = await agent.connection.sendTransaction(luloTxn, {
+      preflightCommitment: "confirmed",
+      maxRetries: 3,
+    });
+
+    // Wait for confirmation using the latest strategy
+    const latestBlockhash = await agent.connection.getLatestBlockhash();
+    await agent.connection.confirmTransaction({
+      signature,
+      blockhash: latestBlockhash.blockhash,
+      lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
+    });
+
+    return signature;
+  } catch (error: any) {
+    throw new Error(`Lending failed: ${error.message}`);
+  }
+}

src/tools/lulo/lulo_withdraw.ts

@@ -0,0 +1,69 @@
+import { VersionedTransaction } from "@solana/web3.js";
+import { SolanaAgentKit } from "../../index";
+
+/**
+ * Withdraw tokens for yields using Lulo
+ * @param agent SolanaAgentKit instance
+ * @param mintAddress SPL Mint address
+ * @param amount Amount to withdraw
+ * @returns Transaction signature
+ */
+export async function luloWithdraw(
+  agent: SolanaAgentKit,
+  mintAddress: string,
+  amount: number,
+): Promise<string> {
+  try {
+    if (!agent.config.FLEXLEND_API_KEY) {
+      throw new Error("Lulo API key not found in agent configuration");
+    }
+
+    const response = await fetch(
+      `https://api.flexlend.fi/generate/account/withdraw?priorityFee=50000`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "x-wallet-pubkey": agent.wallet.publicKey.toBase58(),
+          "x-api-key": agent.config.FLEXLEND_API_KEY
+        },
+        body: JSON.stringify({
+          owner: agent.wallet.publicKey.toBase58(),
+          mintAddress: mintAddress,
+          depositAmount: amount,
+        }),
+      },
+    );
+
+    const { data: { transactionMeta } } = await response.json()
+
+    // Deserialize the transaction
+    const luloTxn = VersionedTransaction.deserialize(
+      Buffer.from(transactionMeta[0].transaction, "base64"),
+    );
+
+    // Get a recent blockhash and set it
+    const { blockhash } = await agent.connection.getLatestBlockhash();
+    luloTxn.message.recentBlockhash = blockhash;
+
+    // Sign and send transaction
+    luloTxn.sign([agent.wallet]);
+
+    const signature = await agent.connection.sendTransaction(luloTxn, {
+      preflightCommitment: "confirmed",
+      maxRetries: 3,
+    });
+
+    // Wait for confirmation using the latest strategy
+    const latestBlockhash = await agent.connection.getLatestBlockhash();
+    await agent.connection.confirmTransaction({
+      signature,
+      blockhash: latestBlockhash.blockhash,
+      lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
+    });
+
+    return signature;
+  } catch (error: any) {
+    throw new Error(`Lending failed: ${error.message}`);
+  }
+}

src/tools/voltr/index.ts

@@ -0,0 +1,3 @@
+export * from "./voltr_deposit_strategy";
+export * from "./voltr_withdraw_strategy";
+export * from "./voltr_get_position_values";

src/tools/voltr/voltr_deposit_strategy.ts

@@ -0,0 +1,99 @@
+import { TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID } from "@solana/spl-token";
+import { SolanaAgentKit } from "../../agent";
+import {
+  PublicKey,
+  sendAndConfirmTransaction,
+  Transaction,
+} from "@solana/web3.js";
+import { VoltrClient } from "@voltr/vault-sdk";
+import BN from "bn.js";
+
+/**
+ * Deposits assets into a Voltr strategy
+ * @param agent SolanaAgentKit instance
+ * @param depositAmount Amount to deposit in base units (BN)
+ * @param vault Public key of the target vault
+ * @param strategy Public key of the target strategy
+ * @returns Transaction signature for the deposit
+ */
+export async function voltrDepositStrategy(
+  agent: SolanaAgentKit,
+  depositAmount: BN,
+  vault: PublicKey,
+  strategy: PublicKey,
+): Promise<string> {
+  const vc = new VoltrClient(agent.connection, agent.wallet);
+  const vaultAccount = await vc.fetchVaultAccount(vault);
+  const vaultAssetMint = vaultAccount.asset.mint;
+  const assetTokenProgram = await agent.connection
+    .getAccountInfo(new PublicKey(vaultAssetMint))
+    .then((account) => account?.owner);
+
+  if (
+    !assetTokenProgram ||
+    !(
+      assetTokenProgram.equals(TOKEN_PROGRAM_ID) ||
+      assetTokenProgram.equals(TOKEN_2022_PROGRAM_ID)
+    )
+  ) {
+    throw new Error("Invalid asset token program");
+  }
+
+  const response = await fetch(
+    `https://voltr.xyz/api/remaining-accounts/deposit-strategy?vault=${vault.toBase58()}&strategy=${strategy.toBase58()}`,
+    {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    },
+  );
+
+  const data = (await response.json()).data as {
+    instructionDiscriminator: number[] | null;
+    additionalArgs: number[] | null;
+    remainingAccounts:
+      | {
+          pubkey: string;
+          isSigner: boolean;
+          isWritable: boolean;
+        }[]
+      | null;
+  };
+
+  const additionalArgs = data.additionalArgs
+    ? Buffer.from(data.additionalArgs)
+    : null;
+  const instructionDiscriminator = data.instructionDiscriminator
+    ? Buffer.from(data.instructionDiscriminator)
+    : null;
+  const remainingAccounts =
+    data.remainingAccounts?.map((account) => ({
+      pubkey: new PublicKey(account.pubkey),
+      isSigner: account.isSigner,
+      isWritable: account.isWritable,
+    })) ?? [];
+
+  const depositIx = await vc.createDepositStrategyIx(
+    {
+      depositAmount,
+      additionalArgs,
+      instructionDiscriminator,
+    },
+    {
+      vault,
+      vaultAssetMint,
+      strategy: strategy,
+      assetTokenProgram,
+      remainingAccounts,
+    },
+  );
+
+  const transaction = new Transaction();
+  transaction.add(depositIx);
+
+  const txSig = await sendAndConfirmTransaction(agent.connection, transaction, [
+    agent.wallet,
+  ]);
+  return txSig;
+}

src/tools/voltr/voltr_get_position_values.ts

@@ -0,0 +1,20 @@
+import { SolanaAgentKit } from "../../agent";
+import { PublicKey } from "@solana/web3.js";
+import { VoltrClient } from "@voltr/vault-sdk";
+
+/**
+ * Gets the value of assets in a Voltr vault
+ * @param agent SolanaAgentKit instance
+ * @param vault Public key of the target vault
+ * @returns Position and total values for the vault
+ */
+export async function voltrGetPositionValues(
+  agent: SolanaAgentKit,
+  vault: PublicKey,
+): Promise<string> {
+  const vc = new VoltrClient(agent.connection, agent.wallet);
+  const positionAndTotalValues =
+    await vc.getPositionAndTotalValuesForVault(vault);
+
+  return JSON.stringify(positionAndTotalValues);
+}

src/tools/voltr/voltr_withdraw_strategy.ts

@@ -0,0 +1,99 @@
+import { SolanaAgentKit } from "../../agent";
+import {
+  PublicKey,
+  sendAndConfirmTransaction,
+  Transaction,
+} from "@solana/web3.js";
+import BN from "bn.js";
+import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
+import { VoltrClient } from "@voltr/vault-sdk";
+
+/**
+ * Withdraws assets from a Voltr strategy
+ * @param agent SolanaAgentKit instance
+ * @param withdrawAmount Amount to withdraw in base units (BN)
+ * @param vault Public key of the target vault
+ * @param strategy Public key of the target strategy
+ * @returns Transaction signature for the deposit
+ */
+export async function voltrWithdrawStrategy(
+  agent: SolanaAgentKit,
+  withdrawAmount: BN,
+  vault: PublicKey,
+  strategy: PublicKey,
+): Promise<string> {
+  const vc = new VoltrClient(agent.connection, agent.wallet);
+  const vaultAccount = await vc.fetchVaultAccount(vault);
+  const vaultAssetMint = vaultAccount.asset.mint;
+  const assetTokenProgram = await agent.connection
+    .getAccountInfo(new PublicKey(vaultAssetMint))
+    .then((account) => account?.owner);
+
+  if (
+    !assetTokenProgram ||
+    !(
+      assetTokenProgram.equals(TOKEN_PROGRAM_ID) ||
+      assetTokenProgram.equals(TOKEN_2022_PROGRAM_ID)
+    )
+  ) {
+    throw new Error("Invalid asset token program");
+  }
+
+  const response = await fetch(
+    `https://voltr.xyz/api/remaining-accounts/deposit-strategy?vault=${vault.toBase58()}&strategy=${strategy.toBase58()}`,
+    {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    },
+  );
+
+  const data = (await response.json()).data as {
+    instructionDiscriminator: number[] | null;
+    additionalArgs: number[] | null;
+    remainingAccounts:
+      | {
+          pubkey: string;
+          isSigner: boolean;
+          isWritable: boolean;
+        }[]
+      | null;
+  };
+
+  const additionalArgs = data.additionalArgs
+    ? Buffer.from(data.additionalArgs)
+    : null;
+  const instructionDiscriminator = data.instructionDiscriminator
+    ? Buffer.from(data.instructionDiscriminator)
+    : null;
+  const remainingAccounts =
+    data.remainingAccounts?.map((account) => ({
+      pubkey: new PublicKey(account.pubkey),
+      isSigner: account.isSigner,
+      isWritable: account.isWritable,
+    })) ?? [];
+
+  const withdrawIx = await vc.createWithdrawStrategyIx(
+    {
+      withdrawAmount,
+      additionalArgs,
+      instructionDiscriminator,
+    },
+    {
+      vault,
+      vaultAssetMint,
+      strategy,
+      assetTokenProgram,
+      remainingAccounts,
+    },
+  );
+
+  const transaction = new Transaction();
+  transaction.add(withdrawIx);
+
+  const txSig = await sendAndConfirmTransaction(agent.connection, transaction, [
+    agent.wallet,
+  ]);
+  return txSig;
+}