@kamino-finance/klend-sdk 5.10.33 → 5.10.35-beta.0

package/src/leverage/operations.ts

@@ -17,11 +17,10 @@ import {
   ObligationTypeTag,
   SOL_DECIMALS,
   U64_MAX,
-  WRAPPED_SOL_MINT,
   createAtasIdempotent,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxns,
-  getDepositWsolIxns,
+  getTransferWsolIxns,
   getLookupTableAccount,
   removeBudgetAndAtaIxns,
   uniqueAccounts,
@@ -35,7 +34,12 @@ import {
   toJson,
   withdrawLeverageCalcs,
 } from './calcs';
-import { TOKEN_PROGRAM_ID, createCloseAccountInstruction, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import {
+  NATIVE_MINT,
+  TOKEN_PROGRAM_ID,
+  createCloseAccountInstruction,
+  getAssociatedTokenAddressSync,
+} from '@solana/spl-token';
 import { Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
 import { getExpectedTokenBalanceAfterBorrow, getKtokenToTokenSwapper, getTokenToKtokenSwapper } from './utils';
 import { FullBPS } from '@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters';
@@ -49,7 +53,7 @@ import {
   DepositLeverageInitialInputs,
   DepositWithLeverageProps,
   DepositWithLeverageSwapInputsProps,
-  DepsoitLeverageIxsResponse,
+  DepositLeverageIxsResponse,
   PriceAinBProvider,
   SwapInputs,
   SwapIxs,
@@ -82,6 +86,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
   priceAinB,
   isKtoken,
   quoter,
+  useV2Ixs,
   elevationGroupOverride,
 }: DepositWithLeverageSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
@@ -89,7 +94,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 }> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const flashLoanFee = collReserve.getFlashLoanFee() || new Decimal(0);
 
   const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
@@ -147,6 +152,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
     },
     strategy,
     collIsKtoken,
+    useV2Ixs,
     elevationGroupOverride
   );
 
@@ -191,7 +197,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 
   if (collIsKtoken) {
     let futureBalanceInAta = new Decimal(0);
-    if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
+    if (debtTokenMint.equals(NATIVE_MINT)) {
       futureBalanceInAta = futureBalanceInAta.add(
         !collIsKtoken ? quotePriceCalcs.initDepositInSol : quotePriceCalcs.initDepositInSol
       );
@@ -311,7 +317,8 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
   quoter,
   swapper,
   elevationGroupOverride,
-}: DepositWithLeverageProps<QuoteResponse>): Promise<DepsoitLeverageIxsResponse<QuoteResponse>> {
+  useV2Ixs,
+}: DepositWithLeverageProps<QuoteResponse>): Promise<DepositLeverageIxsResponse<QuoteResponse>> {
   const { swapInputs, initialInputs } = await getDepositWithLeverageSwapInputs({
     owner,
     kaminoMarket,
@@ -333,6 +340,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
     priceAinB,
     isKtoken,
     quoter,
+    useV2Ixs,
   });
 
   let depositSwapper: SwapIxsProvider<QuoteResponse>;
@@ -366,7 +374,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
 
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
 
   const ixs = await buildDepositWithLeverageIxns(
@@ -388,6 +396,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
     },
     initialInputs.strategy,
     initialInputs.collIsKtoken,
+    useV2Ixs,
     elevationGroupOverride
   );
 
