@haven-fi/solauto-sdk 1.0.331 → 1.0.333

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;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;YAMb,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;YAqE7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAmD9B"}
+{"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"}

package/dist/transactions/transactionsManager.js

@@ -244,9 +244,9 @@ class TransactionsManager {
         }
         return this.priorityFeeSetting;
     }
-    updateStatusForSets(itemSets) {
-        itemSets.forEach((itemSet) => {
-            this.updateStatus(itemSet.name(), TransactionStatus.Queued, 0);
+    updateStatusForSets(itemSets, status, attemptNum, txSigs, simulationSuccessful, moreInfo) {
+        itemSets.forEach((itemSet, i) => {
+            this.updateStatus(itemSet.name(), status, attemptNum, txSigs !== undefined ? txSigs[i] : undefined, simulationSuccessful, moreInfo);
         });
     }
     async updateLut(tx, newLut) {
@@ -316,7 +316,7 @@ class TransactionsManager {
         }
         this.txHandler.log("Transaction items:", items.length);
         const itemSets = await this.assembleTransactionSets(items);
-        this.updateStatusForSets(itemSets);
+        this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
         this.txHandler.log("Initial item sets:", itemSets.length);
         if (this.txType === "only-simulate" && itemSets.length > 1) {
             this.txHandler.log("Only simulate and more than 1 transaction. Skipping...");
@@ -342,23 +342,23 @@ class TransactionsManager {
                 for (let i = 0; i < itemSets.length; i++) {
                     await itemSets[i].refetchAll(attemptNum);
                 }
-                itemSets = await this.assembleTransactionSets(itemSets.flatMap(x => x.items));
+                itemSets = await this.assembleTransactionSets(itemSets.flatMap((x) => x.items));
             }
             let transactions = [];
             for (const set of itemSets) {
                 transactions.push(await set.getSingleTransaction());
             }
-            itemSets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Processing, attemptNum));
+            this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum);
             const txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.signer, transactions, false, this.priorityFeeSetting);
             if (Boolean(txSigs) && txSigs.length > 0) {
-                itemSets.forEach((x, i) => this.updateStatus(x.name(), TransactionStatus.Successful, attemptNum, txSigs[i]));
+                this.updateStatusForSets(itemSets, TransactionStatus.Successful, attemptNum, txSigs);
             }
             else {
-                itemSets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Failed, attemptNum, undefined, true));
+                this.updateStatusForSets(itemSets, TransactionStatus.Failed, attemptNum, txSigs, true);
                 throw new Error("Unknown error");
             }
         }, this.retries, this.retryDelay, this.errorsToThrow).catch((e) => {
-            itemSets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Failed, num, undefined, true, e.message));
+            this.updateStatusForSets(itemSets, TransactionStatus.Failed, num, undefined, true, e.message);
             throw e;
         });
     }

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

@@ -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,CA8C/B"}
+{"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"}

package/dist/utils/jitoUtils.js

@@ -115,6 +115,9 @@ async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, prior
         : undefined;
     let builtTxs = await umiToVersionedTransactions(umi, signer, txs, true, // false if simulating first and rebuilding later
     feeEstimates);
