@kamino-finance/klend-sdk 3.2.1 → 3.2.3

package/dist/classes/action.d.ts

@@ -8,6 +8,7 @@ export declare const POSITION_LIMIT = 10;
 export declare const BORROWS_LIMIT = 5;
 export declare const DEPOSITS_LIMIT = 8;
 export type ActionType = 'deposit' | 'borrow' | 'withdraw' | 'repay' | 'mint' | 'redeem' | 'depositCollateral' | 'liquidate' | 'depositAndBorrow' | 'repayAndWithdraw' | 'refreshObligation' | 'requestElevationGroup' | 'withdrawReferrerFees';
+export type AuxiliaryIx = 'setup' | 'inBetween' | 'cleanup';
 export declare class KaminoAction {
     kaminoMarket: KaminoMarket;
     reserve: KaminoReserve;
@@ -131,7 +132,7 @@ export declare class KaminoAction {
     addLiquidateIx(maxAllowedLtvOverridePercent?: number): Promise<void>;
     addInBetweenIxs(action: ActionType, includeAtaIxns: boolean, requestElevationGroup: boolean, addInitObligationForFarm: boolean, isClosingPosition?: boolean): Promise<void>;
     addRefreshObligation(crank: PublicKey): void;
-    addSupportIxsWithoutInitObligation(action: ActionType, includeAtaIxns: boolean, addToSetupIxs?: boolean, requestElevationGroup?: boolean, addInitObligationForFarm?: boolean, isClosingPosition?: boolean, twoTokenAction?: boolean): Promise<void>;
+    addSupportIxsWithoutInitObligation(action: ActionType, includeAtaIxns: boolean, addAsSupportIx?: AuxiliaryIx, requestElevationGroup?: boolean, addInitObligationForFarm?: boolean, isClosingPosition?: boolean, twoTokenAction?: boolean): Promise<void>;
     addSupportIxs(action: ActionType, includeAtaIxns: boolean, requestElevationGroup: boolean, includeUserMetadata: boolean, addInitObligationForFarm: boolean, twoTokenAction?: boolean): Promise<void>;
     private static optionalAccount;
     private addRefreshReserveIxs;

package/dist/classes/action.js

@@ -164,7 +164,7 @@ class KaminoAction {
                 axn.addComputeBudgetIxn(extraComputeBudget);
             }
             axn.addRefreshObligation(payer);
-            axn.addRequestElevationIx(elevationGroup, true);
+            axn.addRequestElevationIx(elevationGroup, 'setup');
             return axn;
         });
     }
@@ -863,12 +863,12 @@ class KaminoAction {
     }
     addInBetweenIxs(action_1, includeAtaIxns_1, requestElevationGroup_1, addInitObligationForFarm_1) {
         return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, isClosingPosition = false) {
-            yield this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, false, requestElevationGroup, addInitObligationForFarm, isClosingPosition);
+            yield this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'inBetween', requestElevationGroup, addInitObligationForFarm, isClosingPosition);
         });
     }
     addRefreshObligation(crank) {
         const uniqueReserveAddresses = new utils_1.PublicKeySet(this.depositReserves.concat(this.borrowReserves)).toArray();
-        const addAllToSetupIxns = true;
+        const addAllToSetupIxns = 'setup';
         // Union of addresses
         const allReservesExcludingCurrent = [...uniqueReserveAddresses];
         this.addRefreshReserveIxs(allReservesExcludingCurrent, addAllToSetupIxns);
@@ -877,7 +877,7 @@ class KaminoAction {
         this.addRefreshObligationIx(addAllToSetupIxns, false);
     }
     addSupportIxsWithoutInitObligation(action_1, includeAtaIxns_1) {
-        return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, addToSetupIxs = true, requestElevationGroup = false, addInitObligationForFarm = false, isClosingPosition = false, twoTokenAction = false) {
+        return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, addAsSupportIx = 'setup', requestElevationGroup = false, addInitObligationForFarm = false, isClosingPosition = false, twoTokenAction = false) {
             var _a;
             // TODO: why are we not doing this first?
             if (includeAtaIxns) {
@@ -955,63 +955,63 @@ class KaminoAction {
                 const currentReserveAddresses = new utils_1.PublicKeySet(currentReserves.map((reserve) => reserve.address));
                 // Union of addresses
                 const allReservesExcludingCurrent = [...uniqueReserveAddresses.toArray()].filter((address) => !currentReserveAddresses.contains(address));
-                this.addRefreshReserveIxs(allReservesExcludingCurrent, addToSetupIxs);
+                this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
                 if (addInitObligationForFarm) {
                     if (action === 'liquidate') {
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addToSetupIxs);
-                        yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addToSetupIxs);
+                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
+                        yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
                     }
                     else if (action === 'depositAndBorrow' ||
                         action === 'depositCollateral' ||
                         action === 'withdraw' ||
                         action === 'deposit') {
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Collateral, addToSetupIxs);
+                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
                         if (this.outflowReserve) {
-                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addToSetupIxs);
+                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                         }
                     }
                     else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
                         // todo - probably don't need to add both debt and collateral for everything here
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addToSetupIxs);
+                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                         if (this.outflowReserve) {
-                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addToSetupIxs);
+                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
                         }
                     }
                     else {
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Collateral, addToSetupIxs);
-                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addToSetupIxs);
+                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
+                        yield this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                         if (this.outflowReserve) {
-                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addToSetupIxs);
-                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addToSetupIxs);
+                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Collateral, addAsSupportIx);
+                            yield this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                         }
                     }
                 }
