@haven-fi/solauto-sdk 1.0.172 → 1.0.173

package/dist/transactions/transactionsManager.js

@@ -191,7 +191,7 @@ class TransactionsManager {
             }
         }
         this.txHandler.log(`${name} is ${status.toString().toLowerCase()}`);
-        this.statusCallback?.(this.statuses);
+        this.statusCallback?.([...this.statuses]);
     }
     // TODO remove me
     async debugAccounts(itemSet, tx) {

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,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAKtG,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,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA+C5E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAK3F;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"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAKlC,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,CAKlB;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,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAwD5E;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;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

@@ -28,7 +28,9 @@ function currentUnixSeconds() {
     return Math.round(new Date().getTime() / 1000);
 }
 async function getSolanaAccountCreated(umi, pk) {
-    const account = await umi.rpc.getAccount((0, umi_1.publicKey)(pk), { commitment: "confirmed" });
+    const account = await umi.rpc.getAccount((0, umi_1.publicKey)(pk), {
+        commitment: "confirmed",
+    });
     return rpcAccountCreated(account);
 }
 function rpcAccountCreated(account) {
@@ -53,25 +55,28 @@ async function fetchTokenPrices(mints) {
     }
     const priceFeedIds = mints.map((mint) => pythConstants_1.PYTH_PRICE_FEED_IDS[mint.toString()]);
     const getReq = async () => await fetch(`https://hermes.pyth.network/v2/updates/price/latest?${priceFeedIds.map((x) => `ids%5B%5D=${x}`).join("&")}`);
-    let resp = await getReq();
-    let status = resp.status;
-    while (status !== 200) {
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-        resp = await getReq();
-        status = resp.status;
-    }
-    const json = await resp.json();
-    const prices = json.parsed.map((x) => {
-        if (x.price.expo > 0) {
-            return Number((0, numberUtils_1.toBaseUnit)(Number(x.price.price), x.price.expo));
-        }
-        else if (x.price.expo < 0) {
-            return (0, numberUtils_1.fromBaseUnit)(BigInt(x.price.price), Math.abs(x.price.expo));
+    const prices = await retryWithExponentialBackoff(async () => {
+        let resp = await getReq();
+        let status = resp.status;
+        while (status !== 200) {
+            await new Promise((resolve) => setTimeout(resolve, 1000));
+            resp = await getReq();
+            status = resp.status;
         }
-        else {
-            return Number(x.price.price);
-        }
-    });
+        const json = await resp.json();
+        const prices = json.parsed.map((x) => {
+            if (x.price.expo > 0) {
+                return Number((0, numberUtils_1.toBaseUnit)(Number(x.price.price), x.price.expo));
+            }
+            else if (x.price.expo < 0) {
+                return (0, numberUtils_1.fromBaseUnit)(BigInt(x.price.price), Math.abs(x.price.expo));
+            }
+            else {
+                return Number(x.price.price);
+            }
+        });
+        return prices;
+    }, 5, 200);
     for (var i = 0; i < mints.length; i++) {
         solautoConstants_1.PRICES[mints[i].toString()] = {
             price: prices[i],

package/package.json

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

@@ -280,7 +280,7 @@ export class TransactionsManager {
       }
     }
     this.txHandler.log(`${name} is ${status.toString().toLowerCase()}`);
-    this.statusCallback?.(this.statuses);
+    this.statusCallback?.([...this.statuses]);
   }
 
   // TODO remove me

package/src/utils/generalUtils.ts

@@ -1,5 +1,10 @@
 import { PublicKey } from "@solana/web3.js";
-import { MaybeRpcAccount, publicKey, Umi, PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
+import {
+  MaybeRpcAccount,
+  publicKey,
+  Umi,
+  PublicKey as UmiPublicKey,
+} from "@metaplex-foundation/umi";
 import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
 import { fromBaseUnit, toBaseUnit } from "./numberUtils";
 import { PRICES } from "../constants/solautoConstants";
@@ -25,7 +30,9 @@ export async function getSolanaAccountCreated(
   umi: Umi,
   pk: PublicKey
 ): Promise<boolean> {
-  const account = await umi.rpc.getAccount(publicKey(pk), { commitment: "confirmed" });
+  const account = await umi.rpc.getAccount(publicKey(pk), {
+    commitment: "confirmed",
+  });
   return rpcAccountCreated(account);
 }
 
@@ -65,24 +72,33 @@ export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
     await fetch(
       `https://hermes.pyth.network/v2/updates/price/latest?${priceFeedIds.map((x) => `ids%5B%5D=${x}`).join("&")}`
     );
-  let resp = await getReq();
-  let status = resp.status;
-  while (status !== 200) {
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-    resp = await getReq();
-    status = resp.status;
-  }
 
-  const json = await resp.json();
-  const prices = json.parsed.map((x: any) => {
-    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));
-    } else {
-      return Number(x.price.price);
-    }
-  });
+  const prices = await retryWithExponentialBackoff(
+    async () => {
+      let resp = await getReq();
+      let status = resp.status;
+      while (status !== 200) {
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+        resp = await getReq();
+        status = resp.status;
+      }
+
+      const json = await resp.json();
+      const prices = json.parsed.map((x: any) => {
+        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));
+        } else {
+          return Number(x.price.price);
+        }
+      });
+
+      return prices;
+    },
+    5,
+    200
+  );
 
   for (var i = 0; i < mints.length; i++) {
     PRICES[mints[i].toString()] = {
@@ -94,7 +110,9 @@ export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   return prices;
 }
 
-export function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined {
+export function safeGetPrice(
+  mint: PublicKey | UmiPublicKey | undefined
+): number | undefined {
   if (mint && mint?.toString() in PRICES) {
     return PRICES[mint!.toString()].price;
   }