+    for (let i = 0; i < txs.length; i++) {
+        (0, generalUtils_1.consoleLog)("Transaction", i, txs[i].getInstructions());
+    }
     // const simulationResults = await simulateJitoBundle(umi, builtTxs);
     if (!simulateOnly) {
         // let builtTxs = await umiToVersionedTransactions(

package/dist/utils/priceUtils.d.ts

@@ -2,6 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 export declare function fetchTokenPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getPythPrices(mints: PublicKey[]): Promise<number[]>;
-export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined;
+export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getJupTokenPrices(mints: PublicKey[]): Promise<number[]>;
+export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined;
 //# sourceMappingURL=priceUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYrE,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAqCnB;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAGD,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAoBzD"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAarE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAuC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAmCnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAoBzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB"}

package/dist/utils/priceUtils.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchTokenPrices = fetchTokenPrices;
 exports.getPythPrices = getPythPrices;
-exports.safeGetPrice = safeGetPrice;
+exports.getSwitchboardPrices = getSwitchboardPrices;
 exports.getJupTokenPrices = getJupTokenPrices;
+exports.safeGetPrice = safeGetPrice;
 const pythConstants_1 = require("../constants/pythConstants");
 const numberUtils_1 = require("./numberUtils");
 const solautoConstants_1 = require("../constants/solautoConstants");
 const switchboardConstants_1 = require("../constants/switchboardConstants");
 const generalUtils_1 = require("./generalUtils");
-const switchboardUtils_1 = require("./switchboardUtils");
+const on_demand_1 = require("@switchboard-xyz/on-demand");
 async function fetchTokenPrices(mints) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
     if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
@@ -20,8 +21,9 @@ async function fetchTokenPrices(mints) {
     const switchboardMints = mints.filter((x) => x.toString() in switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS);
     const [pythData, switchboardData] = await Promise.all([
         (0, generalUtils_1.zip)(pythMints, await getPythPrices(pythMints)),
-        (0, generalUtils_1.zip)(switchboardMints, await (0, switchboardUtils_1.getSwitchboardPrices)(switchboardMints)),
+        (0, generalUtils_1.zip)(switchboardMints, await getSwitchboardPrices(switchboardMints)),
     ]);
+    (0, generalUtils_1.consoleLog)([...pythData, ...switchboardData]);
     const prices = mints.map((mint) => {
         const item = [...pythData, ...switchboardData].find((data) => data[0].equals(mint));
         return item ? item[1] : 0;
@@ -62,22 +64,39 @@ async function getPythPrices(mints) {
     }, 5, 200);
     return prices;
 }
-function safeGetPrice(mint) {
-    if (mint && mint?.toString() in solautoConstants_1.PRICES) {
-        return solautoConstants_1.PRICES[mint.toString()].price;
+async function getSwitchboardPrices(mints) {
+    if (mints.length === 0) {
+        return [];
     }
-    return undefined;
+    const crossbar = new on_demand_1.CrossbarClient("https://crossbar.switchboard.xyz");
+    let prices = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+        const res = await crossbar.simulateSolanaFeeds("mainnet", mints.map((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()]));
+        const prices = res.flatMap((x) => x.results[0]);
+        if (prices.find((x) => !x || x === -Infinity)) {
+            throw new Error("Unable to fetch Switchboard prices");
+        }
+        return prices;
+    }, 8, 250);
+    const missingPrices = (0, generalUtils_1.zip)(mints, prices).filter((x) => !x[1]);
+    const jupPrices = (0, generalUtils_1.zip)(missingPrices.map((x) => x[0]), await getJupTokenPrices(missingPrices.map((x) => x[0])));
+    prices = prices.map((x, i) => x ? x : jupPrices.find((y) => y[0].toString() === mints[i].toString())[1]);
+    return prices;
 }
-// LEGACY, NOT USED
 async function getJupTokenPrices(mints) {
     if (mints.length == 0) {
         return [];
     }
     const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = (await fetch("https://api.jup.ag/price/v2?ids=" +
-            mints.map((x) => x.toString()).join(",") + "&showExtraInfo=true")).json();
+            mints.map((x) => x.toString()).join(","))).json();
         return res;
     }, 6);
     const prices = Object.values(data.data).map((x) => parseFloat(x.price));
     return prices;
 }
+function safeGetPrice(mint) {
+    if (mint && mint?.toString() in solautoConstants_1.PRICES) {
+        return solautoConstants_1.PRICES[mint.toString()].price;
+    }
+    return undefined;
+}

package/dist/utils/switchboardUtils.d.ts

@@ -9,5 +9,4 @@ export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKe
     price: number;
     stale: boolean;
 }[]>;
-export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<number[]>;
 //# sourceMappingURL=switchboardUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAkB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAOtE,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,YAsBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAyBnB"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAkB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAOtE,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,YAsBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D"}

package/dist/utils/switchboardUtils.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
 exports.getSwitchboardFeedData = getSwitchboardFeedData;
-exports.getSwitchboardPrices = getSwitchboardPrices;
 const anchor_1 = require("@coral-xyz/anchor");
 const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
 const web3_js_1 = require("@solana/web3.js");
@@ -56,18 +55,3 @@ async function getSwitchboardFeedData(conn, mints) {
     }));
     return results;
 }
