@kamino-finance/klend-sdk 6.1.0-beta.0 → 7.0.1

package/dist/classes/action.js

@@ -4,18 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KaminoAction = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const spl_token_1 = require("@solana/spl-token");
+const kit_1 = require("@solana/kit");
 const bn_js_1 = __importDefault(require("bn.js"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
-const instructions_1 = require("../idl_codegen/instructions");
+const instructions_1 = require("../@codegen/klend/instructions");
 const utils_1 = require("../utils");
 const market_1 = require("./market");
 const obligation_1 = require("./obligation");
-const types_1 = require("../idl_codegen/types");
-const farms_sdk_1 = require("@kamino-finance/farms-sdk");
+const types_1 = require("../@codegen/klend/types");
+const programId_1 = require("@kamino-finance/farms-sdk/dist/@codegen/farms/programId");
 const ObligationType_1 = require("../utils/ObligationType");
-const lib_1 = require("../lib");
+const token_1 = require("@solana-program/token");
+const sysvars_1 = require("@solana/sysvars");
+const token_2022_1 = require("@solana-program/token-2022");
+const system_1 = require("@solana-program/system");
+const signer_1 = require("../utils/signer");
 class KaminoAction {
     kaminoMarket;
     reserve;
@@ -49,7 +52,7 @@ class KaminoAction {
     borrowReserves;
     preLoadedDepositReservesSameTx;
     currentSlot;
-    constructor(kaminoMarket, owner, obligation, mint, positions, amount, depositReserves, borrowReserves, reserveState, currentSlot, secondaryMint, outflowReserveState, outflowAmount, referrer, payer) {
+    constructor(kaminoMarket, owner, obligation, mint, positions, amount, depositReserves, borrowReserves, reserveState, currentSlot, secondaryMint, outflowReserveState, outflowAmount, referrer = (0, kit_1.none)(), payer) {
         this.kaminoMarket = kaminoMarket;
         this.obligation = obligation;
         this.owner = owner;
@@ -76,21 +79,23 @@ class KaminoAction {
         this.outflowReserve = outflowReserveState;
         this.outflowAmount = outflowAmount ? new bn_js_1.default(outflowAmount) : undefined;
         this.preLoadedDepositReservesSameTx = [];
-        this.referrer = referrer ? referrer : web3_js_1.PublicKey.default;
+        this.referrer = referrer;
         this.currentSlot = currentSlot;
     }
-    static async initialize(action, amount, mint, owner, kaminoMarket, obligation, referrer = web3_js_1.PublicKey.default, currentSlot = 0, payer) {
+    static async initialize(action, amount, mint, owner, kaminoMarket, obligation, referrer = (0, kit_1.none)(), currentSlot = 0n, payer = owner) {
         const reserve = kaminoMarket.getReserveByMint(mint);
         if (reserve === undefined) {
-            throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
+            throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress()}`);
         }
-        const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = await KaminoAction.loadObligation(action, kaminoMarket, owner, reserve.address, obligation);
-        const referrerKey = await this.getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer);
+        const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = await KaminoAction.loadObligation(action, kaminoMarket, owner.address, reserve.address, obligation);
+        const referrerKey = await this.getReferrerKey(kaminoMarket, owner.address, kaminoObligation, referrer);
         return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, mint, distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, 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);
+    static async getUserAccountAddresses(owner, reserve) {
+        const [userTokenAccountAddress, userCollateralAccountAddress] = await Promise.all([
+            (0, utils_1.getAssociatedTokenAddress)(reserve.liquidity.mintPubkey, owner, reserve.liquidity.tokenProgram, token_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS),
+            (0, utils_1.getAssociatedTokenAddress)(reserve.collateral.mintPubkey, owner, token_1.TOKEN_PROGRAM_ADDRESS, token_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS),
+        ]);
         return { userTokenAccountAddress, userCollateralAccountAddress };
     }
     static async loadObligation(action, kaminoMarket, owner, reserve, obligation, outflowReserve) {
@@ -101,7 +106,7 @@ class KaminoAction {
             kaminoObligation = obligation;
         }
         else {
-            const obligationAddress = obligation.toPda(kaminoMarket.getAddress(), owner);
+            const obligationAddress = await obligation.toPda(kaminoMarket.getAddress(), owner);
             kaminoObligation = await obligation_1.KaminoObligation.load(kaminoMarket, obligationAddress);
         }
         if (kaminoObligation !== null) {
@@ -112,16 +117,16 @@ class KaminoAction {
             throw new Error(`Outflow reserve has not been set for depositAndBorrow`);
         }
         // Union of addresses
-        const distinctReserveCount = new utils_1.PublicKeySet([
+        const distinctReserveCount = new Set([
             ...borrowReserves.map((e) => e),
             ...(action === 'borrow' ? [reserve] : []),
             ...(action === 'depositAndBorrow' ? [reserve] : []),
-        ]).toArray().length +
-            new utils_1.PublicKeySet([
+        ]).size +
+            new Set([
                 ...depositReserves.map((e) => e),
                 ...(action === 'deposit' ? [reserve] : []),
                 ...(action === 'depositAndBorrow' ? [outflowReserve] : []),
-            ]).toArray().length;
+            ]).size;
         return {
             kaminoObligation,
             depositReserves,
@@ -130,33 +135,34 @@ class KaminoAction {
         };
     }
     static async buildRefreshObligationTxns(kaminoMarket, payer, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    currentSlot = 0) {
+    currentSlot = 0n) {
         //  placeholder for action initialization
         const firstReserve = obligation.getDeposits()[0].reserveAddress;
         const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
         if (!firstKaminoReserve) {
-            throw new Error(`Reserve ${firstReserve.toBase58()} not found`);
+            throw new Error(`Reserve ${firstReserve} not found`);
         }
-        const axn = await KaminoAction.initialize('refreshObligation', '0', firstKaminoReserve?.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, undefined, currentSlot);
+        const axn = await KaminoAction.initialize('refreshObligation', '0', firstKaminoReserve?.getLiquidityMint(), (0, signer_1.noopSigner)(obligation.state.owner), // owner does not need to sign for refresh
+        kaminoMarket, obligation, undefined, currentSlot);
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        axn.addRefreshObligation(payer);
+        await axn.addRefreshObligation(payer);
         return axn;
     }
-    static async buildRequestElevationGroupTxns(kaminoMarket, payer, obligation, elevationGroup, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    currentSlot = 0) {
-        const firstReserve = obligation.state.deposits.find((x) => !x.depositReserve.equals(web3_js_1.PublicKey.default)).depositReserve;
+    static async buildRequestElevationGroupTxns(kaminoMarket, owner, obligation, elevationGroup, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    currentSlot = 0n) {
+        const firstReserve = obligation.state.deposits.find((x) => x.depositReserve !== utils_1.DEFAULT_PUBLIC_KEY).depositReserve;
         const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
         if (!firstKaminoReserve) {
-            throw new Error(`Reserve ${firstReserve.toBase58()} not found`);
+            throw new Error(`Reserve ${firstReserve} not found`);
         }
-        const axn = await KaminoAction.initialize('requestElevationGroup', '0', firstKaminoReserve?.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, undefined, currentSlot);
+        const axn = await KaminoAction.initialize('requestElevationGroup', '0', firstKaminoReserve?.getLiquidityMint(), owner, kaminoMarket, obligation, undefined, currentSlot);
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        axn.addRefreshObligation(payer);
-        axn.addRequestElevationIx(elevationGroup, 'setup');
+        await axn.addRefreshObligation(owner);
+        await axn.addRequestElevationIx(elevationGroup, 'setup');
         return axn;
     }
     static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
@@ -165,7 +171,7 @@ class KaminoAction {
     initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default, currentSlot = 0, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
+    }, referrer = (0, kit_1.none)(), currentSlot = 0n, 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;
@@ -174,18 +180,18 @@ class KaminoAction {
         }
         await axn.addSupportIxs('deposit', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, undefined, overrideElevationGroupRequest);
         if (useV2Ixs) {
-            axn.addDepositIxV2();
+            await axn.addDepositIxV2();
         }
         else {
-            axn.addDepositIx();
+            await axn.addDepositIx();
         }
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    async addScopeRefreshIxs(scope, tokens, feed = 'hubble') {
+    async addScopeRefreshIxs(scope, tokens, scopeConfig) {
         this.setupIxsLabels.unshift(`refreshScopePrices`);
         this.setupIxs.unshift(await scope.refreshPriceListIx({
-            feed: feed,
+            config: scopeConfig,
         }, tokens));
     }
     static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
@@ -193,53 +199,53 @@ class KaminoAction {
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default, currentSlot = 0, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
+    }, referrer = (0, kit_1.none)(), currentSlot = 0n, 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);
         }
-        if (!axn.referrer.equals(web3_js_1.PublicKey.default)) {
-            const referrerTokenState = (0, utils_1.referrerTokenStatePda)(axn.referrer, axn.reserve.address, axn.kaminoMarket.programId)[0];
-            const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
-            if (!account) {
+        if ((0, kit_1.isSome)(axn.referrer)) {
+            const referrerTokenState = await (0, utils_1.referrerTokenStatePda)(axn.referrer.value, axn.reserve.address, axn.kaminoMarket.programId);
+            const account = await (0, kit_1.fetchEncodedAccount)(kaminoMarket.getRpc(), referrerTokenState);
+            if (!account.exists) {
                 axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
             }
         }
         await axn.addSupportIxs('borrow', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, undefined, overrideElevationGroupRequest);
         if (useV2Ixs) {
-            axn.addBorrowIxV2();
+            await axn.addBorrowIxV2();
         }
         else {
-            axn.addBorrowIx();
+            await axn.addBorrowIx();
         }
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
     static async buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
     includeAtaIxs = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+    requestElevationGroup = false, referrer = (0, kit_1.none)(), currentSlot = 0n) {
         const axn = await KaminoAction.initialize('mint', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
         await axn.addSupportIxs('mint', includeAtaIxs, requestElevationGroup, false, addInitObligationForFarm, scopeRefreshConfig, { skipInitialization: true, skipLutCreation: true });
-        axn.addDepositReserveLiquidityIx();
+        await axn.addDepositReserveLiquidityIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
     static async buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
     includeAtaIxs = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+    requestElevationGroup = false, referrer = (0, kit_1.none)(), currentSlot = 0n) {
         const axn = await KaminoAction.initialize('redeem', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
         await axn.addSupportIxs('redeem', includeAtaIxs, requestElevationGroup, false, addInitObligationForFarm, scopeRefreshConfig, { skipInitialization: true, skipLutCreation: true });
-        axn.addRedeemReserveCollateralIx();
+        await axn.addRedeemReserveCollateralIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -248,7 +254,7 @@ class KaminoAction {
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+    }, referrer = (0, kit_1.none)(), currentSlot = 0n) {
         const axn = await KaminoAction.initialize('depositCollateral', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -256,31 +262,31 @@ class KaminoAction {
         }
         await axn.addSupportIxs('depositCollateral', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata);
         if (useV2Ixs) {
-            axn.addDepositObligationCollateralIxV2();
+            await axn.addDepositObligationCollateralIxV2();
         }
         else {
-            axn.addDepositObligationCollateralIx();
+            await axn.addDepositObligationCollateralIx();
         }
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
     includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, payer, payer, obligation, borrowAmount, referrer, currentSlot);
+    }, referrer = (0, kit_1.none)(), currentSlot = 0n) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, owner, owner.address, obligation, borrowAmount, referrer, currentSlot);
         const addInitObligationForFarmForDeposit = true;
         const addInitObligationForFarmForBorrow = false;
         const twoTokenAction = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        if (!axn.referrer.equals(web3_js_1.PublicKey.default)) {
-            const referrerTokenState = (0, utils_1.referrerTokenStatePda)(axn.referrer, axn.outflowReserve.address, axn.kaminoMarket.programId)[0];
-            const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
-            if (!account) {
+        if ((0, kit_1.isSome)(axn.referrer)) {
+            const referrerTokenState = await (0, utils_1.referrerTokenStatePda)(axn.referrer.value, axn.outflowReserve.address, axn.kaminoMarket.programId);
+            const account = await (0, kit_1.fetchEncodedAccount)(axn.kaminoMarket.getRpc(), referrerTokenState);
+            if (!account.exists) {
                 axn.addInitReferrerTokenStateIx(axn.outflowReserve, referrerTokenState);
             }
         }
@@ -293,27 +299,34 @@ class KaminoAction {
         }
         await axn.addInBetweenIxs('depositAndBorrow', includeAtaIxs, requestElevationGroup, addInitObligationForFarmForBorrow, useV2Ixs);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-        // Create the scope refresh ix in here to ensure it's the first ix in the txn
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-            ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
-            ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
-        ]).toArray();
-        const tokenIds = (0, market_1.getTokenIdsForScopeRefresh)(axn.kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefreshConfig) {
-            await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
+        // Create the scope refresh ix in here to ensure it's the first ix in the tx
+        const allReserves = [
+            ...new Set([
+                ...axn.depositReserves,
+                ...axn.borrowReserves,
+                axn.reserve.address,
+                ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
+                ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
+            ]),
+        ];
+        const scopeTokensMap = (0, market_1.getTokenIdsForScopeRefresh)(axn.kaminoMarket, allReserves);
+        if (scopeTokensMap.size > 0 && scopeRefreshConfig) {
+            for (const [configPubkey, config] of scopeRefreshConfig.scopeConfigurations) {
+                const tokenIds = scopeTokensMap.get(config.oraclePrices);
+                if (tokenIds && tokenIds.length > 0) {
+                    await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, configPubkey);
+                }
+            }
         }
         return axn;
     }
-    static async buildDepositAndWithdrawV2Txns(kaminoMarket, depositAmount, depositMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    static async buildDepositAndWithdrawV2Txns(kaminoMarket, depositAmount, depositMint, withdrawAmount, withdrawMint, owner, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
     includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndWithdraw', depositAmount, depositMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
+    }, referrer = (0, kit_1.none)()) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndWithdraw', depositAmount, depositMint, withdrawMint, owner, owner.address, obligation, withdrawAmount, referrer, currentSlot);
         const addInitObligationForFarm = true;
         const twoTokenAction = true;
         if (extraComputeBudget > 0) {
@@ -321,7 +334,7 @@ class KaminoAction {
         }
         await axn.addSupportIxs('depositAndWithdraw', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, true, scopeRefreshConfig, initUserMetadata, twoTokenAction);
         const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
-        axn.addDepositAndWithdrawV2Ixs(withdrawCollateralAmount);
+        await axn.addDepositAndWithdrawV2Ixs(withdrawCollateralAmount);
         return axn;
     }
     static async buildRepayAndWithdrawV2Txns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
@@ -329,8 +342,8 @@ class KaminoAction {
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdrawV2', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
+    }, referrer = (0, kit_1.none)()) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdrawV2', repayAmount, repayMint, withdrawMint, payer, payer.address, obligation, withdrawAmount, referrer, currentSlot);
         const addInitObligationForFarm = true;
         const twoTokenAction = true;
         if (extraComputeBudget > 0) {
@@ -338,7 +351,7 @@ class KaminoAction {
         }
         await axn.addSupportIxs('repayAndWithdrawV2', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, true, scopeRefreshConfig, initUserMetadata, twoTokenAction);
         const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
-        axn.addRepayAndWithdrawV2Ixs(withdrawCollateralAmount);
+        await axn.addRepayAndWithdrawV2Ixs(withdrawCollateralAmount);
         return axn;
     }
     static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
@@ -346,8 +359,8 @@ class KaminoAction {
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
+    }, referrer = (0, kit_1.none)()) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer.address, obligation, withdrawAmount, referrer, currentSlot);
         const addInitObligationForFarmForRepay = true;
         const addInitObligationForFarmForWithdraw = false;
         const twoTokenAction = true;
@@ -364,17 +377,24 @@ class KaminoAction {
         }
         await axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxs, requestElevationGroup, addInitObligationForFarmForWithdraw, useV2Ixs);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-        // Create the scope refresh ix in here to ensure it's the first ix in the txn
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-            ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
-            ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
-        ]).toArray();
-        const tokenIds = (0, market_1.getTokenIdsForScopeRefresh)(axn.kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefreshConfig) {
-            await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
+        // Create the scope refresh ix in here to ensure it's the first ix in the tx
+        const allReserves = [
+            ...new Set([
+                ...axn.depositReserves,
+                ...axn.borrowReserves,
+                axn.reserve.address,
+                ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
+                ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
+            ]),
+        ];
+        const scopeTokensMap = (0, market_1.getTokenIdsForScopeRefresh)(axn.kaminoMarket, allReserves);
+        if (scopeTokensMap.size > 0 && scopeRefreshConfig) {
+            for (const [configPubkey, config] of scopeRefreshConfig.scopeConfigurations) {
+                const tokenIds = scopeTokensMap.get(config.oraclePrices);
+                if (tokenIds && tokenIds.length > 0) {
+                    await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, configPubkey);
+                }
+            }
         }
         return axn;
     }
@@ -384,7 +404,7 @@ class KaminoAction {
     initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default, currentSlot = 0, overrideElevationGroupRequest, 
+    }, referrer = (0, kit_1.none)(), currentSlot = 0n, overrideElevationGroupRequest, 
     // Optional customizations which may be needed if the obligation was mutated by some previous ix.
     obligationCustomizations) {
         const axn = await KaminoAction.initialize('withdraw', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
@@ -411,18 +431,20 @@ class KaminoAction {
      * @param mint
      * @param owner
      * @param obligation - obligation to repay or the PDA seeds
+     * @param useV2Ixs
+     * @param scopeRefreshConfig
      * @param currentSlot
      * @param payer - if not set then owner is used
      * @param extraComputeBudget - if > 0 then adds the ix
      * @param includeAtaIxs - if true it includes create and close wsol and token atas
      * @param requestElevationGroup
-     * @param includeUserMetadata - if true it includes user metadata
+     * @param initUserMetadata
      * @param referrer
      */
-    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, currentSlot, payer = undefined, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = {
+    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, currentSlot, payer = owner, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default) {
+    }, referrer = (0, kit_1.none)()) {
         const axn = await KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, payer);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -443,7 +465,7 @@ class KaminoAction {
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
-    }, referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0) {
+    }, referrer = (0, kit_1.none)(), maxAllowedLtvOverridePercent = 0, currentSlot = 0n) {
         const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'liquidate', amount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, minCollateralReceiveAmount, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -459,19 +481,19 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildWithdrawReferrerFeeTxns(owner, tokenMint, kaminoMarket, currentSlot = 0) {
+    static async buildWithdrawReferrerFeeTxns(owner, tokenMint, kaminoMarket, currentSlot = 0n) {
         const { axn, createAtaIxs } = await KaminoAction.initializeWithdrawReferrerFees(tokenMint, owner, kaminoMarket, currentSlot);
         axn.setupIxs.push(...createAtaIxs);
         axn.setupIxsLabels.push(`createAtasIxs[${axn.owner.toString()}]`);
-        if (!axn.referrer.equals(web3_js_1.PublicKey.default)) {
-            const referrerTokenState = (0, utils_1.referrerTokenStatePda)(axn.referrer, axn.reserve.address, axn.kaminoMarket.programId)[0];
-            const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
-            if (!account) {
+        if ((0, kit_1.isSome)(axn.referrer)) {
+            const referrerTokenState = await (0, utils_1.referrerTokenStatePda)(axn.referrer.value, axn.reserve.address, axn.kaminoMarket.programId);
+            const account = await (0, kit_1.fetchEncodedAccount)(axn.kaminoMarket.getRpc(), referrerTokenState);
+            if (!account.exists) {
                 axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
             }
         }
         axn.addRefreshReserveIxs([axn.reserve.address]);
-        axn.addWithdrawReferrerFeesIxs();
+        await axn.addWithdrawReferrerFeesIxs();
         return axn;
     }
     /**
@@ -480,263 +502,207 @@ class KaminoAction {
      * In other words: it will overwrite the given slot in the {@link Obligation.orders} array. This possibly includes
      * setting the `null` state (i.e. cancelling the order).
      */
-    static buildSetObligationOrderIxn(kaminoMarket, obligation, orderAtIndex) {
+    static buildSetObligationOrderIxn(owner, kaminoMarket, obligation, orderAtIndex) {
         return (0, instructions_1.setObligationOrder)({
             index: orderAtIndex.index,
             order: orderAtIndex.orderState(),
         }, {
             lendingMarket: kaminoMarket.getAddress(),
             obligation: obligation.obligationAddress,
-            owner: obligation.state.owner,
+            owner,
         }, kaminoMarket.programId);
     }
-    async getTransactions() {
-        let txns;
-        if (this.lendingIxs.length === 2) {
-            txns = 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 = new web3_js_1.Transaction({
-                feePayer: this.owner,
-                recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-            }).add(...this.setupIxs, ...this.lendingIxs, ...this.cleanupIxs);
-        }
-        return txns;
-    }
-    async sendTransactions(sendTransaction) {
-        const txns = await this.getTransactions();
-        const signature = await this.sendSingleTransaction(txns, sendTransaction);
-        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;
-    }
-    async simulateTransactions(sendTransaction) {
-        const txns = await this.getTransactions();
-        const signature = await this.simulateSingleTransaction(txns, sendTransaction);
-        return signature;
-    }
-    async simulateSingleTransaction(txn, sendTransaction) {
-        if (!txn)
-            return '';
-        return await sendTransaction(txn, this.kaminoMarket.getConnection());
-    }
-    addDepositReserveLiquidityIx() {
+    async addDepositReserveLiquidityIx() {
         this.lendingIxsLabels.push(`depositReserveLiquidity`);
         this.lendingIxs.push((0, instructions_1.depositReserveLiquidity)({
             liquidityAmount: this.amount,
         }, {
             owner: this.owner,
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             reserve: this.reserve.address,
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
-            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
-            userDestinationCollateral: this.getUserCollateralAccountAddress(this.reserve),
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+            userDestinationCollateral: await this.getUserCollateralAccountAddress(this.reserve),
+            collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId));
     }
-    addRedeemReserveCollateralIx() {
+    async addRedeemReserveCollateralIx() {
         this.lendingIxsLabels.push(`redeemReserveCollateral`);
         this.lendingIxs.push((0, instructions_1.redeemReserveCollateral)({
             collateralAmount: this.amount,
         }, {
             owner: this.owner,
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             reserve: this.reserve.address,
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
-            userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
-            userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            userSourceCollateral: await this.getUserCollateralAccountAddress(this.reserve),
+            userDestinationLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+            collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId));
     }
     // @deprecated -- use addDepositIxV2 instead
-    addDepositIx() {
+    async addDepositIx() {
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
         this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateral)({
             liquidityAmount: this.amount,
         }, {
             owner: this.owner,
-            obligation: this.getObligationPda(),
+            obligation: await this.getObligationPda(),
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.reserve),
-            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+            placeholderUserDestinationCollateral: (0, kit_1.none)(),
+            collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId));
     }
-    addDepositIxV2() {
-        const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
+    async addDepositIxV2() {
+        const { collateralFarmAccounts: farmsAccounts } = await KaminoAction.getFarmAccountsForReserve(await this.getObligationPda(), this.reserve);
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateralV2`);
         this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateralV2)({
             liquidityAmount: this.amount,
         }, {
             depositAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: await this.getObligationPda(),
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.reserve),
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+                placeholderUserDestinationCollateral: (0, kit_1.none)(),
+                collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
                 liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId));
     }
     /// @deprecated -- use addDepositObligationCollateralIxV2 instead
-    addDepositObligationCollateralIx() {
+    async addDepositObligationCollateralIx() {
         this.lendingIxsLabels.push(`depositObligationCollateral`);
         this.lendingIxs.push((0, instructions_1.depositObligationCollateral)({
             collateralAmount: this.amount,
         }, {
             owner: this.owner,
-            obligation: this.getObligationPda(),
+            obligation: await this.getObligationPda(),
             lendingMarket: this.kaminoMarket.getAddress(),
             depositReserve: this.reserve.address,
             reserveDestinationCollateral: this.reserve.state.collateral.supplyVault,
-            userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            userSourceCollateral: await this.getUserCollateralAccountAddress(this.reserve),
+            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId));
     }
-    addDepositObligationCollateralIxV2() {
-        const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
+    async addDepositObligationCollateralIxV2() {
+        const obligationAddress = await this.getObligationPda();
+        const { collateralFarmAccounts: farmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.reserve);
         this.lendingIxsLabels.push(`depositObligationCollateralV2`);
         this.lendingIxs.push((0, instructions_1.depositObligationCollateralV2)({
             collateralAmount: this.amount,
         }, {
             depositAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
                 depositReserve: this.reserve.address,
                 reserveDestinationCollateral: this.reserve.state.collateral.supplyVault,
-                userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                userSourceCollateral: await this.getUserCollateralAccountAddress(this.reserve),
+                tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId));
     }
     /// @deprecated -- use addDepositObligationCollateralIxV2 instead
-    addBorrowIx() {
+    async addBorrowIx() {
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
+        let borrowIx = (0, instructions_1.borrowObligationLiquidity)({
             liquidityAmount: this.amount,
         }, {
             owner: this.owner,
-            obligation: this.getObligationPda(),
+            obligation: await this.getObligationPda(),
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             borrowReserve: this.reserve.address,
             borrowReserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveSourceLiquidity: this.reserve.state.liquidity.supplyVault,
-            userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
+            userDestinationLiquidity: await this.getUserTokenAccountAddress(this.reserve),
             borrowReserveLiquidityFeeReceiver: this.reserve.state.liquidity.feeVault,
-            referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.reserve.address, this.kaminoMarket.programId)[0],
+            referrerTokenState: await this.getReferrerTokenStateAddress(this.reserve.address),
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId);
-        borrowIx.keys =
-            (0, obligation_1.isKaminoObligation)(this.obligation) &&
+        borrowIx = {
+            ...borrowIx,
+            accounts: (0, obligation_1.isKaminoObligation)(this.obligation) &&
                 (this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0)
-                ? borrowIx.keys.concat([...depositReserveAccountMetas])
-                : borrowIx.keys;
+                ? borrowIx.accounts.concat(depositReserveAccountMetas)
+                : borrowIx.accounts,
+        };
         this.lendingIxs.push(borrowIx);
     }
-    addBorrowIxV2() {
+    async addBorrowIxV2() {
         this.lendingIxsLabels.push(`borrowObligationLiquidityV2`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const farmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
-        const borrowIx = (0, instructions_1.borrowObligationLiquidityV2)({
+        const obligationAddress = await this.getObligationPda();
+        const { debtFarmAccounts: farmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.reserve);
+        let borrowIx = (0, instructions_1.borrowObligationLiquidityV2)({
             liquidityAmount: this.amount,
         }, {
             borrowAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
                 borrowReserve: this.reserve.address,
                 borrowReserveLiquidityMint: this.reserve.getLiquidityMint(),
                 reserveSourceLiquidity: this.reserve.state.liquidity.supplyVault,
-                userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
+                userDestinationLiquidity: await this.getUserTokenAccountAddress(this.reserve),
                 borrowReserveLiquidityFeeReceiver: this.reserve.state.liquidity.feeVault,
-                referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.reserve.address, this.kaminoMarket.programId)[0],
+                referrerTokenState: await this.getReferrerTokenStateAddress(this.reserve.address),
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId);
-        borrowIx.keys =
-            (0, obligation_1.isKaminoObligation)(this.obligation) &&
+        borrowIx = {
+            ...borrowIx,
+            accounts: (0, obligation_1.isKaminoObligation)(this.obligation) &&
                 (this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0)
-                ? borrowIx.keys.concat([...depositReserveAccountMetas])
-                : borrowIx.keys;
+                ? borrowIx.accounts.concat(depositReserveAccountMetas)
+                : borrowIx.accounts,
+        };
         this.lendingIxs.push(borrowIx);
     }
     /// @deprecated -- use addWithdrawIxV2 instead
@@ -746,129 +712,121 @@ class KaminoAction {
             collateralAmount,
         }, {
             owner: this.owner,
-            obligation: this.getObligationPda(),
+            obligation: await this.getObligationPda(),
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.reserve),
-            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            userDestinationLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+            placeholderUserDestinationCollateral: (0, kit_1.none)(),
+            collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId));
     }
     async addWithdrawIxV2(collateralAmount) {
-        const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
+        const obligationAddress = await this.getObligationPda();
+        const { collateralFarmAccounts: farmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.reserve);
         this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateralV2`);
         this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateralV2)({
             collateralAmount,
         }, {
             withdrawAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.reserve),
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                userDestinationLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+                placeholderUserDestinationCollateral: (0, kit_1.none)(),
+                collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
                 liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             farmsAccounts: farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId));
     }
     /// @deprecated -- use addRepayIxV2 instead
     async addRepayIx() {
-        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+        const obligationAddress = await this.getObligationPda();
+        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${obligationAddress})`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const repayIx = (0, instructions_1.repayObligationLiquidity)({
+        let repayIx = (0, instructions_1.repayObligationLiquidity)({
             liquidityAmount: this.amount,
         }, {
             owner: this.payer,
-            obligation: this.getObligationPda(),
+            obligation: obligationAddress,
             lendingMarket: this.kaminoMarket.getAddress(),
             repayReserve: this.reserve.address,
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
-            userSourceLiquidity: this.getTokenAccountAddressByUser(this.reserve, this.payer),
+            userSourceLiquidity: await this.getTokenAccountAddressByUser(this.reserve, this.payer.address),
             reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId);
-        repayIx.keys =
-            (0, obligation_1.isKaminoObligation)(this.obligation) && this.obligation.state.elevationGroup > 0
-                ? repayIx.keys.concat([...depositReserveAccountMetas])
-                : repayIx.keys;
+        repayIx = {
+            ...repayIx,
+            accounts: (0, obligation_1.isKaminoObligation)(this.obligation) && this.obligation.state.elevationGroup > 0
+                ? repayIx.accounts.concat(depositReserveAccountMetas)
+                : repayIx.accounts,
+        };
         this.lendingIxs.push(repayIx);
     }
     async addRepayIxV2() {
-        this.lendingIxsLabels.push(`repayObligationLiquidityV2(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+        const obligationAddress = await this.getObligationPda();
+        this.lendingIxsLabels.push(`repayObligationLiquidityV2(reserve=${this.reserve.address})(obligation=${obligationAddress})`);
         const depositReservesList = this.getAdditionalDepositReservesList();
-        const farmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
+        const { debtFarmAccounts: farmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.reserve);
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const repayIx = (0, instructions_1.repayObligationLiquidityV2)({
+        let repayIx = (0, instructions_1.repayObligationLiquidityV2)({
             liquidityAmount: this.amount,
         }, {
             repayAccounts: {
                 owner: this.payer,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
                 repayReserve: this.reserve.address,
                 reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                userSourceLiquidity: this.getTokenAccountAddressByUser(this.reserve, this.payer),
+                userSourceLiquidity: await this.getTokenAccountAddressByUser(this.reserve, this.payer.address),
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId);
-        repayIx.keys =
+        repayIx = {
+            ...repayIx,
             // TODO: potential elev group update?
-            (0, obligation_1.isKaminoObligation)(this.obligation) && this.obligation.state.elevationGroup > 0
-                ? repayIx.keys.concat([...depositReserveAccountMetas])
-                : repayIx.keys;
+            accounts: (0, obligation_1.isKaminoObligation)(this.obligation) && this.obligation.state.elevationGroup > 0
+                ? repayIx.accounts.concat(depositReserveAccountMetas)
+                : repayIx.accounts,
+        };
         this.lendingIxs.push(repayIx);
     }
-    addRepayAndWithdrawV2Ixs(withdrawCollateralAmount) {
-        this.lendingIxsLabels.push(`repayAndWithdrawAndRedeem(repayReserve=${this.reserve.address})(withdrawReserve=${this.outflowReserve.address})(obligation=${this.getObligationPda()})`);
+    async addRepayAndWithdrawV2Ixs(withdrawCollateralAmount) {
+        const obligationAddress = await this.getObligationPda();
+        this.lendingIxsLabels.push(`repayAndWithdrawAndRedeem(repayReserve=${this.reserve.address})(withdrawReserve=${this.outflowReserve.address})(obligation=${obligationAddress})`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
         const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
         if (!this.outflowAmount) {
             throw new Error(`outflowAmount not set`);
@@ -876,73 +834,58 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
         }
-        const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.outflowReserve.state.farmCollateral,
-            };
-        const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
-        const repayAndWithdrawIx = (0, instructions_1.repayAndWithdrawAndRedeem)({
+        const { collateralFarmAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.outflowReserve);
+        const { debtFarmAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.reserve);
+        let repayAndWithdrawIx = (0, instructions_1.repayAndWithdrawAndRedeem)({
             repayAmount: this.amount,
             withdrawCollateralAmount,
         }, {
             repayAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
                 repayReserve: this.reserve.address,
                 reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+                userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             withdrawAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.outflowReserve),
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                userDestinationLiquidity: await this.getUserTokenAccountAddress(this.outflowReserve),
+                placeholderUserDestinationCollateral: (0, kit_1.none)(),
+                collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
                 liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
-            collateralFarmsAccounts,
-            debtFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            collateralFarmsAccounts: collateralFarmAccounts,
+            debtFarmsAccounts: debtFarmAccounts,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId);
-        repayAndWithdrawIx.keys = repayAndWithdrawIx.keys.concat([
-            ...depositReserveAccountMetas,
-            ...borrowReserveAccountMetas,
-        ]);
+        repayAndWithdrawIx = {
+            ...repayAndWithdrawIx,
+            accounts: repayAndWithdrawIx.accounts.concat(depositReserveAccountMetas).concat(borrowReserveAccountMetas),
+        };
         this.lendingIxs.push(repayAndWithdrawIx);
     }
-    addDepositAndWithdrawV2Ixs(withdrawCollateralAmount) {
-        this.lendingIxsLabels.push(`depositAndWithdrawV2(depositReserve=${this.reserve.address})(withdrawReserve=${this.outflowReserve.address})(obligation=${this.getObligationPda()})`);
+    async addDepositAndWithdrawV2Ixs(withdrawCollateralAmount) {
+        const obligationAddress = await this.getObligationPda();
+        this.lendingIxsLabels.push(`depositAndWithdrawV2(depositReserve=${this.reserve.address})(withdrawReserve=${this.outflowReserve.address})(obligation=${obligationAddress})`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
         const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
         if (!this.outflowAmount) {
             throw new Error(`outflowAmount not set`);
@@ -950,68 +893,53 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
         }
-        const depositFarmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
-        const withdrawFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.outflowReserve.state.farmCollateral,
-            };
-        const depositAndWithdrawIx = (0, instructions_1.depositAndWithdraw)({
+        const { collateralFarmAccounts: depositFarmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.reserve);
+        const { collateralFarmAccounts: withdrawFarmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.outflowReserve);
+        const lendingMarketAuthority = await this.kaminoMarket.getLendingMarketAuthority();
+        let depositAndWithdrawIx = (0, instructions_1.depositAndWithdraw)({
             liquidityAmount: this.amount,
             withdrawCollateralAmount,
         }, {
             depositAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority,
                 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.getUserTokenAccountAddress(this.reserve),
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+                placeholderUserDestinationCollateral: (0, kit_1.none)(),
+                collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
                 liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             withdrawAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority,
                 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.getUserTokenAccountAddress(this.outflowReserve),
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                userDestinationLiquidity: await this.getUserTokenAccountAddress(this.outflowReserve),
+                placeholderUserDestinationCollateral: (0, kit_1.none)(),
+                collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
                 liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             depositFarmsAccounts,
             withdrawFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId);
-        depositAndWithdrawIx.keys = depositAndWithdrawIx.keys.concat([
-            ...depositReserveAccountMetas,
-            ...borrowReserveAccountMetas,
-        ]);
+        depositAndWithdrawIx = {
+            ...depositAndWithdrawIx,
+            accounts: depositAndWithdrawIx.accounts.concat(depositReserveAccountMetas).concat(borrowReserveAccountMetas),
+        };
         this.lendingIxs.push(depositAndWithdrawIx);
     }
     async addDepositAndBorrowIx() {
@@ -1021,19 +949,19 @@ class KaminoAction {
             liquidityAmount: this.amount,
         }, {
             owner: this.owner,
-            obligation: this.getObligationPda(),
+            obligation: await this.getObligationPda(),
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.reserve),
-            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+            placeholderUserDestinationCollateral: (0, kit_1.none)(),
+            collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId));
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
@@ -1046,37 +974,33 @@ class KaminoAction {
             depositReservesList.push(this.reserve.address);
         }
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
+        let borrowIx = (0, instructions_1.borrowObligationLiquidity)({
             liquidityAmount: this.outflowAmount,
         }, {
             owner: this.owner,
-            obligation: this.getObligationPda(),
+            obligation: await this.getObligationPda(),
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             borrowReserve: this.outflowReserve.address,
             borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
             reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
-            userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
+            userDestinationLiquidity: await this.getUserTokenAccountAddress(this.outflowReserve),
             borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-            referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
+            referrerTokenState: await this.getReferrerTokenStateAddress(this.outflowReserve.address),
             tokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId);
-        borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
+        borrowIx = {
+            ...borrowIx,
+            accounts: borrowIx.accounts.concat(depositReserveAccountMetas),
+        };
         this.lendingIxs.push(borrowIx);
     }
     async addDepositAndBorrowIxV2() {
-        const collateralFarmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
+        const obligationAddress = await this.getObligationPda();
+        const { collateralFarmAccounts: collateralFarmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.reserve);
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateralV2`);
         this.lendingIxsLabels.push(`borrowObligationLiquidityV2`);
         this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateralV2)({
@@ -1084,22 +1008,22 @@ class KaminoAction {
         }, {
             depositAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.reserve),
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+                placeholderUserDestinationCollateral: (0, kit_1.none)(),
+                collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
                 liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             farmsAccounts: collateralFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId));
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
@@ -1112,61 +1036,60 @@ class KaminoAction {
             depositReservesList.push(this.reserve.address);
         }
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const debtFarmsAccounts = this.outflowReserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmDebt, this.getObligationPda()),
-                reserveFarmState: this.outflowReserve.state.farmDebt,
-            };
-        const borrowIx = (0, instructions_1.borrowObligationLiquidityV2)({
+        const { debtFarmAccounts: debtFarmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.outflowReserve);
+        let borrowIx = (0, instructions_1.borrowObligationLiquidityV2)({
             liquidityAmount: this.outflowAmount,
         }, {
             borrowAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
                 borrowReserve: this.outflowReserve.address,
                 borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
                 reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
-                userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
+                userDestinationLiquidity: await this.getUserTokenAccountAddress(this.outflowReserve),
                 borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-                referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
+                referrerTokenState: await this.getReferrerTokenStateAddress(this.outflowReserve.address),
                 tokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             farmsAccounts: debtFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId);
-        borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
+        borrowIx = {
+            ...borrowIx,
+            accounts: borrowIx.accounts.concat(depositReserveAccountMetas),
+        };
         this.lendingIxs.push(borrowIx);
     }
     async addRepayAndWithdrawIxs(withdrawCollateralAmount) {
-        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+        const obligationAddress = await this.getObligationPda();
+        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${obligationAddress})`);
         this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const repayIx = (0, instructions_1.repayObligationLiquidity)({
+        let repayIx = (0, instructions_1.repayObligationLiquidity)({
             liquidityAmount: this.amount,
         }, {
             owner: this.owner,
-            obligation: this.getObligationPda(),
+            obligation: obligationAddress,
             lendingMarket: this.kaminoMarket.getAddress(),
             repayReserve: this.reserve.address,
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
-            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+            userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
             reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId);
-        repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
+        repayIx = {
+            ...repayIx,
+            accounts: repayIx.accounts.concat(depositReserveAccountMetas),
+        };
         this.lendingIxs.push(repayIx);
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
@@ -1178,60 +1101,57 @@ class KaminoAction {
             collateralAmount: withdrawCollateralAmount,
         }, {
             owner: this.owner,
-            obligation: this.getObligationPda(),
+            obligation: obligationAddress,
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.outflowReserve),
-            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            userDestinationLiquidity: await this.getUserTokenAccountAddress(this.outflowReserve),
+            placeholderUserDestinationCollateral: (0, kit_1.none)(),
+            collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
             liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId));
     }
     async addRepayAndWithdrawIxsV2(withdrawCollateralAmount) {
-        this.lendingIxsLabels.push(`repayObligationLiquidityV2(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+        const obligationAddress = await this.getObligationPda();
+        this.lendingIxsLabels.push(`repayObligationLiquidityV2(reserve=${this.reserve.address})(obligation=${obligationAddress})`);
         this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateralV2`);
         if (!(0, obligation_1.isKaminoObligation)(this.obligation)) {
             throw new Error(`obligation is not a KaminoObligation`);
         }
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
-        const repayIx = (0, instructions_1.repayObligationLiquidityV2)({
+        const { debtFarmAccounts: debtFarmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.reserve);
+        let repayIx = (0, instructions_1.repayObligationLiquidityV2)({
             liquidityAmount: this.amount,
         }, {
             repayAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
                 repayReserve: this.reserve.address,
                 reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+                userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             farmsAccounts: debtFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId);
-        repayIx.keys =
-            this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
+        repayIx = {
+            ...repayIx,
+            accounts: this.obligation.state.elevationGroup > 0
+                ? repayIx.accounts.concat(depositReserveAccountMetas)
+                : repayIx.accounts,
+        };
         this.lendingIxs.push(repayIx);
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
@@ -1239,39 +1159,31 @@ class KaminoAction {
         if (!this.outflowAmount) {
             throw new Error(`outflowAmount not set`);
         }
-        const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.outflowReserve.state.farmCollateral,
-            };
+        const { collateralFarmAccounts: collateralFarmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.outflowReserve);
         this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateralV2)({
             collateralAmount: withdrawCollateralAmount,
         }, {
             withdrawAccounts: {
                 owner: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority: await 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.getUserTokenAccountAddress(this.outflowReserve),
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                userDestinationLiquidity: await this.getUserTokenAccountAddress(this.outflowReserve),
+                placeholderUserDestinationCollateral: (0, kit_1.none)(),
+                collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
                 liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             farmsAccounts: collateralFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId));
     }
-    addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
+    async addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
         this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
         if (!this.outflowReserve) {
             throw Error(`Withdraw reserve during liquidation is not defined`);
@@ -1281,18 +1193,18 @@ class KaminoAction {
         }
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
+        let 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(),
+            obligation: await this.getObligationPda(),
             lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             repayReserve: this.reserve.address,
             repayReserveLiquidityMint: this.reserve.getLiquidityMint(),
             repayReserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
@@ -1301,19 +1213,21 @@ class KaminoAction {
             withdrawReserveCollateralMint: this.outflowReserve.getCTokenMint(),
             withdrawReserveCollateralSupply: this.outflowReserve.state.collateral.supplyVault,
             withdrawReserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
-            userDestinationCollateral: this.getUserCollateralAccountAddress(this.outflowReserve),
-            userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
+            userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+            userDestinationCollateral: await this.getUserCollateralAccountAddress(this.outflowReserve),
+            userDestinationLiquidity: await this.getUserTokenAccountAddress(this.outflowReserve),
             withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
             repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
         }, this.kaminoMarket.programId);
-        liquidateIx.keys =
-            this.obligation.state.elevationGroup > 0
-                ? liquidateIx.keys.concat([...depositReserveAccountMetas])
-                : liquidateIx.keys;
+        liquidateIx = {
+            ...liquidateIx,
+            accounts: this.obligation.state.elevationGroup > 0
+                ? liquidateIx.accounts.concat(depositReserveAccountMetas)
+                : liquidateIx.accounts,
+        };
         this.lendingIxs.push(liquidateIx);
     }
     async addLiquidateIxV2(maxAllowedLtvOverridePercent = 0) {
@@ -1326,27 +1240,12 @@ class KaminoAction {
         }
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.outflowReserve.state.farmCollateral,
-            };
-        const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
-        const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateralV2)({
+        const obligationAddress = await this.getObligationPda();
+        const { collateralFarmAccounts: collateralFarmsAccounts } = await KaminoAction.getFarmAccountsForReserve(obligationAddress, this.outflowReserve);
+        const { debtFarmAccounts: debtFarmsAccounts } = await KaminoAction.getFarmAccountsForReserve(await this.getObligationPda(), this.reserve);
+        let liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateralV2)({
             liquidityAmount: this.amount,
             // TODO: Configure this when updating liquidator with new interface
             minAcceptableReceivedLiquidityAmount: this.outflowAmount || new bn_js_1.default(0),
@@ -1354,9 +1253,9 @@ class KaminoAction {
         }, {
             liquidationAccounts: {
                 liquidator: this.owner,
-                obligation: this.getObligationPda(),
+                obligation: obligationAddress,
                 lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
                 repayReserve: this.reserve.address,
                 repayReserveLiquidityMint: this.reserve.getLiquidityMint(),
                 repayReserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
@@ -1365,37 +1264,39 @@ class KaminoAction {
                 withdrawReserveCollateralMint: this.outflowReserve.getCTokenMint(),
                 withdrawReserveCollateralSupply: this.outflowReserve.state.collateral.supplyVault,
                 withdrawReserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-                userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
-                userDestinationCollateral: this.getUserCollateralAccountAddress(this.outflowReserve),
-                userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
+                userSourceLiquidity: await this.getUserTokenAccountAddress(this.reserve),
+                userDestinationCollateral: await this.getUserCollateralAccountAddress(this.outflowReserve),
+                userDestinationLiquidity: await this.getUserTokenAccountAddress(this.outflowReserve),
                 withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                collateralTokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
                 repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
                 withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructionSysvarAccount: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
             },
             debtFarmsAccounts,
             collateralFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
+            farmsProgram: programId_1.PROGRAM_ID,
         }, this.kaminoMarket.programId);
-        liquidateIx.keys =
-            this.obligation.state.elevationGroup > 0
-                ? liquidateIx.keys.concat([...depositReserveAccountMetas])
-                : liquidateIx.keys;
+        liquidateIx = {
+            ...liquidateIx,
+            accounts: this.obligation.state.elevationGroup > 0
+                ? liquidateIx.accounts.concat(depositReserveAccountMetas)
+                : liquidateIx.accounts,
+        };
         this.lendingIxs.push(liquidateIx);
     }
     async addInBetweenIxs(action, includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs) {
         await this.addSupportIxsWithoutInitObligation(action, includeAtaIxs, useV2Ixs, 'inBetween', requestElevationGroup, addInitObligationForFarm);
     }
-    addRefreshObligation(crank) {
-        const uniqueReserveAddresses = new utils_1.PublicKeySet(this.depositReserves.concat(this.borrowReserves)).toArray();
+    async addRefreshObligation(crank) {
+        const uniqueReserveAddresses = [...new Set(this.depositReserves.concat(this.borrowReserves))];
         const addAllToSetupIxs = 'setup';
         // Union of addresses
         const allReservesExcludingCurrent = [...uniqueReserveAddresses];
         this.addRefreshReserveIxs(allReservesExcludingCurrent, addAllToSetupIxs);
-        this.addRefreshFarmsForReserve(this.depositReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxs, types_1.ReserveFarmKind.Collateral, crank);
-        this.addRefreshFarmsForReserve(this.borrowReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxs, types_1.ReserveFarmKind.Debt, crank);
-        this.addRefreshObligationIx(addAllToSetupIxs);
+        await this.addRefreshFarmsForReserve(this.depositReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxs, types_1.ReserveFarmKind.Collateral, crank);
+        await this.addRefreshFarmsForReserve(this.borrowReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxs, types_1.ReserveFarmKind.Debt, crank);
+        await this.addRefreshObligationIx(addAllToSetupIxs);
     }
     async addSupportIxsWithoutInitObligation(action, includeAtaIxs, useV2Ixs, addAsSupportIx = 'setup', requestElevationGroup = false, addInitObligationForFarm = false, twoTokenAction = false, overrideElevationGroupRequest) {
         // TODO: why are we not doing this first?
@@ -1450,7 +1351,7 @@ class KaminoAction {
                         }
                     }
                 }
-                else if (action === 'liquidate' && !this.outflowReserve.address.equals(this.reserve.address)) {
+                else if (action === 'liquidate' && this.outflowReserve.address !== this.reserve.address) {
                     currentReserves = [this.outflowReserve, this.reserve];
                 }
                 else {
@@ -1460,10 +1361,10 @@ class KaminoAction {
             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));
+            const uniqueReserveAddresses = new Set(this.depositReserves.concat(this.borrowReserves));
+            const currentReserveAddresses = new Set(currentReserves.map((reserve) => reserve.address));
             // Union of addresses
-            const allReservesExcludingCurrent = [...uniqueReserveAddresses.toArray()].filter((address) => !currentReserveAddresses.contains(address));
+            const allReservesExcludingCurrent = [...uniqueReserveAddresses].filter((address) => !currentReserveAddresses.has(address));
             this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
             if (addInitObligationForFarm) {
                 if (action === 'liquidate') {
@@ -1499,7 +1400,7 @@ class KaminoAction {
                     }
                 }
             }
-            this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
+            this.addRefreshReserveIxs([...currentReserveAddresses], addAsSupportIx);
             if (action === 'repayAndWithdraw' && addAsSupportIx === 'inBetween') {
                 if (!(0, obligation_1.isKaminoObligation)(this.obligation)) {
                     throw new Error(`obligation is not a KaminoObligation`);
@@ -1511,10 +1412,10 @@ class KaminoAction {
                 const repaidBorrowReservesToSkip = repayObligationLiquidity.amount.lte(new decimal_js_1.default(this.amount.toString()))
                     ? [repayObligationLiquidity.reserveAddress]
                     : [];
-                this.addRefreshObligationIx(addAsSupportIx, repaidBorrowReservesToSkip);
+                await this.addRefreshObligationIx(addAsSupportIx, repaidBorrowReservesToSkip);
             }
             else {
-                this.addRefreshObligationIx(addAsSupportIx);
+                await this.addRefreshObligationIx(addAsSupportIx);
             }
             if (requestElevationGroup) {
                 if (action === 'repay' || action === 'repayAndWithdrawV2') {
@@ -1530,8 +1431,8 @@ class KaminoAction {
                         this.obligation.state.elevationGroup !== 0) {
                         this.addRefreshReserveIxs(allReservesExcludingCurrent, 'cleanup');
                         // Skip the borrow reserve, since we repay in the same tx
-                        this.addRefreshObligationIx('cleanup', [this.reserve.address]);
-                        this.addRequestElevationIx(overrideElevationGroupRequest ?? 0, 'cleanup', [this.reserve.address]);
+                        await this.addRefreshObligationIx('cleanup', [this.reserve.address]);
+                        await this.addRequestElevationIx(overrideElevationGroupRequest ?? 0, 'cleanup', [this.reserve.address]);
                     }
                 }
                 else if (action === 'depositAndBorrow' || action === 'borrow') {
@@ -1578,10 +1479,10 @@ class KaminoAction {
                     }
                     if (newElevationGroup >= 0 &&
                         newElevationGroup !== ((0, obligation_1.isKaminoObligation)(this.obligation) ? this.obligation.state.elevationGroup : 0)) {
-                        this.addRequestElevationIx(newElevationGroup, addAsSupportIx);
+                        await this.addRequestElevationIx(newElevationGroup, addAsSupportIx);
                         this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
-                        this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
-                        this.addRefreshObligationIx(addAsSupportIx);
+                        this.addRefreshReserveIxs([...currentReserveAddresses], addAsSupportIx);
+                        await this.addRefreshObligationIx(addAsSupportIx);
                         if (action === 'borrow') {
                             if (!(0, obligation_1.isKaminoObligation)(this.obligation)) {
                                 throw new Error(`obligation is not a KaminoObligation`);
@@ -1596,10 +1497,10 @@ class KaminoAction {
                         ((0, obligation_1.isKaminoObligation)(this.obligation) ? this.obligation.state.elevationGroup : 0)) {
                     const addAsSupportIx = 'setup';
                     console.log('Deposit: Requesting elevation group', overrideElevationGroupRequest);
-                    this.addRequestElevationIx(overrideElevationGroupRequest, addAsSupportIx);
+                    await this.addRequestElevationIx(overrideElevationGroupRequest, addAsSupportIx);
                     this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
-                    this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
-                    this.addRefreshObligationIx(addAsSupportIx);
+                    this.addRefreshReserveIxs([...currentReserveAddresses], addAsSupportIx);
+                    await this.addRefreshObligationIx(addAsSupportIx);
                 }
                 else if (action === 'withdraw' &&
                     overrideElevationGroupRequest !== undefined
@@ -1608,8 +1509,8 @@ class KaminoAction {
                     console.log('Withdraw: Requesting elevation group', overrideElevationGroupRequest);
                     // Skip the withdrawn reserve if we are in the process of closing it:
                     const skipReserveIfClosing = this.amount.eq(new bn_js_1.default(utils_1.U64_MAX)) ? [this.reserve.address] : [];
-                    this.addRefreshObligationIx('cleanup', skipReserveIfClosing);
-                    this.addRequestElevationIx(overrideElevationGroupRequest, 'cleanup', skipReserveIfClosing);
+                    await this.addRefreshObligationIx('cleanup', skipReserveIfClosing);
+                    await this.addRequestElevationIx(overrideElevationGroupRequest, 'cleanup', skipReserveIfClosing);
                 }
             }
             if (!useV2Ixs) {
@@ -1617,17 +1518,17 @@ class KaminoAction {
                     // If this is an setup ix (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);
+                        await this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
+                        await 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);
+                        await 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);
+                        await this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Debt, undefined, twoTokenAction);
                     }
                     else {
                         throw new Error(`Could not decide on refresh farm for action ${action}`);
@@ -1638,10 +1539,10 @@ class KaminoAction {
                     // so we skip the refresh farm obligation of the first reserve as that operation already happened
                     // add added to 'setup' ixs
                     if (action === 'depositAndBorrow') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
+                        await this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
                     }
                     else if (action === 'repayAndWithdraw') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
+                        await this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
                     }
                     else {
                         throw new Error(`Could not decide on refresh farm for action ${action}`);
@@ -1652,38 +1553,45 @@ class KaminoAction {
     }
     async addSupportIxs(action, includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, twoTokenAction = false, overrideElevationGroupRequest) {
         if (!['mint', 'redeem'].includes(action)) {
-            const [, ownerUserMetadata] = await this.kaminoMarket.getUserMetadata(this.owner);
+            const [, ownerUserMetadata] = await this.kaminoMarket.getUserMetadata(this.owner.address);
             if (!ownerUserMetadata && !initUserMetadata.skipInitialization) {
-                let lookupTable = web3_js_1.PublicKey.default;
+                let lookupTable = utils_1.DEFAULT_PUBLIC_KEY;
                 if (!initUserMetadata.skipLutCreation) {
-                    const [createLutIx, lookupTableAddress] = await (0, utils_1.createLookupTableIx)(this.kaminoMarket.getConnection(), this.owner);
+                    const [createLutIx, lookupTableAddress] = await (0, utils_1.createLookupTableIx)(this.kaminoMarket.getRpc(), this.owner);
                     lookupTable = lookupTableAddress;
                     this.setupIxs.push(createLutIx);
-                    this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress.toString()}]`);
+                    this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress}]`);
                 }
-                this.addInitUserMetadataIxs(lookupTable);
+                await this.addInitUserMetadataIxs(lookupTable);
             }
             await this.addInitObligationIxs();
         }
         await this.addSupportIxsWithoutInitObligation(action, includeAtaIxs, useV2Ixs, 'setup', requestElevationGroup, addInitObligationForFarm, twoTokenAction, overrideElevationGroupRequest);
-        const allReserves = new utils_1.PublicKeySet([
-            ...this.depositReserves,
-            ...this.borrowReserves,
-            this.reserve.address,
-            ...(this.outflowReserve ? [this.outflowReserve.address] : []),
-            ...(this.preLoadedDepositReservesSameTx ? this.preLoadedDepositReservesSameTx : []),
-        ]).toArray();
-        const tokenIds = (0, market_1.getTokenIdsForScopeRefresh)(this.kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefreshConfig) {
-            await this.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
-        }
-    }
-    static optionalAccount(pubkey, programId = lib_1.PROGRAM_ID) {
+        const allReserves = [
+            ...new Set([
+                ...this.depositReserves,
+                ...this.borrowReserves,
+                this.reserve.address,
+                ...(this.outflowReserve ? [this.outflowReserve.address] : []),
+                ...(this.preLoadedDepositReservesSameTx ? this.preLoadedDepositReservesSameTx : []),
+            ]),
+        ];
+        const scopeTokensMap = (0, market_1.getTokenIdsForScopeRefresh)(this.kaminoMarket, allReserves);
+        if (scopeTokensMap.size > 0 && scopeRefreshConfig) {
+            for (const [configPubkey, config] of scopeRefreshConfig.scopeConfigurations) {
+                const tokenIds = scopeTokensMap.get(config.oraclePrices);
+                if (tokenIds && tokenIds.length > 0) {
+                    await this.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, configPubkey);
+                }
+            }
+        }
+    }
+    static optionalAccount(pubkey) {
         if ((0, utils_1.isNotNullPubkey)(pubkey)) {
-            return pubkey;
+            return (0, kit_1.some)(pubkey);
         }
         else {
-            return programId;
+            return (0, kit_1.none)();
         }
     }
     addRefreshReserveIxs(reserves, addAsSupportIx = 'setup') {
@@ -1696,10 +1604,10 @@ class KaminoAction {
             const refreshReserveIx = (0, instructions_1.refreshReserve)({
                 lendingMarket: this.kaminoMarket.getAddress(),
                 reserve: reserveAddress,
-                pythOracle: KaminoAction.optionalAccount(state.config.tokenInfo.pythConfiguration.price, this.kaminoMarket.programId),
-                switchboardPriceOracle: KaminoAction.optionalAccount(state.config.tokenInfo.switchboardConfiguration.priceAggregator, this.kaminoMarket.programId),
-                switchboardTwapOracle: KaminoAction.optionalAccount(state.config.tokenInfo.switchboardConfiguration.twapAggregator, this.kaminoMarket.programId),
-                scopePrices: KaminoAction.optionalAccount(state.config.tokenInfo.scopeConfiguration.priceFeed, this.kaminoMarket.programId),
+                pythOracle: KaminoAction.optionalAccount(state.config.tokenInfo.pythConfiguration.price),
+                switchboardPriceOracle: KaminoAction.optionalAccount(state.config.tokenInfo.switchboardConfiguration.priceAggregator),
+                switchboardTwapOracle: KaminoAction.optionalAccount(state.config.tokenInfo.switchboardConfiguration.twapAggregator),
+                scopePrices: KaminoAction.optionalAccount(state.config.tokenInfo.scopeConfiguration.priceFeed),
             }, this.kaminoMarket.programId);
             if (addAsSupportIx === 'setup') {
                 this.setupIxs.push(refreshReserveIx);
@@ -1725,43 +1633,43 @@ class KaminoAction {
             return (0, instructions_1.refreshReserve)({
                 reserve: reserveAddress,
                 lendingMarket: state.lendingMarket,
-                pythOracle: this.optionalAccount(state.config.tokenInfo.pythConfiguration.price, kaminoMarket.programId),
-                switchboardPriceOracle: this.optionalAccount(state.config.tokenInfo.switchboardConfiguration.priceAggregator, kaminoMarket.programId),
-                switchboardTwapOracle: this.optionalAccount(state.config.tokenInfo.switchboardConfiguration.twapAggregator, kaminoMarket.programId),
-                scopePrices: this.optionalAccount(state.config.tokenInfo.scopeConfiguration.priceFeed, kaminoMarket.programId),
+                pythOracle: this.optionalAccount(state.config.tokenInfo.pythConfiguration.price),
+                switchboardPriceOracle: this.optionalAccount(state.config.tokenInfo.switchboardConfiguration.priceAggregator),
+                switchboardTwapOracle: this.optionalAccount(state.config.tokenInfo.switchboardConfiguration.twapAggregator),
+                scopePrices: this.optionalAccount(state.config.tokenInfo.scopeConfiguration.priceFeed),
             }, kaminoMarket.programId);
         });
     }
-    addRefreshObligationIx(addAsSupportIx = 'setup', skipReserves = []) {
+    async addRefreshObligationIx(addAsSupportIx = 'setup', skipReserves = []) {
         const marketAddress = this.kaminoMarket.getAddress();
-        const obligationPda = this.getObligationPda();
-        const refreshObligationIx = (0, instructions_1.refreshObligation)({
+        const obligationPda = await this.getObligationPda();
+        let refreshObligationIx = (0, instructions_1.refreshObligation)({
             lendingMarket: marketAddress,
             obligation: obligationPda,
         }, this.kaminoMarket.programId);
-        const skipReservesSet = new utils_1.PublicKeySet(skipReserves);
-        const depositReservesList = this.getAdditionalDepositReservesList().filter((reserve) => !skipReservesSet.contains(reserve));
+        const skipReservesSet = new Set(skipReserves);
+        const depositReservesList = this.getAdditionalDepositReservesList().filter((reserve) => !skipReservesSet.has(reserve));
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const borrowReservesList = this.borrowReserves.filter((reserve) => !skipReservesSet.contains(reserve));
+        const borrowReservesList = this.borrowReserves.filter((reserve) => !skipReservesSet.has(reserve));
         const borrowReserveAccountMetas = borrowReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const borrowReservesReferrerTokenStates = borrowReservesList
-            .map((reserve) => {
-            if (this.referrer.equals(web3_js_1.PublicKey.default)) {
-                return { pubkey: this.kaminoMarket.programId, isSigner: false, isWritable: false };
-            }
-            const referrerTokenStateAddress = (0, utils_1.referrerTokenStatePda)(this.referrer, reserve, this.kaminoMarket.programId)[0];
-            return { pubkey: referrerTokenStateAddress, isSigner: false, isWritable: true };
-        })
-            .filter((x) => !x.pubkey.equals(this.kaminoMarket.programId));
-        refreshObligationIx.keys = refreshObligationIx.keys.concat([
-            ...depositReserveAccountMetas,
-            ...borrowReserveAccountMetas,
-            ...borrowReservesReferrerTokenStates,
-        ]);
+        const borrowReservesReferrerTokenStates = [];
+        if ((0, kit_1.isSome)(this.referrer)) {
+            borrowReservesReferrerTokenStates.push(...(await Promise.all(borrowReservesList.map((reserve) => {
+                return this.getReferrerTokenStateAccountMeta(reserve, true);
+            }))));
+        }
+        refreshObligationIx = {
+            ...refreshObligationIx,
+            accounts: refreshObligationIx.accounts.concat([
+                ...depositReserveAccountMetas,
+                ...borrowReserveAccountMetas,
+                ...borrowReservesReferrerTokenStates,
+            ]),
+        };
         if (addAsSupportIx === 'setup') {
             this.setupIxs.push(refreshObligationIx);
             this.setupIxsLabels.push(`RefreshObligation[${obligationPda.toString()}]`);
@@ -1775,8 +1683,8 @@ class KaminoAction {
             this.cleanupIxsLabels.push(`RefreshObligation[${obligationPda.toString()}]`);
         }
     }
-    addRequestElevationIx(elevationGroup, addAsSupportIx, skipReserves = []) {
-        const obligationPda = this.getObligationPda();
+    async addRequestElevationIx(elevationGroup, addAsSupportIx, skipReserves = []) {
+        const obligationPda = await this.getObligationPda();
         const args = {
             elevationGroup,
         };
@@ -1785,31 +1693,30 @@ class KaminoAction {
             obligation: obligationPda,
             lendingMarket: this.kaminoMarket.getAddress(),
         };
-        const requestElevationGroupIx = (0, instructions_1.requestElevationGroup)(args, accounts, this.kaminoMarket.programId);
-        const skipReservesSet = new utils_1.PublicKeySet(skipReserves);
-        const depositReservesList = this.getAdditionalDepositReservesList().filter((reserve) => !skipReservesSet.contains(reserve));
+        let requestElevationGroupIx = (0, instructions_1.requestElevationGroup)(args, accounts, this.kaminoMarket.programId);
+        const skipReservesSet = new Set(skipReserves);
+        const depositReservesList = this.getAdditionalDepositReservesList().filter((reserve) => !skipReservesSet.has(reserve));
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const borrowReservesList = this.borrowReserves.filter((reserve) => !skipReservesSet.contains(reserve));
+        const borrowReservesList = this.borrowReserves.filter((reserve) => !skipReservesSet.has(reserve));
         const borrowReserveAccountMetas = borrowReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
+            return { address: reserve, role: kit_1.AccountRole.WRITABLE };
         });
-        const borrowReservesReferrerTokenStates = borrowReservesList
-            .map((reserve) => {
-            if (this.referrer.equals(web3_js_1.PublicKey.default)) {
-                return { pubkey: this.kaminoMarket.programId, isSigner: false, isWritable: false };
-            }
-            const reserveState = this.kaminoMarket.getReserveByAddress(reserve);
-            const referrerTokenStateAddress = (0, utils_1.referrerTokenStatePda)(this.referrer, reserveState.address, this.kaminoMarket.programId)[0];
-            return { pubkey: referrerTokenStateAddress, isSigner: false, isWritable: true };
-        })
-            .filter((x) => !x.pubkey.equals(this.kaminoMarket.programId));
-        requestElevationGroupIx.keys = requestElevationGroupIx.keys.concat([
-            ...depositReserveAccountMetas,
-            ...borrowReserveAccountMetas,
-            ...borrowReservesReferrerTokenStates,
-        ]);
+        const borrowReservesReferrerTokenStates = [];
+        if ((0, kit_1.isSome)(this.referrer)) {
+            borrowReservesReferrerTokenStates.push(...(await Promise.all(borrowReservesList.map((reserve) => {
+                return this.getReferrerTokenStateAccountMeta(reserve, false);
+            }))));
+        }
+        requestElevationGroupIx = {
+            ...requestElevationGroupIx,
+            accounts: requestElevationGroupIx.accounts.concat([
+                ...depositReserveAccountMetas,
+                ...borrowReserveAccountMetas,
+                ...borrowReservesReferrerTokenStates,
+            ]),
+        };
         if (addAsSupportIx === 'setup') {
             this.setupIxs.push(requestElevationGroupIx);
             this.setupIxsLabels.push(`RequestElevation[${obligationPda}], elevation_group:${elevationGroup}`);
@@ -1823,63 +1730,65 @@ class KaminoAction {
             this.cleanupIxsLabels.push(`RequestElevation[${obligationPda}], elevation_group:${elevationGroup}`);
         }
     }
-    addRefreshFarmsForReserve(reserves, addAsSupportIx = 'setup', mode, crank = this.payer, twoTokenAction = false) {
+    async addRefreshFarmsForReserve(reserves, addAsSupportIx = 'setup', mode, crank = this.payer, twoTokenAction = false) {
         const farms = [];
+        const obligationAddress = await this.getObligationPda();
         for (const kaminoReserve of reserves) {
-            if (mode === types_1.ReserveFarmKind.Collateral && !kaminoReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)) {
+            if (mode === types_1.ReserveFarmKind.Collateral && kaminoReserve.state.farmCollateral !== utils_1.DEFAULT_PUBLIC_KEY) {
                 farms.push([
                     types_1.ReserveFarmKind.Collateral,
                     kaminoReserve.state.farmCollateral,
-                    (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmCollateral, this.getObligationPda()),
+                    await (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmCollateral, obligationAddress),
                     kaminoReserve,
                 ]);
             }
-            if (mode === types_1.ReserveFarmKind.Debt && !kaminoReserve.state.farmDebt.equals(web3_js_1.PublicKey.default)) {
+            if (mode === types_1.ReserveFarmKind.Debt && kaminoReserve.state.farmDebt !== utils_1.DEFAULT_PUBLIC_KEY) {
                 farms.push([
                     types_1.ReserveFarmKind.Debt,
                     kaminoReserve.state.farmDebt,
-                    (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmDebt, this.getObligationPda()),
+                    await (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmDebt, obligationAddress),
                     kaminoReserve,
                 ]);
             }
         }
-        farms.forEach((arg) => {
+        const lendingMarketAuthority = await this.kaminoMarket.getLendingMarketAuthority();
+        for (const arg of farms) {
             const args = { mode: arg[0].discriminator };
             const accounts = {
                 crank,
                 baseAccounts: {
-                    obligation: this.getObligationPda(),
-                    lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                    obligation: obligationAddress,
+                    lendingMarketAuthority,
                     reserve: arg[3].address,
                     reserveFarmState: arg[1],
                     obligationFarmUserState: arg[2],
                     lendingMarket: this.kaminoMarket.getAddress(),
                 },
-                farmsProgram: farms_sdk_1.farmsId,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                systemProgram: web3_js_1.SystemProgram.programId,
+                farmsProgram: programId_1.PROGRAM_ID,
+                rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+                systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
             };
             const refreshFarmForObligationix = (0, instructions_1.refreshObligationFarmsForReserve)(args, accounts, this.kaminoMarket.programId);
             if (addAsSupportIx === 'setup') {
                 this.setupIxs.push(refreshFarmForObligationix);
-                this.setupIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${this.getObligationPda().toString()}]`);
+                this.setupIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${await this.getObligationPda()}]`);
                 if (twoTokenAction) {
                     // If two token action, this refresh needs to be the first inbetween ix
                     this.inBetweenIxs.push(refreshFarmForObligationix);
-                    this.inBetweenIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${this.getObligationPda().toString()}]`);
+                    this.inBetweenIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${await this.getObligationPda()}]`);
                 }
                 else {
                     this.refreshFarmsCleanupTxnIxs.push(refreshFarmForObligationix);
-                    this.refreshFarmsCleanupTxnIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${this.getObligationPda().toString()}]`);
+                    this.refreshFarmsCleanupTxnIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${await this.getObligationPda()}]`);
                 }
             }
             else if (addAsSupportIx === 'inBetween') {
                 this.inBetweenIxs.push(refreshFarmForObligationix);
-                this.inBetweenIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${this.getObligationPda().toString()}]`);
+                this.inBetweenIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${await this.getObligationPda()}]`);
                 this.refreshFarmsCleanupTxnIxs.push(refreshFarmForObligationix);
-                this.refreshFarmsCleanupTxnIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${this.getObligationPda().toString()}]`);
+                this.refreshFarmsCleanupTxnIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${await this.getObligationPda()}]`);
             }
-        });
+        }
     }
     addRefreshFarmsCleanupTxnIxsToCleanupIxs() {
         this.cleanupIxs.splice(0, 0, ...this.refreshFarmsCleanupTxnIxs);
@@ -1887,50 +1796,52 @@ class KaminoAction {
     }
     async addInitObligationForFarm(reserve, mode, addAsSupportIx = 'setup') {
         const farms = [];
+        const obligationAddress = await this.getObligationPda();
         if (mode === types_1.ReserveFarmKind.Collateral && (0, utils_1.isNotNullPubkey)(reserve.state.farmCollateral)) {
-            const pda = (0, utils_1.obligationFarmStatePda)(reserve.state.farmCollateral, this.getObligationPda());
-            const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
-            if (!account) {
+            const pda = await (0, utils_1.obligationFarmStatePda)(reserve.state.farmCollateral, obligationAddress);
+            const account = await (0, kit_1.fetchEncodedAccount)(this.kaminoMarket.getRpc(), pda);
+            if (!account.exists) {
                 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 = (0, utils_1.obligationFarmStatePda)(reserve.state.farmDebt, this.getObligationPda());
-            const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
-            if (!account) {
+            const pda = await (0, utils_1.obligationFarmStatePda)(reserve.state.farmDebt, obligationAddress);
+            const account = await (0, kit_1.fetchEncodedAccount)(this.kaminoMarket.getRpc(), pda);
+            if (!account.exists) {
                 farms.push([types_1.ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, pda]);
             }
         }
+        const lendingMarketAuthority = await this.kaminoMarket.getLendingMarketAuthority();
         farms.forEach((arg) => {
             const args = { mode: arg[0] };
             const accounts = {
-                owner: (0, obligation_1.isKaminoObligation)(this.obligation) ? this.obligation.state.owner : this.owner,
+                owner: (0, obligation_1.isKaminoObligation)(this.obligation) ? this.obligation.state.owner : this.owner.address,
                 payer: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                obligation: obligationAddress,
+                lendingMarketAuthority,
                 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,
+                farmsProgram: programId_1.PROGRAM_ID,
+                rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+                systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
             };
             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()}]`);
