@kamino-finance/klend-sdk 5.10.34 → 5.10.35-beta.0

package/src/classes/manager.ts

@@ -187,6 +187,7 @@ export class KaminoManager {
     const createReserveInstructions = await createReserveIxs(
       this._connection,
       params.admin,
+      params.adminLiquiditySource,
       params.marketAddress,
       params.assetConfig.mint,
       reserveAccount.publicKey,
@@ -198,7 +199,7 @@ export class KaminoManager {
       reserveAccount.publicKey,
       params.assetConfig.getReserveConfig(),
       undefined,
-      true
+      false
     );
 
     const txnIxns: TransactionInstruction[][] = [];
@@ -1267,6 +1268,17 @@ const updateLendingMarketConfig = (
         });
       }
       break;
+    case 'minInitialDepositAmount':
+      if (!market.minInitialDepositAmount.eq(newMarket.minInitialDepositAmount)) {
+        updateLendingMarketIxnsArgs.push({
+          mode: UpdateLendingMarketMode.UpdateInitialDepositAmount.discriminator,
+          value: updateMarketConfigEncodedValue(
+            UpdateLendingMarketMode.UpdateInitialDepositAmount.discriminator,
+            newMarket.minInitialDepositAmount.toNumber()
+          ),
+        });
+      }
+      break;
     default:
       assertNever(key);
   }