@@ -414,6 +423,7 @@ async function buildDepositWithLeverageIxns(
   swapQuoteIxs: SwapIxs,
   strategy: StrategyWithAddress | undefined,
   collIsKtoken: boolean,
+  useV2Ixs: boolean,
   elevationGroupOverride?: number
 ): Promise<TransactionInstruction[]> {
   const budgetIxns = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxns(3000000);
@@ -485,9 +495,9 @@ async function buildDepositWithLeverageIxns(
   const fillWsolAtaIxns: TransactionInstruction[] = [];
   if (depositTokenIsSol) {
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(
+      ...getTransferWsolIxns(
         owner,
-        getAssociatedTokenAddressSync(WRAPPED_SOL_MINT, owner),
+        getAssociatedTokenAddressSync(NATIVE_MINT, owner),
         toLamports(calcs.initDepositInSol, SOL_DECIMALS).ceil()
       )
     );
@@ -526,10 +536,12 @@ async function buildDepositWithLeverageIxns(
     debtTokenMint,
     owner,
     obligation!,
+    useV2Ixs,
     0,
     false,
     elevationGroupOverride === 0 ? false : true, // emode
     false, // to be checked and created in a setup tx in the UI
+    false, // to be checked and created in a setup tx in the UI
     referrer,
     currentSlot,
     scopeRefresh
@@ -587,6 +599,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   quoteBufferBps,
   isKtoken,
   quoter,
+  useV2Ixs,
 }: WithdrawWithLeverageSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
   initialInputs: WithdrawLeverageInitialInputs<QuoteResponse>;
@@ -598,7 +611,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   const collIsKtoken = await isKtoken(collTokenMint);
   const strategy = collIsKtoken ? (await kamino!.getStrategyByKTokenMint(collTokenMint))! : undefined;
 
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
 
   const calcs = withdrawLeverageCalcs(
@@ -637,7 +650,8 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
       lookupTables: [],
     },
     strategy,
-    collIsKtoken
+    collIsKtoken,
+    useV2Ixs
   );
 
   const uniqueKlendAccounts = uniqueAccounts(klendIxs);
@@ -720,11 +734,12 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
   isKtoken,
   quoter,
   swapper,
+  useV2Ixs,
 }: WithdrawWithLeverageProps<QuoteResponse>): Promise<WithdrawLeverageIxsResponse<QuoteResponse>> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
 
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
   const { swapInputs, initialInputs } = await getWithdrawWithLeverageSwapInputs({
     owner,
@@ -747,6 +762,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
     quoteBufferBps,
     isKtoken,
     quoter,
+    useV2Ixs,
   });
 
   let withdrawSwapper: SwapIxsProvider<QuoteResponse>;
@@ -797,7 +813,8 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
       lookupTables,
     },
     initialInputs.strategy,
-    initialInputs.collIsKtoken
+    initialInputs.collIsKtoken,
+    useV2Ixs
   );
 
   // Send ixns and lookup tables
