@haven-fi/solauto-sdk 1.0.736 → 1.0.738

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.
Files changed (14) hide show
  1. package/dist/services/rebalance/rebalanceSwapManager.d.ts.map +1 -1
  2. package/dist/services/rebalance/rebalanceSwapManager.js +1 -1
  3. package/dist/services/swap/jupSwapManager.d.ts +2 -1
  4. package/dist/services/swap/jupSwapManager.d.ts.map +1 -1
  5. package/dist/services/swap/jupSwapManager.js +3 -2
  6. package/dist/utils/jitoUtils.d.ts.map +1 -1
  7. package/dist/utils/jitoUtils.js +4 -6
  8. package/dist/utils/solanaUtils.d.ts.map +1 -1
  9. package/dist/utils/solanaUtils.js +4 -0
  10. package/package.json +1 -1
  11. package/src/services/rebalance/rebalanceSwapManager.ts +1 -3
  12. package/src/services/swap/jupSwapManager.ts +8 -4
  13. package/src/utils/jitoUtils.ts +23 -24
  14. package/src/utils/solanaUtils.ts +4 -0
package/dist/services/rebalance/rebalanceSwapManager.d.ts.map CHANGED
@@ -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;AAE5C,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,EAA0B,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAc3E,qBAAa,oBAAoB;IAS7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAZb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,aAAa,CAAU;gBAGrB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAU/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAsCnB,OAAO,CAAC,kCAAkC;YAwE5B,mBAAmB;IAyCjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}
1
+ {"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,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,EAA0B,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAY3E,qBAAa,oBAAoB;IAS7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAZb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,aAAa,CAAU;gBAGrB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAU/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAsCnB,OAAO,CAAC,kCAAkC;YAwE5B,mBAAmB;IAyCjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}
package/dist/services/rebalance/rebalanceSwapManager.js CHANGED
@@ -14,7 +14,7 @@ class RebalanceSwapManager {
14
14
  this.flRequirements = flRequirements;
15
15
  this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
16
16
  this.priceType = priceType;
17
- this.jupSwapManager = new swap_1.JupSwapManager(client.signer);
17
+ this.jupSwapManager = new swap_1.JupSwapManager(client.signer, true);
18
18
  this.solautoFeeBps = solautoFees_1.SolautoFeesBps.create(this.client.isReferred, this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd(this.priceType)).getSolautoFeesBps(values.rebalanceDirection).total;
19
19
  }
20
20
  isBoost() {
package/dist/services/swap/jupSwapManager.d.ts CHANGED
@@ -24,9 +24,10 @@ export interface JupSwapTransactionData {
24
24
  }
25
25
  export declare class JupSwapManager {
26
26
  private signer;
27
+ private limitSize?;
27
28
  jupApi: import("@jup-ag/api").DefaultApi;
28
29
  jupQuote: QuoteResponse | undefined;
29
- constructor(signer: Signer);
30
+ constructor(signer: Signer, limitSize?: boolean | undefined);
30
31
  getQuote(data: SwapInput): Promise<QuoteResponse>;
31
32
  private getJupInstructions;
32
33
  priceImpactBps(): number;
package/dist/services/swap/jupSwapManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAWrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,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,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,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;YA6BhD,kBAAkB;IAsChC,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"}
1
+ {"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAWrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,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,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAMvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS,CAAC;IANpB,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAG7C,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,OAAO,YAAA;IAGhB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YA8BhD,kBAAkB;IAsChC,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"}
package/dist/services/swap/jupSwapManager.js CHANGED
@@ -6,8 +6,9 @@ const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters"
6
6
  const api_1 = require("@jup-ag/api");
7
7
  const utils_1 = require("../../utils");
8
8
  class JupSwapManager {
9
- constructor(signer) {
9
+ constructor(signer, limitSize) {
10
10
  this.signer = signer;
11
+ this.limitSize = limitSize;
11
12
  this.jupApi = (0, api_1.createJupiterApiClient)();
12
13
  this.jupQuote = undefined;
13
14
  }
@@ -27,7 +28,7 @@ class JupSwapManager {
27
28
  ? "ExactIn"
28
29
  : undefined,
29
30
  slippageBps,
30
- maxAccounts: !data.exactOut
31
+ maxAccounts: !data.exactOut && this.limitSize
31
32
  ? (lowLiquidityMint ? 25 : 15) + attemptNum * 5
32
33
  : undefined,
33
34
  }), 6, 250);
package/dist/utils/jitoUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAgBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAwHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAwG/B"}
1
+ {"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAgBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAsHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAyG/B"}
package/dist/utils/jitoUtils.js CHANGED
@@ -103,11 +103,9 @@ function getAdditionalSigners(message) {
103
103
  return signersInfo;
104
104
  }
105
105
  async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigners, txs, sign, feeEstimates, computeUnitLimits) {
106
- let builtTxs = await Promise.all(txs.map(async (tx, i) => {
107
- return (0, solanaUtils_1.assembleFinalTransaction)(umi, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined)
108
- .setBlockhash(blockhash)
109
- .build(umi);
110
- }));
106
+ let builtTxs = txs.map((tx, i) => (0, solanaUtils_1.assembleFinalTransaction)(umi, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined)
107
+ .setBlockhash(blockhash)
108
+ .build(umi));
111
109
  if (sign) {
112
110
  builtTxs = await userSigner.signAllTransactions(builtTxs);
113
111
  for (const signer of otherSigners) {
@@ -199,7 +197,7 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
199
197
  let builtTxs = [];
200
198
  let simulationResults;
201
199
  if (txType !== "skip-simulation") {
202
- builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, false, undefined, Array(txs.length).map(_ => 1400000));
200
+ builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, false, undefined, Array(txs.length).map((_) => 1400000));
203
201
  simulationResults = await simulateJitoBundle(umi, builtTxs);
204
202
  }
205
203
  const feeEstimates = (0, services_1.usePriorityFee)(priorityFeeSetting)
package/dist/utils/solanaUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"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"}
package/dist/utils/solanaUtils.js CHANGED
@@ -111,16 +111,20 @@ function addTxOptimizations(umi, tx, computeUnitPrice, computeUnitLimit) {
111
111
  const computeLimitIx = computeUnitLimit
112
112
  ? setComputeUnitLimitUmiIx(umi.identity, computeUnitLimit)
113
113
  : (0, umi_1.transactionBuilder)();
114
+ (0, generalUtils_1.consoleLog)("Optimizations:", computeUnitPrice, computeUnitLimit);
114
115
  const allOptimizations = tx.prepend(computePriceIx).prepend(computeLimitIx);
115
116
  const withCuPrice = tx.prepend(computePriceIx);
116
117
  const withCuLimit = tx.prepend(computeLimitIx);
117
118
  if (allOptimizations.fitsInOneTransaction(umi)) {
119
+ (0, generalUtils_1.consoleLog)("Adding all tx optimizations");
118
120
  return allOptimizations;
119
121
  }
120
122
  else if (withCuPrice.fitsInOneTransaction(umi)) {
123
+ (0, generalUtils_1.consoleLog)("Adding CU price optimization");
121
124
  return withCuPrice;
122
125
  }
123
126
  else if (withCuLimit.fitsInOneTransaction(umi)) {
127
+ (0, generalUtils_1.consoleLog)("Adding CU limit optimization");
124
128
  return withCuLimit;
125
129
  }
126
130
  else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.736",
3
+ "version": "1.0.738",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "description": "Typescript SDK for the Solauto program on the Solana blockchain",
package/src/services/rebalance/rebalanceSwapManager.ts CHANGED
@@ -6,12 +6,10 @@ import { JupSwapManager, SwapParams, SwapInput } from "../swap";
6
6
  import { applyDebtAdjustmentUsd, RebalanceValues } from "./rebalanceValues";
7
7
  import { PriceType, RebalanceDirection, TokenType } from "../../generated";
8
8
  import {
9
- bytesToI80F48,
10
9
  consoleLog,
11
10
  fromBaseUnit,
12
11
  fromBps,
13
12
  getLiqUtilzationRateBps,
14
- isMarginfiPosition,
15
13
  safeGetPrice,
16
14
  toBaseUnit,
17
15
  tokenInfo,
@@ -33,7 +31,7 @@ export class RebalanceSwapManager {
33
31
  private targetLiqUtilizationRateBps?: number,
34
32
  private priceType?: PriceType
35
33
  ) {
36
- this.jupSwapManager = new JupSwapManager(client.signer);
34
+ this.jupSwapManager = new JupSwapManager(client.signer, true);
37
35
  this.solautoFeeBps = SolautoFeesBps.create(
38
36
  this.client.isReferred,
39
37
  this.targetLiqUtilizationRateBps,
package/src/services/swap/jupSwapManager.ts CHANGED
@@ -51,7 +51,10 @@ export class JupSwapManager {
51
51
 
52
52
  public jupQuote: QuoteResponse | undefined = undefined;
53
53
 
54
- constructor(private signer: Signer) {}
54
+ constructor(
55
+ private signer: Signer,
56
+ private limitSize?: boolean
57
+ ) {}
55
58
 
56
59
  public async getQuote(data: SwapInput): Promise<QuoteResponse> {
57
60
  const inputMintInfo: TokenInfo | undefined = tokenInfo(data.inputMint);
@@ -73,9 +76,10 @@ export class JupSwapManager {
73
76
  ? "ExactIn"
74
77
  : undefined,
75
78
  slippageBps,
76
- maxAccounts: !data.exactOut
77
- ? (lowLiquidityMint ? 25 : 15) + attemptNum * 5
78
- : undefined,
79
+ maxAccounts:
80
+ !data.exactOut && this.limitSize
81
+ ? (lowLiquidityMint ? 25 : 15) + attemptNum * 5
82
+ : undefined,
79
83
  }),
80
84
  6,
81
85
  250
package/src/utils/jitoUtils.ts CHANGED
@@ -160,17 +160,15 @@ async function umiToVersionedTransactions(
160
160
  feeEstimates?: number[],
161
161
  computeUnitLimits?: number[]
162
162
  ): Promise<VersionedTransaction[]> {
163
- let builtTxs = await Promise.all(
164
- txs.map(async (tx, i) => {
165
- return assembleFinalTransaction(
166
- umi,
167
- tx,
168
- feeEstimates ? feeEstimates[i] : undefined,
169
- computeUnitLimits ? computeUnitLimits[i] : undefined
170
- )
171
- .setBlockhash(blockhash)
172
- .build(umi);
173
- })
163
+ let builtTxs = txs.map((tx, i) =>
164
+ assembleFinalTransaction(
165
+ umi,
166
+ tx,
167
+ feeEstimates ? feeEstimates[i] : undefined,
168
+ computeUnitLimits ? computeUnitLimits[i] : undefined
169
+ )
170
+ .setBlockhash(blockhash)
171
+ .build(umi)
174
172
  );
175
173
 
176
174
  if (sign) {
@@ -280,7 +278,7 @@ export async function sendJitoBundledTransactions(
280
278
  abortController?: AbortController
281
279
  ): Promise<string[] | undefined> {
282
280
  const txs = [...transactions];
283
-
281
+
284
282
  if (txs.length === 1) {
285
283
  const resp = await sendSingleOptimizedTransaction(
286
284
  umi,
@@ -313,6 +311,7 @@ export async function sendJitoBundledTransactions(
313
311
  if (abortController?.signal.aborted) {
314
312
  return;
315
313
  }
314
+
316
315
  let builtTxs: VersionedTransaction[] = [];
317
316
  let simulationResults: SimulatedTransactionResponse[] | undefined;
318
317
  if (txType !== "skip-simulation") {
@@ -324,24 +323,24 @@ export async function sendJitoBundledTransactions(
324
323
  txs,
325
324
  false,
326
325
  undefined,
327
- Array(txs.length).map(_ => 1_400_000)
326
+ Array(txs.length).map((_) => 1_400_000)
328
327
  );
329
328
  simulationResults = await simulateJitoBundle(umi, builtTxs);
330
329
  }
331
330
 
332
331
  const feeEstimates = usePriorityFee(priorityFeeSetting)
333
- ? await Promise.all(
334
- txs.map(
335
- async (x) =>
336
- (await getComputeUnitPriceEstimate(
337
- umi,
338
- x,
339
- priorityFeeSetting,
340
- true
341
- )) ?? 1000000
332
+ ? await Promise.all(
333
+ txs.map(
334
+ async (x) =>
335
+ (await getComputeUnitPriceEstimate(
336
+ umi,
337
+ x,
338
+ priorityFeeSetting,
339
+ true
340
+ )) ?? 1000000
341
+ )
342
342
  )
343
- )
344
- : undefined;
343
+ : undefined;
345
344
 
346
345
  if (abortController?.signal.aborted) {
347
346
  return;
package/src/utils/solanaUtils.ts CHANGED
@@ -223,14 +223,18 @@ export function addTxOptimizations(
223
223
  ? setComputeUnitLimitUmiIx(umi.identity, computeUnitLimit)
224
224
  : transactionBuilder();
225
225
 
226
+ consoleLog("Optimizations:", computeUnitPrice, computeUnitLimit);
226
227
  const allOptimizations = tx.prepend(computePriceIx).prepend(computeLimitIx);
227
228
  const withCuPrice = tx.prepend(computePriceIx);
228
229
  const withCuLimit = tx.prepend(computeLimitIx);
229
230
  if (allOptimizations.fitsInOneTransaction(umi)) {
231
+ consoleLog("Adding all tx optimizations");
230
232
  return allOptimizations;
231
233
  } else if (withCuPrice.fitsInOneTransaction(umi)) {
234
+ consoleLog("Adding CU price optimization");
232
235
  return withCuPrice;
233
236
  } else if (withCuLimit.fitsInOneTransaction(umi)) {
237
+ consoleLog("Adding CU limit optimization");
234
238
  return withCuLimit;
235
239
  } else {
236
240
  return tx;