@kamino-finance/klend-sdk 5.13.20 → 5.13.21-beta.0

package/src/classes/utils.ts

@@ -287,6 +287,18 @@ export function orThrow(message: string): never {
   throw new Error(message);
 }
 
+export function blobEquals(left: Uint8Array, right: Uint8Array): boolean {
+  if (left.length !== right.length) {
+    return false;
+  }
+  for (let i = 0; i < left.length; ++i) {
+    if (left[i] !== right[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * Returns an integer {@link Decimal} nearest to the given one.
  *

package/src/classes/vault.ts

@@ -966,9 +966,7 @@ export class KaminoVaultClient {
     };
 
     const depositArgs: DepositArgs = {
-      maxAmount: new BN(
-        numberToLamportsDecimal(tokenAmount, vaultState.tokenMintDecimals.toNumber()).floor().toString()
-      ),
+      maxAmount: new BN(numberToLamportsDecimal(tokenAmount, vaultState.tokenMintDecimals.toNumber()).toString()),
     };
 
     const depositIx = deposit(depositArgs, depoistAccounts, this._kaminoVaultProgramId);
@@ -1086,7 +1084,7 @@ export class KaminoVaultClient {
     );
 
     if (vaultAllocation) {
-      const withdrawFromVaultIxs = await this.withdrawWithReserveIxs(
+      const withdrawFromVaultIxs = await this.wihdrdrawWithReserveIxs(
         user,
         kaminoVault,
         shareAmount,
@@ -1131,7 +1129,7 @@ export class KaminoVaultClient {
     return [createAtaIx, withdrawFromAvailableIxn];
   }
 
-  private async withdrawWithReserveIxs(
+  private async wihdrdrawWithReserveIxs(
     user: PublicKey,
     vault: KaminoVault,
     shareAmount: Decimal,
@@ -1141,6 +1139,7 @@ export class KaminoVaultClient {
     const vaultState = await vault.getState(this.getConnection());
 
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
+
     const userSharesAta = getAssociatedTokenAddress(vaultState.sharesMint, user);
     const [{ ata: userTokenAta, createAtaIx }] = createAtasIdempotent(user, [
       {
@@ -1163,12 +1162,9 @@ export class KaminoVaultClient {
     let isFirstWithdraw = true;
 
     if (tokenLeftToWithdraw.lte(0)) {
-      // Availabe enough to withdraw all - using the first existent reserve
-      const firstReserve = vaultState.vaultAllocationStrategy.find(
-        (reserve) => !reserve.reserve.equals(PublicKey.default)
-      );
+      // Availabe enough to withdraw all - using first reserve as it does not matter
       reserveWithSharesAmountToWithdraw.push({
-        reserve: firstReserve!.reserve,
+        reserve: vaultState.vaultAllocationStrategy[0].reserve,
         shares: shareLamportsToWithdraw,
       });
     } else {
@@ -1201,6 +1197,7 @@ export class KaminoVaultClient {
 
     const withdrawIxs: TransactionInstruction[] = [];
     withdrawIxs.push(createAtaIx);
+
     for (let reserveIndex = 0; reserveIndex < reserveWithSharesAmountToWithdraw.length; reserveIndex++) {
       const reserveWithTokens = reserveWithSharesAmountToWithdraw[reserveIndex];
       const reserveState = vaultReservesState.get(reserveWithTokens.reserve);

package/src/client_kamino_manager.ts

@@ -8,15 +8,20 @@ import {
   Signer,
   Transaction,
   TransactionInstruction,
+  TransactionMessage,
   TransactionSignature,
   VersionedTransaction,
 } from '@solana/web3.js';
 import {
   AssetReserveConfigCli,
   Chain,
+  createLookupTableIx,
   DEFAULT_RECENT_SLOT_DURATION_MS,
   encodeTokenName,
+  extendLookupTableIxs,
+  getLookupTableAccounts,
   getMedianSlotDurationInMsFromLastEpochs,
+  globalConfigPda,
   initLookupTableIx,
   KaminoManager,
   KaminoMarket,
@@ -27,6 +32,7 @@ import {
   MAINNET_BETA_CHAIN_ID,
   parseZeroPaddedUtf8,
   printHoldings,
+  PROGRAM_ID,
   Reserve,
   ReserveAllocationConfig,
   ReserveWithAddress,
@@ -153,7 +159,10 @@ async function main() {
 
       const _createReserveSig = await processTxn(env.client, env.payer, txnIxs[0], mode, 2500, [reserve]);
 
-      const _updateReserveSig = await processTxn(env.client, env.payer, txnIxs[1], mode, 2500, [], 400_000);
+      const [lut, createLutIxs] = await createUpdateReserveConfigLutIxs(env, marketAddress, reserve.publicKey);
+      await processTxn(env.client, env.payer, createLutIxs, mode, 2500, []);
+
+      const _updateSig = await processTxn(env.client, env.payer, txnIxs[1], mode, 2500, [], 400_000, 1000, [lut]);
 
       mode === 'execute' &&
         console.log(
@@ -609,21 +618,13 @@ async function main() {
       const acceptVaultOwnershipSig = await processTxn(
         env.client,
         env.payer,
-        [instructions.acceptVaultOwnershipIx],
+        [instructions.acceptVaultOwnershipIx, ...instructions.updateLUTIxs],
         mode,
         2500,
         []
       );
 
       mode === 'execute' && console.log('Vault ownership accepted:', acceptVaultOwnershipSig);
-
-      // send the LUT mgmt ixs one by one
-      const lutIxs = [...instructions.updateLUTIxs];
-      for (let i = 0; i < lutIxs.length; i++) {
-        const lutIxsGroup = lutIxs.slice(i, i + 1);
-        const lutIxsSig = await processTxn(env.client, env.payer, lutIxsGroup, mode, 2500, []);
-        mode === 'execute' && console.log('LUT updated:', lutIxsSig);
-      }
     });
 
   commands
@@ -1076,11 +1077,7 @@ async function main() {
       const walletAddress = new PublicKey(wallet);
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const userShares = await kaminoManager.getUserSharesBalanceSingleVault(walletAddress, kaminoVault);
-      console.log(
-        `User shares for vault ${vaultAddress.toBase58()}: unstaked shares: ${
-          userShares.unstakedShares
-        } staked shares: ${userShares.stakedShares} total shares: ${userShares.totalShares}`
-      );
+      console.log(`User shares for vault ${vaultAddress.toBase58()}: ${userShares}`);
     });
 
   commands
@@ -1604,45 +1601,46 @@ async function processTxn(
   priorityFeeMultiplier: number = 2500,
   extraSigners: Signer[],
   computeUnits: number = 200_000,
-  priorityFeeLamports: number = 1000
+  priorityFeeLamports: number = 1000,
+  luts: PublicKey[] = []
 ): Promise<TransactionSignature> {
   if (mode !== 'inspect' && mode !== 'simulate' && mode !== 'execute' && mode !== 'multisig') {
     throw new Error('Invalid mode: ' + mode + '. Must be one of: inspect/simulate/execute/multisig');
   }
   if (mode === 'multisig') {
     const { blockhash } = await web3Client.connection.getLatestBlockhash();
-    for (const ix of ixs) {
-      const txn = new Transaction();
-      txn.add(ix);
-      txn.recentBlockhash = blockhash;
-      txn.feePayer = admin.publicKey;
+    const txn = new Transaction();
+    txn.add(...ixs);
+    txn.recentBlockhash = blockhash;
+    txn.feePayer = admin.publicKey;
 
-      console.log(`${binary_to_base58(txn.serializeMessage())} \n`);
-    }
+    console.log(binary_to_base58(txn.serializeMessage()));
 
     return '';
   } else {
     const microLamport = priorityFeeLamports * 10 ** 6; // 1000 lamports
     const microLamportsPrioritizationFee = microLamport / computeUnits;
-
-    const tx = new Transaction();
     const { blockhash } = await web3Client.connection.getLatestBlockhash();
+
     if (priorityFeeMultiplier) {
       const priorityFeeIxn = createAddExtraComputeUnitFeeTransaction(
         computeUnits,
         microLamportsPrioritizationFee * priorityFeeMultiplier
       );
-      tx.add(...priorityFeeIxn);
+      ixs.push(...priorityFeeIxn);
     }
-    tx.recentBlockhash = blockhash;
-    tx.feePayer = admin.publicKey;
-    tx.add(...ixs);
+
+    const tx = new TransactionMessage({
+      payerKey: admin.publicKey,
+      recentBlockhash: blockhash,
+      instructions: ixs,
+    }).compileToV0Message(await getLookupTableAccounts(web3Client.connection, luts));
 
     if (mode === 'execute') {
       return await signSendAndConfirmRawTransactionWithRetry({
         mainConnection: web3Client.sendConnection,
         extraConnections: [],
-        tx: new VersionedTransaction(tx.compileMessage()),
+        tx: new VersionedTransaction(tx),
         signers: [admin, ...extraSigners],
         commitment: 'confirmed',
         sendTransactionOptions: {
@@ -1651,9 +1649,7 @@ async function processTxn(
         },
       });
     } else if (mode === 'simulate') {
-      const simulation = await web3Client.sendConnection.simulateTransaction(
-        new VersionedTransaction(tx.compileMessage())
-      );
+      const simulation = await web3Client.sendConnection.simulateTransaction(new VersionedTransaction(tx));
       if (simulation.value.logs && simulation.value.logs.length > 0) {
         console.log('Simulation: \n' + simulation.value.logs);
       } else {
@@ -1663,7 +1659,7 @@ async function processTxn(
       console.log(
         'Tx in B64',
         `https://explorer.solana.com/tx/inspector?message=${encodeURIComponent(
-          tx.serializeMessage().toString('base64')
+          Buffer.from(tx.serialize()).toString('base64')
         )}`
       );
     }
@@ -1861,3 +1857,15 @@ function parseReserveConfigToFile(reserveConfig: ReserveConfig) {
     reserved2: Array(9).fill(0),
   };
 }
+
+async function createUpdateReserveConfigLutIxs(
+  env: Env,
+  lendingMarketAddress: PublicKey,
+  reserveAddress: PublicKey
+): Promise<[PublicKey, TransactionInstruction[]]> {
+  const [globalConfigAddress] = globalConfigPda(PROGRAM_ID);
+  const contents = [globalConfigAddress, lendingMarketAddress, reserveAddress];
+  const [createIx, lut] = await createLookupTableIx(env.connection, env.payer.publicKey);
+  const extendIxs = extendLookupTableIxs(env.payer.publicKey, lut, contents);
+  return [lut, [createIx, ...extendIxs]];
+}

package/src/idl.json

@@ -230,10 +230,15 @@
       "name": "updateReserveConfig",
       "accounts": [
         {
-          "name": "lendingMarketOwner",
+          "name": "signer",
           "isMut": false,
           "isSigner": true
         },
+        {
+          "name": "globalConfig",
+          "isMut": false,
+          "isSigner": false
+        },
         {
           "name": "lendingMarket",
           "isMut": false,
@@ -248,7 +253,9 @@
       "args": [
         {
           "name": "mode",
-          "type": "u64"
+          "type": {
+            "defined": "UpdateConfigMode"
+          }
         },
         {
           "name": "value",
@@ -305,9 +312,9 @@
       "name": "withdrawProtocolFee",
       "accounts": [
         {
-          "name": "lendingMarketOwner",
+          "name": "globalConfig",
           "isMut": false,
-          "isSigner": true
+          "isSigner": false
         },
         {
           "name": "lendingMarket",
@@ -335,7 +342,7 @@
           "isSigner": false
         },
         {
-          "name": "lendingMarketOwnerAta",
+          "name": "feeCollectorAta",
           "isMut": true,
           "isSigner": false
         },
@@ -2932,14 +2939,93 @@
         }
       ]
     },
+    {
+      "name": "initGlobalConfig",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "globalConfig",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "programData",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "rent",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "updateGlobalConfig",
+      "accounts": [
+        {
+          "name": "globalAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "globalConfig",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "mode",
+          "type": {
+            "defined": "UpdateGlobalConfigMode"
+          }
+        },
+        {
+          "name": "value",
+          "type": "bytes"
+        }
+      ]
+    },
+    {
+      "name": "updateGlobalConfigAdmin",
+      "accounts": [
+        {
+          "name": "pendingAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "globalConfig",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "idlMissingTypes",
       "accounts": [
         {
-          "name": "lendingMarketOwner",
+          "name": "signer",
           "isMut": false,
           "isSigner": true
         },
+        {
+          "name": "globalConfig",
+          "isMut": false,
+          "isSigner": false
+        },
         {
           "name": "lendingMarket",
           "isMut": false,
@@ -3134,6 +3220,47 @@
         ]
       }
     },
+    {
+      "name": "GlobalConfig",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "globalAdmin",
+            "docs": [
+              "Global admin of the program"
+            ],
+            "type": "publicKey"
+          },
+          {
+            "name": "pendingAdmin",
+            "docs": [
+              "Pending admin must sign a specific transaction to become the global admin"
+            ],
+            "type": "publicKey"
+          },
+          {
+            "name": "feeCollector",
+            "docs": [
+              "Fee collector is the only allowed owner of token accounts receiving protocol fees"
+            ],
+            "type": "publicKey"
+          },
+          {
+            "name": "padding",
+            "docs": [
+              "Padding to make the struct size 1024 bytes"
+            ],
+            "type": {
+              "array": [
+                "u8",
+                928
+              ]
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "LendingMarket",
       "type": {
@@ -3353,18 +3480,33 @@
             "type": "u64"
           },
           {
-            "name": "obligationOrdersEnabled",
+            "name": "obligationOrderExecutionEnabled",
             "docs": [
               "Whether the obligation orders should be evaluated during liquidations."
             ],
             "type": "u8"
           },
+          {
+            "name": "immutable",
+            "docs": [
+              "Whether the lending market is set as immutable."
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "obligationOrderCreationEnabled",
+            "docs": [
+              "Whether new obligation orders can be created.",
+              "Note: updating or cancelling existing orders is *not* affected by this flag."
+            ],
+            "type": "u8"
+          },
           {
             "name": "padding2",
             "type": {
               "array": [
                 "u8",
-                7
+                5
               ]
             }
           },
@@ -4186,7 +4328,27 @@
             "name": "UpdateInitialDepositAmount"
           },
           {
-            "name": "UpdateObligationOrdersEnabled"
+            "name": "UpdateObligationOrderExecutionEnabled"
+          },
+          {
+            "name": "UpdateImmutableFlag"
+          },
+          {
+            "name": "UpdateObligationOrderCreationEnabled"
+          }
+        ]
+      }
+    },
+    {
+      "name": "UpdateGlobalConfigMode",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "PendingAdmin"
+          },
+          {
+            "name": "FeeCollector"
           }
         ]
       }
@@ -6032,6 +6194,21 @@
       "code": 6126,
       "name": "OperationNotPermittedWithCurrentObligationOrders",
       "msg": "Single debt, single collateral obligation orders have to be cancelled before changing the deposit/borrow count"
+    },
+    {
+      "code": 6127,
+      "name": "OperationNotPermittedMarketImmutable",
+      "msg": "Cannot update lending market because it is set as immutable"
+    },
+    {
+      "code": 6128,
+      "name": "OrderCreationDisabled",
+      "msg": "Creation of new orders is disabled"
+    },
+    {
+      "code": 6129,
+      "name": "NoUpgradeAuthority",
+      "msg": "Cannot initialize global config because there is no upgrade authority to the program"
     }
   ]
 }

package/src/idl_codegen/accounts/GlobalConfig.ts

@@ -0,0 +1,125 @@
+import { PublicKey, Connection } from "@solana/web3.js"
+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 GlobalConfigFields {
+  /** Global admin of the program */
+  globalAdmin: PublicKey
+  /** Pending admin must sign a specific transaction to become the global admin */
+  pendingAdmin: PublicKey
+  /** Fee collector is the only allowed owner of token accounts receiving protocol fees */
+  feeCollector: PublicKey
+  /** Padding to make the struct size 1024 bytes */
+  padding: Array<number>
+}
+
+export interface GlobalConfigJSON {
+  /** Global admin of the program */
+  globalAdmin: string
+  /** Pending admin must sign a specific transaction to become the global admin */
+  pendingAdmin: string
+  /** Fee collector is the only allowed owner of token accounts receiving protocol fees */
+  feeCollector: string
+  /** Padding to make the struct size 1024 bytes */
+  padding: Array<number>
+}
+
+export class GlobalConfig {
+  /** Global admin of the program */
+  readonly globalAdmin: PublicKey
+  /** Pending admin must sign a specific transaction to become the global admin */
+  readonly pendingAdmin: PublicKey
+  /** Fee collector is the only allowed owner of token accounts receiving protocol fees */
+  readonly feeCollector: PublicKey
+  /** Padding to make the struct size 1024 bytes */
+  readonly padding: Array<number>
+
+  static readonly discriminator = Buffer.from([
+    149, 8, 156, 202, 160, 252, 176, 217,
+  ])
+
+  static readonly layout = borsh.struct([
+    borsh.publicKey("globalAdmin"),
+    borsh.publicKey("pendingAdmin"),
+    borsh.publicKey("feeCollector"),
+    borsh.array(borsh.u8(), 928, "padding"),
+  ])
+
+  constructor(fields: GlobalConfigFields) {
+    this.globalAdmin = fields.globalAdmin
+    this.pendingAdmin = fields.pendingAdmin
+    this.feeCollector = fields.feeCollector
+    this.padding = fields.padding
+  }
+
+  static async fetch(
+    c: Connection,
+    address: PublicKey,
+    programId: PublicKey = PROGRAM_ID
+  ): Promise<GlobalConfig | null> {
+    const info = await c.getAccountInfo(address)
+
+    if (info === null) {
+      return null
+    }
+    if (!info.owner.equals(programId)) {
+      throw new Error("account doesn't belong to this program")
+    }
+
+    return this.decode(info.data)
+  }
+
+  static async fetchMultiple(
+    c: Connection,
+    addresses: PublicKey[],
+    programId: PublicKey = PROGRAM_ID
+  ): Promise<Array<GlobalConfig | null>> {
+    const infos = await c.getMultipleAccountsInfo(addresses)
+
+    return infos.map((info) => {
+      if (info === null) {
+        return null
+      }
+      if (!info.owner.equals(programId)) {
+        throw new Error("account doesn't belong to this program")
+      }
+
+      return this.decode(info.data)
+    })
+  }
+
+  static decode(data: Buffer): GlobalConfig {
+    if (!data.slice(0, 8).equals(GlobalConfig.discriminator)) {
+      throw new Error("invalid account discriminator")
+    }
+
+    const dec = GlobalConfig.layout.decode(data.slice(8))
+
+    return new GlobalConfig({
+      globalAdmin: dec.globalAdmin,
+      pendingAdmin: dec.pendingAdmin,
+      feeCollector: dec.feeCollector,
+      padding: dec.padding,
+    })
+  }
+
+  toJSON(): GlobalConfigJSON {
+    return {
+      globalAdmin: this.globalAdmin.toString(),
+      pendingAdmin: this.pendingAdmin.toString(),
+      feeCollector: this.feeCollector.toString(),
+      padding: this.padding,
+    }
+  }
+
+  static fromJSON(obj: GlobalConfigJSON): GlobalConfig {
+    return new GlobalConfig({
+      globalAdmin: new PublicKey(obj.globalAdmin),
+      pendingAdmin: new PublicKey(obj.pendingAdmin),
+      feeCollector: new PublicKey(obj.feeCollector),
+      padding: obj.padding,
+    })
+  }
+}