@haven-fi/solauto-sdk 1.0.519 → 1.0.521
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/transactions/transactionsManager.d.ts.map +1 -1
- package/dist/transactions/transactionsManager.js +4 -3
- package/dist/utils/jitoUtils.d.ts +2 -2
- package/dist/utils/jitoUtils.d.ts.map +1 -1
- package/dist/utils/jitoUtils.js +4 -7
- package/dist/utils/solauto/rebalanceUtils.d.ts.map +1 -1
- package/dist/utils/solauto/rebalanceUtils.js +2 -1
- package/package.json +1 -1
- package/src/transactions/transactionsManager.ts +9 -5
- package/src/utils/jitoUtils.ts +0 -12
- package/src/utils/solauto/rebalanceUtils.ts +2 -1
@@ -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;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,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;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;
|
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;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,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;IAMhC,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;IAwCrC,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;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}
|
@@ -77,7 +77,9 @@ class TransactionSet {
|
|
77
77
|
this.items = items;
|
78
78
|
}
|
79
79
|
async lutInputs() {
|
80
|
-
|
80
|
+
const lutInputs = await this.lookupTables.getLutInputs(this.lutAddresses());
|
81
|
+
return lutInputs.filter((lut, index, self) => index ===
|
82
|
+
self.findIndex((item) => item.publicKey.toString() === lut.publicKey.toString()));
|
81
83
|
}
|
82
84
|
async fitsWith(item) {
|
83
85
|
if (!item.tx) {
|
@@ -388,9 +390,8 @@ class TransactionsManager {
|
|
388
390
|
}
|
389
391
|
let txSigs;
|
390
392
|
let error;
|
391
|
-
const lutInputs = await Promise.all(itemSets.map(async (x) => await x.lutInputs()));
|
392
393
|
try {
|
393
|
-
txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions,
|
394
|
+
txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions, this.txType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
|
394
395
|
}
|
395
396
|
catch (e) {
|
396
397
|
error = e;
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { Connection, PublicKey } from "@solana/web3.js";
|
2
|
-
import { Signer, TransactionBuilder, Umi, TransactionMessage
|
2
|
+
import { Signer, TransactionBuilder, Umi, TransactionMessage } from "@metaplex-foundation/umi";
|
3
3
|
import { PriorityFeeSetting, TransactionRunType } from "../types";
|
4
4
|
export declare function getRandomTipAccount(): PublicKey;
|
5
5
|
export declare function getRequiredSigners(message: TransactionMessage): {
|
@@ -7,5 +7,5 @@ export declare function getRequiredSigners(message: TransactionMessage): {
|
|
7
7
|
publicKey: string;
|
8
8
|
isWritable: boolean;
|
9
9
|
}[];
|
10
|
-
export declare function sendJitoBundledTransactions(umi: Umi, connection: Connection, userSigner: Signer, otherSigners: Signer[], txs: TransactionBuilder[],
|
10
|
+
export declare function sendJitoBundledTransactions(umi: Umi, connection: Connection, userSigner: Signer, otherSigners: Signer[], txs: TransactionBuilder[], txType?: TransactionRunType, priorityFeeSetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<string[] | undefined>;
|
11
11
|
//# sourceMappingURL=jitoUtils.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,
|
1
|
+
{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AA+ND,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,CA8F/B"}
|
package/dist/utils/jitoUtils.js
CHANGED
@@ -98,10 +98,9 @@ async function simulateJitoBundle(umi, txs) {
|
|
98
98
|
const transactionResults = simulationResult.transactionResults;
|
99
99
|
return transactionResults;
|
100
100
|
}
|
101
|
-
async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigners, txs,
|
101
|
+
async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigners, txs, sign, feeEstimates, computeUnitLimits) {
|
102
102
|
let builtTxs = await Promise.all(txs.map(async (tx, i) => {
|
103
103
|
return (0, solanaUtils_1.assembleFinalTransaction)(userSigner, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined)
|
104
|
-
.setAddressLookupTables(lutInputs)
|
105
104
|
.setBlockhash(blockhash)
|
106
105
|
.build(umi);
|
107
106
|
}));
|
@@ -190,7 +189,7 @@ function getRequiredSigners(message) {
|
|
190
189
|
}
|
191
190
|
return signersInfo;
|
192
191
|
}
|
193
|
-
async function sendJitoBundledTransactions(umi, connection, userSigner, otherSigners, txs,
|
192
|
+
async function sendJitoBundledTransactions(umi, connection, userSigner, otherSigners, txs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, onAwaitingSign) {
|
194
193
|
if (txs.length === 1) {
|
195
194
|
const resp = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(umi, connection, txs[0], txType, priorityFeeSetting, onAwaitingSign);
|
196
195
|
return resp ? [bytes_1.bs58.encode(resp)] : undefined;
|
@@ -200,8 +199,6 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
|
|
200
199
|
(0, generalUtils_1.consoleLog)(txs.map((tx) => tx.getInstructions().map((x) => x.programId.toString())));
|
201
200
|
(0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
|
202
201
|
txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150000));
|
203
|
-
(0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
|
204
|
-
(0, generalUtils_1.consoleLog)(lutInputs);
|
205
202
|
const feeEstimates = priorityFeeSetting !== types_1.PriorityFeeSetting.None
|
206
203
|
? await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting, true)) ?? 1000000))
|
207
204
|
: undefined;
|
@@ -209,13 +206,13 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
|
|
209
206
|
let builtTxs = [];
|
210
207
|
let simulationResults;
|
211
208
|
if (txType !== "skip-simulation") {
|
212
|
-
builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs,
|
209
|
+
builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, false, feeEstimates);
|
213
210
|
(0, generalUtils_1.consoleLog)(builtTxs.map((x) => x.message.compiledInstructions.map((y) => x.message.staticAccountKeys[y.programIdIndex].toString())));
|
214
211
|
simulationResults = await simulateJitoBundle(umi, builtTxs);
|
215
212
|
}
|
216
213
|
if (txType !== "only-simulate") {
|
217
214
|
onAwaitingSign?.();
|
218
|
-
builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs,
|
215
|
+
builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, true, feeEstimates, simulationResults
|
219
216
|
? simulationResults.map((x) => x.unitsConsumed * 1.15)
|
220
217
|
: undefined);
|
221
218
|
const serializedTxs = builtTxs.map((x) => x.serialize());
|
@@ -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,EAAgB,MAAM,iBAAiB,CAAC;AAc5E,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;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;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,CA4EjB;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,UAAU,CAAC,EAAE,MAAM,GAClB,qBAAqB,GAAG,SAAS,CA0EnC;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,qBAAqB,EACrC,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA2B9B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,EACtC,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,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,EAAgB,MAAM,iBAAiB,CAAC;AAc5E,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;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;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,CA4EjB;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,UAAU,CAAC,EAAE,MAAM,GAClB,qBAAqB,GAAG,SAAS,CA0EnC;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,qBAAqB,EACrC,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA2B9B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,EACtC,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,CA0FzB"}
|
@@ -206,7 +206,8 @@ async function getJupSwapRebalanceDetails(client, values, flRequirements, target
|
|
206
206
|
: (0, numberUtils_1.toBaseUnit)(usdToSwap / (0, priceUtils_1.safeGetPrice)(output.mint), output.decimals);
|
207
207
|
const repaying = values.rebalanceDirection === generated_1.RebalanceDirection.Repay;
|
208
208
|
const flashLoanRepayFromDebt = repaying && flRequirements && flRequirements.useDebtLiquidity;
|
209
|
-
const exactOut =
|
209
|
+
const exactOut = flashLoanRepayFromDebt;
|
210
|
+
// || rebalanceToZero
|
210
211
|
const exactIn = !exactOut;
|
211
212
|
const jupSwapInput = {
|
212
213
|
inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
|
package/package.json
CHANGED
@@ -124,7 +124,15 @@ class TransactionSet {
|
|
124
124
|
) {}
|
125
125
|
|
126
126
|
async lutInputs(): Promise<AddressLookupTableInput[]> {
|
127
|
-
|
127
|
+
const lutInputs = await this.lookupTables.getLutInputs(this.lutAddresses());
|
128
|
+
|
129
|
+
return lutInputs.filter(
|
130
|
+
(lut, index, self) =>
|
131
|
+
index ===
|
132
|
+
self.findIndex(
|
133
|
+
(item) => item.publicKey.toString() === lut.publicKey.toString()
|
134
|
+
)
|
135
|
+
);
|
128
136
|
}
|
129
137
|
|
130
138
|
async fitsWith(item: TransactionItem): Promise<boolean> {
|
@@ -619,9 +627,6 @@ export class TransactionsManager {
|
|
619
627
|
|
620
628
|
let txSigs: string[] | undefined;
|
621
629
|
let error: Error | undefined;
|
622
|
-
const lutInputs = await Promise.all(
|
623
|
-
itemSets.map(async (x) => await x.lutInputs())
|
624
|
-
);
|
625
630
|
try {
|
626
631
|
txSigs = await sendJitoBundledTransactions(
|
627
632
|
this.txHandler.umi,
|
@@ -629,7 +634,6 @@ export class TransactionsManager {
|
|
629
634
|
this.txHandler.signer,
|
630
635
|
this.txHandler.otherSigners,
|
631
636
|
transactions,
|
632
|
-
lutInputs.flat(),
|
633
637
|
this.txType,
|
634
638
|
this.getUpdatedPriorityFeeSetting(prevError, attemptNum),
|
635
639
|
() =>
|
package/src/utils/jitoUtils.ts
CHANGED
@@ -154,7 +154,6 @@ async function umiToVersionedTransactions(
|
|
154
154
|
userSigner: Signer,
|
155
155
|
otherSigners: Signer[],
|
156
156
|
txs: TransactionBuilder[],
|
157
|
-
lutInputs: AddressLookupTableInput[],
|
158
157
|
sign: boolean,
|
159
158
|
feeEstimates?: number[],
|
160
159
|
computeUnitLimits?: number[]
|
@@ -167,7 +166,6 @@ async function umiToVersionedTransactions(
|
|
167
166
|
feeEstimates ? feeEstimates[i] : undefined,
|
168
167
|
computeUnitLimits ? computeUnitLimits[i] : undefined
|
169
168
|
)
|
170
|
-
.setAddressLookupTables(lutInputs)
|
171
169
|
.setBlockhash(blockhash)
|
172
170
|
.build(umi);
|
173
171
|
})
|
@@ -286,7 +284,6 @@ export async function sendJitoBundledTransactions(
|
|
286
284
|
userSigner: Signer,
|
287
285
|
otherSigners: Signer[],
|
288
286
|
txs: TransactionBuilder[],
|
289
|
-
lutInputs: AddressLookupTableInput[],
|
290
287
|
txType?: TransactionRunType,
|
291
288
|
priorityFeeSetting: PriorityFeeSetting = PriorityFeeSetting.Min,
|
292
289
|
onAwaitingSign?: () => void
|
@@ -314,13 +311,6 @@ export async function sendJitoBundledTransactions(
|
|
314
311
|
);
|
315
312
|
|
316
313
|
txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150_000));
|
317
|
-
|
318
|
-
consoleLog(
|
319
|
-
"Transaction sizes: ",
|
320
|
-
txs.map((x) => x.getTransactionSize(umi))
|
321
|
-
);
|
322
|
-
consoleLog(lutInputs);
|
323
|
-
|
324
314
|
const feeEstimates =
|
325
315
|
priorityFeeSetting !== PriorityFeeSetting.None
|
326
316
|
? await Promise.all(
|
@@ -349,7 +339,6 @@ export async function sendJitoBundledTransactions(
|
|
349
339
|
userSigner,
|
350
340
|
otherSigners,
|
351
341
|
txs,
|
352
|
-
lutInputs,
|
353
342
|
false,
|
354
343
|
feeEstimates
|
355
344
|
);
|
@@ -372,7 +361,6 @@ export async function sendJitoBundledTransactions(
|
|
372
361
|
userSigner,
|
373
362
|
otherSigners,
|
374
363
|
txs,
|
375
|
-
lutInputs,
|
376
364
|
true,
|
377
365
|
feeEstimates,
|
378
366
|
simulationResults
|
@@ -424,7 +424,8 @@ export async function getJupSwapRebalanceDetails(
|
|
424
424
|
const flashLoanRepayFromDebt =
|
425
425
|
repaying && flRequirements && flRequirements.useDebtLiquidity;
|
426
426
|
|
427
|
-
const exactOut =
|
427
|
+
const exactOut = flashLoanRepayFromDebt;
|
428
|
+
// || rebalanceToZero
|
428
429
|
const exactIn = !exactOut;
|
429
430
|
|
430
431
|
const jupSwapInput: JupSwapInput = {
|