@kamino-finance/klend-sdk 5.14.3 → 5.14.4

package/src/classes/utils.ts

@@ -287,6 +287,18 @@ export function orThrow(message: string): never {
   throw new Error(message);
 }
 
+export function blobEquals(left: Uint8Array, right: Uint8Array): boolean {
+  if (left.length !== right.length) {
+    return false;
+  }
+  for (let i = 0; i < left.length; ++i) {
+    if (left[i] !== right[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * Returns an integer {@link Decimal} nearest to the given one.
  *

package/src/classes/vault.ts

@@ -11,7 +11,13 @@ import {
   SYSVAR_RENT_PUBKEY,
   TransactionInstruction,
 } from '@solana/web3.js';
-import { getAssociatedTokenAddressSync, NATIVE_MINT, TOKEN_PROGRAM_ID, unpackAccount } from '@solana/spl-token';
+import {
+  createCloseAccountInstruction,
+  getAssociatedTokenAddressSync,
+  NATIVE_MINT,
+  TOKEN_PROGRAM_ID,
+  unpackAccount,
+} from '@solana/spl-token';
 import {
   getAssociatedTokenAddress,
   getTransferWsolIxs,
@@ -1064,6 +1070,7 @@ export class KaminoVaultClient {
     const withdrawIxs: WithdrawIxs = {
       unstakeFromFarmIfNeededIxs: [],
       withdrawIxs: [],
+      postWithdrawIxs: [],
     };
 
     const shareLamportsToWithdraw = collToLamportsDecimal(shareAmount, vaultState.sharesMintDecimals.toNumber());
@@ -1099,6 +1106,13 @@ export class KaminoVaultClient {
       withdrawIxs.withdrawIxs = withdrawFromVaultIxs;
     }
 
+    // if the vault is for SOL return the ix to unwrap the SOL
+    if (vaultState.tokenMint.equals(NATIVE_MINT)) {
+      const userWsolAta = getAssociatedTokenAddress(NATIVE_MINT, user);
+      const unwrapIx = createCloseAccountInstruction(userWsolAta, user, user, [], TOKEN_PROGRAM_ID);
+      withdrawIxs.postWithdrawIxs.push(unwrapIx);
+    }
+
     return withdrawIxs;
   }
 

package/src/classes/vault_types.ts

@@ -48,6 +48,7 @@ export type DepositIxs = {
 export type WithdrawIxs = {
   unstakeFromFarmIfNeededIxs: TransactionInstruction[];
   withdrawIxs: TransactionInstruction[];
+  postWithdrawIxs: TransactionInstruction[]; // wSOL ATA close ix 
 };
 
 /** The shares an user has in a vault (staked and unstaked), in tokens */

package/src/client_kamino_manager.ts

@@ -895,7 +895,7 @@ async function main() {
       const withdrawSig = await processTxn(
         env.client,
         env.payer,
-        [...withdrawIxs.unstakeFromFarmIfNeededIxs, ...withdrawIxs.withdrawIxs],
+        [...withdrawIxs.unstakeFromFarmIfNeededIxs, ...withdrawIxs.withdrawIxs, ...withdrawIxs.postWithdrawIxs],
         mode,
         2500,
         [],
@@ -1156,6 +1156,10 @@ async function main() {
       printHoldings(holdings);
       console.log(`Tokens per share for vault ${vaultAddress.toBase58()}: ${tokensPerShare}`);
       console.log('vaultOverview', vaultOverview);
+
+      for (const [reserveAddress, reserveOverview] of vaultOverview.reservesOverview) {
+        console.log(`reserve ${reserveAddress.toBase58()} supplyAPY ${reserveOverview.supplyAPY}`);
+      }
     });
 
   commands.command('get-oracle-mappings').action(async () => {