@kamino-finance/klend-sdk 5.14.2 → 5.14.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/classes/market.d.ts.map +1 -1
- package/dist/classes/market.js +1 -1
- package/dist/classes/market.js.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.d.ts +2 -1
- package/dist/lending_operations/repay_with_collateral_operations.d.ts.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.js +13 -9
- package/dist/lending_operations/repay_with_collateral_operations.js.map +1 -1
- package/dist/lending_operations/swap_collateral_operations.d.ts +1 -1
- package/dist/lending_operations/swap_collateral_operations.d.ts.map +1 -1
- package/dist/lending_operations/swap_collateral_operations.js +34 -30
- package/dist/lending_operations/swap_collateral_operations.js.map +1 -1
- package/dist/leverage/operations.d.ts +4 -4
- package/dist/leverage/operations.d.ts.map +1 -1
- package/dist/leverage/operations.js +91 -55
- package/dist/leverage/operations.js.map +1 -1
- package/dist/leverage/types.d.ts +8 -6
- package/dist/leverage/types.d.ts.map +1 -1
- package/dist/leverage/utils.d.ts.map +1 -1
- package/dist/leverage/utils.js +40 -19
- package/dist/leverage/utils.js.map +1 -1
- package/dist/utils/instruction.d.ts +3 -1
- package/dist/utils/instruction.d.ts.map +1 -1
- package/dist/utils/instruction.js +17 -1
- package/dist/utils/instruction.js.map +1 -1
- package/dist/utils/managerTypes.d.ts.map +1 -1
- package/dist/utils/managerTypes.js +9 -3
- package/dist/utils/managerTypes.js.map +1 -1
- package/package.json +1 -1
- package/src/classes/market.ts +6 -1
- package/src/lending_operations/repay_with_collateral_operations.ts +34 -26
- package/src/lending_operations/swap_collateral_operations.ts +43 -36
- package/src/leverage/operations.ts +175 -147
- package/src/leverage/types.ts +8 -6
- package/src/leverage/utils.ts +41 -20
- package/src/utils/instruction.ts +28 -0
- package/src/utils/managerTypes.ts +9 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/leverage/utils.ts"],"names":[],"mappings":";;;;;;AA2BA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/leverage/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Decimal from 'decimal.js';
|
|
2
|
-
import { AddressLookupTableAccount, Commitment, Connection, Keypair, PublicKey, SendOptions, Signer, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
|
|
2
|
+
import { AddressLookupTableAccount, Blockhash, Commitment, Connection, Keypair, PublicKey, SendOptions, Signer, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
|
|
3
3
|
export declare function buildAndSendTxnWithLogs(c: Connection, tx: VersionedTransaction, owner: Keypair, signers: Signer[], withLogsIfSuccess?: boolean, withDescription?: string, throwOnError?: boolean): Promise<TransactionSignature>;
|
|
4
4
|
export declare function buildAndSendTxn(c: Connection, owner: Keypair, ixs: TransactionInstruction[], signers: Signer[], lutAddresses?: PublicKey[], description?: string): Promise<TransactionSignature>;
|
|
5
5
|
export declare function sendAndConfirmVersionedTransaction(c: Connection, tx: VersionedTransaction, commitment?: Commitment, sendTransactionOptions?: SendOptions): Promise<string>;
|
|
@@ -16,6 +16,8 @@ export declare function buildComputeBudgetIx(units: number): TransactionInstruct
|
|
|
16
16
|
export declare function sendTransactionV0(connection: Connection, payer: Keypair, instructions: TransactionInstruction[], lookupTables?: AddressLookupTableAccount[] | undefined, options?: SendOptions): Promise<string>;
|
|
17
17
|
export declare function simulateTransactionV0(connection: Connection, payer: Keypair, instructions: TransactionInstruction[], lookupTables?: AddressLookupTableAccount[] | undefined): Promise<import("@solana/web3.js").RpcResponseAndContext<import("@solana/web3.js").SimulatedTransactionResponse>>;
|
|
18
18
|
export declare const buildVersionedTransaction: (connection: Connection, payer: PublicKey, instructions: TransactionInstruction[], lookupTables?: PublicKey[]) => Promise<VersionedTransaction>;
|
|
19
|
+
export declare function getLookupTableAccountsFromAddresses(connection: Connection, addresses: PublicKey[]): Promise<AddressLookupTableAccount[]>;
|
|
20
|
+
export declare const buildVersionedTransactionSync: (payer: PublicKey, instructions: TransactionInstruction[], blockhash: Blockhash, lookupTables?: AddressLookupTableAccount[]) => VersionedTransaction;
|
|
19
21
|
export declare const getLookupTableAccount: (connection: Connection, address: PublicKey) => Promise<AddressLookupTableAccount | null>;
|
|
20
22
|
export declare function getLookupTableAccounts(connection: Connection, addresses: PublicKey[]): Promise<AddressLookupTableAccount[]>;
|
|
21
23
|
export declare const getComputeBudgetAndPriorityFeeIxs: (units: number, priorityFeeLamports?: Decimal) => TransactionInstruction[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction.d.ts","sourceRoot":"","sources":["../../src/utils/instruction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EACL,yBAAyB,EACzB,UAAU,EAEV,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,EACX,MAAM,EACN,WAAW,EACX,sBAAsB,EAGtB,oBAAoB,EACpB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAMzB,wBAAsB,uBAAuB,CAC3C,CAAC,EAAE,UAAU,EACb,EAAE,EAAE,oBAAoB,EACxB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,iBAAiB,GAAE,OAAe,EAClC,eAAe,GAAE,MAAW,EAC5B,YAAY,GAAE,OAAe,GAC5B,OAAO,CAAC,oBAAoB,CAAC,CA+B/B;AAED,wBAAsB,eAAe,CACnC,CAAC,EAAE,UAAU,EACb,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,sBAAsB,EAAE,EAC7B,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,GAAE,SAAS,EAAO,EAC9B,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAI/B;AAED,wBAAsB,kCAAkC,CACtD,CAAC,EAAE,UAAU,EACb,EAAE,EAAE,oBAAoB,EACxB,UAAU,GAAE,UAAwB,EACpC,sBAAsB,GAAE,WAAkD,mBAyB3E;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAkBlG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,sBAAsB,CAE1E;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,sBAAsB,EAAE,EACtC,YAAY,GAAE,yBAAyB,EAAE,GAAG,SAAqB,EACjE,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,sBAAsB,EAAE,EACtC,YAAY,GAAE,yBAAyB,EAAE,GAAG,SAAqB,oHAiBlE;AAED,eAAO,MAAM,yBAAyB,eACxB,UAAU,SACf,SAAS,gBACF,sBAAsB,EAAE,iBACxB,SAAS,EAAE,KACxB,OAAO,CAAC,oBAAoB,CAgB9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAsB,UAAU,WAAW,SAAS,8CAErF,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EAAE,GACrB,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAgBtC;AAED,eAAO,MAAM,iCAAiC,UACrC,MAAM,wBACS,OAAO,KAC5B,sBAAsB,EAUxB,CAAC;AAGF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,KAAK,IAAI,MAAM,CAQlF;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,sBAAsB,EAAE,EAC7B,mBAAmB,GAAE,SAAS,EAAE,GAAG,yBAAyB,EAAO,GAClE,KAAK,CAAC,SAAS,CAAC,CAiBlB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,sBAAsB,EAAE,GAAG,sBAAsB,EAAE,CAUvF"}
|
|
1
|
+
{"version":3,"file":"instruction.d.ts","sourceRoot":"","sources":["../../src/utils/instruction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EACL,yBAAyB,EACzB,SAAS,EACT,UAAU,EAEV,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,EACX,MAAM,EACN,WAAW,EACX,sBAAsB,EAGtB,oBAAoB,EACpB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAMzB,wBAAsB,uBAAuB,CAC3C,CAAC,EAAE,UAAU,EACb,EAAE,EAAE,oBAAoB,EACxB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,iBAAiB,GAAE,OAAe,EAClC,eAAe,GAAE,MAAW,EAC5B,YAAY,GAAE,OAAe,GAC5B,OAAO,CAAC,oBAAoB,CAAC,CA+B/B;AAED,wBAAsB,eAAe,CACnC,CAAC,EAAE,UAAU,EACb,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,sBAAsB,EAAE,EAC7B,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,GAAE,SAAS,EAAO,EAC9B,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAI/B;AAED,wBAAsB,kCAAkC,CACtD,CAAC,EAAE,UAAU,EACb,EAAE,EAAE,oBAAoB,EACxB,UAAU,GAAE,UAAwB,EACpC,sBAAsB,GAAE,WAAkD,mBAyB3E;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAkBlG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,sBAAsB,CAE1E;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,sBAAsB,EAAE,EACtC,YAAY,GAAE,yBAAyB,EAAE,GAAG,SAAqB,EACjE,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,sBAAsB,EAAE,EACtC,YAAY,GAAE,yBAAyB,EAAE,GAAG,SAAqB,oHAiBlE;AAED,eAAO,MAAM,yBAAyB,eACxB,UAAU,SACf,SAAS,gBACF,sBAAsB,EAAE,iBACxB,SAAS,EAAE,KACxB,OAAO,CAAC,oBAAoB,CAgB9B,CAAC;AAEF,wBAAsB,mCAAmC,CACvD,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EAAE,GACrB,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAOtC;AAED,eAAO,MAAM,6BAA6B,UACjC,SAAS,gBACF,sBAAsB,EAAE,aAC3B,SAAS,iBACN,yBAAyB,EAAE,KACxC,oBAQF,CAAA;AAED,eAAO,MAAM,qBAAqB,eAAsB,UAAU,WAAW,SAAS,8CAErF,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EAAE,GACrB,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAgBtC;AAED,eAAO,MAAM,iCAAiC,UACrC,MAAM,wBACS,OAAO,KAC5B,sBAAsB,EAUxB,CAAC;AAGF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,KAAK,IAAI,MAAM,CAQlF;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,sBAAsB,EAAE,EAC7B,mBAAmB,GAAE,SAAS,EAAE,GAAG,yBAAyB,EAAO,GAClE,KAAK,CAAC,SAAS,CAAC,CAiBlB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,sBAAsB,EAAE,GAAG,sBAAsB,EAAE,CAUvF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getComputeBudgetAndPriorityFeeIxs = exports.getLookupTableAccount = exports.buildVersionedTransaction = void 0;
|
|
3
|
+
exports.getComputeBudgetAndPriorityFeeIxs = exports.getLookupTableAccount = exports.buildVersionedTransactionSync = exports.buildVersionedTransaction = void 0;
|
|
4
4
|
exports.buildAndSendTxnWithLogs = buildAndSendTxnWithLogs;
|
|
5
5
|
exports.buildAndSendTxn = buildAndSendTxn;
|
|
6
6
|
exports.sendAndConfirmVersionedTransaction = sendAndConfirmVersionedTransaction;
|
|
@@ -8,6 +8,7 @@ exports.simulateTxn = simulateTxn;
|
|
|
8
8
|
exports.buildComputeBudgetIx = buildComputeBudgetIx;
|
|
9
9
|
exports.sendTransactionV0 = sendTransactionV0;
|
|
10
10
|
exports.simulateTransactionV0 = simulateTransactionV0;
|
|
11
|
+
exports.getLookupTableAccountsFromAddresses = getLookupTableAccountsFromAddresses;
|
|
11
12
|
exports.getLookupTableAccounts = getLookupTableAccounts;
|
|
12
13
|
exports.notEmpty = notEmpty;
|
|
13
14
|
exports.uniqueAccountsWithProgramIds = uniqueAccountsWithProgramIds;
|
|
@@ -150,6 +151,21 @@ const buildVersionedTransaction = async (connection, payer, instructions, lookup
|
|
|
150
151
|
return new web3_js_1.VersionedTransaction(messageV0);
|
|
151
152
|
};
|
|
152
153
|
exports.buildVersionedTransaction = buildVersionedTransaction;
|
|
154
|
+
async function getLookupTableAccountsFromAddresses(connection, addresses) {
|
|
155
|
+
const lookupTablesAccounts = await Promise.all(addresses.map((address) => {
|
|
156
|
+
return (0, exports.getLookupTableAccount)(connection, address);
|
|
157
|
+
}));
|
|
158
|
+
return lookupTablesAccounts.filter((account) => account !== null);
|
|
159
|
+
}
|
|
160
|
+
const buildVersionedTransactionSync = (payer, instructions, blockhash, lookupTables = []) => {
|
|
161
|
+
const messageV0 = new web3_js_1.TransactionMessage({
|
|
162
|
+
payerKey: payer,
|
|
163
|
+
recentBlockhash: blockhash,
|
|
164
|
+
instructions,
|
|
165
|
+
}).compileToV0Message(lookupTables.filter(notEmpty));
|
|
166
|
+
return new web3_js_1.VersionedTransaction(messageV0);
|
|
167
|
+
};
|
|
168
|
+
exports.buildVersionedTransactionSync = buildVersionedTransactionSync;
|
|
153
169
|
const getLookupTableAccount = async (connection, address) => {
|
|
154
170
|
return connection.getAddressLookupTable(address).then((res) => res.value);
|
|
155
171
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction.js","sourceRoot":"","sources":["../../src/utils/instruction.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"instruction.js","sourceRoot":"","sources":["../../src/utils/instruction.ts"],"names":[],"mappings":";;;AAyBA,0DAuCC;AAED,0CAWC;AAED,gFA6BC;AAED,kCAkBC;AAED,oDAEC;AAUD,8CAsBC;AAED,sDAqBC;AAyBD,kFAUC;AAqBD,wDAmBC;AAkBD,4BAQC;AAED,oEAoBC;AAED,0CAUC;AAhUD,6CAiByB;AACzB,kDAAoD;AACpD,4CAAyC;AACzC,mEAA4D;AAC5D,qCAAwC;AAEjC,KAAK,UAAU,uBAAuB,CAC3C,CAAa,EACb,EAAwB,EACxB,KAAc,EACd,OAAiB,EACjB,oBAA6B,KAAK,EAClC,kBAA0B,EAAE,EAC5B,eAAwB,KAAK,CAAC,8IAA8I;;IAE5K,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAE7B,IAAI,CAAC;QACH,MAAM,GAAG,GAAW,MAAM,kCAAkC,CAAC,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE;YAC/E,mBAAmB,EAAE,WAAW;SACjC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;QACvD,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,IAAA,aAAK,EAAC,IAAI,CAAC,CAAC;YAClB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE;gBACtC,UAAU,EAAE,WAAW;gBACvB,8BAA8B,EAAE,CAAC;aAClC,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,CAAC,CAAC;QACV,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,GAAG,GAAwC,MAAM,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE;YAC3E,UAAU,EAAE,WAAW;YACvB,8BAA8B,EAAE,CAAC;SAClC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAI,CAAC,IAAK,CAAC,WAAW,CAAC,CAAC;QAC3C,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,CAAa,EACb,KAAc,EACd,GAA6B,EAC7B,OAAiB,EACjB,eAA4B,EAAE,EAC9B,cAAsB,EAAE;IAExB,MAAM,EAAE,GAAG,MAAM,IAAA,iCAAyB,EAAC,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IAElF,OAAO,MAAM,uBAAuB,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AACjF,CAAC;AAEM,KAAK,UAAU,kCAAkC,CACtD,CAAa,EACb,EAAwB,EACxB,aAAyB,WAAW,EACpC,yBAAsC,EAAE,mBAAmB,EAAE,WAAW,EAAE;IAE1E,MAAM,cAAc,GAAgB,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;IAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,GAAG,sBAAsB,EAAE,CAAC,CAAC;IAE3F,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAChE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,kBAAkB,CAClC;QACE,SAAS,EAAE,eAAe,CAAC,SAAS;QACpC,oBAAoB,EAAE,eAAe,CAAC,oBAAoB;QAC1D,SAAS,EAAE,IAAI;KAChB,EACD,UAAU,CACX,CAAC;IACF,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,cAAc,CAAC,IAAI,EAAE;YAC7C,8BAA8B,EAAE,CAAC;YACjC,UAAU,EAAE,WAAW;SACxB,CAAC,CAAC;QACH,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,WAAW,IAAI,EAAE,EAAE,CAAC;QAC9E,CAAC;QACD,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,CAAa,EAAE,EAAe,EAAE,KAAc,EAAE,OAAiB;IACjG,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,kBAAkB,EAAE,CAAC;IACnD,EAAE,CAAC,eAAe,GAAG,SAAS,CAAC;IAC/B,EAAE,CAAC,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC;IAE9B,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,mBAAmB,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;QACxE,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,GAAG,GAA+B,MAAM,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE;YAClE,UAAU,EAAE,WAAW;SACxB,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAI,CAAC,IAAK,CAAC,WAAW,CAAC,CAAC;QAC3C,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAa;IAChD,OAAO,8BAAoB,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CACrC,UAAsB,EACtB,KAAc,EACd,YAAsC,EACtC,eAAwD,SAAS,EACjE,OAAqB;IAErB,MAAM,eAAe,GAAG,CAAC,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC,SAAS,CAAC;IAE1E,MAAM,SAAS,GAAG,IAAI,4BAAkB,CAAC;QACvC,QAAQ,EAAE,KAAK,CAAC,SAAS;QACzB,eAAe;QACf,YAAY;KACb,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAEpC,MAAM,EAAE,GAAG,IAAI,8BAAoB,CAAC,SAAS,CAAC,CAAC;IAC/C,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACjB,IAAI,CAAC;QACH,OAAO,MAAM,UAAU,CAAC,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAA,oBAAW,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC;IAChC,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,UAAsB,EACtB,KAAc,EACd,YAAsC,EACtC,eAAwD,SAAS;IAEjE,MAAM,eAAe,GAAG,CAAC,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC,SAAS,CAAC;IAE1E,MAAM,SAAS,GAAG,IAAI,4BAAkB,CAAC;QACvC,QAAQ,EAAE,KAAK,CAAC,SAAS;QACzB,eAAe;QACf,YAAY;KACb,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAEpC,MAAM,EAAE,GAAG,IAAI,8BAAoB,CAAC,SAAS,CAAC,CAAC;IAC/C,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACjB,IAAI,CAAC;QACH,OAAO,MAAM,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAA,oBAAW,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC;IAChC,CAAC;AACH,CAAC;AAEM,MAAM,yBAAyB,GAAG,KAAK,EAC5C,UAAsB,EACtB,KAAgB,EAChB,YAAsC,EACtC,eAA4B,EAAE,EACC,EAAE;IACjC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEhG,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5C,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,OAAO,IAAA,6BAAqB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,SAAS,GAAG,IAAI,4BAAkB,CAAC;QACvC,QAAQ,EAAE,KAAK;QACf,eAAe,EAAE,SAAS;QAC1B,YAAY;KACb,CAAC,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE7D,OAAO,IAAI,8BAAoB,CAAC,SAAS,CAAC,CAAC;AAC7C,CAAC,CAAC;AArBW,QAAA,yBAAyB,6BAqBpC;AAEK,KAAK,UAAU,mCAAmC,CACvD,UAAsB,EACtB,SAAsB;IAEtB,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5C,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACxB,OAAO,IAAA,6BAAqB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CACH,CAAC;IACF,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,CAAgC,CAAC;AACnG,CAAC;AAEM,MAAM,6BAA6B,GAAG,CAC3C,KAAgB,EAChB,YAAsC,EACtC,SAAoB,EACpB,eAA4C,EAAE,EACxB,EAAE;IACxB,MAAM,SAAS,GAAG,IAAI,4BAAkB,CAAC;QACvC,QAAQ,EAAE,KAAK;QACf,eAAe,EAAE,SAAS;QAC1B,YAAY;KACb,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAErD,OAAO,IAAI,8BAAoB,CAAC,SAAS,CAAC,CAAC;AAC7C,CAAC,CAAA;AAbY,QAAA,6BAA6B,iCAazC;AAEM,MAAM,qBAAqB,GAAG,KAAK,EAAE,UAAsB,EAAE,OAAkB,EAAE,EAAE;IACxF,OAAO,UAAU,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC5E,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEK,KAAK,UAAU,sBAAsB,CAC1C,UAAsB,EACtB,SAAsB;IAEtB,MAAM,mBAAmB,GAAgC,EAAE,CAAC;IAC5D,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAU,EAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;IACvG,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,gBAAgB,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;QAC/D,CAAC;QACD,mBAAmB,CAAC,IAAI,CACtB,IAAI,mCAAyB,CAAC;YAC5B,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;YACjB,KAAK,EAAE,mCAAyB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;SACxD,CAAC,CACH,CAAC;IACJ,CAAC;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAEM,MAAM,iCAAiC,GAAG,CAC/C,KAAa,EACb,mBAA6B,EACH,EAAE;IAC5B,MAAM,GAAG,GAA6B,EAAE,CAAC;IACzC,GAAG,CAAC,IAAI,CAAC,8BAAoB,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAE9D,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,MAAM,SAAS,GAAG,mBAAmB,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9D,GAAG,CAAC,IAAI,CAAC,8BAAoB,CAAC,mBAAmB,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9G,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAbW,QAAA,iCAAiC,qCAa5C;AAEF,2DAA2D;AAC3D,SAAgB,QAAQ,CAAS,KAAgC;IAC/D,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,EAAE;IACF,4EAA4E;IAC5E,MAAM,SAAS,GAAW,KAAK,CAAC;IAChC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,4BAA4B,CAC1C,GAA6B,EAC7B,sBAAiE,EAAE;IAEnE,IAAI,IAAiB,CAAC;IACtB,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,YAAY,mCAAyB,EAAE,CAAC;QAClG,IAAI,GAAI,mBAAmD,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,mBAAkC,CAAC;IAC5C,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,qBAAY,CAAY,IAAI,CAAC,CAAC;IACzD,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QACjB,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QACjC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACtB,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC,OAAO,EAAE,CAAC;AAClC,CAAC;AAED,SAAgB,eAAe,CAAC,GAA6B;IAC3D,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;QACvB,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;QAEzB,IAAI,SAAS,CAAC,MAAM,CAAC,8BAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;YACrD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managerTypes.d.ts","sourceRoot":"","sources":["../../src/utils/managerTypes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"managerTypes.d.ts","sourceRoot":"","sources":["../../src/utils/managerTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -209,13 +209,17 @@ function buildReserveConfig(fields) {
|
|
|
209
209
|
},
|
|
210
210
|
borrowRateCurve: fields.configParams.borrowRateCurve,
|
|
211
211
|
depositWithdrawalCap: new types_1.WithdrawalCaps({
|
|
212
|
-
configCapacity: new bn_js_1.default((0, classes_1.numberToLamportsDecimal)(fields.configParams.depositLimit ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
212
|
+
configCapacity: new bn_js_1.default((0, classes_1.numberToLamportsDecimal)(fields.configParams.depositLimit ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
213
|
+
.floor()
|
|
214
|
+
.toString()),
|
|
213
215
|
currentTotal: new bn_js_1.default(0),
|
|
214
216
|
lastIntervalStartTimestamp: new bn_js_1.default(0),
|
|
215
217
|
configIntervalLengthSeconds: new bn_js_1.default(0),
|
|
216
218
|
}),
|
|
217
219
|
debtWithdrawalCap: new types_1.WithdrawalCaps({
|
|
218
|
-
configCapacity: new bn_js_1.default((0, classes_1.numberToLamportsDecimal)(fields.debtWithdrawalCapConfigCapacity ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
220
|
+
configCapacity: new bn_js_1.default((0, classes_1.numberToLamportsDecimal)(fields.debtWithdrawalCapConfigCapacity ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
221
|
+
.floor()
|
|
222
|
+
.toString()),
|
|
219
223
|
currentTotal: new bn_js_1.default(0),
|
|
220
224
|
lastIntervalStartTimestamp: new bn_js_1.default(0),
|
|
221
225
|
configIntervalLengthSeconds: new bn_js_1.default(0),
|
|
@@ -228,7 +232,9 @@ function buildReserveConfig(fields) {
|
|
|
228
232
|
utilizationLimitBlockBorrowingAbovePct: 0,
|
|
229
233
|
hostFixedInterestRateBps: 0,
|
|
230
234
|
autodeleverageEnabled: 0,
|
|
231
|
-
borrowLimitOutsideElevationGroup: new bn_js_1.default((0, classes_1.numberToLamportsDecimal)(fields.borrowLimitOutsideElevationGroup ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
235
|
+
borrowLimitOutsideElevationGroup: new bn_js_1.default((0, classes_1.numberToLamportsDecimal)(fields.borrowLimitOutsideElevationGroup ?? new decimal_js_1.default(0), fields.mintDecimals)
|
|
236
|
+
.floor()
|
|
237
|
+
.toString()),
|
|
232
238
|
borrowLimitAgainstThisCollateralInElevationGroup: Array(32).fill(new bn_js_1.default(0)),
|
|
233
239
|
deleveragingBonusIncreaseBpsPerDay: new bn_js_1.default(100),
|
|
234
240
|
reserved1: Array(1).fill(0),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managerTypes.js","sourceRoot":"","sources":["../../src/utils/managerTypes.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"managerTypes.js","sourceRoot":"","sources":["../../src/utils/managerTypes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/classes/market.ts
CHANGED
|
@@ -524,8 +524,13 @@ export class KaminoMarket {
|
|
|
524
524
|
getRewardPrice
|
|
525
525
|
);
|
|
526
526
|
}
|
|
527
|
+
|
|
527
528
|
if (isNotNullPubkey(debtFarmAddress)) {
|
|
528
|
-
result.
|
|
529
|
+
result.borrowingRewards = await this.getRewardInfoForFarm(
|
|
530
|
+
debtFarmAddress,
|
|
531
|
+
totalBorrowAmount,
|
|
532
|
+
getRewardPrice
|
|
533
|
+
);
|
|
529
534
|
}
|
|
530
535
|
|
|
531
536
|
return result;
|
|
@@ -28,6 +28,7 @@ export type RepayWithCollIxsResponse<QuoteResponse> = {
|
|
|
28
28
|
flashLoanInfo: FlashLoanInfo;
|
|
29
29
|
swapInputs: SwapInputs;
|
|
30
30
|
initialInputs: RepayWithCollInitialInputs<QuoteResponse>;
|
|
31
|
+
quote?: QuoteResponse;
|
|
31
32
|
};
|
|
32
33
|
|
|
33
34
|
export type RepayWithCollInitialInputs<QuoteResponse> = {
|
|
@@ -129,6 +130,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
|
|
|
129
130
|
preActionIxs: [],
|
|
130
131
|
swapIxs: [],
|
|
131
132
|
lookupTables: [],
|
|
133
|
+
quote: {} as SwapQuote<QuoteResponse>,
|
|
132
134
|
},
|
|
133
135
|
isClosingPosition,
|
|
134
136
|
repayAmountLamports,
|
|
@@ -193,7 +195,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
|
|
|
193
195
|
scopeRefreshConfig,
|
|
194
196
|
useV2Ixs,
|
|
195
197
|
logger = console.log,
|
|
196
|
-
}: RepayWithCollIxsProps<QuoteResponse>): Promise<RepayWithCollIxsResponse<QuoteResponse
|
|
198
|
+
}: RepayWithCollIxsProps<QuoteResponse>): Promise<Array<RepayWithCollIxsResponse<QuoteResponse>>> {
|
|
197
199
|
const { swapInputs, initialInputs } = await getRepayWithCollSwapInputs({
|
|
198
200
|
collTokenMint,
|
|
199
201
|
currentSlot,
|
|
@@ -234,33 +236,39 @@ export async function getRepayWithCollIxs<QuoteResponse>({
|
|
|
234
236
|
.div(actualSwapInLamports.div(collReserve.getMintFactor()))} ${debtReserve.symbol}/${collReserve.symbol}`
|
|
235
237
|
);
|
|
236
238
|
|
|
237
|
-
const
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
239
|
+
const swapResponses = await swapper(swapInputs, initialInputs.klendAccounts, swapQuote);
|
|
240
|
+
|
|
241
|
+
return Promise.all(
|
|
242
|
+
swapResponses.map(async (swapResponse) => {
|
|
243
|
+
const ixs: LeverageIxsOutput = await buildRepayWithCollateralIxs(
|
|
244
|
+
kaminoMarket,
|
|
245
|
+
debtReserve,
|
|
246
|
+
collReserve,
|
|
247
|
+
obligation,
|
|
248
|
+
referrer,
|
|
249
|
+
currentSlot,
|
|
250
|
+
budgetAndPriorityFeeIxs,
|
|
251
|
+
scopeRefreshConfig,
|
|
252
|
+
swapResponse,
|
|
253
|
+
isClosingPosition,
|
|
254
|
+
debtRepayAmountLamports,
|
|
255
|
+
swapInputs.inputAmountLamports,
|
|
256
|
+
useV2Ixs
|
|
257
|
+
);
|
|
258
|
+
|
|
259
|
+
return {
|
|
260
|
+
ixs: ixs.instructions,
|
|
261
|
+
lookupTables: swapResponse.lookupTables,
|
|
262
|
+
swapInputs,
|
|
263
|
+
flashLoanInfo: ixs.flashLoanInfo,
|
|
264
|
+
initialInputs,
|
|
265
|
+
quote: swapResponse.quote.quoteResponse,
|
|
266
|
+
};
|
|
267
|
+
})
|
|
252
268
|
);
|
|
253
|
-
|
|
254
|
-
return {
|
|
255
|
-
ixs: ixs.instructions,
|
|
256
|
-
lookupTables: swapResponse.lookupTables,
|
|
257
|
-
swapInputs,
|
|
258
|
-
flashLoanInfo: ixs.flashLoanInfo,
|
|
259
|
-
initialInputs,
|
|
260
|
-
};
|
|
261
269
|
}
|
|
262
270
|
|
|
263
|
-
async function buildRepayWithCollateralIxs(
|
|
271
|
+
async function buildRepayWithCollateralIxs<QuoteResponse>(
|
|
264
272
|
market: KaminoMarket,
|
|
265
273
|
debtReserve: KaminoReserve,
|
|
266
274
|
collReserve: KaminoReserve,
|
|
@@ -269,7 +277,7 @@ async function buildRepayWithCollateralIxs(
|
|
|
269
277
|
currentSlot: number,
|
|
270
278
|
budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
|
|
271
279
|
scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
|
|
272
|
-
swapQuoteIxs: SwapIxs
|
|
280
|
+
swapQuoteIxs: SwapIxs<QuoteResponse>,
|
|
273
281
|
isClosingPosition: boolean,
|
|
274
282
|
debtRepayAmountLamports: Decimal,
|
|
275
283
|
collWithdrawLamports: Decimal,
|
|
@@ -145,7 +145,7 @@ export interface SwapCollIxsOutputs<QuoteResponse> {
|
|
|
145
145
|
*/
|
|
146
146
|
export async function getSwapCollIxs<QuoteResponse>(
|
|
147
147
|
inputs: SwapCollIxsInputs<QuoteResponse>
|
|
148
|
-
): Promise<SwapCollIxsOutputs<QuoteResponse
|
|
148
|
+
): Promise<Array<SwapCollIxsOutputs<QuoteResponse>>> {
|
|
149
149
|
const [args, context] = extractArgsAndContext(inputs);
|
|
150
150
|
|
|
151
151
|
// Conceptually, we need to construct the following ixs:
|
|
@@ -165,33 +165,37 @@ export async function getSwapCollIxs<QuoteResponse>(
|
|
|
165
165
|
const klendAccounts = uniqueAccountsWithProgramIds(listIxs(fakeKlendIxs));
|
|
166
166
|
|
|
167
167
|
// Construct the external swap ixs (and learn the actual swap-out amount):
|
|
168
|
-
const
|
|
168
|
+
const externalSwapIxsArray = await getExternalSwapIxs(args, klendAccounts, context);
|
|
169
169
|
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
170
|
+
return Promise.all(
|
|
171
|
+
externalSwapIxsArray.map(async (externalSwapIxs) => {
|
|
172
|
+
// We now have the full information needed to simulate the end-state, so let's check that the operation is legal:
|
|
173
|
+
context.logger(
|
|
174
|
+
`Expected to swap ${args.sourceCollSwapAmount} ${context.sourceCollReserve.symbol} collateral into ${externalSwapIxs.swapOutAmount} ${context.targetCollReserve.symbol} collateral`
|
|
175
|
+
);
|
|
176
|
+
checkResultingObligationValid(args, externalSwapIxs.swapOutAmount, context);
|
|
177
|
+
|
|
178
|
+
// Construct the Klend's own ixs with an actual swap-out amount:
|
|
179
|
+
const klendIxs = await getKlendIxs(args, externalSwapIxs.swapOutAmount, context);
|
|
180
|
+
|
|
181
|
+
return {
|
|
182
|
+
ixs: listIxs(klendIxs, externalSwapIxs.ixs),
|
|
183
|
+
lookupTables: externalSwapIxs.luts,
|
|
184
|
+
useV2Ixs: context.useV2Ixs,
|
|
185
|
+
simulationDetails: {
|
|
186
|
+
flashLoan: {
|
|
187
|
+
targetCollFlashBorrowedAmount: klendIxs.simulationDetails.targetCollFlashBorrowedAmount,
|
|
188
|
+
targetCollFlashRepaidAmount: externalSwapIxs.swapOutAmount,
|
|
189
|
+
},
|
|
190
|
+
externalSwap: {
|
|
191
|
+
sourceCollSwapInAmount: args.sourceCollSwapAmount, // repeated `/inputs.sourceCollSwapAmount`, only for clarity
|
|
192
|
+
targetCollSwapOutAmount: externalSwapIxs.swapOutAmount, // repeated `../flashLoan.targetCollFlashRepaidAmount`, only for clarity
|
|
193
|
+
quoteResponse: externalSwapIxs.simulationDetails.quoteResponse,
|
|
194
|
+
},
|
|
195
|
+
},
|
|
196
|
+
};
|
|
197
|
+
})
|
|
173
198
|
);
|
|
174
|
-
checkResultingObligationValid(args, externalSwapIxs.swapOutAmount, context);
|
|
175
|
-
|
|
176
|
-
// Construct the Klend's own ixs with an actual swap-out amount:
|
|
177
|
-
const klendIxs = await getKlendIxs(args, externalSwapIxs.swapOutAmount, context);
|
|
178
|
-
|
|
179
|
-
return {
|
|
180
|
-
ixs: listIxs(klendIxs, externalSwapIxs.ixs),
|
|
181
|
-
lookupTables: externalSwapIxs.luts,
|
|
182
|
-
useV2Ixs: context.useV2Ixs,
|
|
183
|
-
simulationDetails: {
|
|
184
|
-
flashLoan: {
|
|
185
|
-
targetCollFlashBorrowedAmount: klendIxs.simulationDetails.targetCollFlashBorrowedAmount,
|
|
186
|
-
targetCollFlashRepaidAmount: externalSwapIxs.swapOutAmount,
|
|
187
|
-
},
|
|
188
|
-
externalSwap: {
|
|
189
|
-
sourceCollSwapInAmount: args.sourceCollSwapAmount, // repeated `/inputs.sourceCollSwapAmount`, only for clarity
|
|
190
|
-
targetCollSwapOutAmount: externalSwapIxs.swapOutAmount, // repeated `../flashLoan.targetCollFlashRepaidAmount`, only for clarity
|
|
191
|
-
quoteResponse: externalSwapIxs.simulationDetails.quoteResponse,
|
|
192
|
-
},
|
|
193
|
-
},
|
|
194
|
-
};
|
|
195
199
|
}
|
|
196
200
|
|
|
197
201
|
type SwapCollArgs = {
|
|
@@ -508,7 +512,7 @@ async function getExternalSwapIxs<QuoteResponse>(
|
|
|
508
512
|
args: SwapCollArgs,
|
|
509
513
|
klendAccounts: PublicKey[],
|
|
510
514
|
context: SwapCollContext<QuoteResponse>
|
|
511
|
-
): Promise<ExternalSwapIxs<QuoteResponse
|
|
515
|
+
): Promise<Array<ExternalSwapIxs<QuoteResponse>>> {
|
|
512
516
|
const externalSwapInputs = {
|
|
513
517
|
inputAmountLamports: args.sourceCollSwapAmount.mul(context.sourceCollReserve.getMintFactor()),
|
|
514
518
|
inputMint: context.sourceCollReserve.getLiquidityMint(),
|
|
@@ -516,17 +520,20 @@ async function getExternalSwapIxs<QuoteResponse>(
|
|
|
516
520
|
amountDebtAtaBalance: undefined, // only used for kTokens
|
|
517
521
|
};
|
|
518
522
|
const externalSwapQuote = await context.quoter(externalSwapInputs, klendAccounts);
|
|
519
|
-
const swapOutAmount = externalSwapQuote.priceAInB.mul(args.sourceCollSwapAmount);
|
|
520
523
|
const externalSwapIxsAndLuts = await context.swapper(externalSwapInputs, klendAccounts, externalSwapQuote);
|
|
524
|
+
|
|
521
525
|
// Note: we can ignore the returned `preActionIxs` field - we do not request any of them from the swapper.
|
|
522
|
-
return {
|
|
523
|
-
swapOutAmount
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
526
|
+
return externalSwapIxsAndLuts.map((externalSwapIxsAndLuts) => {
|
|
527
|
+
const swapOutAmount = externalSwapIxsAndLuts.quote.priceAInB.mul(args.sourceCollSwapAmount);
|
|
528
|
+
return {
|
|
529
|
+
swapOutAmount,
|
|
530
|
+
ixs: externalSwapIxsAndLuts.swapIxs,
|
|
531
|
+
luts: externalSwapIxsAndLuts.lookupTables,
|
|
532
|
+
simulationDetails: {
|
|
533
|
+
quoteResponse: externalSwapIxsAndLuts.quote.quoteResponse,
|
|
534
|
+
},
|
|
535
|
+
};
|
|
536
|
+
});
|
|
530
537
|
}
|
|
531
538
|
|
|
532
539
|
function checkResultingObligationValid(
|