@kamino-finance/klend-sdk 5.11.6-beta.0 → 5.11.7

package/src/idl_codegen_kamino_vault/errors/custom.ts

@@ -43,6 +43,9 @@ export type CustomError =
   | ManagementFeeGreaterThanMaxAllowed
   | VaultAUMZero
   | MissingReserveForBatchRefresh
+  | MinWithdrawAmountTooBig
+  | InvestTooSoon
+  | WrongAdminOrAllocationAdmin
 
 export class DepositAmountsZero extends Error {
   static readonly code = 7000
@@ -528,6 +531,39 @@ export class MissingReserveForBatchRefresh extends Error {
   }
 }
 
+export class MinWithdrawAmountTooBig extends Error {
+  static readonly code = 7044
+  readonly code = 7044
+  readonly name = "MinWithdrawAmountTooBig"
+  readonly msg = "Min withdraw amount is too big"
+
+  constructor(readonly logs?: string[]) {
+    super("7044: Min withdraw amount is too big")
+  }
+}
+
+export class InvestTooSoon extends Error {
+  static readonly code = 7045
+  readonly code = 7045
+  readonly name = "InvestTooSoon"
+  readonly msg = "Invest is called too soon after last invest"
+
+  constructor(readonly logs?: string[]) {
+    super("7045: Invest is called too soon after last invest")
+  }
+}
+
+export class WrongAdminOrAllocationAdmin extends Error {
+  static readonly code = 7046
+  readonly code = 7046
+  readonly name = "WrongAdminOrAllocationAdmin"
+  readonly msg = "Wrong admin or allocation admin"
+
+  constructor(readonly logs?: string[]) {
+    super("7046: Wrong admin or allocation admin")
+  }
+}
+
 export function fromCode(code: number, logs?: string[]): CustomError | null {
   switch (code) {
     case 7000:
@@ -618,6 +654,12 @@ export function fromCode(code: number, logs?: string[]): CustomError | null {
       return new VaultAUMZero(logs)
     case 7043:
       return new MissingReserveForBatchRefresh(logs)
+    case 7044:
+      return new MinWithdrawAmountTooBig(logs)
+    case 7045:
+      return new InvestTooSoon(logs)
+    case 7046:
+      return new WrongAdminOrAllocationAdmin(logs)
   }
 
   return null

package/src/idl_codegen_kamino_vault/instructions/giveUpPendingFees.ts

@@ -9,7 +9,7 @@ export interface GiveUpPendingFeesArgs {
 }
 
 export interface GiveUpPendingFeesAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -22,7 +22,7 @@ export function giveUpPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
   ]

package/src/idl_codegen_kamino_vault/instructions/initVault.ts

@@ -11,6 +11,7 @@ export interface InitVaultAccounts {
   tokenVault: PublicKey
   baseTokenMint: PublicKey
   sharesMint: PublicKey
+  adminTokenAccount: PublicKey
   systemProgram: PublicKey
   rent: PublicKey
   tokenProgram: PublicKey
@@ -28,6 +29,7 @@ export function initVault(
     { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },
     { pubkey: accounts.baseTokenMint, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: true },
+    { pubkey: accounts.adminTokenAccount, isSigner: false, isWritable: true },
     { pubkey: accounts.systemProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.rent, isSigner: false, isWritable: false },
     { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.ts

@@ -11,7 +11,7 @@ export interface InitializeSharesMetadataArgs {
 }
 
 export interface InitializeSharesMetadataAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   sharesMint: PublicKey
   baseVaultAuthority: PublicKey
@@ -33,7 +33,7 @@ export function initializeSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/updateReserveAllocation.ts

@@ -10,7 +10,7 @@ export interface UpdateReserveAllocationArgs {
 }
 
 export interface UpdateReserveAllocationAccounts {
-  adminAuthority: PublicKey
+  signer: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   reserveCollateralMint: PublicKey
@@ -29,7 +29,7 @@ export function updateReserveAllocation(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.signer, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
     {

package/src/idl_codegen_kamino_vault/instructions/updateSharesMetadata.ts

@@ -11,7 +11,7 @@ export interface UpdateSharesMetadataArgs {
 }
 
 export interface UpdateSharesMetadataAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   sharesMetadata: PublicKey
@@ -30,7 +30,7 @@ export function updateSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMetadata, isSigner: false, isWritable: true },

package/src/idl_codegen_kamino_vault/instructions/updateVaultConfig.ts

@@ -10,7 +10,7 @@ export interface UpdateVaultConfigArgs {
 }
 
 export interface UpdateVaultConfigAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -26,7 +26,7 @@ export function updateVaultConfig(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: false },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: false },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
   ]

package/src/idl_codegen_kamino_vault/instructions/withdrawPendingFees.ts

@@ -5,7 +5,7 @@ import * as types from "../types" // eslint-disable-line @typescript-eslint/no-u
 import { PROGRAM_ID } from "../programId"
 
 export interface WithdrawPendingFeesAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   reserve: PublicKey
   tokenVault: PublicKey
@@ -29,7 +29,7 @@ export function withdrawPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.reserve, isSigner: false, isWritable: true },
     { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },

package/src/idl_codegen_kamino_vault/types/VaultConfigField.ts

@@ -256,6 +256,29 @@ export class Farm {
   }
 }
 
+export interface AllocationAdminJSON {
+  kind: "AllocationAdmin"
+}
+
+export class AllocationAdmin {
+  static readonly discriminator = 11
+  static readonly kind = "AllocationAdmin"
+  readonly discriminator = 11
+  readonly kind = "AllocationAdmin"
+
+  toJSON(): AllocationAdminJSON {
+    return {
+      kind: "AllocationAdmin",
+    }
+  }
+
+  toEncodable() {
+    return {
+      AllocationAdmin: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if (typeof obj !== "object") {
@@ -295,6 +318,9 @@ export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if ("Farm" in obj) {
     return new Farm()
   }
+  if ("AllocationAdmin" in obj) {
+    return new AllocationAdmin()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -336,6 +362,9 @@ export function fromJSON(
     case "Farm": {
       return new Farm()
     }
+    case "AllocationAdmin": {
+      return new AllocationAdmin()
+    }
   }
 }
 
@@ -352,6 +381,7 @@ export function layout(property?: string) {
     borsh.struct([], "Name"),
     borsh.struct([], "LookupTable"),
     borsh.struct([], "Farm"),
+    borsh.struct([], "AllocationAdmin"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/idl_codegen_kamino_vault/types/index.ts

@@ -63,6 +63,7 @@ export type VaultConfigFieldKind =
   | VaultConfigField.Name
   | VaultConfigField.LookupTable
   | VaultConfigField.Farm
+  | VaultConfigField.AllocationAdmin
 export type VaultConfigFieldJSON =
   | VaultConfigField.PerformanceFeeBpsJSON
   | VaultConfigField.ManagementFeeBpsJSON
@@ -75,6 +76,7 @@ export type VaultConfigFieldJSON =
   | VaultConfigField.NameJSON
   | VaultConfigField.LookupTableJSON
   | VaultConfigField.FarmJSON
+  | VaultConfigField.AllocationAdminJSON
 
 export { VaultAllocation } from "./VaultAllocation"
 export type {

package/src/idl_kamino_vault.json

@@ -35,6 +35,11 @@
           "isMut": true,
           "isSigner": false
         },
+        {
+          "name": "adminTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
         {
           "name": "systemProgram",
           "isMut": false,
@@ -62,7 +67,7 @@
       "name": "updateReserveAllocation",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "signer",
           "isMut": true,
           "isSigner": true
         },
@@ -398,7 +403,7 @@
       "name": "updateVaultConfig",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": false,
           "isSigner": true
         },
@@ -430,7 +435,7 @@
       "name": "withdrawPendingFees",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -535,7 +540,7 @@
       "name": "giveUpPendingFees",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -561,7 +566,7 @@
       "name": "initializeSharesMetadata",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -620,7 +625,7 @@
       "name": "updateSharesMetadata",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -853,7 +858,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "adminAuthority",
+            "name": "vaultAdminAuthority",
             "type": "publicKey"
           },
           {
@@ -996,12 +1001,16 @@
             "name": "padding1",
             "type": "u64"
           },
+          {
+            "name": "allocationAdmin",
+            "type": "publicKey"
+          },
           {
             "name": "padding2",
             "type": {
               "array": [
                 "u128",
-                244
+                242
               ]
             }
           }
@@ -1874,6 +1883,9 @@
           },
           {
             "name": "Farm"
+          },
+          {
+            "name": "AllocationAdmin"
           }
         ]
       }
@@ -2160,6 +2172,21 @@
       "code": 7043,
       "name": "MissingReserveForBatchRefresh",
       "msg": "Missing reserve for batch refresh"
+    },
+    {
+      "code": 7044,
+      "name": "MinWithdrawAmountTooBig",
+      "msg": "Min withdraw amount is too big"
+    },
+    {
+      "code": 7045,
+      "name": "InvestTooSoon",
+      "msg": "Invest is called too soon after last invest"
+    },
+    {
+      "code": 7046,
+      "name": "WrongAdminOrAllocationAdmin",
+      "msg": "Wrong admin or allocation admin"
     }
   ]
 }

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -6,12 +6,13 @@ import {
   SwapIxs,
   SwapIxsProvider,
   SwapQuoteProvider,
+  getScopeRefreshIx,
 } from '../leverage';
 import {
   createAtasIdempotent,
   getComputeBudgetAndPriorityFeeIxns,
   removeBudgetAndAtaIxns,
-  ScopeRefresh,
+  ScopePriceRefreshConfig,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -51,7 +52,7 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   repayAmount: Decimal;
   isClosingPosition: boolean;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
-  scopeRefresh?: ScopeRefresh;
+  scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
@@ -67,7 +68,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   repayAmount,
   isClosingPosition,
   budgetAndPriorityFeeIxs,
-  scopeRefresh,
+  scopeRefreshConfig,
   useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
@@ -126,7 +127,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     {
       preActionIxs: [],
       swapIxs: [],
@@ -191,7 +192,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   quoter,
   swapper,
   referrer,
-  scopeRefresh,
+  scopeRefreshConfig,
   useV2Ixs,
   logger = console.log,
 }: RepayWithCollIxsProps<QuoteResponse>): Promise<RepayWithCollIxsResponse<QuoteResponse>> {
@@ -206,7 +207,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     repayAmount,
     isClosingPosition,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     useV2Ixs,
   });
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
@@ -244,7 +245,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     swapResponse,
     isClosingPosition,
     debtRepayAmountLamports,
