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

package/src/idl_codegen_kamino_vault/instructions/updateReserveAllocation.ts

@@ -10,7 +10,7 @@ export interface UpdateReserveAllocationArgs {
 }
 
 export interface UpdateReserveAllocationAccounts {
-  signer: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   reserveCollateralMint: PublicKey
@@ -29,7 +29,7 @@ export function updateReserveAllocation(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.signer, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, 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 {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   sharesMetadata: PublicKey
@@ -30,7 +30,7 @@ export function updateSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, 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 {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -26,7 +26,7 @@ export function updateVaultConfig(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: false },
+    { pubkey: accounts.adminAuthority, 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 {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   reserve: PublicKey
   tokenVault: PublicKey
@@ -29,7 +29,7 @@ export function withdrawPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, 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,29 +256,6 @@ 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") {
@@ -318,9 +295,6 @@ 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")
 }
@@ -362,9 +336,6 @@ export function fromJSON(
     case "Farm": {
       return new Farm()
     }
-    case "AllocationAdmin": {
-      return new AllocationAdmin()
-    }
   }
 }
 
@@ -381,7 +352,6 @@ 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,7 +63,6 @@ export type VaultConfigFieldKind =
   | VaultConfigField.Name
   | VaultConfigField.LookupTable
   | VaultConfigField.Farm
-  | VaultConfigField.AllocationAdmin
 export type VaultConfigFieldJSON =
   | VaultConfigField.PerformanceFeeBpsJSON
   | VaultConfigField.ManagementFeeBpsJSON
@@ -76,7 +75,6 @@ export type VaultConfigFieldJSON =
   | VaultConfigField.NameJSON
   | VaultConfigField.LookupTableJSON
   | VaultConfigField.FarmJSON
-  | VaultConfigField.AllocationAdminJSON
 
 export { VaultAllocation } from "./VaultAllocation"
 export type {

package/src/idl_kamino_vault.json

@@ -35,11 +35,6 @@
           "isMut": true,
           "isSigner": false
         },
-        {
-          "name": "adminTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
         {
           "name": "systemProgram",
           "isMut": false,
@@ -67,7 +62,7 @@
       "name": "updateReserveAllocation",
       "accounts": [
         {
-          "name": "signer",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -403,7 +398,7 @@
       "name": "updateVaultConfig",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": false,
           "isSigner": true
         },
@@ -435,7 +430,7 @@
       "name": "withdrawPendingFees",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -540,7 +535,7 @@
       "name": "giveUpPendingFees",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -566,7 +561,7 @@
       "name": "initializeSharesMetadata",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -625,7 +620,7 @@
       "name": "updateSharesMetadata",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -858,7 +853,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultAdminAuthority",
+            "name": "adminAuthority",
             "type": "publicKey"
           },
           {
@@ -1001,16 +996,12 @@
             "name": "padding1",
             "type": "u64"
           },
-          {
-            "name": "allocationAdmin",
-            "type": "publicKey"
-          },
           {
             "name": "padding2",
             "type": {
               "array": [
                 "u128",
-                242
+                244
               ]
             }
           }
@@ -1883,9 +1874,6 @@
           },
           {
             "name": "Farm"
-          },
-          {
-            "name": "AllocationAdmin"
           }
         ]
       }
@@ -2172,21 +2160,6 @@
       "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,13 +6,12 @@ import {
   SwapIxs,
   SwapIxsProvider,
   SwapQuoteProvider,
-  getScopeRefreshIx,
 } from '../leverage';
 import {
   createAtasIdempotent,
   getComputeBudgetAndPriorityFeeIxns,
   removeBudgetAndAtaIxns,
-  ScopePriceRefreshConfig,
+  ScopeRefresh,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -52,7 +51,7 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   repayAmount: Decimal;
   isClosingPosition: boolean;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
-  scopeRefreshConfig?: ScopePriceRefreshConfig;
+  scopeRefresh?: ScopeRefresh;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
@@ -68,7 +67,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   repayAmount,
   isClosingPosition,
   budgetAndPriorityFeeIxs,
-  scopeRefreshConfig,
+  scopeRefresh,
   useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
@@ -127,7 +126,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefreshConfig,
+    scopeRefresh,
     {
       preActionIxs: [],
       swapIxs: [],
@@ -192,7 +191,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   quoter,
   swapper,
   referrer,
-  scopeRefreshConfig,
+  scopeRefresh,
   useV2Ixs,
   logger = console.log,
 }: RepayWithCollIxsProps<QuoteResponse>): Promise<RepayWithCollIxsResponse<QuoteResponse>> {
@@ -207,7 +206,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     repayAmount,
     isClosingPosition,
     budgetAndPriorityFeeIxs,
-    scopeRefreshConfig,
+    scopeRefresh,
     useV2Ixs,
   });
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
@@ -245,7 +244,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefreshConfig,
+    scopeRefresh,
     swapResponse,
     isClosingPosition,
     debtRepayAmountLamports,
@@ -269,7 +268,7 @@ async function buildRepayWithCollateralIxs(
   referrer: PublicKey,
   currentSlot: number,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeRefresh: ScopeRefresh | undefined,
   swapQuoteIxs: SwapIxs,
   isClosingPosition: boolean,
   debtRepayAmountLamports: Decimal,
@@ -287,11 +286,9 @@ 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 + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    borrowIxnIndex: budgetIxns.length + atasAndIxs.length,
     walletPublicKey: obligation.state.owner,
     lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -317,13 +314,13 @@ async function buildRepayWithCollateralIxs(
     currentSlot,
     obligation,
     useV2Ixs,
-    undefined,
     0,
     false,
     requestElevationGroup,
     undefined,
     undefined,
-    referrer
+    referrer,
+    scopeRefresh
   );
 
   // 4. Swap collateral to debt to repay flash loan
@@ -331,7 +328,6 @@ 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, getScopeRefreshIx, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
+import { getFlashLoanInstructions, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
 import {
   createAtasIdempotent,
   DEFAULT_MAX_COMPUTE_UNITS,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxns,
   PublicKeySet,
-  ScopePriceRefreshConfig,
+  ScopeRefresh,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -61,7 +61,7 @@ export interface SwapCollIxnsInputs<QuoteResponse> {
   referrer: PublicKey;
   currentSlot: number;
   budgetAndPriorityFeeIxns?: TransactionInstruction[];
-  scopeRefreshConfig?: ScopePriceRefreshConfig;
+  scopeRefresh?: ScopeRefresh;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
   swapper: SwapIxsProvider<QuoteResponse>;
@@ -205,7 +205,7 @@ type SwapCollContext<QuoteResponse> = {
   referrer: PublicKey;
   currentSlot: number;
   useV2Ixs: boolean;
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  scopeRefresh: ScopeRefresh | undefined;
   logger: (msg: string, ...extra: any[]) => void;
 };
 
@@ -235,7 +235,7 @@ function extractArgsAndContext<QuoteResponse>(
       quoter: inputs.quoter,
       swapper: inputs.swapper,
       referrer: inputs.referrer,
-      scopeRefreshConfig: inputs.scopeRefreshConfig,
+      scopeRefresh: inputs.scopeRefresh,
       currentSlot: inputs.currentSlot,
       useV2Ixs: inputs.useV2Ixs,
     },
@@ -264,18 +264,6 @@ 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,
@@ -392,7 +380,6 @@ 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
@@ -400,6 +387,7 @@ 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 {
@@ -442,7 +430,6 @@ 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
@@ -450,6 +437,7 @@ 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...