@kamino-finance/klend-sdk 3.2.26 → 4.0.0

package/dist/classes/action.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,12 +21,45 @@ exports.BORROWS_LIMIT = 5;
 exports.DEPOSITS_LIMIT = 8;
 const SOL_PADDING_FOR_INTEREST = new bn_js_1.default('1000000');
 class KaminoAction {
+    kaminoMarket;
+    reserve;
+    outflowReserve;
+    owner;
+    payer;
+    obligation = null;
+    referrer;
+    userTokenAccountAddress;
+    userCollateralAccountAddress;
+    additionalTokenAccountAddress;
+    /**
+     * Null unless the obligation is not passed
+     */
+    obligationType = null;
+    mint;
+    secondaryMint;
+    positions;
+    amount;
+    outflowAmount;
+    setupIxs;
+    setupIxsLabels;
+    inBetweenIxs;
+    inBetweenIxsLabels;
+    lendingIxs;
+    lendingIxsLabels;
+    cleanupIxs;
+    cleanupIxsLabels;
+    preTxnIxs;
+    preTxnIxsLabels;
+    postTxnIxs;
+    postTxnIxsLabels;
+    refreshFarmsCleanupTxnIxs;
+    refreshFarmsCleanupTxnIxsLabels;
+    depositReserves;
+    borrowReserves;
+    preLoadedDepositReservesSameTx;
+    preLoadedBorrowReservesSameTx;
+    currentSlot;
     constructor(kaminoMarket, owner, obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, positions, amount, depositReserves, borrowReserves, reserveState, currentSlot, secondaryMint, additionalTokenAccountAddress, outflowReserveState, outflowAmount, referrer, payer) {
-        this.obligation = null;
-        /**
-         * Null unless the obligation is not passed
-         */
-        this.obligationType = null;
         if (obligation instanceof obligation_1.KaminoObligation) {
             this.obligation = obligation;
         }
@@ -44,7 +68,7 @@ class KaminoAction {
         }
         this.kaminoMarket = kaminoMarket;
         this.owner = owner;
-        this.payer = payer !== null && payer !== void 0 ? payer : owner;
+        this.payer = payer ?? owner;
         this.amount = new bn_js_1.default(amount);
         this.mint = mint;
         this.positions = positions;
@@ -76,123 +100,113 @@ class KaminoAction {
         this.referrer = referrer ? referrer : web3_js_1.PublicKey.default;
         this.currentSlot = currentSlot;
     }
-    static initialize(action_1, amount_1, mint_1, owner_1, kaminoMarket_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (action, amount, mint, owner, kaminoMarket, obligation, referrer = web3_js_1.PublicKey.default, currentSlot = 0, payer) {
-            const reserve = kaminoMarket.getReserveByMint(mint);
-            if (reserve === undefined) {
-                throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
-            }
-            const { userTokenAccountAddress, userCollateralAccountAddress } = KaminoAction.getUserAccountAddresses(payer !== null && payer !== void 0 ? payer : owner, reserve.state);
-            const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = yield KaminoAction.loadObligation(action, kaminoMarket, owner, reserve.address, obligation);
-            const referrerKey = yield this.getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer);
-            return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, undefined, undefined, undefined, undefined, referrerKey, payer);
-        });
+    static async initialize(action, amount, mint, owner, kaminoMarket, obligation, referrer = web3_js_1.PublicKey.default, currentSlot = 0, payer) {
+        const reserve = kaminoMarket.getReserveByMint(mint);
+        if (reserve === undefined) {
+            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);
+        const referrerKey = await this.getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer);
+        return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, undefined, undefined, undefined, undefined, referrerKey, payer);
     }
     static getUserAccountAddresses(owner, reserve) {
         const userTokenAccountAddress = (0, utils_1.getAssociatedTokenAddress)(reserve.liquidity.mintPubkey, owner, true, reserve.liquidity.tokenProgram, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
         const userCollateralAccountAddress = (0, utils_1.getAssociatedTokenAddress)(reserve.collateral.mintPubkey, owner, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
         return { userTokenAccountAddress, userCollateralAccountAddress };
     }
-    static loadObligation(action, kaminoMarket, owner, reserve, obligation, outflowReserve) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let kaminoObligation;
-            const depositReserves = [];
-            const borrowReserves = [];
-            if (obligation instanceof obligation_1.KaminoObligation) {
-                kaminoObligation = obligation;
-            }
-            else {
-                const obligationAddress = obligation.toPda(kaminoMarket.getAddress(), owner);
-                kaminoObligation = yield obligation_1.KaminoObligation.load(kaminoMarket, obligationAddress);
-            }
-            if (kaminoObligation !== null) {
-                depositReserves.push(...[...kaminoObligation.deposits.keys()]);
-                borrowReserves.push(...[...kaminoObligation.borrows.keys()]);
-            }
-            if (!outflowReserve && action === 'depositAndBorrow') {
-                throw new Error(`Outflow reserve has not been set for depositAndBorrow`);
-            }
-            // Union of addresses
-            const distinctReserveCount = new utils_1.PublicKeySet([
-                ...borrowReserves.map((e) => e),
-                ...(action === 'borrow' ? [reserve] : []),
-                ...(action === 'depositAndBorrow' ? [reserve] : []),
-            ]).toArray().length +
-                new utils_1.PublicKeySet([
-                    ...depositReserves.map((e) => e),
-                    ...(action === 'deposit' ? [reserve] : []),
-                    ...(action === 'depositAndBorrow' ? [outflowReserve] : []),
-                ]).toArray().length;
-            if (distinctReserveCount > exports.POSITION_LIMIT) {
-                throw Error(`Obligation already has max number of positions: ${exports.POSITION_LIMIT}`);
-            }
-            return {
-                kaminoObligation,
-                depositReserves,
-                borrowReserves,
-                distinctReserveCount,
-            };
-        });
+    static async loadObligation(action, kaminoMarket, owner, reserve, obligation, outflowReserve) {
+        let kaminoObligation;
+        const depositReserves = [];
+        const borrowReserves = [];
+        if (obligation instanceof obligation_1.KaminoObligation) {
+            kaminoObligation = obligation;
+        }
+        else {
+            const obligationAddress = obligation.toPda(kaminoMarket.getAddress(), owner);
+            kaminoObligation = await obligation_1.KaminoObligation.load(kaminoMarket, obligationAddress);
+        }
+        if (kaminoObligation !== null) {
+            depositReserves.push(...[...kaminoObligation.deposits.keys()]);
+            borrowReserves.push(...[...kaminoObligation.borrows.keys()]);
+        }
+        if (!outflowReserve && action === 'depositAndBorrow') {
+            throw new Error(`Outflow reserve has not been set for depositAndBorrow`);
+        }
+        // Union of addresses
+        const distinctReserveCount = new utils_1.PublicKeySet([
+            ...borrowReserves.map((e) => e),
+            ...(action === 'borrow' ? [reserve] : []),
+            ...(action === 'depositAndBorrow' ? [reserve] : []),
+        ]).toArray().length +
+            new utils_1.PublicKeySet([
+                ...depositReserves.map((e) => e),
+                ...(action === 'deposit' ? [reserve] : []),
+                ...(action === 'depositAndBorrow' ? [outflowReserve] : []),
+            ]).toArray().length;
+        if (distinctReserveCount > exports.POSITION_LIMIT) {
+            throw Error(`Obligation already has max number of positions: ${exports.POSITION_LIMIT}`);
+        }
+        return {
+            kaminoObligation,
+            depositReserves,
+            borrowReserves,
+            distinctReserveCount,
+        };
     }
-    static buildRefreshObligationTxns(kaminoMarket_1, payer_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, payer, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        currentSlot = 0) {
-            //  placeholder for action initialization
-            const firstReserve = obligation.state.deposits[0].depositReserve;
-            const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
-            if (!firstKaminoReserve) {
-                throw new Error(`Reserve ${firstReserve.toBase58()} not found`);
-            }
-            const axn = yield KaminoAction.initialize('refreshObligation', '0', firstKaminoReserve === null || firstKaminoReserve === void 0 ? void 0 : firstKaminoReserve.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, undefined, currentSlot);
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            axn.addRefreshObligation(payer);
-            return axn;
-        });
+    static async buildRefreshObligationTxns(kaminoMarket, payer, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    currentSlot = 0) {
+        //  placeholder for action initialization
+        const firstReserve = obligation.state.deposits[0].depositReserve;
+        const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
+        if (!firstKaminoReserve) {
+            throw new Error(`Reserve ${firstReserve.toBase58()} not found`);
+        }
+        const axn = await KaminoAction.initialize('refreshObligation', '0', firstKaminoReserve?.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, undefined, currentSlot);
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        axn.addRefreshObligation(payer);
+        return axn;
     }
-    static buildRequestElevationGroupTxns(kaminoMarket_1, payer_1, obligation_2, elevationGroup_1) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, payer, obligation, elevationGroup, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        currentSlot = 0) {
-            const firstReserve = obligation.state.deposits.find((x) => !x.depositReserve.equals(web3_js_1.PublicKey.default)).depositReserve;
-            const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
-            if (!firstKaminoReserve) {
-                throw new Error(`Reserve ${firstReserve.toBase58()} not found`);
-            }
-            const axn = yield KaminoAction.initialize('requestElevationGroup', '0', firstKaminoReserve === null || firstKaminoReserve === void 0 ? void 0 : firstKaminoReserve.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, undefined, currentSlot);
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            axn.addRefreshObligation(payer);
-            axn.addRequestElevationIx(elevationGroup, 'setup');
-            return axn;
-        });
+    static async buildRequestElevationGroupTxns(kaminoMarket, payer, obligation, elevationGroup, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    currentSlot = 0) {
+        const firstReserve = obligation.state.deposits.find((x) => !x.depositReserve.equals(web3_js_1.PublicKey.default)).depositReserve;
+        const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
+        if (!firstKaminoReserve) {
+            throw new Error(`Reserve ${firstReserve.toBase58()} not found`);
+        }
+        const axn = await KaminoAction.initialize('requestElevationGroup', '0', firstKaminoReserve?.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, undefined, currentSlot);
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        axn.addRefreshObligation(payer);
+        axn.addRequestElevationIx(elevationGroup, 'setup');
+        return axn;
     }
