@haven-fi/solauto-sdk 1.0.16 → 1.0.18

package/dist/transactions/transactionsManager.d.ts

@@ -1,5 +1,6 @@
 import { TransactionBuilder } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../clients/solautoClient";
+import { ErrorsToThrow } from "../utils/generalUtils";
 export declare class TransactionItem {
     fetchTx: (attemptNum: number) => Promise<{
         tx: TransactionBuilder;
@@ -33,9 +34,10 @@ export declare class TransactionsManager {
     private statusCallback?;
     private simulateOnly?;
     private mustBeAtomic?;
+    private errorsToThrow?;
     private statuses;
     private lookupTables;
-    constructor(client: SolautoClient, items: TransactionItem[], statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, simulateOnly?: boolean | undefined, mustBeAtomic?: boolean | undefined);
+    constructor(client: SolautoClient, items: TransactionItem[], statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, simulateOnly?: boolean | undefined, mustBeAtomic?: boolean | undefined, errorsToThrow?: ErrorsToThrow | undefined);
     private assembleTransactionSets;
     updateStatus(name: string, status: TransactionStatus, txSig?: string): void;
     send(): Promise<void>;

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,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAyCzD,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAgFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IARvB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS;YAKlB,uBAAuB;IAsCrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAgB9D,IAAI;CAuIX"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAqC/B,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAgFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IATxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS,EACtB,aAAa,CAAC,2BAAe;YAKzB,uBAAuB;IAsCrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAgB9D,IAAI;CA8IX"}

package/dist/transactions/transactionsManager.js

@@ -15,13 +15,14 @@ class LookupTables {
         this.client = client;
         this.defaultLuts = [];
         this.cache = [];
-        this.defaultLuts = [
-            client.authorityLutAddress.toString(),
-            ...client.defaultLookupTables(),
-        ];
+        this.defaultLuts = [...client.defaultLookupTables()];
     }
     async getLutInputs(additionalAddresses) {
-        const addresses = [...this.defaultLuts, ...additionalAddresses];
+        const addresses = [
+            ...this.defaultLuts,
+            this.client.authorityLutAddress.toString(),
+            ...additionalAddresses,
+        ];
         const currentCacheAddresses = this.cache.map((x) => x.publicKey.toString());
         const missingAddresses = addresses.filter((x) => !currentCacheAddresses.includes(x));
         if (missingAddresses) {
@@ -119,12 +120,13 @@ var TransactionStatus;
     TransactionStatus["Successful"] = "Successful";
 })(TransactionStatus = exports.TransactionStatus || (exports.TransactionStatus = {}));
 class TransactionsManager {
-    constructor(client, items, statusCallback, simulateOnly, mustBeAtomic) {
+    constructor(client, items, statusCallback, simulateOnly, mustBeAtomic, errorsToThrow) {
         this.client = client;
         this.items = items;
         this.statusCallback = statusCallback;
         this.simulateOnly = simulateOnly;
         this.mustBeAtomic = mustBeAtomic;
+        this.errorsToThrow = errorsToThrow;
         this.statuses = [];
         this.lookupTables = new LookupTables(client);
     }
@@ -178,7 +180,7 @@ class TransactionsManager {
         const updateLookupTable = await this.client.updateLookupTable();
         if (updateLookupTable && updateLookupTable?.needsToBeIsolated) {
             this.updateStatus("update lookup table", TransactionStatus.Processing);
-            await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.client.umi, this.client.connection, updateLookupTable.updateLutTx, this.simulateOnly, attemptNum), 2);
+            await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.client.umi, this.client.connection, updateLookupTable.updateLutTx, this.simulateOnly, attemptNum), 2, undefined, this.errorsToThrow);
             this.updateStatus("update lookup table", TransactionStatus.Successful);
         }
         for (const item of this.items) {
@@ -254,7 +256,7 @@ class TransactionsManager {
                         const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.client.umi, this.client.connection, tx, this.simulateOnly, attemptNum);
                         this.updateStatus(itemSet.name(), TransactionStatus.Successful, txSig ? bs58_1.default.encode(txSig) : undefined);
                     }
-                }, 3);
+                }, 3, undefined, this.errorsToThrow);
             }
         }
         if (!this.simulateOnly) {

package/dist/utils/generalUtils.d.ts

@@ -7,5 +7,6 @@ export declare function getSolanaAccountCreated(umi: Umi, pk: PublicKey): Promis
 export declare function rpcAccountCreated(account: MaybeRpcAccount): boolean;
 export declare function arraysAreEqual(arrayA: number[], arrayB: number[]): boolean;
 export declare function getTokenPrices(mints: PublicKey[]): Promise<number[]>;
-export declare function retryWithExponentialBackoff<T>(fn: (attemptNum: number) => Promise<T>, retries?: number, delay?: number, errorsToRetry?: Set<Function>): Promise<T>;
+export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
+export declare function retryWithExponentialBackoff<T>(fn: (attemptNum: number) => Promise<T>, retries?: number, delay?: number, errorsToThrow?: ErrorsToThrow): Promise<T>;
 //# sourceMappingURL=generalUtils.d.ts.map

package/dist/utils/generalUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK3E,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAGvF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA+C1E;AAED,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,GAC5B,OAAO,CAAC,CAAC,CAAC,CAwBZ"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK3E,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiD1E;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}

package/dist/utils/generalUtils.js

@@ -45,9 +45,10 @@ function arraysAreEqual(arrayA, arrayB) {
 exports.arraysAreEqual = arraysAreEqual;
 async function getTokenPrices(mints) {
     const currentTime = currentUnixSeconds();
-    if (!mints.some(mint => !(mint.toString() in solautoConstants_1.PRICES) || currentTime - solautoConstants_1.PRICES[mint.toString()].time > 3)) {
+    if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
+        currentTime - solautoConstants_1.PRICES[mint.toString()].time > 3)) {
         console.log("Accessing price cache");
-        return mints.map(mint => solautoConstants_1.PRICES[mint.toString()].price);
+        return mints.map((mint) => solautoConstants_1.PRICES[mint.toString()].price);
     }
     console.log("Fetching prices...");
     const priceFeedIds = mints.map((mint) => pythConstants_1.PYTH_PRICE_FEED_IDS[mint.toString()]);
@@ -74,21 +75,25 @@ async function getTokenPrices(mints) {
     for (var i = 0; i < mints.length; i++) {
         solautoConstants_1.PRICES[mints[i].toString()] = {
             price: prices[i],
-            time: currentUnixSeconds()
+            time: currentUnixSeconds(),
         };
     }
     return prices;
 }
 exports.getTokenPrices = getTokenPrices;
-function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToRetry) {
+function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow) {
     return new Promise((resolve, reject) => {
         const attempt = (attemptNum) => {
             fn(attemptNum)
                 .then(resolve)
                 .catch((error) => {
                 attemptNum++;
-                if (attemptNum < retries &&
-                    (!errorsToRetry || errorsToRetry.has(error.constructor))) {
+                if (errorsToThrow &&
+                    errorsToThrow.some((errorType) => error instanceof errorType)) {
+                    reject(error);
+                    return;
+                }
+                if (attemptNum < retries) {
                     console.log(error);
                     setTimeout(() => {
                         console.log("Retrying...");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "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

@@ -9,7 +9,10 @@ import {
   getAdressLookupInputs,
   sendSingleOptimizedTransaction,
 } from "../utils/solanaUtils";
-import { retryWithExponentialBackoff } from "../utils/generalUtils";
+import {
+  ErrorsToThrow,
+  retryWithExponentialBackoff,
+} from "../utils/generalUtils";
 import { getTransactionChores } from "./transactionUtils";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
@@ -18,16 +21,17 @@ class LookupTables {
   cache: AddressLookupTableInput[] = [];
 
   constructor(private client: SolautoClient) {
-    this.defaultLuts = [
-      client.authorityLutAddress!.toString(),
-      ...client.defaultLookupTables(),
-    ];
+    this.defaultLuts = [...client.defaultLookupTables()];
   }
 
   async getLutInputs(
     additionalAddresses: string[]
   ): Promise<AddressLookupTableInput[]> {
-    const addresses = [...this.defaultLuts, ...additionalAddresses];
+    const addresses = [
+      ...this.defaultLuts,
+      this.client.authorityLutAddress!.toString(),
+      ...additionalAddresses,
+    ];
     const currentCacheAddresses = this.cache.map((x) => x.publicKey.toString());
 
     const missingAddresses = addresses.filter(
@@ -182,7 +186,8 @@ export class TransactionsManager {
     private items: TransactionItem[],
     private statusCallback?: (statuses: TransactionManagerStatuses) => void,
     private simulateOnly?: boolean,
-    private mustBeAtomic?: boolean
+    private mustBeAtomic?: boolean,
+    private errorsToThrow?: ErrorsToThrow
   ) {
     this.lookupTables = new LookupTables(client);
   }
@@ -254,7 +259,9 @@ export class TransactionsManager {
             this.simulateOnly,
             attemptNum
           ),
-        2
+        2,
+        undefined,
+        this.errorsToThrow
       );
       this.updateStatus("update lookup table", TransactionStatus.Successful);
     }
@@ -344,31 +351,36 @@ export class TransactionsManager {
         };
 
         let itemSet = itemSets[i];
-        await retryWithExponentialBackoff(async (attemptNum) => {
-          itemSet =
-            i > 0 || attemptNum > 0
-              ? await getFreshItemSet(itemSet, attemptNum)
-              : itemSet;
-          const tx = await itemSet.getSingleTransaction();
-
-          if (tx.getInstructions().length === 0) {
-            this.updateStatus(itemSet.name(), TransactionStatus.Skipped);
-          } else {
-            this.updateStatus(itemSet.name(), TransactionStatus.Processing);
-            const txSig = await sendSingleOptimizedTransaction(
-              this.client.umi,
-              this.client.connection,
-              tx,
-              this.simulateOnly,
-              attemptNum
-            );
-            this.updateStatus(
-              itemSet.name(),
-              TransactionStatus.Successful,
-              txSig ? bs58.encode(txSig) : undefined
-            );
-          }
-        }, 3);
+        await retryWithExponentialBackoff(
+          async (attemptNum) => {
+            itemSet =
+              i > 0 || attemptNum > 0
+                ? await getFreshItemSet(itemSet, attemptNum)
+                : itemSet;
+            const tx = await itemSet.getSingleTransaction();
+
+            if (tx.getInstructions().length === 0) {
+              this.updateStatus(itemSet.name(), TransactionStatus.Skipped);
+            } else {
+              this.updateStatus(itemSet.name(), TransactionStatus.Processing);
+              const txSig = await sendSingleOptimizedTransaction(
+                this.client.umi,
+                this.client.connection,
+                tx,
+                this.simulateOnly,
+                attemptNum
+              );
+              this.updateStatus(
+                itemSet.name(),
+                TransactionStatus.Successful,
+                txSig ? bs58.encode(txSig) : undefined
+              );
+            }
+          },
+          3,
+          undefined,
+          this.errorsToThrow
+        );
       }
     }
 

package/src/utils/generalUtils.ts

@@ -21,7 +21,10 @@ export function currentUnixSeconds(): number {
   return Math.round(new Date().getTime() / 1000);
 }
 
-export async function getSolanaAccountCreated(umi: Umi, pk: PublicKey): Promise<boolean> {
+export async function getSolanaAccountCreated(
+  umi: Umi,
+  pk: PublicKey
+): Promise<boolean> {
   const account = await umi.rpc.getAccount(publicKey(pk));
   return rpcAccountCreated(account);
 }
@@ -44,9 +47,15 @@ export function arraysAreEqual(arrayA: number[], arrayB: number[]): boolean {
 
 export async function getTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
-  if (!mints.some(mint => !(mint.toString() in PRICES) || currentTime - PRICES[mint.toString()].time > 3)) {
+  if (
+    !mints.some(
+      (mint) =>
+        !(mint.toString() in PRICES) ||
+        currentTime - PRICES[mint.toString()].time > 3
+    )
+  ) {
     console.log("Accessing price cache");
-    return mints.map(mint => PRICES[mint.toString()].price);
+    return mints.map((mint) => PRICES[mint.toString()].price);
   }
 
   console.log("Fetching prices...");
@@ -71,10 +80,7 @@ export async function getTokenPrices(mints: PublicKey[]): Promise<number[]> {
     if (x.price.expo > 0) {
       return Number(toBaseUnit(Number(x.price.price), x.price.expo));
     } else if (x.price.expo < 0) {
-      return fromBaseUnit(
-        BigInt(x.price.price),
-        Math.abs(x.price.expo)
-      );
+      return fromBaseUnit(BigInt(x.price.price), Math.abs(x.price.expo));
     } else {
       return Number(x.price.price);
     }
@@ -83,19 +89,20 @@ export async function getTokenPrices(mints: PublicKey[]): Promise<number[]> {
   for (var i = 0; i < mints.length; i++) {
     PRICES[mints[i].toString()] = {
       price: prices[i],
-      time: currentUnixSeconds()
+      time: currentUnixSeconds(),
     };
   }
 
-
   return prices;
 }
 
+export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
+
 export function retryWithExponentialBackoff<T>(
   fn: (attemptNum: number) => Promise<T>,
   retries: number = 5,
   delay: number = 150,
-  errorsToRetry?: Set<Function>
+  errorsToThrow?: ErrorsToThrow
 ): Promise<T> {
   return new Promise((resolve, reject) => {
     const attempt = (attemptNum: number) => {
@@ -103,10 +110,16 @@ export function retryWithExponentialBackoff<T>(
         .then(resolve)
         .catch((error: Error) => {
           attemptNum++;
+
           if (
-            attemptNum < retries &&
-            (!errorsToRetry || errorsToRetry.has(error.constructor))
+            errorsToThrow &&
+            errorsToThrow.some((errorType) => error instanceof errorType)
           ) {
+            reject(error);
+            return;
+          }
+
+          if (attemptNum < retries) {
             console.log(error);
             setTimeout(() => {
               console.log("Retrying...");