@haven-fi/solauto-sdk 1.0.601 → 1.0.603
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/services/rebalance/rebalanceSwapManager.d.ts.map +1 -1
- package/dist/services/rebalance/rebalanceSwapManager.js +6 -2
- package/dist/services/swap/jupSwapManager.d.ts +1 -0
- package/dist/services/swap/jupSwapManager.d.ts.map +1 -1
- package/dist/services/swap/jupSwapManager.js +2 -2
- package/package.json +1 -1
- package/src/services/rebalance/rebalanceSwapManager.ts +8 -2
- package/src/services/swap/jupSwapManager.ts +4 -3
- package/tests/transactions/shared.ts +0 -1
@@ -1 +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;
|
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;IAkFhC,aAAa;;;;;;CAWpB"}
|
@@ -100,12 +100,16 @@ class RebalanceSwapManager {
|
|
100
100
|
? this.bigIntWithIncrement(outputAmount, this.flRequirements.flFeeBps ?? 0)
|
101
101
|
: outputAmount
|
102
102
|
: inputAmount;
|
103
|
+
const inputMint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint);
|
104
|
+
const outputMint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint);
|
105
|
+
const swappingMeme = (0, utils_1.tokenInfo)(inputMint).isMeme || (0, utils_1.tokenInfo)(outputMint).isMeme;
|
103
106
|
const swapInput = {
|
104
|
-
inputMint
|
105
|
-
outputMint
|
107
|
+
inputMint,
|
108
|
+
outputMint,
|
106
109
|
exactIn,
|
107
110
|
exactOut,
|
108
111
|
amount: swapAmount,
|
112
|
+
slippageBps: swappingMeme ? 300 : 50,
|
109
113
|
};
|
110
114
|
(0, utils_1.consoleLog)("Swap input:", swapInput);
|
111
115
|
if (exactIn && (rebalanceToZero || this.values.repayingCloseToMaxLtv)) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YAoBhD,kBAAkB;IAqChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}
|
@@ -23,9 +23,9 @@ class JupSwapManager {
|
|
23
23
|
: data.exactIn
|
24
24
|
? "ExactIn"
|
25
25
|
: undefined,
|
26
|
-
slippageBps: 10,
|
26
|
+
slippageBps: data.slippageBps ?? 10,
|
27
27
|
maxAccounts: !data.exactOut ? 15 + attemptNum * 5 : undefined,
|
28
|
-
}),
|
28
|
+
}), 4, 150);
|
29
29
|
}
|
30
30
|
async getJupInstructions(data) {
|
31
31
|
if (!this.jupQuote) {
|
package/package.json
CHANGED
@@ -166,12 +166,18 @@ export class RebalanceSwapManager {
|
|
166
166
|
)
|
167
167
|
: outputAmount
|
168
168
|
: inputAmount;
|
169
|
+
|
170
|
+
const inputMint = toWeb3JsPublicKey(input.mint);
|
171
|
+
const outputMint = toWeb3JsPublicKey(output.mint);
|
172
|
+
const swappingMeme =
|
173
|
+
tokenInfo(inputMint).isMeme || tokenInfo(outputMint).isMeme;
|
169
174
|
const swapInput: SwapInput = {
|
170
|
-
inputMint
|
171
|
-
outputMint
|
175
|
+
inputMint,
|
176
|
+
outputMint,
|
172
177
|
exactIn,
|
173
178
|
exactOut,
|
174
179
|
amount: swapAmount,
|
180
|
+
slippageBps: swappingMeme ? 300 : 50,
|
175
181
|
};
|
176
182
|
consoleLog("Swap input:", swapInput);
|
177
183
|
|
@@ -25,6 +25,7 @@ export interface SwapInput {
|
|
25
25
|
amount: bigint;
|
26
26
|
exactIn?: boolean;
|
27
27
|
exactOut?: boolean;
|
28
|
+
slippageBps?: number;
|
28
29
|
}
|
29
30
|
|
30
31
|
export interface SwapParams extends SwapInput {
|
@@ -60,11 +61,11 @@ export class JupSwapManager {
|
|
60
61
|
: data.exactIn
|
61
62
|
? "ExactIn"
|
62
63
|
: undefined,
|
63
|
-
slippageBps: 10,
|
64
|
+
slippageBps: data.slippageBps ?? 10,
|
64
65
|
maxAccounts: !data.exactOut ? 15 + attemptNum * 5 : undefined,
|
65
66
|
}),
|
66
|
-
|
67
|
-
|
67
|
+
4,
|
68
|
+
150
|
68
69
|
);
|
69
70
|
}
|
70
71
|
|