-    static buildDepositTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
-        ) {
-            const axn = yield KaminoAction.initialize('deposit', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
-            const addInitObligationForFarm = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, undefined, overrideElevationGroupRequest);
-            axn.addDepositIx();
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
+    ) {
+        const axn = await KaminoAction.initialize('deposit', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, undefined, overrideElevationGroupRequest);
+        axn.addDepositIx();
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
     getTokenIdsForScopeRefresh(kaminoMarket, reserves) {
         const tokenIds = [];
@@ -216,197 +230,181 @@ class KaminoAction {
         }
         return tokenIds;
     }
-    addScopeRefreshIxs(tokens_1) {
-        return __awaiter(this, arguments, void 0, function* (tokens, feed = 'hubble') {
-            this.preTxnIxsLabels.unshift(`refreshScopePrices`);
-            this.preTxnIxs.unshift(yield this.kaminoMarket.scope.refreshPriceListIx({
-                feed: feed,
-            }, tokens));
-        });
+    async addScopeRefreshIxs(tokens, feed = 'hubble') {
+        this.preTxnIxsLabels.unshift(`refreshScopePrices`);
+        this.preTxnIxs.unshift(await this.kaminoMarket.scope.refreshPriceListIx({
+            feed: feed,
+        }, tokens));
     }
-    static buildBorrowTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
-        ) {
-            const axn = yield KaminoAction.initialize('borrow', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
-            const addInitObligationForFarm = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, undefined, overrideElevationGroupRequest);
-            axn.addBorrowIx();
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
+    ) {
+        const axn = await KaminoAction.initialize('borrow', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, undefined, overrideElevationGroupRequest);
+        axn.addBorrowIx();
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
-    static buildDepositReserveLiquidityTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-            const axn = yield KaminoAction.initialize('mint', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
-            const addInitObligationForFarm = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('mint', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-            axn.addDepositReserveLiquidityIx();
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initialize('mint', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('mint', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        axn.addDepositReserveLiquidityIx();
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
-    static buildRedeemReserveCollateralTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-            const axn = yield KaminoAction.initialize('redeem', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
-            const addInitObligationForFarm = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('redeem', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-            axn.addRedeemReserveCollateralIx();
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
+    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initialize('redeem', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('redeem', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        axn.addRedeemReserveCollateralIx();
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
-    static buildDepositObligationCollateralTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-            const axn = yield KaminoAction.initialize('depositCollateral', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
-            const addInitObligationForFarm = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-            axn.addDepositObligationCollateralIx();
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initialize('depositCollateral', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        axn.addDepositObligationCollateralIx();
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
-    static buildDepositAndBorrowTxns(kaminoMarket_1, depositAmount_1, depositMint_1, borrowAmount_1, borrowMint_1, payer_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-            const axn = yield KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, payer, payer, obligation, borrowAmount, referrer, currentSlot);
-            const addInitObligationForFarmForDeposit = true;
-            const addInitObligationForFarmForBorrow = false;
-            const twoTokenAction = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-                axn.outflowReserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, twoTokenAction);
-            yield axn.addDepositAndBorrowIx();
-            yield axn.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow);
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
+    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, payer, payer, obligation, borrowAmount, referrer, currentSlot);
+        const addInitObligationForFarmForDeposit = true;
+        const addInitObligationForFarmForBorrow = false;
+        const twoTokenAction = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+            axn.outflowReserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, twoTokenAction);
+        await axn.addDepositAndBorrowIx();
+        await axn.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow);
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
-    static buildRepayAndWithdrawTxns(kaminoMarket_1, repayAmount_1, repayMint_1, withdrawAmount_1, withdrawMint_1, payer_1, currentSlot_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-        isClosingPosition = false, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-            const axn = yield KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
-            const addInitObligationForFarmForRepay = true;
-            const addInitObligationForFarmForWithdraw = false;
-            const twoTokenAction = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-                axn.outflowReserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, twoTokenAction);
-            yield axn.addRepayAndWithdrawIxs();
-            yield axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw, isClosingPosition);
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
+    isClosingPosition = false, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
+        const addInitObligationForFarmForRepay = true;
+        const addInitObligationForFarmForWithdraw = false;
+        const twoTokenAction = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+            axn.outflowReserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, twoTokenAction);
+        await axn.addRepayAndWithdrawIxs();
+        await axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw, isClosingPosition);
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
-    static buildWithdrawTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-            const axn = yield KaminoAction.initialize('withdraw', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
-            const addInitObligationForFarm = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-            yield axn.addWithdrawIx();
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initialize('withdraw', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        await axn.addWithdrawIx();
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
     /**
      *
@@ -423,131 +421,115 @@ class KaminoAction {
      * @param includeUserMetadata - if true it includes user metadata
      * @param referrer
      */
-    static buildRepayTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2, currentSlot_1) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, currentSlot, payer = undefined, extraComputeBudget = 1000000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-            const axn = yield KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, payer);
-            const addInitObligationForFarm = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-            yield axn.addRepayIx();
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, currentSlot, payer = undefined, extraComputeBudget = 1_000_000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, payer);
+        const addInitObligationForFarm = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        await axn.addRepayIx();
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
-    static buildLiquidateTxns(kaminoMarket_1, amount_1, minCollateralReceiveAmount_1, repayTokenMint_1, withdrawTokenMint_1, liquidator_1, obligationOwner_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-        includeAtaIxns = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
-        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-            const axn = yield KaminoAction.initializeMultiTokenAction(kaminoMarket, 'liquidate', amount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, minCollateralReceiveAmount, referrer, currentSlot);
-            const addInitObligationForFarm = true;
-            if (extraComputeBudget > 0) {
-                axn.addComputeBudgetIxn(extraComputeBudget);
-            }
-            const allReserves = new utils_1.PublicKeySet([
-                ...axn.depositReserves,
-                ...axn.borrowReserves,
-                axn.reserve.address,
-                axn.outflowReserve.address,
-            ]).toArray();
-            const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-            if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-            }
-            yield axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-            yield axn.addLiquidateIx(maxAllowedLtvOverridePercent);
-            axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-            return axn;
-        });
+    static async buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+    referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'liquidate', amount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, minCollateralReceiveAmount, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+            axn.outflowReserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        await axn.addLiquidateIx(maxAllowedLtvOverridePercent);
+        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        return axn;
     }
-    static buildWithdrawReferrerFeeTxns(owner_1, tokenMint_1, kaminoMarket_1) {
-        return __awaiter(this, arguments, void 0, function* (owner, tokenMint, kaminoMarket, currentSlot = 0) {
-            const { axn, createAtasIxns } = yield KaminoAction.initializeWithdrawReferrerFees(tokenMint, owner, kaminoMarket, currentSlot);
-            axn.preTxnIxs.push(...createAtasIxns);
-            axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.toString()}]`);
-            axn.addRefreshReserveIxs([axn.reserve.address]);
-            axn.addWithdrawReferrerFeesIxs();
-            return axn;
-        });
+    static async buildWithdrawReferrerFeeTxns(owner, tokenMint, kaminoMarket, currentSlot = 0) {
+        const { axn, createAtasIxns } = await KaminoAction.initializeWithdrawReferrerFees(tokenMint, owner, kaminoMarket, currentSlot);
+        axn.preTxnIxs.push(...createAtasIxns);
+        axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.toString()}]`);
+        axn.addRefreshReserveIxs([axn.reserve.address]);
+        axn.addWithdrawReferrerFeesIxs();
+        return axn;
     }
-    getTransactions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const txns = {
-                preLendingTxn: null,
-                lendingTxn: null,
-                postLendingTxn: null,
-            };
-            if (this.preTxnIxs.length) {
-                txns.preLendingTxn = new web3_js_1.Transaction({
-                    feePayer: this.owner,
-                    recentBlockhash: (yield this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-                }).add(...this.preTxnIxs);
-            }
-            if (this.lendingIxs.length === 2) {
-                txns.lendingTxn = new web3_js_1.Transaction({
-                    feePayer: this.owner,
-                    recentBlockhash: (yield this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-                }).add(...this.setupIxs, ...[this.lendingIxs[0]], ...this.inBetweenIxs, ...[this.lendingIxs[1]], ...this.cleanupIxs);
-            }
-            else {
-                txns.lendingTxn = new web3_js_1.Transaction({
-                    feePayer: this.owner,
-                    recentBlockhash: (yield this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-                }).add(...this.setupIxs, ...this.lendingIxs, ...this.cleanupIxs);
-            }
-            if (this.postTxnIxs.length) {
-                txns.postLendingTxn = new web3_js_1.Transaction({
-                    feePayer: this.owner,
-                    recentBlockhash: (yield this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-                }).add(...this.postTxnIxs);
-            }
-            return txns;
-        });
+    async getTransactions() {
+        const txns = {
+            preLendingTxn: null,
+            lendingTxn: null,
+            postLendingTxn: null,
+        };
+        if (this.preTxnIxs.length) {
+            txns.preLendingTxn = new web3_js_1.Transaction({
+                feePayer: this.owner,
+                recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
+            }).add(...this.preTxnIxs);
+        }
+        if (this.lendingIxs.length === 2) {
+            txns.lendingTxn = new web3_js_1.Transaction({
+                feePayer: this.owner,
+                recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
+            }).add(...this.setupIxs, ...[this.lendingIxs[0]], ...this.inBetweenIxs, ...[this.lendingIxs[1]], ...this.cleanupIxs);
+        }
+        else {
+            txns.lendingTxn = new web3_js_1.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 web3_js_1.Transaction({
+                feePayer: this.owner,
+                recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
+            }).add(...this.postTxnIxs);
+        }
+        return txns;
     }
-    sendTransactions(sendTransaction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const txns = yield this.getTransactions();
-            yield this.sendSingleTransaction(txns.preLendingTxn, sendTransaction);
-            const signature = yield this.sendSingleTransaction(txns.lendingTxn, sendTransaction);
-            yield this.sendSingleTransaction(txns.postLendingTxn, sendTransaction);
-            return signature;
-        });
+    async sendTransactions(sendTransaction) {
+        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);
+        return signature;
     }
-    sendSingleTransaction(txn, sendTransaction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!txn)
-                return '';
-            const signature = yield sendTransaction(txn, this.kaminoMarket.getConnection());
-            yield this.kaminoMarket.getConnection().confirmTransaction(signature);
-            return signature;
-        });
+    async sendSingleTransaction(txn, sendTransaction) {
+        if (!txn)
+            return '';
+        const signature = await sendTransaction(txn, this.kaminoMarket.getConnection());
+        await this.kaminoMarket.getConnection().confirmTransaction(signature);
+        return signature;
     }
-    simulateTransactions(sendTransaction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const txns = yield this.getTransactions();
-            yield this.simulateSingleTransaction(txns.preLendingTxn, sendTransaction);
-            const signature = yield this.simulateSingleTransaction(txns.lendingTxn, sendTransaction);
-            yield this.simulateSingleTransaction(txns.postLendingTxn, sendTransaction);
-            return signature;
-        });
+    async simulateTransactions(sendTransaction) {
+        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);
+        return signature;
     }
-    simulateSingleTransaction(txn, sendTransaction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!txn)
-                return '';
-            return yield sendTransaction(txn, this.kaminoMarket.getConnection());
-        });
+    async simulateSingleTransaction(txn, sendTransaction) {
+        if (!txn)
+            return '';
+        return await sendTransaction(txn, this.kaminoMarket.getConnection());
     }
     addDepositIx() {
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
@@ -651,222 +633,210 @@ class KaminoAction {
                 : borrowIx.keys;
         this.lendingIxs.push(borrowIx);
     }
-    addDepositAndBorrowIx() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
-            this.lendingIxsLabels.push(`borrowObligationLiquidity`);
-            this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateral)({
-                liquidityAmount: this.amount,
-            }, {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                reserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
-                reserveCollateralMint: this.reserve.getCTokenMint(),
-                reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-                userSourceLiquidity: this.userTokenAccountAddress,
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
-            if (!this.outflowReserve) {
-                throw new Error(`outflowReserve not set`);
-            }
-            if (!this.additionalTokenAccountAddress) {
-                throw new Error(`additionalTokenAccountAddress not set`);
-            }
-            if (!this.outflowAmount) {
-                throw new Error(`outflowAmount not set`);
-            }
-            const depositReservesList = this.getAdditionalDepositReservesList();
-            if (depositReservesList.length === 0) {
-                depositReservesList.push(this.reserve.address);
-            }
-            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-                return { pubkey: reserve, isSigner: false, isWritable: true };
-            });
-            const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
-                liquidityAmount: this.outflowAmount,
-            }, {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                borrowReserve: this.outflowReserve.address,
-                borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-                reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
-                userDestinationLiquidity: this.additionalTokenAccountAddress,
-                borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-                referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
-                tokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId);
-            borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
-            this.lendingIxs.push(borrowIx);
+    async addDepositAndBorrowIx() {
+        this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
+        this.lendingIxsLabels.push(`borrowObligationLiquidity`);
+        this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateral)({
+            liquidityAmount: this.amount,
+        }, {
+            owner: this.owner,
+            obligation: this.getObligationPda(),
+            lendingMarket: this.kaminoMarket.getAddress(),
+            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            reserve: this.reserve.address,
+            reserveLiquidityMint: this.reserve.getLiquidityMint(),
+            reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
+            reserveCollateralMint: this.reserve.getCTokenMint(),
+            reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
+            userSourceLiquidity: this.userTokenAccountAddress,
+            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+        }, this.kaminoMarket.programId));
+        if (!this.outflowReserve) {
+            throw new Error(`outflowReserve not set`);
+        }
+        if (!this.additionalTokenAccountAddress) {
+            throw new Error(`additionalTokenAccountAddress not set`);
+        }
+        if (!this.outflowAmount) {
+            throw new Error(`outflowAmount not set`);
+        }
+        const depositReservesList = this.getAdditionalDepositReservesList();
+        if (depositReservesList.length === 0) {
+            depositReservesList.push(this.reserve.address);
+        }
+        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
         });