@@ -824,7 +841,8 @@ export async function buildWithdrawWithLeverageIxns(
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
   swapQuoteIxs: SwapIxs,
   strategy: StrategyWithAddress | undefined,
-  collIsKtoken: boolean
+  collIsKtoken: boolean,
+  useV2Ixs: boolean
 ): Promise<TransactionInstruction[]> {
   const collTokenMint = collReserve.getLiquidityMint();
   const debtTokenMint = debtReserve.getLiquidityMint();
@@ -885,8 +903,8 @@ export async function buildWithdrawWithLeverageIxns(
   const atasAndCreateIxns = createAtasIdempotent(owner, mintsToCreateAtas);
 
   const closeWsolAtaIxns: TransactionInstruction[] = [];
-  if (depositTokenIsSol || debtTokenMint.equals(WRAPPED_SOL_MINT)) {
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+  if (depositTokenIsSol || debtTokenMint.equals(NATIVE_MINT)) {
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
     closeWsolAtaIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
   }
 
@@ -895,13 +913,13 @@ export async function buildWithdrawWithLeverageIxns(
   // TODO: Might be worth removing as it's only needed for Ktokens
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
   const fillWsolAtaIxns: TransactionInstruction[] = [];
-  if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
+  if (debtTokenMint.equals(NATIVE_MINT)) {
     const halfSolBalance = (await market.getConnection().getBalance(owner)) / LAMPORTS_PER_SOL / 2;
     const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(
+      ...getTransferWsolIxns(
         owner,
-        getAssociatedTokenAddressSync(WRAPPED_SOL_MINT, owner),
+        getAssociatedTokenAddressSync(NATIVE_MINT, owner),
         toLamports(balanceToWrap, SOL_DECIMALS).ceil()
       )
     );
@@ -936,9 +954,11 @@ export async function buildWithdrawWithLeverageIxns(
     owner,
     currentSlot,
     obligation,
+    useV2Ixs,
     0,
     false,
     false, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
+    false, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
     isClosingPosition,
     referrer,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -980,6 +1000,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   quoteBufferBps,
   isKtoken,
   quoter,
+  useV2Ixs,
 }: AdjustLeverageSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
   initialInputs: AdjustLeverageInitialInputs<QuoteResponse>;
@@ -1045,7 +1066,8 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
         swapIxs: [],
         lookupTables: [],
       },
-      budgetAndPriorityFeeIxs
+      budgetAndPriorityFeeIxs,
+      useV2Ixs
     );
 
     const uniqueKlendAccounts = uniqueAccounts(klendIxs);
@@ -1148,7 +1170,8 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
         swapIxs: [],
         lookupTables: [],
       },
-      budgetAndPriorityFeeIxs
+      budgetAndPriorityFeeIxs,
+      useV2Ixs
     );
 
     const uniqueKlendAccounts = uniqueAccounts(klendIxs);
@@ -1234,6 +1257,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
   isKtoken,
   quoter,
   swapper,
+  useV2Ixs,
 }: AdjustLeverageProps<QuoteResponse>): Promise<AdjustLeverageIxsResponse<QuoteResponse>> {
   const { swapInputs, initialInputs } = await getAdjustLeverageSwapInputs({
     owner,
@@ -1256,6 +1280,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
     priceAinB,
     isKtoken,
     quoter,
+    useV2Ixs,
   });
 
   // leverage increased so we need to deposit and borrow more
@@ -1303,7 +1328,8 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
         swapIxs,
         lookupTables,
       },
-      budgetAndPriorityFeeIxs
+      budgetAndPriorityFeeIxs,
+      useV2Ixs
     );
     return {
       ixs,
@@ -1349,7 +1375,8 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
         swapIxs,
         lookupTables,
       },
