@kamino-finance/klend-sdk 5.2.11 → 5.2.13

package/src/idl_codegen_kamino_vault/instructions/deposit.ts

@@ -15,7 +15,7 @@ export interface DepositAccounts {
   tokenMint: PublicKey
   baseVaultAuthority: PublicKey
   sharesMint: PublicKey
-  tokenAta: PublicKey
+  userTokenAta: PublicKey
   userSharesAta: PublicKey
   klendProgram: PublicKey
   tokenProgram: PublicKey
@@ -37,7 +37,7 @@ export function deposit(
     { pubkey: accounts.tokenMint, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: true },
-    { pubkey: accounts.tokenAta, isSigner: false, isWritable: true },
+    { pubkey: accounts.userTokenAta, isSigner: false, isWritable: true },
     { pubkey: accounts.userSharesAta, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/index.ts

@@ -25,3 +25,18 @@ export type {
   GiveUpPendingFeesArgs,
   GiveUpPendingFeesAccounts,
 } from "./giveUpPendingFees"
+export { initializeSharesMetadata } from "./initializeSharesMetadata"
+export type {
+  InitializeSharesMetadataArgs,
+  InitializeSharesMetadataAccounts,
+} from "./initializeSharesMetadata"
+export { updateSharesMetadata } from "./updateSharesMetadata"
+export type {
+  UpdateSharesMetadataArgs,
+  UpdateSharesMetadataAccounts,
+} from "./updateSharesMetadata"
+export { withdrawFromAvailable } from "./withdrawFromAvailable"
+export type {
+  WithdrawFromAvailableArgs,
+  WithdrawFromAvailableAccounts,
+} from "./withdrawFromAvailable"

package/src/idl_codegen_kamino_vault/instructions/initVault.ts

@@ -7,9 +7,9 @@ import { PROGRAM_ID } from "../programId"
 export interface InitVaultAccounts {
   adminAuthority: PublicKey
   vaultState: PublicKey
-  tokenMint: PublicKey
-  tokenVault: PublicKey
   baseVaultAuthority: PublicKey
+  tokenVault: PublicKey
+  baseTokenMint: PublicKey
   sharesMint: PublicKey
   systemProgram: PublicKey
   rent: PublicKey
@@ -24,9 +24,9 @@ export function initVault(
   const keys: Array<AccountMeta> = [
     { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
-    { pubkey: accounts.tokenMint, isSigner: false, isWritable: false },
+    { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
     { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },
-    { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: true },
+    { pubkey: accounts.baseTokenMint, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: true },
     { pubkey: accounts.systemProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.rent, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.ts

@@ -0,0 +1,58 @@
+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 InitializeSharesMetadataArgs {
+  name: string
+  symbol: string
+  uri: string
+}
+
+export interface InitializeSharesMetadataAccounts {
+  adminAuthority: PublicKey
+  vaultState: PublicKey
+  sharesMint: PublicKey
+  baseVaultAuthority: PublicKey
+  sharesMetadata: PublicKey
+  systemProgram: PublicKey
+  rent: PublicKey
+  metadataProgram: PublicKey
+}
+
+export const layout = borsh.struct([
+  borsh.str("name"),
+  borsh.str("symbol"),
+  borsh.str("uri"),
+])
+
+export function initializeSharesMetadata(
+  args: InitializeSharesMetadataArgs,
+  accounts: InitializeSharesMetadataAccounts,
+  programId: PublicKey = PROGRAM_ID
+) {
+  const keys: Array<AccountMeta> = [
+    { pubkey: accounts.adminAuthority, 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 },
+    { pubkey: accounts.sharesMetadata, isSigner: false, isWritable: true },
+    { pubkey: accounts.systemProgram, isSigner: false, isWritable: false },
+    { pubkey: accounts.rent, isSigner: false, isWritable: false },
+    { pubkey: accounts.metadataProgram, isSigner: false, isWritable: false },
+  ]
+  const identifier = Buffer.from([3, 15, 172, 114, 200, 0, 131, 32])
+  const buffer = Buffer.alloc(1000)
+  const len = layout.encode(
+    {
+      name: args.name,
+      symbol: args.symbol,
+      uri: args.uri,
+    },
+    buffer
+  )
+  const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
+  const ix = new TransactionInstruction({ keys, programId, data })
+  return ix
+}

package/src/idl_codegen_kamino_vault/instructions/invest.ts

@@ -12,17 +12,16 @@ export interface InvestAccounts {
   tokenMint: PublicKey
   baseVaultAuthority: PublicKey
   ctokenVault: PublicKey
-  reserve: PublicKey
   /** CPI accounts */
+  reserve: PublicKey
   lendingMarket: PublicKey
   lendingMarketAuthority: PublicKey
   reserveLiquiditySupply: PublicKey
   reserveCollateralMint: PublicKey
-  reserveCollateralTokenProgram: PublicKey
   klendProgram: PublicKey
-  instructionSysvarAccount: PublicKey
+  reserveCollateralTokenProgram: PublicKey
   tokenProgram: PublicKey
-  sharesTokenProgram: PublicKey
+  instructionSysvarAccount: PublicKey
 }
 
 export function invest(
@@ -54,19 +53,18 @@ export function invest(
       isSigner: false,
       isWritable: true,
     },
+    { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
     {
       pubkey: accounts.reserveCollateralTokenProgram,
       isSigner: false,
       isWritable: false,
     },
-    { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
+    { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
     {
       pubkey: accounts.instructionSysvarAccount,
       isSigner: false,
       isWritable: false,
     },
-    { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
-    { pubkey: accounts.sharesTokenProgram, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([13, 245, 180, 103, 254, 182, 121, 4])
   const data = identifier

package/src/idl_codegen_kamino_vault/instructions/updateSharesMetadata.ts

@@ -0,0 +1,52 @@
+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 UpdateSharesMetadataArgs {
+  name: string
+  symbol: string
+  uri: string
+}
+
+export interface UpdateSharesMetadataAccounts {
+  adminAuthority: PublicKey
+  vaultState: PublicKey
+  baseVaultAuthority: PublicKey
+  sharesMetadata: PublicKey
+  metadataProgram: PublicKey
+}
+
+export const layout = borsh.struct([
+  borsh.str("name"),
+  borsh.str("symbol"),
+  borsh.str("uri"),
+])
+
+export function updateSharesMetadata(
+  args: UpdateSharesMetadataArgs,
+  accounts: UpdateSharesMetadataAccounts,
+  programId: PublicKey = PROGRAM_ID
+) {
+  const keys: Array<AccountMeta> = [
+    { 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 },
+    { pubkey: accounts.metadataProgram, isSigner: false, isWritable: false },
+  ]
+  const identifier = Buffer.from([155, 34, 122, 165, 245, 137, 147, 107])
+  const buffer = Buffer.alloc(1000)
+  const len = layout.encode(
+    {
+      name: args.name,
+      symbol: args.symbol,
+      uri: args.uri,
+    },
+    buffer
+  )
+  const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
+  const ix = new TransactionInstruction({ keys, programId, data })
+  return ix
+}

package/src/idl_codegen_kamino_vault/instructions/updateVaultConfig.ts

@@ -26,7 +26,7 @@ export function updateVaultConfig(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { 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/withdraw.ts

@@ -9,26 +9,30 @@ export interface WithdrawArgs {
 }
 
 export interface WithdrawAccounts {
-  user: PublicKey
-  vaultState: PublicKey
-  reserve: PublicKey
-  tokenVault: PublicKey
-  ctokenVault: PublicKey
-  baseVaultAuthority: PublicKey
-  tokenAta: PublicKey
-  tokenMint: PublicKey
-  userSharesAta: PublicKey
-  sharesMint: PublicKey
-  tokenProgram: PublicKey
-  /** CPI accounts */
-  lendingMarket: PublicKey
-  lendingMarketAuthority: PublicKey
-  reserveLiquiditySupply: PublicKey
-  reserveCollateralMint: PublicKey
-  klendProgram: PublicKey
-  instructionSysvarAccount: PublicKey
-  reserveCollateralTokenProgram: PublicKey
-  sharesTokenProgram: PublicKey
+  withdrawFromAvailable: {
+    user: PublicKey
+    vaultState: PublicKey
+    tokenVault: PublicKey
+    baseVaultAuthority: PublicKey
+    userTokenAta: PublicKey
+    tokenMint: PublicKey
+    userSharesAta: PublicKey
+    sharesMint: PublicKey
+    tokenProgram: PublicKey
+    sharesTokenProgram: PublicKey
+    klendProgram: PublicKey
+  }
+  withdrawFromReserveAccounts: {
+    vaultState: PublicKey
+    reserve: PublicKey
+    ctokenVault: PublicKey
+    lendingMarket: PublicKey
+    lendingMarketAuthority: PublicKey
+    reserveLiquiditySupply: PublicKey
+    reserveCollateralMint: PublicKey
+    reserveCollateralTokenProgram: PublicKey
+    instructionSysvarAccount: PublicKey
+  }
 }
 
 export const layout = borsh.struct([borsh.u64("sharesAmount")])
@@ -39,45 +43,107 @@ export function withdraw(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.user, 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 },
-    { pubkey: accounts.ctokenVault, isSigner: false, isWritable: true },
-    { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: true },
-    { pubkey: accounts.tokenAta, isSigner: false, isWritable: true },
-    { pubkey: accounts.tokenMint, isSigner: false, isWritable: true },
-    { pubkey: accounts.userSharesAta, isSigner: false, isWritable: true },
-    { pubkey: accounts.sharesMint, isSigner: false, isWritable: true },
-    { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
-    { pubkey: accounts.lendingMarket, isSigner: false, isWritable: false },
-    {
-      pubkey: accounts.lendingMarketAuthority,
+    {
+      pubkey: accounts.withdrawFromAvailable.user,
+      isSigner: true,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.vaultState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.tokenVault,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.baseVaultAuthority,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.userTokenAta,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.tokenMint,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.userSharesAta,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.sharesMint,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.tokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.sharesTokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.klendProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawFromReserveAccounts.vaultState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromReserveAccounts.reserve,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromReserveAccounts.ctokenVault,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawFromReserveAccounts.lendingMarket,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawFromReserveAccounts.lendingMarketAuthority,
       isSigner: false,
       isWritable: false,
     },
     {
-      pubkey: accounts.reserveLiquiditySupply,
+      pubkey: accounts.withdrawFromReserveAccounts.reserveLiquiditySupply,
       isSigner: false,
       isWritable: true,
     },
     {
-      pubkey: accounts.reserveCollateralMint,
+      pubkey: accounts.withdrawFromReserveAccounts.reserveCollateralMint,
       isSigner: false,
       isWritable: true,
     },
-    { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
     {
-      pubkey: accounts.instructionSysvarAccount,
+      pubkey:
+        accounts.withdrawFromReserveAccounts.reserveCollateralTokenProgram,
       isSigner: false,
       isWritable: false,
     },
     {
-      pubkey: accounts.reserveCollateralTokenProgram,
+      pubkey: accounts.withdrawFromReserveAccounts.instructionSysvarAccount,
       isSigner: false,
       isWritable: false,
     },
-    { pubkey: accounts.sharesTokenProgram, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([183, 18, 70, 156, 148, 109, 161, 34])
   const buffer = Buffer.alloc(1000)

package/src/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.ts

@@ -0,0 +1,56 @@
+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 WithdrawFromAvailableArgs {
+  sharesAmount: BN
+}
+
+export interface WithdrawFromAvailableAccounts {
+  user: PublicKey
+  vaultState: PublicKey
+  tokenVault: PublicKey
+  baseVaultAuthority: PublicKey
+  userTokenAta: PublicKey
+  tokenMint: PublicKey
+  userSharesAta: PublicKey
+  sharesMint: PublicKey
+  tokenProgram: PublicKey
+  sharesTokenProgram: PublicKey
+  klendProgram: PublicKey
+}
+
+export const layout = borsh.struct([borsh.u64("sharesAmount")])
+
+export function withdrawFromAvailable(
+  args: WithdrawFromAvailableArgs,
+  accounts: WithdrawFromAvailableAccounts,
+  programId: PublicKey = PROGRAM_ID
+) {
+  const keys: Array<AccountMeta> = [
+    { pubkey: accounts.user, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
+    { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },
+    { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
+    { pubkey: accounts.userTokenAta, isSigner: false, isWritable: true },
+    { pubkey: accounts.tokenMint, isSigner: false, isWritable: true },
+    { pubkey: accounts.userSharesAta, isSigner: false, isWritable: true },
+    { pubkey: accounts.sharesMint, isSigner: false, isWritable: true },
+    { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
+    { pubkey: accounts.sharesTokenProgram, isSigner: false, isWritable: false },
+    { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
+  ]
+  const identifier = Buffer.from([19, 131, 112, 155, 170, 220, 34, 57])
+  const buffer = Buffer.alloc(1000)
+  const len = layout.encode(
+    {
+      sharesAmount: args.sharesAmount,
+    },
+    buffer
+  )
+  const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
+  const ix = new TransactionInstruction({ keys, programId, data })
+  return ix
+}

package/src/idl_codegen_kamino_vault/instructions/withdrawPendingFees.ts

@@ -13,16 +13,15 @@ export interface WithdrawPendingFeesAccounts {
   baseVaultAuthority: PublicKey
   tokenAta: PublicKey
   tokenMint: PublicKey
-  tokenProgram: PublicKey
   /** CPI accounts */
   lendingMarket: PublicKey
   lendingMarketAuthority: PublicKey
   reserveLiquiditySupply: PublicKey
   reserveCollateralMint: PublicKey
   klendProgram: PublicKey
-  instructionSysvarAccount: PublicKey
+  tokenProgram: PublicKey
   reserveCollateralTokenProgram: PublicKey
-  sharesTokenProgram: PublicKey
+  instructionSysvarAccount: PublicKey
 }
 
 export function withdrawPendingFees(
@@ -38,7 +37,6 @@ export function withdrawPendingFees(
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: true },
     { pubkey: accounts.tokenAta, isSigner: false, isWritable: true },
     { pubkey: accounts.tokenMint, isSigner: false, isWritable: true },
-    { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.lendingMarket, isSigner: false, isWritable: false },
     {
       pubkey: accounts.lendingMarketAuthority,
@@ -56,17 +54,17 @@ export function withdrawPendingFees(
       isWritable: true,
     },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
+    { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
     {
-      pubkey: accounts.instructionSysvarAccount,
+      pubkey: accounts.reserveCollateralTokenProgram,
       isSigner: false,
       isWritable: false,
     },
     {
-      pubkey: accounts.reserveCollateralTokenProgram,
+      pubkey: accounts.instructionSysvarAccount,
       isSigner: false,
       isWritable: false,
     },
-    { pubkey: accounts.sharesTokenProgram, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([131, 194, 200, 140, 175, 244, 217, 183])
   const data = identifier