-                this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addToSetupIxs);
-                if (action === 'repayAndWithdraw' && !addToSetupIxs && isClosingPosition) {
+                this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
+                if (action === 'repayAndWithdraw' && addAsSupportIx === 'inBetween' && isClosingPosition) {
                     // addToSetupIxs === addInBetween (same thing)
                     // If this is a repay and withdraw, and it's not the first action, and it's closing a position
                     // we don't need to include the repay reserve in the refresh obligation
                     // I am ashamed of this code, we need to rewrite this entire thing
-                    this.addRefreshObligationIx(addToSetupIxs, true);
+                    this.addRefreshObligationIx(addAsSupportIx, true);
                 }
                 else {
-                    this.addRefreshObligationIx(addToSetupIxs, false);
+                    this.addRefreshObligationIx(addAsSupportIx, false);
                 }
-                if (addToSetupIxs) {
+                if (addAsSupportIx === 'setup') {
                     // If this is an setup ixn (therefore not an in-between), it means it's either a one off action
                     // or the first of a two-token-action
                     if (action === 'liquidate') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addToSetupIxs, types_1.ReserveFarmKind.Collateral);
-                        this.addRefreshFarmsForReserve([this.reserve], addToSetupIxs, types_1.ReserveFarmKind.Debt);
+                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
+                        this.addRefreshFarmsForReserve([this.reserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
                     }
                     else if (action === 'depositAndBorrow' ||
                         action === 'depositCollateral' ||
                         action === 'withdraw' ||
                         action === 'deposit') {
-                        this.addRefreshFarmsForReserve(currentReserves, addToSetupIxs, types_1.ReserveFarmKind.Collateral, undefined, twoTokenAction);
+                        this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Collateral, undefined, twoTokenAction);
                     }
                     else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
-                        this.addRefreshFarmsForReserve(currentReserves, addToSetupIxs, types_1.ReserveFarmKind.Debt, undefined, twoTokenAction);
+                        this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Debt, undefined, twoTokenAction);
                     }
                     else {
                         throw new Error(`Could not decide on refresh farm for action ${action}`);
@@ -1022,15 +1022,28 @@ class KaminoAction {
                     // so we skip the refresh farm obligation of the first reserve as that operation already happened
                     // add added to 'setup' ixns
                     if (action === 'depositAndBorrow') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addToSetupIxs, types_1.ReserveFarmKind.Debt);
+                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
                     }
                     else if (action === 'repayAndWithdraw') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addToSetupIxs, types_1.ReserveFarmKind.Collateral);
+                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
                     }
                     else {
                         throw new Error(`Could not decide on refresh farm for action ${action}`);
                     }
                 }
+                if (action === 'repay' && requestElevationGroup) {
+                    const repayObligationLiquidity = this.obligation.borrows.get(this.reserve.address);
+                    if (!repayObligationLiquidity) {
+                        throw new Error(`Could not find debt reserve ${this.reserve.address} in obligation`);
+                    }
+                    if (new decimal_js_1.default(repayObligationLiquidity.amount).lte(new decimal_js_1.default(this.amount.toString())) &&
+                        this.obligation.borrows.size === 1) {
+                        this.addRefreshReserveIxs(allReservesExcludingCurrent, 'cleanup');
+                        // Skip the borrow reserve, since we repay in the same tx
+                        this.addRefreshObligationIx('cleanup', true);
+                        this.addRequestElevationIx(0, 'cleanup', true);
+                    }
+                }
                 if ((action === 'depositAndBorrow' || action === 'borrow') && requestElevationGroup) {
                     let emodeGroupsDebt = this.reserve.state.config.elevationGroups;
                     let emodeGroupsColl = this.reserve.state.config.elevationGroups;
@@ -1058,16 +1071,16 @@ class KaminoAction {
                         });
                         const eModeGroup = groups.find((group) => group.id === eModeGroupWithMaxLtvAndDebtReserve).id;
                         console.log('Setting eModeGroup to', eModeGroup);