+                this.setupIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${obligationAddress.toString()}]`);
             }
             else if (addAsSupportIx === 'inBetween') {
                 this.inBetweenIxs.push(initObligationForFarm);
-                this.inBetweenIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${this.getObligationPda().toString()}]`);
+                this.inBetweenIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${obligationAddress.toString()}]`);
             }
         });
     }
-    addInitObligationIxs() {
+    async addInitObligationIxs() {
         if (!(0, obligation_1.isKaminoObligation)(this.obligation)) {
-            const obligationPda = this.getObligationPda();
-            const [userMetadataAddress, _bump] = (0, utils_1.userMetadataPda)(this.owner, this.kaminoMarket.programId);
+            const obligationPda = await this.getObligationPda();
+            const [userMetadataAddress] = await (0, utils_1.userMetadataPda)(this.owner.address, this.kaminoMarket.programId);
             const initObligationIx = (0, instructions_1.initObligation)({
                 args: {
                     tag: this.obligation.toArgs().tag,
@@ -1944,18 +1855,16 @@ class KaminoAction {
                 seed1Account: this.obligation.toArgs().seed1,
                 seed2Account: this.obligation.toArgs().seed2,
                 ownerUserMetadata: userMetadataAddress,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                systemProgram: web3_js_1.SystemProgram.programId,
+                rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+                systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
             }, this.kaminoMarket.programId);
             this.setupIxs.push(initObligationIx);
             this.setupIxsLabels.push(`InitObligation[${obligationPda.toString()}]`);
         }
     }
-    addInitUserMetadataIxs(lookupTableAddress) {
-        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];
+    async addInitUserMetadataIxs(lookupTableAddress) {
+        const [userMetadataAddress] = await (0, utils_1.userMetadataPda)(this.owner.address, this.kaminoMarket.programId);
+        const referrerUserMetadataAddress = await KaminoAction.getReferrerMetadataAccount(this.referrer, this.kaminoMarket.programId);
         const initUserMetadataIx = (0, instructions_1.initUserMetadata)({
             userLookupTable: lookupTableAddress,
         }, {
@@ -1963,27 +1872,30 @@ class KaminoAction {
             feePayer: this.payer,
             userMetadata: userMetadataAddress,
             referrerUserMetadata: referrerUserMetadataAddress,
-            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-            systemProgram: web3_js_1.SystemProgram.programId,
+            rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+            systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
         }, this.kaminoMarket.programId);
         this.setupIxs.push(initUserMetadataIx);
         this.setupIxsLabels.push(`initUserMetadata[${userMetadataAddress.toString()}]`);
     }
     addInitReferrerTokenStateIx(reserve, referrerTokenState) {
+        if ((0, kit_1.isNone)(this.referrer)) {
+            throw new Error('Referrer is not set');
+        }
         const initReferrerTokenStateIx = (0, instructions_1.initReferrerTokenState)({
             lendingMarket: this.kaminoMarket.getAddress(),
             payer: this.owner,
             reserve: reserve.address,
-            referrer: this.referrer,
+            referrer: this.referrer.value,
             referrerTokenState,
-            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-            systemProgram: web3_js_1.SystemProgram.programId,
+            rent: sysvars_1.SYSVAR_RENT_ADDRESS,
+            systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
         }, this.kaminoMarket.programId);
         this.setupIxs.unshift(initReferrerTokenStateIx);
         this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenState.toString()} res=${reserve.address}]`);
     }
