@haven-fi/solauto-sdk 1.0.321 → 1.0.323
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/utils/jitoUtils.d.ts.map +1 -1
- package/dist/utils/jitoUtils.js +5 -3
- package/dist/utils/solauto/generalUtils.d.ts.map +1 -1
- package/dist/utils/solauto/generalUtils.js +10 -7
- package/package.json +1 -1
- package/src/utils/jitoUtils.ts +12 -9
- package/src/utils/solauto/generalUtils.ts +21 -18
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA8GD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA8GD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8C/B"}
|
package/dist/utils/jitoUtils.js
CHANGED
|
@@ -51,7 +51,7 @@ async function getTipInstruction(signer, tipLamports) {
|
|
|
51
51
|
// }
|
|
52
52
|
async function umiToVersionedTransactions(umi, signer, txs, sign, feeEstimates, computeUnitLimits) {
|
|
53
53
|
const builtTxs = await Promise.all(txs.map(async (tx, i) => {
|
|
54
|
-
return (await (0, solanaUtils_1.assembleFinalTransaction)(signer, tx, feeEstimates[i], computeUnitLimits ? computeUnitLimits[i] : undefined).setLatestBlockhash(umi)).build(umi);
|
|
54
|
+
return (await (0, solanaUtils_1.assembleFinalTransaction)(signer, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined).setLatestBlockhash(umi)).build(umi);
|
|
55
55
|
}));
|
|
56
56
|
if (sign) {
|
|
57
57
|
await signer.signAllTransactions(builtTxs);
|
|
@@ -100,8 +100,10 @@ async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, prior
|
|
|
100
100
|
(0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
|
|
101
101
|
(0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
|
|
102
102
|
txs[0] = txs[0].prepend(await getTipInstruction(signer, 150000));
|
|
103
|
-
const feeEstimates =
|
|
104
|
-
|
|
103
|
+
const feeEstimates = priorityFeeSetting !== types_1.PriorityFeeSetting.None
|
|
104
|
+
? await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting)) ??
|
|
105
|
+
1000000))
|
|
106
|
+
: undefined;
|
|
105
107
|
let builtTxs = await umiToVersionedTransactions(umi, signer, txs, true, // false if simulating first and rebuilding later
|
|
106
108
|
feeEstimates);
|
|
107
109
|
// const simulationResults = await simulateJitoBundle(umi, builtTxs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAGL,OAAO,EAEP,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAElB,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,gCAAgC,EAChC,SAAS,EAMV,MAAM,iBAAiB,CAAC;AAkBzB,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAI9E,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAczE;AAgBD,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,eAAe,EAAE,MAAM,GACtB,yBAAyB,CAgB3B;AAED,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,GAAG,SAAS,EACvD,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,oBAAoB,SAAI,GACvB,eAAe,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,14 +93,17 @@ function eligibleForRebalance(positionState, positionSettings, positionDca, curr
|
|
|
93
93
|
const boostFrom = boostToBps - positionSettings.boostGap;
|
|
94
94
|
if (Math.max(0, positionState.liqUtilizationRateBps - boostFrom) <=
|
|
95
95
|
bpsDistanceThreshold) {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
0.
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
96
|
+
if (positionState.liqUtilizationRateBps < boostFrom) {
|
|
97
|
+
const values = (0, rebalanceUtils_1.getRebalanceValues)(positionState, positionSettings, positionDca, (0, generalUtils_1.currentUnixSeconds)(), supplyMintPrice, debtMintPrice);
|
|
98
|
+
const sufficientLiquidity = (0, numberUtils_1.fromBaseUnit)(positionState.debt.amountCanBeUsed.baseAmountUsdValue, constants_1.USD_DECIMALS) *
|
|
99
|
+
0.95 >
|
|
100
|
+
values.debtAdjustmentUsd;
|
|
101
|
+
if (!sufficientLiquidity) {
|
|
102
|
+
console.log("Insufficient debt liquidity to further boost");
|
|
103
|
+
}
|
|
104
|
+
return sufficientLiquidity ? "boost" : undefined;
|
|
102
105
|
}
|
|
103
|
-
return
|
|
106
|
+
return "boost";
|
|
104
107
|
}
|
|
105
108
|
else if (Math.max(0, repayFrom - positionState.liqUtilizationRateBps) <=
|
|
106
109
|
bpsDistanceThreshold) {
|
package/package.json
CHANGED
package/src/utils/jitoUtils.ts
CHANGED
|
@@ -70,7 +70,7 @@ async function umiToVersionedTransactions(
|
|
|
70
70
|
signer: Signer,
|
|
71
71
|
txs: TransactionBuilder[],
|
|
72
72
|
sign: boolean,
|
|
73
|
-
feeEstimates
|
|
73
|
+
feeEstimates?: number[],
|
|
74
74
|
computeUnitLimits?: number[]
|
|
75
75
|
): Promise<VersionedTransaction[]> {
|
|
76
76
|
const builtTxs = await Promise.all(
|
|
@@ -79,7 +79,7 @@ async function umiToVersionedTransactions(
|
|
|
79
79
|
await assembleFinalTransaction(
|
|
80
80
|
signer,
|
|
81
81
|
tx,
|
|
82
|
-
feeEstimates[i],
|
|
82
|
+
feeEstimates ? feeEstimates[i] : undefined,
|
|
83
83
|
computeUnitLimits ? computeUnitLimits[i] : undefined
|
|
84
84
|
).setLatestBlockhash(umi)
|
|
85
85
|
).build(umi);
|
|
@@ -157,13 +157,16 @@ export async function sendJitoBundledTransactions(
|
|
|
157
157
|
);
|
|
158
158
|
|
|
159
159
|
txs[0] = txs[0].prepend(await getTipInstruction(signer, 150_000));
|
|
160
|
-
const feeEstimates =
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
160
|
+
const feeEstimates =
|
|
161
|
+
priorityFeeSetting !== PriorityFeeSetting.None
|
|
162
|
+
? await Promise.all(
|
|
163
|
+
txs.map(
|
|
164
|
+
async (x) =>
|
|
165
|
+
(await getComputeUnitPriceEstimate(umi, x, priorityFeeSetting)) ??
|
|
166
|
+
1000000
|
|
167
|
+
)
|
|
168
|
+
)
|
|
169
|
+
: undefined;
|
|
167
170
|
|
|
168
171
|
let builtTxs = await umiToVersionedTransactions(
|
|
169
172
|
umi,
|
|
@@ -170,26 +170,29 @@ export function eligibleForRebalance(
|
|
|
170
170
|
Math.max(0, positionState.liqUtilizationRateBps - boostFrom) <=
|
|
171
171
|
bpsDistanceThreshold
|
|
172
172
|
) {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
173
|
+
if (positionState.liqUtilizationRateBps < boostFrom) {
|
|
174
|
+
const values = getRebalanceValues(
|
|
175
|
+
positionState!,
|
|
176
|
+
positionSettings,
|
|
177
|
+
positionDca,
|
|
178
|
+
currentUnixSeconds(),
|
|
179
|
+
supplyMintPrice,
|
|
180
|
+
debtMintPrice
|
|
181
|
+
);
|
|
182
|
+
const sufficientLiquidity =
|
|
183
|
+
fromBaseUnit(
|
|
184
|
+
positionState.debt.amountCanBeUsed.baseAmountUsdValue,
|
|
185
|
+
USD_DECIMALS
|
|
186
|
+
) *
|
|
187
|
+
0.95 >
|
|
188
|
+
values.debtAdjustmentUsd;
|
|
189
|
+
if (!sufficientLiquidity) {
|
|
190
|
+
console.log("Insufficient debt liquidity to further boost");
|
|
191
|
+
}
|
|
192
|
+
return sufficientLiquidity ? "boost" : undefined;
|
|
190
193
|
}
|
|
191
194
|
|
|
192
|
-
return
|
|
195
|
+
return "boost";
|
|
193
196
|
} else if (
|
|
194
197
|
Math.max(0, repayFrom - positionState.liqUtilizationRateBps) <=
|
|
195
198
|
bpsDistanceThreshold
|