@kamino-finance/klend-sdk 5.12.7-beta.0 → 5.12.8

package/src/classes/vault.ts

@@ -109,7 +109,7 @@ const TOKEN_VAULT_SEED = 'token_vault';
 const CTOKEN_VAULT_SEED = 'ctoken_vault';
 const BASE_VAULT_AUTHORITY_SEED = 'authority';
 const SHARES_SEED = 'shares';
-
+const EVENT_AUTHORITY_SEED = '__event_authority';
 export const INITIAL_DEPOSIT_LAMPORTS = 1000;
 
 /**
@@ -794,6 +794,7 @@ export class KaminoVaultClient {
     ]);
     createAtasIxns.push(createSharesAtaIxns);
 
+    const eventAuthority = getEventAuthorityPda(this._kaminoVaultProgramId);
     const depoistAccounts: DepositAccounts = {
       user: user,
       vaultState: vault.address,
@@ -806,6 +807,8 @@ export class KaminoVaultClient {
       tokenProgram: tokenProgramID,
       klendProgram: this._kaminoLendProgramId,
       sharesTokenProgram: TOKEN_PROGRAM_ID,
+      eventAuthority: eventAuthority,
+      program: this._kaminoVaultProgramId,
     };
 
     const depositArgs: DepositArgs = {
@@ -1276,6 +1279,7 @@ export class KaminoVaultClient {
   ): TransactionInstruction {
     const lendingMarketAuth = lendingMarketAuthPda(marketAddress, this._kaminoLendProgramId)[0];
 
+    const eventAuthority = getEventAuthorityPda(this._kaminoVaultProgramId);
     const withdrawAccounts: WithdrawAccounts = {
       withdrawFromAvailable: {
         user,
@@ -1289,6 +1293,8 @@ export class KaminoVaultClient {
         tokenProgram: vaultState.tokenProgram,
         sharesTokenProgram: TOKEN_PROGRAM_ID,
         klendProgram: this._kaminoLendProgramId,
+        eventAuthority: eventAuthority,
+        program: this._kaminoVaultProgramId,
       },
       withdrawFromReserveAccounts: {
         vaultState: vault.address,
@@ -1301,6 +1307,8 @@ export class KaminoVaultClient {
         reserveCollateralTokenProgram: TOKEN_PROGRAM_ID,
         instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
       },
+      eventAuthority: eventAuthority,
+      program: this._kaminoVaultProgramId,
     };
 
     const withdrawArgs: WithdrawArgs = {
@@ -1341,6 +1349,7 @@ export class KaminoVaultClient {
     userTokenAta: PublicKey,
     shareAmountLamports: Decimal
   ): Promise<TransactionInstruction> {
+    const eventAuthority = getEventAuthorityPda(this._kaminoVaultProgramId);
     const withdrawFromAvailableAccounts: WithdrawFromAvailableAccounts = {
       user,
       vaultState: vault.address,
@@ -1353,6 +1362,8 @@ export class KaminoVaultClient {
       tokenProgram: vaultState.tokenProgram,
       sharesTokenProgram: TOKEN_PROGRAM_ID,
       klendProgram: this._kaminoLendProgramId,
+      eventAuthority: eventAuthority,
+      program: this._kaminoVaultProgramId,
     };
 
     const withdrawFromAvailableArgs: WithdrawFromAvailableArgs = {
@@ -2688,6 +2699,10 @@ export function getCTokenVaultPda(vaultAddress: PublicKey, reserveAddress: Publi
   )[0];
 }
 
+export function getEventAuthorityPda(kaminoVaultProgramId: PublicKey) {
+  return PublicKey.findProgramAddressSync([Buffer.from(EVENT_AUTHORITY_SEED)], kaminoVaultProgramId)[0];
+}
+
 export type VaultHolder = {
   holderPubkey: PublicKey;
   amount: Decimal;

package/src/idl_codegen_kamino_vault/instructions/deposit.ts

@@ -20,6 +20,8 @@ export interface DepositAccounts {
   klendProgram: PublicKey
   tokenProgram: PublicKey
   sharesTokenProgram: PublicKey
+  eventAuthority: PublicKey
+  program: PublicKey
 }
 
 export const layout = borsh.struct([borsh.u64("maxAmount")])
@@ -41,6 +43,8 @@ export function deposit(
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesTokenProgram, isSigner: false, isWritable: false },
+    { pubkey: accounts.eventAuthority, isSigner: false, isWritable: false },
+    { pubkey: accounts.program, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([242, 35, 198, 137, 82, 225, 242, 182])
   const buffer = Buffer.alloc(1000)

package/src/idl_codegen_kamino_vault/instructions/withdraw.ts

@@ -21,6 +21,8 @@ export interface WithdrawAccounts {
     tokenProgram: PublicKey
     sharesTokenProgram: PublicKey
     klendProgram: PublicKey
+    eventAuthority: PublicKey
+    program: PublicKey
   }
   withdrawFromReserveAccounts: {
     vaultState: PublicKey
@@ -33,6 +35,8 @@ export interface WithdrawAccounts {
     reserveCollateralTokenProgram: PublicKey
     instructionSysvarAccount: PublicKey
   }
+  eventAuthority: PublicKey
+  program: PublicKey
 }
 
 export const layout = borsh.struct([borsh.u64("sharesAmount")])
@@ -98,6 +102,16 @@ export function withdraw(
       isSigner: false,
       isWritable: false,
     },
+    {
+      pubkey: accounts.withdrawFromAvailable.eventAuthority,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawFromAvailable.program,
+      isSigner: false,
+      isWritable: false,
+    },
     {
       pubkey: accounts.withdrawFromReserveAccounts.vaultState,
       isSigner: false,
@@ -144,6 +158,8 @@ export function withdraw(
       isSigner: false,
       isWritable: false,
     },
+    { pubkey: accounts.eventAuthority, isSigner: false, isWritable: false },
+    { pubkey: accounts.program, 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

@@ -20,6 +20,8 @@ export interface WithdrawFromAvailableAccounts {
   tokenProgram: PublicKey
   sharesTokenProgram: PublicKey
   klendProgram: PublicKey
+  eventAuthority: PublicKey
+  program: PublicKey
 }
 
 export const layout = borsh.struct([borsh.u64("sharesAmount")])
@@ -41,6 +43,8 @@ export function withdrawFromAvailable(
     { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesTokenProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
+    { pubkey: accounts.eventAuthority, isSigner: false, isWritable: false },
+    { pubkey: accounts.program, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([19, 131, 112, 155, 170, 220, 34, 57])
   const buffer = Buffer.alloc(1000)

package/src/idl_codegen_kamino_vault/types/ReserveConfig.ts

@@ -10,10 +10,15 @@ export interface ReserveConfigFields {
   assetTier: number
   /** Flat rate that goes to the host */
   hostFixedInterestRateBps: number
