@kamino-finance/klend-sdk 5.11.0-beta.0 → 5.11.1

package/src/idl_codegen_kamino_vault/accounts/VaultState.ts

@@ -38,6 +38,7 @@ export interface VaultStateFields {
   vaultFarm: PublicKey
   creationTimestamp: BN
   padding1: BN
+  allocationAdmin: PublicKey
   padding2: Array<BN>
 }
 
@@ -75,6 +76,7 @@ export interface VaultStateJSON {
   vaultFarm: string
   creationTimestamp: string
   padding1: string
+  allocationAdmin: string
   padding2: Array<string>
 }
 
@@ -112,6 +114,7 @@ export class VaultState {
   readonly vaultFarm: PublicKey
   readonly creationTimestamp: BN
   readonly padding1: BN
+  readonly allocationAdmin: PublicKey
   readonly padding2: Array<BN>
 
   static readonly discriminator = Buffer.from([
@@ -152,7 +155,8 @@ export class VaultState {
     borsh.publicKey("vaultFarm"),
     borsh.u64("creationTimestamp"),
     borsh.u64("padding1"),
-    borsh.array(borsh.u128(), 244, "padding2"),
+    borsh.publicKey("allocationAdmin"),
+    borsh.array(borsh.u128(), 242, "padding2"),
   ])
 
   constructor(fields: VaultStateFields) {
@@ -191,6 +195,7 @@ export class VaultState {
     this.vaultFarm = fields.vaultFarm
     this.creationTimestamp = fields.creationTimestamp
     this.padding1 = fields.padding1
+    this.allocationAdmin = fields.allocationAdmin
     this.padding2 = fields.padding2
   }
 
@@ -275,6 +280,7 @@ export class VaultState {
       vaultFarm: dec.vaultFarm,
       creationTimestamp: dec.creationTimestamp,
       padding1: dec.padding1,
+      allocationAdmin: dec.allocationAdmin,
       padding2: dec.padding2,
     })
   }
@@ -316,6 +322,7 @@ export class VaultState {
       vaultFarm: this.vaultFarm.toString(),
       creationTimestamp: this.creationTimestamp.toString(),
       padding1: this.padding1.toString(),
+      allocationAdmin: this.allocationAdmin.toString(),
       padding2: this.padding2.map((item) => item.toString()),
     }
   }
@@ -357,6 +364,7 @@ export class VaultState {
       vaultFarm: new PublicKey(obj.vaultFarm),
       creationTimestamp: new BN(obj.creationTimestamp),
       padding1: new BN(obj.padding1),
+      allocationAdmin: new PublicKey(obj.allocationAdmin),
       padding2: obj.padding2.map((item) => new BN(item)),
     })
   }

package/src/idl_codegen_kamino_vault/errors/custom.ts

@@ -43,6 +43,9 @@ export type CustomError =
   | ManagementFeeGreaterThanMaxAllowed
   | VaultAUMZero
   | MissingReserveForBatchRefresh
+  | MinWithdrawAmountTooBig
+  | InvestTooSoon
+  | WrongAdminOrAllocationAdmin
 
 export class DepositAmountsZero extends Error {
   static readonly code = 7000
@@ -528,6 +531,39 @@ export class MissingReserveForBatchRefresh extends Error {
   }
 }
 
