@kamino-finance/klend-sdk 7.4.0-beta.0 → 7.4.0-beta.2

package/src/classes/obligation.ts

@@ -337,31 +337,33 @@ export class KaminoObligation {
     return this.deposits.get(reserve);
   }
 
-  getBorrowByMint(mint: Address): Position | undefined {
+  getBorrowsByMint(mint: Address): Position[] {
+    const positions: Position[] = [];
     for (const value of this.borrows.values()) {
       if (value.mintAddress === mint) {
-        return value;
+        positions.push(value);
       }
     }
-    return undefined;
+    return positions;
   }
 
   getBorrowAmountByReserve(reserve: KaminoReserve): Decimal {
-    const amountLamports = this.getBorrowByMint(reserve.getLiquidityMint())?.amount ?? new Decimal(0);
+    const amountLamports = this.getBorrowByReserve(reserve.address)?.amount ?? new Decimal(0);
     return amountLamports.div(reserve.getMintFactor());
   }
 
-  getDepositByMint(mint: Address): Position | undefined {
+  getDepositsByMint(mint: Address): Position[] {
+    const positions: Position[] = [];
     for (const value of this.deposits.values()) {
       if (value.mintAddress === mint) {
-        return value;
+        positions.push(value);
       }
     }
-    return undefined;
+    return positions;
   }
 
   getDepositAmountByReserve(reserve: KaminoReserve): Decimal {
-    const amountLamports = this.getDepositByMint(reserve.getLiquidityMint())?.amount ?? new Decimal(0);
+    const amountLamports = this.getDepositByReserve(reserve.address)?.amount ?? new Decimal(0);
     return amountLamports.div(reserve.getMintFactor());
   }
 
@@ -595,8 +597,8 @@ export class KaminoObligation {
     amountCollateral?: Decimal;
     amountDebt?: Decimal;
     action: ActionType;
-    mintCollateral?: Address;
-    mintDebt?: Address;
+    collateralReserveAddress?: Address;
+    debtReserveAddress?: Address;
     market: KaminoMarket;
     reserves: Map<Address, KaminoReserve>;
     slot: Slot;
@@ -606,18 +608,15 @@ export class KaminoObligation {
     deposits: Map<Address, Position>;
     borrows: Map<Address, Position>;
   } {
-    const { amountCollateral, amountDebt, action, mintCollateral, mintDebt, market } = params;
+    const { amountCollateral, amountDebt, action, collateralReserveAddress, debtReserveAddress, market } = params;
     let newStats = { ...this.refreshedStats };
 
-    const collateralReservePk = mintCollateral ? market.getReserveByMint(mintCollateral)!.address : undefined;
-    const debtReservePk = mintDebt ? market.getReserveByMint(mintDebt)!.address : undefined;
-
     const additionalReserves: Address[] = [];
-    if (collateralReservePk !== undefined) {
-      additionalReserves.push(collateralReservePk);
+    if (collateralReserveAddress !== undefined) {
+      additionalReserves.push(collateralReserveAddress);
     }
-    if (debtReservePk !== undefined) {
-      additionalReserves.push(debtReservePk);
+    if (debtReserveAddress !== undefined) {
+      additionalReserves.push(debtReserveAddress);
     }
 
     const { collateralExchangeRates } = KaminoObligation.getRatesForObligation(
@@ -636,8 +635,8 @@ export class KaminoObligation {
     // so we have to recalculate the entire position, not just an updated deposit or borrow
     // as both LTVs and borrow factors can change, affecting all calcs
 
-    const debtReserveCumulativeBorrowRate = mintDebt
-      ? market.getReserveByMint(mintDebt)!.getCumulativeBorrowRate()
+    const debtReserveCumulativeBorrowRate = debtReserveAddress
+      ? market.getExistingReserveByAddress(debtReserveAddress).getCumulativeBorrowRate()
       : undefined;
 
     let newObligationDeposits = this.state.deposits;
@@ -645,13 +644,13 @@ export class KaminoObligation {
 
     switch (action) {
       case 'deposit': {
-        if (amountCollateral === undefined || mintCollateral === undefined) {
-          throw Error('amountCollateral & mintCollateral are required for deposit action');
+        if (amountCollateral === undefined || collateralReserveAddress === undefined) {
+          throw Error('amountCollateral & collateralReserveAddress are required for deposit action');
         }
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           {
-            reserveAddress: collateralReservePk!,
+            reserveAddress: collateralReserveAddress,
             amountChangeLamports: amountCollateral,
           },
           collateralExchangeRates
@@ -659,14 +658,14 @@ export class KaminoObligation {
         break;
       }
       case 'borrow': {
-        if (amountDebt === undefined || mintDebt === undefined) {
-          throw Error('amountDebt & mintDebt are required for borrow action');
+        if (amountDebt === undefined || debtReserveAddress === undefined) {
+          throw Error('amountDebt & debtReserveAddress are required for borrow action');
         }
 
         newObligationBorrows = this.simulateBorrowChange(
           this.state.borrows,
           {
-            reserveAddress: debtReservePk!,
+            reserveAddress: debtReserveAddress,
             amountChangeLamports: amountDebt,
           },
           debtReserveCumulativeBorrowRate!
@@ -674,14 +673,14 @@ export class KaminoObligation {
         break;
       }
       case 'repay': {
-        if (amountDebt === undefined || mintDebt === undefined) {
-          throw Error('amountDebt & mintDebt are required for repay action');
+        if (amountDebt === undefined || debtReserveAddress === undefined) {
+          throw Error('amountDebt & debtReserveAddress are required for repay action');
         }
 
         newObligationBorrows = this.simulateBorrowChange(
           this.state.borrows,
           {
-            reserveAddress: debtReservePk!,
+            reserveAddress: debtReserveAddress,
             amountChangeLamports: amountDebt.neg(),
           },
           debtReserveCumulativeBorrowRate!
@@ -691,13 +690,13 @@ export class KaminoObligation {
       }
 
       case 'withdraw': {
-        if (amountCollateral === undefined || mintCollateral === undefined) {
-          throw Error('amountCollateral & mintCollateral are required for withdraw action');
+        if (amountCollateral === undefined || collateralReserveAddress === undefined) {
+          throw Error('amountCollateral & collateralReserveAddress are required for withdraw action');
         }
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           {
-            reserveAddress: collateralReservePk!,
+            reserveAddress: collateralReserveAddress,
             amountChangeLamports: amountCollateral.neg(),
           },
           collateralExchangeRates
@@ -708,15 +707,17 @@ export class KaminoObligation {
         if (
           amountCollateral === undefined ||
           amountDebt === undefined ||
-          mintCollateral === undefined ||
-          mintDebt === undefined
+          collateralReserveAddress === undefined ||
+          debtReserveAddress === undefined
         ) {
-          throw Error('amountColl & amountDebt & mintCollateral & mintDebt are required for depositAndBorrow action');
+          throw Error(
+            'amountColl & amountDebt & collateralReserveAddress & debtReserveAddress are required for depositAndBorrow action'
+          );
         }
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           {
-            reserveAddress: collateralReservePk!,
+            reserveAddress: collateralReserveAddress,
             amountChangeLamports: amountCollateral,
           },
           collateralExchangeRates
@@ -725,7 +726,7 @@ export class KaminoObligation {
         newObligationBorrows = this.simulateBorrowChange(
           this.state.borrows,
           {
-            reserveAddress: debtReservePk!,
+            reserveAddress: debtReserveAddress,
             amountChangeLamports: amountDebt,
           },
           debtReserveCumulativeBorrowRate!
@@ -736,15 +737,17 @@ export class KaminoObligation {
         if (
           amountCollateral === undefined ||
           amountDebt === undefined ||
-          mintCollateral === undefined ||
-          mintDebt === undefined
+          collateralReserveAddress === undefined ||
+          debtReserveAddress === undefined
         ) {
-          throw Error('amountColl & amountDebt & mintCollateral & mintDebt are required for repayAndWithdraw action');
+          throw Error(
+            'amountColl & amountDebt & collateralReserveAddress & debtReserveAddress are required for repayAndWithdraw action'
+          );
         }
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           {
-            reserveAddress: collateralReservePk!,
+            reserveAddress: collateralReserveAddress,
             amountChangeLamports: amountCollateral.neg(),
           },
           collateralExchangeRates
@@ -752,7 +755,7 @@ export class KaminoObligation {
         newObligationBorrows = this.simulateBorrowChange(
           this.state.borrows,
           {
-            reserveAddress: debtReservePk!,
+            reserveAddress: debtReserveAddress,
             amountChangeLamports: amountDebt.neg(),
           },
           debtReserveCumulativeBorrowRate!
@@ -1186,7 +1189,7 @@ export class KaminoObligation {
     not a reserve-specific, caps-specific, liquidity-specific function.
 
     * @param market - The KaminoMarket instance.
-    * @param liquidityMint - The liquidity mint Address.
+    * @param liquidityReserveAddress - The liquidity reserve Address.
     * @param slot - The slot number.
     * @param elevationGroup - The elevation group number (default: this.state.elevationGroup).
     * @returns The borrow power as a Decimal.
@@ -1194,11 +1197,11 @@ export class KaminoObligation {
   */
   getBorrowPower(
     market: KaminoMarket,
-    liquidityMint: Address,
+    liquidityReserveAddress: Address,
     slot: Slot,
     elevationGroup: number = this.state.elevationGroup
   ): Decimal {
-    const reserve = market.getReserveByMint(liquidityMint);
+    const reserve = market.getReserveByAddress(liquidityReserveAddress);
     if (!reserve) {
       throw new Error('Reserve not found');
     }
@@ -1265,7 +1268,7 @@ export class KaminoObligation {
     and a specific reserve, until it hits max LTV and given available liquidity and caps.
 
     * @param market - The KaminoMarket instance.
-    * @param liquidityMint - The liquidity mint Address.
+    * @param liquidityReserveAddress - The liquidity reserve Address.
     * @param slot - The slot number.
     * @param elevationGroup - The elevation group number (default: this.state.elevationGroup).
     * @returns The maximum borrow amount as a Decimal.
@@ -1273,11 +1276,11 @@ export class KaminoObligation {
   */
   getMaxBorrowAmountV2(
     market: KaminoMarket,
-    liquidityMint: Address,
+    liquidityReserveAddress: Address,
     slot: Slot,
     elevationGroup: number = this.state.elevationGroup
   ): Decimal {
-    const reserve = market.getReserveByMint(liquidityMint);
+    const reserve = market.getReserveByAddress(liquidityReserveAddress);
     if (!reserve) {
       throw new Error('Reserve not found');
     }
@@ -1287,7 +1290,7 @@ export class KaminoObligation {
       [elevationGroup],
       Array.from(this.deposits.keys())
     )[0];
-    const maxBorrowAmount = this.getBorrowPower(market, liquidityMint, slot, elevationGroup);
+    const maxBorrowAmount = this.getBorrowPower(market, liquidityReserveAddress, slot, elevationGroup);
 
     if (elevationGroup === this.state.elevationGroup) {
       return Decimal.min(maxBorrowAmount, liquidityAvailable);
@@ -1304,7 +1307,7 @@ export class KaminoObligation {
     the new borrow power after the deposit, without overriding the obligation itself.
 
     * @param market - The KaminoMarket instance.
-    * @param liquidityMint - The liquidity mint Address.
+    * @param liquidityReserveAddress - The liquidity reserve Address.
     * @param slot - The slot number.
     * @param elevationGroup - The elevation group number (default: this.state.elevationGroup).
     * @returns The maximum borrow amount as a Decimal.
@@ -1312,7 +1315,7 @@ export class KaminoObligation {
   */
   getMaxBorrowAmountV2WithDeposit(
     market: KaminoMarket,
-    liquidityMint: Address,
+    liquidityReserveAddress: Address,
     slot: Slot,
     elevationGroup: number = this.state.elevationGroup,
     depositAmountLamports: Decimal,
@@ -1326,7 +1329,7 @@ export class KaminoObligation {
     ];
     const obligationWithDeposit = this.withPositionChanges(market, slot, depositChanges);
 
-    return obligationWithDeposit.getMaxBorrowAmountV2(market, liquidityMint, slot, elevationGroup);
+    return obligationWithDeposit.getMaxBorrowAmountV2(market, liquidityReserveAddress, slot, elevationGroup);
   }
 
   /*
@@ -1406,11 +1409,11 @@ export class KaminoObligation {
   /* Deprecated function, also broken */
   getMaxBorrowAmount(
     market: KaminoMarket,
-    liquidityMint: Address,
+    liquidityReserveAddress: Address,
     slot: Slot,
     requestElevationGroup: boolean
   ): Decimal {
-    const reserve = market.getReserveByMint(liquidityMint);
+    const reserve = market.getReserveByAddress(liquidityReserveAddress);
 
     if (!reserve) {
       throw new Error('Reserve not found');
@@ -1525,8 +1528,8 @@ export class KaminoObligation {
     return Decimal.max(new Decimal(0), maxBorrowAmount);
   }
 
-  getMaxWithdrawAmount(market: KaminoMarket, tokenMint: Address, slot: Slot): Decimal {
-    const depositReserve = market.getReserveByMint(tokenMint);
+  getMaxWithdrawAmount(market: KaminoMarket, depositReserveAddress: Address, slot: Slot): Decimal {
+    const depositReserve = market.getReserveByAddress(depositReserveAddress);
 
     if (!depositReserve) {
       throw new Error('Reserve not found');
@@ -1585,7 +1588,7 @@ export class KaminoObligation {
    * the new withdraw power after the repay, without overriding the obligation itself.
    *
    * @param market - The KaminoMarket instance.
-   * @param tokenMint - The liquidity mint Address.
+   * @param depositReserveAddress - The liquidity (deposit) reserve Address.
    * @param slot - The slot number.
    * @param repayAmountLamports - The amount to repay in lamports (use U64_MAX for full repay).
    * @param repayReserveAddress - The reserve address of the borrow being repaid.
@@ -1594,7 +1597,7 @@ export class KaminoObligation {
    */
   getMaxWithdrawAmountWithRepay(
     market: KaminoMarket,
-    tokenMint: Address,
+    depositReserveAddress: Address,
     slot: Slot,
     repayAmountLamports: Decimal,
     repayReserveAddress: Address
@@ -1615,7 +1618,7 @@ export class KaminoObligation {
     ];
     const obligationWithRepay = this.withPositionChanges(market, slot, undefined, borrowChanges);
 
-    return obligationWithRepay.getMaxWithdrawAmount(market, tokenMint, slot);
+    return obligationWithRepay.getMaxWithdrawAmount(market, depositReserveAddress, slot);
   }
 
   getObligationLiquidityByReserve(reserveAddress: Address): ObligationLiquidity {

package/src/classes/obligationOrder.ts

@@ -169,6 +169,7 @@ export class DeleverageDebtAmount implements OrderOpportunity {
     return {
       mint: singleBorrow.mintAddress,
       amount: Decimal.min(singleBorrow.amount, this.amount),
+      reserveAddress: singleBorrow.reserveAddress,
     };
   }
 }
@@ -204,6 +205,7 @@ export class DeleverageAllDebt implements OrderOpportunity {
     return {
       mint: highestValueBorrow.mintAddress,
       amount: highestValueBorrow.amount,
+      reserveAddress: highestValueBorrow.reserveAddress,
     };
   }
 }
@@ -310,7 +312,7 @@ export class KaminoObligationOrder {
       return undefined; // condition not met - cannot execute
     }
     const maxRepay = this.opportunity.getMaxRepay(obligation.getBorrows());
-    const repayBorrow = obligation.getBorrowByMint(maxRepay.mint)!;
+    const repayBorrow = obligation.getBorrowByReserve(maxRepay.reserveAddress)!;
     const maxRepayValue = tokenAmountToValue(maxRepay, repayBorrow);
     const executionBonusRate = this.calculateExecutionBonusRate(conditionHit, obligation);
     const executionBonusFactor = new Decimal(1).add(executionBonusRate);
@@ -342,7 +344,7 @@ export class KaminoObligationOrder {
           return valueComparison;
         }
         // Just for deterministic selection in case of multiple equally-good deposits: pick the one with lower mint pubkey (mostly for test stability purposes)
-        return leftDeposit.mintAddress.localeCompare(rightDeposit.mintAddress);
+        return leftDeposit.reserveAddress.localeCompare(rightDeposit.reserveAddress);
       })
       .at(-1)!;
     const actualRepayValue = actualWithdrawValue.div(executionBonusFactor);
@@ -505,7 +507,7 @@ export type AvailableOrderExecution = {
 // Internal calculation functions:
 
 function tokenAmountToValue(tokenAmount: TokenAmount, position: Position): Decimal {
-  if (tokenAmount.mint !== position.mintAddress) {
+  if (tokenAmount.reserveAddress !== position.reserveAddress) {
     throw new Error(`Value of token amount ${tokenAmount} cannot be computed using data from ${position}`);
   }
   return tokenAmount.amount.mul(position.marketValueRefreshed).div(position.amount);
@@ -516,6 +518,7 @@ function valueToTokenAmount(value: Decimal, position: Position): TokenAmount {
   return {
     amount: roundNearest(fractionalAmount),
     mint: position.mintAddress,
+    reserveAddress: position.reserveAddress,
   };
 }
 

package/src/classes/reserve.ts

@@ -19,6 +19,7 @@ import Decimal from 'decimal.js';
 import {
   AllOracleAccounts,
   DEFAULT_PUBLIC_KEY,
+  FixedRateReserveKind,
   getTokenOracleData,
   globalConfigPda,
   INITIAL_COLLATERAL_RATE,
@@ -26,7 +27,9 @@ import {
   MarketWithAddress,
   MIN_INITIAL_DEPOSIT,
   ONE_HUNDRED_PCT_IN_BPS,
+  FloatRateReserveKind,
   reservePdas,
+  ReserveKind,
   SLOTS_PER_DAY,
   SLOTS_PER_SECOND,
   SLOTS_PER_YEAR,
@@ -76,6 +79,7 @@ export class KaminoReserve {
   private readonly recentSlotDurationMs: number;
 
   private metadata?: ScopeEntryMetadata[];
+  private reserveKind: ReserveKind;
 
   constructor(
     state: Reserve,
@@ -91,6 +95,7 @@ export class KaminoReserve {
     this.rpc = connection;
     this.symbol = parseTokenSymbol(state.config.tokenInfo.name);
     this.recentSlotDurationMs = recentSlotDurationMs;
+    this.reserveKind = KaminoReserve.createReserveKind(state);
   }
 
   static initialize(
@@ -130,6 +135,16 @@ export class KaminoReserve {
     return new KaminoReserve(reserve, address, tokenOracleData, rpc, recentSlotDurationMs);
   }
 
+  static createReserveKind(state: Reserve): ReserveKind {
+    const debtTermSeconds = state.config.debtTermSeconds;
+    if (debtTermSeconds.eqn(0)) {
+      return new FloatRateReserveKind();
+    } else {
+      const borrowRateBps = state.config.borrowRateCurve.points[0]?.borrowRateBps || 0;
+      return new FixedRateReserveKind(debtTermSeconds, borrowRateBps);
+    }
+  }
+
   /// GETTERS
 
   /**
@@ -733,6 +748,15 @@ export class KaminoReserve {
     return this.state.collateral.mintPubkey;
   }
 
+  /**
+   * Returns the reserve kind (FloatRateReserveKind or FixedRateReserveKind) for this reserve.
+   *
+   * @returns The reserve kind instance
+   */
+  getKind(): ReserveKind {
+    return this.reserveKind;
+  }
+
   calculateFees(
     amountLamports: Decimal,
     borrowFeeRate: Decimal,

package/src/classes/shared.ts

@@ -77,6 +77,8 @@ export type TokenAmount = {
    */
   mint: Address;
 
+  reserveAddress: Address;
+
   /**
    * Amount, in lamports.
    */

package/src/classes/utils.ts

@@ -3,6 +3,7 @@ import Decimal from 'decimal.js';
 import { Account, Address } from '@solana/kit';
 import axios from 'axios';
 import { Token } from '@solana-program/token-2022';
+import { ReserveType, ReserveTypeKind } from '../@codegen/kvault/types';
 
 type ObligationFarmScoreType = {
   obligationId: string;
@@ -310,3 +311,10 @@ export async function getMedianSlotDurationInMsFromLastEpochs() {
   const response = await axios.get<{ recentSlotDurationInMs: number }>('https://api.kamino.finance/slots/duration');
   return response.data.recentSlotDurationInMs;
 }
+
+export const toReserveTypeKind = (rt: number | ReserveTypeKind): ReserveTypeKind => {
+  if (typeof rt !== 'number') return rt;
+  if (rt === ReserveType.Standard.discriminator) return new ReserveType.Standard();
+  if (rt === ReserveType.Virtual.discriminator) return new ReserveType.Virtual();
+  throw new Error(`Invalid reserve type: ${rt}`);
+};

package/src/classes/vault.ts

@@ -82,10 +82,23 @@ import {
   withdrawPendingFees,
   WithdrawPendingFeesAccounts,
 } from '../@codegen/kvault/instructions';
-import { UpdateReserveWhitelistModeKind, VaultConfigField, VaultConfigFieldKind } from '../@codegen/kvault/types';
+import {
+  ReserveType,
+  ReserveTypeKind,
+  UpdateReserveWhitelistModeKind,
+  VaultConfigField,
+  VaultConfigFieldKind,
+} from '../@codegen/kvault/types';
 import { VaultState } from '../@codegen/kvault/accounts';
 import Decimal from 'decimal.js';
-import { bpsToPct, decodeVaultName, numberToLamportsDecimal, parseTokenSymbol, pubkeyHashMapToJson } from './utils';
+import {
+  bpsToPct,
+  decodeVaultName,
+  numberToLamportsDecimal,
+  parseTokenSymbol,
+  pubkeyHashMapToJson,
+  toReserveTypeKind,
+} from './utils';
 import { PROGRAM_ID } from '../@codegen/klend/programId';
 import { ReserveWithAddress } from './reserve';
 import { Fraction } from './fraction';
@@ -552,6 +565,7 @@ export class KaminoVaultClient {
     const updateReserveAllocationArgs: UpdateReserveAllocationArgs = {
       weight: new BN(reserveAllocationConfig.targetAllocationWeight),
       cap: new BN(reserveAllocationConfig.getAllocationCapLamports().floor().toString()),
+      reserveType: reserveAllocationConfig.getAllocationReserveType(),
     };
 
     const updateReserveAllocationIx = updateReserveAllocation(
@@ -706,7 +720,10 @@ export class KaminoVaultClient {
         address: reserve,
         state: vaultReservesMap.get(reserve)!.state,
       };
-      const reserveAllocationConfig = new ReserveAllocationConfig(reserveWithAddress, 0, new Decimal(0));
+      const reserveType = vaultState.vaultAllocationStrategy.find(
+        (allocation) => allocation.reserve === reserve
+      )!.reserveType;
+      const reserveAllocationConfig = new ReserveAllocationConfig(reserveWithAddress, 0, new Decimal(0), reserveType);
 
       // update allocation to have 0 weight and 0 cap
       const updateAllocIxs = await this.updateReserveAllocationIxs(vault, reserveAllocationConfig, payer);
@@ -1918,6 +1935,9 @@ export class KaminoVaultClient {
       payerTokenAccount: payerTokenAta,
       tokenMint: vaultState.tokenMint,
       reserveCollateralTokenProgram: TOKEN_PROGRAM_ADDRESS,
+      reserveWithdrawTicket: none(), // todo (silviu): impl this properly
+      ownerQueuedCollateralVault: none(), // todo (silviu): impl this properly
+      systemProgram: SYSTEM_PROGRAM_ADDRESS,
     };
 
     let investIx = invest(investAccounts, undefined, this._kaminoVaultProgramId);
@@ -4513,11 +4533,18 @@ export class ReserveAllocationConfig {
   readonly reserve: ReserveWithAddress;
   readonly targetAllocationWeight: number;
   readonly allocationCapDecimal: Decimal;
+  readonly allocationReserveType: ReserveTypeKind;
 
-  constructor(reserve: ReserveWithAddress, targetAllocationWeight: number, allocationCapDecimal: Decimal) {
+  constructor(
+    reserve: ReserveWithAddress,
+    targetAllocationWeight: number,
+    allocationCapDecimal: Decimal,
+    reserveType: number | ReserveTypeKind = new ReserveType.Standard()
+  ) {
     this.reserve = reserve;
     this.targetAllocationWeight = targetAllocationWeight;
     this.allocationCapDecimal = allocationCapDecimal;
+    this.allocationReserveType = toReserveTypeKind(reserveType);
   }
 
   getAllocationCapLamports(): Decimal {
@@ -4531,6 +4558,10 @@ export class ReserveAllocationConfig {
   getReserveAddress(): Address {
     return this.reserve.address;
   }
+
+  getAllocationReserveType(): ReserveTypeKind {
+    return this.allocationReserveType;
+  }
 }
 
 export async function getCTokenVaultPda(

package/src/client/client.ts

@@ -32,15 +32,15 @@ async function main() {
   commands
     .command('print-borrow-rate')
     .option(`--url <string>`, 'The admin keypair file')
-    .option(`--token <string>`, 'The token symbol')
+    .option(`--reserveAddress <string>`, 'The token symbol')
     .option(`--cluster <string>`, 'staging or mainnet-beta')
-    .action(async ({ url, token, cluster }) => {
+    .action(async ({ url, reserveAddress, cluster }) => {
       const env = await initEnv(url);
 
       const programId = getProgramId(cluster);
       const kaminoMarket = await getMarket(env.c.rpc, programId);
 
-      const reserve = kaminoMarket.getReserveBySymbol(token);
+      const reserve = kaminoMarket.getReserveByAddress(reserveAddress);
 
       const slot = await env.c.rpc.getSlot().send();
 
@@ -130,10 +130,9 @@ async function main() {
     .command('print-reserve')
     .option(`--url <string>`, 'The admin keypair file')
     .option(`--reserve <string>`, 'Reserve address')
-    .option(`--symbol <string>`, 'Symbol (optional)')
-    .action(async ({ url, reserve, symbol }) => {
+    .action(async ({ url, reserve }) => {
       const env = await initEnv(url);
-      await printReserve(env.c.rpc, reserve, symbol);
+      await printReserve(env.c.rpc, reserve);
     });
 
   commands
@@ -148,48 +147,48 @@ async function main() {
     .command('deposit')
     .option(`--url <string>`, 'Custom RPC URL')
     .option(`--owner <string>`, 'Custom RPC URL')
-    .option(`--token <string>`, 'Custom RPC URL')
+    .option(`--reserveAddress <string>`, 'Custom RPC URL')
     .option(`--amount <string>`, 'Custom RPC URL')
-    .action(async ({ url, owner, token, amount }) => {
+    .action(async ({ url, owner, reserveAddress, amount }) => {
       const depositAmount = new BN(amount);
       const env = await initEnv(url, owner);
-      await deposit(env, 'execute', token, depositAmount);
+      await deposit(env, 'execute', reserveAddress, depositAmount);
     });
 
   commands
     .command('withdraw')
     .option(`--url <string>`, 'Custom RPC URL')
     .option(`--owner <string>`, 'Custom RPC URL')
-    .option(`--token <string>`, 'Custom RPC URL')
+    .option(`--reserveAddress <string>`, 'Custom RPC URL')
     .option(`--amount <string>`, 'Custom RPC URL')
-    .action(async ({ url, owner, token, amount }) => {
+    .action(async ({ url, owner, reserveAddress, amount }) => {
       const withdrawAmount = new BN(amount);
       const env = await initEnv(url, owner);
-      await withdraw(env, 'execute', token, withdrawAmount);
+      await withdraw(env, 'execute', reserveAddress, withdrawAmount);
     });
 
   commands
     .command('borrow')
     .option(`--url <string>`, 'Custom RPC URL')
     .option(`--owner <string>`, 'Custom RPC URL')
-    .option(`--token <string>`, 'Custom RPC URL')
+    .option(`--reserveAddress <string>`, 'Custom RPC URL')
     .option(`--amount <string>`, 'Custom RPC URL')
-    .action(async ({ url, owner, token, amount }) => {
+    .action(async ({ url, owner, reserveAddress, amount }) => {
       const borrowAmount = new BN(amount);
       const env = await initEnv(url, owner);
-      await borrow(env, 'execute', token, borrowAmount);
+      await borrow(env, 'execute', reserveAddress, borrowAmount);
     });
 
   commands
     .command('repay')
     .option(`--url <string>`, 'Custom RPC URL')
     .option(`--owner <string>`, 'Custom RPC URL')
-    .option(`--token <string>`, 'Custom RPC URL')
+    .option(`--reserveAddress <string>`, 'Custom RPC URL')
     .option(`--amount <string>`, 'Custom RPC URL')
-    .action(async ({ url, owner, token, amount }) => {
+    .action(async ({ url, owner, reserveAddress, amount }) => {
       const repayAmount = new BN(amount);
       const env = await initEnv(url, owner);
-      await repay(env, 'execute', token, repayAmount);
+      await repay(env, 'execute', reserveAddress, repayAmount);
     });
 
   commands