@kamino-finance/klend-sdk 2.10.21 → 2.11.0

package/dist/classes/action.d.ts

@@ -153,4 +153,5 @@ export declare class KaminoAction {
         createAtasIxns: TransactionInstruction[];
     }>;
     getObligationPda(): PublicKey;
+    getAdditionalDepositReservesList(): PublicKey[];
 }

package/dist/classes/action.js

@@ -504,7 +504,11 @@ class KaminoAction {
     }
     addBorrowIx() {
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
-        this.lendingIxs.push((0, instructions_1.borrowObligationLiquidity)({
+        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
+        });
+        const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
             liquidityAmount: this.amount,
         }, {
             owner: this.owner,
@@ -518,7 +522,9 @@ class KaminoAction {
             referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.reserve.address, this.kaminoMarket.programId)[0],
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-        }, this.kaminoMarket.programId));
+        }, this.kaminoMarket.programId);
+        borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
+        this.lendingIxs.push(borrowIx);
     }
     addDepositAndBorrowIx() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -549,7 +555,14 @@ class KaminoAction {
             if (!this.outflowAmount) {
                 throw new Error(`outflowAmount not set`);
             }
-            this.lendingIxs.push((0, instructions_1.borrowObligationLiquidity)({
+            const depositReservesList = this.getAdditionalDepositReservesList();
+            if (depositReservesList.length === 0) {
+                depositReservesList.push(this.reserve.address);
+            }
+            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+                return { pubkey: reserve, isSigner: false, isWritable: true };
+            });
+            const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
                 liquidityAmount: this.outflowAmount,
             }, {
                 owner: this.owner,
@@ -563,7 +576,9 @@ class KaminoAction {
                 referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
+            }, this.kaminoMarket.programId);
+            borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
+            this.lendingIxs.push(borrowIx);
         });
     }
     addRepayAndWithdrawIxs() {
@@ -640,7 +655,11 @@ class KaminoAction {
     addRepayIx() {
         return __awaiter(this, void 0, void 0, function* () {
             this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
-            this.lendingIxs.push((0, instructions_1.repayObligationLiquidity)({
+            const depositReservesList = this.getAdditionalDepositReservesList();
+            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+                return { pubkey: reserve, isSigner: false, isWritable: true };
+            });
+            const repayIx = (0, instructions_1.repayObligationLiquidity)({
                 liquidityAmount: this.amount,
             }, {
                 owner: this.payer,
@@ -651,7 +670,9 @@ class KaminoAction {
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
+            }, this.kaminoMarket.programId);
+            repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
+            this.lendingIxs.push(repayIx);
         });
     }
     addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
@@ -663,11 +684,14 @@ class KaminoAction {
             if (!this.additionalTokenAccountAddress) {
                 throw Error(`Liquidating token account address is not defined`);
             }
-            this.lendingIxs.push((0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
+            const depositReservesList = this.getAdditionalDepositReservesList();
+            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+                return { pubkey: reserve, isSigner: false, isWritable: true };
+            });
+            const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
                 liquidityAmount: this.amount,
                 // TODO: Configure this when updating liquidator with new interface
-                minAcceptableReceivedCollateralAmount: this.outflowAmount || new bn_js_1.default(0),
-                // TODO: remove this before going live
+                minAcceptableReceivedLiquidityAmount: this.outflowAmount || new bn_js_1.default(0),
                 maxAllowedLtvOverridePercent: new bn_js_1.default(maxAllowedLtvOverridePercent),
             }, {
                 liquidator: this.owner,
@@ -686,7 +710,9 @@ class KaminoAction {
                 withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
+            }, this.kaminoMarket.programId);
+            liquidateIx.keys = liquidateIx.keys.concat([...depositReserveAccountMetas]);
+            this.lendingIxs.push(liquidateIx);
         });
     }
     addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, isClosingPosition = false) {
@@ -957,20 +983,7 @@ class KaminoAction {
             lendingMarket: marketAddress,
             obligation: obligationPda,
         }, this.kaminoMarket.programId);
-        const depositReservesList = this.depositReserves;
-        // check if there's any member in the preloadedDepositReserves that is not in the depositReserves
-        // if so, add it to the depositReserves
-        for (let i = 0; i < this.preLoadedDepositReservesSameTx.length; i++) {
-            const preloadedDepositReserve = this.preLoadedDepositReservesSameTx[i];
-            // Check if the depositReserves array contains the current preloadedDepositReserve
-            const found = this.depositReserves.some((depositReserve) => {
-                return depositReserve.equals(preloadedDepositReserve);
-            });
-            // If not found, push the current preloadedDepositReserve to the depositReserves array
-            if (!found) {
-                depositReservesList.push(this.preLoadedDepositReservesSameTx[i]);
-            }
-        }
+        const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
         });
@@ -1012,20 +1025,7 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
         };
         const requestElevationGroupIx = (0, instructions_1.requestElevationGroup)(args, accounts, this.kaminoMarket.programId);
-        const depositReservesList = this.depositReserves;
-        // check if there's any member in the preloadedDepositReserves that is not in the depositReserves
-        // if so, add it to the depositReserves
-        for (let i = 0; i < this.preLoadedDepositReservesSameTx.length; i++) {
-            const preloadedDepositReserveString = this.preLoadedDepositReservesSameTx[i].toString();
-            // Check if the depositReserves array contains the current preloadedDepositReserve
-            const found = this.depositReserves.some((depositReserve) => {
-                return depositReserve.toString() === preloadedDepositReserveString;
-            });
-            // If not found, push the current preloadedDepositReserve to the depositReserves array
-            if (!found) {
-                depositReservesList.push(this.preLoadedDepositReservesSameTx[i]);
-            }
-        }
+        const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
         });
@@ -1517,6 +1517,23 @@ class KaminoAction {
             ? this.obligation.obligationAddress
             : this.obligationType.toPda(this.kaminoMarket.getAddress(), this.owner);
     }
+    getAdditionalDepositReservesList() {
+        const depositReservesList = this.depositReserves;
+        // check if there's any member in the preloadedDepositReserves that is not in the depositReserves
+        // if so, add it to the depositReserves
+        for (let i = 0; i < this.preLoadedDepositReservesSameTx.length; i++) {
+            const preloadedDepositReserve = this.preLoadedDepositReservesSameTx[i];
+            // Check if the depositReserves array contains the current preloadedDepositReserve
+            const found = this.depositReserves.some((depositReserve) => {
+                return depositReserve.equals(preloadedDepositReserve);
+            });
+            // If not found, push the current preloadedDepositReserve to the depositReserves array
+            if (!found) {
+                depositReservesList.push(this.preLoadedDepositReservesSameTx[i]);
+            }
+        }
+        return depositReservesList;
+    }
 }
 exports.KaminoAction = KaminoAction;
 //# sourceMappingURL=action.js.map