@haven-fi/solauto-sdk 1.0.470 → 1.0.472

package/dist/constants/marginfiAccounts.js

@@ -97,7 +97,7 @@ exports.MARGINFI_ACCOUNTS = {
             bank: "Amtw3n7GZe5SWmyhMhaFhDTi39zbTkLeWErBsmZXwpDa",
             liquidityVault: "9xfyL8gxbV77VvhdgFmacHyLEG4h7d2eDWkSMfhXUPQ",
             vaultAuthority: "F4RSGd4BRXscCqAVG3rFLiPVpo7v6j1drVqnvSM3rBKH",
-            priceOracle: "B1wxT1VK3i6DqCeXNdTHT5hBAJkLa3rxuTqBc7E7XRXV",
+            priceOracle: "2TTGSRSezqFzeLUH8JwRUbtN66XLLaymfYsWRTMjfiMw",
         },
         [tokens.WBTC]: {
             bank: "BKsfDJCMbYep6gr9pq8PsmJbb5XGLHbAJzUV8vmorz7a",

package/dist/transactions/transactionsManager.d.ts

@@ -61,7 +61,7 @@ export declare class TransactionsManager {
     send(items: TransactionItem[]): Promise<TransactionManagerStatuses>;
     private processTransactionsAtomically;
     private processTransactionSet;
-    private refreshItemSet;
+    private refreshItemSets;
     private sendTransaction;
 }
 export {};

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;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;AA0FD,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;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA4BxB,6BAA6B;YAmI7B,qBAAqB;YAmDrB,cAAc;YA0Cd,eAAe;CA4D9B"}
+{"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;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;AA0FD,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;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA4BxB,6BAA6B;YAsI7B,qBAAqB;YAoDrB,eAAe;YAwDf,eAAe;CA4D9B"}

package/dist/transactions/transactionsManager.js

@@ -150,7 +150,7 @@ class TransactionsManager {
         this.atomically = atomically;
         this.errorsToThrow = errorsToThrow;
         this.statuses = [];
-        this.updateOracleTxName = "Update oracle";
+        this.updateOracleTxName = "update oracle";
         this.lookupTables = new LookupTables(this.txHandler.defaultLookupTables(), this.txHandler.umi);
         this.signableRetries =
             retryConfig?.signableRetries ?? retryConfig?.totalRetries ?? 3;
@@ -346,10 +346,13 @@ class TransactionsManager {
             }
             num = attemptNum;
             if (attemptNum > 0) {
-                for (let i = 0; i < itemSets.length; i++) {
-                    await itemSets[i].refetchAll(attemptNum);
+                const refreshedSets = await this.refreshItemSets(itemSets, attemptNum);
+                if (!refreshedSets || !refreshedSets.length) {
+                    return;
+                }
+                else {
+                    itemSets = refreshedSets;
                 }
-                itemSets = await this.assembleTransactionSets(itemSets.flatMap((x) => x.items));
             }
             transactions = [];
             for (const set of itemSets) {
@@ -402,7 +405,8 @@ class TransactionsManager {
             }
             num = attemptNum;
             if (currentIndex > 0 || attemptNum > 0) {
-                itemSet = await this.refreshItemSet(itemSets, currentIndex, attemptNum);
+                const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, currentIndex);
+                itemSet = refreshedSets ? refreshedSets[0] : undefined;
             }
             if (!itemSet)
                 return;
@@ -416,18 +420,29 @@ class TransactionsManager {
             }
         }, this.totalRetries, this.retryDelay, this.errorsToThrow);
     }
