@haven-fi/solauto-sdk 1.0.615 → 1.0.617
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/solautoPosition/marginfiSolautoPositionEx.d.ts +1 -3
- package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts.map +1 -1
- package/dist/solautoPosition/marginfiSolautoPositionEx.js +1 -7
- package/dist/solautoPosition/solautoPositionEx.d.ts +4 -3
- package/dist/solautoPosition/solautoPositionEx.d.ts.map +1 -1
- package/dist/solautoPosition/solautoPositionEx.js +9 -0
- package/dist/utils/jitoUtils.d.ts.map +1 -1
- package/dist/utils/jitoUtils.js +1 -0
- package/dist/utils/numberUtils.d.ts +2 -0
- package/dist/utils/numberUtils.d.ts.map +1 -1
- package/dist/utils/numberUtils.js +8 -0
- package/local/txSandbox.ts +1 -1
- package/package.json +1 -1
- package/src/services/rebalance/rebalanceTxBuilder.ts +1 -1
- package/src/solautoPosition/marginfiSolautoPositionEx.ts +6 -10
- package/src/solautoPosition/solautoPositionEx.ts +15 -3
- package/src/utils/jitoUtils.ts +1 -0
- package/src/utils/numberUtils.ts +15 -0
|
@@ -6,9 +6,7 @@ export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
|
|
|
6
6
|
private debtBank;
|
|
7
7
|
lendingPool(): Promise<PublicKey>;
|
|
8
8
|
maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
|
|
9
|
-
supplyLiquidityAvailable():
|
|
10
|
-
supplyLiquidityDepositable(): bigint;
|
|
11
|
-
debtLiquidityAvailable(): bigint;
|
|
9
|
+
supplyLiquidityAvailable(): number;
|
|
12
10
|
refreshPositionState(): Promise<void>;
|
|
13
11
|
}
|
|
14
12
|
//# sourceMappingURL=marginfiSolautoPositionEx.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmBxD,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwB3D,wBAAwB,IAAI,MAAM;IAO5B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB5C"}
|
|
@@ -45,13 +45,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
|
|
|
45
45
|
return [maxLtvBps, liqThresholdBps];
|
|
46
46
|
}
|
|
47
47
|
supplyLiquidityAvailable() {
|
|
48
|
-
return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false);
|
|
49
|
-
}
|
|
50
|
-
supplyLiquidityDepositable() {
|
|
51
|
-
return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, true);
|
|
52
|
-
}
|
|
53
|
-
debtLiquidityAvailable() {
|
|
54
|
-
return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.debtBank, false);
|
|
48
|
+
return (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false), this.state().supply.decimals);
|
|
55
49
|
}
|
|
56
50
|
async refreshPositionState() {
|
|
57
51
|
if (!this.canRefreshPositionState()) {
|
|
@@ -53,12 +53,13 @@ export declare abstract class SolautoPositionEx {
|
|
|
53
53
|
supplyUsd(): number;
|
|
54
54
|
totalDebt(): number;
|
|
55
55
|
debtUsd(): number;
|
|
56
|
+
supplyLiquidityDepositable(): number;
|
|
56
57
|
supplyLiquidityUsdDepositable(): number;
|
|
58
|
+
supplyLiquidityUsdAvailable(): number;
|
|
59
|
+
debtLiquidityAvailable(): number;
|
|
57
60
|
debtLiquidityUsdAvailable(): number;
|
|
58
61
|
abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
|
|
59
|
-
abstract
|
|
60
|
-
abstract supplyLiquidityAvailable(): bigint;
|
|
61
|
-
abstract debtLiquidityAvailable(): bigint;
|
|
62
|
+
abstract supplyLiquidityAvailable(): number;
|
|
62
63
|
sufficientLiquidityToBoost(): boolean;
|
|
63
64
|
eligibleForRebalance(bpsDistanceThreshold?: number): RebalanceAction | undefined;
|
|
64
65
|
eligibleForRefresh(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,WAAW,EAEX,eAAe,EACf,aAAa,EACb,eAAe,EACf,yBAAyB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAQL,cAAc,
|
|
1
|
+
{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,9 +90,18 @@ class SolautoPositionEx {
|
|
|
90
90
|
debtUsd() {
|
|
91
91
|
return (0, utils_1.calcDebtUsd)(this.state());
|
|
92
92
|
}
|
|
93
|
+
supplyLiquidityDepositable() {
|
|
94
|
+
return (0, utils_1.supplyLiquidityDepositable)(this.state());
|
|
95
|
+
}
|
|
93
96
|
supplyLiquidityUsdDepositable() {
|
|
94
97
|
return (0, utils_1.supplyLiquidityUsdDepositable)(this.state());
|
|
95
98
|
}
|
|
99
|
+
supplyLiquidityUsdAvailable() {
|
|
100
|
+
return this.supplyLiquidityAvailable() * ((0, utils_1.safeGetPrice)(this.supplyMint()) ?? 0);
|
|
101
|
+
}
|
|
102
|
+
debtLiquidityAvailable() {
|
|
103
|
+
return (0, utils_1.debtLiquidityAvailable)(this.state());
|
|
104
|
+
}
|
|
96
105
|
debtLiquidityUsdAvailable() {
|
|
97
106
|
return (0, utils_1.debtLiquidityUsdAvailable)(this.state());
|
|
98
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;
|
|
1
|
+
{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAmND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}
|
package/dist/utils/jitoUtils.js
CHANGED
|
@@ -121,6 +121,7 @@ async function pollBundleStatus(umi, bundleId, interval = 1000, timeout = 40000)
|
|
|
121
121
|
await new Promise((resolve) => setTimeout(resolve, interval));
|
|
122
122
|
const statuses = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
|
|
123
123
|
const resp = await getBundleStatus(umi, bundleId);
|
|
124
|
+
// TODO: remove me
|
|
124
125
|
if (resp?.value?.length > 0 && resp.value[0] === null) {
|
|
125
126
|
throw new Error("No confirmation status");
|
|
126
127
|
}
|
|
@@ -5,7 +5,9 @@ export declare function calcDebtUsd(state?: PositionState): number;
|
|
|
5
5
|
export declare function calcNetWorth(state?: PositionState): number;
|
|
6
6
|
export declare function calcTotalSupply(state?: PositionState): number;
|
|
7
7
|
export declare function calcTotalDebt(state?: PositionState): number;
|
|
8
|
+
export declare function debtLiquidityAvailable(state?: PositionState): number;
|
|
8
9
|
export declare function debtLiquidityUsdAvailable(state?: PositionState): number;
|
|
10
|
+
export declare function supplyLiquidityDepositable(state?: PositionState): number;
|
|
9
11
|
export declare function supplyLiquidityUsdDepositable(state?: PositionState): number;
|
|
10
12
|
export declare function fromRoundedUsdValue(number: bigint): number;
|
|
11
13
|
export declare function toRoundedUsdValue(number: number): bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlD;AAED,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,aAAa,UAIhD;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,aAAa,UAKjD;AAED,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAKpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,CAAC,EAAE,aAAa,UAK3D;AAED,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,aAAa,UAI9D;AAED,wBAAgB,0BAA0B,CAAC,KAAK,CAAC,EAAE,aAAa,UAK/D;AAED,wBAAgB,6BAA6B,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,UAEjD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,UAE/C;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,KAAK,WAAW,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAC9C,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,EACb,WAAW,GAAE,WAAqB,GACjC,MAAM,CAOR;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAejE;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}
|
|
@@ -6,7 +6,9 @@ exports.calcDebtUsd = calcDebtUsd;
|
|
|
6
6
|
exports.calcNetWorth = calcNetWorth;
|
|
7
7
|
exports.calcTotalSupply = calcTotalSupply;
|
|
8
8
|
exports.calcTotalDebt = calcTotalDebt;
|
|
9
|
+
exports.debtLiquidityAvailable = debtLiquidityAvailable;
|
|
9
10
|
exports.debtLiquidityUsdAvailable = debtLiquidityUsdAvailable;
|
|
11
|
+
exports.supplyLiquidityDepositable = supplyLiquidityDepositable;
|
|
10
12
|
exports.supplyLiquidityUsdDepositable = supplyLiquidityUsdDepositable;
|
|
11
13
|
exports.fromRoundedUsdValue = fromRoundedUsdValue;
|
|
12
14
|
exports.toRoundedUsdValue = toRoundedUsdValue;
|
|
@@ -40,9 +42,15 @@ function calcTotalSupply(state) {
|
|
|
40
42
|
function calcTotalDebt(state) {
|
|
41
43
|
return fromBaseUnit(state?.debt.amountUsed.baseUnit ?? BigInt(0), state?.debt.decimals ?? 1);
|
|
42
44
|
}
|
|
45
|
+
function debtLiquidityAvailable(state) {
|
|
46
|
+
return fromBaseUnit(state?.debt.amountCanBeUsed.baseUnit ?? BigInt(0), state?.debt.decimals ?? 1);
|
|
47
|
+
}
|
|
43
48
|
function debtLiquidityUsdAvailable(state) {
|
|
44
49
|
return fromRoundedUsdValue(state?.debt.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0));
|
|
45
50
|
}
|
|
51
|
+
function supplyLiquidityDepositable(state) {
|
|
52
|
+
return fromBaseUnit(state?.supply.amountCanBeUsed.baseUnit ?? BigInt(0), state?.supply.decimals ?? 1);
|
|
53
|
+
}
|
|
46
54
|
function supplyLiquidityUsdDepositable(state) {
|
|
47
55
|
return fromRoundedUsdValue(state?.supply.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0));
|
|
48
56
|
}
|
package/local/txSandbox.ts
CHANGED
package/package.json
CHANGED
|
@@ -11,6 +11,7 @@ import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
|
|
|
11
11
|
import {
|
|
12
12
|
calcMarginfiMaxLtvAndLiqThresholdBps,
|
|
13
13
|
fetchTokenPrices,
|
|
14
|
+
fromBaseUnit,
|
|
14
15
|
getBankLiquidityAvailableBaseUnit,
|
|
15
16
|
getMarginfiAccountPositionState,
|
|
16
17
|
toBps,
|
|
@@ -71,16 +72,11 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
|
|
|
71
72
|
return [maxLtvBps, liqThresholdBps];
|
|
72
73
|
}
|
|
73
74
|
|
|
74
|
-
supplyLiquidityAvailable():
|
|
75
|
-
return
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
return getBankLiquidityAvailableBaseUnit(this.supplyBank, true);
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
debtLiquidityAvailable(): bigint {
|
|
83
|
-
return getBankLiquidityAvailableBaseUnit(this.debtBank, false);
|
|
75
|
+
supplyLiquidityAvailable(): number {
|
|
76
|
+
return fromBaseUnit(
|
|
77
|
+
getBankLiquidityAvailableBaseUnit(this.supplyBank, false),
|
|
78
|
+
this.state().supply.decimals
|
|
79
|
+
);
|
|
84
80
|
}
|
|
85
81
|
|
|
86
82
|
async refreshPositionState(): Promise<void> {
|
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
consoleLog,
|
|
19
19
|
ContextUpdates,
|
|
20
20
|
currentUnixSeconds,
|
|
21
|
+
debtLiquidityAvailable,
|
|
21
22
|
debtLiquidityUsdAvailable,
|
|
22
23
|
fetchTokenPrices,
|
|
23
24
|
getLiqUtilzationRateBps,
|
|
@@ -26,6 +27,7 @@ import {
|
|
|
26
27
|
positionStateWithLatestPrices,
|
|
27
28
|
safeGetPrice,
|
|
28
29
|
solautoStrategyName,
|
|
30
|
+
supplyLiquidityDepositable,
|
|
29
31
|
supplyLiquidityUsdDepositable,
|
|
30
32
|
toBaseUnit,
|
|
31
33
|
tokenInfo,
|
|
@@ -192,18 +194,28 @@ export abstract class SolautoPositionEx {
|
|
|
192
194
|
return calcDebtUsd(this.state());
|
|
193
195
|
}
|
|
194
196
|
|
|
197
|
+
supplyLiquidityDepositable() {
|
|
198
|
+
return supplyLiquidityDepositable(this.state());
|
|
199
|
+
}
|
|
200
|
+
|
|
195
201
|
supplyLiquidityUsdDepositable() {
|
|
196
202
|
return supplyLiquidityUsdDepositable(this.state());
|
|
197
203
|
}
|
|
198
204
|
|
|
205
|
+
supplyLiquidityUsdAvailable() {
|
|
206
|
+
return this.supplyLiquidityAvailable() * (safeGetPrice(this.supplyMint()) ?? 0);
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
debtLiquidityAvailable() {
|
|
210
|
+
return debtLiquidityAvailable(this.state());
|
|
211
|
+
}
|
|
212
|
+
|
|
199
213
|
debtLiquidityUsdAvailable() {
|
|
200
214
|
return debtLiquidityUsdAvailable(this.state());
|
|
201
215
|
}
|
|
202
216
|
|
|
203
217
|
abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
|
|
204
|
-
abstract
|
|
205
|
-
abstract supplyLiquidityAvailable(): bigint;
|
|
206
|
-
abstract debtLiquidityAvailable(): bigint;
|
|
218
|
+
abstract supplyLiquidityAvailable(): number;
|
|
207
219
|
|
|
208
220
|
sufficientLiquidityToBoost() {
|
|
209
221
|
const limitsUpToDate =
|
package/src/utils/jitoUtils.ts
CHANGED
|
@@ -192,6 +192,7 @@ async function pollBundleStatus(
|
|
|
192
192
|
|
|
193
193
|
const statuses = await retryWithExponentialBackoff(async () => {
|
|
194
194
|
const resp = await getBundleStatus(umi, bundleId);
|
|
195
|
+
// TODO: remove me
|
|
195
196
|
if (resp?.value?.length > 0 && resp.value[0] === null) {
|
|
196
197
|
throw new Error("No confirmation status");
|
|
197
198
|
}
|
package/src/utils/numberUtils.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { BASIS_POINTS, MIN_REPAY_GAP_BPS, USD_DECIMALS } from "../constants";
|
|
2
2
|
import { PositionState } from "../generated";
|
|
3
|
+
import { tokenInfo } from "./generalUtils";
|
|
3
4
|
|
|
4
5
|
export function calcNetWorthUsd(state?: PositionState) {
|
|
5
6
|
return fromRoundedUsdValue(state?.netWorth.baseAmountUsdValue ?? BigInt(0));
|
|
@@ -38,12 +39,26 @@ export function calcTotalDebt(state?: PositionState) {
|
|
|
38
39
|
);
|
|
39
40
|
}
|
|
40
41
|
|
|
42
|
+
export function debtLiquidityAvailable(state?: PositionState) {
|
|
43
|
+
return fromBaseUnit(
|
|
44
|
+
state?.debt.amountCanBeUsed.baseUnit ?? BigInt(0),
|
|
45
|
+
state?.debt.decimals ?? 1
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
|
|
41
49
|
export function debtLiquidityUsdAvailable(state?: PositionState) {
|
|
42
50
|
return fromRoundedUsdValue(
|
|
43
51
|
state?.debt.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0)
|
|
44
52
|
);
|
|
45
53
|
}
|
|
46
54
|
|
|
55
|
+
export function supplyLiquidityDepositable(state?: PositionState) {
|
|
56
|
+
return fromBaseUnit(
|
|
57
|
+
state?.supply.amountCanBeUsed.baseUnit ?? BigInt(0),
|
|
58
|
+
state?.supply.decimals ?? 1
|
|
59
|
+
);
|
|
60
|
+
}
|
|
61
|
+
|
|
47
62
|
export function supplyLiquidityUsdDepositable(state?: PositionState) {
|
|
48
63
|
return fromRoundedUsdValue(
|
|
49
64
|
state?.supply.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0)
|