-  /** [DEPRECATED] Boost for side (debt or collateral) */
+  /**
+   * [DEPRECATED] Space that used to hold 2 fields:
+   * - Boost for side (debt or collateral)
+   * - Reward points multiplier per obligation type
+   * Can be re-used after making sure all underlying production account data is zeroed.
+   */
   reserved2: Array<number>
-  /** [DEPRECATED] Reward points multiplier per obligation type */
-  reserved3: Array<number>
+  /** Cut of the order execution bonus that the protocol receives, as a percentage */
+  protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
   protocolTakeRatePct: number
   /** Cut of the liquidation bonus that the protocol receives, as a percentage */
@@ -98,10 +103,15 @@ export interface ReserveConfigJSON {
   assetTier: number
   /** Flat rate that goes to the host */
   hostFixedInterestRateBps: number
-  /** [DEPRECATED] Boost for side (debt or collateral) */
+  /**
+   * [DEPRECATED] Space that used to hold 2 fields:
+   * - Boost for side (debt or collateral)
+   * - Reward points multiplier per obligation type
+   * Can be re-used after making sure all underlying production account data is zeroed.
+   */
   reserved2: Array<number>
-  /** [DEPRECATED] Reward points multiplier per obligation type */
-  reserved3: Array<number>
+  /** Cut of the order execution bonus that the protocol receives, as a percentage */
+  protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
   protocolTakeRatePct: number
   /** Cut of the liquidation bonus that the protocol receives, as a percentage */
@@ -187,10 +197,15 @@ export class ReserveConfig {
   readonly assetTier: number
   /** Flat rate that goes to the host */
   readonly hostFixedInterestRateBps: number
-  /** [DEPRECATED] Boost for side (debt or collateral) */
+  /**
+   * [DEPRECATED] Space that used to hold 2 fields:
+   * - Boost for side (debt or collateral)
+   * - Reward points multiplier per obligation type
+   * Can be re-used after making sure all underlying production account data is zeroed.
+   */
   readonly reserved2: Array<number>
-  /** [DEPRECATED] Reward points multiplier per obligation type */
-  readonly reserved3: Array<number>
+  /** Cut of the order execution bonus that the protocol receives, as a percentage */
+  readonly protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
   readonly protocolTakeRatePct: number
   /** Cut of the liquidation bonus that the protocol receives, as a percentage */
@@ -272,7 +287,7 @@ export class ReserveConfig {
     this.assetTier = fields.assetTier
     this.hostFixedInterestRateBps = fields.hostFixedInterestRateBps
     this.reserved2 = fields.reserved2
-    this.reserved3 = fields.reserved3
+    this.protocolOrderExecutionFeePct = fields.protocolOrderExecutionFeePct
     this.protocolTakeRatePct = fields.protocolTakeRatePct
     this.protocolLiquidationFeePct = fields.protocolLiquidationFeePct
     this.loanToValuePct = fields.loanToValuePct
@@ -318,8 +333,8 @@ export class ReserveConfig {
         borsh.u8("status"),
         borsh.u8("assetTier"),
         borsh.u16("hostFixedInterestRateBps"),
-        borsh.array(borsh.u8(), 2, "reserved2"),
-        borsh.array(borsh.u8(), 8, "reserved3"),
+        borsh.array(borsh.u8(), 9, "reserved2"),
+        borsh.u8("protocolOrderExecutionFeePct"),
         borsh.u8("protocolTakeRatePct"),
         borsh.u8("protocolLiquidationFeePct"),
         borsh.u8("loanToValuePct"),
@@ -361,7 +376,7 @@ export class ReserveConfig {
       assetTier: obj.assetTier,
       hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
       reserved2: obj.reserved2,
-      reserved3: obj.reserved3,
+      protocolOrderExecutionFeePct: obj.protocolOrderExecutionFeePct,
       protocolTakeRatePct: obj.protocolTakeRatePct,
       protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
       loanToValuePct: obj.loanToValuePct,
@@ -404,7 +419,7 @@ export class ReserveConfig {
       assetTier: fields.assetTier,
       hostFixedInterestRateBps: fields.hostFixedInterestRateBps,
       reserved2: fields.reserved2,
-      reserved3: fields.reserved3,
+      protocolOrderExecutionFeePct: fields.protocolOrderExecutionFeePct,
       protocolTakeRatePct: fields.protocolTakeRatePct,
       protocolLiquidationFeePct: fields.protocolLiquidationFeePct,
       loanToValuePct: fields.loanToValuePct,
@@ -449,7 +464,7 @@ export class ReserveConfig {
       assetTier: this.assetTier,
       hostFixedInterestRateBps: this.hostFixedInterestRateBps,
       reserved2: this.reserved2,
-      reserved3: this.reserved3,
+      protocolOrderExecutionFeePct: this.protocolOrderExecutionFeePct,
       protocolTakeRatePct: this.protocolTakeRatePct,
       protocolLiquidationFeePct: this.protocolLiquidationFeePct,
       loanToValuePct: this.loanToValuePct,
@@ -492,7 +507,7 @@ export class ReserveConfig {
       assetTier: obj.assetTier,
       hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
       reserved2: obj.reserved2,
-      reserved3: obj.reserved3,
+      protocolOrderExecutionFeePct: obj.protocolOrderExecutionFeePct,
       protocolTakeRatePct: obj.protocolTakeRatePct,
       protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
       loanToValuePct: obj.loanToValuePct,

package/src/idl_kamino_vault.json

@@ -180,6 +180,16 @@
           "name": "sharesTokenProgram",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "eventAuthority",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "program",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": [
@@ -249,6 +259,16 @@
               "name": "klendProgram",
               "isMut": false,
               "isSigner": false
+            },
+            {
+              "name": "eventAuthority",
+              "isMut": false,
+              "isSigner": false
+            },
+            {
+              "name": "program",
+              "isMut": false,
+              "isSigner": false
             }
           ]
         },
@@ -301,6 +321,16 @@
               "isSigner": false
             }
           ]
+        },
+        {
+          "name": "eventAuthority",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "program",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": [
@@ -722,6 +752,16 @@
           "name": "klendProgram",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "eventAuthority",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "program",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": [
@@ -1198,26 +1238,24 @@
           {
             "name": "reserved2",
             "docs": [
-              "[DEPRECATED] Boost for side (debt or collateral)"
+              "[DEPRECATED] Space that used to hold 2 fields:",
+              "- Boost for side (debt or collateral)",
+              "- Reward points multiplier per obligation type",
+              "Can be re-used after making sure all underlying production account data is zeroed."
             ],
             "type": {
               "array": [
                 "u8",
-                2
+                9
               ]
             }
           },
           {
-            "name": "reserved3",
+            "name": "protocolOrderExecutionFeePct",
             "docs": [
-              "[DEPRECATED] Reward points multiplier per obligation type"
+              "Cut of the order execution bonus that the protocol receives, as a percentage"
             ],
-            "type": {
-              "array": [
-                "u8",
-                8
-              ]
-            }
+            "type": "u8"
           },
           {
             "name": "protocolTakeRatePct",
@@ -1982,6 +2020,78 @@
       }
     }
   ],
+  "events": [
+    {
+      "name": "DepositResultEvent",
+      "fields": [
+        {
+          "name": "sharesToMint",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "tokenToDeposit",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "crankFundsToDeposit",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "DepositUserAtaBalanceEvent",
+      "fields": [
+        {
+          "name": "userAtaBalance",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "SharesToWithdrawEvent",
+      "fields": [
+        {
+          "name": "sharesAmount",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "userSharesBefore",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "WithdrawResultEvent",
+      "fields": [
+        {
+          "name": "sharesToBurn",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "availableToSendToUser",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "investedToDisinvestCtokens",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "investedLiquidityToSendToUser",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    }
+  ],
   "errors": [
     {
       "code": 7000,

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -16,7 +16,7 @@ import {
   removeBudgetAndAtaIxns,
   ScopePriceRefreshConfig,
   U64_MAX,
-  uniqueAccounts,
+  uniqueAccountsWithProgramIds,
 } from '../utils';
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
@@ -147,7 +147,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     inputAmountLamports,
     useV2Ixs
   );
-  const uniqueKlendAccounts = uniqueAccounts(klendIxs.instructions);
+  const uniqueKlendAccounts = uniqueAccountsWithProgramIds(klendIxs.instructions);
 
   const swapQuoteInputs: SwapInputs = {
     inputAmountLamports,

package/src/lending_operations/swap_collateral_operations.ts

@@ -21,7 +21,7 @@ import {
   PublicKeySet,
   ScopePriceRefreshConfig,
   U64_MAX,
-  uniqueAccounts,
+  uniqueAccountsWithProgramIds,
 } from '../utils';
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
@@ -162,7 +162,7 @@ export async function getSwapCollIxns<QuoteResponse>(
 
   // Construct the Klend's own ixns with a fake swap-out (only to learn the klend accounts used):
   const fakeKlendIxns = await getKlendIxns(args, FAKE_TARGET_COLL_SWAP_OUT_AMOUNT, context);
-  const klendAccounts = uniqueAccounts(listIxns(fakeKlendIxns));
+  const klendAccounts = uniqueAccountsWithProgramIds(listIxns(fakeKlendIxns));
 
   // Construct the external swap ixns (and learn the actual swap-out amount):
   const externalSwapIxns = await getExternalSwapIxns(args, klendAccounts, context);

package/src/leverage/operations.ts

@@ -27,7 +27,7 @@ import {
   getTransferWsolIxns,
   getLookupTableAccount,
   removeBudgetAndAtaIxns,
-  uniqueAccounts,
+  uniqueAccountsWithProgramIds,
 } from '../utils';
 import {
   adjustDepositLeverageCalcs,
@@ -163,7 +163,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
     elevationGroupOverride
   );
 
-  const uniqueKlendAccounts = uniqueAccounts(klendIxs.instructions);
+  const uniqueKlendAccounts = uniqueAccountsWithProgramIds(klendIxs.instructions);
 
   const swapInputAmount = toLamports(
     !collIsKtoken ? calcs.swapDebtTokenIn : calcs.singleSidedDepositKtokenOnly,
@@ -677,7 +677,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
     useV2Ixs
   );
 
-  const uniqueKlendAccounts = uniqueAccounts(klendIxs.instructions);
+  const uniqueKlendAccounts = uniqueAccountsWithProgramIds(klendIxs.instructions);
 
   const swapInputAmount = toLamports(
     calcs.collTokenSwapIn,
@@ -1104,7 +1104,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       useV2Ixs
     );
 
-    const uniqueKlendAccounts = uniqueAccounts(klendIxs.instructions);
+    const uniqueKlendAccounts = uniqueAccountsWithProgramIds(klendIxs.instructions);
 
     const swapInputAmount = toLamports(
       !collIsKtoken ? calcs.borrowAmount : calcs.amountToFlashBorrowDebt,
@@ -1209,7 +1209,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       useV2Ixs
     );
 
-    const uniqueKlendAccounts = uniqueAccounts(klendIxs.instructions);
+    const uniqueKlendAccounts = uniqueAccountsWithProgramIds(klendIxs.instructions);
 
     const swapInputAmount = toLamports(
       calcs.withdrawAmountWithSlippageAndFlashLoanFee,

package/src/utils/instruction.ts

@@ -260,7 +260,7 @@ export function notEmpty<TValue>(value: TValue | null | undefined): value is TVa
   return true;
 }
 
-export function uniqueAccounts(
+export function uniqueAccountsWithProgramIds(
   ixs: TransactionInstruction[],
   addressLookupTables: PublicKey[] | AddressLookupTableAccount[] = []
 ): Array<PublicKey> {
@@ -273,6 +273,7 @@ export function uniqueAccounts(
 
   const uniqueAccounts = new PublicKeySet<PublicKey>(luts);
   ixs.forEach((ixn) => {
+    uniqueAccounts.add(ixn.programId);
     ixn.keys.forEach((key) => {
       uniqueAccounts.add(key.pubkey);
     });