+export class MinWithdrawAmountTooBig extends Error {
+  static readonly code = 7044
+  readonly code = 7044
+  readonly name = "MinWithdrawAmountTooBig"
+  readonly msg = "Min withdraw amount is too big"
+
+  constructor(readonly logs?: string[]) {
+    super("7044: Min withdraw amount is too big")
+  }
+}
+
+export class InvestTooSoon extends Error {
+  static readonly code = 7045
+  readonly code = 7045
+  readonly name = "InvestTooSoon"
+  readonly msg = "Invest is called too soon after last invest"
+
+  constructor(readonly logs?: string[]) {
+    super("7045: Invest is called too soon after last invest")
+  }
+}
+
+export class WrongAdminOrAllocationAdmin extends Error {
+  static readonly code = 7046
+  readonly code = 7046
+  readonly name = "WrongAdminOrAllocationAdmin"
+  readonly msg = "Wrong admin or allocation admin"
+
+  constructor(readonly logs?: string[]) {
+    super("7046: Wrong admin or allocation admin")
+  }
+}
+
 export function fromCode(code: number, logs?: string[]): CustomError | null {
   switch (code) {
     case 7000:
@@ -618,6 +654,12 @@ export function fromCode(code: number, logs?: string[]): CustomError | null {
       return new VaultAUMZero(logs)
     case 7043:
       return new MissingReserveForBatchRefresh(logs)
+    case 7044:
+      return new MinWithdrawAmountTooBig(logs)
+    case 7045:
+      return new InvestTooSoon(logs)
+    case 7046:
+      return new WrongAdminOrAllocationAdmin(logs)
   }
 
   return null

package/src/idl_codegen_kamino_vault/instructions/initVault.ts

@@ -11,6 +11,7 @@ export interface InitVaultAccounts {
   tokenVault: PublicKey
   baseTokenMint: PublicKey
   sharesMint: PublicKey
+  adminTokenAccount: PublicKey
   systemProgram: PublicKey
   rent: PublicKey
   tokenProgram: PublicKey
@@ -28,6 +29,7 @@ export function initVault(
     { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },
     { pubkey: accounts.baseTokenMint, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: true },
+    { pubkey: accounts.adminTokenAccount, isSigner: false, isWritable: true },
     { pubkey: accounts.systemProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.rent, isSigner: false, isWritable: false },
     { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/updateReserveAllocation.ts

@@ -10,7 +10,7 @@ export interface UpdateReserveAllocationArgs {
 }
 
 export interface UpdateReserveAllocationAccounts {
-  adminAuthority: PublicKey
+  signer: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   reserveCollateralMint: PublicKey
@@ -29,7 +29,7 @@ export function updateReserveAllocation(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.signer, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
     {

package/src/idl_codegen_kamino_vault/types/VaultConfigField.ts

@@ -256,6 +256,29 @@ export class Farm {
   }
 }
 
+export interface AllocationAdminJSON {
+  kind: "AllocationAdmin"
+}
+
+export class AllocationAdmin {
+  static readonly discriminator = 11
+  static readonly kind = "AllocationAdmin"
+  readonly discriminator = 11
+  readonly kind = "AllocationAdmin"
+
+  toJSON(): AllocationAdminJSON {
+    return {
+      kind: "AllocationAdmin",
+    }
+  }
+
+  toEncodable() {
+    return {
+      AllocationAdmin: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if (typeof obj !== "object") {
@@ -295,6 +318,9 @@ export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if ("Farm" in obj) {
     return new Farm()
   }
+  if ("AllocationAdmin" in obj) {
+    return new AllocationAdmin()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -336,6 +362,9 @@ export function fromJSON(
     case "Farm": {
       return new Farm()
     }
+    case "AllocationAdmin": {
+      return new AllocationAdmin()
+    }
   }
 }
 
@@ -352,6 +381,7 @@ export function layout(property?: string) {
     borsh.struct([], "Name"),
     borsh.struct([], "LookupTable"),
     borsh.struct([], "Farm"),
+    borsh.struct([], "AllocationAdmin"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/idl_codegen_kamino_vault/types/index.ts

@@ -63,6 +63,7 @@ export type VaultConfigFieldKind =
   | VaultConfigField.Name
   | VaultConfigField.LookupTable
   | VaultConfigField.Farm
+  | VaultConfigField.AllocationAdmin
 export type VaultConfigFieldJSON =
   | VaultConfigField.PerformanceFeeBpsJSON
   | VaultConfigField.ManagementFeeBpsJSON
@@ -75,6 +76,7 @@ export type VaultConfigFieldJSON =
   | VaultConfigField.NameJSON
   | VaultConfigField.LookupTableJSON
   | VaultConfigField.FarmJSON
+  | VaultConfigField.AllocationAdminJSON
 
 export { VaultAllocation } from "./VaultAllocation"
 export type {

package/src/idl_kamino_vault.json

@@ -35,6 +35,11 @@
           "isMut": true,
           "isSigner": false
         },
+        {
+          "name": "adminTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
         {
           "name": "systemProgram",
           "isMut": false,
@@ -62,7 +67,7 @@
       "name": "updateReserveAllocation",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "signer",
           "isMut": true,
           "isSigner": true
         },
@@ -996,12 +1001,16 @@
             "name": "padding1",
             "type": "u64"
           },
+          {
+            "name": "allocationAdmin",
+            "type": "publicKey"
+          },
           {
             "name": "padding2",
             "type": {
               "array": [
                 "u128",
-                244
+                242
               ]
             }
           }
@@ -1874,6 +1883,9 @@
           },
           {
             "name": "Farm"
+          },
+          {
+            "name": "AllocationAdmin"
           }
         ]
       }
@@ -2160,6 +2172,21 @@
       "code": 7043,
       "name": "MissingReserveForBatchRefresh",
       "msg": "Missing reserve for batch refresh"
+    },
+    {
+      "code": 7044,
+      "name": "MinWithdrawAmountTooBig",
+      "msg": "Min withdraw amount is too big"
+    },
+    {
+      "code": 7045,
+      "name": "InvestTooSoon",
+      "msg": "Invest is called too soon after last invest"
+    },
+    {
+      "code": 7046,
+      "name": "WrongAdminOrAllocationAdmin",
+      "msg": "Wrong admin or allocation admin"
     }
   ]
-}
+}

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -318,6 +318,7 @@ async function buildRepayWithCollateralIxs(
     false,
     requestElevationGroup,
     undefined,
+    undefined,
     referrer,
     scopeRefresh
   );

package/src/lending_operations/swap_collateral_operations.ts

@@ -16,11 +16,10 @@ import {
   ScopeRefresh,
   U64_MAX,
   uniqueAccounts,
-  WRAPPED_SOL_MINT,
 } from '../utils';
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { createCloseAccountInstruction, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { createCloseAccountInstruction, NATIVE_MINT, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 
 /**
  * Inputs to the `getSwapCollIxns()` operation.
@@ -330,11 +329,11 @@ function getAtaCreationIxns(context: SwapCollContext<any>) {
 function getAtaCloseIxns(context: SwapCollContext<any>) {
   const ataCloseIxns: TransactionInstruction[] = [];
   if (
-    context.sourceCollReserve.getLiquidityMint().equals(WRAPPED_SOL_MINT) ||
-    context.targetCollReserve.getLiquidityMint().equals(WRAPPED_SOL_MINT)
+    context.sourceCollReserve.getLiquidityMint().equals(NATIVE_MINT) ||
+    context.targetCollReserve.getLiquidityMint().equals(NATIVE_MINT)
   ) {
     const owner = context.obligation.state.owner;
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
     ataCloseIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
   }
   return ataCloseIxns;
@@ -385,6 +384,7 @@ async function getDepositTargetCollIxns(
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     removesElevationGroup, // we may need to (temporarily) remove the elevation group; the same or a different one will be set on withdraw, if requested
     false, // we are dealing with an existing obligation, no need to create user metadata
+    false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
     context.scopeRefresh,
@@ -434,6 +434,7 @@ async function getWithdrawSourceCollIxns(
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     requestedElevationGroup !== undefined, // the `elevationGroupIdToRequestAfterWithdraw()` has already decided on this
     false, // we are dealing with an existing obligation, no need to create user metadata
+    false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
     undefined, // we have refreshed scope already, during depositing

package/src/leverage/calcs.ts

@@ -65,7 +65,8 @@ export async function calculateMultiplyEffects(
     debtBorrowFactorPct,
     priceCollToDebt,
     priceDebtToColl,
-  }: LeverageFormsCalcsArgs
+  }: LeverageFormsCalcsArgs,
+  logEstimations = false
 ): Promise<FormsCalcsResult> {
   // calculate estimations for deposit operation
   const {
@@ -107,18 +108,20 @@ export async function calculateMultiplyEffects(
     flashLoanFee: flashBorrowReserveFlashLoanFeePercentage, // TODO: is this the right flash borrow?
   });
 
-  console.log(
-    'Estimations',
-    toJson({
-      activeTab,
-      depositModeEstimatedDepositAmount,
-      depositModeEstimatedBorrowAmount,
-      withdrawModeEstimatedDepositTokenWithdrawn,
-      withdrawModeEstimatedBorrowTokenWithdrawn,
-      adjustModeEstimatedDepositAmount,
-      adjustModeEstimateBorrowAmount,
-    })
-  );
+  if (logEstimations) {
+    console.log(
+      'Estimations',
+      toJson({
+        activeTab,
+        depositModeEstimatedDepositAmount,
+        depositModeEstimatedBorrowAmount,
+        withdrawModeEstimatedDepositTokenWithdrawn,
+        withdrawModeEstimatedBorrowTokenWithdrawn,
+        adjustModeEstimatedDepositAmount,
+        adjustModeEstimateBorrowAmount,
+      })
+    );
+  }
 
   let [isClosingPosition, totalDeposited, totalBorrowed] = [false, new Decimal(0), new Decimal(0)];
 

package/src/leverage/instructions.ts

@@ -1,4 +1,5 @@
 import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from '@solana/web3.js';
+import * as anchor from '@coral-xyz/anchor';
 import { KaminoReserve } from '../classes';
 import {
   FlashBorrowReserveLiquidityArgs,
@@ -9,12 +10,6 @@ import {
   flashRepayReserveLiquidity,
 } from '../lib';
 import Decimal from 'decimal.js';
-import * as anchor from '@coral-xyz/anchor';
-
-export const SOL_MINTS: Array<PublicKey> = [
-  new PublicKey('So11111111111111111111111111111111111111111'),
-  new PublicKey('So11111111111111111111111111111111111111112'),
-];
 
 export const getFlashLoanInstructions = (args: {
   borrowIxnIndex: number;

package/src/leverage/operations.ts

@@ -17,11 +17,10 @@ import {
   ObligationTypeTag,
   SOL_DECIMALS,
   U64_MAX,
-  WRAPPED_SOL_MINT,
   createAtasIdempotent,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxns,
-  getDepositWsolIxns,
+  getTransferWsolIxns,
   getLookupTableAccount,
   removeBudgetAndAtaIxns,
   uniqueAccounts,
@@ -35,7 +34,12 @@ import {
   toJson,
   withdrawLeverageCalcs,
 } from './calcs';
-import { TOKEN_PROGRAM_ID, createCloseAccountInstruction, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import {
+  NATIVE_MINT,
+  TOKEN_PROGRAM_ID,
+  createCloseAccountInstruction,
+  getAssociatedTokenAddressSync,
+} from '@solana/spl-token';
 import { Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
 import { getExpectedTokenBalanceAfterBorrow, getKtokenToTokenSwapper, getTokenToKtokenSwapper } from './utils';
 import { FullBPS } from '@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters';
@@ -90,7 +94,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 }> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const flashLoanFee = collReserve.getFlashLoanFee() || new Decimal(0);
 
   const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
@@ -193,7 +197,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 
   if (collIsKtoken) {
     let futureBalanceInAta = new Decimal(0);
-    if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
+    if (debtTokenMint.equals(NATIVE_MINT)) {
       futureBalanceInAta = futureBalanceInAta.add(
         !collIsKtoken ? quotePriceCalcs.initDepositInSol : quotePriceCalcs.initDepositInSol
       );
@@ -370,7 +374,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
 
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
 
   const ixs = await buildDepositWithLeverageIxns(
@@ -491,9 +495,9 @@ async function buildDepositWithLeverageIxns(
   const fillWsolAtaIxns: TransactionInstruction[] = [];
   if (depositTokenIsSol) {
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(
+      ...getTransferWsolIxns(
         owner,
-        getAssociatedTokenAddressSync(WRAPPED_SOL_MINT, owner),
+        getAssociatedTokenAddressSync(NATIVE_MINT, owner),
         toLamports(calcs.initDepositInSol, SOL_DECIMALS).ceil()
       )
     );
@@ -537,6 +541,7 @@ async function buildDepositWithLeverageIxns(
     false,
     elevationGroupOverride === 0 ? false : true, // emode
     false, // to be checked and created in a setup tx in the UI
+    false, // to be checked and created in a setup tx in the UI
     referrer,
     currentSlot,
     scopeRefresh
@@ -606,7 +611,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   const collIsKtoken = await isKtoken(collTokenMint);
   const strategy = collIsKtoken ? (await kamino!.getStrategyByKTokenMint(collTokenMint))! : undefined;
 
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
 
   const calcs = withdrawLeverageCalcs(
@@ -734,7 +739,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
 
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
   const { swapInputs, initialInputs } = await getWithdrawWithLeverageSwapInputs({
     owner,
@@ -898,8 +903,8 @@ export async function buildWithdrawWithLeverageIxns(
   const atasAndCreateIxns = createAtasIdempotent(owner, mintsToCreateAtas);
 
   const closeWsolAtaIxns: TransactionInstruction[] = [];
-  if (depositTokenIsSol || debtTokenMint.equals(WRAPPED_SOL_MINT)) {
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+  if (depositTokenIsSol || debtTokenMint.equals(NATIVE_MINT)) {
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
     closeWsolAtaIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
   }
 
@@ -908,13 +913,13 @@ export async function buildWithdrawWithLeverageIxns(
   // TODO: Might be worth removing as it's only needed for Ktokens
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
   const fillWsolAtaIxns: TransactionInstruction[] = [];
-  if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
+  if (debtTokenMint.equals(NATIVE_MINT)) {
     const halfSolBalance = (await market.getConnection().getBalance(owner)) / LAMPORTS_PER_SOL / 2;
     const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(
+      ...getTransferWsolIxns(
         owner,
-        getAssociatedTokenAddressSync(WRAPPED_SOL_MINT, owner),
+        getAssociatedTokenAddressSync(NATIVE_MINT, owner),
         toLamports(balanceToWrap, SOL_DECIMALS).ceil()
       )
     );
@@ -953,6 +958,7 @@ export async function buildWithdrawWithLeverageIxns(
     0,
     false,
     false, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
+    false, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
     isClosingPosition,
     referrer,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1496,6 +1502,7 @@ async function buildIncreaseLeverageIxns(
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
     currentSlot,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1513,6 +1520,7 @@ async function buildIncreaseLeverageIxns(
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
     currentSlot,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1633,15 +1641,15 @@ async function buildDecreaseLeverageIxns(
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
   const closeWsolAtaIxns: TransactionInstruction[] = [];
   const fillWsolAtaIxns: TransactionInstruction[] = [];
-  if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+  if (debtTokenMint.equals(NATIVE_MINT)) {
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
 
     closeWsolAtaIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
 
     const halfSolBalance = (await kaminoMarket.getConnection().getBalance(owner)) / LAMPORTS_PER_SOL / 2;
     const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(owner, wsolAta, toLamports(balanceToWrap, debtReserve!.stats.decimals).ceil())
+      ...getTransferWsolIxns(owner, wsolAta, toLamports(balanceToWrap, debtReserve!.stats.decimals).ceil())
     );
   }
 
@@ -1675,6 +1683,7 @@ async function buildDecreaseLeverageIxns(
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
     scopeRefresh
   );
@@ -1691,6 +1700,7 @@ async function buildDecreaseLeverageIxns(
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
     currentSlot,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }

package/src/utils/ata.ts

@@ -98,7 +98,7 @@ export function createAtasIdempotent(
   return res;
 }
 
-export function getDepositWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
+export function getTransferWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
   const ixns: TransactionInstruction[] = [];
 
   ixns.push(

package/src/utils/constants.ts

@@ -72,22 +72,17 @@ export const SLOTS_PER_YEAR = SLOTS_PER_DAY * 365;
  */
 export const MIN_AUTODELEVERAGE_BONUS_BPS = 50;
 
-/**
- * WSOL Mint
- */
-export const WRAPPED_SOL_MINT = new PublicKey('So11111111111111111111111111111111111111112');
-
 export const SOL_DECIMALS = 9;
 
-/**
- * USDC Mint
- */
-export const USDC_MAINNET_MINT = new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
-
 export const MAINNET_BETA_CHAIN_ID = 101;
 
-export const POSITION_LIMIT = 10;
 export const BORROWS_LIMIT = 5;
 export const DEPOSITS_LIMIT = 8;
 
 export const DEFAULT_MAX_COMPUTE_UNITS = 1_400_000;
+
+/**
+ * Minimum initial deposit required for the initialization of a reserve
+ */
+export const MIN_INITIAL_DEPOSIT = 100_000;
+export const MIN_VAULT_INITIAL_DEPOSIT = 1_000_000_000;

package/src/utils/instruction.ts

@@ -38,7 +38,7 @@ export async function buildAndSendTxnWithLogs(
     });
     console.log('Transaction Hash:', withDescription, sig);
     if (withLogsIfSuccess) {
-      await sleep(5000);
+      await sleep(1000);
       const res = await c.getTransaction(sig, {
         commitment: 'confirmed',
         maxSupportedTransactionVersion: 6,
@@ -49,7 +49,6 @@ export async function buildAndSendTxnWithLogs(
   } catch (e: any) {
     console.log(e);
     process.stdout.write(e.logs.toString());
-    await sleep(5000);
     const sig = e.toString().split(' failed ')[0].split('Transaction ')[1];
     const res: VersionedTransactionResponse | null = await c.getTransaction(sig, {
       commitment: 'confirmed',
@@ -115,7 +114,6 @@ export async function simulateTxn(c: Connection, tx: Transaction, owner: Keypair
   } catch (e: any) {
     console.log(e);
     process.stdout.write(e.logs.toString());
-    await sleep(5000);
     const sig = e.toString().split(' failed ')[0].split('Transaction ')[1];
     const res: TransactionResponse | null = await c.getTransaction(sig, {
       commitment: 'confirmed',

package/src/utils/managerTypes.ts

@@ -37,6 +37,7 @@ export type CreateKaminoMarketParams = {
 
 export type AddAssetToMarketParams = {
   admin: PublicKey;
+  adminLiquiditySource: PublicKey;
   marketAddress: PublicKey;
   assetConfig: AssetConfig;
 };