-                        let addToSetupIxs = false;
+                        let addAsSupportIx = 'inBetween';
                         if (eModeGroup !== 0 && eModeGroup !== ((_a = this.obligation) === null || _a === void 0 ? void 0 : _a.state.elevationGroup)) {
                             if (action === 'borrow') {
                                 this.obligation.refreshedStats.potentialElevationGroupUpdate = eModeGroup;
-                                addToSetupIxs = true;
+                                addAsSupportIx = 'setup';
                             }
-                            this.addRequestElevationIx(eModeGroup, addToSetupIxs);
-                            this.addRefreshReserveIxs(allReservesExcludingCurrent, addToSetupIxs);
-                            this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addToSetupIxs);
-                            this.addRefreshObligationIx(addToSetupIxs);
+                            this.addRequestElevationIx(eModeGroup, addAsSupportIx);
+                            this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
+                            this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
+                            this.addRefreshObligationIx(addAsSupportIx);
                         }
                     }
                 }
@@ -1084,7 +1097,7 @@ class KaminoAction {
                 yield this.addInitReferrerTokenStateIxs();
                 yield this.addInitObligationIxs();
             }
-            yield this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, true, requestElevationGroup, addInitObligationForFarm, false, twoTokenAction);
+            yield this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'setup', requestElevationGroup, addInitObligationForFarm, false, twoTokenAction);
         });
     }
     static optionalAccount(pubkey, programId = lib_1.PROGRAM_ID) {
@@ -1095,7 +1108,7 @@ class KaminoAction {
             return programId;
         }
     }
-    addRefreshReserveIxs(reserves, addToSetupIxs = true) {
+    addRefreshReserveIxs(reserves, addAsSupportIx = 'setup') {
         reserves.forEach((reserveAddress) => {
             const foundReserve = this.kaminoMarket.getReserveByAddress(reserveAddress);
             if (!foundReserve) {
@@ -1110,14 +1123,18 @@ class KaminoAction {
                 switchboardTwapOracle: KaminoAction.optionalAccount(state.config.tokenInfo.switchboardConfiguration.twapAggregator, this.kaminoMarket.programId),
                 scopePrices: KaminoAction.optionalAccount(state.config.tokenInfo.scopeConfiguration.priceFeed, this.kaminoMarket.programId),
             }, this.kaminoMarket.programId);
-            if (addToSetupIxs) {
+            if (addAsSupportIx === 'setup') {
                 this.setupIxs.push(refreshReserveIx);
                 this.setupIxsLabels.push(`RefreshReserve[${reserveAddress}]`);
             }
-            else {
+            else if (addAsSupportIx === 'inBetween') {
                 this.inBetweenIxs.push(refreshReserveIx);
                 this.inBetweenIxsLabels.push(`RefreshReserve[${reserveAddress}]`);
             }
+            else {
+                this.cleanupIxs.push(refreshReserveIx);
+                this.cleanupIxsLabels.push(`RefreshReserve[${reserveAddress}]`);
+            }
         });
     }
     static getRefreshAllReserves(kaminoMarket, reserves) {
@@ -1137,7 +1154,7 @@ class KaminoAction {
             }, kaminoMarket.programId);
         });
     }
