@haven-fi/solauto-sdk 1.0.550 → 1.0.552
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/clients/solautoClient.d.ts.map +1 -1
- package/dist/clients/solautoClient.js +0 -2
- package/dist/transactions/transactionsManager.d.ts +1 -1
- package/dist/transactions/transactionsManager.d.ts.map +1 -1
- package/dist/transactions/transactionsManager.js +2 -4
- package/dist/utils/jupiterUtils.d.ts +1 -0
- package/dist/utils/jupiterUtils.d.ts.map +1 -1
- package/dist/utils/jupiterUtils.js +1 -1
- package/dist/utils/solauto/generalUtils.d.ts +5 -0
- package/dist/utils/solauto/generalUtils.d.ts.map +1 -1
- package/dist/utils/solauto/generalUtils.js +5 -0
- package/package.json +1 -1
- package/src/clients/solautoClient.ts +0 -2
- package/src/transactions/transactionsManager.ts +3 -7
- package/src/utils/jupiterUtils.ts +2 -1
- package/src/utils/solauto/generalUtils.ts +7 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -237,7 +237,6 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
|
|
|
237
237
|
positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
|
|
238
238
|
signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
|
|
239
239
|
}
|
|
240
|
-
let addingToPos = false;
|
|
241
240
|
if ((0, umi_1.isOption)(args.dca) &&
|
|
242
241
|
(0, umi_1.isSome)(args.dca) &&
|
|
243
242
|
args.dca.value.dcaInBaseUnit > 0) {
|
|
@@ -248,7 +247,6 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
|
|
|
248
247
|
tokenType: args.dca.value.tokenType,
|
|
249
248
|
},
|
|
250
249
|
});
|
|
251
|
-
addingToPos = true;
|
|
252
250
|
}
|
|
253
251
|
}
|
|
254
252
|
if ((0, umi_1.isOption)(args.settingParams) && (0, umi_1.isSome)(args.settingParams)) {
|
|
@@ -11,8 +11,8 @@ export declare class TransactionItem {
|
|
|
11
11
|
name?: string | undefined;
|
|
12
12
|
lookupTableAddresses: string[];
|
|
13
13
|
tx?: TransactionBuilder;
|
|
14
|
-
orderPrio: number;
|
|
15
14
|
initialized: boolean;
|
|
15
|
+
orderPrio: number;
|
|
16
16
|
constructor(fetchTx: (attemptNum: number) => Promise<TransactionItemInputs | undefined>, name?: string | undefined);
|
|
17
17
|
initialize(): Promise<void>;
|
|
18
18
|
refetch(attemptNum: number): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAa7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,
|
|
1
|
+
{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAa7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAOhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAqGD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA0GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YA4I7B,qBAAqB;YAgDrB,eAAe;YAwDf,eAAe;CA4D9B"}
|
|
@@ -49,8 +49,8 @@ class TransactionItem {
|
|
|
49
49
|
constructor(fetchTx, name) {
|
|
50
50
|
this.fetchTx = fetchTx;
|
|
51
51
|
this.name = name;
|
|
52
|
-
this.orderPrio = 0;
|
|
53
52
|
this.initialized = false;
|
|
53
|
+
this.orderPrio = 0;
|
|
54
54
|
}
|
|
55
55
|
async initialize() {
|
|
56
56
|
await this.refetch(0);
|
|
@@ -169,7 +169,7 @@ class TransactionsManager {
|
|
|
169
169
|
async assembleTransactionSets(items) {
|
|
170
170
|
let transactionSets = [];
|
|
171
171
|
this.txHandler.log(`Reassembling ${items.length} items`);
|
|
172
|
-
const txItems =
|
|
172
|
+
const txItems = items.sort((a, b) => a.orderPrio - b.orderPrio);
|
|
173
173
|
for (let i = txItems.length - 1; i >= 0;) {
|
|
174
174
|
let item = txItems[i];
|
|
175
175
|
i--;
|
|
@@ -423,14 +423,12 @@ class TransactionsManager {
|
|
|
423
423
|
}
|
|
424
424
|
async processTransactionSet(itemSets, currentIndex) {
|
|
425
425
|
let itemSet = itemSets[currentIndex];
|
|
426
|
-
let num = 0;
|
|
427
426
|
await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => {
|
|
428
427
|
if (prevError &&
|
|
429
428
|
this.statuses.filter((x) => x.simulationSuccessful).length >
|
|
430
429
|
this.signableRetries) {
|
|
431
430
|
throw prevError;
|
|
432
431
|
}
|
|
433
|
-
num = attemptNum;
|
|
434
432
|
if (currentIndex > 0 || attemptNum > 0) {
|
|
435
433
|
const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, currentIndex);
|
|
436
434
|
itemSet = refreshedSets ? refreshedSets[0] : undefined;
|
|
@@ -13,6 +13,7 @@ export interface JupSwapDetails extends JupSwapInput {
|
|
|
13
13
|
slippageIncFactor?: number;
|
|
14
14
|
addPadding?: boolean;
|
|
15
15
|
jupQuote?: QuoteResponse;
|
|
16
|
+
wrapAndUnwrapSol?: boolean;
|
|
16
17
|
}
|
|
17
18
|
export declare function getJupQuote(swapDetails: JupSwapInput): Promise<QuoteResponse>;
|
|
18
19
|
export interface JupSwapTransaction {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAUrB,MAAM,WAAW,YAAY;IAC3B,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;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAUrB,MAAM,WAAW,YAAY;IAC3B,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;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAkB1D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAoF7B;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO;;GAwC/B"}
|
|
@@ -49,7 +49,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
|
|
|
49
49
|
swapRequest: {
|
|
50
50
|
userPublicKey: signer.publicKey.toString(),
|
|
51
51
|
quoteResponse,
|
|
52
|
-
wrapAndUnwrapSol: false,
|
|
52
|
+
wrapAndUnwrapSol: swapDetails.wrapAndUnwrapSol ?? false,
|
|
53
53
|
useTokenLedger: !swapDetails.exactOut && !swapDetails.exactIn,
|
|
54
54
|
destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(swapDetails.destinationWallet, swapDetails.outputMint).toString(),
|
|
55
55
|
},
|
|
@@ -2,6 +2,7 @@ import { PublicKey } from "@solana/web3.js";
|
|
|
2
2
|
import { Program, Umi } from "@metaplex-foundation/umi";
|
|
3
3
|
import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, PositionType, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
|
|
4
4
|
import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
|
|
5
|
+
import { QuoteResponse } from "@jup-ag/api";
|
|
5
6
|
export declare function createDynamicSolautoProgram(programId: PublicKey): Program;
|
|
6
7
|
export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
|
|
7
8
|
export declare function eligibleForNextAutomationPeriod(automation: AutomationSettings, currentUnixTime: number): boolean;
|
|
@@ -44,6 +45,9 @@ type PositionAdjustment = {
|
|
|
44
45
|
} | {
|
|
45
46
|
type: "cancellingDca";
|
|
46
47
|
value: TokenType;
|
|
48
|
+
} | {
|
|
49
|
+
type: "jupSwap";
|
|
50
|
+
value: QuoteResponse;
|
|
47
51
|
};
|
|
48
52
|
export declare class LivePositionUpdates {
|
|
49
53
|
supplyAdjustment: bigint;
|
|
@@ -55,6 +59,7 @@ export declare class LivePositionUpdates {
|
|
|
55
59
|
tokenType: TokenType;
|
|
56
60
|
};
|
|
57
61
|
cancellingDca: TokenType | undefined;
|
|
62
|
+
jupSwap: QuoteResponse | undefined;
|
|
58
63
|
new(update: PositionAdjustment): void;
|
|
59
64
|
reset(): void;
|
|
60
65
|
hasUpdates(): boolean;
|
|
@@ -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,EAElB,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,gCAAgC,EAChC,SAAS,EAMV,MAAM,iBAAiB,CAAC;AAsBzB,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -409,6 +409,7 @@ class LivePositionUpdates {
|
|
|
409
409
|
this.activeDca = undefined;
|
|
410
410
|
this.dcaInBalance = undefined;
|
|
411
411
|
this.cancellingDca = undefined;
|
|
412
|
+
this.jupSwap = undefined;
|
|
412
413
|
}
|
|
413
414
|
new(update) {
|
|
414
415
|
if (update.type === "supply") {
|
|
@@ -442,6 +443,9 @@ class LivePositionUpdates {
|
|
|
442
443
|
else if (update.type === "dcaInBalance") {
|
|
443
444
|
this.dcaInBalance = update.value;
|
|
444
445
|
}
|
|
446
|
+
else if (update.type === "jupSwap") {
|
|
447
|
+
this.jupSwap = update.value;
|
|
448
|
+
}
|
|
445
449
|
}
|
|
446
450
|
reset() {
|
|
447
451
|
this.supplyAdjustment = BigInt(0);
|
|
@@ -450,6 +454,7 @@ class LivePositionUpdates {
|
|
|
450
454
|
this.activeDca = undefined;
|
|
451
455
|
this.dcaInBalance = undefined;
|
|
452
456
|
this.cancellingDca = undefined;
|
|
457
|
+
this.jupSwap = undefined;
|
|
453
458
|
}
|
|
454
459
|
hasUpdates() {
|
|
455
460
|
return (this.supplyAdjustment !== BigInt(0) ||
|
package/package.json
CHANGED
|
@@ -420,7 +420,6 @@ export abstract class SolautoClient extends ReferralStateManager {
|
|
|
420
420
|
signerDcaTa = publicKey(this.signerDebtTa);
|
|
421
421
|
}
|
|
422
422
|
|
|
423
|
-
let addingToPos = false;
|
|
424
423
|
if (
|
|
425
424
|
isOption(args.dca) &&
|
|
426
425
|
isSome(args.dca) &&
|
|
@@ -433,7 +432,6 @@ export abstract class SolautoClient extends ReferralStateManager {
|
|
|
433
432
|
tokenType: args.dca.value.tokenType,
|
|
434
433
|
},
|
|
435
434
|
});
|
|
436
|
-
addingToPos = true;
|
|
437
435
|
}
|
|
438
436
|
}
|
|
439
437
|
|
|
@@ -82,8 +82,8 @@ class LookupTables {
|
|
|
82
82
|
export class TransactionItem {
|
|
83
83
|
lookupTableAddresses!: string[];
|
|
84
84
|
tx?: TransactionBuilder;
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
initialized: boolean = false;
|
|
86
|
+
orderPrio: number = 0;
|
|
87
87
|
|
|
88
88
|
constructor(
|
|
89
89
|
public fetchTx: (
|
|
@@ -275,7 +275,7 @@ export class TransactionsManager {
|
|
|
275
275
|
let transactionSets: TransactionSet[] = [];
|
|
276
276
|
this.txHandler.log(`Reassembling ${items.length} items`);
|
|
277
277
|
|
|
278
|
-
const txItems =
|
|
278
|
+
const txItems = items.sort((a, b) => a.orderPrio - b.orderPrio);
|
|
279
279
|
|
|
280
280
|
for (let i = txItems.length - 1; i >= 0; ) {
|
|
281
281
|
let item = txItems[i];
|
|
@@ -718,8 +718,6 @@ export class TransactionsManager {
|
|
|
718
718
|
currentIndex: number
|
|
719
719
|
) {
|
|
720
720
|
let itemSet: TransactionSet | undefined = itemSets[currentIndex];
|
|
721
|
-
let num = 0;
|
|
722
|
-
|
|
723
721
|
await retryWithExponentialBackoff(
|
|
724
722
|
async (attemptNum, prevError) => {
|
|
725
723
|
if (
|
|
@@ -730,8 +728,6 @@ export class TransactionsManager {
|
|
|
730
728
|
throw prevError;
|
|
731
729
|
}
|
|
732
730
|
|
|
733
|
-
num = attemptNum;
|
|
734
|
-
|
|
735
731
|
if (currentIndex > 0 || attemptNum > 0) {
|
|
736
732
|
const refreshedSets = await this.refreshItemSets(
|
|
737
733
|
itemSets,
|
|
@@ -33,6 +33,7 @@ export interface JupSwapDetails extends JupSwapInput {
|
|
|
33
33
|
slippageIncFactor?: number;
|
|
34
34
|
addPadding?: boolean;
|
|
35
35
|
jupQuote?: QuoteResponse;
|
|
36
|
+
wrapAndUnwrapSol?: boolean;
|
|
36
37
|
}
|
|
37
38
|
|
|
38
39
|
function createTransactionInstruction(
|
|
@@ -102,7 +103,7 @@ export async function getJupSwapTransaction(
|
|
|
102
103
|
swapRequest: {
|
|
103
104
|
userPublicKey: signer.publicKey.toString(),
|
|
104
105
|
quoteResponse,
|
|
105
|
-
wrapAndUnwrapSol: false,
|
|
106
|
+
wrapAndUnwrapSol: swapDetails.wrapAndUnwrapSol ?? false,
|
|
106
107
|
useTokenLedger: !swapDetails.exactOut && !swapDetails.exactIn,
|
|
107
108
|
destinationTokenAccount: getTokenAccount(
|
|
108
109
|
swapDetails.destinationWallet,
|
|
@@ -46,6 +46,7 @@ import {
|
|
|
46
46
|
import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
|
|
47
47
|
import { fetchTokenPrices } from "../priceUtils";
|
|
48
48
|
import { getRebalanceValues } from "./rebalanceUtils";
|
|
49
|
+
import { QuoteResponse } from "@jup-ag/api";
|
|
49
50
|
|
|
50
51
|
export function createDynamicSolautoProgram(programId: PublicKey): Program {
|
|
51
52
|
return {
|
|
@@ -630,7 +631,8 @@ type PositionAdjustment =
|
|
|
630
631
|
| { type: "settings"; value: SolautoSettingsParametersInpArgs }
|
|
631
632
|
| { type: "dca"; value: DCASettingsInpArgs }
|
|
632
633
|
| { type: "dcaInBalance"; value: { amount: bigint; tokenType: TokenType } }
|
|
633
|
-
| { type: "cancellingDca"; value: TokenType }
|
|
634
|
+
| { type: "cancellingDca"; value: TokenType }
|
|
635
|
+
| { type: "jupSwap", value: QuoteResponse };
|
|
634
636
|
|
|
635
637
|
export class LivePositionUpdates {
|
|
636
638
|
public supplyAdjustment = BigInt(0);
|
|
@@ -639,6 +641,7 @@ export class LivePositionUpdates {
|
|
|
639
641
|
public activeDca: DCASettings | undefined = undefined;
|
|
640
642
|
public dcaInBalance?: { amount: bigint; tokenType: TokenType } = undefined;
|
|
641
643
|
public cancellingDca: TokenType | undefined = undefined;
|
|
644
|
+
public jupSwap: QuoteResponse | undefined = undefined;
|
|
642
645
|
|
|
643
646
|
new(update: PositionAdjustment) {
|
|
644
647
|
if (update.type === "supply") {
|
|
@@ -666,6 +669,8 @@ export class LivePositionUpdates {
|
|
|
666
669
|
this.cancellingDca = update.value;
|
|
667
670
|
} else if (update.type === "dcaInBalance") {
|
|
668
671
|
this.dcaInBalance = update.value;
|
|
672
|
+
} else if (update.type === "jupSwap") {
|
|
673
|
+
this.jupSwap = update.value;
|
|
669
674
|
}
|
|
670
675
|
}
|
|
671
676
|
|
|
@@ -676,6 +681,7 @@ export class LivePositionUpdates {
|
|
|
676
681
|
this.activeDca = undefined;
|
|
677
682
|
this.dcaInBalance = undefined;
|
|
678
683
|
this.cancellingDca = undefined;
|
|
684
|
+
this.jupSwap = undefined;
|
|
679
685
|
}
|
|
680
686
|
|
|
681
687
|
hasUpdates(): boolean {
|