@kamino-finance/klend-sdk 5.13.1 → 5.13.4

package/src/client_kamino_manager.ts

@@ -26,6 +26,7 @@ import {
   LendingMarket,
   MAINNET_BETA_CHAIN_ID,
   parseZeroPaddedUtf8,
+  printHoldings,
   Reserve,
   ReserveAllocationConfig,
   ReserveWithAddress,
@@ -57,7 +58,6 @@ import {
   PerformanceFeeBps,
 } from './idl_codegen_kamino_vault/types/VaultConfigField';
 import { getAccountOwner } from './utils/rpc';
-import { printHoldings } from './classes/types_utils';
 import { getAssociatedTokenAddressSync } from '@solana/spl-token';
 
 dotenv.config({
@@ -93,11 +93,11 @@ async function main() {
         env.kVaultProgramId
       );
 
-      const { market: marketKp, ixns: createMarketIxns } = await kaminoManager.createMarketIxs({
+      const { market: marketKp, ixs: createMarketIxs } = await kaminoManager.createMarketIxs({
         admin: mode === 'multisig' ? multisigPk : env.payer.publicKey,
       });
 
-      await processTxn(env.client, env.payer, createMarketIxns, mode, 2500, [marketKp]);
+      await processTxn(env.client, env.payer, createMarketIxs, mode, 2500, [marketKp]);
 
       mode === 'execute' && console.log('Market created:', marketKp.publicKey.toBase58());
     });
@@ -142,7 +142,7 @@ async function main() {
           ? getAssociatedTokenAddressSync(tokenMint, multisigPk)
           : getAssociatedTokenAddressSync(tokenMint, env.payer.publicKey);
 
-      const { reserve, txnIxns } = await kaminoManager.addAssetToMarketIxs({
+      const { reserve, txnIxs } = await kaminoManager.addAssetToMarketIxs({
         admin: mode === 'multisig' ? multisigPk : env.payer.publicKey,
         adminLiquiditySource: adminAta,
         marketAddress: marketAddress,
@@ -151,9 +151,9 @@ async function main() {
 
       console.log('reserve: ', reserve.publicKey);
 
-      const _createReserveSig = await processTxn(env.client, env.payer, txnIxns[0], mode, 2500, [reserve]);
+      const _createReserveSig = await processTxn(env.client, env.payer, txnIxs[0], mode, 2500, [reserve]);
 
-      const _updateReserveSig = await processTxn(env.client, env.payer, txnIxns[1], mode, 2500, [], 400_000);
+      const _updateReserveSig = await processTxn(env.client, env.payer, txnIxs[1], mode, 2500, [], 400_000);
 
       mode === 'execute' &&
         console.log(
@@ -207,7 +207,7 @@ async function main() {
 
       const reserveConfig = parseReserveConfigFromFile(reserveConfigFromFile);
 
-      const ixns = await kaminoManager.updateReserveIxs(
+      const ixs = await kaminoManager.updateReserveIxs(
         marketWithAddress,
         reserveAddress,
         reserveConfig,
@@ -215,7 +215,7 @@ async function main() {
         updateEntireConfig
       );
 
-      const _updateReserveSig = await processTxn(env.client, env.payer, ixns, mode, 2500, [], 400_000);
+      const _updateReserveSig = await processTxn(env.client, env.payer, ixs, mode, 2500, [], 400_000);
 
       mode === 'execute' && console.log('Reserve Updated with config -> ', JSON.parse(JSON.stringify(reserveConfig)));
     });
@@ -252,10 +252,12 @@ async function main() {
       `--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(`--name`, 'The onchain name of the strat')
+    .requiredOption('--name <string>', 'The onchain name of the strat')
+    .requiredOption('--tokenName <string>', 'The name of the token in the vault')
+    .requiredOption('--extraTokenName <string>', 'The extra string appended to the token symbol')
     .option(`--staging`, 'If true, will use the staging programs')
     .option(`--multisig <string>`, 'If using multisig mode this is required, otherwise will be ignored')
-    .action(async ({ mint, mode, name, staging, multisig }) => {
+    .action(async ({ mint, mode, name, tokenName, extraTokenName, staging, multisig }) => {
       const env = initializeClient(mode === 'multisig', staging);
       const tokenMint = new PublicKey(mint);
 
@@ -279,6 +281,8 @@ async function main() {
         performanceFeeRatePercentage: new Decimal(0.0),
         managementFeeRatePercentage: new Decimal(0.0),
         name,
+        vaultTokenSymbol: tokenName,
+        vaultTokenName: extraTokenName,
       });
 
       const { vault: vaultKp, initVaultIxs: instructions } = await kaminoManager.createVaultIxs(kaminoVaultConfig);
@@ -294,9 +298,37 @@ async function main() {
       await sleep(2000);
       const _populateLUTSig = await processTxn(env.client, env.payer, instructions.populateLUTIxs, mode, 2500, []);
 
+      const _setSharesMetadataSig = await processTxn(
+        env.client,
+        env.payer,
+        [instructions.initSharesMetadataIx],
+        mode,
+        2500,
+        []
+      );
       mode === 'execute' && console.log('Vault created:', vaultKp.publicKey.toBase58());
     });
 
+  commands
+    .command('set-shares-metadata')
+    .requiredOption('--vault <string>', 'Vault address')
+    .requiredOption('--symbol <string>', 'The symbol of the kVault token')
+    .requiredOption('--extraName <string>', 'The name of the kVault token, appended to the symbol')
+    .action(async ({ vault, symbol, extraName }) => {
+      const env = initializeClient(false, false);
+      const kVault = new KaminoVault(new PublicKey(vault));
+
+      const kaminoManager = new KaminoManager(
+        env.connection,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        env.kLendProgramId,
+        env.kVaultProgramId
+      );
+      const ix = await kaminoManager.getSetSharesMetadataIx(kVault, symbol, extraName);
+
+      await processTxn(env.client, env.payer, [ix], 'execute', 2500, []);
+    });
+
   commands
     .command('update-vault-pending-admin')
     .requiredOption('--vault <string>', 'Vault address')
@@ -1242,11 +1274,11 @@ async function main() {
 
       const newLendingMarket = LendingMarket.fromJSON(JSON.parse(fs.readFileSync(lendingMarketConfigPath, 'utf8')));
 
-      const ixns = kaminoManager.updateLendingMarketIxs(marketWithAddress, newLendingMarket);
+      const ixs = kaminoManager.updateLendingMarketIxs(marketWithAddress, newLendingMarket);
 
-      // executing 6 ixns in a txn to make sure they fit
-      for (let ixnIndex = 0; ixnIndex < ixns.length; ixnIndex += 6) {
-        const ixnToExecute = ixns.slice(ixnIndex, ixnIndex + 6);
+      // executing 6 ixs in a txn to make sure they fit
+      for (let ixnIndex = 0; ixnIndex < ixs.length; ixnIndex += 6) {
+        const ixnToExecute = ixs.slice(ixnIndex, ixnIndex + 6);
         const _updateLendingMarketSig = await processTxn(env.client, env.payer, ixnToExecute, mode, 2500, [], 400_000);
       }
 
@@ -1285,9 +1317,9 @@ async function main() {
         env.kVaultProgramId
       );
 
-      const ixn = kaminoManager.updateLendingMarketOwnerIxs(marketWithAddress);
+      const ix = kaminoManager.updateLendingMarketOwnerIxs(marketWithAddress);
 
-      const _updateLendingMarketSig = await processTxn(env.client, env.payer, [ixn], mode, 2500, [], 400_000);
+      const _updateLendingMarketSig = await processTxn(env.client, env.payer, [ix], mode, 2500, [], 400_000);
 
       mode === 'execute' &&
         console.log(
@@ -1340,9 +1372,9 @@ async function main() {
         name: newNameEncoded,
       };
 
-      const ixns = kaminoManager.updateLendingMarketIxs(marketWithAddress, newLendingMarket);
+      const ixs = kaminoManager.updateLendingMarketIxs(marketWithAddress, newLendingMarket);
 
-      const _updateLendingMarketSig = await processTxn(env.client, env.payer, ixns, mode, 2500, [], 400_000);
+      const _updateLendingMarketSig = await processTxn(env.client, env.payer, ixs, mode, 2500, [], 400_000);
 
       mode === 'execute' &&
         console.log(
@@ -1395,9 +1427,9 @@ async function main() {
       };
       const newReserveConfig: ReserveConfig = new ReserveConfig(newReserveConfigFields);
 
-      const ixns = await kaminoManager.updateReserveIxs(marketWithAddress, reserveAddress, newReserveConfig);
+      const ixs = await kaminoManager.updateReserveIxs(marketWithAddress, reserveAddress, newReserveConfig);
 
-      const _updateLendingMarketSig = await processTxn(env.client, env.payer, ixns, mode, 2500, [], 400_000);
+      const _updateLendingMarketSig = await processTxn(env.client, env.payer, ixs, mode, 2500, [], 400_000);
 
       mode === 'execute' &&
         console.log(
@@ -1486,7 +1518,7 @@ export type Env = {
 async function processTxn(
   web3Client: Web3Client,
   admin: Keypair,
-  ixns: TransactionInstruction[],
+  ixs: TransactionInstruction[],
   mode: string,
   priorityFeeMultiplier: number = 2500,
   extraSigners: Signer[],
@@ -1499,7 +1531,7 @@ async function processTxn(
   if (mode === 'multisig') {
     const { blockhash } = await web3Client.connection.getLatestBlockhash();
     const txn = new Transaction();
-    txn.add(...ixns);
+    txn.add(...ixs);
     txn.recentBlockhash = blockhash;
     txn.feePayer = admin.publicKey;
 
@@ -1521,7 +1553,7 @@ async function processTxn(
     }
     tx.recentBlockhash = blockhash;
     tx.feePayer = admin.publicKey;
-    tx.add(...ixns);
+    tx.add(...ixs);
 
     if (mode === 'execute') {
       return await signSendAndConfirmRawTransactionWithRetry({
@@ -1557,10 +1589,10 @@ async function processTxn(
 }
 
 function createAddExtraComputeUnitFeeTransaction(units: number, microLamports: number): TransactionInstruction[] {
-  const ixns: TransactionInstruction[] = [];
-  ixns.push(ComputeBudgetProgram.setComputeUnitLimit({ units }));
-  ixns.push(ComputeBudgetProgram.setComputeUnitPrice({ microLamports: new Decimal(microLamports).floor().toNumber() }));
-  return ixns;
+  const ixs: TransactionInstruction[] = [];
+  ixs.push(ComputeBudgetProgram.setComputeUnitLimit({ units }));
+  ixs.push(ComputeBudgetProgram.setComputeUnitPrice({ microLamports: new Decimal(microLamports).floor().toNumber() }));
+  return ixs;
 }
 
 function parseReserveConfigFromFile(reserveConfigFromFile: any): ReserveConfig {

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -7,13 +7,13 @@ import {
   SwapIxsProvider,
   SwapQuoteProvider,
   getScopeRefreshIx,
-  LeverageIxnsOutput,
+  LeverageIxsOutput,
   FlashLoanInfo,
 } from '../leverage';
 import {
   createAtasIdempotent,
-  getComputeBudgetAndPriorityFeeIxns,
-  removeBudgetAndAtaIxns,
+  getComputeBudgetAndPriorityFeeIxs,
+  removeBudgetAndAtaIxs,
   ScopePriceRefreshConfig,
   U64_MAX,
   uniqueAccountsWithProgramIds,
@@ -128,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: LeverageIxnsOutput = await buildRepayWithCollateralIxs(
+  const klendIxs: LeverageIxsOutput = await buildRepayWithCollateralIxs(
     kaminoMarket,
     debtReserve,
     collReserve,
@@ -256,7 +256,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   );
 
   const swapResponse = await swapper(swapInputs, initialInputs.klendAccounts, swapQuote);
-  const ixs: LeverageIxnsOutput = await buildRepayWithCollateralIxs(
+  const ixs: LeverageIxsOutput = await buildRepayWithCollateralIxs(
     kaminoMarket,
     debtReserve,
     collReserve,
@@ -295,9 +295,9 @@ async function buildRepayWithCollateralIxs(
   debtRepayAmountLamports: Decimal,
   collWithdrawLamports: Decimal,
   useV2Ixs: boolean
-): Promise<LeverageIxnsOutput> {
+): Promise<LeverageIxsOutput> {
   // 1. Create atas & budget txns
-  const budgetIxns = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxns(1_400_000);
+  const budgetIxs = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxs(1_400_000);
 
   const atas = [
     { mint: collReserve.getLiquidityMint(), tokenProgram: collReserve.getLiquidityTokenProgram() },
@@ -311,7 +311,7 @@ async function buildRepayWithCollateralIxs(
 
   // 2. Flash borrow & repay the debt to repay amount needed
   const { flashBorrowIxn, flashRepayIxn } = getFlashLoanInstructions({
-    borrowIxnIndex: budgetIxns.length + atasAndIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    borrowIxnIndex: budgetIxs.length + atasAndIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
     walletPublicKey: obligation.state.owner,
     lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -369,11 +369,11 @@ async function buildRepayWithCollateralIxs(
 
   // 4. Swap collateral to debt to repay flash loan
   const { preActionIxs, swapIxs } = swapQuoteIxs;
-  const swapInstructions = removeBudgetAndAtaIxns(swapIxs, []);
+  const swapInstructions = removeBudgetAndAtaIxs(swapIxs, []);
 
-  const ixns = [
+  const ixs = [
     ...scopeRefreshIxn,
-    ...budgetIxns,
+    ...budgetIxs,
     ...atasAndIxs.map((x) => x.createAtaIx),
     flashBorrowIxn,
     ...preActionIxs,
@@ -382,12 +382,12 @@ async function buildRepayWithCollateralIxs(
     flashRepayIxn,
   ];
 
-  const res: LeverageIxnsOutput = {
+  const res: LeverageIxsOutput = {
     flashLoanInfo: {
       flashBorrowReserve: debtReserve.address,
       flashLoanFee: debtReserve.getFlashLoanFee(),
     },
-    instructions: ixns,
+    instructions: ixs,
   };
 
   return res;