@kamino-finance/klend-sdk 6.0.3 → 6.0.5-beta.0

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -18,14 +18,13 @@ import {
   U64_MAX,
   uniqueAccountsWithProgramIds,
 } from '../utils';
-import { AddressLookupTable } from '@solana-program/address-lookup-table';
-import { Account, Address, IInstruction, none, Option, Slot, TransactionSigner } from '@solana/kit';
+import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import { calcMaxWithdrawCollateral, calcRepayAmountWithSlippage } from './repay_with_collateral_calcs';
 
 export type RepayWithCollIxsResponse<QuoteResponse> = {
-  ixs: IInstruction[];
-  lookupTables: Account<AddressLookupTable>[];
+  ixs: TransactionInstruction[];
+  lookupTables: AddressLookupTableAccount[];
   flashLoanInfo: FlashLoanInfo;
   swapInputs: SwapInputs;
   initialInputs: RepayWithCollInitialInputs<QuoteResponse>;
@@ -43,21 +42,20 @@ export type RepayWithCollInitialInputs<QuoteResponse> = {
    * The quote from the provided quoter
    */
   swapQuote: SwapQuote<QuoteResponse>;
-  currentSlot: Slot;
-  klendAccounts: Array<Address>;
+  currentSlot: number;
+  klendAccounts: Array<PublicKey>;
 };
 
 interface RepayWithCollSwapInputsProps<QuoteResponse> {
   kaminoMarket: KaminoMarket;
-  debtTokenMint: Address;
-  collTokenMint: Address;
-  owner: TransactionSigner;
+  debtTokenMint: PublicKey;
+  collTokenMint: PublicKey;
   obligation: KaminoObligation;
-  referrer: Option<Address>;
-  currentSlot: Slot;
+  referrer: PublicKey;
+  currentSlot: number;
   repayAmount: Decimal;
   isClosingPosition: boolean;
-  budgetAndPriorityFeeIxs?: IInstruction[];
+  budgetAndPriorityFeeIxs?: TransactionInstruction[];
   scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
@@ -73,7 +71,6 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   currentSlot,
   debtTokenMint,
   kaminoMarket,
-  owner,
   obligation,
   quoter,
   referrer,
@@ -124,7 +121,6 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     kaminoMarket,
     debtReserve,
     collReserve,
-    owner,
     obligation,
     referrer,
     currentSlot,
@@ -192,7 +188,6 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   currentSlot,
   debtTokenMint,
   kaminoMarket,
-  owner,
   obligation,
   quoter,
   swapper,
@@ -206,7 +201,6 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     currentSlot,
     debtTokenMint,
     kaminoMarket,
-    owner,
     obligation,
     quoter,
     referrer,
@@ -250,7 +244,6 @@ export async function getRepayWithCollIxs<QuoteResponse>({
         kaminoMarket,
         debtReserve,
         collReserve,
-        owner,
         obligation,
         referrer,
         currentSlot,
@@ -279,11 +272,10 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
   market: KaminoMarket,
   debtReserve: KaminoReserve,
   collReserve: KaminoReserve,
-  owner: TransactionSigner,
   obligation: KaminoObligation,
-  referrer: Option<Address>,
-  currentSlot: Slot,
-  budgetAndPriorityFeeIxs: IInstruction[] | undefined,
+  referrer: PublicKey,
+  currentSlot: number,
+  budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   swapQuoteIxs: SwapIxs<QuoteResponse>,
   isClosingPosition: boolean,
@@ -299,23 +291,23 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
     { mint: debtReserve.getLiquidityMint(), tokenProgram: debtReserve.getLiquidityTokenProgram() },
   ];
 
-  const atasAndIxs = await createAtasIdempotent(owner, atas);
+  const atasAndIxs = createAtasIdempotent(obligation.state.owner, atas);
   const [, { ata: debtTokenAta }] = atasAndIxs;
 
-  const scopeRefreshIx = await getScopeRefreshIx(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
+  const scopeRefreshIxn = await getScopeRefreshIx(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
 
   // 2. Flash borrow & repay the debt to repay amount needed
   const { flashBorrowIx, flashRepayIx } = getFlashLoanInstructions({
-    borrowIxIndex: budgetIxs.length + atasAndIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
-    userTransferAuthority: owner,
-    lendingMarketAuthority: await market.getLendingMarketAuthority(),
+    borrowIxIndex: budgetIxs.length + atasAndIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    walletPublicKey: obligation.state.owner,
+    lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
     reserve: debtReserve,
     amountLamports: debtRepayAmountLamports,
     destinationAta: debtTokenAta,
     // TODO(referrals): once we support referrals, we will have to replace the placeholder args below:
-    referrerAccount: none(),
-    referrerTokenState: none(),
+    referrerAccount: market.programId,
+    referrerTokenState: market.programId,
     programId: market.programId,
   });
 
@@ -338,7 +330,7 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
       debtReserve.getLiquidityMint(),
       isClosingPosition ? U64_MAX : collWithdrawLamports.toString(),
       collReserve.getLiquidityMint(),
-      owner,
+      obligation.state.owner,
       currentSlot,
       obligation,
       useV2Ixs,
@@ -356,7 +348,7 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
       debtReserve.getLiquidityMint(),
       isClosingPosition ? U64_MAX : collWithdrawLamports.toString(),
       collReserve.getLiquidityMint(),
-      owner,
+      obligation.state.owner,
       currentSlot,
       obligation,
       undefined,
@@ -373,7 +365,7 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
   const swapInstructions = removeBudgetIxs(swapIxs);
 
   const ixs = [
-    ...scopeRefreshIx,
+    ...scopeRefreshIxn,
     ...budgetIxs,
     ...atasAndIxs.map((x) => x.createAtaIx),
     flashBorrowIx,

package/src/lending_operations/swap_collateral_operations.ts

@@ -18,16 +18,14 @@ import {
   DEFAULT_MAX_COMPUTE_UNITS,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxs,
+  PublicKeySet,
   ScopePriceRefreshConfig,
   U64_MAX,
   uniqueAccountsWithProgramIds,
-  WRAPPED_SOL_MINT,
 } from '../utils';
-import { Account, Address, IInstruction, isSome, none, Option, Slot, TransactionSigner } from '@solana/kit';
+import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { TOKEN_PROGRAM_ADDRESS } from '@solana-program/token';
-import { AddressLookupTable } from '@solana-program/address-lookup-table';
-import { getCloseAccountInstruction } from '@solana-program/token-2022';
+import { createCloseAccountInstruction, NATIVE_MINT, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 
 /**
  * Inputs to the `getSwapCollIxs()` operation.
@@ -49,12 +47,12 @@ export interface SwapCollIxsInputs<QuoteResponse> {
   /**
    * The mint of the source collateral token (i.e. the current one).
    */
-  sourceCollTokenMint: Address;
+  sourceCollTokenMint: PublicKey;
 
   /**
    * The mint of the target collateral token (i.e. the new one).
    */
-  targetCollTokenMint: Address;
+  targetCollTokenMint: PublicKey;
 
   /**
    * An elevation group ID that the obligation should end up with after the collateral swap - it will be requested by
@@ -65,11 +63,10 @@ export interface SwapCollIxsInputs<QuoteResponse> {
   // Note: the undocumented inputs below all have their most usual meaning used across the SDK.
 
   market: KaminoMarket;
-  owner: TransactionSigner;
   obligation: KaminoObligation;
-  referrer: Option<Address>;
-  currentSlot: Slot;
-  budgetAndPriorityFeeIxs?: IInstruction[];
+  referrer: PublicKey;
+  currentSlot: number;
+  budgetAndPriorityFeeIxs?: TransactionInstruction[];
   scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
@@ -84,12 +81,12 @@ export interface SwapCollIxsOutputs<QuoteResponse> {
   /**
    * Instructions for on-chain execution.
    */
-  ixs: IInstruction[];
+  ixs: TransactionInstruction[];
 
   /**
    * Required LUTs.
    */
-  lookupTables: Account<AddressLookupTable>[];
+  lookupTables: AddressLookupTableAccount[];
 
   /**
    * Whether the swap is using V2 instructions.
@@ -208,16 +205,15 @@ type SwapCollArgs = {
 };
 
 type SwapCollContext<QuoteResponse> = {
-  budgetAndPriorityFeeIxs: IInstruction[];
+  budgetAndPriorityFeeIxs: TransactionInstruction[];
   market: KaminoMarket;
   sourceCollReserve: KaminoReserve;
   targetCollReserve: KaminoReserve;
-  owner: TransactionSigner;
   obligation: KaminoObligation;
   quoter: SwapQuoteProvider<QuoteResponse>;
   swapper: SwapIxsProvider<QuoteResponse>;
-  referrer: Option<Address>;
-  currentSlot: Slot;
+  referrer: PublicKey;
+  currentSlot: number;
   useV2Ixs: boolean;
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
   logger: (msg: string, ...extra: any[]) => void;
@@ -226,7 +222,7 @@ type SwapCollContext<QuoteResponse> = {
 function extractArgsAndContext<QuoteResponse>(
   inputs: SwapCollIxsInputs<QuoteResponse>
 ): [SwapCollArgs, SwapCollContext<QuoteResponse>] {
-  if (inputs.sourceCollTokenMint === inputs.targetCollTokenMint) {
+  if (inputs.sourceCollTokenMint.equals(inputs.targetCollTokenMint)) {
     throw new Error(`Cannot swap from/to the same collateral`);
   }
   if (inputs.sourceCollSwapAmount.lte(0)) {
@@ -246,7 +242,6 @@ function extractArgsAndContext<QuoteResponse>(
       logger: console.log,
       market: inputs.market,
       obligation: inputs.obligation,
-      owner: inputs.owner,
       quoter: inputs.quoter,
       swapper: inputs.swapper,
       referrer: inputs.referrer,
@@ -260,12 +255,12 @@ function extractArgsAndContext<QuoteResponse>(
 const FAKE_TARGET_COLL_SWAP_OUT_AMOUNT = new Decimal(1); // see the lengthy `getSwapCollIxs()` impl comment
 
 type SwapCollKlendIxs = {
-  setupIxs: IInstruction[];
-  targetCollFlashBorrowIx: IInstruction;
-  depositTargetCollIxs: IInstruction[];
-  withdrawSourceCollIxs: IInstruction[];
-  targetCollFlashRepayIx: IInstruction;
-  cleanupIxs: IInstruction[];
+  setupIxs: TransactionInstruction[];
+  targetCollFlashBorrowIx: TransactionInstruction;
+  depositTargetCollIxs: TransactionInstruction[];
+  withdrawSourceCollIxs: TransactionInstruction[];
+  targetCollFlashRepayIx: TransactionInstruction;
+  cleanupIxs: TransactionInstruction[];
   flashLoanInfo: FlashLoanInfo;
   simulationDetails: {
     targetCollFlashBorrowedAmount: Decimal;
@@ -277,7 +272,7 @@ async function getKlendIxs(
   targetCollSwapOutAmount: Decimal,
   context: SwapCollContext<any>
 ): Promise<SwapCollKlendIxs> {
-  const { ataCreationIxs, targetCollAta } = await getAtaCreationIxs(context);
+  const { ataCreationIxs, targetCollAta } = getAtaCreationIxs(context);
   const setupIxs = [...context.budgetAndPriorityFeeIxs, ...ataCreationIxs];
 
   const scopeRefreshIxn = await getScopeRefreshIx(
@@ -293,7 +288,7 @@ async function getKlendIxs(
   }
 
   const targetCollFlashBorrowedAmount = calculateTargetCollFlashBorrowedAmount(targetCollSwapOutAmount, context);
-  const { targetCollFlashBorrowIx, targetCollFlashRepayIx } = await getTargetCollFlashLoanIxs(
+  const { targetCollFlashBorrowIx, targetCollFlashRepayIx } = getTargetCollFlashLoanIxs(
     targetCollFlashBorrowedAmount,
     setupIxs.length,
     targetCollAta,
@@ -307,7 +302,7 @@ async function getKlendIxs(
     context
   );
 
-  const cleanupIxs = await getAtaCloseIxs(context);
+  const cleanupIxs = getAtaCloseIxs(context);
 
   return {
     setupIxs,
@@ -335,14 +330,14 @@ function calculateTargetCollFlashBorrowedAmount(
     context.targetCollReserve.getFlashLoanFee(),
     FeeCalculation.Inclusive, // denotes that the amount parameter above means "to be repaid" (not "borrowed")
     context.market.state.referralFeeBps,
-    isSome(context.referrer)
+    !context.referrer.equals(PublicKey.default)
   );
   const targetCollFlashLoanFee = protocolFees.add(referrerFees).div(context.targetCollReserve.getMintFactor());
   return targetCollFlashRepaidAmount.sub(targetCollFlashLoanFee);
 }
 
-async function getAtaCreationIxs(context: SwapCollContext<any>) {
-  const atasAndAtaCreationIxs = await createAtasIdempotent(context.owner, [
+function getAtaCreationIxs(context: SwapCollContext<any>) {
+  const atasAndAtaCreationIxs = createAtasIdempotent(context.obligation.state.owner, [
     {
       mint: context.sourceCollReserve.getLiquidityMint(),
       tokenProgram: context.sourceCollReserve.getLiquidityTokenProgram(),
@@ -358,41 +353,36 @@ async function getAtaCreationIxs(context: SwapCollContext<any>) {
   };
 }
 
-async function getAtaCloseIxs(context: SwapCollContext<any>) {
-  const ataCloseIxs: IInstruction[] = [];
+function getAtaCloseIxs(context: SwapCollContext<any>) {
+  const ataCloseIxs: TransactionInstruction[] = [];
   if (
-    context.sourceCollReserve.getLiquidityMint() === WRAPPED_SOL_MINT ||
-    context.targetCollReserve.getLiquidityMint() === WRAPPED_SOL_MINT
+    context.sourceCollReserve.getLiquidityMint().equals(NATIVE_MINT) ||
+    context.targetCollReserve.getLiquidityMint().equals(NATIVE_MINT)
   ) {
-    const owner = context.owner;
-    const wsolAta = await getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner.address);
-    ataCloseIxs.push(
-      getCloseAccountInstruction(
-        { account: wsolAta, owner, destination: owner.address },
-        { programAddress: TOKEN_PROGRAM_ADDRESS }
-      )
-    );
+    const owner = context.obligation.state.owner;
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
+    ataCloseIxs.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
   }
   return ataCloseIxs;
 }
 
-async function getTargetCollFlashLoanIxs(
+function getTargetCollFlashLoanIxs(
   targetCollAmount: Decimal,
   flashBorrowIxIndex: number,
-  destinationAta: Address,
+  destinationAta: PublicKey,
   context: SwapCollContext<any>
 ) {
   const { flashBorrowIx: targetCollFlashBorrowIx, flashRepayIx: targetCollFlashRepayIx } = getFlashLoanInstructions({
     borrowIxIndex: flashBorrowIxIndex,
-    userTransferAuthority: context.owner,
-    lendingMarketAuthority: await context.market.getLendingMarketAuthority(),
+    walletPublicKey: context.obligation.state.owner,
+    lendingMarketAuthority: context.market.getLendingMarketAuthority(),
     lendingMarketAddress: context.market.getAddress(),
     reserve: context.targetCollReserve,
     amountLamports: targetCollAmount.mul(context.targetCollReserve.getMintFactor()),
     destinationAta,
     // TODO(referrals): once we support referrals, we will have to replace the placeholder args below:
-    referrerAccount: none(),
-    referrerTokenState: none(),
+    referrerAccount: context.market.programId,
+    referrerTokenState: context.market.programId,
     programId: context.market.programId,
   });
   return { targetCollFlashBorrowIx, targetCollFlashRepayIx };
@@ -400,7 +390,7 @@ async function getTargetCollFlashLoanIxs(
 
 type DepositTargetCollIxs = {
   removesElevationGroup: boolean;
-  ixs: IInstruction[];
+  ixs: TransactionInstruction[];
 };
 
 async function getDepositTargetCollIxs(
@@ -412,7 +402,7 @@ async function getDepositTargetCollIxs(
     context.market,
     targetCollAmount.mul(context.targetCollReserve.getMintFactor()).toString(), // in lamports
     context.targetCollReserve.getLiquidityMint(),
-    context.owner,
+    context.obligation.state.owner,
     context.obligation,
     context.useV2Ixs,
     undefined, // we create the scope refresh ix outside of KaminoAction
@@ -452,7 +442,7 @@ async function getWithdrawSourceCollIxs(
   args: SwapCollArgs,
   depositRemovedElevationGroup: boolean,
   context: SwapCollContext<any>
-): Promise<IInstruction[]> {
+): Promise<TransactionInstruction[]> {
   const withdrawnSourceCollLamports = args.isClosingSourceColl
     ? U64_MAX
     : args.sourceCollSwapAmount.mul(context.sourceCollReserve.getMintFactor()).toString();
@@ -461,7 +451,7 @@ async function getWithdrawSourceCollIxs(
     context.market,
     withdrawnSourceCollLamports,
     context.sourceCollReserve.getLiquidityMint(),
-    context.owner,
+    context.obligation.state.owner,
     context.obligation,
     context.useV2Ixs,
     undefined, // we create the scope refresh ix outside of KaminoAction
@@ -511,8 +501,8 @@ function elevationGroupIdToRequestAfterWithdraw(
 
 type ExternalSwapIxs<QuoteResponse> = {
   swapOutAmount: Decimal;
-  ixs: IInstruction[];
-  luts: Account<AddressLookupTable>[];
+  ixs: TransactionInstruction[];
+  luts: AddressLookupTableAccount[];
   simulationDetails: {
     quoteResponse?: QuoteResponse;
   };
@@ -520,7 +510,7 @@ type ExternalSwapIxs<QuoteResponse> = {
 
 async function getExternalSwapIxs<QuoteResponse>(
   args: SwapCollArgs,
-  klendAccounts: Address[],
+  klendAccounts: PublicKey[],
   context: SwapCollContext<QuoteResponse>
 ): Promise<Array<ExternalSwapIxs<QuoteResponse>>> {
   const externalSwapInputs = {
@@ -565,30 +555,36 @@ function checkResultingObligationValid(
     }
     if (debtReserveAddresses.length == 1) {
       const debtReserveAddress = debtReserveAddresses[0];
-      if (args.newElevationGroup.debtReserve !== debtReserveAddress) {
+      if (!args.newElevationGroup.debtReserve.equals(debtReserveAddress)) {
         throw new Error(
-          `The obligation with debt reserve ${debtReserveAddress} cannot request elevation group ${args.newElevationGroup.elevationGroup}`
+          `The obligation with debt reserve ${debtReserveAddress.toBase58()} cannot request elevation group ${
+            args.newElevationGroup.elevationGroup
+          }`
         );
       }
     }
 
     // Now the coll reserves: this requires first finding out the resulting set of deposits:
-    const collReserveAddresses = new Set<Address>([
+    const collReserveAddresses = new PublicKeySet([
       ...context.obligation.deposits.keys(),
       context.targetCollReserve.address,
     ]);
     if (args.isClosingSourceColl) {
-      collReserveAddresses.delete(context.sourceCollReserve.address);
+      collReserveAddresses.remove(context.sourceCollReserve.address);
     }
-    if (collReserveAddresses.size > args.newElevationGroup.maxReservesAsCollateral) {
+    if (collReserveAddresses.size() > args.newElevationGroup.maxReservesAsCollateral) {
       throw new Error(
-        `The obligation with ${collReserveAddresses.size} collateral reserves cannot request elevation group ${args.newElevationGroup.elevationGroup}`
+        `The obligation with ${collReserveAddresses.size()} collateral reserves cannot request elevation group ${
+          args.newElevationGroup.elevationGroup
+        }`
       );
     }
-    for (const collReserveAddress of [...collReserveAddresses]) {
-      if (!args.newElevationGroup.collateralReserves.has(collReserveAddress)) {
+    for (const collReserveAddress of collReserveAddresses.toArray()) {
+      if (!args.newElevationGroup.collateralReserves.contains(collReserveAddress)) {
         throw new Error(
-          `The obligation with collateral reserve ${collReserveAddress} cannot request elevation group ${args.newElevationGroup.elevationGroup}`
+          `The obligation with collateral reserve ${collReserveAddress.toBase58()} cannot request elevation group ${
+            args.newElevationGroup.elevationGroup
+          }`
         );
       }
     }
@@ -615,7 +611,7 @@ function checkResultingObligationValid(
   }
 }
 
-function listIxs(klendIxs: SwapCollKlendIxs, externalSwapIxs?: IInstruction[]): IInstruction[] {
+function listIxs(klendIxs: SwapCollKlendIxs, externalSwapIxs?: TransactionInstruction[]): TransactionInstruction[] {
   return [
     ...klendIxs.setupIxs,
     klendIxs.targetCollFlashBorrowIx,

package/src/leverage/calcs.ts

@@ -1,4 +1,4 @@
-import { Address, Slot } from '@solana/kit';
+import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import { collToLamportsDecimal, Kamino, StrategyWithAddress, TokenAmounts } from '@kamino-finance/kliquidity-sdk';
 import { KaminoMarket, KaminoObligation, KaminoReserve, toJson } from '../classes';
@@ -25,9 +25,9 @@ export interface LeverageCalcsArgs {
   withdrawAmount: Decimal;
   deposited: Decimal;
   borrowed: Decimal;
-  debtTokenMint: Address;
-  selectedTokenMint: Address;
-  collTokenMint: Address;
+  debtTokenMint: PublicKey;
+  selectedTokenMint: PublicKey;
+  collTokenMint: PublicKey;
   targetLeverage: Decimal;
   activeLeverageOption: LeverageOption;
   flashLoanFeeRatio: Decimal;
@@ -46,7 +46,7 @@ export interface LeverageCalcsResult {
 }
 
 export async function calculateMultiplyEffects(
-  getPriceByTokenMintDecimal: (mint: Address) => Promise<Decimal>,
+  getPriceByTokenMintDecimal: (mint: PublicKey | string) => Promise<Decimal>,
   {
     depositAmount,
     withdrawAmount,
@@ -210,8 +210,8 @@ interface UseEstimateWithdrawAmountsProps {
   amount: Decimal.Value;
   deposited: Decimal;
   borrowed: Decimal;
-  collTokenMint: Address;
-  selectedTokenMint: Address;
+  collTokenMint: PublicKey;
+  selectedTokenMint: PublicKey;
 }
 
 export const estimateWithdrawMode = (props: UseEstimateWithdrawAmountsProps) => {
@@ -232,8 +232,8 @@ export interface WithdrawParams {
   currentDepositPosition: Decimal;
   priceCollToDebt: Decimal;
   withdrawAmount: Decimal;
-  selectedTokenMint: Address;
-  collTokenMint: Address;
+  selectedTokenMint: PublicKey;
+  collTokenMint: PublicKey;
 }
 
 interface WithdrawResult {
@@ -259,8 +259,9 @@ export function calcWithdrawAmounts(params: WithdrawParams): WithdrawResult {
 
   const initialDepositInCollateralToken = currentDepositPosition.minus(currentBorrowPosition.div(priceCollToDebt));
 
-  const amountToWithdrawDepositToken =
-    selectedTokenMint === collTokenMint ? withdrawAmount : withdrawAmount.div(priceCollToDebt);
+  const amountToWithdrawDepositToken = selectedTokenMint.equals(collTokenMint)
+    ? withdrawAmount
+    : withdrawAmount.div(priceCollToDebt);
 
   const targetDeposit = initialDepositInCollateralToken.minus(amountToWithdrawDepositToken).mul(targetLeverage);
 
@@ -283,8 +284,8 @@ export function calcWithdrawAmounts(params: WithdrawParams): WithdrawResult {
 
 interface UseEstimateAdjustAmountsProps {
   targetLeverage: Decimal;
-  debtTokenMint: Address;
-  collTokenMint: Address;
+  debtTokenMint: PublicKey;
+  collTokenMint: PublicKey;
   totalDeposited: Decimal;
   totalBorrowed: Decimal;
   flashLoanFee: Decimal;
@@ -363,8 +364,8 @@ interface UseTransactionInfoStats {
   priceDebtToColl: Decimal;
   amount: Decimal;
   targetLeverage: Decimal;
-  selectedTokenMint: Address;
-  collTokenMint: Address;
+  selectedTokenMint: PublicKey;
+  collTokenMint: PublicKey;
   flashLoanFee: Decimal;
   slippagePct?: Decimal;
 }
@@ -381,7 +382,7 @@ export const estimateDepositMode = ({
   flashLoanFee,
   slippagePct = new Decimal(0),
 }: UseTransactionInfoStats) => {
-  const isDepositingCollToken = selectedTokenMint === collTokenMint;
+  const isDepositingCollToken = selectedTokenMint.equals(collTokenMint);
 
   const finalCollTokenAmount = isDepositingCollToken
     ? new Decimal(amount).mul(targetLeverage).toNumber()
@@ -537,7 +538,7 @@ export const depositLeverageCalcs = (props: {
 export const depositLeverageKtokenCalcs = async (props: {
   kamino: Kamino;
   strategy: StrategyWithAddress;
-  debtTokenMint: Address;
+  debtTokenMint: PublicKey;
   depositAmount: Decimal;
   depositTokenIsCollToken: boolean;
   depositTokenIsSol: boolean;
@@ -600,13 +601,12 @@ export const depositLeverageKtokenCalcs = async (props: {
     // So we use the actualColl as the amount we will deposit
     const [estimatedA, estimatedB, actualColl] = await simulateMintKToken(
       kamino!,
-      strategy,
+      strategy!,
       finalColl,
       strategyHoldings
     );
-    const { tokenAMint, tokenBMint } = strategy.strategy;
-    const pxAinB = await priceAinB(tokenAMint, tokenBMint);
-    const isTokenADeposit = tokenAMint === debtTokenMint;
+    const pxAinB = await priceAinB(strategy!.strategy.tokenAMint, strategy!.strategy.tokenBMint);
+    const isTokenADeposit = strategy.strategy.tokenAMint.equals(debtTokenMint);
     // Calculate the amount we need to flash borrow by combining value of A and B into the debt token
     const singleSidedDepositAmount = isTokenADeposit
       ? estimatedA.add(estimatedB.div(pxAinB))
@@ -646,10 +646,10 @@ export function withdrawLeverageCalcs(
   withdrawAmount: Decimal,
   deposited: Decimal,
   borrowed: Decimal,
-  currentSlot: Slot,
+  currentSlot: number,
   isClosingPosition: boolean,
   selectedTokenIsCollToken: boolean,
-  selectedTokenMint: Address,
+  selectedTokenMint: PublicKey,
   obligation: KaminoObligation,
   flashLoanFee: Decimal,
   slippagePct: Decimal
@@ -711,7 +711,7 @@ export function withdrawLeverageCalcs(
 
 export async function adjustDepositLeverageCalcs(
   market: KaminoMarket,
-  owner: Address,
+  owner: PublicKey,
   debtReserve: KaminoReserve,
   adjustDepositPosition: Decimal,
   adjustBorrowPosition: Decimal,
@@ -732,7 +732,7 @@ export async function adjustDepositLeverageCalcs(
     .div(priceDebtToColl);
 
   const expectedDebtTokenAtaBalance = await getExpectedTokenBalanceAfterBorrow(
-    market.getRpc(),
+    market.getConnection(),
     debtReserve.getLiquidityMint(),
     owner,
     collToLamportsDecimal(!collIsKtoken ? borrowAmount : amountToFlashBorrowDebt, debtReserve!.stats.decimals).floor(),