@@ -1331,6 +1343,7 @@ function updateMarketConfigEncodedValue(
     case UpdateLendingMarketMode.UpdateMinValueBfSkipPriorityLiqCheck.discriminator:
     case UpdateLendingMarketMode.UpdateMinValueLtvSkipPriorityLiqCheck.discriminator:
     case UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecs.discriminator:
+    case UpdateLendingMarketMode.UpdateInitialDepositAmount.discriminator:
       value = value as number;
       buffer.writeBigUint64LE(BigInt(value), 0);
       break;

package/src/classes/reserve.ts

@@ -1134,6 +1134,7 @@ const truncateBorrowCurve = (points: CurvePointFields[]): [number, number][] =>
 export async function createReserveIxs(
   connection: Connection,
   owner: PublicKey,
+  ownerLiquiditySource: PublicKey,
   lendingMarket: PublicKey,
   liquidityMint: PublicKey,
   reserveAddress: PublicKey,
@@ -1166,6 +1167,7 @@ export async function createReserveIxs(
     feeReceiver: feeVault,
     reserveCollateralMint: collateralMint,
     reserveCollateralSupply: collateralSupplyVault,
+    initialLiquiditySource: ownerLiquiditySource,
     liquidityTokenProgram: TOKEN_PROGRAM_ID,
     collateralTokenProgram: TOKEN_PROGRAM_ID,
     systemProgram: SystemProgram.programId,

package/src/classes/utils.ts

@@ -1,8 +1,8 @@
 import { PubkeyHashMap, SLOTS_PER_SECOND, SLOTS_PER_YEAR } from '../utils';
 import Decimal from 'decimal.js';
 import { AccountInfo, PublicKey } from '@solana/web3.js';
-import { MarketOverview, ReserveOverview, SOL_MINTS } from '../lib';
-import { AccountLayout } from '@solana/spl-token';
+import { MarketOverview, ReserveOverview } from '../lib';
+import { AccountLayout, NATIVE_MINT } from '@solana/spl-token';
 import { ReserveAllocationOverview } from './types';
 import axios from 'axios';
 
@@ -188,7 +188,7 @@ export function lamportsToDecimal(amount: Decimal.Value, decimals: Decimal.Value
 }
 
 export const isSolMint = (mint: PublicKey): boolean => {
-  return SOL_MINTS.filter((m) => m.equals(mint)).length > 0;
+  return NATIVE_MINT.equals(mint);
 };
 
 export const valueOrZero = (value: Decimal): Decimal => {

package/src/classes/vault.ts

@@ -11,10 +11,10 @@ import {
   SYSVAR_RENT_PUBKEY,
   TransactionInstruction,
 } from '@solana/web3.js';
-import { TOKEN_PROGRAM_ID, unpackAccount } from '@solana/spl-token';
+import { NATIVE_MINT, TOKEN_PROGRAM_ID, unpackAccount } from '@solana/spl-token';
 import {
   getAssociatedTokenAddress,
-  getDepositWsolIxns,
+  getTransferWsolIxns,
   getTokenOracleData,
   KaminoMarket,
   KaminoReserve,
@@ -22,7 +22,6 @@ import {
   PubkeyHashMap,
   Reserve,
   UserState,
-  WRAPPED_SOL_MINT,
 } from '../lib';
 import {
   DepositAccounts,
@@ -695,20 +694,20 @@ export class KaminoVaultClient {
     const userTokenAta = getAssociatedTokenAddress(vaultState.tokenMint, user, true, tokenProgramID);
     const createAtasIxns: TransactionInstruction[] = [];
     const closeAtasIxns: TransactionInstruction[] = [];
-    if (vaultState.tokenMint.equals(WRAPPED_SOL_MINT)) {
+    if (vaultState.tokenMint.equals(NATIVE_MINT)) {
       const [{ ata: wsolAta, createAtaIx: createWsolAtaIxn }] = createAtasIdempotent(user, [
         {
-          mint: WRAPPED_SOL_MINT,
+          mint: NATIVE_MINT,
           tokenProgram: TOKEN_PROGRAM_ID,
         },
       ]);
       createAtasIxns.push(createWsolAtaIxn);
-      const depositWsolIxn = getDepositWsolIxns(
+      const transferWsolIxns = getTransferWsolIxns(
         user,
         wsolAta,
         numberToLamportsDecimal(tokenAmount, vaultState.tokenMintDecimals.toNumber()).ceil()
       );
-      createAtasIxns.push(...depositWsolIxn);
+      createAtasIxns.push(...transferWsolIxns);
     }
 
     const [{ ata: userSharesAta, createAtaIx: createSharesAtaIxns }] = createAtasIdempotent(user, [

package/src/client.ts

@@ -308,7 +308,8 @@ async function deposit(connection: Connection, wallet: Keypair, token: string, d
     depositAmount,
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
-    new VanillaObligation(STAGING_LENDING_MARKET)
+    new VanillaObligation(STAGING_LENDING_MARKET),
+    true
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -328,7 +329,8 @@ async function withdraw(connection: Connection, wallet: Keypair, token: string,
     depositAmount,
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
-    new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET))
+    new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
+    true
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -348,7 +350,8 @@ async function borrow(connection: Connection, wallet: Keypair, token: string, bo
     borrowAmount,
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
-    new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET))
+    new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
+    true
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -369,6 +372,7 @@ async function repay(connection: Connection, wallet: Keypair, token: string, bor
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
     new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
+    true,
     await connection.getSlot()
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());

package/src/client_kamino_manager.ts

@@ -54,6 +54,7 @@ import {
 } 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({
   path: `.env${process.env.ENV ? '.' + process.env.ENV : ''}`,
@@ -87,7 +88,7 @@ async function main() {
         admin: mode === 'multisig' ? multisigPk : env.payer.publicKey,
       });
 
-      const _createMarketSig = await processTxn(env.client, env.payer, createMarketIxns, mode, 2500, [marketKp]);
+      await processTxn(env.client, env.payer, createMarketIxns, mode, 2500, [marketKp]);
 
       mode === 'execute' && console.log('Market created:', marketKp.publicKey.toBase58());
     });
@@ -122,8 +123,14 @@ async function main() {
       const reserveConfig = parseReserveConfigFromFile(reserveConfigFromFile);
       const assetConfig = new AssetReserveConfigCli(tokenMint, tokenMintProgramId, reserveConfig);
 
+      const adminAta =
+        mode === 'multisig'
+          ? getAssociatedTokenAddressSync(tokenMint, multisigPk)
+          : getAssociatedTokenAddressSync(tokenMint, env.payer.publicKey);
+
       const { reserve, txnIxns } = await kaminoManager.addAssetToMarketIxs({
         admin: mode === 'multisig' ? multisigPk : env.payer.publicKey,
+        adminLiquiditySource: adminAta,
         marketAddress: marketAddress,
         assetConfig: assetConfig,
       });