@haven-fi/solauto-sdk 1.0.440 → 1.0.442
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.
@@ -40,7 +40,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
|
|
40
40
|
const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
|
41
41
|
const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
|
42
42
|
(1 + (swapDetails.slippageIncFactor ?? 0)));
|
43
|
-
quoteResponse.slippageBps = finalPriceSlippageBps;
|
43
|
+
// quoteResponse.slippageBps = finalPriceSlippageBps;
|
44
44
|
(0, generalUtils_1.consoleLog)(quoteResponse);
|
45
45
|
(0, generalUtils_1.consoleLog)("Getting jup instructions...");
|
46
46
|
const instructions = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.swapInstructionsPost({
|
@@ -60,7 +60,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
|
|
60
60
|
(0, generalUtils_1.consoleLog)("Increased price impact bps:", finalPriceImpactBps);
|
61
61
|
if (swapDetails.addPadding) {
|
62
62
|
(0, generalUtils_1.consoleLog)("Raw inAmount:", quoteResponse.inAmount);
|
63
|
-
const inc = Math.max((0, numberUtils_1.fromBps)(finalPriceImpactBps), (0, numberUtils_1.fromBps)(finalPriceSlippageBps)
|
63
|
+
const inc = Math.max((0, numberUtils_1.fromBps)(finalPriceImpactBps) * 1.1, (0, numberUtils_1.fromBps)(finalPriceSlippageBps) * 0.15);
|
64
64
|
(0, generalUtils_1.consoleLog)("Inc:", inc);
|
65
65
|
quoteResponse.inAmount = Math.round(parseInt(quoteResponse.inAmount) + parseInt(quoteResponse.inAmount) * inc).toString();
|
66
66
|
(0, generalUtils_1.consoleLog)("Increased inAmount:", quoteResponse.inAmount);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAwDjB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe;;;EAsDxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,
|
1
|
+
{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAwDjB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe;;;EAsDxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAwDhB"}
|
@@ -182,15 +182,14 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
|
|
182
182
|
values.repayingCloseToMaxLtv ||
|
183
183
|
flashLoanRepayFromDebt;
|
184
184
|
const exactIn = !exactOut;
|
185
|
-
|
186
|
-
const addPadding = exactOut;
|
185
|
+
const addPadding = targetLiqUtilizationRateBps === 0;
|
187
186
|
return {
|
188
187
|
inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
|
189
188
|
outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
|
190
189
|
destinationWallet: flashLoanRepayFromDebt
|
191
190
|
? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey)
|
192
191
|
: client.solautoPosition,
|
193
|
-
slippageIncFactor: 0.
|
192
|
+
slippageIncFactor: 0.2 + (attemptNum ?? 0) * 0.25,
|
194
193
|
amount: exactOut ? outputAmount : inputAmount,
|
195
194
|
exactIn: exactIn,
|
196
195
|
exactOut: exactOut,
|
package/package.json
CHANGED
@@ -84,7 +84,7 @@ export async function getJupSwapTransaction(
|
|
84
84
|
Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
|
85
85
|
(1 + (swapDetails.slippageIncFactor ?? 0))
|
86
86
|
);
|
87
|
-
quoteResponse.slippageBps = finalPriceSlippageBps;
|
87
|
+
// quoteResponse.slippageBps = finalPriceSlippageBps;
|
88
88
|
consoleLog(quoteResponse);
|
89
89
|
|
90
90
|
consoleLog("Getting jup instructions...");
|
@@ -118,8 +118,8 @@ export async function getJupSwapTransaction(
|
|
118
118
|
if (swapDetails.addPadding) {
|
119
119
|
consoleLog("Raw inAmount:", quoteResponse.inAmount);
|
120
120
|
const inc = Math.max(
|
121
|
-
fromBps(finalPriceImpactBps),
|
122
|
-
fromBps(finalPriceSlippageBps)
|
121
|
+
fromBps(finalPriceImpactBps) * 1.1,
|
122
|
+
fromBps(finalPriceSlippageBps) * 0.15
|
123
123
|
);
|
124
124
|
consoleLog("Inc:", inc);
|
125
125
|
quoteResponse.inAmount = Math.round(
|
@@ -389,8 +389,7 @@ export function getJupSwapRebalanceDetails(
|
|
389
389
|
flashLoanRepayFromDebt;
|
390
390
|
const exactIn = !exactOut;
|
391
391
|
|
392
|
-
|
393
|
-
const addPadding = exactOut;
|
392
|
+
const addPadding = targetLiqUtilizationRateBps === 0;
|
394
393
|
|
395
394
|
return {
|
396
395
|
inputMint: toWeb3JsPublicKey(input.mint),
|
@@ -398,7 +397,7 @@ export function getJupSwapRebalanceDetails(
|
|
398
397
|
destinationWallet: flashLoanRepayFromDebt
|
399
398
|
? toWeb3JsPublicKey(client.signer.publicKey)
|
400
399
|
: client.solautoPosition,
|
401
|
-
slippageIncFactor: 0.
|
400
|
+
slippageIncFactor: 0.2 + (attemptNum ?? 0) * 0.25,
|
402
401
|
amount: exactOut ? outputAmount : inputAmount,
|
403
402
|
exactIn: exactIn,
|
404
403
|
exactOut: exactOut,
|