@haven-fi/solauto-sdk 1.0.333 → 1.0.334

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 (7) hide show
  1. package/dist/transactions/transactionsManager.d.ts.map +1 -1
  2. package/dist/transactions/transactionsManager.js +13 -6
  3. package/dist/utils/jitoUtils.d.ts.map +1 -1
  4. package/dist/utils/jitoUtils.js +4 -4
  5. package/package.json +1 -1
  6. package/src/transactions/transactionsManager.ts +27 -16
  7. package/src/utils/jitoUtils.ts +3 -5
package/dist/transactions/transactionsManager.d.ts.map CHANGED
@@ -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,EACL,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;AAW7D,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;AAyFD,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,qBAAa,mBAAmB;IAK5B,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;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAXpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,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,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YAmE7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAmD9B"}
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,EACL,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;AAW7D,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;AAyFD,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,qBAAa,mBAAmB;IAK5B,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;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAXpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,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,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YA8E7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAmD9B"}
package/dist/transactions/transactionsManager.js CHANGED
@@ -349,14 +349,21 @@ class TransactionsManager {
349
349
  transactions.push(await set.getSingleTransaction());
350
350
  }
351
351
  this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum);
352
- const txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.signer, transactions, false, this.priorityFeeSetting);
353
- if (Boolean(txSigs) && txSigs.length > 0) {
354
- this.updateStatusForSets(itemSets, TransactionStatus.Successful, attemptNum, txSigs);
352
+ let txSigs;
353
+ let error;
354
+ try {
355
+ txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.signer, transactions, false, this.priorityFeeSetting);
355
356
  }
356
- else {
357
- this.updateStatusForSets(itemSets, TransactionStatus.Failed, attemptNum, txSigs, true);
358
- throw new Error("Unknown error");
357
+ catch (e) {
358
+ error = e.message;
359
+ }
360
+ if (error || !Boolean(txSigs) || txSigs?.length === 0) {
361
+ this.updateStatusForSets(itemSets, TransactionStatus.Failed, attemptNum, txSigs, true, error);
362
+ if (error) {
363
+ throw new Error(error ? error : "Unknown error");
364
+ }
359
365
  }
366
+ this.updateStatusForSets(itemSets, TransactionStatus.Successful, attemptNum, txSigs);
360
367
  }, this.retries, this.retryDelay, this.errorsToThrow).catch((e) => {
361
368
  this.updateStatusForSets(itemSets, TransactionStatus.Failed, num, undefined, true, e.message);
362
369
  throw e;
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,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAsHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAkD/B"}
1
+ {"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAwHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8C/B"}
package/dist/utils/jitoUtils.js CHANGED
@@ -95,8 +95,11 @@ async function sendJitoBundle(transactions) {
95
95
  });
96
96
  }
97
97
  catch (e) {
98
- if (e.response) {
98
+ if (e.response.data.error) {
99
99
  console.error("Jito send bundle error:", e.response.data.error);
100
+ throw new Error(e.response.data.error.message);
101
+ }
102
+ else {
100
103
  throw e;
101
104
  }
102
105
  }
@@ -115,9 +118,6 @@ async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, prior
115
118
  : undefined;
116
119
  let builtTxs = await umiToVersionedTransactions(umi, signer, txs, true, // false if simulating first and rebuilding later
117
120
  feeEstimates);
118
- for (let i = 0; i < txs.length; i++) {
119
- (0, generalUtils_1.consoleLog)("Transaction", i, txs[i].getInstructions());
120
- }
121
121
  // const simulationResults = await simulateJitoBundle(umi, builtTxs);
122
122
  if (!simulateOnly) {
123
123
  // let builtTxs = await umiToVersionedTransactions(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.333",
3
+ "version": "1.0.334",
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/transactions/transactionsManager.ts CHANGED
@@ -551,30 +551,41 @@ export class TransactionsManager {
551
551
  TransactionStatus.Processing,
552
552
  attemptNum
553
553
  );
554
- const txSigs = await sendJitoBundledTransactions(
555
- this.txHandler.umi,
556
- this.txHandler.signer,
557
- transactions,
558
- false,
559
- this.priorityFeeSetting
560
- );
561
- if (Boolean(txSigs) && txSigs!.length > 0) {
562
- this.updateStatusForSets(
563
- itemSets,
564
- TransactionStatus.Successful,
565
- attemptNum,
566
- txSigs
554
+
555
+ let txSigs: string[] | undefined;
556
+ let error: string | undefined;
557
+ try {
558
+ txSigs = await sendJitoBundledTransactions(
559
+ this.txHandler.umi,
560
+ this.txHandler.signer,
561
+ transactions,
562
+ false,
563
+ this.priorityFeeSetting
567
564
  );
568
- } else {
565
+ } catch (e: any) {
566
+ error = e.message;
567
+ }
568
+
569
+ if (error || !Boolean(txSigs) || txSigs?.length === 0) {
569
570
  this.updateStatusForSets(
570
571
  itemSets,
571
572
  TransactionStatus.Failed,
572
573
  attemptNum,
573
574
  txSigs,
574
- true
575
+ true,
576
+ error
575
577
  );
576
- throw new Error("Unknown error");
578
+ if (error) {
579
+ throw new Error(error ? error : "Unknown error");
580
+ }
577
581
  }
582
+
583
+ this.updateStatusForSets(
584
+ itemSets,
585
+ TransactionStatus.Successful,
586
+ attemptNum,
587
+ txSigs
588
+ );
578
589
  },
579
590
  this.retries,
580
591
  this.retryDelay,
package/src/utils/jitoUtils.ts CHANGED
@@ -139,8 +139,10 @@ async function sendJitoBundle(transactions: string[]): Promise<string[]> {
139
139
  }
140
140
  );
141
141
  } catch (e: any) {
142
- if (e.response) {
142
+ if (e.response.data.error) {
143
143
  console.error("Jito send bundle error:", e.response.data.error);
144
+ throw new Error(e.response.data.error.message);
145
+ } else {
144
146
  throw e;
145
147
  }
146
148
  }
@@ -184,10 +186,6 @@ export async function sendJitoBundledTransactions(
184
186
  feeEstimates
185
187
  );
186
188
 
187
- for (let i = 0; i < txs.length; i++) {
188
- consoleLog("Transaction", i, txs[i].getInstructions());
189
- }
190
-
191
189
  // const simulationResults = await simulateJitoBundle(umi, builtTxs);
192
190
 
193
191
  if (!simulateOnly) {