@kamino-finance/klend-sdk 7.4.0-beta.1 → 7.4.0-beta.3

package/src/manager/client_kamino_manager.ts

@@ -218,9 +218,8 @@ async function main() {
       `--mode <string>`,
       'simulate|multisig|execute - simulate - to print txn simulation and to get tx simulation link in explorer, execute - execute tx, multisig - to get bs58 tx for multisig usage'
     )
-    .option('--update-entire-config', 'If set, it will update entire reserve config in 1 instruction')
     .option(`--staging`, 'If true, will use the staging programs')
-    .action(async ({ reserve, reserveConfigPath, mode, updateEntireConfig, staging }) => {
+    .action(async ({ reserve, reserveConfigPath, mode, staging }) => {
       const env = await initEnv(undefined, staging);
       const reserveAddress = address(reserve);
       const reserveState = await Reserve.fetch(env.c.rpc, reserveAddress, env.klendProgramId);
@@ -261,8 +260,7 @@ async function main() {
         marketWithAddress,
         reserveAddress,
         reserveConfig,
-        reserveState,
-        updateEntireConfig
+        reserveState
       );
 
       await processTx(
@@ -537,7 +535,6 @@ async function main() {
         signer,
         [
           instructions.updateVaultConfigIx,
-          ...instructions.updateLUTIxs,
           ...getPriorityFeeAndCuIxs({
             priorityFeeMultiplier: 2500,
           }),
@@ -1421,7 +1418,6 @@ async function main() {
       );
       const txInstructions = [
         instructions.updateReserveAllocationIx,
-        ...instructions.updateLUTIxs,
         ...getPriorityFeeAndCuIxs({
           priorityFeeMultiplier: 2500,
         }),
@@ -2464,7 +2460,7 @@ function parseReserveConfigFromFile(reserveConfigFromFile: any): ReserveConfig {
     protocolLiquidationFeePct: reserveConfigFromFile.protocolLiquidationFeePct,
     protocolOrderExecutionFeePct: reserveConfigFromFile.protocolOrderExecutionFeePct,
     protocolTakeRatePct: reserveConfigFromFile.protocolTakeRatePct,
-    assetTier: reserveConfigFromFile.assetTier,
+    paddingDeprecatedAssetTier: 0,
     maxLiquidationBonusBps: reserveConfigFromFile.maxLiquidationBonusBps,
     badDebtLiquidationBonusBps: reserveConfigFromFile.badDebtLiquidationBonusBps,
     fees: {
@@ -2513,10 +2509,12 @@ function parseReserveConfigFromFile(reserveConfigFromFile: any): ReserveConfig {
     borrowLimitOutsideElevationGroup: new BN(reserveConfigFromFile.borrowLimitOutsideElevationGroup),
     borrowLimitAgainstThisCollateralInElevationGroup: parseReserveBorrowLimitAgainstCollInEmode(reserveConfigFromFile),
     deleveragingBonusIncreaseBpsPerDay: new BN(reserveConfigFromFile.deleveragingBonusIncreaseBpsPerDay),
-    reserved1: Array(1).fill(0),
+    reserved1: Array(6).fill(0),
     minDeleveragingBonusBps: 0,
     proposerAuthorityLocked: 0,
     blockCtokenUsage: 0,
+    debtMaturityTimestamp: new BN(reserveConfigFromFile.debtMaturityTimestamp),
+    debtTermSeconds: new BN(reserveConfigFromFile.debtTermSeconds),
   };
 
   return new ReserveConfig(reserveConfigFields);
@@ -2590,13 +2588,16 @@ function parseReserveConfigToFile(reserveConfig: ReserveConfig) {
 
   return {
     status: reserveConfig.status,
+    paddingDeprecatedAssetTier: reserveConfig.paddingDeprecatedAssetTier,
+    hostFixedInterestRateBps: reserveConfig.hostFixedInterestRateBps,
+    minDeleveragingBonusBps: reserveConfig.minDeleveragingBonusBps,
+    blockCtokenUsage: reserveConfig.blockCtokenUsage,
     loanToValuePct: reserveConfig.loanToValuePct,
     liquidationThresholdPct: reserveConfig.liquidationThresholdPct,
     minLiquidationBonusBps: reserveConfig.minLiquidationBonusBps,
     protocolLiquidationFeePct: reserveConfig.protocolLiquidationFeePct,
     protocolOrderExecutionFeePct: reserveConfig.protocolOrderExecutionFeePct,
     protocolTakeRatePct: reserveConfig.protocolTakeRatePct,
-    assetTier: reserveConfig.assetTier,
     maxLiquidationBonusBps: reserveConfig.maxLiquidationBonusBps,
     badDebtLiquidationBonusBps: reserveConfig.badDebtLiquidationBonusBps,
     fees: {
@@ -2630,14 +2631,15 @@ function parseReserveConfigToFile(reserveConfig: ReserveConfig) {
     deleveragingThresholdDecreaseBpsPerDay: reserveConfig.deleveragingThresholdDecreaseBpsPerDay.toString(),
     disableUsageAsCollOutsideEmode: reserveConfig.disableUsageAsCollOutsideEmode,
     utilizationLimitBlockBorrowingAbovePct: reserveConfig.utilizationLimitBlockBorrowingAbovePct,
-    hostFixedInterestRateBps: reserveConfig.hostFixedInterestRateBps,
     autodeleverageEnabled: reserveConfig.autodeleverageEnabled,
+    proposerAuthorityLocked: reserveConfig.proposerAuthorityLocked,
     borrowLimitOutsideElevationGroup: reserveConfig.borrowLimitOutsideElevationGroup.toString(),
     borrowLimitAgainstThisCollateralInElevationGroup:
       reserveConfig.borrowLimitAgainstThisCollateralInElevationGroup.map((entry) => entry.toString()),
     deleveragingBonusIncreaseBpsPerDay: reserveConfig.deleveragingBonusIncreaseBpsPerDay.toString(),
-    reserved1: Array(2).fill(0),
-    reserved2: Array(9).fill(0),
+    debtMaturityTimestamp: reserveConfig.debtMaturityTimestamp.toString(),
+    debtTermSeconds: reserveConfig.debtTermSeconds.toString(),
+    reserved1: reserveConfig.reserved1,
   };
 }
 

package/src/obligation_orders/price_based.ts

@@ -245,12 +245,13 @@ function collectReserveAddresses(
   kaminoMarket: KaminoMarket,
   symbolOrMintAddresses: SymbolOrMintAddress[]
 ): Set<Address> {
-  // TODO: replace with methods that get all the reserves by mint/symbol
   return new Set<Address>(
-    symbolOrMintAddresses.map((symbolOrMintAddress) =>
-      typeof symbolOrMintAddress === 'string'
-        ? kaminoMarket.getExistingReserveBySymbol(symbolOrMintAddress).address
-        : kaminoMarket.getExistingReserveByMint(symbolOrMintAddress).address
-    )
+    symbolOrMintAddresses
+      .map((symbolOrMintAddress) =>
+        typeof symbolOrMintAddress === 'string'
+          ? kaminoMarket.getExistingReservesBySymbol(symbolOrMintAddress).map((r) => r.address)
+          : kaminoMarket.getExistingReservesByMint(symbolOrMintAddress).map((r) => r.address)
+      )
+      .flat()
   );
 }

package/src/utils/managerTypes.ts

@@ -306,7 +306,7 @@ function buildReserveConfig(fields: {
     protocolLiquidationFeePct: 0,
     protocolOrderExecutionFeePct: 0,
     protocolTakeRatePct: fields.configParams.protocolTakeRate,
-    assetTier: 0,
+    paddingDeprecatedAssetTier: 0,
     maxLiquidationBonusBps: fields.configParams.maxLiquidationBonusBps,
     badDebtLiquidationBonusBps: fields.configParams.badDebtLiquidationBonusBps,
     fees: {
@@ -373,6 +373,8 @@ function buildReserveConfig(fields: {
     minDeleveragingBonusBps: 0,
     proposerAuthorityLocked: 0,
     blockCtokenUsage: 0,
+    debtMaturityTimestamp: new BN(0),
+    debtTermSeconds: new BN(0),
   };
 
   return new ReserveConfig(reserveConfigFields);

package/src/utils/seeds.ts

@@ -44,6 +44,14 @@ export const BASE_SEED_SHORT_URL = 'short_url';
  * Short url seed
  */
 export const BASE_SEED_GLOBAL_CONFIG_STATE = 'global_config';
+/**
+ * Withdraw ticket seed
+ */
+export const WITHDRAW_TICKET_SEED = 'withdraw_ticket';
+/**
+ * Owner queued collateral vault seed
+ */
+export const OWNER_QUEUED_COLLATERAL_VAULT_SEED = 'owner_queued_collateral_vault';
 /**
  * Farm user state seed
  */
@@ -286,3 +294,44 @@ export async function getKVaultSharesMetadataPda(mint: Address): Promise<Program
     programAddress: METADATA_PROGRAM_ID,
   });
 }
+
+/**
+ * Returns the PDA for a withdraw ticket
+ * @param reserve
+ * @param sequenceNumber
+ * @param programId
+ * @returns pda
+ */
+export async function withdrawTicketPda(
+  reserve: Address,
+  sequenceNumber: bigint,
+  programId: Address = PROGRAM_ID
+): Promise<Address> {
+  const sequenceNumberBuffer = Buffer.alloc(8);
+  sequenceNumberBuffer.writeBigUInt64LE(sequenceNumber);
+
+  const [address] = await getProgramDerivedAddress({
+    seeds: [Buffer.from(WITHDRAW_TICKET_SEED), addressEncoder.encode(reserve), sequenceNumberBuffer],
+    programAddress: programId,
+  });
+  return address;
+}
+
+/**
+ * Returns the PDA for the owner's queued collateral vault
+ * @param reserve
+ * @param owner
+ * @param programId
+ * @returns pda
+ */
+export async function ownerQueuedCollateralVaultPda(
+  reserve: Address,
+  owner: Address,
+  programId: Address = PROGRAM_ID
+): Promise<Address> {
+  const [address] = await getProgramDerivedAddress({
+    seeds: [Buffer.from(OWNER_QUEUED_COLLATERAL_VAULT_SEED), addressEncoder.encode(reserve), addressEncoder.encode(owner)],
+    programAddress: programId,
+  });
+  return address;
+}

package/src/utils/validations.ts

@@ -14,6 +14,11 @@ export function checkNotNull<T>(value: T | null, message: string = 'value null')
   return value as T;
 }
 
+export function checkArrayNotEmpty<T>(array: T[], message: string = 'array is empty'): T[] {
+  checkThat(array.length > 0, message);
+  return array;
+}
+
 export function getSingleElement<T>(iterable: Iterable<T>, nameWithinMessage: string = 'element'): T {
   const nothingReturnedMarker = {};
   let single: T | {} = nothingReturnedMarker;

package/src/utils/vault.ts

@@ -53,5 +53,7 @@ export function decodeVaultState(data: Buffer): VaultState {
     allowAllocationsInWhitelistedReservesOnly: dec.allowAllocationsInWhitelistedReservesOnly,
     allowInvestInWhitelistedReservesOnly: dec.allowInvestInWhitelistedReservesOnly,
     padding4: dec.padding4,
+    padding2: dec.padding2,
+    withdrawTicketRentBudget: dec.withdrawTicketRentBudget,
   });
 }

package/dist/@codegen/klend/types/AssetTier.d.ts

@@ -1,45 +0,0 @@
-import * as types from "../types";
-import * as borsh from "@coral-xyz/borsh";
-export interface RegularJSON {
-    kind: "Regular";
-}
-export declare class Regular {
-    static readonly discriminator = 0;
-    static readonly kind = "Regular";
-    readonly discriminator = 0;
-    readonly kind = "Regular";
-    toJSON(): RegularJSON;
-    toEncodable(): {
-        Regular: {};
-    };
-}
-export interface IsolatedCollateralJSON {
-    kind: "IsolatedCollateral";
-}
-export declare class IsolatedCollateral {
-    static readonly discriminator = 1;
-    static readonly kind = "IsolatedCollateral";
-    readonly discriminator = 1;
-    readonly kind = "IsolatedCollateral";
-    toJSON(): IsolatedCollateralJSON;
-    toEncodable(): {
-        IsolatedCollateral: {};
-    };
-}
-export interface IsolatedDebtJSON {
-    kind: "IsolatedDebt";
-}
-export declare class IsolatedDebt {
-    static readonly discriminator = 2;
-    static readonly kind = "IsolatedDebt";
-    readonly discriminator = 2;
-    readonly kind = "IsolatedDebt";
-    toJSON(): IsolatedDebtJSON;
-    toEncodable(): {
-        IsolatedDebt: {};
-    };
-}
-export declare function fromDecoded(obj: any): types.AssetTierKind;
-export declare function fromJSON(obj: types.AssetTierJSON): types.AssetTierKind;
-export declare function layout(property?: string): borsh.EnumLayout<unknown>;
-//# sourceMappingURL=AssetTier.d.ts.map

package/dist/@codegen/klend/types/AssetTier.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AssetTier.d.ts","sourceRoot":"","sources":["../../../../src/@codegen/klend/types/AssetTier.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAGzC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,SAAS,CAAA;CAChB;AAED,qBAAa,OAAO;IAClB,MAAM,CAAC,QAAQ,CAAC,aAAa,KAAI;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,aAAY;IAChC,QAAQ,CAAC,aAAa,KAAI;IAC1B,QAAQ,CAAC,IAAI,aAAY;IAEzB,MAAM,IAAI,WAAW;IAMrB,WAAW;;;CAKZ;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,oBAAoB,CAAA;CAC3B;AAED,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,aAAa,KAAI;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,wBAAuB;IAC3C,QAAQ,CAAC,aAAa,KAAI;IAC1B,QAAQ,CAAC,IAAI,wBAAuB;IAEpC,MAAM,IAAI,sBAAsB;IAMhC,WAAW;;;CAKZ;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,qBAAa,YAAY;IACvB,MAAM,CAAC,QAAQ,CAAC,aAAa,KAAI;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,kBAAiB;IACrC,QAAQ,CAAC,aAAa,KAAI;IAC1B,QAAQ,CAAC,IAAI,kBAAiB;IAE9B,MAAM,IAAI,gBAAgB;IAM1B,WAAW;;;CAKZ;AAGD,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK,CAAC,aAAa,CAgBzD;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAYtE;AAED,wBAAgB,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,6BAUvC"}

package/dist/@codegen/klend/types/AssetTier.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AssetTier.js","sourceRoot":"","sources":["../../../../src/@codegen/klend/types/AssetTier.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4EA,kCAgBC;AAED,4BAYC;AAED,wBAUC;AAnHD,wDAAyC;AAOzC,MAAa,OAAO;IAClB,MAAM,CAAU,aAAa,GAAG,CAAC,CAAA;IACjC,MAAM,CAAU,IAAI,GAAG,SAAS,CAAA;IACvB,aAAa,GAAG,CAAC,CAAA;IACjB,IAAI,GAAG,SAAS,CAAA;IAEzB,MAAM;QACJ,OAAO;YACL,IAAI,EAAE,SAAS;SAChB,CAAA;IACH,CAAC;IAED,WAAW;QACT,OAAO;YACL,OAAO,EAAE,EAAE;SACZ,CAAA;IACH,CAAC;;AAhBH,0BAiBC;AAMD,MAAa,kBAAkB;IAC7B,MAAM,CAAU,aAAa,GAAG,CAAC,CAAA;IACjC,MAAM,CAAU,IAAI,GAAG,oBAAoB,CAAA;IAClC,aAAa,GAAG,CAAC,CAAA;IACjB,IAAI,GAAG,oBAAoB,CAAA;IAEpC,MAAM;QACJ,OAAO;YACL,IAAI,EAAE,oBAAoB;SAC3B,CAAA;IACH,CAAC;IAED,WAAW;QACT,OAAO;YACL,kBAAkB,EAAE,EAAE;SACvB,CAAA;IACH,CAAC;;AAhBH,gDAiBC;AAMD,MAAa,YAAY;IACvB,MAAM,CAAU,aAAa,GAAG,CAAC,CAAA;IACjC,MAAM,CAAU,IAAI,GAAG,cAAc,CAAA;IAC5B,aAAa,GAAG,CAAC,CAAA;IACjB,IAAI,GAAG,cAAc,CAAA;IAE9B,MAAM;QACJ,OAAO;YACL,IAAI,EAAE,cAAc;SACrB,CAAA;IACH,CAAC;IAED,WAAW;QACT,OAAO;YACL,YAAY,EAAE,EAAE;SACjB,CAAA;IACH,CAAC;;AAhBH,oCAiBC;AAED,8DAA8D;AAC9D,SAAgB,WAAW,CAAC,GAAQ;IAClC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACxC,CAAC;IAED,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;QACrB,OAAO,IAAI,OAAO,EAAE,CAAA;IACtB,CAAC;IACD,IAAI,oBAAoB,IAAI,GAAG,EAAE,CAAC;QAChC,OAAO,IAAI,kBAAkB,EAAE,CAAA;IACjC,CAAC;IACD,IAAI,cAAc,IAAI,GAAG,EAAE,CAAC;QAC1B,OAAO,IAAI,YAAY,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;AACxC,CAAC;AAED,SAAgB,QAAQ,CAAC,GAAwB;IAC/C,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,OAAO,IAAI,OAAO,EAAE,CAAA;QACtB,CAAC;QACD,KAAK,oBAAoB,CAAC,CAAC,CAAC;YAC1B,OAAO,IAAI,kBAAkB,EAAE,CAAA;QACjC,CAAC;QACD,KAAK,cAAc,CAAC,CAAC,CAAC;YACpB,OAAO,IAAI,YAAY,EAAE,CAAA;QAC3B,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAgB,MAAM,CAAC,QAAiB;IACtC,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC;QACzB,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC;QAC3B,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC;QACtC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC;KACjC,CAAC,CAAA;IACF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC"}

package/src/@codegen/klend/types/AssetTier.ts

@@ -1,119 +0,0 @@
-import { address, Address } from "@solana/kit" // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from "bn.js" // eslint-disable-line @typescript-eslint/no-unused-vars
-import * as types from "../types" // eslint-disable-line @typescript-eslint/no-unused-vars
-import * as borsh from "@coral-xyz/borsh"
-import { borshAddress } from "../utils"
-
-export interface RegularJSON {
-  kind: "Regular"
-}
-
-export class Regular {
-  static readonly discriminator = 0
-  static readonly kind = "Regular"
-  readonly discriminator = 0
-  readonly kind = "Regular"
-
-  toJSON(): RegularJSON {
-    return {
-      kind: "Regular",
-    }
-  }
-
-  toEncodable() {
-    return {
-      Regular: {},
-    }
-  }
-}
-
-export interface IsolatedCollateralJSON {
-  kind: "IsolatedCollateral"
-}
-
-export class IsolatedCollateral {
-  static readonly discriminator = 1
-  static readonly kind = "IsolatedCollateral"
-  readonly discriminator = 1
-  readonly kind = "IsolatedCollateral"
-
-  toJSON(): IsolatedCollateralJSON {
-    return {
-      kind: "IsolatedCollateral",
-    }
-  }
-
-  toEncodable() {
-    return {
-      IsolatedCollateral: {},
-    }
-  }
-}
-
-export interface IsolatedDebtJSON {
-  kind: "IsolatedDebt"
-}
-
-export class IsolatedDebt {
-  static readonly discriminator = 2
-  static readonly kind = "IsolatedDebt"
-  readonly discriminator = 2
-  readonly kind = "IsolatedDebt"
-
-  toJSON(): IsolatedDebtJSON {
-    return {
-      kind: "IsolatedDebt",
-    }
-  }
-
-  toEncodable() {
-    return {
-      IsolatedDebt: {},
-    }
-  }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function fromDecoded(obj: any): types.AssetTierKind {
-  if (typeof obj !== "object") {
-    throw new Error("Invalid enum object")
-  }
-
-  if ("Regular" in obj) {
-    return new Regular()
-  }
-  if ("IsolatedCollateral" in obj) {
-    return new IsolatedCollateral()
-  }
-  if ("IsolatedDebt" in obj) {
-    return new IsolatedDebt()
-  }
-
-  throw new Error("Invalid enum object")
-}
-
-export function fromJSON(obj: types.AssetTierJSON): types.AssetTierKind {
-  switch (obj.kind) {
-    case "Regular": {
-      return new Regular()
-    }
-    case "IsolatedCollateral": {
-      return new IsolatedCollateral()
-    }
-    case "IsolatedDebt": {
-      return new IsolatedDebt()
-    }
-  }
-}
-
-export function layout(property?: string) {
-  const ret = borsh.rustEnum([
-    borsh.struct([], "Regular"),
-    borsh.struct([], "IsolatedCollateral"),
-    borsh.struct([], "IsolatedDebt"),
-  ])
-  if (property !== undefined) {
-    return ret.replicate(property)
-  }
-  return ret
-}