-    addWithdrawReferrerFeesIxs() {
-        const referrerTokenStateAddress = (0, utils_1.referrerTokenStatePda)(this.owner, this.reserve.address, this.kaminoMarket.programId)[0];
+    async addWithdrawReferrerFeesIxs() {
+        const referrerTokenStateAddress = await (0, utils_1.referrerTokenStatePda)(this.owner.address, this.reserve.address, this.kaminoMarket.programId);
         const withdrawReferrerFeesIx = (0, instructions_1.withdrawReferrerFees)({
             referrer: this.owner,
             lendingMarket: this.kaminoMarket.getAddress(),
@@ -1991,8 +1903,8 @@ class KaminoAction {
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             referrerTokenState: referrerTokenStateAddress,
             reserveSupplyLiquidity: this.reserve.state.liquidity.supplyVault,
-            referrerTokenAccount: this.getUserTokenAccountAddress(this.reserve),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            referrerTokenAccount: await this.getUserTokenAccountAddress(this.reserve),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
         }, this.kaminoMarket.programId);
         this.lendingIxs.push(withdrawReferrerFeesIx);
@@ -2003,48 +1915,51 @@ class KaminoAction {
         this.computeBudgetIxsLabels.push(`AddComputeBudget[${units}]`);
     }
     async addAtaIxs(action) {
-        if (this.mint.equals(spl_token_1.NATIVE_MINT) || this.secondaryMint?.equals(spl_token_1.NATIVE_MINT)) {
+        if (this.mint === utils_1.WRAPPED_SOL_MINT || this.secondaryMint === utils_1.WRAPPED_SOL_MINT) {
             await this.updateWSOLAccount(action);
         }
-        if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(spl_token_1.NATIVE_MINT)) {
-            const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.getUserTokenAccountAddress(this.reserve));
+        if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && this.mint !== utils_1.WRAPPED_SOL_MINT) {
+            const reserveAta = await this.getUserTokenAccountAddress(this.reserve);
+            const [, createUserTokenAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner.address, this.reserve.getLiquidityTokenProgram(), reserveAta);
             this.setupIxs.unshift(createUserTokenAccountIx);
-            this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${this.owner}]`);
+            this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${reserveAta}]`);
         }
         if (action === 'liquidate') {
             if (!this.outflowReserve) {
                 throw new Error(`Outflow reserve state not found ${this.secondaryMint}`);
             }
-            const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.getUserTokenAccountAddress(this.outflowReserve));
+            const outflowReserveAta = await this.getUserTokenAccountAddress(this.outflowReserve);
+            const [, createUserTokenAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner.address, this.outflowReserve.getLiquidityTokenProgram(), outflowReserveAta);
             this.setupIxs.unshift(createUserTokenAccountIx);
-            this.setupIxsLabels.unshift(`CreateUserAta[${this.getUserTokenAccountAddress(this.outflowReserve).toBase58()}]`);
-            const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.getUserCollateralAccountAddress(this.outflowReserve));
+            this.setupIxsLabels.unshift(`CreateUserAta[${outflowReserveAta}]`);
+            const ctokenAta = await this.getUserCollateralAccountAddress(this.outflowReserve);
+            const [, createUserCollateralAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner.address, token_1.TOKEN_PROGRAM_ADDRESS, ctokenAta);
             this.setupIxs.unshift(createUserCollateralAccountIx);
