@kamino-finance/klend-sdk 5.13.1 → 5.13.4

package/src/classes/utils.ts

@@ -1,9 +1,7 @@
 import { PubkeyHashMap, SLOTS_PER_SECOND, SLOTS_PER_YEAR } from '../utils';
 import Decimal from 'decimal.js';
 import { AccountInfo, PublicKey } from '@solana/web3.js';
-import { MarketOverview, ReserveOverview } from '../lib';
 import { AccountLayout, NATIVE_MINT } from '@solana/spl-token';
-import { ReserveAllocationOverview } from './types';
 import axios from 'axios';
 
 type ObligationFarmScoreType = {
@@ -276,56 +274,9 @@ export function pubkeyHashMapToJson(map: PubkeyHashMap<PublicKey, any>): { [key:
   return obj;
 }
 
-export function printPubkeyHashMap<V>(map: PubkeyHashMap<PublicKey, V>) {
-  console.log(pubkeyHashMapToJson(map));
-}
-
-export function printReservesOverviewMap(map: PubkeyHashMap<PublicKey, ReserveOverview>) {
-  map.forEach((value, key) => {
-    console.log('Reserve:', key.toString());
-    printReserveOverview(value);
-  });
-}
-
-export function printReserveOverview(reserveOverview: ReserveOverview) {
-  console.log('Total borrowed from reserve:', reserveOverview.totalBorrowedAmount.toString());
-  console.log('Borrowed from the supplied amount:', reserveOverview.amountBorrowedFromSupplied.toString());
-  console.log('Supplied:', reserveOverview.suppliedAmount.toString());
-  console.log('Utilization ratio:', reserveOverview.utilizationRatio.toString());
-  console.log('Liquidation Threshold Pct:', reserveOverview.liquidationThresholdPct.toString());
-  console.log('Supply APY:', reserveOverview.supplyAPY.toString());
-  console.log('Lending market:', reserveOverview.market.toString());
-}
-
-export function printMarketsOverviewMap(map: PubkeyHashMap<PublicKey, MarketOverview>) {
-  map.forEach((value, key) => {
-    console.log('Reserve:', key.toString());
-    printMarketOverview(value);
-  });
-}
-
-export function printMarketOverview(marketOverview: MarketOverview) {
-  console.log('Market overview:');
-  console.log('  Address:', marketOverview.address.toString());
-  console.log('  Min LTV percentage:', marketOverview.minLTVPct.toString());
-  console.log('  Max LTV percentage:', marketOverview.maxLTVPct.toString());
-  marketOverview.reservesAsCollateral.forEach((reserve, _) => {
-    console.log('    Liquidation LTV percentage:', reserve.liquidationLTVPct.toString());
-  });
-}
-
-export function printReservesAllocationOverviewMap(map: PubkeyHashMap<PublicKey, ReserveAllocationOverview>) {
-  map.forEach((value, key) => {
-    console.log('Reserve:', key.toString());
-    printReserveAllocationOverview(value);
-  });
-}
-
-export function printReserveAllocationOverview(reserveAllocationOverview: ReserveAllocationOverview) {
-  console.log('Reserve allocation overview:');
-  console.log('  Target weight:', reserveAllocationOverview.targetWeight.toString());
-  console.log('  Token allocation cap:', reserveAllocationOverview.tokenAllocationCap.toString());
-  console.log('  Ctoken allocation:', reserveAllocationOverview.ctokenAllocation.toString());
+export function toJson(object: any, inline: boolean = false): string {
+  const replacer = (key: any, value: any) => (typeof value === 'bigint' ? value.toString() : value);
+  return inline ? JSON.stringify(object, replacer) : JSON.stringify(object, replacer, 2);
 }
 
 export function assertNever(x: never): never {

package/src/classes/vault.ts

@@ -14,7 +14,7 @@ import {
 import { getAssociatedTokenAddressSync, NATIVE_MINT, TOKEN_PROGRAM_ID, unpackAccount } from '@solana/spl-token';
 import {
   getAssociatedTokenAddress,
-  getTransferWsolIxns,
+  getTransferWsolIxs,
   getTokenOracleData,
   KaminoMarket,
   KaminoReserve,
@@ -60,6 +60,7 @@ import {
   getTokenBalanceFromAccountInfoLamports,
   numberToLamportsDecimal,
   parseTokenSymbol,
+  pubkeyHashMapToJson,
 } from './utils';
 import { deposit } from '../idl_codegen_kamino_vault/instructions';
 import { withdraw } from '../idl_codegen_kamino_vault/instructions';
@@ -69,6 +70,7 @@ import { Fraction } from './fraction';
 import {
   createAtasIdempotent,
   createWsolAtaIfMissing,
+  getKVaultSharesMetadataPda,
   lendingMarketAuthPda,
   PublicKeySet,
   SECONDS_PER_YEAR,
@@ -88,7 +90,7 @@ import {
   UpdateVaultConfigIxs,
   UserSharesForVault,
   WithdrawIxs,
-} from './types';
+} from './vault_types';
 import { batchFetch, collToLamportsDecimal, ZERO } from '@kamino-finance/kliquidity-sdk';
 import { FullBPSDecimal } from '@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters';
 import { FarmState } from '@kamino-finance/farms-sdk/dist';
@@ -100,7 +102,7 @@ import {
   getSharesInFarmUserPosition,
   getUserSharesInFarm,
 } from './farm_utils';
-import { printHoldings } from './types_utils';
+import { getInitializeKVaultSharesMetadataIx, getUpdateSharesMetadataIx, resolveMetadata } from '../utils/metadata';
 
 export const kaminoVaultId = new PublicKey('KvauGMspG5k6rtzrqqn7WNn3oZdyKqLKwK2XWQ8FLjd');
 export const kaminoVaultStagingId = new PublicKey('stKvQfwRsQiKnLtMNVLHKS3exFJmZFsgfzBPWHECUYK');
@@ -110,6 +112,10 @@ const CTOKEN_VAULT_SEED = 'ctoken_vault';
 const BASE_VAULT_AUTHORITY_SEED = 'authority';
 const SHARES_SEED = 'shares';
 const EVENT_AUTHORITY_SEED = '__event_authority';
+export const METADATA_SEED = 'metadata';
+
+export const METADATA_PROGRAM_ID: PublicKey = new PublicKey('metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
+
 export const INITIAL_DEPOSIT_LAMPORTS = 1000;
 
 /**
@@ -270,7 +276,7 @@ export class KaminoVaultClient {
       lut.toString()
     );
 
-    const ixns = [createVaultIx, initVaultIx, setLUTIx];
+    const ixs = [createVaultIx, initVaultIx, setLUTIx];
 
     if (vaultConfig.getPerformanceFeeBps() > 0) {
       const setPerformanceFeeIx = this.updateUninitialisedVaultConfigIx(
@@ -279,7 +285,7 @@ export class KaminoVaultClient {
         new VaultConfigField.PerformanceFeeBps(),
         vaultConfig.getPerformanceFeeBps().toString()
       );
-      ixns.push(setPerformanceFeeIx);
+      ixs.push(setPerformanceFeeIx);
     }
     if (vaultConfig.getManagementFeeBps() > 0) {
       const setManagementFeeIx = this.updateUninitialisedVaultConfigIx(
@@ -288,7 +294,7 @@ export class KaminoVaultClient {
         new VaultConfigField.ManagementFeeBps(),
         vaultConfig.getManagementFeeBps().toString()
       );
-      ixns.push(setManagementFeeIx);
+      ixs.push(setManagementFeeIx);
     }
     if (vaultConfig.name && vaultConfig.name.length > 0) {
       const setNameIx = this.updateUninitialisedVaultConfigIx(
@@ -297,21 +303,78 @@ export class KaminoVaultClient {
         new VaultConfigField.Name(),
         vaultConfig.name
       );
-      ixns.push(setNameIx);
+      ixs.push(setNameIx);
     }
 
+    const metadataIx = await this.getSetSharesMetadataIx(
+      this.getConnection(),
+      vaultConfig.admin,
+      vaultState.publicKey,
+      sharesMint,
+      baseVaultAuthority,
+      vaultConfig.vaultTokenSymbol,
+      vaultConfig.vaultTokenName
+    );
+
     return {
       vault: vaultState,
       initVaultIxs: {
         createAtaIfNeededIxs: prerequisiteIxs,
-        initVaultIxs: ixns,
+        initVaultIxs: ixs,
         createLUTIx,
         populateLUTIxs: insertIntoLUTIxs,
         cleanupIxs,
+        initSharesMetadataIx: metadataIx,
       },
     };
   }
 
+  /**
+   * This method creates an instruction to set the shares metadata for a vault
+   * @param vault - the vault to set the shares metadata for
+   * @param tokenName - the name of the token in the vault (symbol; e.g. "USDC" which becomes "kVUSDC")
+   * @param extraName - the extra string appended to the prefix("Kamino Vault USDC <extraName>")
+   * @returns - an instruction to set the shares metadata for the vault
+   */
+  async getSetSharesMetadataIx(
+    connection: Connection,
+    vaultAdmin: PublicKey,
+    vault: PublicKey,
+    sharesMint: PublicKey,
+    baseVaultAuthority: PublicKey,
+    tokenName: string,
+    extraName: string
+  ) {
+    const [sharesMintMetadata] = getKVaultSharesMetadataPda(sharesMint);
+
+    const { name, symbol, uri } = resolveMetadata(sharesMint, extraName, tokenName);
+
+    const ix =
+      (await connection.getAccountInfo(sharesMintMetadata)) === null
+        ? await getInitializeKVaultSharesMetadataIx(
+            connection,
+            vaultAdmin,
+            vault,
+            sharesMint,
+            baseVaultAuthority,
+            name,
+            symbol,
+            uri
+          )
+        : await getUpdateSharesMetadataIx(
+            connection,
+            vaultAdmin,
+            vault,
+            sharesMint,
+            baseVaultAuthority,
+            name,
+            symbol,
+            uri
+          );
+
+    return ix;
+  }
+
   /**
    * This method updates the vault reserve allocation cofnig for an exiting vault reserve, or adds a new reserve to the vault if it does not exist.
    * @param vault - vault to be updated
@@ -715,7 +778,7 @@ export class KaminoVaultClient {
       reservesToWithdraw,
       this._kaminoLendProgramId
     );
-    const withdrawIxns: TransactionInstruction[] = await Promise.all(
+    const withdrawIxs: TransactionInstruction[] = await Promise.all(
       reservesToWithdraw.map(async (reserve, index) => {
         if (reserveStates[index] === null) {
           throw new Error(`Reserve ${reserve.toBase58()} not found`);
@@ -734,7 +797,7 @@ export class KaminoVaultClient {
       })
     );
 
-    return [createAtaIx, ...withdrawIxns];
+    return [createAtaIx, ...withdrawIxs];
   }
 
   // async closeVaultIx(vault: KaminoVault): Promise<TransactionInstruction> {
@@ -768,8 +831,8 @@ export class KaminoVaultClient {
 
     const tokenProgramID = vaultState.tokenProgram;
     const userTokenAta = getAssociatedTokenAddress(vaultState.tokenMint, user, true, tokenProgramID);
-    const createAtasIxns: TransactionInstruction[] = [];
-    const closeAtasIxns: TransactionInstruction[] = [];
+    const createAtasIxs: TransactionInstruction[] = [];
+    const closeAtasIxs: TransactionInstruction[] = [];
     if (vaultState.tokenMint.equals(NATIVE_MINT)) {
       const [{ ata: wsolAta, createAtaIx: createWsolAtaIxn }] = createAtasIdempotent(user, [
         {
@@ -777,22 +840,22 @@ export class KaminoVaultClient {
           tokenProgram: TOKEN_PROGRAM_ID,
         },
       ]);
-      createAtasIxns.push(createWsolAtaIxn);
-      const transferWsolIxns = getTransferWsolIxns(
+      createAtasIxs.push(createWsolAtaIxn);
+      const transferWsolIxs = getTransferWsolIxs(
         user,
         wsolAta,
         numberToLamportsDecimal(tokenAmount, vaultState.tokenMintDecimals.toNumber()).ceil()
       );
-      createAtasIxns.push(...transferWsolIxns);
+      createAtasIxs.push(...transferWsolIxs);
     }
 
-    const [{ ata: userSharesAta, createAtaIx: createSharesAtaIxns }] = createAtasIdempotent(user, [
+    const [{ ata: userSharesAta, createAtaIx: createSharesAtaIxs }] = createAtasIdempotent(user, [
       {
         mint: vaultState.sharesMint,
         tokenProgram: TOKEN_PROGRAM_ID,
       },
     ]);
-    createAtasIxns.push(createSharesAtaIxns);
+    createAtasIxs.push(createSharesAtaIxs);
 
     const eventAuthority = getEventAuthorityPda(this._kaminoVaultProgramId);
     const depoistAccounts: DepositAccounts = {
@@ -839,7 +902,7 @@ export class KaminoVaultClient {
     depositIx.keys = depositIx.keys.concat(vaultReservesLendingMarkets);
 
     const depositIxs: DepositIxs = {
-      depositIxs: [...createAtasIxns, depositIx, ...closeAtasIxns],
+      depositIxs: [...createAtasIxs, depositIx, ...closeAtasIxs],
       stakeInFarmIfNeededIxs: [],
     };
 
@@ -930,7 +993,7 @@ export class KaminoVaultClient {
     );
 
     if (vaultAllocation) {
-      const withdrawFromVaultIxs = await this.wihdrdrawWithReserveIxns(
+      const withdrawFromVaultIxs = await this.wihdrdrawWithReserveIxs(
         user,
         kaminoVault,
         shareAmount,
@@ -939,14 +1002,14 @@ export class KaminoVaultClient {
       );
       withdrawIxs.withdrawIxs = withdrawFromVaultIxs;
     } else {
-      const withdrawFromVaultIxs = await this.withdrawFromAvailableIxns(user, kaminoVault, shareAmount);
+      const withdrawFromVaultIxs = await this.withdrawFromAvailableIxs(user, kaminoVault, shareAmount);
       withdrawIxs.withdrawIxs = withdrawFromVaultIxs;
     }
 
     return withdrawIxs;
   }
 
-  private async withdrawFromAvailableIxns(
+  private async withdrawFromAvailableIxs(
     user: PublicKey,
     vault: KaminoVault,
     shareAmount: Decimal
@@ -975,7 +1038,7 @@ export class KaminoVaultClient {
     return [createAtaIx, withdrawFromAvailableIxn];
   }
 
-  private async wihdrdrawWithReserveIxns(
+  private async wihdrdrawWithReserveIxs(
     user: PublicKey,
     vault: KaminoVault,
     shareAmount: Decimal,
@@ -1041,8 +1104,8 @@ export class KaminoVaultClient {
       });
     }
 
-    const withdrawIxns: TransactionInstruction[] = [];
-    withdrawIxns.push(createAtaIx);
+    const withdrawIxs: TransactionInstruction[] = [];
+    withdrawIxs.push(createAtaIx);
 
     for (let reserveIndex = 0; reserveIndex < reserveWithSharesAmountToWithdraw.length; reserveIndex++) {
       const reserveWithTokens = reserveWithSharesAmountToWithdraw[reserveIndex];
@@ -1070,10 +1133,10 @@ export class KaminoVaultClient {
         sharesToWithdraw,
         vaultReservesState
       );
-      withdrawIxns.push(withdrawFromReserveIx);
+      withdrawIxs.push(withdrawFromReserveIx);
     }
 
-    return withdrawIxns;
+    return withdrawIxs;
   }
 
   /**
@@ -1132,7 +1195,7 @@ export class KaminoVaultClient {
       }
     }
 
-    const investIxnsPromises: Promise<TransactionInstruction[]>[] = [];
+    const investIxsPromises: Promise<TransactionInstruction[]>[] = [];
     // invest first the reserves from which we disinvest, then the other ones
     for (const reserve of reservesToDisinvestFrom) {
       const reserveState = allReservesStateMap.get(reserve);
@@ -1149,7 +1212,7 @@ export class KaminoVaultClient {
         allReservesStateMap,
         false
       );
-      investIxnsPromises.push(investIxsPromise);
+      investIxsPromises.push(investIxsPromise);
     }
 
     for (const reserve of reservesToInvestInto) {
@@ -1167,14 +1230,14 @@ export class KaminoVaultClient {
         allReservesStateMap,
         false
       );
-      investIxnsPromises.push(investIxsPromise);
+      investIxsPromises.push(investIxsPromise);
     }
 
-    let investIxns: TransactionInstruction[] = [];
-    investIxns.push(createAtaIx);
-    investIxns = await Promise.all(investIxnsPromises).then((ixns) => ixns.flat());
+    let investIxs: TransactionInstruction[] = [];
+    investIxs.push(createAtaIx);
+    investIxs = await Promise.all(investIxsPromises).then((ixs) => ixs.flat());
 
-    return investIxns;
+    return investIxs;
   }
 
   // todo: make sure we also check the ata of the investor for the vault token exists
@@ -1488,8 +1551,8 @@ export class KaminoVaultClient {
     let lut = vaultState.vaultLookupTable;
     if (lut.equals(PublicKey.default)) {
       const recentSlot = await this.getConnection().getSlot();
-      const [ixn, address] = initLookupTableIx(vaultState.vaultAdminAuthority, recentSlot);
-      setupLUTIfNeededIxs.push(ixn);
+      const [ix, address] = initLookupTableIx(vaultState.vaultAdminAuthority, recentSlot);
+      setupLUTIfNeededIxs.push(ix);
       lut = address;
 
       // set the new LUT for the vault
@@ -1501,12 +1564,12 @@ export class KaminoVaultClient {
       setupLUTIfNeededIxs.push(updateVaultConfigIxs.updateVaultConfigIx);
     }
 
-    const ixns: TransactionInstruction[] = [];
+    const ixs: TransactionInstruction[] = [];
     let overridenExistentAccounts: PublicKey[] | undefined = undefined;
     if (vaultState.vaultLookupTable.equals(PublicKey.default)) {
       overridenExistentAccounts = [];
     }
-    ixns.push(
+    ixs.push(
       ...(await this.insertIntoLookupTableIxs(
         vaultState.vaultAdminAuthority,
         lut,
@@ -1517,7 +1580,7 @@ export class KaminoVaultClient {
 
     return {
       setupLUTIfNeededIxs,
-      syncLUTIxs: ixns,
+      syncLUTIxs: ixs,
     };
   }
 
@@ -1562,20 +1625,20 @@ export class KaminoVaultClient {
     const missingAccountsList = new PublicKeySet(missingAccounts).toArray();
 
     const chunkSize = 20;
-    const ixns: TransactionInstruction[] = [];
+    const ixs: TransactionInstruction[] = [];
 
     for (let i = 0; i < missingAccountsList.length; i += chunkSize) {
       const chunk = missingAccountsList.slice(i, i + chunkSize);
-      const ixn = AddressLookupTableProgram.extendLookupTable({
+      const ix = AddressLookupTableProgram.extendLookupTable({
         lookupTable,
         authority: payer,
         payer,
         addresses: chunk,
       });
-      ixns.push(ixn);
+      ixs.push(ix);
     }
 
-    return ixns;
+    return ixs;
   }
 
   /** Read the total holdings of a vault and the reserve weights and returns a map from each reserve to how many tokens should be deposited.
@@ -2138,6 +2201,7 @@ export class KaminoVaultClient {
         .map((filteredReserve) => {
           const reserveAsCollateral: ReserveAsCollateral = {
             mint: filteredReserve.getLiquidityMint(),
+            address: filteredReserve.address,
             liquidationLTVPct: new Decimal(filteredReserve.state.config.liquidationThresholdPct),
           };
           marketOverview.reservesAsCollateral.push(reserveAsCollateral);
@@ -2643,9 +2707,12 @@ export class KaminoVaultConfig {
   readonly performanceFeeRatePercentage: Decimal;
   /** The management fee rate of the vault, as percents, expressed as a decimal */
   readonly managementFeeRatePercentage: Decimal;
-  /** The name to be stored on cain for the vault (max 40 characters). */
+  /** The name to be stored on chain for the vault (max 40 characters). */
   readonly name: string;
-
+  /** The symbol of the vault token to be stored (max 5 characters). E.g. USDC for a vault using USDC as token. */
+  readonly vaultTokenSymbol: string;
+  /** The name of the vault token to be stored (max 10 characters), after the prefix `Kamino Vault <vaultTokenSymbol>`. E.g. USDC Vault for a vault using USDC as token. */
+  readonly vaultTokenName: string;
   constructor(args: {
     admin: PublicKey;
     tokenMint: PublicKey;
@@ -2653,6 +2720,8 @@ export class KaminoVaultConfig {
     performanceFeeRatePercentage: Decimal;
     managementFeeRatePercentage: Decimal;
     name: string;
+    vaultTokenSymbol: string;
+    vaultTokenName: string;
   }) {
     this.admin = args.admin;
     this.tokenMint = args.tokenMint;
@@ -2660,6 +2729,8 @@ export class KaminoVaultConfig {
     this.managementFeeRatePercentage = args.managementFeeRatePercentage;
     this.tokenMintProgramId = args.tokenMintProgramId;
     this.name = args.name;
+    this.vaultTokenSymbol = args.vaultTokenSymbol;
+    this.vaultTokenName = args.vaultTokenName;
   }
 
   getPerformanceFeeBps(): number {
@@ -2762,6 +2833,7 @@ export type MarketOverview = {
 export type ReserveAsCollateral = {
   mint: PublicKey;
   liquidationLTVPct: Decimal;
+  address: PublicKey;
 };
 
 export type VaultOverview = {
@@ -2788,3 +2860,12 @@ export type VaultCumulativeInterestWithTimestamp = {
   cumulativeInterest: Decimal;
   timestamp: number;
 };
+
+export function printHoldings(holdings: VaultHoldings) {
+  console.log('Holdings:');
+  console.log('  Available:', holdings.available.toString());
+  console.log('  Invested:', holdings.invested.toString());
+  console.log('  Total AUM including fees:', holdings.totalAUMIncludingFees.toString());
+  console.log('  Pending fees:', holdings.pendingFees.toString());
+  console.log('  Invested in reserves:', pubkeyHashMapToJson(holdings.investedInReserves));
+}

package/src/classes/{types.ts → vault_types.ts}

@@ -1,4 +1,4 @@
-import { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { TransactionInstruction } from '@solana/web3.js';
 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 */
@@ -8,6 +8,7 @@ export type InitVaultIxs = {
   createLUTIx: TransactionInstruction;
   populateLUTIxs: TransactionInstruction[];
   cleanupIxs: TransactionInstruction[];
+  initSharesMetadataIx: TransactionInstruction;
 };
 
 export type AcceptVaultOwnershipIxs = {
@@ -61,18 +62,3 @@ export type APYs = {
   grossAPY: Decimal;
   netAPY: Decimal;
 };
-
-/**
- * Some amount of a specific token type.
- */
-export type TokenAmount = {
-  /**
-   * Token's mint key.
-   */
-  mint: PublicKey;
-
-  /**
-   * Amount, in lamports.
-   */
-  amount: Decimal;
-};

package/src/client.ts

@@ -364,13 +364,13 @@ async function deposit(connection: Connection, wallet: Keypair, token: string, d
     true,
     { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
-  console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
+  console.log('User obligation', kaminoAction.getObligationPda().toString());
 
   const tx = await buildVersionedTransaction(connection, wallet.publicKey, KaminoAction.actionToIxs(kaminoAction));
 
-  console.log('Deposit SetupIxns:', kaminoAction.setupIxsLabels);
-  console.log('Deposit LendingIxns:', kaminoAction.lendingIxsLabels);
-  console.log('Deposit CleanupIxns:', kaminoAction.cleanupIxsLabels);
+  console.log('Deposit SetupIxs:', kaminoAction.setupIxsLabels);
+  console.log('Deposit LendingIxs:', kaminoAction.lendingIxsLabels);
+  console.log('Deposit CleanupIxs:', kaminoAction.cleanupIxsLabels);
   await buildAndSendTxnWithLogs(connection, tx, wallet, []);
 }
 
@@ -386,13 +386,13 @@ async function withdraw(connection: Connection, wallet: Keypair, token: string,
     true,
     { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
-  console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
+  console.log('User obligation', kaminoAction.getObligationPda().toString());
 
   const tx = await buildVersionedTransaction(connection, wallet.publicKey, KaminoAction.actionToIxs(kaminoAction));
 
-  console.log('Withdraw SetupIxns:', kaminoAction.setupIxsLabels);
-  console.log('Withdraw LendingIxns:', kaminoAction.lendingIxsLabels);
-  console.log('Withdraw CleanupIxns:', kaminoAction.cleanupIxsLabels);
+  console.log('Withdraw SetupIxs:', kaminoAction.setupIxsLabels);
+  console.log('Withdraw LendingIxs:', kaminoAction.lendingIxsLabels);
+  console.log('Withdraw CleanupIxs:', kaminoAction.cleanupIxsLabels);
   await buildAndSendTxnWithLogs(connection, tx, wallet, []);
 }
 
@@ -408,13 +408,13 @@ async function borrow(connection: Connection, wallet: Keypair, token: string, bo
     true,
     { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
-  console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
+  console.log('User obligation', kaminoAction.getObligationPda().toString());
 
   const tx = await buildVersionedTransaction(connection, wallet.publicKey, KaminoAction.actionToIxs(kaminoAction));
 
-  console.log('Borrow SetupIxns:', kaminoAction.setupIxsLabels);
-  console.log('Borrow LendingIxns:', kaminoAction.lendingIxsLabels);
-  console.log('Borrow CleanupIxns:', kaminoAction.cleanupIxsLabels);
+  console.log('Borrow SetupIxs:', kaminoAction.setupIxsLabels);
+  console.log('Borrow LendingIxs:', kaminoAction.lendingIxsLabels);
+  console.log('Borrow CleanupIxs:', kaminoAction.cleanupIxsLabels);
   await buildAndSendTxnWithLogs(connection, tx, wallet, []);
 }
 
@@ -431,13 +431,13 @@ async function repay(connection: Connection, wallet: Keypair, token: string, bor
     { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' },
     await connection.getSlot()
   );
-  console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
+  console.log('User obligation', kaminoAction.getObligationPda().toString());
 
   const tx = await buildVersionedTransaction(connection, wallet.publicKey, KaminoAction.actionToIxs(kaminoAction));
 
-  console.log('Repay SetupIxns:', kaminoAction.setupIxsLabels);
-  console.log('Repay LendingIxns:', kaminoAction.lendingIxsLabels);
-  console.log('Repay CleanupIxns:', kaminoAction.cleanupIxsLabels);
+  console.log('Repay SetupIxs:', kaminoAction.setupIxsLabels);
+  console.log('Repay LendingIxs:', kaminoAction.lendingIxsLabels);
+  console.log('Repay CleanupIxs:', kaminoAction.cleanupIxsLabels);
   await buildAndSendTxnWithLogs(connection, tx, wallet, []);
 }