-async function getSwitchboardPrices(mints) {
-    if (mints.length === 0) {
-        return [];
-    }
-    const crossbar = new on_demand_1.CrossbarClient("https://crossbar.switchboard.xyz");
-    const results = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
-        const res = await crossbar.simulateSolanaFeeds("mainnet", mints.map((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()]));
-        const prices = res.flatMap((x) => x.results[0]);
-        if (prices.find((x) => !x || x === -Infinity)) {
-            throw new Error("Unable to fetch Switchboard prices");
-        }
-        return prices;
-    }, 8, 250);
-    return results;
-}

package/package.json

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

@@ -358,9 +358,23 @@ export class TransactionsManager {
     return this.priorityFeeSetting;
   }
 
-  private updateStatusForSets(itemSets: TransactionSet[]) {
-    itemSets.forEach((itemSet) => {
-      this.updateStatus(itemSet.name(), TransactionStatus.Queued, 0);
+  private updateStatusForSets(
+    itemSets: TransactionSet[],
+    status: TransactionStatus,
+    attemptNum: number,
+    txSigs?: string[],
+    simulationSuccessful?: boolean,
+    moreInfo?: string
+  ) {
+    itemSets.forEach((itemSet, i) => {
+      this.updateStatus(
+        itemSet.name(),
+        status,
+        attemptNum,
+        txSigs !== undefined ? txSigs[i] : undefined,
+        simulationSuccessful,
+        moreInfo
+      );
     });
   }
 
@@ -488,7 +502,7 @@ export class TransactionsManager {
 
     this.txHandler.log("Transaction items:", items.length);
     const itemSets = await this.assembleTransactionSets(items);
-    this.updateStatusForSets(itemSets);
+    this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
     this.txHandler.log("Initial item sets:", itemSets.length);
 
     if (this.txType === "only-simulate" && itemSets.length > 1) {
@@ -522,7 +536,9 @@ export class TransactionsManager {
           for (let i = 0; i < itemSets.length; i++) {
             await itemSets[i].refetchAll(attemptNum);
           }
-          itemSets = await this.assembleTransactionSets(itemSets.flatMap(x => x.items));
+          itemSets = await this.assembleTransactionSets(
+            itemSets.flatMap((x) => x.items)
+          );
         }
 
         let transactions = [];
@@ -530,8 +546,10 @@ export class TransactionsManager {
           transactions.push(await set.getSingleTransaction());
         }
 
-        itemSets.forEach((x) =>
-          this.updateStatus(x.name(), TransactionStatus.Processing, attemptNum)
+        this.updateStatusForSets(
+          itemSets,
+          TransactionStatus.Processing,
+          attemptNum
         );
         const txSigs = await sendJitoBundledTransactions(
           this.txHandler.umi,
@@ -541,23 +559,19 @@ export class TransactionsManager {
           this.priorityFeeSetting
         );
         if (Boolean(txSigs) && txSigs!.length > 0) {
-          itemSets.forEach((x, i) =>
-            this.updateStatus(
-              x.name(),
-              TransactionStatus.Successful,
-              attemptNum,
-              txSigs![i]
-            )
+          this.updateStatusForSets(
+            itemSets,
+            TransactionStatus.Successful,
+            attemptNum,
+            txSigs
           );
         } else {
-          itemSets.forEach((x) =>
-            this.updateStatus(
-              x.name(),
-              TransactionStatus.Failed,
-              attemptNum,
-              undefined,
-              true,
-            )
+          this.updateStatusForSets(
+            itemSets,
+            TransactionStatus.Failed,
+            attemptNum,
+            txSigs,
+            true
           );
           throw new Error("Unknown error");
         }
@@ -566,15 +580,13 @@ export class TransactionsManager {
       this.retryDelay,
       this.errorsToThrow
     ).catch((e: Error) => {
-      itemSets.forEach((x) =>
-        this.updateStatus(
-          x.name(),
-          TransactionStatus.Failed,
-          num,
-          undefined,
-          true,
-          e.message
-        )
+      this.updateStatusForSets(
+        itemSets,
+        TransactionStatus.Failed,
+        num,
+        undefined,
+        true,
+        e.message
       );
       throw e;
     });

package/src/utils/jitoUtils.ts

@@ -184,6 +184,10 @@ export async function sendJitoBundledTransactions(
     feeEstimates
   );
 
+  for (let i = 0; i < txs.length; i++) {
+    consoleLog("Transaction", i, txs[i].getInstructions());
+  }
+
   // const simulationResults = await simulateJitoBundle(umi, builtTxs);
 
   if (!simulateOnly) {

package/src/utils/priceUtils.ts

@@ -5,15 +5,14 @@ import { fromBaseUnit, toBaseUnit } from "./numberUtils";
 import { PRICES } from "../constants/solautoConstants";
 import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
 import {
+  consoleLog,
   currentUnixSeconds,
   retryWithExponentialBackoff,
   zip,
 } from "./generalUtils";
-import { getSwitchboardPrices } from "./switchboardUtils";
+import { CrossbarClient } from "@switchboard-xyz/on-demand";
 
-export async function fetchTokenPrices(
-  mints: PublicKey[]
-): Promise<number[]> {
+export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
   if (
     !mints.some(
@@ -35,6 +34,8 @@ export async function fetchTokenPrices(
     zip(switchboardMints, await getSwitchboardPrices(switchboardMints)),
   ]);
 
+  consoleLog([...pythData, ...switchboardData]);
+
   const prices = mints.map((mint) => {
     const item = [...pythData, ...switchboardData].find((data) =>
       data[0].equals(mint)
@@ -94,16 +95,45 @@ export async function getPythPrices(mints: PublicKey[]) {
   return prices;
 }
 
-export function safeGetPrice(
-  mint: PublicKey | UmiPublicKey | undefined
-): number | undefined {
-  if (mint && mint?.toString() in PRICES) {
-    return PRICES[mint!.toString()].price;
+export async function getSwitchboardPrices(
+  mints: PublicKey[]
+): Promise<number[]> {
+  if (mints.length === 0) {
+    return [];
   }
-  return undefined;
+
+  const crossbar = new CrossbarClient("https://crossbar.switchboard.xyz");
+  let prices = await retryWithExponentialBackoff(
+    async () => {
+      const res = await crossbar.simulateSolanaFeeds(
+        "mainnet",
+        mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()])
+      );
+
+      const prices = res.flatMap((x) => x.results[0]);
+      if (prices.find((x) => !x || x === -Infinity)) {
+        throw new Error("Unable to fetch Switchboard prices");
+      }
+
+      return prices;
+    },
+    8,
+    250
+  );
+
+  const missingPrices = zip(mints, prices).filter((x) => !x[1]);
+  const jupPrices = zip(
+    missingPrices.map((x) => x[0]),
+    await getJupTokenPrices(missingPrices.map((x) => x[0]))
+  );
+
+  prices = prices.map((x, i) =>
+    x ? x : jupPrices.find((y) => y[0].toString() === mints[i].toString())![1]
+  );
+
+  return prices;
 }
 
-// LEGACY, NOT USED
 export async function getJupTokenPrices(mints: PublicKey[]) {
   if (mints.length == 0) {
     return [];
@@ -113,7 +143,7 @@ export async function getJupTokenPrices(mints: PublicKey[]) {
     const res = (
       await fetch(
         "https://api.jup.ag/price/v2?ids=" +
-          mints.map((x) => x.toString()).join(",") + "&showExtraInfo=true"
+          mints.map((x) => x.toString()).join(",")
       )
     ).json();
     return res;
@@ -125,3 +155,12 @@ export async function getJupTokenPrices(mints: PublicKey[]) {
 
   return prices;
 }
+
+export function safeGetPrice(
+  mint: PublicKey | UmiPublicKey | undefined
+): number | undefined {
+  if (mint && mint?.toString() in PRICES) {
+    return PRICES[mint!.toString()].price;
+  }
+  return undefined;
+}

package/src/utils/switchboardUtils.ts

@@ -97,33 +97,4 @@ export async function getSwitchboardFeedData(
   );
 
   return results;
-}
-
-export async function getSwitchboardPrices(
-  mints: PublicKey[]
-): Promise<number[]> {
-  if (mints.length === 0) {
-    return [];
-  }
-
-  const crossbar = new CrossbarClient("https://crossbar.switchboard.xyz");
-  const results = await retryWithExponentialBackoff(
-    async () => {
-      const res = await crossbar.simulateSolanaFeeds(
-        "mainnet",
-        mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()])
-      );
-
-      const prices = res.flatMap((x) => x.results[0]);
-      if (prices.find((x) => !x || x === -Infinity)) {
-        throw new Error("Unable to fetch Switchboard prices");
-      }
-
-      return prices;
-    },
-    8,
-    250
-  );
-
-  return results;
-}
+}