-    async refreshItemSet(itemSets, currentIndex, attemptNum) {
-        const itemSet = itemSets[currentIndex];
-        await itemSet.refetchAll(attemptNum);
-        const newItemSets = await this.assembleTransactionSets([
-            ...itemSet.items,
-            ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
-        ]);
-        const newItemSetNames = newItemSets.map(x => x.name());
-        if (newItemSetNames.length === 1 && newItemSetNames[0] === this.updateOracleTxName) {
+    async refreshItemSets(itemSets, attemptNum, currentIndex) {
+        if (currentIndex !== undefined) {
+            const itemSet = itemSets[currentIndex];
+            await itemSet.refetchAll(attemptNum);
+        }
+        else {
+            for (const itemSet of itemSets) {
+                await itemSet.refetchAll(attemptNum);
+            }
+        }
+        const newItemSets = await this.assembleTransactionSets(currentIndex !== undefined
+            ? [
+                ...itemSets[currentIndex].items,
+                ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
+            ]
+            : itemSets.flatMap((set) => set.items));
+        const newItemSetNames = newItemSets.map((x) => x.name());
+        if (newItemSetNames.length === 1 &&
+            newItemSetNames[0] === this.updateOracleTxName) {
+            (0, generalUtils_1.consoleLog)("Skipping unnecessary oracle update");
             return undefined;
         }
-        if (newItemSets.length > 1) {
+        if (currentIndex !== undefined && newItemSets.length > 1) {
             itemSets.splice(currentIndex, itemSets.length - currentIndex, ...newItemSets);
             const startOfQueuedStatuses = this.statuses.findIndex((x) => x.status === TransactionStatus.Queued);
             this.statuses.splice(startOfQueuedStatuses, this.statuses.length - startOfQueuedStatuses, ...newItemSets.map((x, i) => ({
@@ -436,7 +451,7 @@ class TransactionsManager {
                 status: i === 0 ? TransactionStatus.Processing : TransactionStatus.Queued,
             })));
         }
-        return newItemSets[0];
+        return newItemSets;
     }
     async sendTransaction(tx, txName, attemptNum, priorityFeeSetting, txType) {
         this.updateStatus(txName, TransactionStatus.Processing, attemptNum);

package/package.json

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

package/src/constants/marginfiAccounts.ts

@@ -79,7 +79,7 @@ export const MARGINFI_ACCOUNTS: {
       bank: "Amtw3n7GZe5SWmyhMhaFhDTi39zbTkLeWErBsmZXwpDa",
       liquidityVault: "9xfyL8gxbV77VvhdgFmacHyLEG4h7d2eDWkSMfhXUPQ",
       vaultAuthority: "F4RSGd4BRXscCqAVG3rFLiPVpo7v6j1drVqnvSM3rBKH",
-      priceOracle: "B1wxT1VK3i6DqCeXNdTHT5hBAJkLa3rxuTqBc7E7XRXV",
+      priceOracle: "2TTGSRSezqFzeLUH8JwRUbtN66XLLaymfYsWRTMjfiMw",
     },
     [tokens.WBTC]: {
       bank: "BKsfDJCMbYep6gr9pq8PsmJbb5XGLHbAJzUV8vmorz7a",

package/src/transactions/transactionsManager.ts

@@ -12,6 +12,7 @@ import {
   sendSingleOptimizedTransaction,
 } from "../utils/solanaUtils";
 import {
+  consoleLog,
   ErrorsToThrow,
   retryWithExponentialBackoff,
 } from "../utils/generalUtils";
@@ -231,7 +232,7 @@ export class TransactionsManager {
   private totalRetries: number;
   private retryDelay: number;
 
-  updateOracleTxName = "Update oracle";
+  updateOracleTxName = "update oracle";
 
   constructor(
     private txHandler: SolautoClient | ReferralStateManager,
@@ -555,12 +556,15 @@ export class TransactionsManager {
         num = attemptNum;
 
         if (attemptNum > 0) {
-          for (let i = 0; i < itemSets.length; i++) {
-            await itemSets[i].refetchAll(attemptNum);
-          }
-          itemSets = await this.assembleTransactionSets(
-            itemSets.flatMap((x) => x.items)
+          const refreshedSets = await this.refreshItemSets(
+            itemSets,
+            attemptNum
           );
+          if (!refreshedSets || !refreshedSets.length) {
+            return;
+          } else {
+            itemSets = refreshedSets;
+          }
         }
 
         transactions = [];
@@ -689,11 +693,12 @@ export class TransactionsManager {
         num = attemptNum;
 
         if (currentIndex > 0 || attemptNum > 0) {
-          itemSet = await this.refreshItemSet(
+          const refreshedSets = await this.refreshItemSets(
             itemSets,
-            currentIndex,
-            attemptNum
+            attemptNum,
+            currentIndex
           );
+          itemSet = refreshedSets ? refreshedSets[0] : undefined;
         }
         if (!itemSet) return;
 
@@ -720,25 +725,39 @@ export class TransactionsManager {
     );
   }
 
-  private async refreshItemSet(
+  private async refreshItemSets(
     itemSets: TransactionSet[],
-    currentIndex: number,
-    attemptNum: number
-  ): Promise<TransactionSet | undefined> {
-    const itemSet = itemSets[currentIndex];
-    await itemSet.refetchAll(attemptNum);
+    attemptNum: number,
+    currentIndex?: number
+  ): Promise<TransactionSet[] | undefined> {
+    if (currentIndex !== undefined) {
+      const itemSet = itemSets[currentIndex];
+      await itemSet.refetchAll(attemptNum);
+    } else {
+      for (const itemSet of itemSets) {
+        await itemSet.refetchAll(attemptNum);
+      }
+    }
 
-    const newItemSets = await this.assembleTransactionSets([
-      ...itemSet.items,
-      ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
-    ]);
+    const newItemSets = await this.assembleTransactionSets(
+      currentIndex !== undefined
+        ? [
+            ...itemSets[currentIndex].items,
+            ...itemSets.slice(currentIndex + 1).flatMap((set) => set.items),
+          ]
+        : itemSets.flatMap((set) => set.items)
+    );
 
-    const newItemSetNames = newItemSets.map(x => x.name());
-    if (newItemSetNames.length === 1 && newItemSetNames[0] === this.updateOracleTxName) {
+    const newItemSetNames = newItemSets.map((x) => x.name());
+    if (
+      newItemSetNames.length === 1 &&
+      newItemSetNames[0] === this.updateOracleTxName
+    ) {
+      consoleLog("Skipping unnecessary oracle update");
       return undefined;
     }
 
-    if (newItemSets.length > 1) {
+    if (currentIndex !== undefined && newItemSets.length > 1) {
       itemSets.splice(
         currentIndex,
         itemSets.length - currentIndex,
@@ -759,7 +778,7 @@ export class TransactionsManager {
       );
     }
 
-    return newItemSets[0];
+    return newItemSets;
   }
 
   private async sendTransaction(