@kamino-finance/klend-sdk 5.11.11 → 5.11.12

package/src/client_kamino_manager.ts

@@ -16,12 +16,14 @@ import {
   Chain,
   DEFAULT_RECENT_SLOT_DURATION_MS,
   encodeTokenName,
+  initLookupTableIx,
   KaminoManager,
   KaminoMarket,
   KaminoVault,
   KaminoVaultConfig,
   LendingMarket,
   MAINNET_BETA_CHAIN_ID,
+  parseZeroPaddedUtf8,
   Reserve,
   ReserveAllocationConfig,
   ReserveWithAddress,
@@ -408,6 +410,14 @@ async function main() {
       mode === 'execute' && console.log('Management fee updated:', updateVaultConfigSig);
     });
 
+  commands.command('create-lut').action(async () => {
+    const env = initializeClient(false, false);
+    const initLutIx = initLookupTableIx(env.payer.publicKey, await env.connection.getSlot());
+
+    const updateVaultConfigSig = await processTxn(env.client, env.payer, [initLutIx[0]], 'execute', 2500, []);
+    console.log(`LUT created: ${initLutIx[1].toString()} tx id: ${updateVaultConfigSig}`);
+  });
+
   commands
     .command('sync-vault-lut')
     .requiredOption('--vault <string>', 'The vault address to sync')
@@ -1142,9 +1152,6 @@ async function main() {
         address: lendingMarketAddress,
         state: lendingMarketState,
       };
-      if (!lendingMarketState) {
-        throw new Error('Lending Market not found');
-      }
 
       if (mode === 'multisig') {
         throw new Error('If using multisig mode, multisig is required');
@@ -1163,6 +1170,106 @@ async function main() {
         );
     });
 
+  commands
+    .command('update-lending-market-name')
+    .requiredOption('--lending-market <string>', 'Lending Market address')
+    .requiredOption('--new-name <string>', 'Lending Market address')
+    .requiredOption(
+      `--mode <string>`,
+      'simulate - to print txn simulation, inspect - to get txn simulation in explorer, execute - execute txn, multisig - to get bs58 txn for multisig usage'
+    )
+    .option(`--staging`, 'If true, will use the staging programs')
+    .action(async ({ lendingMarket, newName, mode, staging }) => {
+      const env = initializeClient(mode === 'multisig', staging);
+      const lendingMarketAddress = new PublicKey(lendingMarket);
+      const lendingMarketState = await LendingMarket.fetch(env.connection, lendingMarketAddress, env.kLendProgramId);
+      if (!lendingMarketState) {
+        throw new Error('Lending Market not found');
+      }
+      const marketWithAddress = {
+        address: lendingMarketAddress,
+        state: lendingMarketState,
+      };
+
+      if (mode === 'multisig') {
+        throw new Error('If using multisig mode, multisig is required');
+      }
+
+      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+
+      const currentName = parseZeroPaddedUtf8(lendingMarketState.name);
+      const newNameEncoded = encodeTokenName(newName);
+
+      console.log('Current name: ', currentName, ' encoded: ', lendingMarketState.name);
+      console.log('New name: ', newName, ' encoded: ', newNameEncoded);
+
+      // @ts-ignore
+      const newLendingMarket: LendingMarket = {
+        ...lendingMarketState,
+        name: newNameEncoded,
+      };
+
+      const ixns = kaminoManager.updateLendingMarketIxs(marketWithAddress, newLendingMarket);
+
+      const _updateLendingMarketSig = await processTxn(env.client, env.payer, ixns, mode, 2500, [], 400_000);
+
+      mode === 'execute' &&
+        console.log(
+          'Lending market name updated to -> ',
+          JSON.parse(JSON.stringify(lendingMarketState.lendingMarketOwnerCached))
+        );
+    });
+
+  commands
+    .command('update-reserve-config-debt-cap')
+    .requiredOption('--reserve <string>', 'Lending Market address')
+    .requiredOption(
+      `--mode <string>`,
+      'simulate - to print txn simulation, inspect - to get txn simulation in explorer, execute - execute txn, multisig - to get bs58 txn for multisig usage'
+    )
+    .option(`--staging`, 'If true, will use the staging programs')
+    .action(async ({ reserve, mode, staging }) => {
+      const env = initializeClient(mode === 'multisig', staging);
+      const reserveAddress = new PublicKey(reserve);
+      const reserveState = await Reserve.fetch(env.connection, reserveAddress, env.kLendProgramId);
+      if (!reserveState) {
+        throw new Error('Reserve not found');
+      }
+
+      const lendingMarketAddress = reserveState.lendingMarket;
+      const lendingMarketState = await LendingMarket.fetch(env.connection, lendingMarketAddress, env.kLendProgramId);
+      if (!lendingMarketState) {
+        throw new Error('Lending Market not found');
+      }
+
+      const marketWithAddress = {
+        address: lendingMarketAddress,
+        state: lendingMarketState,
+      };
+
+      if (mode === 'multisig') {
+        throw new Error('If using multisig mode, multisig is required');
+      }
+
+      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+
+      const newReserveConfigFields: ReserveConfigFields = {
+        ...reserveState.config,
+        borrowLimit: new BN(1000),
+      };
+      const newReserveConfig: ReserveConfig = new ReserveConfig(newReserveConfigFields);
+
+      const ixns = await kaminoManager.updateReserveIxs(marketWithAddress, reserveAddress, newReserveConfig);
+
+      const _updateLendingMarketSig = await processTxn(env.client, env.payer, ixns, mode, 2500, [], 400_000);
+
+      mode === 'execute' &&
+        console.log(
+          'Lending market name updated to -> ',
+          JSON.parse(JSON.stringify(lendingMarketState.lendingMarketOwnerCached))
+        );
+    });
+
   await commands.parseAsync();
 }
 