+        const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
+            liquidityAmount: this.outflowAmount,
+        }, {
+            owner: this.owner,
+            obligation: this.getObligationPda(),
+            lendingMarket: this.kaminoMarket.getAddress(),
+            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            borrowReserve: this.outflowReserve.address,
+            borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
+            reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
+            userDestinationLiquidity: this.additionalTokenAccountAddress,
+            borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
+            referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
+            tokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+        }, this.kaminoMarket.programId);
+        borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
+        this.lendingIxs.push(borrowIx);
     }
-    addRepayAndWithdrawIxs() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
-            this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
-            const depositReservesList = this.getAdditionalDepositReservesList();
-            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-                return { pubkey: reserve, isSigner: false, isWritable: true };
-            });
-            const repayIx = (0, instructions_1.repayObligationLiquidity)({
-                liquidityAmount: this.amount,
-            }, {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                repayReserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                userSourceLiquidity: this.userTokenAccountAddress,
-                reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
-                tokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId);
-            repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
-            this.lendingIxs.push(repayIx);
-            if (!this.outflowReserve) {
-                throw new Error(`outflowReserve not set`);
-            }
-            if (!this.additionalTokenAccountAddress) {
-                throw new Error(`additionalTokenAccountAddress not set`);
-            }
-            if (!this.outflowAmount) {
-                throw new Error(`outflowAmount not set`);
-            }
-            const collateralExchangeRate = this.outflowReserve.getEstimatedCollateralExchangeRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
-            this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateral)({
-                collateralAmount: this.outflowAmount.eq(new bn_js_1.default(utils_1.U64_MAX))
-                    ? this.outflowAmount
-                    : new bn_js_1.default(new decimal_js_1.default(this.outflowAmount.toString()).mul(collateralExchangeRate).ceil().toString()),
-            }, {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                withdrawReserve: this.outflowReserve.address,
-                reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-                reserveCollateralMint: this.outflowReserve.getCTokenMint(),
-                reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-                reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-                userDestinationLiquidity: this.additionalTokenAccountAddress,
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
+    async addRepayAndWithdrawIxs() {
+        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+        this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
+        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
         });
+        const repayIx = (0, instructions_1.repayObligationLiquidity)({
+            liquidityAmount: this.amount,
+        }, {
+            owner: this.owner,
+            obligation: this.getObligationPda(),
+            lendingMarket: this.kaminoMarket.getAddress(),
+            repayReserve: this.reserve.address,
+            reserveLiquidityMint: this.reserve.getLiquidityMint(),
+            userSourceLiquidity: this.userTokenAccountAddress,
+            reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
+            tokenProgram: this.reserve.getLiquidityTokenProgram(),
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+        }, this.kaminoMarket.programId);
+        repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
+        this.lendingIxs.push(repayIx);
+        if (!this.outflowReserve) {
+            throw new Error(`outflowReserve not set`);
+        }
+        if (!this.additionalTokenAccountAddress) {
+            throw new Error(`additionalTokenAccountAddress not set`);
+        }
+        if (!this.outflowAmount) {
+            throw new Error(`outflowAmount not set`);
+        }
+        const collateralExchangeRate = this.outflowReserve.getEstimatedCollateralExchangeRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
+        this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateral)({
+            collateralAmount: this.outflowAmount.eq(new bn_js_1.default(utils_1.U64_MAX))
+                ? this.outflowAmount
+                : new bn_js_1.default(new decimal_js_1.default(this.outflowAmount.toString()).mul(collateralExchangeRate).ceil().toString()),
+        }, {
+            owner: this.owner,
+            obligation: this.getObligationPda(),
+            lendingMarket: this.kaminoMarket.getAddress(),
+            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            withdrawReserve: this.outflowReserve.address,
+            reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
+            reserveCollateralMint: this.outflowReserve.getCTokenMint(),
+            reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
+            reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
+            userDestinationLiquidity: this.additionalTokenAccountAddress,
+            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+        }, this.kaminoMarket.programId));
     }
-    addWithdrawIx() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const collateralExchangeRate = this.reserve.getEstimatedCollateralExchangeRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
-            const collateralAmount = this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))
-                ? this.amount
-                : new bn_js_1.default(new decimal_js_1.default(this.amount.toString()).mul(collateralExchangeRate).ceil().toString());
-            this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
-            this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateral)({
-                collateralAmount,
-            }, {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                withdrawReserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                reserveCollateralMint: this.reserve.getCTokenMint(),
-                reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
-                reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
-                userDestinationLiquidity: this.userTokenAccountAddress,
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
-        });
+    async addWithdrawIx() {
+        const collateralExchangeRate = this.reserve.getEstimatedCollateralExchangeRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
+        const collateralAmount = this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))
+            ? this.amount
+            : new bn_js_1.default(new decimal_js_1.default(this.amount.toString()).mul(collateralExchangeRate).ceil().toString());
+        this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
+        this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateral)({
+            collateralAmount,
+        }, {
+            owner: this.owner,
+            obligation: this.getObligationPda(),
+            lendingMarket: this.kaminoMarket.getAddress(),
+            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            withdrawReserve: this.reserve.address,
+            reserveLiquidityMint: this.reserve.getLiquidityMint(),
+            reserveCollateralMint: this.reserve.getCTokenMint(),
+            reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
+            reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
+            userDestinationLiquidity: this.userTokenAccountAddress,
+            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+        }, this.kaminoMarket.programId));
     }
-    addRepayIx() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
-            const depositReservesList = this.getAdditionalDepositReservesList();
-            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-                return { pubkey: reserve, isSigner: false, isWritable: true };
-            });
-            const repayIx = (0, instructions_1.repayObligationLiquidity)({
-                liquidityAmount: this.amount,
-            }, {
-                owner: this.payer,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                repayReserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                userSourceLiquidity: this.userTokenAccountAddress,
-                reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
-                tokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId);
-            repayIx.keys =
-                this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
-            this.lendingIxs.push(repayIx);
+    async addRepayIx() {
+        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
         });
+        const repayIx = (0, instructions_1.repayObligationLiquidity)({
+            liquidityAmount: this.amount,
+        }, {
+            owner: this.payer,
+            obligation: this.getObligationPda(),
+            lendingMarket: this.kaminoMarket.getAddress(),
+            repayReserve: this.reserve.address,
+            reserveLiquidityMint: this.reserve.getLiquidityMint(),
+            userSourceLiquidity: this.userTokenAccountAddress,
+            reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
+            tokenProgram: this.reserve.getLiquidityTokenProgram(),
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+        }, this.kaminoMarket.programId);
+        repayIx.keys =
+            this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
+        this.lendingIxs.push(repayIx);
     }
-    addLiquidateIx() {
-        return __awaiter(this, arguments, void 0, function* (maxAllowedLtvOverridePercent = 0) {
-            this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
-            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) => {
-                return { pubkey: reserve, isSigner: false, isWritable: true };
-            });
-            const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
-                liquidityAmount: this.amount,
-                // TODO: Configure this when updating liquidator with new interface
-                minAcceptableReceivedLiquidityAmount: this.outflowAmount || new bn_js_1.default(0),
-                maxAllowedLtvOverridePercent: new bn_js_1.default(maxAllowedLtvOverridePercent),
-            }, {
-                liquidator: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                repayReserve: this.reserve.address,
-                repayReserveLiquidityMint: this.reserve.getLiquidityMint(),
-                repayReserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
-                withdrawReserve: this.outflowReserve.address,
-                withdrawReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-                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,
-                withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId);
-            liquidateIx.keys =
-                this.obligation.state.elevationGroup > 0
-                    ? liquidateIx.keys.concat([...depositReserveAccountMetas])
-                    : liquidateIx.keys;
-            this.lendingIxs.push(liquidateIx);
+    async addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
+        this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
+        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) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
         });
+        const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
+            liquidityAmount: this.amount,
+            // TODO: Configure this when updating liquidator with new interface
+            minAcceptableReceivedLiquidityAmount: this.outflowAmount || new bn_js_1.default(0),
+            maxAllowedLtvOverridePercent: new bn_js_1.default(maxAllowedLtvOverridePercent),
+        }, {
+            liquidator: this.owner,
+            obligation: this.getObligationPda(),
+            lendingMarket: this.kaminoMarket.getAddress(),
+            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            repayReserve: this.reserve.address,
+            repayReserveLiquidityMint: this.reserve.getLiquidityMint(),
+            repayReserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
+            withdrawReserve: this.outflowReserve.address,
+            withdrawReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
+            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,
+            withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
+            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+            withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+        }, this.kaminoMarket.programId);
+        liquidateIx.keys =
+            this.obligation.state.elevationGroup > 0
+                ? liquidateIx.keys.concat([...depositReserveAccountMetas])
+                : liquidateIx.keys;
+        this.lendingIxs.push(liquidateIx);
     }