-      budgetAndPriorityFeeIxs
+      budgetAndPriorityFeeIxs,
+      useV2Ixs
     );
 
     return {
@@ -1377,7 +1404,8 @@ async function buildIncreaseLeverageIxns(
   scopeFeed: string | undefined,
   collIsKtoken: boolean,
   swapQuoteIxs: SwapIxs,
-  budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined
+  budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined,
+  useV2Ixs: boolean
 ): Promise<TransactionInstruction[]> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
@@ -1469,10 +1497,12 @@ async function buildIncreaseLeverageIxns(
     collTokenMint,
     owner,
     obligation,
+    useV2Ixs,
     0,
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
     currentSlot,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1485,10 +1515,12 @@ async function buildIncreaseLeverageIxns(
     debtTokenMint,
     owner,
     obligation,
+    useV2Ixs,
     0,
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
     currentSlot,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1543,7 +1575,8 @@ async function buildDecreaseLeverageIxns(
   scopeFeed: string | undefined,
   collIsKtoken: boolean,
   swapQuoteIxs: SwapIxs,
-  budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined
+  budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined,
+  useV2Ixs: boolean
 ): Promise<TransactionInstruction[]> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
@@ -1608,15 +1641,15 @@ async function buildDecreaseLeverageIxns(
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
   const closeWsolAtaIxns: TransactionInstruction[] = [];
   const fillWsolAtaIxns: TransactionInstruction[] = [];
-  if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+  if (debtTokenMint.equals(NATIVE_MINT)) {
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
 
     closeWsolAtaIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
 
     const halfSolBalance = (await kaminoMarket.getConnection().getBalance(owner)) / LAMPORTS_PER_SOL / 2;
     const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(owner, wsolAta, toLamports(balanceToWrap, debtReserve!.stats.decimals).ceil())
+      ...getTransferWsolIxns(owner, wsolAta, toLamports(balanceToWrap, debtReserve!.stats.decimals).ceil())
     );
   }
 
@@ -1643,12 +1676,14 @@ async function buildDecreaseLeverageIxns(
     debtTokenMint,
     owner,
     obligation,
+    useV2Ixs,
     currentSlot,
     undefined,
     0,
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
     scopeRefresh
   );
@@ -1660,10 +1695,12 @@ async function buildDecreaseLeverageIxns(
     collTokenMint,
     owner,
     obligation,
+    useV2Ixs,
     0,
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
     currentSlot,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }

package/src/leverage/types.ts

@@ -49,7 +49,7 @@ export type KaminoDepositSwapOverride = (
   amountDebtAtaBalance: Decimal
 ) => Promise<InstructionsWithLookupTables>;
 
-export type DepsoitLeverageIxsResponse<QuoteResponse> = {
+export type DepositLeverageIxsResponse<QuoteResponse> = {
   ixs: TransactionInstruction[];
   lookupTables: AddressLookupTableAccount[];
   swapInputs: SwapInputs;
@@ -90,6 +90,7 @@ export interface DepositWithLeverageSwapInputsProps<QuoteResponse> {
   // currently only used to disable requesting elevation group when this value is 0
   // to be implemented properly in the future
   elevationGroupOverride?: number;
+  useV2Ixs: boolean;
 }
 
 export interface DepositWithLeverageProps<QuoteResponse> extends DepositWithLeverageSwapInputsProps<QuoteResponse> {
@@ -146,6 +147,7 @@ export interface WithdrawWithLeverageSwapInputsProps<QuoteResponse> {
   quoteBufferBps: Decimal;
   isKtoken: IsKtokenProvider;
   quoter: SwapQuoteProvider<QuoteResponse>;
+  useV2Ixs: boolean;
 }
 
 export interface WithdrawWithLeverageProps<QuoteResponse> extends WithdrawWithLeverageSwapInputsProps<QuoteResponse> {
@@ -199,6 +201,7 @@ export interface AdjustLeverageSwapInputsProps<QuoteResponse> {
   priceAinB: PriceAinBProvider;
   isKtoken: IsKtokenProvider;
   quoter: SwapQuoteProvider<QuoteResponse>;
+  useV2Ixs: boolean;
 }
 
 export interface AdjustLeverageProps<QuoteResponse> extends AdjustLeverageSwapInputsProps<QuoteResponse> {

package/src/utils/ata.ts

@@ -98,7 +98,7 @@ export function createAtasIdempotent(
   return res;
 }
 
-export function getDepositWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
+export function getTransferWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
   const ixns: TransactionInstruction[] = [];
 
   ixns.push(

package/src/utils/constants.ts

@@ -72,22 +72,16 @@ export const SLOTS_PER_YEAR = SLOTS_PER_DAY * 365;
  */
 export const MIN_AUTODELEVERAGE_BONUS_BPS = 50;
 
-/**
- * WSOL Mint
- */
-export const WRAPPED_SOL_MINT = new PublicKey('So11111111111111111111111111111111111111112');
-
 export const SOL_DECIMALS = 9;
 
-/**
- * USDC Mint
- */
-export const USDC_MAINNET_MINT = new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
-
 export const MAINNET_BETA_CHAIN_ID = 101;
 
-export const POSITION_LIMIT = 10;
 export const BORROWS_LIMIT = 5;
 export const DEPOSITS_LIMIT = 8;
 
 export const DEFAULT_MAX_COMPUTE_UNITS = 1_400_000;
+
+/**
+ * Minimum initial deposit required for the initialization of a reserve
+ */
+export const MIN_INITIAL_DEPOSIT = 100_000;

package/src/utils/instruction.ts

@@ -38,7 +38,7 @@ export async function buildAndSendTxnWithLogs(
     });
     console.log('Transaction Hash:', withDescription, sig);
     if (withLogsIfSuccess) {
-      await sleep(5000);
+      await sleep(1000);
       const res = await c.getTransaction(sig, {
         commitment: 'confirmed',
         maxSupportedTransactionVersion: 6,
@@ -49,7 +49,6 @@ export async function buildAndSendTxnWithLogs(
   } catch (e: any) {
     console.log(e);
     process.stdout.write(e.logs.toString());
-    await sleep(5000);
     const sig = e.toString().split(' failed ')[0].split('Transaction ')[1];
     const res: VersionedTransactionResponse | null = await c.getTransaction(sig, {
       commitment: 'confirmed',
@@ -115,7 +114,6 @@ export async function simulateTxn(c: Connection, tx: Transaction, owner: Keypair
   } catch (e: any) {
     console.log(e);
     process.stdout.write(e.logs.toString());
-    await sleep(5000);
     const sig = e.toString().split(' failed ')[0].split('Transaction ')[1];
     const res: TransactionResponse | null = await c.getTransaction(sig, {
       commitment: 'confirmed',

package/src/utils/managerTypes.ts

@@ -37,6 +37,7 @@ export type CreateKaminoMarketParams = {
 
 export type AddAssetToMarketParams = {
   admin: PublicKey;
+  adminLiquiditySource: PublicKey;
   marketAddress: PublicKey;
   assetConfig: AssetConfig;
 };

package/src/utils/seeds.ts

@@ -1,5 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import { PROGRAM_ID } from '../idl_codegen/programId';
+import { farmsId } from '@kamino-finance/farms-sdk';
 
 /**
  * Lending market authority seed
@@ -38,6 +39,11 @@ export const BASE_SEED_REFERRER_STATE = 'ref_state';
  */
 export const BASE_SEED_SHORT_URL = 'short_url';
 
+/**
+ * User farm state seed
+ */
+export const BASE_SEED_FARM_USER_STATE = Buffer.from('user');
+
 /**
  * Encapsulates all the PDAs for a given reserve
  */
@@ -181,3 +187,10 @@ export function referrerStatePda(referrer: PublicKey, programId: PublicKey = PRO
 export function shortUrlPda(shortUrl: string, programId: PublicKey = PROGRAM_ID) {
   return PublicKey.findProgramAddressSync([Buffer.from(BASE_SEED_SHORT_URL), Buffer.from(shortUrl)], programId);
 }
+
+export function obligationFarmStatePda(obligation: PublicKey, farm: PublicKey, programId: PublicKey = farmsId) {
+  return PublicKey.findProgramAddressSync(
+    [Buffer.from(BASE_SEED_FARM_USER_STATE), farm.toBuffer(), obligation.toBuffer()],
+    programId
+  );
+}

package/src/utils/userMetadata.ts

@@ -6,11 +6,11 @@ import {
   Connection,
   GetProgramAccountsFilter,
 } from '@solana/web3.js';
+import { NATIVE_MINT } from '@solana/spl-token';
 import { KaminoMarket, KaminoObligation } from '../classes';
 import {
   LeverageObligation,
   MultiplyObligation,
-  WRAPPED_SOL_MINT,
   createLookupTableIx,
   extendLookupTableIxs,
   getAssociatedTokenAddress,
@@ -20,8 +20,8 @@ import {
   isNotNullPubkey,
   UserMetadata,
   PublicKeySet,
+  obligationFarmStatePda,
 } from '../lib';
-import { farmsId } from '@kamino-finance/farms-sdk';
 import { KaminoReserve } from '../classes/reserve';
 
 export type KaminoUserMetadata = {
@@ -259,26 +259,26 @@ function getMultiplyObligationAndObligationFarmStateAddresses(
     const collMintString = collMint.toString();
     const debtMintString = debtMint.toString();
     if (collReserve && debtReserve) {
-      const multiplyObligation = new MultiplyObligation(collMint, WRAPPED_SOL_MINT, kaminoMarket.programId);
+      const multiplyObligation = new MultiplyObligation(collMint, NATIVE_MINT, kaminoMarket.programId);
       obligationPdas.push({
         address: multiplyObligation.toPda(kaminoMarket.getAddress(), user),
         log: 'multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
       });
       if (!collReserve.state.farmCollateral.equals(PublicKey.default)) {
         farmUserStates.push({
-          address: getPdaFarmsUserState(
-            collReserve.state.farmCollateral!,
-            multiplyObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+          address: obligationFarmStatePda(
+            multiplyObligation.toPda(kaminoMarket.getAddress(), user),
+            collReserve.state.farmCollateral!
+          )[0],
           log: 'collReserve farmState for multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
       if (!debtReserve.state.farmDebt.equals(PublicKey.default)) {
         farmUserStates.push({
-          address: getPdaFarmsUserState(
-            debtReserve.state.farmDebt!,
-            multiplyObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+          address: obligationFarmStatePda(
+            multiplyObligation.toPda(kaminoMarket.getAddress(), user),
+            debtReserve.state.farmDebt!
+          )[0],
           log: 'debtReserve farmState for multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
@@ -309,19 +309,19 @@ function getLeverageObligationAndObligationFarmStateAddresses(
       });
       if (!collReserve.state.farmCollateral.equals(PublicKey.default)) {
         farmUserStates.push({
-          address: getPdaFarmsUserState(
-            collReserve.state.farmCollateral!,
-            leverageObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+          address: obligationFarmStatePda(
+            leverageObligation.toPda(kaminoMarket.getAddress(), user),
+            collReserve.state.farmCollateral!
+          )[0],
           log: 'collReserve farmState for leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
       if (!debtReserve.state.farmDebt.equals(PublicKey.default)) {
         farmUserStates.push({
-          address: getPdaFarmsUserState(
-            debtReserve.state.farmDebt!,
-            leverageObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+          address: obligationFarmStatePda(
+            leverageObligation.toPda(kaminoMarket.getAddress(), user),
+            debtReserve.state.farmDebt!
+          )[0],
           log: 'debtReserve farmState for leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
@@ -342,7 +342,7 @@ function getRepayWithCollObligationFarmStateAddresses(
     const borrowReserve = kaminoMarket.getReserveByMint(borrow.mintAddress)!;
     if (!borrowReserve.state.farmDebt.equals(PublicKey.default)) {
       farmUserStates.push({
-        address: getPdaFarmsUserState(borrowReserve.state.farmDebt!, obligation.obligationAddress),
+        address: obligationFarmStatePda(obligation.obligationAddress, borrowReserve.state.farmDebt!)[0],
         log: 'debtReserve farmState for vanilla obligation: ' + obligationString,
       });
     }
@@ -352,7 +352,7 @@ function getRepayWithCollObligationFarmStateAddresses(
     const depositReserve = kaminoMarket.getReserveByMint(deposit.mintAddress)!;
     if (!depositReserve.state.farmCollateral.equals(PublicKey.default)) {
       farmUserStates.push({
-        address: getPdaFarmsUserState(depositReserve.state.farmCollateral!, obligation.obligationAddress),
+        address: obligationFarmStatePda(obligation.obligationAddress, depositReserve.state.farmCollateral!)[0],
         log: 'collReserve farmState for vanilla obligation' + obligationString,
       });
     }
@@ -361,11 +361,6 @@ function getRepayWithCollObligationFarmStateAddresses(
   return farmUserStates;
 }
 
-const BASE_SEED_USER_STATE = Buffer.from('user');
-
-const getPdaFarmsUserState = (farm: PublicKey, obligation: PublicKey) =>
-  PublicKey.findProgramAddressSync([BASE_SEED_USER_STATE, farm.toBytes(), obligation.toBytes()], farmsId)[0];
-
 export async function getAllUserMetadatasWithFilter(
   connection: Connection,
   filter: GetProgramAccountsFilter[],