@@ -268,7 +269,7 @@ async function buildRepayWithCollateralIxs(
   referrer: PublicKey,
   currentSlot: number,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
-  scopeRefresh: ScopeRefresh | undefined,
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   swapQuoteIxs: SwapIxs,
   isClosingPosition: boolean,
   debtRepayAmountLamports: Decimal,
@@ -286,9 +287,11 @@ async function buildRepayWithCollateralIxs(
   const atasAndIxs = createAtasIdempotent(obligation.state.owner, atas);
   const [, { ata: debtTokenAta }] = atasAndIxs;
 
+  const scopeRefreshIxn = await getScopeRefreshIx(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
+
   // 2. Flash borrow & repay the debt to repay amount needed
   const { flashBorrowIxn, flashRepayIxn } = getFlashLoanInstructions({
-    borrowIxnIndex: budgetIxns.length + atasAndIxs.length,
+    borrowIxnIndex: budgetIxns.length + atasAndIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
     walletPublicKey: obligation.state.owner,
     lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -314,13 +317,13 @@ async function buildRepayWithCollateralIxs(
     currentSlot,
     obligation,
     useV2Ixs,
+    undefined,
     0,
     false,
     requestElevationGroup,
     undefined,
     undefined,
-    referrer,
-    scopeRefresh
+    referrer
   );
 
   // 4. Swap collateral to debt to repay flash loan
@@ -328,6 +331,7 @@ async function buildRepayWithCollateralIxs(
   const swapInstructions = removeBudgetAndAtaIxns(swapIxs, []);
 
   return [
+    ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndIxs.map((x) => x.createAtaIx),
     flashBorrowIxn,

package/src/lending_operations/swap_collateral_operations.ts

@@ -6,14 +6,14 @@ import {
   KaminoObligation,
   KaminoReserve,
 } from '../classes';
-import { getFlashLoanInstructions, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
+import { getFlashLoanInstructions, getScopeRefreshIx, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
 import {
   createAtasIdempotent,
   DEFAULT_MAX_COMPUTE_UNITS,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxns,
   PublicKeySet,
-  ScopeRefresh,
+  ScopePriceRefreshConfig,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -61,7 +61,7 @@ export interface SwapCollIxnsInputs<QuoteResponse> {
   referrer: PublicKey;
   currentSlot: number;
   budgetAndPriorityFeeIxns?: TransactionInstruction[];
-  scopeRefresh?: ScopeRefresh;
+  scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
   swapper: SwapIxsProvider<QuoteResponse>;
@@ -205,7 +205,7 @@ type SwapCollContext<QuoteResponse> = {
   referrer: PublicKey;
   currentSlot: number;
   useV2Ixs: boolean;
-  scopeRefresh: ScopeRefresh | undefined;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
   logger: (msg: string, ...extra: any[]) => void;
 };
 
@@ -235,7 +235,7 @@ function extractArgsAndContext<QuoteResponse>(
       quoter: inputs.quoter,
       swapper: inputs.swapper,
       referrer: inputs.referrer,
-      scopeRefresh: inputs.scopeRefresh,
+      scopeRefreshConfig: inputs.scopeRefreshConfig,
       currentSlot: inputs.currentSlot,
       useV2Ixs: inputs.useV2Ixs,
     },
@@ -264,6 +264,18 @@ async function getKlendIxns(
   const { ataCreationIxns, targetCollAta } = getAtaCreationIxns(context);
   const setupIxns = [...context.budgetAndPriorityFeeIxns, ...ataCreationIxns];
 
+  const scopeRefreshIxn = await getScopeRefreshIx(
+    context.market,
+    context.sourceCollReserve,
+    context.targetCollReserve,
+    context.obligation,
+    context.scopeRefreshConfig
+  );
+
+  if (scopeRefreshIxn) {
+    setupIxns.unshift(...scopeRefreshIxn);
+  }
+
   const targetCollFlashBorrowedAmount = calculateTargetCollFlashBorrowedAmount(targetCollSwapOutAmount, context);
   const { targetCollFlashBorrowIxn, targetCollFlashRepayIxn } = getTargetCollFlashLoanIxns(
     targetCollFlashBorrowedAmount,
@@ -380,6 +392,7 @@ async function getDepositTargetCollIxns(
     context.obligation.state.owner,
     context.obligation,
     context.useV2Ixs,
+    undefined, // we create the scope refresh ixn outside of KaminoAction
     0, // no extra compute budget
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     removesElevationGroup, // we may need to (temporarily) remove the elevation group; the same or a different one will be set on withdraw, if requested
@@ -387,7 +400,6 @@ async function getDepositTargetCollIxns(
     false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
-    context.scopeRefresh,
     removesElevationGroup ? 0 : undefined // only applicable when removing the group
   );
   return {
@@ -430,6 +442,7 @@ async function getWithdrawSourceCollIxns(
     context.obligation.state.owner,
     context.obligation,
     context.useV2Ixs,
+    undefined, // we create the scope refresh ixn outside of KaminoAction
     0, // no extra compute budget
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     requestedElevationGroup !== undefined, // the `elevationGroupIdToRequestAfterWithdraw()` has already decided on this
@@ -437,7 +450,6 @@ async function getWithdrawSourceCollIxns(
     false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
-    undefined, // we have refreshed scope already, during depositing
     requestedElevationGroup,
     context.obligation.deposits.has(context.targetCollReserve.address) // if our obligation already had the target coll...
       ? undefined // ... then we need no customizations here, but otherwise...