@haven-fi/solauto-sdk 1.0.272 → 1.0.274

package/dist/transactions/transactionsManager.d.ts.map

@@ -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;AAKzD,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;AAO7D,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;AAmFD,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,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAVpB,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,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA8CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,mBAAmB;YAMb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+DzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA+BxB,qBAAqB;YAgDrB,cAAc;YAkCd,eAAe;CAkD9B"}
+{"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;AAKzD,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;AAO7D,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;AAmFD,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,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAVpB,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,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA8CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,mBAAmB;YAMb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+DzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA+BxB,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAoD9B"}

package/dist/transactions/transactionsManager.js

@@ -104,9 +104,11 @@ class TransactionSet {
         const transactions = this.items
             .filter((x) => x.tx && x.tx.getInstructions().length > 0)
             .map((x) => x.tx);
+        const lutInputs = await this.lookupTables.getLutInputs(this.lutAddresses());
+        this.txHandler.log(lutInputs);
         return (0, umi_1.transactionBuilder)()
             .add(transactions)
-            .setAddressLookupTables(await this.lookupTables.getLutInputs(this.lutAddresses()));
+            .setAddressLookupTables(lutInputs);
     }
     lutAddresses() {
         return Array.from(new Set(this.items.map((x) => x.lookupTableAddresses).flat()));
@@ -327,7 +329,7 @@ class TransactionsManager {
             }
         }, this.retries, this.retryDelay, this.errorsToThrow).catch((e) => {
             if (itemSet) {
-                this.updateStatus(itemSet.name(), TransactionStatus.Failed, num);
+                this.updateStatus(itemSet.name(), TransactionStatus.Failed, num, undefined, undefined, e.message);
             }
             throw e;
         });
@@ -341,11 +343,11 @@ class TransactionsManager {
         ]);
         if (newItemSets.length > 1) {
             itemSets.splice(currentIndex, itemSets.length - currentIndex, ...newItemSets);
-            const startOfQueuedStatuses = this.statuses.findIndex(x => x.status === TransactionStatus.Queued);
+            const startOfQueuedStatuses = this.statuses.findIndex((x) => x.status === TransactionStatus.Queued);
             this.statuses.splice(startOfQueuedStatuses, this.statuses.length - startOfQueuedStatuses, ...newItemSets.map((x, i) => ({
                 name: x.name(),
                 attemptNum: i === 0 ? attemptNum : 0,
-                status: TransactionStatus.Queued,
+                status: i === 0 ? TransactionStatus.Processing : TransactionStatus.Queued,
             })));
         }
         return newItemSets[0];
@@ -361,7 +363,9 @@ class TransactionsManager {
             const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo ?? "unknown"}`;
             this.updateStatus(txName, errorDetails.canBeIgnored
                 ? TransactionStatus.Skipped
-                : TransactionStatus.Failed, attemptNum, undefined, undefined, errorString);
+                : TransactionStatus.Failed, attemptNum, undefined, undefined, errorDetails.errorName || errorDetails.errorInfo
+                ? errorString
+                : e.message);
             this.txHandler.log(errorString);
             if (!errorDetails.canBeIgnored) {
                 throw e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.272",
+  "version": "1.0.274",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/transactions/transactionsManager.ts

@@ -159,11 +159,11 @@ class TransactionSet {
       .filter((x) => x.tx && x.tx.getInstructions().length > 0)
       .map((x) => x.tx!);
 
+    const lutInputs = await this.lookupTables.getLutInputs(this.lutAddresses());
+    this.txHandler.log(lutInputs);
     return transactionBuilder()
       .add(transactions)
-      .setAddressLookupTables(
-        await this.lookupTables.getLutInputs(this.lutAddresses())
-      );
+      .setAddressLookupTables(lutInputs);
   }
 
   lutAddresses(): string[] {
@@ -501,9 +501,16 @@ export class TransactionsManager {
       this.retries,
       this.retryDelay,
       this.errorsToThrow
-    ).catch((e) => {
+    ).catch((e: Error) => {
       if (itemSet) {
-        this.updateStatus(itemSet.name(), TransactionStatus.Failed, num);
+        this.updateStatus(
+          itemSet.name(),
+          TransactionStatus.Failed,
+          num,
+          undefined,
+          undefined,
+          e.message
+        );
       }
       throw e;
     });
@@ -528,14 +535,17 @@ export class TransactionsManager {
         itemSets.length - currentIndex,
         ...newItemSets
       );
-      const startOfQueuedStatuses = this.statuses.findIndex(x => x.status === TransactionStatus.Queued);
+      const startOfQueuedStatuses = this.statuses.findIndex(
+        (x) => x.status === TransactionStatus.Queued
+      );
       this.statuses.splice(
         startOfQueuedStatuses,
         this.statuses.length - startOfQueuedStatuses,
         ...newItemSets.map((x, i) => ({
           name: x.name(),
           attemptNum: i === 0 ? attemptNum : 0,
-          status: TransactionStatus.Queued,
+          status:
+            i === 0 ? TransactionStatus.Processing : TransactionStatus.Queued,
         }))
       );
     }
@@ -584,7 +594,9 @@ export class TransactionsManager {
         attemptNum,
         undefined,
         undefined,
-        errorString
+        errorDetails.errorName || errorDetails.errorInfo
+          ? errorString
+          : e.message
       );
       this.txHandler.log(errorString);