package/src/idl_codegen_kamino_vault/accounts/VaultState.ts

@@ -24,6 +24,7 @@ export interface VaultStateFields {
   prevAumSf: BN
   pendingFeesSf: BN
   vaultAllocationStrategy: Array<types.VaultAllocationFields>
+  padding1: Array<BN>
   minDepositAmount: BN
   minWithdrawAmount: BN
   minInvestAmount: BN
@@ -37,9 +38,9 @@ export interface VaultStateFields {
   vaultLookupTable: PublicKey
   vaultFarm: PublicKey
   creationTimestamp: BN
-  padding1: BN
+  padding2: BN
   allocationAdmin: PublicKey
-  padding2: Array<BN>
+  padding3: Array<BN>
 }
 
 export interface VaultStateJSON {
@@ -62,6 +63,7 @@ export interface VaultStateJSON {
   prevAumSf: string
   pendingFeesSf: string
   vaultAllocationStrategy: Array<types.VaultAllocationJSON>
+  padding1: Array<string>
   minDepositAmount: string
   minWithdrawAmount: string
   minInvestAmount: string
@@ -75,9 +77,9 @@ export interface VaultStateJSON {
   vaultLookupTable: string
   vaultFarm: string
   creationTimestamp: string
-  padding1: string
+  padding2: string
   allocationAdmin: string
-  padding2: Array<string>
+  padding3: Array<string>
 }
 
 export class VaultState {
@@ -100,6 +102,7 @@ export class VaultState {
   readonly prevAumSf: BN
   readonly pendingFeesSf: BN
   readonly vaultAllocationStrategy: Array<types.VaultAllocation>
+  readonly padding1: Array<BN>
   readonly minDepositAmount: BN
   readonly minWithdrawAmount: BN
   readonly minInvestAmount: BN
@@ -113,9 +116,9 @@ export class VaultState {
   readonly vaultLookupTable: PublicKey
   readonly vaultFarm: PublicKey
   readonly creationTimestamp: BN
-  readonly padding1: BN
+  readonly padding2: BN
   readonly allocationAdmin: PublicKey
-  readonly padding2: Array<BN>
+  readonly padding3: Array<BN>
 
   static readonly discriminator = Buffer.from([
     228, 196, 82, 165, 98, 210, 235, 152,
@@ -140,7 +143,8 @@ export class VaultState {
     borsh.u64("lastFeeChargeTimestamp"),
     borsh.u128("prevAumSf"),
     borsh.u128("pendingFeesSf"),
-    borsh.array(types.VaultAllocation.layout(), 10, "vaultAllocationStrategy"),
+    borsh.array(types.VaultAllocation.layout(), 25, "vaultAllocationStrategy"),
+    borsh.array(borsh.u128(), 256, "padding1"),
     borsh.u64("minDepositAmount"),
     borsh.u64("minWithdrawAmount"),
     borsh.u64("minInvestAmount"),
@@ -154,9 +158,9 @@ export class VaultState {
     borsh.publicKey("vaultLookupTable"),
     borsh.publicKey("vaultFarm"),
     borsh.u64("creationTimestamp"),
-    borsh.u64("padding1"),
+    borsh.u64("padding2"),
     borsh.publicKey("allocationAdmin"),
-    borsh.array(borsh.u128(), 242, "padding2"),
+    borsh.array(borsh.u128(), 242, "padding3"),
   ])
 
   constructor(fields: VaultStateFields) {
@@ -181,6 +185,7 @@ export class VaultState {
     this.vaultAllocationStrategy = fields.vaultAllocationStrategy.map(
       (item) => new types.VaultAllocation({ ...item })
     )
+    this.padding1 = fields.padding1
     this.minDepositAmount = fields.minDepositAmount
     this.minWithdrawAmount = fields.minWithdrawAmount
     this.minInvestAmount = fields.minInvestAmount
@@ -194,9 +199,9 @@ export class VaultState {
     this.vaultLookupTable = fields.vaultLookupTable
     this.vaultFarm = fields.vaultFarm
     this.creationTimestamp = fields.creationTimestamp
-    this.padding1 = fields.padding1
-    this.allocationAdmin = fields.allocationAdmin
     this.padding2 = fields.padding2
+    this.allocationAdmin = fields.allocationAdmin
+    this.padding3 = fields.padding3
   }
 
   static async fetch(
@@ -266,6 +271,7 @@ export class VaultState {
           item: any /* eslint-disable-line @typescript-eslint/no-explicit-any */
         ) => types.VaultAllocation.fromDecoded(item)
       ),
+      padding1: dec.padding1,
       minDepositAmount: dec.minDepositAmount,
       minWithdrawAmount: dec.minWithdrawAmount,
       minInvestAmount: dec.minInvestAmount,
@@ -279,9 +285,9 @@ export class VaultState {
       vaultLookupTable: dec.vaultLookupTable,
       vaultFarm: dec.vaultFarm,
       creationTimestamp: dec.creationTimestamp,
-      padding1: dec.padding1,
-      allocationAdmin: dec.allocationAdmin,
       padding2: dec.padding2,
+      allocationAdmin: dec.allocationAdmin,
+      padding3: dec.padding3,
     })
   }
 
@@ -308,6 +314,7 @@ export class VaultState {
       vaultAllocationStrategy: this.vaultAllocationStrategy.map((item) =>
         item.toJSON()
       ),
+      padding1: this.padding1.map((item) => item.toString()),
       minDepositAmount: this.minDepositAmount.toString(),
       minWithdrawAmount: this.minWithdrawAmount.toString(),
       minInvestAmount: this.minInvestAmount.toString(),
@@ -321,9 +328,9 @@ export class VaultState {
       vaultLookupTable: this.vaultLookupTable.toString(),
       vaultFarm: this.vaultFarm.toString(),
       creationTimestamp: this.creationTimestamp.toString(),
-      padding1: this.padding1.toString(),
+      padding2: this.padding2.toString(),
       allocationAdmin: this.allocationAdmin.toString(),
-      padding2: this.padding2.map((item) => item.toString()),
+      padding3: this.padding3.map((item) => item.toString()),
     }
   }
 
@@ -350,6 +357,7 @@ export class VaultState {
       vaultAllocationStrategy: obj.vaultAllocationStrategy.map((item) =>
         types.VaultAllocation.fromJSON(item)
       ),
+      padding1: obj.padding1.map((item) => new BN(item)),
       minDepositAmount: new BN(obj.minDepositAmount),
       minWithdrawAmount: new BN(obj.minWithdrawAmount),
       minInvestAmount: new BN(obj.minInvestAmount),
@@ -363,9 +371,9 @@ export class VaultState {
       vaultLookupTable: new PublicKey(obj.vaultLookupTable),
       vaultFarm: new PublicKey(obj.vaultFarm),
       creationTimestamp: new BN(obj.creationTimestamp),
-      padding1: new BN(obj.padding1),
+      padding2: new BN(obj.padding2),
       allocationAdmin: new PublicKey(obj.allocationAdmin),
-      padding2: obj.padding2.map((item) => new BN(item)),
+      padding3: obj.padding3.map((item) => new BN(item)),
     })
   }
 }

package/src/idl_codegen_kamino_vault/errors/custom.ts

@@ -46,6 +46,7 @@ export type CustomError =
   | MinWithdrawAmountTooBig
   | InvestTooSoon
   | WrongAdminOrAllocationAdmin
+  | ReserveHasNonZeroAllocationOrCTokens
 
 export class DepositAmountsZero extends Error {
   static readonly code = 7000
@@ -564,6 +565,20 @@ export class WrongAdminOrAllocationAdmin extends Error {
   }
 }
 
+export class ReserveHasNonZeroAllocationOrCTokens extends Error {
+  static readonly code = 7047
+  readonly code = 7047
+  readonly name = "ReserveHasNonZeroAllocationOrCTokens"
+  readonly msg =
+    "Reserve has non-zero allocation or ctokens so cannot be removed"
+
+  constructor(readonly logs?: string[]) {
+    super(
+      "7047: Reserve has non-zero allocation or ctokens so cannot be removed"
+    )
+  }
+}
+
 export function fromCode(code: number, logs?: string[]): CustomError | null {
   switch (code) {
     case 7000:
@@ -660,6 +675,8 @@ export function fromCode(code: number, logs?: string[]): CustomError | null {
       return new InvestTooSoon(logs)
     case 7046:
       return new WrongAdminOrAllocationAdmin(logs)
+    case 7047:
+      return new ReserveHasNonZeroAllocationOrCTokens(logs)
   }
 
   return null

package/src/idl_codegen_kamino_vault/instructions/index.ts

@@ -40,3 +40,5 @@ export type {
   WithdrawFromAvailableArgs,
   WithdrawFromAvailableAccounts,
 } from "./withdrawFromAvailable"
+export { removeAllocation } from "./removeAllocation"
+export type { RemoveAllocationAccounts } from "./removeAllocation"

package/src/idl_codegen_kamino_vault/instructions/removeAllocation.ts

@@ -0,0 +1,26 @@
+import { TransactionInstruction, PublicKey, AccountMeta } from "@solana/web3.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import BN from "bn.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as borsh from "@coral-xyz/borsh" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as types from "../types" // eslint-disable-line @typescript-eslint/no-unused-vars
+import { PROGRAM_ID } from "../programId"
+
+export interface RemoveAllocationAccounts {
+  vaultAdminAuthority: PublicKey
+  vaultState: PublicKey
+  reserve: PublicKey
+}
+
+export function removeAllocation(
+  accounts: RemoveAllocationAccounts,
+  programId: PublicKey = PROGRAM_ID
+) {
+  const keys: Array<AccountMeta> = [
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
+    { pubkey: accounts.reserve, isSigner: false, isWritable: false },
+  ]
+  const identifier = Buffer.from([32, 220, 211, 141, 209, 231, 73, 76])
+  const data = identifier
+  const ix = new TransactionInstruction({ keys, programId, data })
+  return ix
+}

package/src/idl_codegen_kamino_vault/programId.ts

@@ -2,13 +2,12 @@ import { PublicKey } from "@solana/web3.js"
 
 // Program ID passed with the cli --program-id flag when running the code generator. Do not edit, it will get overwritten.
 export const KVAULTS_PROGRAM_ID_CLI = new PublicKey(
-  "kvauTFR8qm1dhniz6pYuBZkuene3Hfrs1VQhVRgCNrr"
+  "KvauGMspG5k6rtzrqqn7WNn3oZdyKqLKwK2XWQ8FLjd"
 )
 
 // This constant will not get overwritten on subsequent code generations and it's safe to modify it's value.
 export let KVAULTS_PROGRAM_ID: PublicKey = KVAULTS_PROGRAM_ID_CLI
 export let PROGRAM_ID: PublicKey = KVAULTS_PROGRAM_ID_CLI
-
 export const setKVaultsProgramId = (programId: PublicKey) => {
   KVAULTS_PROGRAM_ID = programId;
   PROGRAM_ID = programId;

package/src/idl_kamino_vault.json

@@ -730,6 +730,27 @@
           "type": "u64"
         }
       ]
+    },
+    {
+      "name": "removeAllocation",
+      "accounts": [
+        {
+          "name": "vaultAdminAuthority",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "vaultState",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "reserve",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
     }
   ],
   "accounts": [
@@ -936,7 +957,16 @@
                 {
                   "defined": "VaultAllocation"
                 },
-                10
+                25
+              ]
+            }
+          },
+          {
+            "name": "padding1",
+            "type": {
+              "array": [
+                "u128",
+                256
               ]
             }
           },
@@ -998,7 +1028,7 @@
             "type": "u64"
           },
           {
-            "name": "padding1",
+            "name": "padding2",
             "type": "u64"
           },
           {
@@ -1006,7 +1036,7 @@
             "type": "publicKey"
           },
           {
-            "name": "padding2",
+            "name": "padding3",
             "type": {
               "array": [
                 "u128",
@@ -2187,6 +2217,11 @@
       "code": 7046,
       "name": "WrongAdminOrAllocationAdmin",
       "msg": "Wrong admin or allocation admin"
+    },
+    {
+      "code": 7047,
+      "name": "ReserveHasNonZeroAllocationOrCTokens",
+      "msg": "Reserve has non-zero allocation or ctokens so cannot be removed"
     }
   ]
 }

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -7,6 +7,8 @@ import {
   SwapIxsProvider,
   SwapQuoteProvider,
   getScopeRefreshIx,
+  LeverageIxnsOutput,
+  FlashLoanInfo,
 } from '../leverage';
 import {
   createAtasIdempotent,
@@ -23,6 +25,7 @@ import { calcMaxWithdrawCollateral, calcRepayAmountWithSlippage } from './repay_
 export type RepayWithCollIxsResponse<QuoteResponse> = {
   ixs: TransactionInstruction[];
   lookupTables: AddressLookupTableAccount[];
+  flashLoanInfo: FlashLoanInfo;
   swapInputs: SwapInputs;
   initialInputs: RepayWithCollInitialInputs<QuoteResponse>;
 };
@@ -77,6 +80,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
+  flashLoanInfo: FlashLoanInfo;
   initialInputs: RepayWithCollInitialInputs<QuoteResponse>;
 }> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
@@ -124,7 +128,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   const inputAmountLamports = Decimal.min(withdrawableCollLamports, maxCollNeededFromOracle);
 
   // Build the repay & withdraw collateral tx to get the number of accounts
-  const klendIxs = await buildRepayWithCollateralIxs(
+  const klendIxs: LeverageIxnsOutput = await buildRepayWithCollateralIxs(
     kaminoMarket,
     debtReserve,
     collReserve,
@@ -143,7 +147,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     inputAmountLamports,
     useV2Ixs
   );
-  const uniqueKlendAccounts = uniqueAccounts(klendIxs);
+  const uniqueKlendAccounts = uniqueAccounts(klendIxs.instructions);
 
   const swapQuoteInputs: SwapInputs = {
     inputAmountLamports,
@@ -169,6 +173,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
       outputMint: debtTokenMint,
       amountDebtAtaBalance: new Decimal(0), // only used for kTokens
     },
+    flashLoanInfo: klendIxs.flashLoanInfo,
     initialInputs: {
       debtRepayAmountLamports: repayAmountLamports,
       flashRepayAmountLamports,
@@ -251,7 +256,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   );
 
   const swapResponse = await swapper(swapInputs, initialInputs.klendAccounts, swapQuote);
-  const ixs = await buildRepayWithCollateralIxs(
+  const ixs: LeverageIxnsOutput = await buildRepayWithCollateralIxs(
     kaminoMarket,
     debtReserve,
     collReserve,
@@ -268,9 +273,10 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   );
 
   return {
-    ixs,
+    ixs: ixs.instructions,
     lookupTables: swapResponse.lookupTables,
     swapInputs,
+    flashLoanInfo: ixs.flashLoanInfo,
     initialInputs,
   };
 }
@@ -289,7 +295,7 @@ async function buildRepayWithCollateralIxs(
   debtRepayAmountLamports: Decimal,
   collWithdrawLamports: Decimal,
   useV2Ixs: boolean
-): Promise<TransactionInstruction[]> {
+): Promise<LeverageIxnsOutput> {
   // 1. Create atas & budget txns
   const budgetIxns = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxns(1_400_000);
 
@@ -367,7 +373,7 @@ async function buildRepayWithCollateralIxs(
   const { preActionIxs, swapIxs } = swapQuoteIxs;
   const swapInstructions = removeBudgetAndAtaIxns(swapIxs, []);
 
-  return [
+  const ixns = [
     ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndIxs.map((x) => x.createAtaIx),
@@ -377,6 +383,16 @@ async function buildRepayWithCollateralIxs(
     ...swapInstructions,
     flashRepayIxn,
   ];
+
+  const res: LeverageIxnsOutput = {
+    flashLoanInfo: {
+      flashBorrowReserve: debtReserve.address,
+      flashLoanFee: debtReserve.getFlashLoanFee(),
+    },
+    instructions: ixns,
+  };
+
+  return res;
 }
 
 export const getMaxWithdrawLtvCheck = (obligation: KaminoObligation) => {

package/src/lending_operations/swap_collateral_operations.ts

@@ -6,7 +6,13 @@ import {
   KaminoObligation,
   KaminoReserve,
 } from '../classes';
-import { getFlashLoanInstructions, getScopeRefreshIx, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
+import {
+  FlashLoanInfo,
+  getFlashLoanInstructions,
+  getScopeRefreshIx,
+  SwapIxsProvider,
+  SwapQuoteProvider,
+} from '../leverage';
 import {
   createAtasIdempotent,
   DEFAULT_MAX_COMPUTE_UNITS,
@@ -251,6 +257,7 @@ type SwapCollKlendIxns = {
   withdrawSourceCollIxns: TransactionInstruction[];
   targetCollFlashRepayIxn: TransactionInstruction;
   cleanupIxns: TransactionInstruction[];
+  flashLoanInfo: FlashLoanInfo;
   simulationDetails: {
     targetCollFlashBorrowedAmount: Decimal;
   };
@@ -295,6 +302,10 @@ async function getKlendIxns(
 
   return {
     setupIxns,
+    flashLoanInfo: {
+      flashBorrowReserve: context.targetCollReserve.address,
+      flashLoanFee: context.targetCollReserve.getFlashLoanFee(),
+    },
     targetCollFlashBorrowIxn,
     depositTargetCollIxns: depositTargetCollIxns.ixns,
     withdrawSourceCollIxns,