@kamino-finance/klend-sdk 5.11.14 → 5.11.16

package/src/classes/types.ts

@@ -3,9 +3,11 @@ import Decimal from 'decimal.js/decimal';
 
 /** the populateLUTIxs should be executed in a separate transaction as we cannot create and populate a lookup table in the same tx */
 export type InitVaultIxs = {
+  createAtaIfNeededIxs: TransactionInstruction[];
   initVaultIxs: TransactionInstruction[];
   createLUTIx: TransactionInstruction;
   populateLUTIxs: TransactionInstruction[];
+  cleanupIxs: TransactionInstruction[];
 };
 
 export type AcceptVaultOwnershipIxs = {
@@ -59,3 +61,4 @@ export type APYs = {
   grossAPY: Decimal;
   netAPY: Decimal;
 };
+

package/src/classes/utils.ts

@@ -222,11 +222,17 @@ export function calculateAPRFromAPY(apy: Decimal.Value) {
     .times(SLOTS_PER_YEAR);
 }
 
-export function sameLengthArrayEquals(left: Array<number>, right: Array<number>): boolean {
+export function sameLengthArrayEquals<T>(left: Array<T>, right: Array<T>): boolean {
   if (left.length != right.length) {
-    throw new Error(`Not same length: ${left.length} != ${left.length}`);
+    throw new Error(`Not same length: ${left.length} != ${right.length}`);
   }
-  return left.every((value, index) => value === right[index]);
+  return left.every((value, index) => {
+    const other = right[index];
+    if (value != null && typeof (value as any).eq === 'function') {
+      return (value as any).eq(other);
+    }
+    return value === other;
+  });
 }
 
 export function getTokenBalanceFromAccountInfoLamports(accountInfo: AccountInfo<Buffer>): Decimal {

package/src/classes/vault.ts

@@ -64,9 +64,17 @@ import {
 import { deposit } from '../idl_codegen_kamino_vault/instructions';
 import { withdraw } from '../idl_codegen_kamino_vault/instructions';
 import { PROGRAM_ID } from '../idl_codegen/programId';
-import { DEFAULT_RECENT_SLOT_DURATION_MS, ReserveWithAddress } from './reserve';
+import { ReserveWithAddress } from './reserve';
 import { Fraction } from './fraction';
-import { createAtasIdempotent, lendingMarketAuthPda, PublicKeySet, SECONDS_PER_YEAR, U64_MAX } from '../utils';
+import {
+  createAtasIdempotent,
+  createWsolAtaIfMissing,
+  lendingMarketAuthPda,
+  PublicKeySet,
+  SECONDS_PER_YEAR,
+  U64_MAX,
+  VAULT_INITIAL_DEPOSIT,
+} from '../utils';
 import bs58 from 'bs58';
 import { getAccountOwner, getProgramAccounts } from '../utils/rpc';
 import {
@@ -115,14 +123,14 @@ export class KaminoVaultClient {
 
   constructor(
     connection: Connection,
+    recentSlotDurationMs: number,
     kaminoVaultprogramId?: PublicKey,
-    kaminoLendProgramId?: PublicKey,
-    recentSlotDurationMs?: number
+    kaminoLendProgramId?: PublicKey
   ) {
     this._connection = connection;
+    this.recentSlotDurationMs = recentSlotDurationMs;
     this._kaminoVaultProgramId = kaminoVaultprogramId ? kaminoVaultprogramId : kaminoVaultId;
     this._kaminoLendProgramId = kaminoLendProgramId ? kaminoLendProgramId : PROGRAM_ID;
-    this.recentSlotDurationMs = recentSlotDurationMs ? recentSlotDurationMs : DEFAULT_RECENT_SLOT_DURATION_MS;
   }
 
   getConnection() {
@@ -199,12 +207,27 @@ export class KaminoVaultClient {
       this._kaminoVaultProgramId
     )[0];
 
-    const adminTokenAccount = getAssociatedTokenAddressSync(
-      vaultConfig.tokenMint,
-      vaultConfig.admin,
-      false,
-      vaultConfig.tokenMintProgramId
-    );
+    let adminTokenAccount: PublicKey;
+    const prerequisiteIxs: TransactionInstruction[] = [];
+    const cleanupIxs: TransactionInstruction[] = [];
+    if (vaultConfig.tokenMint.equals(NATIVE_MINT)) {
+      const { wsolAta, createAtaIxs, closeAtaIxs } = await createWsolAtaIfMissing(
+        this.getConnection(),
+        new Decimal(VAULT_INITIAL_DEPOSIT),
+        vaultConfig.admin
+      );
+      adminTokenAccount = wsolAta;
+
+      prerequisiteIxs.push(...createAtaIxs);
+      cleanupIxs.push(...closeAtaIxs);
+    } else {
+      adminTokenAccount = getAssociatedTokenAddressSync(
+        vaultConfig.tokenMint,
+        vaultConfig.admin,
+        false,
+        vaultConfig.tokenMintProgramId
+      );
+    }
 
     const initVaultAccounts: InitVaultAccounts = {
       adminAuthority: vaultConfig.admin,
@@ -277,7 +300,16 @@ export class KaminoVaultClient {
       ixns.push(setNameIx);
     }
 
-    return { vault: vaultState, initVaultIxs: { initVaultIxs: ixns, createLUTIx, populateLUTIxs: insertIntoLUTIxs } };
+    return {
+      vault: vaultState,
+      initVaultIxs: {
+        createAtaIfNeededIxs: prerequisiteIxs,
+        initVaultIxs: ixns,
+        createLUTIx,
+        populateLUTIxs: insertIntoLUTIxs,
+        cleanupIxs,
+      },
+    };
   }
 
   /**