@exponent-labs/klend-idl 0.9.25 → 0.9.26

package/src/instructions/withdrawObligationCollateral.ts

@@ -1,6 +1,7 @@
 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 WithdrawObligationCollateralArgs {
@@ -24,10 +25,10 @@ export const layout = borsh.struct([borsh.u64("collateralAmount")])
 export function withdrawObligationCollateral(
   args: WithdrawObligationCollateralArgs,
   accounts: WithdrawObligationCollateralAccounts,
-  programId: PublicKey = PROGRAM_ID,
+  programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.owner, isSigner: true, isWritable: false },
+    { pubkey: accounts.owner, isSigner: true, isWritable: true },
     { pubkey: accounts.obligation, isSigner: false, isWritable: true },
     { pubkey: accounts.lendingMarket, isSigner: false, isWritable: false },
     {
@@ -59,7 +60,7 @@ export function withdrawObligationCollateral(
     {
       collateralAmount: args.collateralAmount,
     },
-    buffer,
+    buffer
   )
   const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
   const ix = new TransactionInstruction({ keys, programId, data })

package/src/instructions/withdrawObligationCollateralAndRedeemReserveCollateral.ts

@@ -1,6 +1,7 @@
 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 WithdrawObligationCollateralAndRedeemReserveCollateralArgs {
@@ -18,7 +19,7 @@ export interface WithdrawObligationCollateralAndRedeemReserveCollateralAccounts
   reserveCollateralMint: PublicKey
   reserveLiquiditySupply: PublicKey
   userDestinationLiquidity: PublicKey
-  placeholderUserDestinationCollateral: PublicKey
+  placeholderUserDestinationCollateral?: PublicKey | null
   collateralTokenProgram: PublicKey
   liquidityTokenProgram: PublicKey
   instructionSysvarAccount: PublicKey
@@ -26,10 +27,22 @@ export interface WithdrawObligationCollateralAndRedeemReserveCollateralAccounts
 
 export const layout = borsh.struct([borsh.u64("collateralAmount")])
 
+function optionalAccountMeta(
+  pubkey: PublicKey | null | undefined,
+  isWritable: boolean,
+  programId: PublicKey
+): AccountMeta {
+  return {
+    pubkey: pubkey ?? programId,
+    isSigner: false,
+    isWritable: pubkey === null || pubkey === undefined ? false : isWritable,
+  }
+}
+
 export function withdrawObligationCollateralAndRedeemReserveCollateral(
   args: WithdrawObligationCollateralAndRedeemReserveCollateralArgs,
   accounts: WithdrawObligationCollateralAndRedeemReserveCollateralAccounts,
-  programId: PublicKey = PROGRAM_ID,
+  programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
     { pubkey: accounts.owner, isSigner: true, isWritable: true },
@@ -44,7 +57,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateral(
     {
       pubkey: accounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.reserveSourceCollateral,
@@ -66,11 +79,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateral(
       isSigner: false,
       isWritable: true,
     },
-    {
-      pubkey: accounts.placeholderUserDestinationCollateral,
-      isSigner: false,
-      isWritable: false,
-    },
+    optionalAccountMeta(accounts.placeholderUserDestinationCollateral, false, programId),
     {
       pubkey: accounts.collateralTokenProgram,
       isSigner: false,
@@ -93,7 +102,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateral(
     {
       collateralAmount: args.collateralAmount,
     },
-    buffer,
+    buffer
   )
   const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
   const ix = new TransactionInstruction({ keys, programId, data })

package/src/instructions/withdrawObligationCollateralAndRedeemReserveCollateralV2.ts

@@ -1,6 +1,7 @@
 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 WithdrawObligationCollateralAndRedeemReserveCollateralV2Args {
@@ -36,30 +37,46 @@ export const layout = borsh.struct([borsh.u64("collateralAmount")])
 function optionalAccountMeta(
   pubkey: PublicKey | null | undefined,
   isWritable: boolean,
-  programId: PublicKey,
+  programId: PublicKey
 ): AccountMeta {
   return {
     pubkey: pubkey ?? programId,
     isSigner: false,
-    isWritable,
+    isWritable: pubkey === null || pubkey === undefined ? false : isWritable,
   }
 }
 
 export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
   args: WithdrawObligationCollateralAndRedeemReserveCollateralV2Args,
   accounts: WithdrawObligationCollateralAndRedeemReserveCollateralV2Accounts,
-  programId: PublicKey = PROGRAM_ID,
+  programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.withdrawAccounts.owner, isSigner: true, isWritable: true },
-    { pubkey: accounts.withdrawAccounts.obligation, isSigner: false, isWritable: true },
-    { pubkey: accounts.withdrawAccounts.lendingMarket, isSigner: false, isWritable: false },
+    {
+      pubkey: accounts.withdrawAccounts.owner,
+      isSigner: true,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.obligation,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.lendingMarket,
+      isSigner: false,
+      isWritable: false,
+    },
     {
       pubkey: accounts.withdrawAccounts.lendingMarketAuthority,
       isSigner: false,
       isWritable: false,
     },
-    { pubkey: accounts.withdrawAccounts.withdrawReserve, isSigner: false, isWritable: true },
+    {
+      pubkey: accounts.withdrawAccounts.withdrawReserve,
+      isSigner: false,
+      isWritable: true,
+    },
     {
       pubkey: accounts.withdrawAccounts.reserveLiquidityMint,
       isSigner: false,
@@ -85,11 +102,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
       isSigner: false,
       isWritable: true,
     },
-    optionalAccountMeta(
-      accounts.withdrawAccounts.placeholderUserDestinationCollateral,
-      false,
-      programId,
-    ),
+    optionalAccountMeta(accounts.withdrawAccounts.placeholderUserDestinationCollateral, false, programId),
     {
       pubkey: accounts.withdrawAccounts.collateralTokenProgram,
       isSigner: false,
@@ -115,7 +128,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
     {
       collateralAmount: args.collateralAmount,
     },
-    buffer,
+    buffer
   )
   const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
   const ix = new TransactionInstruction({ keys, programId, data })

package/src/instructions/withdrawObligationCollateralV2.ts

@@ -0,0 +1,110 @@
+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 WithdrawObligationCollateralV2Args {
+  collateralAmount: BN
+}
+
+export interface WithdrawObligationCollateralV2Accounts {
+  withdrawAccounts: {
+    owner: PublicKey
+    obligation: PublicKey
+    lendingMarket: PublicKey
+    lendingMarketAuthority: PublicKey
+    withdrawReserve: PublicKey
+    reserveSourceCollateral: PublicKey
+    userDestinationCollateral: PublicKey
+    tokenProgram: PublicKey
+    instructionSysvarAccount: PublicKey
+  }
+  farmsAccounts: {
+    obligationFarmUserState?: PublicKey | null
+    reserveFarmState?: PublicKey | null
+  }
+  farmsProgram: PublicKey
+}
+
+export const layout = borsh.struct([borsh.u64("collateralAmount")])
+
+function optionalAccountMeta(
+  pubkey: PublicKey | null | undefined,
+  isWritable: boolean,
+  programId: PublicKey
+): AccountMeta {
+  return {
+    pubkey: pubkey ?? programId,
+    isSigner: false,
+    isWritable: pubkey === null || pubkey === undefined ? false : isWritable,
+  }
+}
+
+export function withdrawObligationCollateralV2(
+  args: WithdrawObligationCollateralV2Args,
+  accounts: WithdrawObligationCollateralV2Accounts,
+  programId: PublicKey = PROGRAM_ID
+) {
+  const keys: Array<AccountMeta> = [
+    {
+      pubkey: accounts.withdrawAccounts.owner,
+      isSigner: true,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.obligation,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.lendingMarket,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.lendingMarketAuthority,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.withdrawReserve,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.reserveSourceCollateral,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.userDestinationCollateral,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.tokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.instructionSysvarAccount,
+      isSigner: false,
+      isWritable: false,
+    },
+    optionalAccountMeta(accounts.farmsAccounts.obligationFarmUserState, true, programId),
+    optionalAccountMeta(accounts.farmsAccounts.reserveFarmState, true, programId),
+    { pubkey: accounts.farmsProgram, isSigner: false, isWritable: false },
+  ]
+  const identifier = Buffer.from([202, 249, 117, 114, 231, 192, 47, 138])
+  const buffer = Buffer.alloc(1000)
+  const len = layout.encode(
+    {
+      collateralAmount: args.collateralAmount,
+    },
+    buffer
+  )
+  const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
+  const ix = new TransactionInstruction({ keys, programId, data })
+  return ix
+}

package/src/instructions/withdrawProtocolFee.ts

@@ -1,6 +1,7 @@
 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 WithdrawProtocolFeeArgs {
@@ -8,14 +9,15 @@ export interface WithdrawProtocolFeeArgs {
 }
 
 export interface WithdrawProtocolFeeAccounts {
-  lendingMarketOwner: PublicKey
+  globalConfig: PublicKey
   lendingMarket: PublicKey
   reserve: PublicKey
   reserveLiquidityMint: PublicKey
   lendingMarketAuthority: PublicKey
   feeVault: PublicKey
-  lendingMarketOwnerAta: PublicKey
+  feeCollectorAta: PublicKey
   tokenProgram: PublicKey
+  instructionSysvarAccount: PublicKey
 }
 
 export const layout = borsh.struct([borsh.u64("amount")])
@@ -23,16 +25,16 @@ export const layout = borsh.struct([borsh.u64("amount")])
 export function withdrawProtocolFee(
   args: WithdrawProtocolFeeArgs,
   accounts: WithdrawProtocolFeeAccounts,
-  programId: PublicKey = PROGRAM_ID,
+  programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.lendingMarketOwner, isSigner: true, isWritable: false },
+    { pubkey: accounts.globalConfig, isSigner: false, isWritable: false },
     { pubkey: accounts.lendingMarket, isSigner: false, isWritable: false },
     { pubkey: accounts.reserve, isSigner: false, isWritable: false },
     {
       pubkey: accounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.lendingMarketAuthority,
@@ -40,12 +42,13 @@ export function withdrawProtocolFee(
       isWritable: false,
     },
     { pubkey: accounts.feeVault, isSigner: false, isWritable: true },
+    { pubkey: accounts.feeCollectorAta, isSigner: false, isWritable: true },
+    { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
     {
-      pubkey: accounts.lendingMarketOwnerAta,
+      pubkey: accounts.instructionSysvarAccount,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
-    { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([158, 201, 158, 189, 33, 93, 162, 103])
   const buffer = Buffer.alloc(1000)
@@ -53,7 +56,7 @@ export function withdrawProtocolFee(
     {
       amount: args.amount,
     },
-    buffer,
+    buffer
   )
   const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
   const ix = new TransactionInstruction({ keys, programId, data })

package/src/instructions/withdrawQueuedLiquidity.ts

@@ -0,0 +1,110 @@
+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 WithdrawQueuedLiquidityAccounts {
+  payer: PublicKey
+  lendingMarket: PublicKey
+  lendingMarketAuthority: PublicKey
+  reserve: PublicKey
+  reserveLiquidityMint: PublicKey
+  reserveCollateralMint: PublicKey
+  reserveLiquiditySupply: PublicKey
+  ownerQueuedCollateralVault: PublicKey
+  userDestinationLiquidity: PublicKey
+  collateralTokenProgram: PublicKey
+  liquidityTokenProgram: PublicKey
+  withdrawTicket: PublicKey
+  withdrawTicketOwner: PublicKey
+  associatedTokenProgram: PublicKey
+  systemProgram: PublicKey
+  progressCallbackProgram?: PublicKey | null
+  progressCallbackCustomAccount0?: PublicKey | null
+  progressCallbackCustomAccount1?: PublicKey | null
+  instructionSysvarAccount: PublicKey
+}
+
+function optionalAccountMeta(
+  pubkey: PublicKey | null | undefined,
+  isWritable: boolean,
+  programId: PublicKey
+): AccountMeta {
+  return {
+    pubkey: pubkey ?? programId,
+    isSigner: false,
+    isWritable: pubkey === null || pubkey === undefined ? false : isWritable,
+  }
+}
+
+export function withdrawQueuedLiquidity(
+  accounts: WithdrawQueuedLiquidityAccounts,
+  programId: PublicKey = PROGRAM_ID
+) {
+  const keys: Array<AccountMeta> = [
+    { pubkey: accounts.payer, isSigner: true, isWritable: true },
+    { pubkey: accounts.lendingMarket, isSigner: false, isWritable: false },
+    {
+      pubkey: accounts.lendingMarketAuthority,
+      isSigner: false,
+      isWritable: false,
+    },
+    { pubkey: accounts.reserve, isSigner: false, isWritable: true },
+    {
+      pubkey: accounts.reserveLiquidityMint,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.reserveCollateralMint,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.reserveLiquiditySupply,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.ownerQueuedCollateralVault,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.userDestinationLiquidity,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.collateralTokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.liquidityTokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    { pubkey: accounts.withdrawTicket, isSigner: false, isWritable: true },
+    { pubkey: accounts.withdrawTicketOwner, isSigner: false, isWritable: true },
+    {
+      pubkey: accounts.associatedTokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    { pubkey: accounts.systemProgram, isSigner: false, isWritable: false },
+    optionalAccountMeta(accounts.progressCallbackProgram, false, programId),
+    optionalAccountMeta(accounts.progressCallbackCustomAccount0, false, programId),
+    optionalAccountMeta(accounts.progressCallbackCustomAccount1, false, programId),
+    {
+      pubkey: accounts.instructionSysvarAccount,
+      isSigner: false,
+      isWritable: false,
+    },
+  ]
+  const identifier = Buffer.from([66, 149, 187, 201, 74, 191, 174, 120])
+  const data = identifier
+  const ix = new TransactionInstruction({ keys, programId, data })
+  return ix
+}

package/src/instructions/withdrawReferrerFees.ts

@@ -1,4 +1,7 @@
 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 WithdrawReferrerFeesAccounts {
@@ -13,7 +16,10 @@ export interface WithdrawReferrerFeesAccounts {
   tokenProgram: PublicKey
 }
 
-export function withdrawReferrerFees(accounts: WithdrawReferrerFeesAccounts, programId: PublicKey = PROGRAM_ID) {
+export function withdrawReferrerFees(
+  accounts: WithdrawReferrerFeesAccounts,
+  programId: PublicKey = PROGRAM_ID
+) {
   const keys: Array<AccountMeta> = [
     { pubkey: accounts.referrer, isSigner: true, isWritable: true },
     { pubkey: accounts.referrerTokenState, isSigner: false, isWritable: true },
@@ -21,7 +27,7 @@ export function withdrawReferrerFees(accounts: WithdrawReferrerFeesAccounts, pro
     {
       pubkey: accounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.reserveSupplyLiquidity,