@haven-fi/solauto-sdk 1.0.582 → 1.0.584
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/constants/solautoConstants.d.ts +1 -0
- package/dist/constants/solautoConstants.d.ts.map +1 -1
- package/dist/constants/solautoConstants.js +4 -10
- package/dist/generated/accounts/solautoPosition.js +2 -2
- package/dist/generated/errors/solauto.d.ts +14 -2
- package/dist/generated/errors/solauto.d.ts.map +1 -1
- package/dist/generated/errors/solauto.js +27 -5
- package/dist/generated/instructions/claimReferralFees.d.ts +1 -1
- package/dist/generated/instructions/claimReferralFees.d.ts.map +1 -1
- package/dist/generated/instructions/closePosition.d.ts +1 -1
- package/dist/generated/instructions/closePosition.d.ts.map +1 -1
- package/dist/generated/instructions/closePosition.js +2 -2
- package/dist/generated/instructions/marginfiOpenPosition.d.ts +1 -3
- package/dist/generated/instructions/marginfiOpenPosition.d.ts.map +1 -1
- package/dist/generated/instructions/marginfiOpenPosition.js +0 -1
- package/dist/generated/instructions/marginfiRebalance.d.ts +7 -3
- package/dist/generated/instructions/marginfiRebalance.d.ts.map +1 -1
- package/dist/generated/instructions/marginfiRebalance.js +3 -1
- package/dist/generated/types/index.d.ts +7 -1
- package/dist/generated/types/index.d.ts.map +1 -1
- package/dist/generated/types/index.js +7 -1
- package/dist/generated/types/positionData.d.ts +2 -2
- package/dist/generated/types/positionData.d.ts.map +1 -1
- package/dist/generated/types/positionData.js +1 -1
- package/dist/generated/types/positionState.d.ts +7 -7
- package/dist/generated/types/positionState.d.ts.map +1 -1
- package/dist/generated/types/positionState.js +3 -3
- package/dist/generated/types/{positionTokenUsage.d.ts → positionTokenState.d.ts} +6 -8
- package/dist/generated/types/positionTokenState.d.ts.map +1 -0
- package/dist/generated/types/{positionTokenUsage.js → positionTokenState.js} +6 -7
- package/dist/generated/types/rebalanceData.d.ts +7 -13
- package/dist/generated/types/rebalanceData.d.ts.map +1 -1
- package/dist/generated/types/rebalanceData.js +3 -6
- package/dist/generated/types/rebalanceDirection.d.ts +3 -2
- package/dist/generated/types/rebalanceDirection.d.ts.map +1 -1
- package/dist/generated/types/rebalanceDirection.js +3 -2
- package/dist/generated/types/rebalanceInstructionData.d.ts +27 -0
- package/dist/generated/types/rebalanceInstructionData.d.ts.map +1 -0
- package/dist/generated/types/rebalanceInstructionData.js +22 -0
- package/dist/generated/types/rebalanceStateValues.d.ts +27 -0
- package/dist/generated/types/rebalanceStateValues.d.ts.map +1 -0
- package/dist/generated/types/rebalanceStateValues.js +22 -0
- package/dist/generated/types/rebalanceStep.d.ts +15 -0
- package/dist/generated/types/rebalanceStep.d.ts.map +1 -0
- package/dist/generated/types/rebalanceStep.js +22 -0
- package/dist/generated/types/solautoRebalanceType.d.ts +4 -5
- package/dist/generated/types/solautoRebalanceType.d.ts.map +1 -1
- package/dist/generated/types/solautoRebalanceType.js +4 -5
- package/dist/generated/types/solautoSettingsParameters.d.ts +2 -15
- package/dist/generated/types/solautoSettingsParameters.d.ts.map +1 -1
- package/dist/generated/types/solautoSettingsParameters.js +1 -5
- package/dist/generated/types/solautoSettingsParametersInp.d.ts +1 -12
- package/dist/generated/types/solautoSettingsParametersInp.d.ts.map +1 -1
- package/dist/generated/types/solautoSettingsParametersInp.js +0 -3
- package/dist/generated/types/swapType.d.ts +15 -0
- package/dist/generated/types/swapType.d.ts.map +1 -0
- package/dist/generated/types/swapType.js +22 -0
- package/dist/generated/types/tokenBalanceChange.d.ts +21 -0
- package/dist/generated/types/tokenBalanceChange.d.ts.map +1 -0
- package/dist/generated/types/tokenBalanceChange.js +19 -0
- package/dist/generated/types/tokenBalanceChangeType.d.ts +18 -0
- package/dist/generated/types/tokenBalanceChangeType.d.ts.map +1 -0
- package/dist/generated/types/tokenBalanceChangeType.js +25 -0
- package/dist/generated/types/updatePositionData.d.ts +2 -2
- package/dist/generated/types/updatePositionData.d.ts.map +1 -1
- package/dist/generated/types/updatePositionData.js +1 -1
- package/dist/index.d.ts +8 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -5
- package/dist/marginfi-sdk/types/interestRateConfig.d.ts +3 -1
- package/dist/marginfi-sdk/types/interestRateConfig.d.ts.map +1 -1
- package/dist/marginfi-sdk/types/interestRateConfig.js +2 -1
- package/dist/services/flashLoans/flProviderAggregator.d.ts +19 -0
- package/dist/services/flashLoans/flProviderAggregator.d.ts.map +1 -0
- package/dist/services/flashLoans/flProviderAggregator.js +46 -0
- package/dist/services/flashLoans/flProviderBase.d.ts +23 -0
- package/dist/services/flashLoans/flProviderBase.d.ts.map +1 -0
- package/dist/services/flashLoans/flProviderBase.js +37 -0
- package/dist/services/flashLoans/index.d.ts +4 -0
- package/dist/services/flashLoans/index.d.ts.map +1 -0
- package/dist/services/flashLoans/index.js +19 -0
- package/dist/services/flashLoans/marginfiFlProvider.d.ts +25 -0
- package/dist/services/flashLoans/marginfiFlProvider.d.ts.map +1 -0
- package/dist/services/flashLoans/marginfiFlProvider.js +246 -0
- package/dist/services/index.d.ts +6 -0
- package/dist/services/index.d.ts.map +1 -0
- package/dist/services/index.js +21 -0
- package/dist/services/rebalance/index.d.ts +3 -0
- package/dist/services/rebalance/index.d.ts.map +1 -0
- package/dist/services/rebalance/index.js +18 -0
- package/dist/services/rebalance/rebalanceSwapManager.d.ts +30 -0
- package/dist/services/rebalance/rebalanceSwapManager.d.ts.map +1 -0
- package/dist/services/rebalance/rebalanceSwapManager.js +144 -0
- package/dist/services/rebalance/rebalanceTxBuilder.d.ts +22 -0
- package/dist/services/rebalance/rebalanceTxBuilder.d.ts.map +1 -0
- package/dist/services/rebalance/rebalanceTxBuilder.js +200 -0
- package/dist/services/rebalance/rebalanceValues.d.ts +31 -0
- package/dist/services/rebalance/rebalanceValues.d.ts.map +1 -0
- package/dist/services/rebalance/rebalanceValues.js +118 -0
- package/dist/services/rebalance/solautoFees.d.ts +13 -0
- package/dist/services/rebalance/solautoFees.d.ts.map +1 -0
- package/dist/services/rebalance/solautoFees.js +54 -0
- package/dist/services/solauto/index.d.ts +5 -0
- package/dist/services/solauto/index.d.ts.map +1 -0
- package/dist/{clients → services/solauto}/referralStateManager.d.ts +4 -5
- package/dist/services/solauto/referralStateManager.d.ts.map +1 -0
- package/dist/{clients → services/solauto}/referralStateManager.js +10 -12
- package/dist/services/solauto/solautoClient.d.ts +59 -0
- package/dist/services/solauto/solautoClient.d.ts.map +1 -0
- package/dist/{clients → services/solauto}/solautoClient.js +78 -109
- package/dist/services/solauto/solautoMarginfiClient.d.ts +34 -0
- package/dist/services/solauto/solautoMarginfiClient.d.ts.map +1 -0
- package/dist/services/solauto/solautoMarginfiClient.js +322 -0
- package/dist/{clients → services/solauto}/txHandler.d.ts +11 -2
- package/dist/services/solauto/txHandler.d.ts.map +1 -0
- package/dist/services/solauto/txHandler.js +38 -0
- package/dist/services/swap/index.d.ts +2 -0
- package/dist/services/swap/index.d.ts.map +1 -0
- package/dist/{utils/solauto → services/swap}/index.js +1 -2
- package/dist/services/swap/jupSwapManager.d.ts +37 -0
- package/dist/services/swap/jupSwapManager.d.ts.map +1 -0
- package/dist/services/swap/jupSwapManager.js +108 -0
- package/dist/services/transactions/index.d.ts.map +1 -0
- package/dist/{transactions → services/transactions}/transactionUtils.d.ts +3 -5
- package/dist/services/transactions/transactionUtils.d.ts.map +1 -0
- package/dist/{transactions → services/transactions}/transactionUtils.js +29 -137
- package/dist/{transactions → services/transactions}/transactionsManager.d.ts +4 -4
- package/dist/services/transactions/transactionsManager.d.ts.map +1 -0
- package/dist/{transactions → services/transactions}/transactionsManager.js +10 -8
- package/dist/solautoPosition/index.d.ts +4 -0
- package/dist/solautoPosition/index.d.ts.map +1 -0
- package/dist/solautoPosition/index.js +19 -0
- package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts +14 -0
- package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts.map +1 -0
- package/dist/solautoPosition/marginfiSolautoPositionEx.js +73 -0
- package/dist/solautoPosition/solautoPositionEx.d.ts +67 -0
- package/dist/solautoPosition/solautoPositionEx.d.ts.map +1 -0
- package/dist/solautoPosition/solautoPositionEx.js +143 -0
- package/dist/solautoPosition/utils.d.ts +17 -0
- package/dist/solautoPosition/utils.d.ts.map +1 -0
- package/dist/solautoPosition/utils.js +115 -0
- package/dist/types/solauto.d.ts +19 -1
- package/dist/types/solauto.d.ts.map +1 -1
- package/dist/utils/generalUtils.d.ts +1 -0
- package/dist/utils/generalUtils.d.ts.map +1 -1
- package/dist/utils/generalUtils.js +9 -1
- package/dist/utils/index.d.ts +1 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -1
- package/dist/utils/jitoUtils.d.ts.map +1 -1
- package/dist/utils/jupiterUtils.d.ts +3 -28
- package/dist/utils/jupiterUtils.d.ts.map +1 -1
- package/dist/utils/jupiterUtils.js +2 -73
- package/dist/utils/marginfiUtils.d.ts +4 -3
- package/dist/utils/marginfiUtils.d.ts.map +1 -1
- package/dist/utils/marginfiUtils.js +47 -18
- package/dist/utils/numberUtils.d.ts +3 -6
- package/dist/utils/numberUtils.d.ts.map +1 -1
- package/dist/utils/numberUtils.js +13 -48
- package/dist/utils/solanaUtils.js +2 -2
- package/dist/utils/{solauto/generalUtils.d.ts → solautoUtils.d.ts} +9 -16
- package/dist/utils/solautoUtils.d.ts.map +1 -0
- package/dist/utils/{solauto/generalUtils.js → solautoUtils.js} +49 -173
- package/local/createTokenAccounts.ts +1 -5
- package/local/logPositions.ts +22 -68
- package/local/shared.ts +29 -24
- package/local/txSandbox.ts +66 -0
- package/local/updateMarginfiLUT.ts +80 -4
- package/package.json +3 -6
- package/src/constants/solautoConstants.ts +4 -9
- package/src/generated/accounts/solautoPosition.ts +2 -2
- package/src/generated/errors/solauto.ts +45 -4
- package/src/generated/instructions/claimReferralFees.ts +1 -1
- package/src/generated/instructions/closePosition.ts +3 -3
- package/src/generated/instructions/marginfiOpenPosition.ts +0 -7
- package/src/generated/instructions/marginfiRebalance.ts +12 -3
- package/src/generated/types/index.ts +7 -1
- package/src/generated/types/positionData.ts +3 -3
- package/src/generated/types/positionState.ts +12 -12
- package/src/generated/types/{positionTokenUsage.ts → positionTokenState.ts} +13 -16
- package/src/generated/types/rebalanceData.ts +16 -27
- package/src/generated/types/rebalanceDirection.ts +1 -0
- package/src/generated/types/rebalanceInstructionData.ts +62 -0
- package/src/generated/types/rebalanceStateValues.ts +59 -0
- package/src/generated/types/rebalanceStep.ts +25 -0
- package/src/generated/types/solautoRebalanceType.ts +0 -1
- package/src/generated/types/solautoSettingsParameters.ts +4 -25
- package/src/generated/types/solautoSettingsParametersInp.ts +2 -24
- package/src/generated/types/swapType.ts +22 -0
- package/src/generated/types/tokenBalanceChange.ts +46 -0
- package/src/generated/types/tokenBalanceChangeType.ts +28 -0
- package/src/generated/types/updatePositionData.ts +3 -3
- package/src/index.ts +8 -8
- package/src/marginfi-sdk/types/interestRateConfig.ts +6 -2
- package/src/services/flashLoans/flProviderAggregator.ts +74 -0
- package/src/services/flashLoans/flProviderBase.ts +88 -0
- package/src/services/flashLoans/index.ts +3 -0
- package/src/services/flashLoans/marginfiFlProvider.ts +392 -0
- package/src/services/index.ts +5 -0
- package/src/services/rebalance/index.ts +2 -0
- package/src/services/rebalance/rebalanceSwapManager.ts +218 -0
- package/src/services/rebalance/rebalanceTxBuilder.ts +330 -0
- package/src/services/rebalance/rebalanceValues.ts +232 -0
- package/src/services/rebalance/solautoFees.ts +61 -0
- package/src/services/solauto/index.ts +4 -0
- package/src/{clients → services/solauto}/referralStateManager.ts +17 -31
- package/src/{clients → services/solauto}/solautoClient.ts +142 -205
- package/src/services/solauto/solautoMarginfiClient.ts +472 -0
- package/src/services/solauto/txHandler.ts +69 -0
- package/src/services/swap/index.ts +1 -0
- package/src/services/swap/jupSwapManager.ts +189 -0
- package/src/{transactions → services/transactions}/transactionUtils.ts +40 -280
- package/src/{transactions → services/transactions}/transactionsManager.ts +15 -10
- package/src/solautoPosition/index.ts +3 -0
- package/src/solautoPosition/marginfiSolautoPositionEx.ts +111 -0
- package/src/solautoPosition/solautoPositionEx.ts +281 -0
- package/src/solautoPosition/utils.ts +188 -0
- package/src/types/solauto.ts +30 -2
- package/src/utils/generalUtils.ts +9 -1
- package/src/utils/index.ts +2 -2
- package/src/utils/jitoUtils.ts +0 -4
- package/src/utils/jupiterUtils.ts +3 -164
- package/src/utils/marginfiUtils.ts +77 -43
- package/src/utils/numberUtils.ts +18 -77
- package/src/utils/solanaUtils.ts +1 -1
- package/src/utils/{solauto/generalUtils.ts → solautoUtils.ts} +67 -288
- package/tests/transactions/shared.ts +135 -0
- package/tests/transactions/solautoMarginfi.ts +8 -198
- package/tests/unit/accounts.ts +3 -10
- package/tests/unit/lookupTables.ts +23 -2
- package/tests/unit/rebalanceCalculations.ts +65 -343
- package/dist/clients/index.d.ts +0 -5
- package/dist/clients/index.d.ts.map +0 -1
- package/dist/clients/referralStateManager.d.ts.map +0 -1
- package/dist/clients/solautoClient.d.ts +0 -71
- package/dist/clients/solautoClient.d.ts.map +0 -1
- package/dist/clients/solautoMarginfiClient.d.ts +0 -51
- package/dist/clients/solautoMarginfiClient.d.ts.map +0 -1
- package/dist/clients/solautoMarginfiClient.js +0 -497
- package/dist/clients/txHandler.d.ts.map +0 -1
- package/dist/clients/txHandler.js +0 -23
- package/dist/generated/types/positionTokenUsage.d.ts.map +0 -1
- package/dist/transactions/index.d.ts.map +0 -1
- package/dist/transactions/transactionUtils.d.ts.map +0 -1
- package/dist/transactions/transactionsManager.d.ts.map +0 -1
- package/dist/utils/solauto/generalUtils.d.ts.map +0 -1
- package/dist/utils/solauto/index.d.ts +0 -3
- package/dist/utils/solauto/index.d.ts.map +0 -1
- package/dist/utils/solauto/rebalanceUtils.d.ts +0 -30
- package/dist/utils/solauto/rebalanceUtils.d.ts.map +0 -1
- package/dist/utils/solauto/rebalanceUtils.js +0 -287
- package/src/clients/index.ts +0 -4
- package/src/clients/solautoMarginfiClient.ts +0 -774
- package/src/clients/txHandler.ts +0 -38
- package/src/utils/solauto/index.ts +0 -2
- package/src/utils/solauto/rebalanceUtils.ts +0 -562
- package/dist/{clients → services/solauto}/index.js +2 -2
- /package/dist/{transactions → services/transactions}/index.d.ts +0 -0
- /package/dist/{transactions → services/transactions}/index.js +0 -0
- /package/src/{transactions → services/transactions}/index.ts +0 -0
@@ -0,0 +1,46 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.FlProviderAggregator = void 0;
|
4
|
+
const flProviderBase_1 = require("./flProviderBase");
|
5
|
+
const marginfiFlProvider_1 = require("./marginfiFlProvider");
|
6
|
+
class FlProviderAggregator extends flProviderBase_1.FlProviderBase {
|
7
|
+
constructor(umi, signer, supplyMint, debtMint) {
|
8
|
+
super(umi, signer, supplyMint, debtMint);
|
9
|
+
this.marginfiFlProvider = new marginfiFlProvider_1.MarginfiFlProvider(umi, signer, supplyMint, debtMint);
|
10
|
+
}
|
11
|
+
async initialize() {
|
12
|
+
// TODO: PF
|
13
|
+
// Once we have more than one, set the right fl provider for each liquidity source
|
14
|
+
await this.marginfiFlProvider.initialize();
|
15
|
+
}
|
16
|
+
async flAccountPrereqIxs() {
|
17
|
+
return await this.marginfiFlProvider.initializeIMfiAccounts();
|
18
|
+
}
|
19
|
+
otherSigners() {
|
20
|
+
// TODO: PF
|
21
|
+
return [...this.flSigners, ...this.marginfiFlProvider.otherSigners()];
|
22
|
+
}
|
23
|
+
lutAccountsToAdd() {
|
24
|
+
return [
|
25
|
+
...super.lutAccountsToAdd(),
|
26
|
+
...this.marginfiFlProvider.lutAccountsToAdd(),
|
27
|
+
];
|
28
|
+
}
|
29
|
+
flProvider(source) {
|
30
|
+
// TODO: PF
|
31
|
+
return this.marginfiFlProvider;
|
32
|
+
}
|
33
|
+
liquidityAvailable(source) {
|
34
|
+
return this.flProvider(source).liquidityAvailable(source);
|
35
|
+
}
|
36
|
+
flFeeBps(source, signerFlashLoan) {
|
37
|
+
return this.flProvider(source).flFeeBps(source);
|
38
|
+
}
|
39
|
+
flashBorrow(flashLoan, destTokenAccount) {
|
40
|
+
return this.flProvider(flashLoan.liquiditySource).flashBorrow(flashLoan, destTokenAccount);
|
41
|
+
}
|
42
|
+
flashRepay(flashLoan) {
|
43
|
+
return this.flProvider(flashLoan.liquiditySource).flashRepay(flashLoan);
|
44
|
+
}
|
45
|
+
}
|
46
|
+
exports.FlProviderAggregator = FlProviderAggregator;
|
@@ -0,0 +1,23 @@
|
|
1
|
+
import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
|
2
|
+
import { PublicKey } from "@solana/web3.js";
|
3
|
+
import { TokenType } from "../../generated";
|
4
|
+
import { FlashLoanDetails } from "../../types";
|
5
|
+
export declare abstract class FlProviderBase {
|
6
|
+
protected umi: Umi;
|
7
|
+
protected signer: Signer;
|
8
|
+
protected supplyMint: PublicKey;
|
9
|
+
protected debtMint: PublicKey;
|
10
|
+
protected flSigners: Signer[];
|
11
|
+
constructor(umi: Umi, signer: Signer, supplyMint: PublicKey, debtMint: PublicKey);
|
12
|
+
abstract initialize(): Promise<void>;
|
13
|
+
lutAccountsToAdd(): PublicKey[];
|
14
|
+
otherSigners(): Signer[];
|
15
|
+
mint(source: TokenType): PublicKey;
|
16
|
+
abstract liquidityAvailable(source: TokenType): bigint;
|
17
|
+
liquidityAvailableUsd(source: TokenType): number;
|
18
|
+
abstract flFeeBps(source: TokenType, signerFlashLoan?: boolean): number;
|
19
|
+
abstract flashBorrow(flashLoan: FlashLoanDetails, destTokenAccount: PublicKey): TransactionBuilder;
|
20
|
+
abstract flashRepay(flashLoan: FlashLoanDetails): TransactionBuilder;
|
21
|
+
protected signerFlashBorrow(flashLoan: FlashLoanDetails, destTokenAccount: PublicKey): TransactionBuilder;
|
22
|
+
}
|
23
|
+
//# sourceMappingURL=flProviderBase.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"flProviderBase.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/flProviderBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAEN,kBAAkB,EAClB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,8BAAsB,cAAc;IAIhC,SAAS,CAAC,GAAG,EAAE,GAAG;IAClB,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,UAAU,EAAE,SAAS;IAC/B,SAAS,CAAC,QAAQ,EAAE,SAAS;IAN/B,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,CAAM;gBAGvB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS;IAG/B,QAAQ,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAEpC,gBAAgB,IAAI,SAAS,EAAE;IAI/B,YAAY,IAAI,MAAM,EAAE;IAIxB,IAAI,CAAC,MAAM,EAAE,SAAS;IAItB,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IACtD,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAShD,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IACvE,QAAQ,CAAC,WAAW,CAClB,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IACrB,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAEpE,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;CAyBtB"}
|
@@ -0,0 +1,37 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.FlProviderBase = void 0;
|
4
|
+
const umi_1 = require("@metaplex-foundation/umi");
|
5
|
+
const utils_1 = require("../../utils");
|
6
|
+
const generated_1 = require("../../generated");
|
7
|
+
const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
|
8
|
+
class FlProviderBase {
|
9
|
+
constructor(umi, signer, supplyMint, debtMint) {
|
10
|
+
this.umi = umi;
|
11
|
+
this.signer = signer;
|
12
|
+
this.supplyMint = supplyMint;
|
13
|
+
this.debtMint = debtMint;
|
14
|
+
this.flSigners = [];
|
15
|
+
}
|
16
|
+
lutAccountsToAdd() {
|
17
|
+
return [];
|
18
|
+
}
|
19
|
+
otherSigners() {
|
20
|
+
return this.flSigners;
|
21
|
+
}
|
22
|
+
mint(source) {
|
23
|
+
return source === generated_1.TokenType.Supply ? this.supplyMint : this.debtMint;
|
24
|
+
}
|
25
|
+
liquidityAvailableUsd(source) {
|
26
|
+
return ((0, utils_1.fromBaseUnit)(this.liquidityAvailable(source), (0, utils_1.tokenInfo)(this.mint(source)).decimals) * ((0, utils_1.safeGetPrice)(this.mint(source)) ?? 0));
|
27
|
+
}
|
28
|
+
signerFlashBorrow(flashLoan, destTokenAccount) {
|
29
|
+
if (!destTokenAccount.equals((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoan.mint))) {
|
30
|
+
return (0, umi_1.transactionBuilder)().add((0, utils_1.splTokenTransferUmiIx)(this.signer, (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoan.mint), destTokenAccount, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoan.baseUnitAmount));
|
31
|
+
}
|
32
|
+
else {
|
33
|
+
return (0, umi_1.transactionBuilder)();
|
34
|
+
}
|
35
|
+
}
|
36
|
+
}
|
37
|
+
exports.FlProviderBase = FlProviderBase;
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC"}
|
@@ -0,0 +1,19 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
15
|
+
};
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
17
|
+
__exportStar(require("./flProviderAggregator"), exports);
|
18
|
+
__exportStar(require("./flProviderBase"), exports);
|
19
|
+
__exportStar(require("./marginfiFlProvider"), exports);
|
@@ -0,0 +1,25 @@
|
|
1
|
+
import { TransactionBuilder } from "@metaplex-foundation/umi";
|
2
|
+
import { FlProviderBase } from "./flProviderBase";
|
3
|
+
import { PublicKey } from "@solana/web3.js";
|
4
|
+
import { TokenType } from "../../generated";
|
5
|
+
import { FlashLoanDetails } from "../../types";
|
6
|
+
export declare class MarginfiFlProvider extends FlProviderBase {
|
7
|
+
private existingMarginfiAccounts;
|
8
|
+
private supplyBankLiquiditySource;
|
9
|
+
private debtBankLiquiditySource;
|
10
|
+
private supplyImfiAccount;
|
11
|
+
private debtImfiAccount;
|
12
|
+
initialize(): Promise<void>;
|
13
|
+
private setAvailableBanks;
|
14
|
+
private setIntermediaryAccount;
|
15
|
+
initializeIMfiAccounts(): Promise<TransactionBuilder>;
|
16
|
+
lutAccountsToAdd(): PublicKey[];
|
17
|
+
private liquidityBank;
|
18
|
+
private iMfiAccount;
|
19
|
+
liquidityAvailable(source: TokenType): bigint;
|
20
|
+
flFeeBps(source: TokenType, signerFlashLoan?: boolean): number;
|
21
|
+
flashBorrow(flashLoan: FlashLoanDetails, destTokenAccount: PublicKey): TransactionBuilder;
|
22
|
+
flashRepay(flashLoan: FlashLoanDetails): TransactionBuilder;
|
23
|
+
closeBalance(marginfiAccount: PublicKey, bank: PublicKey, marginfiGroup: PublicKey): TransactionBuilder;
|
24
|
+
}
|
25
|
+
//# sourceMappingURL=marginfiFlProvider.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAalC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAcxE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA2C/B,OAAO,CAAC,sBAAsB;IAqCxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAW9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IA6G3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}
|
@@ -0,0 +1,246 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.MarginfiFlProvider = void 0;
|
4
|
+
const umi_1 = require("@metaplex-foundation/umi");
|
5
|
+
const constants_1 = require("../../constants");
|
6
|
+
const marginfi_sdk_1 = require("../../marginfi-sdk");
|
7
|
+
const flProviderBase_1 = require("./flProviderBase");
|
8
|
+
const web3_js_1 = require("@solana/web3.js");
|
9
|
+
const utils_1 = require("../../utils");
|
10
|
+
const generated_1 = require("../../generated");
|
11
|
+
const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
|
12
|
+
class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
|
13
|
+
async initialize() {
|
14
|
+
await this.setAvailableBanks();
|
15
|
+
this.existingMarginfiAccounts = await (0, utils_1.getEmptyMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey));
|
16
|
+
if (this.liquidityBank(generated_1.TokenType.Supply).group.toString() !==
|
17
|
+
this.liquidityBank(generated_1.TokenType.Debt).group.toString()) {
|
18
|
+
this.setIntermediaryAccount([generated_1.TokenType.Supply]);
|
19
|
+
this.setIntermediaryAccount([generated_1.TokenType.Debt]);
|
20
|
+
}
|
21
|
+
else {
|
22
|
+
this.setIntermediaryAccount([generated_1.TokenType.Supply, generated_1.TokenType.Debt]);
|
23
|
+
}
|
24
|
+
}
|
25
|
+
async setAvailableBanks() {
|
26
|
+
const availableBanks = [];
|
27
|
+
const checkIfUsable = (group, mint) => {
|
28
|
+
if (Object.keys(constants_1.MARGINFI_ACCOUNTS[group]).includes(mint.toString())) {
|
29
|
+
availableBanks.push(constants_1.MARGINFI_ACCOUNTS[group][mint.toString()].bank);
|
30
|
+
}
|
31
|
+
};
|
32
|
+
for (const group of Object.keys(constants_1.MARGINFI_ACCOUNTS)) {
|
33
|
+
checkIfUsable(group, this.supplyMint);
|
34
|
+
checkIfUsable(group, this.debtMint);
|
35
|
+
}
|
36
|
+
const banks = await (0, marginfi_sdk_1.safeFetchAllBank)(this.umi, availableBanks.map((x) => (0, umi_1.publicKey)(x)));
|
37
|
+
if (!(0, utils_1.safeGetPrice)(this.supplyMint) || !(0, utils_1.safeGetPrice)(this.debtMint)) {
|
38
|
+
await (0, utils_1.fetchTokenPrices)([this.supplyMint, this.debtMint]);
|
39
|
+
}
|
40
|
+
const mapBanksAndBalances = (mint) => banks
|
41
|
+
.filter((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.mint).equals(mint))
|
42
|
+
.map((x) => {
|
43
|
+
return [
|
44
|
+
(0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityAvailableBaseUnit)(x, false), (0, utils_1.tokenInfo)(mint).decimals) * (0, utils_1.safeGetPrice)(mint),
|
45
|
+
x,
|
46
|
+
];
|
47
|
+
})
|
48
|
+
.sort((a, b) => b[0] - a[0]);
|
49
|
+
const supplyBanks = mapBanksAndBalances(this.supplyMint);
|
50
|
+
const debtBanks = mapBanksAndBalances(this.debtMint);
|
51
|
+
this.supplyBankLiquiditySource = supplyBanks[0][1];
|
52
|
+
this.debtBankLiquiditySource = debtBanks[0][1];
|
53
|
+
}
|
54
|
+
setIntermediaryAccount(sources) {
|
55
|
+
const compatibleMarginfiAccounts = this.existingMarginfiAccounts.filter((x) => x.group.toString() == this.liquidityBank(sources[0]).group);
|
56
|
+
const signer = compatibleMarginfiAccounts.length > 0
|
57
|
+
? undefined
|
58
|
+
: (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
|
59
|
+
const accountPk = compatibleMarginfiAccounts.length > 0
|
60
|
+
? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(compatibleMarginfiAccounts[0].publicKey)
|
61
|
+
: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey);
|
62
|
+
const accountData = compatibleMarginfiAccounts.length > 0
|
63
|
+
? compatibleMarginfiAccounts[0]
|
64
|
+
: undefined;
|
65
|
+
if (signer) {
|
66
|
+
this.flSigners.push(signer);
|
67
|
+
}
|
68
|
+
(0, utils_1.consoleLog)("Intermediary MF account:", accountPk.toString());
|
69
|
+
for (const s of sources) {
|
70
|
+
const data = {
|
71
|
+
signer,
|
72
|
+
accountPk,
|
73
|
+
accountData,
|
74
|
+
};
|
75
|
+
if (s === generated_1.TokenType.Supply) {
|
76
|
+
this.supplyImfiAccount = data;
|
77
|
+
}
|
78
|
+
else {
|
79
|
+
this.debtImfiAccount = data;
|
80
|
+
}
|
81
|
+
}
|
82
|
+
}
|
83
|
+
async initializeIMfiAccounts() {
|
84
|
+
const supplyImfiAccount = this.iMfiAccount(generated_1.TokenType.Supply);
|
85
|
+
const debtImfiAccount = this.iMfiAccount(generated_1.TokenType.Debt);
|
86
|
+
const [supplyImfiRpcAccount, debtImfiRpcAccount] = await this.umi.rpc.getAccounts([
|
87
|
+
(0, umi_1.publicKey)(supplyImfiAccount.accountPk),
|
88
|
+
(0, umi_1.publicKey)(debtImfiAccount.accountPk),
|
89
|
+
]);
|
90
|
+
let tx = (0, umi_1.transactionBuilder)();
|
91
|
+
if (!(0, utils_1.rpcAccountCreated)(supplyImfiRpcAccount)) {
|
92
|
+
tx = tx.add((0, marginfi_sdk_1.marginfiAccountInitialize)(this.umi, {
|
93
|
+
marginfiAccount: supplyImfiAccount.signer,
|
94
|
+
marginfiGroup: this.supplyBankLiquiditySource.group,
|
95
|
+
authority: this.signer,
|
96
|
+
feePayer: this.signer,
|
97
|
+
}));
|
98
|
+
}
|
99
|
+
if (supplyImfiAccount.accountPk.toString() !==
|
100
|
+
debtImfiAccount.accountPk.toString() &&
|
101
|
+
!(0, utils_1.rpcAccountCreated)(debtImfiRpcAccount)) {
|
102
|
+
tx = tx.add((0, marginfi_sdk_1.marginfiAccountInitialize)(this.umi, {
|
103
|
+
marginfiAccount: debtImfiAccount.signer,
|
104
|
+
marginfiGroup: this.debtBankLiquiditySource.group,
|
105
|
+
authority: this.signer,
|
106
|
+
feePayer: this.signer,
|
107
|
+
}));
|
108
|
+
}
|
109
|
+
return tx;
|
110
|
+
}
|
111
|
+
lutAccountsToAdd() {
|
112
|
+
return [
|
113
|
+
...super.lutAccountsToAdd(),
|
114
|
+
...Array.from(new Set([
|
115
|
+
this.iMfiAccount(generated_1.TokenType.Supply).accountPk.toString(),
|
116
|
+
this.iMfiAccount(generated_1.TokenType.Debt).accountPk.toString(),
|
117
|
+
])).map((x) => new web3_js_1.PublicKey(x)),
|
118
|
+
];
|
119
|
+
}
|
120
|
+
liquidityBank(source) {
|
121
|
+
return source === generated_1.TokenType.Supply
|
122
|
+
? this.supplyBankLiquiditySource
|
123
|
+
: this.debtBankLiquiditySource;
|
124
|
+
}
|
125
|
+
iMfiAccount(source) {
|
126
|
+
return source === generated_1.TokenType.Supply
|
127
|
+
? this.supplyImfiAccount
|
128
|
+
: this.debtImfiAccount;
|
129
|
+
}
|
130
|
+
liquidityAvailable(source) {
|
131
|
+
return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.liquidityBank(source), false);
|
132
|
+
}
|
133
|
+
flFeeBps(source, signerFlashLoan) {
|
134
|
+
if (signerFlashLoan) {
|
135
|
+
return 0;
|
136
|
+
}
|
137
|
+
return (0, utils_1.bytesToI80F48)(this.liquidityBank(source).config.interestRateConfig
|
138
|
+
.protocolOriginationFee.value);
|
139
|
+
}
|
140
|
+
flashBorrow(flashLoan, destTokenAccount) {
|
141
|
+
if (flashLoan.signerFlashLoan) {
|
142
|
+
return this.signerFlashBorrow(flashLoan, destTokenAccount);
|
143
|
+
}
|
144
|
+
const bank = this.liquidityBank(flashLoan.liquiditySource);
|
145
|
+
const associatedBankAccs = (0, utils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.publicKey));
|
146
|
+
const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource);
|
147
|
+
return (0, umi_1.transactionBuilder)()
|
148
|
+
.add((0, marginfi_sdk_1.lendingAccountStartFlashloan)(this.umi, {
|
149
|
+
endIndex: 0, // We set this after building the transaction
|
150
|
+
ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
|
151
|
+
marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
|
152
|
+
signer: this.signer,
|
153
|
+
}))
|
154
|
+
.add((0, marginfi_sdk_1.lendingAccountBorrow)(this.umi, {
|
155
|
+
amount: flashLoan.baseUnitAmount,
|
156
|
+
bank: (0, umi_1.publicKey)(bank),
|
157
|
+
bankLiquidityVault: (0, umi_1.publicKey)(associatedBankAccs.liquidityVault),
|
158
|
+
bankLiquidityVaultAuthority: (0, umi_1.publicKey)(associatedBankAccs.vaultAuthority),
|
159
|
+
destinationTokenAccount: (0, umi_1.publicKey)(destTokenAccount),
|
160
|
+
marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
|
161
|
+
marginfiGroup: this.liquidityBank(flashLoan.liquiditySource).group,
|
162
|
+
signer: this.signer,
|
163
|
+
}));
|
164
|
+
}
|
165
|
+
flashRepay(flashLoan) {
|
166
|
+
if (flashLoan.signerFlashLoan) {
|
167
|
+
return (0, umi_1.transactionBuilder)();
|
168
|
+
}
|
169
|
+
const bank = this.liquidityBank(flashLoan.liquiditySource);
|
170
|
+
const associatedBankAccs = (0, utils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.publicKey));
|
171
|
+
const marginfiGroup = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.liquidityBank(flashLoan.liquiditySource).group);
|
172
|
+
const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource);
|
173
|
+
const remainingAccounts = [];
|
174
|
+
let includedFlashLoanToken = false;
|
175
|
+
if (iMfiAccount?.accountData) {
|
176
|
+
iMfiAccount.accountData.lendingAccount.balances.forEach(async (x) => {
|
177
|
+
if (x.active) {
|
178
|
+
if (x.bankPk.toString() === bank.publicKey.toString()) {
|
179
|
+
includedFlashLoanToken = true;
|
180
|
+
}
|
181
|
+
// TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
|
182
|
+
// const bankData = await safeFetchBank(this.umi, publicKey(accounts.data.bank));
|
183
|
+
// const priceOracle = bankData!.config.oracleKeys[0];
|
184
|
+
const priceOracle = (0, umi_1.publicKey)((0, utils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.bankPk)).priceOracle);
|
185
|
+
remainingAccounts.push(...[
|
186
|
+
{
|
187
|
+
pubkey: x.bankPk,
|
188
|
+
isSigner: false,
|
189
|
+
isWritable: false,
|
190
|
+
},
|
191
|
+
{
|
192
|
+
pubkey: priceOracle,
|
193
|
+
isSigner: false,
|
194
|
+
isWritable: false,
|
195
|
+
},
|
196
|
+
]);
|
197
|
+
}
|
198
|
+
});
|
199
|
+
}
|
200
|
+
if (!iMfiAccount.accountData || !includedFlashLoanToken) {
|
201
|
+
remainingAccounts.push(...[
|
202
|
+
{
|
203
|
+
pubkey: bank.publicKey,
|
204
|
+
isSigner: false,
|
205
|
+
isWritable: false,
|
206
|
+
},
|
207
|
+
{
|
208
|
+
pubkey: (0, umi_1.publicKey)(associatedBankAccs.priceOracle),
|
209
|
+
isSigner: false,
|
210
|
+
isWritable: false,
|
211
|
+
},
|
212
|
+
]);
|
213
|
+
}
|
214
|
+
const banksRequiringBalanceClose = Array.from(new Set([
|
215
|
+
bank.publicKey.toString(),
|
216
|
+
...(iMfiAccount.accountData?.lendingAccount.balances ?? [])
|
217
|
+
.filter((x) => x.active && (0, utils_1.bytesToI80F48)(x.liabilityShares.value) > 0)
|
218
|
+
.map((x) => x.bankPk.toString()),
|
219
|
+
]));
|
220
|
+
return (0, umi_1.transactionBuilder)()
|
221
|
+
.add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
|
222
|
+
amount: flashLoan.baseUnitAmount,
|
223
|
+
repayAll: null,
|
224
|
+
bank: bank.publicKey,
|
225
|
+
bankLiquidityVault: (0, umi_1.publicKey)(associatedBankAccs.liquidityVault),
|
226
|
+
marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
|
227
|
+
marginfiGroup: (0, umi_1.publicKey)(marginfiGroup),
|
228
|
+
signer: this.signer,
|
229
|
+
signerTokenAccount: (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoan.mint)),
|
230
|
+
}))
|
231
|
+
.add(banksRequiringBalanceClose.map((x) => this.closeBalance(iMfiAccount.accountPk, new web3_js_1.PublicKey(x), marginfiGroup)))
|
232
|
+
.add((0, marginfi_sdk_1.lendingAccountEndFlashloan)(this.umi, {
|
233
|
+
marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
|
234
|
+
signer: this.signer,
|
235
|
+
}).addRemainingAccounts(remainingAccounts));
|
236
|
+
}
|
237
|
+
closeBalance(marginfiAccount, bank, marginfiGroup) {
|
238
|
+
return (0, umi_1.transactionBuilder)().add((0, marginfi_sdk_1.lendingAccountCloseBalance)(this.umi, {
|
239
|
+
signer: this.signer,
|
240
|
+
marginfiAccount: (0, umi_1.publicKey)(marginfiAccount),
|
241
|
+
bank: (0, umi_1.publicKey)(bank),
|
242
|
+
marginfiGroup: (0, umi_1.publicKey)(marginfiGroup),
|
243
|
+
}));
|
244
|
+
}
|
245
|
+
}
|
246
|
+
exports.MarginfiFlProvider = MarginfiFlProvider;
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,gBAAgB,CAAC"}
|
@@ -0,0 +1,21 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
15
|
+
};
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
17
|
+
__exportStar(require("./flashLoans"), exports);
|
18
|
+
__exportStar(require("./rebalance"), exports);
|
19
|
+
__exportStar(require("./solauto"), exports);
|
20
|
+
__exportStar(require("./swap"), exports);
|
21
|
+
__exportStar(require("./transactions"), exports);
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC"}
|
@@ -0,0 +1,18 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
15
|
+
};
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
17
|
+
__exportStar(require("./rebalanceTxBuilder"), exports);
|
18
|
+
__exportStar(require("./rebalanceValues"), exports);
|
@@ -0,0 +1,30 @@
|
|
1
|
+
import { QuoteResponse } from "@jup-ag/api";
|
2
|
+
import { FlashLoanRequirements } from "../../types";
|
3
|
+
import { SolautoClient } from "../solauto";
|
4
|
+
import { SwapParams } from "../swap";
|
5
|
+
import { RebalanceValues } from "./rebalanceValues";
|
6
|
+
export declare class RebalanceSwapManager {
|
7
|
+
private client;
|
8
|
+
private values;
|
9
|
+
private flRequirements?;
|
10
|
+
private targetLiqUtilizationRateBps?;
|
11
|
+
swapParams: SwapParams;
|
12
|
+
swapQuote?: QuoteResponse;
|
13
|
+
flBorrowAmount?: bigint;
|
14
|
+
private jupSwapManager;
|
15
|
+
constructor(client: SolautoClient, values: RebalanceValues, flRequirements?: FlashLoanRequirements | undefined, targetLiqUtilizationRateBps?: number | undefined);
|
16
|
+
private isBoost;
|
17
|
+
private usdToSwap;
|
18
|
+
private postRebalanceLiqUtilizationRateBps;
|
19
|
+
private findSufficientQuote;
|
20
|
+
private swapDetails;
|
21
|
+
private bigIntWithIncrement;
|
22
|
+
setSwapParams(attemptNum: number): Promise<void>;
|
23
|
+
getSwapTxData(): Promise<{
|
24
|
+
swapQuote: QuoteResponse;
|
25
|
+
lookupTableAddresses: string[];
|
26
|
+
setupInstructions: import("@metaplex-foundation/umi").TransactionBuilder;
|
27
|
+
swapIx: import("@metaplex-foundation/umi").TransactionBuilder;
|
28
|
+
}>;
|
29
|
+
}
|
30
|
+
//# sourceMappingURL=rebalanceSwapManager.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAapD,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IAV/B,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAK9C,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kCAAkC;YA6B5B,mBAAmB;IAoCjC,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IA4EhC,aAAa;;;;;;CAWpB"}
|
@@ -0,0 +1,144 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.RebalanceSwapManager = void 0;
|
4
|
+
const swap_1 = require("../swap");
|
5
|
+
const generated_1 = require("../../generated");
|
6
|
+
const utils_1 = require("../../utils");
|
7
|
+
const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
|
8
|
+
class RebalanceSwapManager {
|
9
|
+
constructor(client, values, flRequirements, targetLiqUtilizationRateBps) {
|
10
|
+
this.client = client;
|
11
|
+
this.values = values;
|
12
|
+
this.flRequirements = flRequirements;
|
13
|
+
this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
|
14
|
+
this.jupSwapManager = new swap_1.JupSwapManager(client.signer);
|
15
|
+
}
|
16
|
+
isBoost() {
|
17
|
+
return this.values.rebalanceDirection === generated_1.RebalanceDirection.Boost;
|
18
|
+
}
|
19
|
+
usdToSwap() {
|
20
|
+
return Math.abs(this.values.debtAdjustmentUsd);
|
21
|
+
}
|
22
|
+
postRebalanceLiqUtilizationRateBps(swapOutputAmount) {
|
23
|
+
let supplyUsd = this.client.solautoPosition.supplyUsd();
|
24
|
+
// TODO: add token balance change
|
25
|
+
let debtUsd = this.client.solautoPosition.debtUsd();
|
26
|
+
const outputToken = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.isBoost()
|
27
|
+
? this.client.solautoPosition.state().supply.mint
|
28
|
+
: this.client.solautoPosition.state().debt.mint);
|
29
|
+
const swapOutputUsd = swapOutputAmount
|
30
|
+
? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)(outputToken).decimals) *
|
31
|
+
((0, utils_1.safeGetPrice)(outputToken) ?? 0)
|
32
|
+
: this.usdToSwap();
|
33
|
+
supplyUsd = this.isBoost()
|
34
|
+
? supplyUsd + swapOutputUsd
|
35
|
+
: supplyUsd - this.usdToSwap();
|
36
|
+
debtUsd = this.isBoost()
|
37
|
+
? debtUsd + this.usdToSwap()
|
38
|
+
: debtUsd - swapOutputUsd;
|
39
|
+
return (0, utils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, this.client.solautoPosition.state().liqThresholdBps ?? 0);
|
40
|
+
}
|
41
|
+
async findSufficientQuote(swapInput, criteria) {
|
42
|
+
let swapQuote;
|
43
|
+
let insufficient = false;
|
44
|
+
for (let i = 0; i < 10; i++) {
|
45
|
+
(0, utils_1.consoleLog)("Finding sufficient quote...");
|
46
|
+
swapQuote = await this.jupSwapManager.getQuote(swapInput);
|
47
|
+
const outputAmount = parseInt(swapQuote.outAmount);
|
48
|
+
const postRebalanceRate = this.postRebalanceLiqUtilizationRateBps(BigInt(outputAmount));
|
49
|
+
insufficient = criteria.minOutputAmount
|
50
|
+
? outputAmount < Number(criteria.minOutputAmount)
|
51
|
+
: criteria.minLiqUtilizationRateBps
|
52
|
+
? postRebalanceRate < criteria.minLiqUtilizationRateBps
|
53
|
+
: postRebalanceRate > criteria.maxLiqUtilizationRateBps;
|
54
|
+
if (insufficient) {
|
55
|
+
(0, utils_1.consoleLog)("Insufficient swap quote:", swapQuote);
|
56
|
+
swapInput.amount = this.bigIntWithIncrement(swapInput.amount, 0.01);
|
57
|
+
}
|
58
|
+
else {
|
59
|
+
break;
|
60
|
+
}
|
61
|
+
}
|
62
|
+
return swapQuote;
|
63
|
+
}
|
64
|
+
swapDetails() {
|
65
|
+
const input = this.isBoost()
|
66
|
+
? this.client.solautoPosition.state().debt
|
67
|
+
: this.client.solautoPosition.state().supply;
|
68
|
+
const output = this.isBoost()
|
69
|
+
? this.client.solautoPosition.state().supply
|
70
|
+
: this.client.solautoPosition.state().debt;
|
71
|
+
let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(input.mint), input.decimals);
|
72
|
+
return {
|
73
|
+
input,
|
74
|
+
output,
|
75
|
+
inputAmount,
|
76
|
+
};
|
77
|
+
}
|
78
|
+
bigIntWithIncrement(num, inc) {
|
79
|
+
return num + BigInt(Math.round(Number(num) * inc));
|
80
|
+
}
|
81
|
+
async setSwapParams(attemptNum) {
|
82
|
+
const rebalanceToZero = this.targetLiqUtilizationRateBps === 0;
|
83
|
+
let { input, output, inputAmount } = this.swapDetails();
|
84
|
+
let outputAmount = rebalanceToZero
|
85
|
+
? output.amountUsed.baseUnit +
|
86
|
+
BigInt(Math.round(Number(output.amountUsed.baseUnit) *
|
87
|
+
// Add this small percentage to account for the APR on the debt between now and the transaction
|
88
|
+
0.0001))
|
89
|
+
: (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(output.mint), output.decimals);
|
90
|
+
const flashLoanRepayFromDebt = !this.isBoost() &&
|
91
|
+
this.flRequirements &&
|
92
|
+
this.flRequirements.liquiditySource === generated_1.TokenType.Debt;
|
93
|
+
const exactOut = flashLoanRepayFromDebt && !rebalanceToZero;
|
94
|
+
const exactIn = !exactOut;
|
95
|
+
if (exactIn && (rebalanceToZero || this.values.repayingCloseToMaxLtv)) {
|
96
|
+
inputAmount = this.bigIntWithIncrement(inputAmount, 0.005);
|
97
|
+
}
|
98
|
+
const swapAmount = exactOut
|
99
|
+
? this.flRequirements
|
100
|
+
? this.bigIntWithIncrement(outputAmount, this.flRequirements.flFeeBps ?? 0)
|
101
|
+
: outputAmount
|
102
|
+
: inputAmount;
|
103
|
+
const swapInput = {
|
104
|
+
inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
|
105
|
+
outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
|
106
|
+
exactIn,
|
107
|
+
exactOut,
|
108
|
+
amount: swapAmount,
|
109
|
+
};
|
110
|
+
(0, utils_1.consoleLog)("Swap input:", swapInput);
|
111
|
+
if (exactIn && (rebalanceToZero || this.values.repayingCloseToMaxLtv)) {
|
112
|
+
this.swapQuote = await this.findSufficientQuote(swapInput, {
|
113
|
+
minOutputAmount: rebalanceToZero ? outputAmount : undefined,
|
114
|
+
maxLiqUtilizationRateBps: this.values.repayingCloseToMaxLtv
|
115
|
+
? (0, utils_1.maxRepayToBps)(this.client.solautoPosition.state().maxLtvBps ?? 0, this.client.solautoPosition.state().liqThresholdBps ?? 0) - 15
|
116
|
+
: undefined,
|
117
|
+
});
|
118
|
+
}
|
119
|
+
if (this.flRequirements) {
|
120
|
+
this.flBorrowAmount = exactOut
|
121
|
+
? outputAmount
|
122
|
+
: this.swapQuote
|
123
|
+
? BigInt(parseInt(this.swapQuote.inAmount))
|
124
|
+
: inputAmount;
|
125
|
+
}
|
126
|
+
this.swapParams = {
|
127
|
+
...swapInput,
|
128
|
+
destinationWallet: flashLoanRepayFromDebt
|
129
|
+
? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.client.signer.publicKey)
|
130
|
+
: this.client.solautoPosition.publicKey,
|
131
|
+
slippageIncFactor: 0.2 + attemptNum * 0.25,
|
132
|
+
};
|
133
|
+
}
|
134
|
+
async getSwapTxData() {
|
135
|
+
const { jupQuote, lookupTableAddresses, setupInstructions, swapIx } = await this.jupSwapManager.getJupSwapTxData(this.swapParams);
|
136
|
+
return {
|
137
|
+
swapQuote: jupQuote,
|
138
|
+
lookupTableAddresses,
|
139
|
+
setupInstructions,
|
140
|
+
swapIx,
|
141
|
+
};
|
142
|
+
}
|
143
|
+
}
|
144
|
+
exports.RebalanceSwapManager = RebalanceSwapManager;
|