-    addInBetweenIxs(action_1, includeAtaIxns_1, requestElevationGroup_1, addInitObligationForFarm_1) {
-        return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, isClosingPosition = false) {
-            yield this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'inBetween', requestElevationGroup, addInitObligationForFarm, isClosingPosition);
-        });
+    async addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, isClosingPosition = false) {
+        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'inBetween', requestElevationGroup, addInitObligationForFarm, isClosingPosition);
     }
     addRefreshObligation(crank) {
         const uniqueReserveAddresses = new utils_1.PublicKeySet(this.depositReserves.concat(this.borrowReserves)).toArray();
@@ -878,253 +848,248 @@ class KaminoAction {
         this.addRefreshFarmsForReserve(this.borrowReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxns, types_1.ReserveFarmKind.Debt, crank);
         this.addRefreshObligationIx(addAllToSetupIxns, false);
     }
-    addSupportIxsWithoutInitObligation(action_1, includeAtaIxns_1) {
-        return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, addAsSupportIx = 'setup', requestElevationGroup = false, addInitObligationForFarm = false, isClosingPosition = false, twoTokenAction = false, overrideElevationGroupRequest) {
-            var _a, _b, _c, _d;
-            // TODO: why are we not doing this first?
-            if (includeAtaIxns) {
-                yield this.addAtaIxs(action);
-            }
-            if ([
-                'depositCollateral',
-                'deposit',
-                'withdraw',
-                'borrow',
-                'liquidate',
-                'repay',
-                'depositAndBorrow',
-                'repayAndWithdraw',
-                'refreshObligation',
-            ].includes(action)) {
-                // The support ixns in order are:
-                // 0. Init obligation ixn
-                // 0. Token Ata ixns
-                // 0. Init obligation for farm
-                // 1. Ixns to refresh the reserves of the obligation not related to the current action
-                // 2. Ixn to refresh the reserve of the current action
-                // 3. Ixn to refresh the obligation
-                // 4. Ixn to refresh the `debt` farm of the obligation
-                // 5. Ixn to refresh the `collateral` farm of the obligation
-                // 6. The instruction itself
-                // 7. Ixn to refresh the `debt` farm of the obligation
-                // 8. Ixn to refresh the `collateral` farm of the obligation
-                let currentReserves = [];
-                if (action === 'liquidate' || action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
-                    if (!this.outflowReserve) {
-                        throw new Error('outflowReserve is undefined');
-                    }
-                    if (action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
-                        currentReserves = [this.reserve, this.outflowReserve];
-                        if (this.obligation) {
-                            if (action === 'depositAndBorrow') {
-                                const deposit = this.obligation.state.deposits.find((deposit) => deposit.depositReserve.equals(this.reserve.address));
-                                if (!deposit) {
-                                    this.preLoadedDepositReservesSameTx.push(this.reserve.address);
-                                }
-                            }
-                            else {
-                                const borrow = this.obligation.state.borrows.find((borrow) => borrow.borrowReserve.equals(this.reserve.address));
-                                if (!borrow) {
-                                    throw Error(`Unable to find obligation borrow to repay for ${this.obligation.state.owner.toBase58()}`);
-                                }
-                                const cumulativeBorrowRateObligation = obligation_1.KaminoObligation.getCumulativeBorrowRate(borrow);
-                                const cumulativeBorrowRateReserve = this.reserve.getEstimatedCumulativeBorrowRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
-                                const fullRepay = obligation_1.KaminoObligation.getBorrowAmount(borrow)
-                                    .mul(cumulativeBorrowRateReserve)
-                                    .div(cumulativeBorrowRateObligation);
-                                const amountDecimal = new decimal_js_1.default(this.amount.toString());
-                                if (fullRepay.lte(amountDecimal)) {
-                                    this.preLoadedBorrowReservesSameTx.push(this.reserve.address);
-                                }
+    async addSupportIxsWithoutInitObligation(action, includeAtaIxns, addAsSupportIx = 'setup', requestElevationGroup = false, addInitObligationForFarm = false, isClosingPosition = false, twoTokenAction = false, overrideElevationGroupRequest) {
+        // TODO: why are we not doing this first?
+        if (includeAtaIxns) {
+            await this.addAtaIxs(action);
+        }
+        if ([
+            'depositCollateral',
+            'deposit',
+            'withdraw',
+            'borrow',
+            'liquidate',
+            'repay',
+            'depositAndBorrow',
+            'repayAndWithdraw',
+            'refreshObligation',
+        ].includes(action)) {
+            // The support ixns in order are:
+            // 0. Init obligation ixn
+            // 0. Token Ata ixns
+            // 0. Init obligation for farm
+            // 1. Ixns to refresh the reserves of the obligation not related to the current action
+            // 2. Ixn to refresh the reserve of the current action
+            // 3. Ixn to refresh the obligation
+            // 4. Ixn to refresh the `debt` farm of the obligation
+            // 5. Ixn to refresh the `collateral` farm of the obligation
+            // 6. The instruction itself
+            // 7. Ixn to refresh the `debt` farm of the obligation
+            // 8. Ixn to refresh the `collateral` farm of the obligation
+            let currentReserves = [];
+            if (action === 'liquidate' || action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
+                if (!this.outflowReserve) {
+                    throw new Error('outflowReserve is undefined');
+                }
+                if (action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
+                    currentReserves = [this.reserve, this.outflowReserve];
+                    if (this.obligation) {
+                        if (action === 'depositAndBorrow') {
+                            const deposit = this.obligation.state.deposits.find((deposit) => deposit.depositReserve.equals(this.reserve.address));
+                            if (!deposit) {
+                                this.preLoadedDepositReservesSameTx.push(this.reserve.address);
                             }
                         }
                         else {
-                            // Obligation doesn't exist yet, so we have to preload the deposit reserve
-                            this.preLoadedDepositReservesSameTx.push(this.reserve.address);
+                            const borrow = this.obligation.state.borrows.find((borrow) => borrow.borrowReserve.equals(this.reserve.address));
+                            if (!borrow) {
+                                throw Error(`Unable to find obligation borrow to repay for ${this.obligation.state.owner.toBase58()}`);
+                            }
+                            const cumulativeBorrowRateObligation = obligation_1.KaminoObligation.getCumulativeBorrowRate(borrow);
+                            const cumulativeBorrowRateReserve = this.reserve.getEstimatedCumulativeBorrowRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
+                            const fullRepay = obligation_1.KaminoObligation.getBorrowAmount(borrow)
+                                .mul(cumulativeBorrowRateReserve)
+                                .div(cumulativeBorrowRateObligation);
+                            const amountDecimal = new decimal_js_1.default(this.amount.toString());
+                            if (fullRepay.lte(amountDecimal)) {
+                                this.preLoadedBorrowReservesSameTx.push(this.reserve.address);
+                            }
                         }
                     }
-                    else if (action === 'liquidate' && !this.outflowReserve.address.equals(this.reserve.address)) {
-                        currentReserves = [this.outflowReserve, this.reserve];
-                    }
                     else {
-                        currentReserves = [this.reserve];
+                        // Obligation doesn't exist yet, so we have to preload the deposit reserve
+                        this.preLoadedDepositReservesSameTx.push(this.reserve.address);
                     }
                 }
+                else if (action === 'liquidate' && !this.outflowReserve.address.equals(this.reserve.address)) {
+                    currentReserves = [this.outflowReserve, this.reserve];
+                }
                 else {
                     currentReserves = [this.reserve];
                 }
-                const uniqueReserveAddresses = new utils_1.PublicKeySet(this.depositReserves.concat(this.borrowReserves));
-                const currentReserveAddresses = new utils_1.PublicKeySet(currentReserves.map((reserve) => reserve.address));
-                // Union of addresses
-                const allReservesExcludingCurrent = [...uniqueReserveAddresses.toArray()].filter((address) => !currentReserveAddresses.contains(address));
-                this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
-                if (addInitObligationForFarm) {
-                    if (action === 'liquidate') {
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
-                        yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
-                    }
-                    else if (action === 'depositAndBorrow' ||
-                        action === 'depositCollateral' ||
-                        action === 'withdraw' ||
-                        action === 'deposit') {
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
-                        if (this.outflowReserve) {
-                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
-                        }
-                    }
-                    else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
-                        // todo - probably don't need to add both debt and collateral for everything here
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
-                        if (this.outflowReserve) {
-                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
-                        }
-                    }
-                    else {
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
-                        if (this.outflowReserve) {
-                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
-                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
-                        }
+            }
+            else {
+                currentReserves = [this.reserve];
+            }
+            const uniqueReserveAddresses = new utils_1.PublicKeySet(this.depositReserves.concat(this.borrowReserves));
+            const currentReserveAddresses = new utils_1.PublicKeySet(currentReserves.map((reserve) => reserve.address));
+            // Union of addresses
+            const allReservesExcludingCurrent = [...uniqueReserveAddresses.toArray()].filter((address) => !currentReserveAddresses.contains(address));
+            this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
+            if (addInitObligationForFarm) {
+                if (action === 'liquidate') {
+                    await this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
+                    await this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
+                }
+                else if (action === 'depositAndBorrow' ||
+                    action === 'depositCollateral' ||
+                    action === 'withdraw' ||
+                    action === 'deposit') {
+                    await this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
+                    if (this.outflowReserve) {
+                        await this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                     }
                 }
-                this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
-                if (action === 'repayAndWithdraw' && addAsSupportIx === 'inBetween' && isClosingPosition) {
-                    // addToSetupIxs === addInBetween (same thing)
-                    // If this is a repay and withdraw, and it's not the first action, and it's closing a position
-                    // we don't need to include the repay reserve in the refresh obligation
-                    // I am ashamed of this code, we need to rewrite this entire thing
-                    this.addRefreshObligationIx(addAsSupportIx, true);
+                else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
+                    // todo - probably don't need to add both debt and collateral for everything here
+                    await this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
+                    if (this.outflowReserve) {
+                        await this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
+                    }
                 }
                 else {
-                    this.addRefreshObligationIx(addAsSupportIx, false);
+                    await this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
+                    await this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
+                    if (this.outflowReserve) {
+                        await this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
+                        await this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
+                    }
                 }
-                if (requestElevationGroup) {
-                    if (action === 'repay') {
-                        const repayObligationLiquidity = this.obligation.borrows.get(this.reserve.address);
-                        if (!repayObligationLiquidity) {
-                            throw new Error(`Could not find debt reserve ${this.reserve.address} in obligation`);
+            }
+            this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
+            if (action === 'repayAndWithdraw' && addAsSupportIx === 'inBetween' && isClosingPosition) {
+                // addToSetupIxs === addInBetween (same thing)
+                // If this is a repay and withdraw, and it's not the first action, and it's closing a position
+                // we don't need to include the repay reserve in the refresh obligation
+                // I am ashamed of this code, we need to rewrite this entire thing
+                this.addRefreshObligationIx(addAsSupportIx, true);
+            }
+            else {
+                this.addRefreshObligationIx(addAsSupportIx, false);
+            }
+            if (requestElevationGroup) {
+                if (action === 'repay') {
+                    const repayObligationLiquidity = this.obligation.borrows.get(this.reserve.address);
+                    if (!repayObligationLiquidity) {
+                        throw new Error(`Could not find debt reserve ${this.reserve.address} in obligation`);
+                    }
+                    if (new decimal_js_1.default(repayObligationLiquidity.amount).lte(new decimal_js_1.default(this.amount.toString())) &&
+                        this.obligation.borrows.size === 1 &&
+                        this.obligation?.state.elevationGroup !== 0) {
+                        this.addRefreshReserveIxs(allReservesExcludingCurrent, 'cleanup');
+                        // Skip the borrow reserve, since we repay in the same tx
+                        this.addRefreshObligationIx('cleanup', true);
+                        this.addRequestElevationIx(overrideElevationGroupRequest ?? 0, 'cleanup', true);
+                    }
+                }
+                else if (action === 'depositAndBorrow' || action === 'borrow') {
+                    let newElevationGroup = -1;
+                    let addAsSupportIx = 'setup';
+                    if (overrideElevationGroupRequest !== undefined) {
+                        newElevationGroup = overrideElevationGroupRequest;
+                    }
+                    else {
+                        let emodeGroupsDebt = this.reserve.state.config.elevationGroups;
+                        let emodeGroupsColl = this.reserve.state.config.elevationGroups;
+                        let debtReserve = this.reserve.address;
+                        if (action === 'depositAndBorrow') {
+                            emodeGroupsDebt = this.outflowReserve.state.config.elevationGroups;
+                            debtReserve = this.outflowReserve.address;
+                            addAsSupportIx = 'inBetween';
                         }
-                        if (new decimal_js_1.default(repayObligationLiquidity.amount).lte(new decimal_js_1.default(this.amount.toString())) &&
-                            this.obligation.borrows.size === 1 &&
-                            ((_a = this.obligation) === null || _a === void 0 ? void 0 : _a.state.elevationGroup) !== 0) {
-                            this.addRefreshReserveIxs(allReservesExcludingCurrent, 'cleanup');
-                            // Skip the borrow reserve, since we repay in the same tx
-                            this.addRefreshObligationIx('cleanup', true);
-                            this.addRequestElevationIx(overrideElevationGroupRequest !== null && overrideElevationGroupRequest !== void 0 ? overrideElevationGroupRequest : 0, 'cleanup', true);
+                        else if (action === 'borrow') {
+                            const depositReserve = this.obligation.state.deposits.find((x) => !x.depositReserve.equals(web3_js_1.PublicKey.default)).depositReserve;
+                            const collReserve = this.kaminoMarket.getReserveByAddress(depositReserve);
+                            emodeGroupsColl = collReserve.state.config.elevationGroups;
+                            addAsSupportIx = 'setup';
                         }
-                    }
-                    else if (action === 'depositAndBorrow' || action === 'borrow') {
-                        let newElevationGroup = -1;
-                        let addAsSupportIx = 'setup';
-                        if (overrideElevationGroupRequest !== undefined) {
-                            newElevationGroup = overrideElevationGroupRequest;
+                        const groups = this.kaminoMarket.state.elevationGroups;
+                        const commonElevationGroups = [...emodeGroupsColl].filter((item) => emodeGroupsDebt.includes(item) && item !== 0 && groups[item - 1].debtReserve.equals(debtReserve));
+                        console.log('Groups of coll reserve', emodeGroupsColl, 'Groups of debt reserve', emodeGroupsDebt, 'Common groups', commonElevationGroups);
+                        if (commonElevationGroups.length === 0) {
+                            console.log('No common elevation groups found, staying with default');
                         }
                         else {
-                            let emodeGroupsDebt = this.reserve.state.config.elevationGroups;
-                            let emodeGroupsColl = this.reserve.state.config.elevationGroups;
-                            let debtReserve = this.reserve.address;
-                            if (action === 'depositAndBorrow') {
-                                emodeGroupsDebt = this.outflowReserve.state.config.elevationGroups;
-                                debtReserve = this.outflowReserve.address;
-                                addAsSupportIx = 'inBetween';
-                            }
-                            else if (action === 'borrow') {
-                                const depositReserve = this.obligation.state.deposits.find((x) => !x.depositReserve.equals(web3_js_1.PublicKey.default)).depositReserve;
-                                const collReserve = this.kaminoMarket.getReserveByAddress(depositReserve);
-                                emodeGroupsColl = collReserve.state.config.elevationGroups;
-                                addAsSupportIx = 'setup';
-                            }
-                            const groups = this.kaminoMarket.state.elevationGroups;
-                            const commonElevationGroups = [...emodeGroupsColl].filter((item) => emodeGroupsDebt.includes(item) && item !== 0 && groups[item - 1].debtReserve.equals(debtReserve));
-                            console.log('Groups of coll reserve', emodeGroupsColl, 'Groups of debt reserve', emodeGroupsDebt, 'Common groups', commonElevationGroups);
-                            if (commonElevationGroups.length === 0) {
-                                console.log('No common elevation groups found, staying with default');
-                            }
-                            else {
-                                const eModeGroupWithMaxLtvAndDebtReserve = commonElevationGroups.reduce((prev, curr) => {
-                                    const prevGroup = groups.find((group) => group.id === prev);
-                                    const currGroup = groups.find((group) => group.id === curr);
-                                    return prevGroup.ltvPct > currGroup.ltvPct ? prev : curr;
-                                });
-                                const eModeGroup = groups.find((group) => group.id === eModeGroupWithMaxLtvAndDebtReserve).id;
-                                console.log('Setting eModeGroup to', eModeGroup);
-                                if (eModeGroup !== 0 && eModeGroup !== ((_b = this.obligation) === null || _b === void 0 ? void 0 : _b.state.elevationGroup)) {
-                                    newElevationGroup = eModeGroup;
-                                }
-                            }
-                        }
-                        console.log('newElevationGroup', newElevationGroup, addAsSupportIx);
-                        if (newElevationGroup >= 0 && newElevationGroup !== ((_c = this.obligation) === null || _c === void 0 ? void 0 : _c.state.elevationGroup)) {
-                            this.addRequestElevationIx(newElevationGroup, addAsSupportIx);
-                            this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
-                            this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
-                            this.addRefreshObligationIx(addAsSupportIx);
-                            if (action === 'borrow') {
-                                this.obligation.refreshedStats.potentialElevationGroupUpdate = newElevationGroup;
+                            const eModeGroupWithMaxLtvAndDebtReserve = commonElevationGroups.reduce((prev, curr) => {
+                                const prevGroup = groups.find((group) => group.id === prev);
+                                const currGroup = groups.find((group) => group.id === curr);
+                                return prevGroup.ltvPct > currGroup.ltvPct ? prev : curr;
+                            });
+                            const eModeGroup = groups.find((group) => group.id === eModeGroupWithMaxLtvAndDebtReserve).id;
+                            console.log('Setting eModeGroup to', eModeGroup);
+                            if (eModeGroup !== 0 && eModeGroup !== this.obligation?.state.elevationGroup) {
+                                newElevationGroup = eModeGroup;
                             }
                         }
                     }
-                    else if (action === 'deposit' &&
-                        overrideElevationGroupRequest !== undefined &&
-                        overrideElevationGroupRequest !== ((_d = this.obligation) === null || _d === void 0 ? void 0 : _d.state.elevationGroup)) {
-                        const addAsSupportIx = 'setup';
-                        console.log('Deposit: Requesting elevation group', overrideElevationGroupRequest);
-                        this.addRequestElevationIx(overrideElevationGroupRequest, addAsSupportIx);
+                    console.log('newElevationGroup', newElevationGroup, addAsSupportIx);
+                    if (newElevationGroup >= 0 && newElevationGroup !== this.obligation?.state.elevationGroup) {
+                        this.addRequestElevationIx(newElevationGroup, addAsSupportIx);
                         this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
                         this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
                         this.addRefreshObligationIx(addAsSupportIx);
+                        if (action === 'borrow') {
+                            this.obligation.refreshedStats.potentialElevationGroupUpdate = newElevationGroup;
+                        }
                     }
                 }
-                if (addAsSupportIx === 'setup') {
-                    // If this is an setup ixn (therefore not an in-between), it means it's either a one off action
-                    // or the first of a two-token-action
-                    if (action === 'liquidate') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
-                        this.addRefreshFarmsForReserve([this.reserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
-                    }
-                    else if (action === 'depositAndBorrow' ||
-                        action === 'depositCollateral' ||
-                        action === 'withdraw' ||
-                        action === 'deposit') {
-                        this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Collateral, undefined, twoTokenAction);
-                    }
-                    else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
-                        this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Debt, undefined, twoTokenAction);
-                    }
-                    else {
-                        throw new Error(`Could not decide on refresh farm for action ${action}`);
-                    }
+                else if (action === 'deposit' &&
+                    overrideElevationGroupRequest !== undefined &&
+                    overrideElevationGroupRequest !== this.obligation?.state.elevationGroup) {
+                    const addAsSupportIx = 'setup';
+                    console.log('Deposit: Requesting elevation group', overrideElevationGroupRequest);
+                    this.addRequestElevationIx(overrideElevationGroupRequest, addAsSupportIx);
+                    this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
+                    this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
+                    this.addRefreshObligationIx(addAsSupportIx);
+                }
+            }
+            if (addAsSupportIx === 'setup') {
+                // If this is an setup ixn (therefore not an in-between), it means it's either a one off action
+                // or the first of a two-token-action
+                if (action === 'liquidate') {
+                    this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
+                    this.addRefreshFarmsForReserve([this.reserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
+                }
+                else if (action === 'depositAndBorrow' ||
+                    action === 'depositCollateral' ||
+                    action === 'withdraw' ||
+                    action === 'deposit') {
+                    this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Collateral, undefined, twoTokenAction);
+                }
+                else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
+                    this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Debt, undefined, twoTokenAction);
                 }
                 else {
-                    // If this is an inbetween, it means it's part of a two-token-action
-                    // so we skip the refresh farm obligation of the first reserve as that operation already happened
-                    // add added to 'setup' ixns
-                    if (action === 'depositAndBorrow') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
-                    }
-                    else if (action === 'repayAndWithdraw') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
-                    }
-                    else {
-                        throw new Error(`Could not decide on refresh farm for action ${action}`);
-                    }
+                    throw new Error(`Could not decide on refresh farm for action ${action}`);
                 }
             }
-        });
-    }
-    addSupportIxs(action_1, includeAtaIxns_1, requestElevationGroup_1, includeUserMetadata_1, addInitObligationForFarm_1) {
-        return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, twoTokenAction = false, overrideElevationGroupRequest) {
-            if (!['mint', 'redeem'].includes(action)) {
-                const [, ownerUserMetadata] = yield this.kaminoMarket.getUserMetadata(this.owner);
-                if (!ownerUserMetadata && includeUserMetadata) {
-                    yield this.addInitUserMetadataIxs();
+            else {
+                // If this is an inbetween, it means it's part of a two-token-action
+                // so we skip the refresh farm obligation of the first reserve as that operation already happened
+                // add added to 'setup' ixns
+                if (action === 'depositAndBorrow') {
+                    this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
+                }
+                else if (action === 'repayAndWithdraw') {
+                    this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
+                }
+                else {
+                    throw new Error(`Could not decide on refresh farm for action ${action}`);
                 }
-                yield this.addInitReferrerTokenStateIxs();
-                yield this.addInitObligationIxs();
             }
-            yield this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'setup', requestElevationGroup, addInitObligationForFarm, false, twoTokenAction, overrideElevationGroupRequest);
-        });
+        }
+    }
+    async addSupportIxs(action, includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, twoTokenAction = false, overrideElevationGroupRequest) {
+        if (!['mint', 'redeem'].includes(action)) {
+            const [, ownerUserMetadata] = await this.kaminoMarket.getUserMetadata(this.owner);
+            if (!ownerUserMetadata && includeUserMetadata) {
+                await this.addInitUserMetadataIxs();
+            }
+            await this.addInitReferrerTokenStateIxs();
+            await this.addInitObligationIxs();
+        }
+        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'setup', requestElevationGroup, addInitObligationForFarm, false, twoTokenAction, overrideElevationGroupRequest);
     }
     static optionalAccount(pubkey, programId = lib_1.PROGRAM_ID) {
         if ((0, utils_1.isNotNullPubkey)(pubkey)) {
@@ -1331,135 +1296,126 @@ class KaminoAction {
         this.cleanupIxs.splice(0, 0, ...this.refreshFarmsCleanupTxnIxs);
         this.cleanupIxsLabels.splice(0, 0, ...this.refreshFarmsCleanupTxnIxsLabels);
     }
-    addInitObligationForFarm(reserve_1, mode_1) {
-        return __awaiter(this, arguments, void 0, function* (reserve, mode, addAsSupportIx = 'setup') {
-            const BASE_SEED_USER_STATE = Buffer.from('user');
-            const getPda = (farm) => web3_js_1.PublicKey.findProgramAddressSync([BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()], farms_sdk_1.farmsId)[0];
-            const farms = [];
-            if (mode === types_1.ReserveFarmKind.Collateral && (0, utils_1.isNotNullPubkey)(reserve.state.farmCollateral)) {
-                const pda = getPda(reserve.state.farmCollateral);
-                const account = yield this.kaminoMarket.getConnection().getAccountInfo(pda);
-                if (!account) {
-                    farms.push([types_1.ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, pda]);
-                }
+    async addInitObligationForFarm(reserve, mode, addAsSupportIx = 'setup') {
+        const BASE_SEED_USER_STATE = Buffer.from('user');
+        const getPda = (farm) => web3_js_1.PublicKey.findProgramAddressSync([BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()], farms_sdk_1.farmsId)[0];
+        const farms = [];
+        if (mode === types_1.ReserveFarmKind.Collateral && (0, utils_1.isNotNullPubkey)(reserve.state.farmCollateral)) {
+            const pda = getPda(reserve.state.farmCollateral);
+            const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
+            if (!account) {
+                farms.push([types_1.ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, pda]);
             }
-            if (mode === types_1.ReserveFarmKind.Debt && (0, utils_1.isNotNullPubkey)(reserve.state.farmDebt)) {
-                const pda = getPda(reserve.state.farmDebt);
-                const account = yield this.kaminoMarket.getConnection().getAccountInfo(pda);
-                if (!account) {
-                    farms.push([types_1.ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, getPda(reserve.state.farmDebt)]);
-                }
+        }
+        if (mode === types_1.ReserveFarmKind.Debt && (0, utils_1.isNotNullPubkey)(reserve.state.farmDebt)) {
+            const pda = getPda(reserve.state.farmDebt);
+            const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
+            if (!account) {
+                farms.push([types_1.ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, getPda(reserve.state.farmDebt)]);
             }
-            farms.forEach((arg) => {
-                const args = { mode: arg[0] };
-                const accounts = {
-                    owner: this.obligation ? this.obligation.state.owner : this.owner,
-                    payer: this.owner,
-                    obligation: this.getObligationPda(),
-                    lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                    reserve: reserve.address,
-                    reserveFarmState: arg[1],
-                    obligationFarm: arg[2],
-                    lendingMarket: this.kaminoMarket.getAddress(),
-                    farmsProgram: farms_sdk_1.farmsId,
-                    rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                    systemProgram: web3_js_1.SystemProgram.programId,
-                };
-                const initObligationForFarm = (0, instructions_1.initObligationFarmsForReserve)(args, accounts, this.kaminoMarket.programId);
-                if (addAsSupportIx === 'setup') {
-                    this.setupIxs.push(initObligationForFarm);
-                    this.setupIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${this.getObligationPda().toString()}]`);
-                }
-                else if (addAsSupportIx === 'inBetween') {
-                    this.inBetweenIxs.push(initObligationForFarm);
-                    this.inBetweenIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${this.getObligationPda().toString()}]`);
-                }
-            });
-        });
-    }
-    addInitObligationIxs() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.obligation) {
-                const obligationPda = this.getObligationPda();
-                const [userMetadataAddress, _bump] = (0, utils_1.userMetadataPda)(this.owner, this.kaminoMarket.programId);
-                const initObligationIx = (0, instructions_1.initObligation)({
-                    args: {
-                        tag: this.obligationType.toArgs().tag,
-                        id: this.obligationType.toArgs().id,
-                    },
-                }, {
-                    obligationOwner: this.owner,
-                    feePayer: this.payer,
-                    obligation: obligationPda,
-                    lendingMarket: this.kaminoMarket.getAddress(),
-                    seed1Account: this.obligationType.toArgs().seed1,
-                    seed2Account: this.obligationType.toArgs().seed2,
-                    ownerUserMetadata: userMetadataAddress,
-                    rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                    systemProgram: web3_js_1.SystemProgram.programId,
-                }, this.kaminoMarket.programId);
-                this.setupIxs.push(initObligationIx);
-                this.setupIxsLabels.push(`InitObligation[${obligationPda.toString()}]`);
+        }
+        farms.forEach((arg) => {
+            const args = { mode: arg[0] };
+            const accounts = {
+                owner: this.obligation ? this.obligation.state.owner : this.owner,
+                payer: this.owner,
+                obligation: this.getObligationPda(),
+                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                reserve: reserve.address,
+                reserveFarmState: arg[1],
+                obligationFarm: arg[2],
+                lendingMarket: this.kaminoMarket.getAddress(),
+                farmsProgram: farms_sdk_1.farmsId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
+            };
+            const initObligationForFarm = (0, instructions_1.initObligationFarmsForReserve)(args, accounts, this.kaminoMarket.programId);
+            if (addAsSupportIx === 'setup') {
+                this.setupIxs.push(initObligationForFarm);
+                this.setupIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${this.getObligationPda().toString()}]`);
+            }
+            else if (addAsSupportIx === 'inBetween') {
+                this.inBetweenIxs.push(initObligationForFarm);
+                this.inBetweenIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${this.getObligationPda().toString()}]`);
             }
         });
     }
-    addInitUserMetadataIxs() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [createLutIx, lookupTableAddress] = yield (0, utils_1.createLookupTableIx)(this.kaminoMarket.getConnection(), this.owner);
-            this.setupIxs.push(createLutIx);
-            this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress.toString()}]`);
+    async addInitObligationIxs() {
+        if (!this.obligation) {
+            const obligationPda = this.getObligationPda();
             const [userMetadataAddress, _bump] = (0, utils_1.userMetadataPda)(this.owner, this.kaminoMarket.programId);
-            const referrerUserMetadataAddress = this.referrer.equals(web3_js_1.PublicKey.default)
-                ? this.kaminoMarket.programId
-                : (0, utils_1.userMetadataPda)(this.referrer, this.kaminoMarket.programId)[0];
-            const initUserMetadataIx = (0, instructions_1.initUserMetadata)({
-                userLookupTable: lookupTableAddress,
+            const initObligationIx = (0, instructions_1.initObligation)({
+                args: {
+                    tag: this.obligationType.toArgs().tag,
+                    id: this.obligationType.toArgs().id,
+                },
             }, {
-                owner: this.owner,
+                obligationOwner: this.owner,
                 feePayer: this.payer,
-                userMetadata: userMetadataAddress,
-                referrerUserMetadata: referrerUserMetadataAddress,
+                obligation: obligationPda,
+                lendingMarket: this.kaminoMarket.getAddress(),
+                seed1Account: this.obligationType.toArgs().seed1,
+                seed2Account: this.obligationType.toArgs().seed2,
+                ownerUserMetadata: userMetadataAddress,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                 systemProgram: web3_js_1.SystemProgram.programId,
             }, this.kaminoMarket.programId);
-            this.setupIxs.push(initUserMetadataIx);
-            this.setupIxsLabels.push(`initUserMetadata[${userMetadataAddress.toString()}]`);
-        });
+            this.setupIxs.push(initObligationIx);
+            this.setupIxsLabels.push(`InitObligation[${obligationPda.toString()}]`);
+        }
     }
-    addInitReferrerTokenStateIxs() {
-        return __awaiter(this, arguments, void 0, function* (reservesArr = []) {
-            var _a;
-            if (this.referrer.equals(web3_js_1.PublicKey.default)) {
-                return;
+    async addInitUserMetadataIxs() {
+        const [createLutIx, lookupTableAddress] = await (0, utils_1.createLookupTableIx)(this.kaminoMarket.getConnection(), this.owner);
+        this.setupIxs.push(createLutIx);
+        this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress.toString()}]`);
+        const [userMetadataAddress, _bump] = (0, utils_1.userMetadataPda)(this.owner, this.kaminoMarket.programId);
+        const referrerUserMetadataAddress = this.referrer.equals(web3_js_1.PublicKey.default)
+            ? this.kaminoMarket.programId
+            : (0, utils_1.userMetadataPda)(this.referrer, this.kaminoMarket.programId)[0];
+        const initUserMetadataIx = (0, instructions_1.initUserMetadata)({
+            userLookupTable: lookupTableAddress,
+        }, {
+            owner: this.owner,
+            feePayer: this.payer,
+            userMetadata: userMetadataAddress,
+            referrerUserMetadata: referrerUserMetadataAddress,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        }, this.kaminoMarket.programId);
+        this.setupIxs.push(initUserMetadataIx);
+        this.setupIxsLabels.push(`initUserMetadata[${userMetadataAddress.toString()}]`);
+    }
+    async addInitReferrerTokenStateIxs(reservesArr = []) {
+        if (this.referrer.equals(web3_js_1.PublicKey.default)) {
+            return;
+        }
+        const outflowReserve = this.outflowReserve?.address ? [this.outflowReserve.address] : [];
+        const reserves = reservesArr.length !== 0
+            ? reservesArr.map((reserve) => reserve.address)
+            : new utils_1.PublicKeySet([this.reserve.address, ...outflowReserve]).toArray();
+        const tokenStatesToCreate = [];
+        for (const reserve of reserves) {
+            if (!reserve) {
+                continue;
             }
-            const outflowReserve = ((_a = this.outflowReserve) === null || _a === void 0 ? void 0 : _a.address) ? [this.outflowReserve.address] : [];
-            const reserves = reservesArr.length !== 0
-                ? reservesArr.map((reserve) => reserve.address)
-                : new utils_1.PublicKeySet([this.reserve.address, ...outflowReserve]).toArray();
-            const tokenStatesToCreate = [];
-            for (const reserve of reserves) {
-                if (!reserve) {
-                    continue;
-                }
-                const referrerTokenStateAddress = (0, utils_1.referrerTokenStatePda)(this.referrer, reserve, this.kaminoMarket.programId)[0];
-                if (!(yield (0, utils_1.checkIfAccountExists)(this.kaminoMarket.getConnection(), referrerTokenStateAddress))) {
-                    tokenStatesToCreate.push([referrerTokenStateAddress, reserve]);
-                }
+            const referrerTokenStateAddress = (0, utils_1.referrerTokenStatePda)(this.referrer, reserve, this.kaminoMarket.programId)[0];
+            if (!(await (0, utils_1.checkIfAccountExists)(this.kaminoMarket.getConnection(), referrerTokenStateAddress))) {
+                tokenStatesToCreate.push([referrerTokenStateAddress, reserve]);
             }
-            tokenStatesToCreate.forEach(([referrerTokenStateAddress, reserveAddress]) => {
-                const initreferrerTokenStateIx = (0, instructions_1.initReferrerTokenState)({
-                    referrer: this.referrer,
-                }, {
-                    lendingMarket: this.kaminoMarket.getAddress(),
-                    payer: this.owner,
-                    reserve: reserveAddress,
-                    referrerTokenState: referrerTokenStateAddress,
-                    rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                    systemProgram: web3_js_1.SystemProgram.programId,
-                }, this.kaminoMarket.programId);
-                this.setupIxs.unshift(initreferrerTokenStateIx);
-                this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenStateAddress.toString()} res=${reserveAddress}]`);
-            });
+        }
+        tokenStatesToCreate.forEach(([referrerTokenStateAddress, reserveAddress]) => {
+            const initreferrerTokenStateIx = (0, instructions_1.initReferrerTokenState)({
+                referrer: this.referrer,
+            }, {
+                lendingMarket: this.kaminoMarket.getAddress(),
+                payer: this.owner,
+                reserve: reserveAddress,
+                referrerTokenState: referrerTokenStateAddress,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
+            }, this.kaminoMarket.programId);
+            this.setupIxs.unshift(initreferrerTokenStateIx);
+            this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenStateAddress.toString()} res=${reserveAddress}]`);
         });
     }
     addWithdrawReferrerFeesIxs() {
@@ -1482,242 +1438,232 @@ class KaminoAction {
         this.setupIxs.push((0, utils_1.buildComputeBudgetIx)(units));
         this.setupIxsLabels.push(`AddComputeBudget[${units}]`);
     }
-    addAtaIxs(action) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (this.mint.equals(utils_1.WRAPPED_SOL_MINT) || ((_a = this.secondaryMint) === null || _a === void 0 ? void 0 : _a.equals(utils_1.WRAPPED_SOL_MINT))) {
-                yield this.updateWSOLAccount(action);
-            }
-            if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
-                const userTokenAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
-                if (!userTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
-                    if (this.positions === exports.POSITION_LIMIT) {
-                        this.preTxnIxs.push(createUserTokenAccountIx);
-                        this.preTxnIxsLabels.push(`CreateLiquidityUserAta[${this.owner}]`);
-                    }
-                    else {
-                        this.setupIxs.unshift(createUserTokenAccountIx);
-                        this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${this.owner}]`);
-                    }
-                }
-            }
-            if (action === 'liquidate') {
-                const userTokenAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
-                if (!this.outflowReserve) {
-                    throw new Error(`Outflow reserve state not found ${this.mint}`);
-                }
-                if (!userTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
-                    if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
-                        this.preTxnIxs.push(createUserTokenAccountIx);
-                        this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
-                    }
-                    else {
-                        this.setupIxs.unshift(createUserTokenAccountIx);
-                        this.setupIxsLabels.unshift(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
-                    }
-                }
-                const userCollateralAccountInfo = yield this.kaminoMarket
-                    .getConnection()
-                    .getAccountInfo(this.userCollateralAccountAddress);
-                if (!userCollateralAccountInfo) {
-                    const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
-                    if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
-                        this.preTxnIxs.push(createUserCollateralAccountIx);
-                        this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-                    }
-                    else {
-                        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}`);
-                }
-            }
-            if (action === 'depositAndBorrow' ||
-                (action === 'repayAndWithdraw' && !((_b = this.secondaryMint) === null || _b === void 0 ? void 0 : _b.equals(utils_1.WRAPPED_SOL_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}`);
+    async addAtaIxs(action) {
+        if (this.mint.equals(utils_1.WRAPPED_SOL_MINT) || this.secondaryMint?.equals(utils_1.WRAPPED_SOL_MINT)) {
+            await this.updateWSOLAccount(action);
+        }
+        if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
+            const userTokenAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
+            if (!userTokenAccountInfo) {
+                const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+                if (this.positions === exports.POSITION_LIMIT) {
+                    this.preTxnIxs.push(createUserTokenAccountIx);
+                    this.preTxnIxsLabels.push(`CreateLiquidityUserAta[${this.owner}]`);
                 }
-                const additionalUserTokenAccountInfo = yield this.kaminoMarket
-                    .getConnection()
-                    .getAccountInfo(this.additionalTokenAccountAddress);
-                if (!additionalUserTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.additionalTokenAccountAddress);
+                else {
                     this.setupIxs.unshift(createUserTokenAccountIx);
-                    this.setupIxsLabels.unshift(`CreateAdditionalUserTokenAta[${this.owner}]`);
+                    this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${this.owner}]`);
                 }
             }
-            if (action === 'withdraw' || action === 'mint' || action === 'deposit' || action === 'repayAndWithdraw') {
-                const userTokenAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
-                // TODO: Might need to remove this
-                if (!userTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+        }
+        if (action === 'liquidate') {
+            const userTokenAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
+            if (!this.outflowReserve) {
+                throw new Error(`Outflow reserve state not found ${this.mint}`);
+            }
+            if (!userTokenAccountInfo) {
+                const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+                if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
                     this.preTxnIxs.push(createUserTokenAccountIx);
                     this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
                 }
+                else {
+                    this.setupIxs.unshift(createUserTokenAccountIx);
+                    this.setupIxsLabels.unshift(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
+                }
             }
-            if (action === 'mint') {
-                const userCollateralAccountInfo = yield this.kaminoMarket
-                    .getConnection()
-                    .getAccountInfo(this.userCollateralAccountAddress);
-                if (!userCollateralAccountInfo) {
-                    const collateralMintPubkey = this.reserve.getCTokenMint();
-                    const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, collateralMintPubkey, this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
-                    if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
-                        this.preTxnIxs.push(createUserCollateralAccountIx);
-                        this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-                    }
-                    else {
-                        this.setupIxs.unshift(createUserCollateralAccountIx);
-                        this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-                    }
+            const userCollateralAccountInfo = await this.kaminoMarket
+                .getConnection()
+                .getAccountInfo(this.userCollateralAccountAddress);
+            if (!userCollateralAccountInfo) {
+                const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
+                if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
+                    this.preTxnIxs.push(createUserCollateralAccountIx);
+                    this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
+                }
+                else {
+                    this.setupIxs.unshift(createUserCollateralAccountIx);
+                    this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
                 }
             }
-        });
-    }
-    updateWSOLAccount(action) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const preIxs = [];
-            const postIxs = [];
-            const preIxsLabels = [];
-            const postIxsLabels = [];
-            if (action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
-                return;
+            if (!this.additionalTokenAccountAddress) {
+                throw new Error(`Additional token account address not found ${this.mint}`);
             }
-            let safeRepay = new bn_js_1.default(this.amount);
-            if (this.obligation && action === 'repay' && this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))) {
-                const borrow = this.obligation.state.borrows.find((borrow) => borrow.borrowReserve.toString() === this.reserve.address.toString());
-                if (!borrow) {
-                    throw Error(`Unable to find obligation borrow to repay for ${this.obligation.state.owner.toBase58()}`);
-                }
-                const cumulativeBorrowRateObligation = obligation_1.KaminoObligation.getCumulativeBorrowRate(borrow);
-                const cumulativeBorrowRateReserve = this.reserve.getEstimatedCumulativeBorrowRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
-                // TODO: shouldn't this calc be added to all other stuff as well?
-                safeRepay = new bn_js_1.default(Math.floor(obligation_1.KaminoObligation.getBorrowAmount(borrow)
-                    .mul(cumulativeBorrowRateReserve)
-                    .div(cumulativeBorrowRateObligation)
-                    .add(new decimal_js_1.default(SOL_PADDING_FOR_INTEREST.toString()))
-                    .toNumber()).toString());
+        }
+        if (action === 'depositAndBorrow' ||
+            (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(utils_1.WRAPPED_SOL_MINT))) {
+            if (!this.additionalTokenAccountAddress) {
+                throw new Error(`Additional token account address not found ${this.secondaryMint}`);
             }
-            let userTokenAccountAddress = this.userTokenAccountAddress;
-            if ((_a = this.secondaryMint) === null || _a === void 0 ? void 0 : _a.equals(utils_1.WRAPPED_SOL_MINT)) {
-                if (!this.additionalTokenAccountAddress) {
-                    throw new Error(`Additional token account address not found ${this.secondaryMint}`);
-                }
-                userTokenAccountAddress = this.additionalTokenAccountAddress;
+            if (!this.outflowReserve) {
+                throw new Error(`Outflow reserve state not found ${this.mint}`);
             }
-            const userWSOLAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(userTokenAccountAddress);
-            const rentExempt = yield this.kaminoMarket.getConnection().getMinimumBalanceForRentExemption(165);
-            // Add rent exemption lamports for WSOL accounts that need to be pre-funded for inflow/send transactions
-            const sendAction = action === 'deposit' ||
-                action === 'repay' ||
-                action === 'mint' ||
-                (action === 'liquidate' && ((_b = this.secondaryMint) === null || _b === void 0 ? void 0 : _b.equals(utils_1.WRAPPED_SOL_MINT))); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
-            const transferLamportsIx = web3_js_1.SystemProgram.transfer({
-                fromPubkey: this.owner,
-                toPubkey: userTokenAccountAddress,
-                lamports: (userWSOLAccountInfo ? 0 : rentExempt) + (sendAction ? parseInt(safeRepay.toString(), 10) : 0),
-            });
-            preIxs.push(transferLamportsIx);
-            preIxsLabels.push(`TransferLamportsToUserAtaSOL[${userTokenAccountAddress}]`);
-            const closeWSOLAccountIx = (0, spl_token_1.createCloseAccountInstruction)(userTokenAccountAddress, this.owner, this.owner, [], spl_token_1.TOKEN_PROGRAM_ID);
-            const syncIx = (0, utils_1.syncNative)(userTokenAccountAddress);
-            if (userWSOLAccountInfo) {
-                if (sendAction) {
-                    preIxs.push(syncIx);
-                    preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
+            const additionalUserTokenAccountInfo = await this.kaminoMarket
+                .getConnection()
+                .getAccountInfo(this.additionalTokenAccountAddress);
+            if (!additionalUserTokenAccountInfo) {
+                const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.additionalTokenAccountAddress);
+                this.setupIxs.unshift(createUserTokenAccountIx);
+                this.setupIxsLabels.unshift(`CreateAdditionalUserTokenAta[${this.owner}]`);
+            }
+        }
+        if (action === 'withdraw' || action === 'mint' || action === 'deposit' || action === 'repayAndWithdraw') {
+            const userTokenAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
+            // TODO: Might need to remove this
+            if (!userTokenAccountInfo) {
+                const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+                this.preTxnIxs.push(createUserTokenAccountIx);
+                this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
+            }
+        }
+        if (action === 'mint') {
+            const userCollateralAccountInfo = await this.kaminoMarket
+                .getConnection()
+                .getAccountInfo(this.userCollateralAccountAddress);
+            if (!userCollateralAccountInfo) {
+                const collateralMintPubkey = this.reserve.getCTokenMint();
+                const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, collateralMintPubkey, this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
+                if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
+                    this.preTxnIxs.push(createUserCollateralAccountIx);
+                    this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
                 }
                 else {
-                    postIxs.push(closeWSOLAccountIx);
-                    postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
+                    this.setupIxs.unshift(createUserCollateralAccountIx);
+                    this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
                 }
             }
-            else {
-                const [, createUserWSOLAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, spl_token_1.NATIVE_MINT, this.owner, spl_token_1.TOKEN_PROGRAM_ID, userTokenAccountAddress);
-                preIxs.push(createUserWSOLAccountIx);
-                preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
+        }
+    }
+    async updateWSOLAccount(action) {
+        const preIxs = [];
+        const postIxs = [];
+        const preIxsLabels = [];
+        const postIxsLabels = [];
+        if (action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
+            return;
+        }
+        let safeRepay = new bn_js_1.default(this.amount);
+        if (this.obligation && action === 'repay' && this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))) {
+            const borrow = this.obligation.state.borrows.find((borrow) => borrow.borrowReserve.toString() === this.reserve.address.toString());
+            if (!borrow) {
+                throw Error(`Unable to find obligation borrow to repay for ${this.obligation.state.owner.toBase58()}`);
+            }
+            const cumulativeBorrowRateObligation = obligation_1.KaminoObligation.getCumulativeBorrowRate(borrow);
+            const cumulativeBorrowRateReserve = this.reserve.getEstimatedCumulativeBorrowRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
+            // TODO: shouldn't this calc be added to all other stuff as well?
+            safeRepay = new bn_js_1.default(Math.floor(obligation_1.KaminoObligation.getBorrowAmount(borrow)
+                .mul(cumulativeBorrowRateReserve)
+                .div(cumulativeBorrowRateObligation)
+                .add(new decimal_js_1.default(SOL_PADDING_FOR_INTEREST.toString()))
+                .toNumber()).toString());
+        }
+        let userTokenAccountAddress = this.userTokenAccountAddress;
+        if (this.secondaryMint?.equals(utils_1.WRAPPED_SOL_MINT)) {
+            if (!this.additionalTokenAccountAddress) {
+                throw new Error(`Additional token account address not found ${this.secondaryMint}`);
+            }
+            userTokenAccountAddress = this.additionalTokenAccountAddress;
+        }
+        const userWSOLAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(userTokenAccountAddress);
+        const rentExempt = await this.kaminoMarket.getConnection().getMinimumBalanceForRentExemption(165);
+        // Add rent exemption lamports for WSOL accounts that need to be pre-funded for inflow/send transactions
+        const sendAction = action === 'deposit' ||
+            action === 'repay' ||
+            action === 'mint' ||
+            (action === 'liquidate' && this.secondaryMint?.equals(utils_1.WRAPPED_SOL_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
+        const transferLamportsIx = web3_js_1.SystemProgram.transfer({
+            fromPubkey: this.owner,
+            toPubkey: userTokenAccountAddress,
+            lamports: (userWSOLAccountInfo ? 0 : rentExempt) + (sendAction ? parseInt(safeRepay.toString(), 10) : 0),
+        });
+        preIxs.push(transferLamportsIx);
+        preIxsLabels.push(`TransferLamportsToUserAtaSOL[${userTokenAccountAddress}]`);
+        const closeWSOLAccountIx = (0, spl_token_1.createCloseAccountInstruction)(userTokenAccountAddress, this.owner, this.owner, [], spl_token_1.TOKEN_PROGRAM_ID);
+        const syncIx = (0, utils_1.syncNative)(userTokenAccountAddress);
+        if (userWSOLAccountInfo) {
+            if (sendAction) {
                 preIxs.push(syncIx);
                 preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
+            }
+            else {
                 postIxs.push(closeWSOLAccountIx);
                 postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
             }
-            // TODO: Consider for liquidations and other types of actions if we have to split up some ixs in 2-3 txs
-            // if (this.positions && this.positions >= POSITION_LIMIT) {
-            //   this.preTxnIxs.push(...preIxs);
-            //   this.preTxnIxsLabels.push(...preIxsLabels);
-            //   this.postTxnIxs.push(...postIxs);
-            //   this.postTxnIxsLabels.push(...postIxsLabels);
-            // } else {
-            // }
-            this.setupIxs.unshift(...preIxs);
-            this.setupIxsLabels.unshift(...preIxsLabels);
-            this.cleanupIxs.push(...postIxs);
-            this.cleanupIxsLabels.push(...postIxsLabels);
-        });
+        }
+        else {
+            const [, createUserWSOLAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, spl_token_1.NATIVE_MINT, this.owner, spl_token_1.TOKEN_PROGRAM_ID, userTokenAccountAddress);
+            preIxs.push(createUserWSOLAccountIx);
+            preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
+            preIxs.push(syncIx);
+            preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
+            postIxs.push(closeWSOLAccountIx);
+            postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
+        }
+        // TODO: Consider for liquidations and other types of actions if we have to split up some ixs in 2-3 txs
+        // if (this.positions && this.positions >= POSITION_LIMIT) {
+        //   this.preTxnIxs.push(...preIxs);
+        //   this.preTxnIxsLabels.push(...preIxsLabels);
+        //   this.postTxnIxs.push(...postIxs);
+        //   this.postTxnIxsLabels.push(...postIxsLabels);
+        // } else {
+        // }
+        this.setupIxs.unshift(...preIxs);
+        this.setupIxsLabels.unshift(...preIxsLabels);
+        this.cleanupIxs.push(...postIxs);
+        this.cleanupIxsLabels.push(...postIxsLabels);
     }
