@kamino-finance/klend-sdk 5.11.5 → 5.11.6

package/src/classes/action.ts

@@ -63,6 +63,7 @@ import {
   getAssociatedTokenAddress,
   ScopePriceRefreshConfig,
   createAtasIdempotent,
+  SOL_PADDING_FOR_INTEREST,
   obligationFarmStatePda,
 } from '../utils';
 import { getTokenIdsForScopeRefresh, KaminoMarket } from './market';
@@ -75,8 +76,6 @@ import { VanillaObligation } from '../utils/ObligationType';
 import { PROGRAM_ID } from '../lib';
 import { Scope } from '@kamino-finance/scope-sdk';
 
-const SOL_PADDING_FOR_INTEREST = new BN('1000000');
-
 export type ActionType =
   | 'deposit'
   | 'borrow'
@@ -108,12 +107,6 @@ export class KaminoAction {
 
   referrer: PublicKey;
 
-  userTokenAccountAddress: PublicKey;
-
-  userCollateralAccountAddress: PublicKey;
-
-  additionalTokenAccountAddress?: PublicKey;
-
   /**
    * Null unless the obligation is not passed
    */
@@ -143,12 +136,6 @@ export class KaminoAction {
   cleanupIxs: Array<TransactionInstruction>;
   cleanupIxsLabels: Array<string>;
 
-  preTxnIxs: Array<TransactionInstruction>;
-  preTxnIxsLabels: Array<string>;
-
-  postTxnIxs: Array<TransactionInstruction>;
-  postTxnIxsLabels: Array<string>;
-
   refreshFarmsCleanupTxnIxs: Array<TransactionInstruction>;
   refreshFarmsCleanupTxnIxsLabels: Array<string>;
 
@@ -163,8 +150,6 @@ export class KaminoAction {
     kaminoMarket: KaminoMarket,
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType | null,
-    userTokenAccountAddress: PublicKey,
-    userCollateralAccountAddress: PublicKey,
     mint: PublicKey,
     positions: number,
     amount: string | BN,
@@ -173,7 +158,6 @@ export class KaminoAction {
     reserveState: KaminoReserve,
     currentSlot: number,
     secondaryMint?: PublicKey,
-    additionalTokenAccountAddress?: PublicKey,
     outflowReserveState?: KaminoReserve,
     outflowAmount?: string | BN,
     referrer?: PublicKey,
@@ -191,8 +175,6 @@ export class KaminoAction {
     this.amount = new BN(amount);
     this.mint = mint;
     this.positions = positions;
-    this.userTokenAccountAddress = userTokenAccountAddress;
-    this.userCollateralAccountAddress = userCollateralAccountAddress;
     this.computeBudgetIxs = [];
     this.computeBudgetIxsLabels = [];
     this.setupIxs = [];
@@ -203,15 +185,10 @@ export class KaminoAction {
     this.lendingIxsLabels = [];
     this.cleanupIxs = [];
     this.cleanupIxsLabels = [];
-    this.preTxnIxs = [];
-    this.preTxnIxsLabels = [];
-    this.postTxnIxs = [];
-    this.postTxnIxsLabels = [];
     this.refreshFarmsCleanupTxnIxs = [];
     this.refreshFarmsCleanupTxnIxsLabels = [];
     this.depositReserves = depositReserves;
     this.borrowReserves = borrowReserves;
-    this.additionalTokenAccountAddress = additionalTokenAccountAddress;
     this.secondaryMint = secondaryMint;
     this.reserve = reserveState;
     this.outflowReserve = outflowReserveState;
@@ -237,11 +214,6 @@ export class KaminoAction {
       throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
     }
 
-    const { userTokenAccountAddress, userCollateralAccountAddress } = KaminoAction.getUserAccountAddresses(
-      payer ?? owner,
-      reserve.state
-    );
-
     const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } =
       await KaminoAction.loadObligation(action, kaminoMarket, owner, reserve.address, obligation);
 
@@ -251,8 +223,6 @@ export class KaminoAction {
       kaminoMarket,
       owner,
       kaminoObligation || obligation,
-      userTokenAccountAddress,
-      userCollateralAccountAddress,
       mint,
       distinctReserveCount,
       amount,
@@ -263,7 +233,6 @@ export class KaminoAction {
       undefined,
       undefined,
       undefined,
-      undefined,
       referrerKey,
       payer
     );
@@ -1055,8 +1024,8 @@ export class KaminoAction {
       currentSlot
     );
 
-    axn.preTxnIxs.push(...createAtaIxs);
-    axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.toString()}]`);
+    axn.setupIxs.push(...createAtaIxs);
+    axn.setupIxsLabels.push(`createAtasIxs[${axn.owner.toString()}]`);
 
     if (!axn.referrer.equals(PublicKey.default)) {
       const referrerTokenState = referrerTokenStatePda(
@@ -1076,25 +1045,10 @@ export class KaminoAction {
   }
 
   async getTransactions() {
-    const txns: {
-      preLendingTxn: Transaction | null;
-      lendingTxn: Transaction | null;
-      postLendingTxn: Transaction | null;
-    } = {
-      preLendingTxn: null,
-      lendingTxn: null,
-      postLendingTxn: null,
-    };
-
-    if (this.preTxnIxs.length) {
-      txns.preLendingTxn = new Transaction({
-        feePayer: this.owner,
-        recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-      }).add(...this.preTxnIxs);
-    }
+    let txns: Transaction;
 
     if (this.lendingIxs.length === 2) {
-      txns.lendingTxn = new Transaction({
+      txns = new Transaction({
         feePayer: this.owner,
         recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
       }).add(
@@ -1105,30 +1059,19 @@ export class KaminoAction {
         ...this.cleanupIxs
       );
     } else {
-      txns.lendingTxn = new Transaction({
+      txns = new Transaction({
         feePayer: this.owner,
         recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
       }).add(...this.setupIxs, ...this.lendingIxs, ...this.cleanupIxs);
     }
 
-    if (this.postTxnIxs.length) {
-      txns.postLendingTxn = new Transaction({
-        feePayer: this.owner,
-        recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-      }).add(...this.postTxnIxs);
-    }
-
     return txns;
   }
 
   async sendTransactions(sendTransaction: (txn: Transaction, connection: Connection) => Promise<TransactionSignature>) {
     const txns = await this.getTransactions();
 
-    await this.sendSingleTransaction(txns.preLendingTxn, sendTransaction);
-
-    const signature = await this.sendSingleTransaction(txns.lendingTxn, sendTransaction);
-
-    await this.sendSingleTransaction(txns.postLendingTxn, sendTransaction);
+    const signature = await this.sendSingleTransaction(txns, sendTransaction);
 
     return signature;
   }
@@ -1153,11 +1096,7 @@ export class KaminoAction {
   ) {
     const txns = await this.getTransactions();
 
-    await this.simulateSingleTransaction(txns.preLendingTxn, sendTransaction);
-
-    const signature = await this.simulateSingleTransaction(txns.lendingTxn, sendTransaction);
-
-    await this.simulateSingleTransaction(txns.postLendingTxn, sendTransaction);
+    const signature = await this.simulateSingleTransaction(txns, sendTransaction);
 
     return signature;
   }
@@ -1188,8 +1127,8 @@ export class KaminoAction {
           reserveLiquidityMint: this.reserve.getLiquidityMint(),
           reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
           reserveCollateralMint: this.reserve.getCTokenMint(),
-          userSourceLiquidity: this.userTokenAccountAddress,
-          userDestinationCollateral: this.userCollateralAccountAddress,
+          userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+          userDestinationCollateral: this.getUserCollateralAccountAddress(this.reserve),
           collateralTokenProgram: TOKEN_PROGRAM_ID,
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1214,8 +1153,8 @@ export class KaminoAction {
           reserveLiquidityMint: this.reserve.getLiquidityMint(),
           reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
           reserveCollateralMint: this.reserve.getCTokenMint(),
-          userSourceCollateral: this.userCollateralAccountAddress,
-          userDestinationLiquidity: this.userTokenAccountAddress,
+          userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
+          userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
           collateralTokenProgram: TOKEN_PROGRAM_ID,
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1243,7 +1182,7 @@ export class KaminoAction {
           reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
           reserveCollateralMint: this.reserve.getCTokenMint(),
           reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-          userSourceLiquidity: this.userTokenAccountAddress,
+          userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
           placeholderUserDestinationCollateral: this.kaminoMarket.programId,
           collateralTokenProgram: TOKEN_PROGRAM_ID,
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1285,7 +1224,7 @@ export class KaminoAction {
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
             reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-            userSourceLiquidity: this.userTokenAccountAddress,
+            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1313,7 +1252,7 @@ export class KaminoAction {
           lendingMarket: this.kaminoMarket.getAddress(),
           depositReserve: this.reserve.address,
           reserveDestinationCollateral: this.reserve.state.collateral.supplyVault,
-          userSourceCollateral: this.userCollateralAccountAddress,
+          userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
           tokenProgram: TOKEN_PROGRAM_ID,
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
         },
@@ -1349,7 +1288,7 @@ export class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
             depositReserve: this.reserve.address,
             reserveDestinationCollateral: this.reserve.state.collateral.supplyVault,
-            userSourceCollateral: this.userCollateralAccountAddress,
+            userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
             tokenProgram: TOKEN_PROGRAM_ID,
             instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
           },
@@ -1384,7 +1323,7 @@ export class KaminoAction {
         borrowReserve: this.reserve.address,
         borrowReserveLiquidityMint: this.reserve.getLiquidityMint(),
         reserveSourceLiquidity: this.reserve.state.liquidity.supplyVault,
-        userDestinationLiquidity: this.userTokenAccountAddress,
+        userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
         borrowReserveLiquidityFeeReceiver: this.reserve.state.liquidity.feeVault,
         referrerTokenState: referrerTokenStatePda(this.referrer, this.reserve.address, this.kaminoMarket.programId)[0],
         tokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1431,7 +1370,7 @@ export class KaminoAction {
           borrowReserve: this.reserve.address,
           borrowReserveLiquidityMint: this.reserve.getLiquidityMint(),
           reserveSourceLiquidity: this.reserve.state.liquidity.supplyVault,
-          userDestinationLiquidity: this.userTokenAccountAddress,
+          userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
           borrowReserveLiquidityFeeReceiver: this.reserve.state.liquidity.feeVault,
           referrerTokenState: referrerTokenStatePda(
             this.referrer,
@@ -1471,7 +1410,7 @@ export class KaminoAction {
           reserveCollateralMint: this.reserve.getCTokenMint(),
           reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
           reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
-          userDestinationLiquidity: this.userTokenAccountAddress,
+          userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
           placeholderUserDestinationCollateral: this.kaminoMarket.programId,
           collateralTokenProgram: TOKEN_PROGRAM_ID,
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1513,7 +1452,7 @@ export class KaminoAction {
             reserveCollateralMint: this.reserve.getCTokenMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
-            userDestinationLiquidity: this.userTokenAccountAddress,
+            userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1549,7 +1488,7 @@ export class KaminoAction {
         lendingMarket: this.kaminoMarket.getAddress(),
         repayReserve: this.reserve.address,
         reserveLiquidityMint: this.reserve.getLiquidityMint(),
-        userSourceLiquidity: this.userTokenAccountAddress,
+        userSourceLiquidity: this.getTokenAccountAddressByUser(this.reserve, this.payer),
         reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
         tokenProgram: this.reserve.getLiquidityTokenProgram(),
         instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1594,7 +1533,7 @@ export class KaminoAction {
           lendingMarket: this.kaminoMarket.getAddress(),
           repayReserve: this.reserve.address,
           reserveLiquidityMint: this.reserve.getLiquidityMint(),
-          userSourceLiquidity: this.userTokenAccountAddress,
+          userSourceLiquidity: this.getTokenAccountAddressByUser(this.reserve, this.payer),
           reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
           tokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1630,7 +1569,7 @@ export class KaminoAction {
           reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
           reserveCollateralMint: this.reserve.getCTokenMint(),
           reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-          userSourceLiquidity: this.userTokenAccountAddress,
+          userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
           placeholderUserDestinationCollateral: this.kaminoMarket.programId,
           collateralTokenProgram: TOKEN_PROGRAM_ID,
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1644,10 +1583,6 @@ export class KaminoAction {
       throw new Error(`outflowReserve not set`);
     }
 
-    if (!this.additionalTokenAccountAddress) {
-      throw new Error(`additionalTokenAccountAddress not set`);
-    }
-
     if (!this.outflowAmount) {
       throw new Error(`outflowAmount not set`);
     }
@@ -1672,7 +1607,7 @@ export class KaminoAction {
         borrowReserve: this.outflowReserve.address,
         borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
         reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
-        userDestinationLiquidity: this.additionalTokenAccountAddress,
+        userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
         borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
         referrerTokenState: referrerTokenStatePda(
           this.referrer,
@@ -1722,7 +1657,7 @@ export class KaminoAction {
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
             reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-            userSourceLiquidity: this.userTokenAccountAddress,
+            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1739,10 +1674,6 @@ export class KaminoAction {
       throw new Error(`outflowReserve not set`);
     }
 
-    if (!this.additionalTokenAccountAddress) {
-      throw new Error(`additionalTokenAccountAddress not set`);
-    }
-
     if (!this.outflowAmount) {
       throw new Error(`outflowAmount not set`);
     }
@@ -1781,7 +1712,7 @@ export class KaminoAction {
           borrowReserve: this.outflowReserve.address,
           borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
           reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
-          userDestinationLiquidity: this.additionalTokenAccountAddress,
+          userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
           borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
           referrerTokenState: referrerTokenStatePda(
             this.referrer,
@@ -1823,7 +1754,7 @@ export class KaminoAction {
         lendingMarket: this.kaminoMarket.getAddress(),
         repayReserve: this.reserve!.address,
         reserveLiquidityMint: this.reserve.getLiquidityMint(),
-        userSourceLiquidity: this.userTokenAccountAddress,
+        userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
         reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
         tokenProgram: this.reserve.getLiquidityTokenProgram(),
         instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1838,10 +1769,6 @@ export class KaminoAction {
       throw new Error(`outflowReserve not set`);
     }
 
-    if (!this.additionalTokenAccountAddress) {
-      throw new Error(`additionalTokenAccountAddress not set`);
-    }
-
     if (!this.outflowAmount) {
       throw new Error(`outflowAmount not set`);
     }
@@ -1861,7 +1788,7 @@ export class KaminoAction {
           reserveCollateralMint: this.outflowReserve.getCTokenMint(),
           reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
           reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-          userDestinationLiquidity: this.additionalTokenAccountAddress,
+          userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
           placeholderUserDestinationCollateral: this.kaminoMarket.programId,
           collateralTokenProgram: TOKEN_PROGRAM_ID,
           liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
@@ -1905,7 +1832,7 @@ export class KaminoAction {
           lendingMarket: this.kaminoMarket.getAddress(),
           repayReserve: this.reserve!.address,
           reserveLiquidityMint: this.reserve.getLiquidityMint(),
-          userSourceLiquidity: this.userTokenAccountAddress,
+          userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
           reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
           tokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1924,10 +1851,6 @@ export class KaminoAction {
       throw new Error(`outflowReserve not set`);
     }
 
-    if (!this.additionalTokenAccountAddress) {
-      throw new Error(`additionalTokenAccountAddress not set`);
-    }
-
     if (!this.outflowAmount) {
       throw new Error(`outflowAmount not set`);
     }
@@ -1961,7 +1884,7 @@ export class KaminoAction {
             reserveCollateralMint: this.outflowReserve.getCTokenMint(),
             reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
             reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-            userDestinationLiquidity: this.additionalTokenAccountAddress,
+            userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
@@ -1980,9 +1903,6 @@ export class KaminoAction {
     if (!this.outflowReserve) {
       throw Error(`Withdraw reserve during liquidation is not defined`);
     }
-    if (!this.additionalTokenAccountAddress) {
-      throw Error(`Liquidating token account address is not defined`);
-    }
 
     const depositReservesList = this.getAdditionalDepositReservesList();
     const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -2009,9 +1929,9 @@ export class KaminoAction {
         withdrawReserveCollateralMint: this.outflowReserve.getCTokenMint(),
         withdrawReserveCollateralSupply: this.outflowReserve.state.collateral.supplyVault,
         withdrawReserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-        userSourceLiquidity: this.additionalTokenAccountAddress,
-        userDestinationCollateral: this.userCollateralAccountAddress,
-        userDestinationLiquidity: this.userTokenAccountAddress,
+        userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+        userDestinationCollateral: this.getUserCollateralAccountAddress(this.outflowReserve),
+        userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
         withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
         collateralTokenProgram: TOKEN_PROGRAM_ID,
         repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -2032,9 +1952,6 @@ export class KaminoAction {
     if (!this.outflowReserve) {
       throw Error(`Withdraw reserve during liquidation is not defined`);
     }
-    if (!this.additionalTokenAccountAddress) {
-      throw Error(`Liquidating token account address is not defined`);
-    }
 
     const depositReservesList = this.getAdditionalDepositReservesList();
     const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -2085,9 +2002,9 @@ export class KaminoAction {
           withdrawReserveCollateralMint: this.outflowReserve.getCTokenMint(),
           withdrawReserveCollateralSupply: this.outflowReserve.state.collateral.supplyVault,
           withdrawReserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-          userSourceLiquidity: this.additionalTokenAccountAddress,
-          userDestinationCollateral: this.userCollateralAccountAddress,
-          userDestinationLiquidity: this.userTokenAccountAddress,
+          userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+          userDestinationCollateral: this.getUserCollateralAccountAddress(this.outflowReserve),
+          userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
           withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
           collateralTokenProgram: TOKEN_PROGRAM_ID,
           repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -2920,7 +2837,7 @@ export class KaminoAction {
         reserveLiquidityMint: this.reserve.getLiquidityMint(),
         referrerTokenState: referrerTokenStateAddress,
         reserveSupplyLiquidity: this.reserve.state.liquidity.supplyVault,
-        referrerTokenAccount: this.userTokenAccountAddress,
+        referrerTokenAccount: this.getUserTokenAccountAddress(this.reserve),
         lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
         tokenProgram: this.reserve.getLiquidityTokenProgram(),
       },
@@ -2947,7 +2864,7 @@ export class KaminoAction {
         this.reserve.getLiquidityMint(),
         this.owner,
         this.reserve.getLiquidityTokenProgram(),
-        this.userTokenAccountAddress
+        this.getUserTokenAccountAddress(this.reserve)
       );
 
       this.setupIxs.unshift(createUserTokenAccountIx);
@@ -2956,7 +2873,7 @@ export class KaminoAction {
 
     if (action === 'liquidate') {
       if (!this.outflowReserve) {
-        throw new Error(`Outflow reserve state not found ${this.mint}`);
+        throw new Error(`Outflow reserve state not found ${this.secondaryMint}`);
       }
 
       const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
@@ -2964,40 +2881,36 @@ export class KaminoAction {
         this.outflowReserve.getLiquidityMint(),
         this.owner,
         this.outflowReserve.getLiquidityTokenProgram(),
-        this.userTokenAccountAddress
+        this.getUserTokenAccountAddress(this.outflowReserve)
       );
 
       this.setupIxs.unshift(createUserTokenAccountIx);
-      this.setupIxsLabels.unshift(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
+      this.setupIxsLabels.unshift(`CreateUserAta[${this.getUserTokenAccountAddress(this.outflowReserve).toBase58()}]`);
 
       const [, createUserCollateralAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
         this.owner,
         this.outflowReserve.getCTokenMint(),
         this.owner,
         TOKEN_PROGRAM_ID,
-        this.userCollateralAccountAddress
+        this.getUserCollateralAccountAddress(this.outflowReserve)
       );
 
       this.setupIxs.unshift(createUserCollateralAccountIx);
-      this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-
-      if (!this.additionalTokenAccountAddress) {
-        throw new Error(`Additional token account address not found ${this.mint}`);
-      }
+      this.setupIxsLabels.unshift(
+        `CreateCollateralUserAta[${this.getUserCollateralAccountAddress(this.outflowReserve).toString()}]`
+      );
     }
 
     if (action === 'depositAndBorrow' || (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(NATIVE_MINT))) {
-      if (!this.additionalTokenAccountAddress) {
-        throw new Error(`Additional token account address not found ${this.secondaryMint}`);
-      }
-
       if (!this.outflowReserve) {
         throw new Error(`Outflow reserve state not found ${this.mint}`);
       }
 
+      const additionalUserTokenAccountAddress = this.getUserTokenAccountAddress(this.outflowReserve);
+
       const additionalUserTokenAccountInfo = await this.kaminoMarket
         .getConnection()
-        .getAccountInfo(this.additionalTokenAccountAddress);
+        .getAccountInfo(additionalUserTokenAccountAddress);
 
       if (!additionalUserTokenAccountInfo) {
         const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
@@ -3005,7 +2918,7 @@ export class KaminoAction {
           this.outflowReserve.getLiquidityMint(),
           this.owner,
           this.outflowReserve.getLiquidityTokenProgram(),
-          this.additionalTokenAccountAddress
+          additionalUserTokenAccountAddress
         );
 
         this.setupIxs.unshift(createUserTokenAccountIx);
@@ -3019,23 +2932,24 @@ export class KaminoAction {
         this.reserve.getLiquidityMint(),
         this.owner,
         this.reserve.getLiquidityTokenProgram(),
-        this.userTokenAccountAddress
+        this.getUserTokenAccountAddress(this.reserve)
       );
-      this.preTxnIxs.push(createUserTokenAccountIx);
-      this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
+      this.setupIxs.unshift(createUserTokenAccountIx);
+      this.setupIxsLabels.unshift(`CreateUserAta[${this.getUserTokenAccountAddress(this.reserve).toBase58()}]`);
     }
     if (action === 'mint') {
-      const collateralMintPubkey = this.reserve.getCTokenMint();
       const [, createUserCollateralAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
         this.owner,
-        collateralMintPubkey,
+        this.reserve.getCTokenMint(),
         this.owner,
         TOKEN_PROGRAM_ID,
-        this.userCollateralAccountAddress
+        this.getUserCollateralAccountAddress(this.reserve)
       );
 
       this.setupIxs.unshift(createUserCollateralAccountIx);
-      this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
+      this.setupIxsLabels.unshift(
+        `CreateCollateralUserAta[${this.getUserCollateralAccountAddress(this.reserve).toString()}]`
+      );
     }
   }
 
@@ -3077,12 +2991,14 @@ export class KaminoAction {
       );
     }
 
-    let userTokenAccountAddress = this.userTokenAccountAddress;
+    let userTokenAccountAddress = this.getUserTokenAccountAddress(this.reserve);
     if (this.secondaryMint?.equals(NATIVE_MINT)) {
-      if (!this.additionalTokenAccountAddress) {
-        throw new Error(`Additional token account address not found ${this.secondaryMint}`);
+      if (!this.outflowReserve) {
+        throw new Error(`Outflow reserve state not found ${this.secondaryMint}`);
       }
-      userTokenAccountAddress = this.additionalTokenAccountAddress;
+
+      const additionalUserTokenAccountAddress = this.getUserTokenAccountAddress(this.outflowReserve);
+      userTokenAccountAddress = additionalUserTokenAccountAddress;
     }
 
     const userWSOLAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(userTokenAccountAddress);
@@ -3094,7 +3010,7 @@ export class KaminoAction {
       action === 'deposit' ||
       action === 'repay' ||
       action === 'mint' ||
-      (action === 'liquidate' && this.secondaryMint?.equals(NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
+      (action === 'liquidate' && this.mint?.equals(NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
 
     const transferLamportsIx = SystemProgram.transfer({
       fromPubkey: this.owner,
@@ -3163,16 +3079,6 @@ export class KaminoAction {
       throw new Error('reserve states are not fetched');
     }
 
-    const {
-      userTokenAccountAddress: userOutflowTokenAccountAddress,
-      userCollateralAccountAddress: userOutflowCollateralAccountAddress,
-    } = KaminoAction.getUserAccountAddresses(payer, outflowReserve.state);
-
-    const {
-      userTokenAccountAddress: userInflowTokenAccountAddress,
-      userCollateralAccountAddress: userInflowCollateralAccountAddress,
-    } = KaminoAction.getUserAccountAddresses(payer, inflowReserve.state);
-
     const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } =
       await KaminoAction.loadObligation(
         action,
@@ -3184,30 +3090,12 @@ export class KaminoAction {
       );
     const referrerKey = await this.getReferrerKey(kaminoMarket, payer, kaminoObligation, referrer);
 
-    let userTokenAccountAddress: PublicKey;
-    let userCollateralAccountAddress: PublicKey;
-    let additionalUserTokenAccountAddress: PublicKey;
     let secondaryMint: PublicKey;
     let primaryMint: PublicKey;
 
-    if (action === 'liquidate') {
-      userTokenAccountAddress = userOutflowTokenAccountAddress;
-      userCollateralAccountAddress = userOutflowCollateralAccountAddress;
-      additionalUserTokenAccountAddress = userInflowTokenAccountAddress;
-      primaryMint = outflowTokenMint;
-      secondaryMint = inflowTokenMint;
-    } else if (action === 'depositAndBorrow') {
-      userTokenAccountAddress = userInflowTokenAccountAddress;
-      userCollateralAccountAddress = userInflowCollateralAccountAddress;
-      additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
+    if (action === 'liquidate' || action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
       primaryMint = inflowTokenMint;
       secondaryMint = outflowTokenMint;
-    } else if (action === 'repayAndWithdraw') {
-      primaryMint = inflowTokenMint;
-      secondaryMint = outflowTokenMint;
-      userTokenAccountAddress = userInflowTokenAccountAddress;
-      userCollateralAccountAddress = userOutflowCollateralAccountAddress;
-      additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
     } else {
       throw new Error('Invalid action');
     }
@@ -3216,8 +3104,6 @@ export class KaminoAction {
       kaminoMarket,
       payer,
       kaminoObligation || obligation,
-      userTokenAccountAddress,
-      userCollateralAccountAddress,
       primaryMint,
       distinctReserveCount,
       inflowAmount,
@@ -3226,7 +3112,6 @@ export class KaminoAction {
       inflowReserve,
       currentSlot,
       secondaryMint,
-      additionalUserTokenAccountAddress,
       outflowReserve,
       outflowAmount,
       referrerKey
@@ -3244,22 +3129,18 @@ export class KaminoAction {
       throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
     }
 
-    const [{ ata, createAtaIx }] = createAtasIdempotent(owner, [
+    const [{ createAtaIx }] = createAtasIdempotent(owner, [
       {
         mint: reserve.getLiquidityMint(),
         tokenProgram: reserve.getLiquidityTokenProgram(),
       },
     ]);
 
-    const userTokenAccountAddress = ata;
-
     return {
       axn: new KaminoAction(
         kaminoMarket,
         owner,
         new VanillaObligation(kaminoMarket.programId),
-        userTokenAccountAddress,
-        PublicKey.default,
         mint,
         0,
         new BN(0),
@@ -3336,6 +3217,18 @@ export class KaminoAction {
     return referrerKey;
   }
 
+  getUserTokenAccountAddress(reserve: KaminoReserve): PublicKey {
+    return getAssociatedTokenAddress(reserve.getLiquidityMint(), this.owner, true, reserve.getLiquidityTokenProgram());
+  }
+
+  getTokenAccountAddressByUser(reserve: KaminoReserve, user: PublicKey): PublicKey {
+    return getAssociatedTokenAddress(reserve.getLiquidityMint(), user, true, reserve.getLiquidityTokenProgram());
+  }
+
+  getUserCollateralAccountAddress(reserve: KaminoReserve): PublicKey {
+    return getAssociatedTokenAddress(reserve.getCTokenMint(), this.owner, true);
+  }
+
   public static actionToIxs(action: KaminoAction): Array<TransactionInstruction> {
     const ixs: TransactionInstruction[] = [...action.computeBudgetIxs, ...action.setupIxs];
     ixs.push(...KaminoAction.actionToLendingIxs(action));
@@ -3362,13 +3255,13 @@ export class KaminoAction {
   }
 
   public static actionToLendingIxLabels(action: KaminoAction): Array<string> {
-    const lables: string[] = [];
+    const labels: string[] = [];
     for (let i = 0; i < action.lendingIxsLabels.length; i++) {
-      lables.push(action.lendingIxsLabels[i]);
+      labels.push(action.lendingIxsLabels[i]);
       if (i !== action.lendingIxsLabels.length - 1) {
-        lables.push(...action.inBetweenIxsLabels);
+        labels.push(...action.inBetweenIxsLabels);
       }
     }
-    return lables;
+    return labels;
   }
 }