-            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.getUserCollateralAccountAddress(this.outflowReserve).toString()}]`);
+            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${ctokenAta}]`);
         }
-        if (action === 'depositAndBorrow' || (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(spl_token_1.NATIVE_MINT))) {
+        if (action === 'depositAndBorrow' || (action === 'repayAndWithdraw' && this.secondaryMint !== utils_1.WRAPPED_SOL_MINT)) {
             if (!this.outflowReserve) {
                 throw new Error(`Outflow reserve state not found ${this.mint}`);
             }
-            const additionalUserTokenAccountAddress = this.getUserTokenAccountAddress(this.outflowReserve);
-            const additionalUserTokenAccountInfo = await this.kaminoMarket
-                .getConnection()
-                .getAccountInfo(additionalUserTokenAccountAddress);
-            if (!additionalUserTokenAccountInfo) {
-                const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), additionalUserTokenAccountAddress);
+            const additionalUserTokenAccountAddress = await this.getUserTokenAccountAddress(this.outflowReserve);
+            const additionalUserTokenAccountInfo = await (0, kit_1.fetchEncodedAccount)(this.kaminoMarket.getRpc(), additionalUserTokenAccountAddress);
+            if (!additionalUserTokenAccountInfo.exists) {
+                const [, createUserTokenAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner.address, this.outflowReserve.getLiquidityTokenProgram(), additionalUserTokenAccountAddress);
                 this.setupIxs.unshift(createUserTokenAccountIx);
                 this.setupIxsLabels.unshift(`CreateAdditionalUserTokenAta[${this.owner}]`);
             }
         }
         if (action === 'withdraw' || action === 'mint' || action === 'deposit' || action === 'repayAndWithdraw') {
-            const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.getUserTokenAccountAddress(this.reserve));
+            const reserveAta = await this.getUserTokenAccountAddress(this.reserve);
+            const [, createUserTokenAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner.address, this.reserve.getLiquidityTokenProgram(), reserveAta);
             this.setupIxs.unshift(createUserTokenAccountIx);