-    static initializeMultiTokenAction(kaminoMarket_1, action_1, inflowAmount_1, inflowTokenMint_1, outflowTokenMint_1, payer_1, obligationOwner_1, obligation_2, outflowAmount_1) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, action, inflowAmount, inflowTokenMint, outflowTokenMint, payer, obligationOwner, obligation, outflowAmount, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-            const inflowReserve = kaminoMarket.getReserveByMint(inflowTokenMint);
-            const outflowReserve = kaminoMarket.getReserveByMint(outflowTokenMint);
-            if (!outflowReserve || !inflowReserve) {
-                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 } = yield KaminoAction.loadObligation(action, kaminoMarket, obligationOwner, inflowReserve.address, obligation, outflowReserve.address);
-            const referrerKey = yield this.getReferrerKey(kaminoMarket, payer, kaminoObligation, referrer);
-            let userTokenAccountAddress;
-            let userCollateralAccountAddress;
-            let additionalUserTokenAccountAddress;
-            let secondaryMint;
-            let primaryMint;
-            if (action === 'liquidate') {
-                userTokenAccountAddress = userOutflowTokenAccountAddress;
-                userCollateralAccountAddress = userOutflowCollateralAccountAddress;
-                additionalUserTokenAccountAddress = userInflowTokenAccountAddress;
-                primaryMint = outflowTokenMint;
-                secondaryMint = inflowTokenMint;
-            }
-            else if (action === 'depositAndBorrow') {
-                userTokenAccountAddress = userInflowTokenAccountAddress;
-                userCollateralAccountAddress = userInflowCollateralAccountAddress;
-                additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
-                primaryMint = inflowTokenMint;
-                secondaryMint = outflowTokenMint;
-            }
-            else if (action === 'repayAndWithdraw') {
-                primaryMint = inflowTokenMint;
-                secondaryMint = outflowTokenMint;
-                userTokenAccountAddress = userInflowTokenAccountAddress;
-                userCollateralAccountAddress = userOutflowCollateralAccountAddress;
-                additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
-            }
-            else {
-                throw new Error('Invalid action');
-            }
-            return new KaminoAction(kaminoMarket, payer, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, secondaryMint, additionalUserTokenAccountAddress, outflowReserve, outflowAmount, referrerKey);
-        });
+    static async initializeMultiTokenAction(kaminoMarket, action, inflowAmount, inflowTokenMint, outflowTokenMint, payer, obligationOwner, obligation, outflowAmount, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+        const inflowReserve = kaminoMarket.getReserveByMint(inflowTokenMint);
+        const outflowReserve = kaminoMarket.getReserveByMint(outflowTokenMint);
+        if (!outflowReserve || !inflowReserve) {
+            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, kaminoMarket, obligationOwner, inflowReserve.address, obligation, outflowReserve.address);
+        const referrerKey = await this.getReferrerKey(kaminoMarket, payer, kaminoObligation, referrer);
+        let userTokenAccountAddress;
+        let userCollateralAccountAddress;
+        let additionalUserTokenAccountAddress;
+        let secondaryMint;
+        let primaryMint;
+        if (action === 'liquidate') {
+            userTokenAccountAddress = userOutflowTokenAccountAddress;
+            userCollateralAccountAddress = userOutflowCollateralAccountAddress;
+            additionalUserTokenAccountAddress = userInflowTokenAccountAddress;
+            primaryMint = outflowTokenMint;
+            secondaryMint = inflowTokenMint;
+        }
+        else if (action === 'depositAndBorrow') {
+            userTokenAccountAddress = userInflowTokenAccountAddress;
+            userCollateralAccountAddress = userInflowCollateralAccountAddress;
+            additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
+            primaryMint = inflowTokenMint;
+            secondaryMint = outflowTokenMint;
+        }
+        else if (action === 'repayAndWithdraw') {
+            primaryMint = inflowTokenMint;
+            secondaryMint = outflowTokenMint;
+            userTokenAccountAddress = userInflowTokenAccountAddress;
+            userCollateralAccountAddress = userOutflowCollateralAccountAddress;
+            additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
+        }
+        else {
+            throw new Error('Invalid action');
+        }
+        return new KaminoAction(kaminoMarket, payer, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, secondaryMint, additionalUserTokenAccountAddress, outflowReserve, outflowAmount, referrerKey);
     }