-    addRefreshObligationIx(addToSetupIxs = true, skipBorrowObligations = false) {
+    addRefreshObligationIx(addAsSupportIx = 'setup', skipBorrowObligations = false) {
         const marketAddress = this.kaminoMarket.getAddress();
         const obligationPda = this.getObligationPda();
         const refreshObligationIx = (0, instructions_1.refreshObligation)({
@@ -1166,16 +1183,20 @@ class KaminoAction {
             ...depositReserveAccountMetas,
             ...(skipBorrowObligations ? [] : [...borrowReserveAccountMetas, ...borrowReservesReferrerTokenStates]),
         ]);
-        if (addToSetupIxs) {
+        if (addAsSupportIx === 'setup') {
             this.setupIxs.push(refreshObligationIx);
             this.setupIxsLabels.push(`RefreshObligation[${obligationPda.toString()}]`);
         }
-        else {
+        else if (addAsSupportIx === 'inBetween') {
             this.inBetweenIxs.push(refreshObligationIx);
             this.inBetweenIxsLabels.push(`RefreshObligation[${obligationPda.toString()}]`);
         }
+        else {
+            this.cleanupIxs.push(refreshObligationIx);
+            this.cleanupIxsLabels.push(`RefreshObligation[${obligationPda.toString()}]`);
+        }
     }
-    addRequestElevationIx(elevationGroup, addToSetupIxs) {
+    addRequestElevationIx(elevationGroup, addAsSupportIx, skipBorrowObligations = false) {
         const obligationPda = this.getObligationPda();
         const args = {
             elevationGroup,
@@ -1207,19 +1228,22 @@ class KaminoAction {
             .filter((x) => !x.pubkey.equals(this.kaminoMarket.programId));
         requestElevationGroupIx.keys = requestElevationGroupIx.keys.concat([
             ...depositReserveAccountMetas,
-            ...borrowReserveAccountMetas,
-            ...borrowReservesReferrerTokenStates,
+            ...(skipBorrowObligations ? [] : [...borrowReserveAccountMetas, ...borrowReservesReferrerTokenStates]),
         ]);
-        if (addToSetupIxs) {
+        if (addAsSupportIx === 'setup') {
             this.setupIxs.push(requestElevationGroupIx);
             this.setupIxsLabels.push(`RequestElevation[${obligationPda}], elevation_group:${elevationGroup}`);
         }
-        else {
+        else if (addAsSupportIx === 'inBetween') {
             this.inBetweenIxs.push(requestElevationGroupIx);
             this.inBetweenIxsLabels.push(`RequestElevation[${obligationPda}], elevation_group:${elevationGroup}`);
         }
+        else {
+            this.cleanupIxs.push(requestElevationGroupIx);
+            this.cleanupIxsLabels.push(`RequestElevation[${obligationPda}], elevation_group:${elevationGroup}`);
+        }
     }
-    addRefreshFarmsForReserve(reserves, addToSetupIxs = true, mode, crank = this.payer, twoTokenAction = false) {
+    addRefreshFarmsForReserve(reserves, addAsSupportIx = 'setup', mode, crank = this.payer, twoTokenAction = false) {
         const BASE_SEED_USER_STATE = Buffer.from('user');
         const getPda = (farm) => web3_js_1.PublicKey.findProgramAddressSync([BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()], farms_sdk_1.farmsId)[0];
         const farms = [];
@@ -1256,7 +1280,7 @@ class KaminoAction {
                 systemProgram: web3_js_1.SystemProgram.programId,
             };
             const refreshFarmForObligationix = (0, instructions_1.refreshObligationFarmsForReserve)(args, accounts, this.kaminoMarket.programId);
-            if (addToSetupIxs) {
+            if (addAsSupportIx === 'setup') {
                 this.setupIxs.push(refreshFarmForObligationix);
                 this.setupIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${this.getObligationPda().toString()}]`);
                 if (twoTokenAction) {
@@ -1269,7 +1293,7 @@ class KaminoAction {
                     this.refreshFarmsCleanupTxnIxsLabels.push(`RefreshFarmForObligation[${arg[0].kind}, res=${arg[3].address.toString()}, obl=${this.getObligationPda().toString()}]`);
                 }
             }
-            else {
+            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.refreshFarmsCleanupTxnIxs.push(refreshFarmForObligationix);
@@ -1282,7 +1306,7 @@ class KaminoAction {
         this.cleanupIxsLabels.splice(this.cleanupIxsLabels.length - 1, 0, ...this.refreshFarmsCleanupTxnIxsLabels);
     }
     addInitObligationForFarm(reserve_1, mode_1) {
-        return __awaiter(this, arguments, void 0, function* (reserve, mode, addToSetupIxs = true) {
+        return __awaiter(this, arguments, void 0, function* (reserve, mode, addAsSupportIx = 'setup') {
             const BASE_SEED_USER_STATE = Buffer.from('user');
             const getPda = (farm) => web3_js_1.PublicKey.findProgramAddressSync([BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()], farms_sdk_1.farmsId)[0];
             const farms = [];
@@ -1316,11 +1340,11 @@ class KaminoAction {
                     systemProgram: web3_js_1.SystemProgram.programId,
                 };
                 const initObligationForFarm = (0, instructions_1.initObligationFarmsForReserve)(args, accounts, this.kaminoMarket.programId);
-                if (addToSetupIxs) {
+                if (addAsSupportIx === 'setup') {
                     this.setupIxs.push(initObligationForFarm);
                     this.setupIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${this.getObligationPda().toString()}]`);
                 }
-                else {
+                else if (addAsSupportIx === 'inBetween') {
                     this.inBetweenIxs.push(initObligationForFarm);
                     this.inBetweenIxsLabels.push(`InitObligationForFarm[${reserve.address.toString()}, ${this.getObligationPda().toString()}]`);
                 }