-            this.setupIxsLabels.unshift(`CreateUserAta[${this.getUserTokenAccountAddress(this.reserve).toBase58()}]`);
+            this.setupIxsLabels.unshift(`CreateUserAta[${reserveAta}]`);
         }
         if (action === 'mint') {
-            const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.getUserCollateralAccountAddress(this.reserve));
+            const ctokenAta = await this.getUserCollateralAccountAddress(this.reserve);
+            const [, createUserCollateralAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getCTokenMint(), this.owner.address, token_1.TOKEN_PROGRAM_ADDRESS, ctokenAta);
             this.setupIxs.unshift(createUserCollateralAccountIx);
-            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.getUserCollateralAccountAddress(this.reserve).toString()}]`);
+            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${ctokenAta.toString()}]`);
         }
     }
     async updateWSOLAccount(action) {
@@ -2061,7 +1976,7 @@ class KaminoAction {
             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()}`);
+                throw Error(`Unable to find obligation borrow to repay for ${this.obligation.state.owner}`);
             }
             const cumulativeBorrowRateObligation = obligation_1.KaminoObligation.getCumulativeBorrowRate(borrow);
             const cumulativeBorrowRateReserve = this.reserve.getEstimatedCumulativeBorrowRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
@@ -2071,32 +1986,37 @@ class KaminoAction {
                 .add(new decimal_js_1.default(utils_1.SOL_PADDING_FOR_INTEREST.toString()))
                 .toNumber()).toString());
         }
-        let userTokenAccountAddress = this.getUserTokenAccountAddress(this.reserve);
-        if (this.secondaryMint?.equals(spl_token_1.NATIVE_MINT)) {
+        let userTokenAccountAddress = await this.getUserTokenAccountAddress(this.reserve);
+        if (this.secondaryMint === utils_1.WRAPPED_SOL_MINT) {
             if (!this.outflowReserve) {
                 throw new Error(`Outflow reserve state not found ${this.secondaryMint}`);
             }
-            const additionalUserTokenAccountAddress = this.getUserTokenAccountAddress(this.outflowReserve);
-            userTokenAccountAddress = additionalUserTokenAccountAddress;
+            userTokenAccountAddress = await this.getUserTokenAccountAddress(this.outflowReserve);
         }
-        const userWSOLAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(userTokenAccountAddress);
-        const rentExempt = await this.kaminoMarket.getConnection().getMinimumBalanceForRentExemption(165);
+        const userWSOLAccountInfo = await (0, kit_1.fetchEncodedAccount)(this.kaminoMarket.getRpc(), userTokenAccountAddress);
+        const rentExemptLamports = await this.kaminoMarket.getRpc().getMinimumBalanceForRentExemption(165n).send();
         // Add rent exemption lamports for WSOL accounts that need to be pre-funded for inflow/send transactions
         const sendAction = action === 'deposit' ||
             action === 'repay' ||
             action === 'repayAndWithdrawV2' ||
             action === 'mint' ||
-            (action === 'liquidate' && this.mint?.equals(spl_token_1.NATIVE_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),
+            (action === 'liquidate' && this.mint === utils_1.WRAPPED_SOL_MINT); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
+        const transferLamportsIx = (0, system_1.getTransferSolInstruction)({
+            amount: (userWSOLAccountInfo.exists ? 0n : rentExemptLamports) + (sendAction ? BigInt(safeRepay.toString()) : 0n),
+            source: this.owner,
+            destination: userTokenAccountAddress,
         });
         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, spl_token_1.createSyncNativeInstruction)(userTokenAccountAddress);
-        if (userWSOLAccountInfo) {
+        const closeWSOLAccountIx = (0, token_2022_1.getCloseAccountInstruction)({
+            owner: this.owner,
+            account: userTokenAccountAddress,
+            destination: this.owner.address,
+        }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS });
+        const syncIx = (0, token_2022_1.getSyncNativeInstruction)({
+            account: userTokenAccountAddress,
+        }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS });
+        if (userWSOLAccountInfo.exists) {
             if (sendAction) {
                 preIxs.push(syncIx);
                 preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
@@ -2107,7 +2027,7 @@ class KaminoAction {
             }
         }
         else {
-            const [, createUserWSOLAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, spl_token_1.NATIVE_MINT, this.owner, spl_token_1.TOKEN_PROGRAM_ID, userTokenAccountAddress);
+            const [, createUserWSOLAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, utils_1.WRAPPED_SOL_MINT, this.owner.address, token_1.TOKEN_PROGRAM_ADDRESS, userTokenAccountAddress);
             preIxs.push(createUserWSOLAccountIx);
             preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
             preIxs.push(syncIx);
@@ -2120,14 +2040,11 @@ class KaminoAction {
         this.cleanupIxs.push(...postIxs);
         this.cleanupIxsLabels.push(...postIxsLabels);
     }
-    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');
-        }
+    static async initializeMultiTokenAction(kaminoMarket, action, inflowAmount, inflowTokenMint, outflowTokenMint, signer, obligationOwner, obligation, outflowAmount, referrer = (0, kit_1.none)(), currentSlot = 0n) {
+        const inflowReserve = kaminoMarket.getExistingReserveByMint(inflowTokenMint);
+        const outflowReserve = kaminoMarket.getExistingReserveByMint(outflowTokenMint);
         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);
+        const referrerKey = await this.getReferrerKey(kaminoMarket, signer.address, kaminoObligation, referrer);
         let secondaryMint;
         let primaryMint;
         if (action === 'liquidate' ||
@@ -2140,14 +2057,14 @@ class KaminoAction {
         else {
             throw new Error('Invalid action');
         }
-        return new KaminoAction(kaminoMarket, payer, kaminoObligation || obligation, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, secondaryMint, outflowReserve, outflowAmount, referrerKey);
+        return new KaminoAction(kaminoMarket, signer, kaminoObligation || obligation, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, secondaryMint, outflowReserve, outflowAmount, referrerKey);
     }
-    static async initializeWithdrawReferrerFees(mint, owner, kaminoMarket, currentSlot = 0) {
+    static async initializeWithdrawReferrerFees(mint, owner, kaminoMarket, currentSlot = 0n) {
         const reserve = kaminoMarket.getReserveByMint(mint);
         if (reserve === undefined) {
-            throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
+            throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress()}`);
         }