-    static initializeWithdrawReferrerFees(mint_1, owner_1, kaminoMarket_1) {
-        return __awaiter(this, arguments, void 0, function* (mint, owner, kaminoMarket, currentSlot = 0) {
-            const reserve = kaminoMarket.getReserveByMint(mint);
-            if (reserve === undefined) {
-                throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
-            }
-            const { atas, createAtasIxns } = yield (0, utils_1.getAtasWithCreateIxnsIfMissing)(kaminoMarket.getConnection(), owner, [reserve.getLiquidityMint()], [reserve.getLiquidityTokenProgram()]);
-            const userTokenAccountAddress = atas[0];
-            return {
-                axn: new KaminoAction(kaminoMarket, owner, new ObligationType_1.VanillaObligation(kaminoMarket.programId), userTokenAccountAddress, web3_js_1.PublicKey.default, mint, 0, new bn_js_1.default(0), [], [], reserve, currentSlot, undefined, undefined, undefined, undefined, undefined),
-                createAtasIxns,
-            };
-        });
+    static async initializeWithdrawReferrerFees(mint, owner, kaminoMarket, currentSlot = 0) {
+        const reserve = kaminoMarket.getReserveByMint(mint);
+        if (reserve === undefined) {
+            throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
+        }
+        const { atas, createAtasIxns } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(kaminoMarket.getConnection(), owner, [reserve.getLiquidityMint()], [reserve.getLiquidityTokenProgram()]);
+        const userTokenAccountAddress = atas[0];
+        return {
+            axn: new KaminoAction(kaminoMarket, owner, new ObligationType_1.VanillaObligation(kaminoMarket.programId), userTokenAccountAddress, web3_js_1.PublicKey.default, mint, 0, new bn_js_1.default(0), [], [], reserve, currentSlot, undefined, undefined, undefined, undefined, undefined),
+            createAtasIxns,
+        };
     }
     getObligationPda() {
         return this.obligation
@@ -1741,22 +1687,20 @@ class KaminoAction {
         }
         return depositReservesList;
     }
-    static getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let referrerKey = referrer;
-            if (!referrer || referrer.equals(web3_js_1.PublicKey.default)) {
-                if (kaminoObligation === null) {
-                    const [_, userMetadata] = yield kaminoMarket.getUserMetadata(owner);
-                    if (userMetadata) {
-                        referrerKey = userMetadata.referrer;
-                    }
-                }
-                else {
-                    referrerKey = kaminoObligation.state.referrer;
+    static async getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer) {
+        let referrerKey = referrer;
+        if (!referrer || referrer.equals(web3_js_1.PublicKey.default)) {
+            if (kaminoObligation === null) {
+                const [_, userMetadata] = await kaminoMarket.getUserMetadata(owner);
+                if (userMetadata) {
+                    referrerKey = userMetadata.referrer;
                 }
             }
-            return referrerKey;
-        });
+            else {
+                referrerKey = kaminoObligation.state.referrer;
+            }
+        }
+        return referrerKey;
     }
 }
 exports.KaminoAction = KaminoAction;