@haven-fi/solauto-sdk 1.0.367 → 1.0.368
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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PublicKey } from "@solana/web3.js";
|
|
2
2
|
import { Program, Umi } from "@metaplex-foundation/umi";
|
|
3
|
-
import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, PositionType, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
|
|
3
|
+
import { AutomationSettings, DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, PositionType, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
|
|
4
4
|
import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
|
|
5
5
|
export declare function createDynamicSolautoProgram(programId: PublicKey): Program;
|
|
6
6
|
export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
|
|
@@ -22,6 +22,7 @@ interface AssetProps {
|
|
|
22
22
|
}
|
|
23
23
|
export declare function createFakePositionState(supply: AssetProps, debt: AssetProps, maxLtvBps: number, liqThresholdBps: number): PositionState;
|
|
24
24
|
export declare function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters;
|
|
25
|
+
export declare function getMaxLtvBpsAndLiqThresholdBps(umi: Umi, lendingPlatform: LendingPlatform, lendingPool: PublicKey, supplyMint: PublicKey, debtMint: PublicKey, supplyPrice: number): Promise<number[]>;
|
|
25
26
|
type PositionAdjustment = {
|
|
26
27
|
type: "supply";
|
|
27
28
|
value: bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAGL,OAAO,EAEP,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,
|
|
1
|
+
{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ exports.getAllPositionsByAuthority = getAllPositionsByAuthority;
|
|
|
15
15
|
exports.positionStateWithLatestPrices = positionStateWithLatestPrices;
|
|
16
16
|
exports.createFakePositionState = createFakePositionState;
|
|
17
17
|
exports.createSolautoSettings = createSolautoSettings;
|
|
18
|
+
exports.getMaxLtvBpsAndLiqThresholdBps = getMaxLtvBpsAndLiqThresholdBps;
|
|
18
19
|
const web3_js_1 = require("@solana/web3.js");
|
|
19
20
|
const umi_1 = require("@metaplex-foundation/umi");
|
|
20
21
|
const generated_1 = require("../../generated");
|
|
@@ -389,6 +390,15 @@ function createSolautoSettings(settings) {
|
|
|
389
390
|
padding1: [],
|
|
390
391
|
};
|
|
391
392
|
}
|
|
393
|
+
async function getMaxLtvBpsAndLiqThresholdBps(umi, lendingPlatform, lendingPool, supplyMint, debtMint, supplyPrice) {
|
|
394
|
+
let maxLtv = 0;
|
|
395
|
+
let liqThreshold = 0;
|
|
396
|
+
if (lendingPlatform === generated_1.LendingPlatform.Marginfi) {
|
|
397
|
+
[maxLtv, liqThreshold] = await (0, marginfiUtils_1.getMaxLtvAndLiqThreshold)(umi, lendingPool, { mint: supplyMint }, { mint: debtMint }, supplyPrice);
|
|
398
|
+
}
|
|
399
|
+
// TODO: PK
|
|
400
|
+
return [(0, numberUtils_1.toBps)(maxLtv), (0, numberUtils_1.toBps)(liqThreshold)];
|
|
401
|
+
}
|
|
392
402
|
class LivePositionUpdates {
|
|
393
403
|
constructor() {
|
|
394
404
|
this.supplyAdjustment = BigInt(0);
|
package/package.json
CHANGED
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
fromBaseUnit,
|
|
28
28
|
getLiqUtilzationRateBps,
|
|
29
29
|
toBaseUnit,
|
|
30
|
+
toBps,
|
|
30
31
|
} from "../numberUtils";
|
|
31
32
|
import { getReferralState } from "../accountUtils";
|
|
32
33
|
import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
|
|
@@ -38,6 +39,7 @@ import {
|
|
|
38
39
|
import {
|
|
39
40
|
findMarginfiAccounts,
|
|
40
41
|
getAllMarginfiAccountsByAuthority,
|
|
42
|
+
getMaxLtvAndLiqThreshold,
|
|
41
43
|
} from "../marginfiUtils";
|
|
42
44
|
import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
|
|
43
45
|
import { fetchTokenPrices } from "../priceUtils";
|
|
@@ -587,6 +589,30 @@ export function createSolautoSettings(
|
|
|
587
589
|
};
|
|
588
590
|
}
|
|
589
591
|
|
|
592
|
+
export async function getMaxLtvBpsAndLiqThresholdBps(
|
|
593
|
+
umi: Umi,
|
|
594
|
+
lendingPlatform: LendingPlatform,
|
|
595
|
+
lendingPool: PublicKey,
|
|
596
|
+
supplyMint: PublicKey,
|
|
597
|
+
debtMint: PublicKey,
|
|
598
|
+
supplyPrice: number
|
|
599
|
+
) {
|
|
600
|
+
let maxLtv: number = 0;
|
|
601
|
+
let liqThreshold: number = 0;
|
|
602
|
+
if (lendingPlatform === LendingPlatform.Marginfi) {
|
|
603
|
+
[maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
|
|
604
|
+
umi,
|
|
605
|
+
lendingPool,
|
|
606
|
+
{ mint: supplyMint },
|
|
607
|
+
{ mint: debtMint },
|
|
608
|
+
supplyPrice
|
|
609
|
+
);
|
|
610
|
+
}
|
|
611
|
+
// TODO: PK
|
|
612
|
+
|
|
613
|
+
return [toBps(maxLtv), toBps(liqThreshold)];
|
|
614
|
+
}
|
|
615
|
+
|
|
590
616
|
type PositionAdjustment =
|
|
591
617
|
| { type: "supply"; value: bigint }
|
|
592
618
|
| { type: "debt"; value: bigint }
|