-        const [{ createAtaIx }] = (0, utils_1.createAtasIdempotent)(owner, [
+        const [{ createAtaIx }] = await (0, utils_1.createAtasIdempotent)(owner, [
             {
                 mint: reserve.getLiquidityMint(),
                 tokenProgram: reserve.getLiquidityTokenProgram(),
@@ -2164,10 +2081,10 @@ class KaminoAction {
             ? amount
             : new bn_js_1.default(new decimal_js_1.default(amount.toString()).mul(collateralExchangeRate).ceil().toString());
     }
-    getObligationPda() {
+    async getObligationPda() {
         return (0, obligation_1.isKaminoObligation)(this.obligation)
             ? this.obligation.obligationAddress
-            : this.obligation.toPda(this.kaminoMarket.getAddress(), this.owner);
+            : await this.obligation.toPda(this.kaminoMarket.getAddress(), this.owner.address);
     }
     isObligationInitialized() {
         return this.obligation instanceof obligation_1.KaminoObligation;
@@ -2180,7 +2097,7 @@ class KaminoAction {
             const preloadedDepositReserve = this.preLoadedDepositReservesSameTx[i];
             // Check if the depositReserves array contains the current preloadedDepositReserve
             const found = this.depositReserves.some((depositReserve) => {
-                return depositReserve.equals(preloadedDepositReserve);
+                return depositReserve === preloadedDepositReserve;
             });
             // If not found, push the current preloadedDepositReserve to the depositReserves array
             if (!found) {
@@ -2189,29 +2106,39 @@ class KaminoAction {
         }
         return depositReservesList;
     }
-    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;
-                }
-            }
-            else {
-                referrerKey = kaminoObligation.state.referrer;
-            }
+    static async getReferrerMetadataAccount(referrer, programId) {
+        if ((0, kit_1.isSome)(referrer)) {
+            return (0, kit_1.some)((await (0, utils_1.userMetadataPda)(referrer.value, programId))[0]);
+        }
+        else {
+            return (0, kit_1.none)();
+        }
+    }
+    async getReferrerTokenStateAccountMeta(reserve, writable) {
+        if ((0, kit_1.isSome)(this.referrer)) {
+            return {
+                address: await (0, utils_1.referrerTokenStatePda)(this.referrer.value, reserve, this.kaminoMarket.programId),
+                role: writable ? kit_1.AccountRole.WRITABLE : kit_1.AccountRole.READONLY,
+            };
+        }
+        else {
+            return {
+                address: this.kaminoMarket.programId,
+                role: kit_1.AccountRole.READONLY,
+            };
         }
-        return referrerKey;
+    }
+    async getReferrerTokenStateAddress(reserve) {
+        return KaminoAction.getReferrerTokenStateAddressImpl(this.referrer, reserve, this.kaminoMarket.programId);
     }
     getUserTokenAccountAddress(reserve) {
-        return (0, utils_1.getAssociatedTokenAddress)(reserve.getLiquidityMint(), this.owner, true, reserve.getLiquidityTokenProgram());
+        return (0, utils_1.getAssociatedTokenAddress)(reserve.getLiquidityMint(), this.owner.address, reserve.getLiquidityTokenProgram());
     }
     getTokenAccountAddressByUser(reserve, user) {
-        return (0, utils_1.getAssociatedTokenAddress)(reserve.getLiquidityMint(), user, true, reserve.getLiquidityTokenProgram());
+        return (0, utils_1.getAssociatedTokenAddress)(reserve.getLiquidityMint(), user, reserve.getLiquidityTokenProgram());
     }
     getUserCollateralAccountAddress(reserve) {
-        return (0, utils_1.getAssociatedTokenAddress)(reserve.getCTokenMint(), this.owner, true);
+        return (0, utils_1.getAssociatedTokenAddress)(reserve.getCTokenMint(), this.owner.address);
     }
     static actionToIxs(action) {
         const ixs = [...action.computeBudgetIxs, ...action.setupIxs];
@@ -2245,6 +2172,58 @@ class KaminoAction {
         }
         return labels;
     }
+    static async getFarmAccountsForReserve(obligationAddress, reserve) {
+        const collateralFarmAddress = reserve.getCollateralFarmAddress();
+        let collateralFarmAccounts = {
+            obligationFarmUserState: (0, kit_1.none)(),
+            reserveFarmState: (0, kit_1.none)(),
+        };
+        if ((0, kit_1.isSome)(collateralFarmAddress)) {
+            collateralFarmAccounts = {
+                obligationFarmUserState: (0, kit_1.some)(await (0, utils_1.obligationFarmStatePda)(collateralFarmAddress.value, obligationAddress)),
+                reserveFarmState: collateralFarmAddress,
+            };
+        }
+        let debtFarmAccounts = {
+            obligationFarmUserState: (0, kit_1.none)(),
+            reserveFarmState: (0, kit_1.none)(),
+        };
+        const debtFarmAddress = reserve.getDebtFarmAddress();
+        if ((0, kit_1.isSome)(debtFarmAddress)) {
+            debtFarmAccounts = {
+                obligationFarmUserState: (0, kit_1.some)(await (0, utils_1.obligationFarmStatePda)(debtFarmAddress.value, obligationAddress)),
+                reserveFarmState: debtFarmAddress,
+            };
+        }
+        return {
+            debtFarmAccounts,
+            collateralFarmAccounts,
+        };
+    }
+    static async getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer) {
+        let referrerKey = (0, kit_1.none)();
+        if ((0, kit_1.isNone)(referrer) || referrer.value === utils_1.DEFAULT_PUBLIC_KEY) {
+            if (kaminoObligation === null) {
+                const [_, userMetadata] = await kaminoMarket.getUserMetadata(owner);
+                if (userMetadata && userMetadata.referrer !== utils_1.DEFAULT_PUBLIC_KEY) {
+                    referrerKey = (0, kit_1.some)(userMetadata.referrer);
+                }
+            }
+            else if (kaminoObligation.state.referrer !== utils_1.DEFAULT_PUBLIC_KEY) {
+                referrerKey = (0, kit_1.some)(kaminoObligation.state.referrer);
+            }
+        }
+        else {
+            referrerKey = referrer;
+        }
+        return referrerKey;
+    }
+    static async getReferrerTokenStateAddressImpl(referrer, reserve, programId) {
+        if ((0, kit_1.isSome)(referrer)) {
+            return (0, kit_1.some)(await (0, utils_1.referrerTokenStatePda)(referrer.value, reserve, programId));
+        }
+        return (0, kit_1.none)();
+    }
 }
 exports.KaminoAction = KaminoAction;
 //# sourceMappingURL=action.js.map