@haven-fi/solauto-sdk 1.0.309 → 1.0.311

package/dist/constants/solautoConstants.d.ts

@@ -14,4 +14,5 @@ export declare const PRICES: {
 };
 export declare const SOLAUTO_LUT = "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
 export declare const STANDARD_LUT_ACCOUNTS: string[];
+export declare const JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";
 //# sourceMappingURL=solautoConstants.d.ts.map

package/dist/constants/solautoConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAE3B,eAAO,MAAM,iBAAiB,0CAA0C,CAAC"}

package/dist/constants/solautoConstants.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.PRICES = exports.MIN_USD_SUPPORTED_POSITION = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.BASIS_POINTS = exports.SOLAUTO_TEST_PROGRAM = exports.SOLAUTO_PROD_PROGRAM = void 0;
+exports.JITO_BLOCK_ENGINE = exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.PRICES = exports.MIN_USD_SUPPORTED_POSITION = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.BASIS_POINTS = exports.SOLAUTO_TEST_PROGRAM = exports.SOLAUTO_PROD_PROGRAM = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
-// import { JitoRpcConnection } from "jito-ts";
 const generalAccounts_1 = require("./generalAccounts");
 const jupiter_sdk_1 = require("../jupiter-sdk");
 exports.SOLAUTO_PROD_PROGRAM = new web3_js_1.PublicKey("AutoyKBRaHSBHy9RsmXCZMy6nNFAg5FYijrvZyQcNLV");
@@ -29,8 +28,4 @@ exports.STANDARD_LUT_ACCOUNTS = [
     web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
     jupiter_sdk_1.JUPITER_PROGRAM_ID,
 ].map((x) => x.toString());
-// export const JITO_BLOCK_ENGINE = "ny.mainnet.block-engine.jito.wtf";
-// export const JITO_CONNECTION = new JitoRpcConnection(
-//   `https://${JITO_BLOCK_ENGINE}`,
-//   "finalized"
-// );
+exports.JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";

package/dist/transactions/transactionsManager.d.ts

@@ -37,12 +37,13 @@ export declare class TransactionsManager {
     private statusCallback?;
     private txType?;
     private priorityFeeSetting;
+    private atomically;
     private errorsToThrow?;
     private retries;
     private retryDelay;
     private statuses;
     private lookupTables;
-    constructor(txHandler: SolautoClient | ReferralStateManager, statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, txType?: TransactionRunType | undefined, priorityFeeSetting?: PriorityFeeSetting, errorsToThrow?: ErrorsToThrow | undefined, retries?: number, retryDelay?: number);
+    constructor(txHandler: SolautoClient | ReferralStateManager, statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, txType?: TransactionRunType | undefined, priorityFeeSetting?: PriorityFeeSetting, atomically?: boolean, errorsToThrow?: ErrorsToThrow | undefined, retries?: number, retryDelay?: number);
     private assembleTransactionSets;
     private updateStatus;
     private debugAccounts;
@@ -51,6 +52,7 @@ export declare class TransactionsManager {
     private updateLut;
     clientSend(transactions: TransactionItem[]): Promise<TransactionManagerStatuses>;
     send(items: TransactionItem[]): Promise<TransactionManagerStatuses>;
+    private processTransactionsAtomically;
     private processTransactionSet;
     private refreshItemSet;
     private sendTransaction;

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;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;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAMb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA0FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA+BxB,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;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,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;IA0FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YA8D7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAmD9B"}

package/dist/transactions/transactionsManager.js

@@ -13,7 +13,7 @@ const types_1 = require("../types");
 const web3_js_1 = require("@solana/web3.js");
 const switchboardConstants_1 = require("../constants/switchboardConstants");
 const utils_1 = require("../utils");
-// import { sendJitoBundledTransactions } from "../utils/jitoUtils";
+const jitoUtils_1 = require("../utils/jitoUtils");
 const CHORES_TX_NAME = "account chores";
 class TransactionTooLargeError extends Error {
     constructor(message) {
@@ -139,11 +139,12 @@ var TransactionStatus;
     TransactionStatus["Failed"] = "Failed";
 })(TransactionStatus || (exports.TransactionStatus = TransactionStatus = {}));
 class TransactionsManager {
-    constructor(txHandler, statusCallback, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, errorsToThrow, retries = 4, retryDelay = 150) {
+    constructor(txHandler, statusCallback, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, atomically = false, errorsToThrow, retries = 4, retryDelay = 150) {
         this.txHandler = txHandler;
         this.statusCallback = statusCallback;
         this.txType = txType;
         this.priorityFeeSetting = priorityFeeSetting;
+        this.atomically = atomically;
         this.errorsToThrow = errorsToThrow;
         this.retries = retries;
         this.retryDelay = retryDelay;
@@ -266,7 +267,7 @@ class TransactionsManager {
         const swbOracle = allAccounts.find((x) => Object.values(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS).includes(x ?? ""));
         if (swbOracle) {
             const mint = new web3_js_1.PublicKey(Object.keys(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS).find((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x] === swbOracle));
-            const stale = (await (0, utils_1.getSwitchboardPrices)(client.connection, [mint]))[0]
+            const stale = (await (0, utils_1.getSwitchboardFeedData)(client.connection, [mint]))[0]
                 .stale;
             if (stale) {
                 const swbTx = new TransactionItem(async () => (0, utils_1.buildSwbSubmitResponseTx)(client.connection, client.signer, mint), items.length === 1 ? "Update oracle" : "");
@@ -316,13 +317,40 @@ class TransactionsManager {
             this.txHandler.log("Only simulate and more than 1 transaction. Skipping...");
             return [];
         }
-        let currentIndex = 0;
-        while (currentIndex < itemSets.length) {
-            await this.processTransactionSet(itemSets, currentIndex);
-            currentIndex++;
+        if (itemSets.length > 1 && this.atomically) {
+            await this.processTransactionsAtomically(itemSets);
+        }
+        else {
+            let currentIndex = 0;
+            while (currentIndex < itemSets.length) {
+                await this.processTransactionSet(itemSets, currentIndex);
+                currentIndex++;
+            }
         }
         return this.statuses;
     }
+    async processTransactionsAtomically(itemSets) {
+        let num = 0;
+        await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => {
+            num = attemptNum;
+            let transactions = [];
+            for (const set of itemSets) {
+                transactions.push(await set.getSingleTransaction());
+            }
+            itemSets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Processing, attemptNum));
+            const txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.signer, transactions, false, this.priorityFeeSetting);
+            if (txSigs) {
+                itemSets.forEach((x, i) => this.updateStatus(x.name(), TransactionStatus.Successful, attemptNum, txSigs[i]));
+            }
+            else {
+                itemSets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Failed, attemptNum, undefined, 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));
+            throw e;
+        });
+    }
     async processTransactionSet(itemSets, currentIndex) {
         let itemSet = itemSets[currentIndex];
         let num = 0;

package/dist/utils/jitoUtils.d.ts

@@ -1 +1,6 @@
+import { PublicKey } from "@solana/web3.js";
+import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { PriorityFeeSetting } from "../types";
+export declare function getRandomTipAccount(): Promise<PublicKey>;
+export declare function sendJitoBundledTransactions(umi: Umi, signer: Signer, txs: TransactionBuilder[], simulateOnly?: boolean, priorityFeeSetting?: PriorityFeeSetting): Promise<string[] | undefined>;
 //# sourceMappingURL=jitoUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":""}
+{"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;AAOlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAI9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA2GD,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,CA0C/B"}

package/dist/utils/jitoUtils.js

@@ -1,64 +1,35 @@
 "use strict";
-// import { SolautoClient } from "../clients/solautoClient";
-// import { Keypair, PublicKey, VersionedTransaction } from "@solana/web3.js";
-// import { SimulatedBundleTransactionResult } from "jito-ts";
-// import { toWeb3JsTransaction } from "@metaplex-foundation/umi-web3js-adapters";
-// import {
-//   JITO_BLOCK_ENGINE,
-//   JITO_CONNECTION,
-//   UMI,
-// } from "../constants/solautoConstants";
-// import {
-//   Signer,
-//   TransactionBuilder,
-//   WrappedInstruction,
-// } from "@metaplex-foundation/umi";
-// import {
-//   assembleFinalTransaction,
-//   getComputeUnitPriceEstimate,
-//   getSecretKey,
-//   systemTransferUmiIx,
-// } from "./solanaUtils";
-// import { Bundle } from "jito-ts/dist/sdk/block-engine/types";
-// import {
-//   SearcherClient,
-//   searcherClient,
-// } from "jito-ts/dist/sdk/block-engine/searcher";
-// import { BundleResult } from "jito-ts/dist/gen/block-engine/bundle";
-// export function getSearcherClient(): SearcherClient {
-//   return searcherClient(
-//     JITO_BLOCK_ENGINE,
-//     Keypair.fromSecretKey(getSecretKey("jito-bundles"))
-//   );
-// }
-// export async function getRandomTipAccount(): Promise<PublicKey> {
-//   const tipAccounts = await getSearcherClient().getTipAccounts();
-//   const randomInt = Math.floor(Math.random() * tipAccounts.length);
-//   return new PublicKey(tipAccounts[randomInt]);
-// }
-// export async function waitUntilJitoNextLeader(
-//   distanceFromJitoSlot: number = 5
-// ) {
-//   let searcher = getSearcherClient();
-//   let isLeaderSlot = false;
-//   while (!isLeaderSlot) {
-//     const nextLeader = await searcher.getNextScheduledLeader();
-//     const numSlots = nextLeader.nextLeaderSlot - nextLeader.currentSlot;
-//     isLeaderSlot = numSlots <= distanceFromJitoSlot && numSlots > 1;
-//     consoleLog(`Next jito leader slot in ${numSlots} slots`);
-//     await new Promise((r) => setTimeout(r, 500));
-//   }
-// }
-// async function getTipInstruction(
-//   client: SolautoClient,
-//   tipLamports: number
-// ): Promise<WrappedInstruction> {
-//   return systemTransferUmiIx(
-//     client.signer,
-//     await getRandomTipAccount(),
-//     BigInt(tipLamports)
-//   );
-// }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRandomTipAccount = getRandomTipAccount;
+exports.sendJitoBundledTransactions = sendJitoBundledTransactions;
+const web3_js_1 = require("@solana/web3.js");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const solautoConstants_1 = require("../constants/solautoConstants");
+const solanaUtils_1 = require("./solanaUtils");
+const generalUtils_1 = require("./generalUtils");
+const types_1 = require("../types");
+const axios_1 = __importDefault(require("axios"));
+const bs58_1 = __importDefault(require("bs58"));
+async function getRandomTipAccount() {
+    const tipAccounts = [
+        "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
+        "HFqU5x63VTqvQss8hp11i4wVV8bD44PvwucfZ2bU7gRe",
+        "Cw8CFyM9FkoMi7K7Crf6HNQqf4uEMzpKw6QNghXLvLkY",
+        "ADaUMid9yfUytqMBgopwjb2DTLSokTSzL1zt6iGPaS49",
+        "DfXygSm4jCyNCybVYYK6DwvWqjKee8pbDmJGcLWNDXjh",
+        "ADuUkR4vqLUMWXxW9gh6D6L8pMSawimctcNZ5pGwDcEt",
+        "DttWaMuVvTiduZRnguLF7jNxTgiMBZ1hyAumKUiL2KRL",
+        "3AVi9Tg9Uo68tJfuvoKvqKNWKkC5wPdSSdeBnizKZ6jT",
+    ];
+    const randomInt = Math.floor(Math.random() * tipAccounts.length);
+    return new web3_js_1.PublicKey(tipAccounts[randomInt]);
+}
+async function getTipInstruction(signer, tipLamports) {
+    return (0, solanaUtils_1.systemTransferUmiIx)(signer, await getRandomTipAccount(), BigInt(tipLamports));
+}
 // async function simulateJitoBundle(
 //   txs: VersionedTransaction[]
 // ): Promise<SimulatedBundleTransactionResult[]> {
@@ -77,94 +48,70 @@
 //   });
 //   return simulationResult.value.transactionResults;
 // }
-// async function umiToVersionedTransactions(
-//   signer: Signer,
-//   txs: TransactionBuilder[],
-//   feeEstimates: number[],
-//   computeUnitLimits?: number[]
-// ): Promise<VersionedTransaction[]> {
-//   return await Promise.all(
-//     txs.map(async (tx, i) => {
-//       const versionedTx = toWeb3JsTransaction(
-//         await (
-//           await assembleFinalTransaction(
-//             signer,
-//             tx,
-//             feeEstimates[i],
-//             computeUnitLimits ? computeUnitLimits[i] : undefined
-//           ).setLatestBlockhash(UMI)
-//         ).buildAndSign(UMI)
-//       );
-//       return versionedTx;
-//     })
-//   );
-// }
-// async function sendJitoBundle(bundle: Bundle): Promise<BundleResult> {
-//   await waitUntilJitoNextLeader();
-//   let searcher = getSearcherClient();
-//   consoleLog("Sending bundle...");
-//   try {
-//     const resp = await searcher.sendBundle(bundle);
-//     consoleLog("Send bundle response:", resp);
-//   } catch (e) {
-//     console.error("Error sending bundle:", e);
-//   }
-//   return await new Promise((resolve, reject) => {
-//     searcher.onBundleResult(
-//       (res) => {
-//         if (res.accepted || res.processed || res.finalized) {
-//           resolve(res);
-//         } else {
-//           consoleLog(res);
-//           return reject("Bundle not accepted");
-//         }
-//       },
-//       (err) => {
-//         consoleLog("Error: ", err);
-//         return reject(err);
-//       }
-//     );
-//   });
-// }
-// interface JitoTransactionsResult {
-//   bundleResult: BundleResult;
-//   txSigs: Uint8Array[];
-// }
-// export async function sendJitoBundledTransactions(
-//   client: SolautoClient,
-//   txs: TransactionBuilder[],
-//   simulateOnly?: boolean
-// ): Promise<JitoTransactionsResult | undefined> {
-//   client.log("Sending Jito bundle...");
-//   client.log("Transactions: ", txs.length);
-//   client.log(
-//     "Transaction sizes: ",
-//     txs.map((x) => x.getTransactionSize(UMI))
-//   );
-//   txs[0] = txs[0].prepend(await getTipInstruction(client, 1000000));
-//   const feeEstimates = await Promise.all(txs.map(getComputeUnitPriceEstimate));
-//   let builtTxs = await umiToVersionedTransactions(
-//     client.signer,
-//     txs,
-//     feeEstimates,
-//     // Array(txs.length).fill(1_400_000)
-//   );
-//   // // TODO: Skip over this for now, and instead don't specify a compute unit limit in the final bundle transactions
-//   // const simulationResults = await simulateJitoBundle(builtTxs);
-//   if (!simulateOnly) {
-//     // let builtTxs = await umiToVersionedTransactions(
-//     //   client.signer,
-//     //   txs,
-//     //   feeEstimates,
-//     //   simulationResults.map((x) => x.unitsConsumed! * 1.15)
-//     // );
-//     const bundleResult = await sendJitoBundle(
-//       new Bundle(builtTxs, 100)
-//     );
-//     return {
-//       bundleResult,
-//       txSigs: builtTxs.map((x) => x.signatures).flat(),
-//     };
-//   }
-//   return undefined;
-// }
+async function umiToVersionedTransactions(umi, signer, txs, feeEstimates, computeUnitLimits) {
+    return await Promise.all(txs.map(async (tx, i) => {
+        const versionedTx = (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await (0, solanaUtils_1.assembleFinalTransaction)(signer, tx, feeEstimates[i], computeUnitLimits ? computeUnitLimits[i] : undefined).setLatestBlockhash(umi)).buildAndSign(umi));
+        return versionedTx;
+    }));
+}
+async function getBundleStatus(bundleId) {
+    const res = await axios_1.default.post(`${solautoConstants_1.JITO_BLOCK_ENGINE}/api/v1/bundles`, {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "getBundleStatuses",
+        params: [[bundleId]],
+    });
+    if (res.data.error) {
+        throw new Error(`Failed to get bundle status: ${res.data.error}`);
+    }
+    return res.data.result;
+}
+async function pollBundleStatus(bundleId, interval = 1000, timeout = 40000) {
+    const endTime = Date.now() + timeout;
+    while (Date.now() < endTime) {
+        await new Promise((resolve) => setTimeout(resolve, interval));
+        const statuses = await getBundleStatus(bundleId);
+        if (statuses?.value?.length > 0) {
+            const status = statuses.value[0].confirmation_status;
+            if (status === "confirmed") {
+                return statuses?.value[0].transactions;
+            }
+        }
+    }
+    return [];
+}
+async function sendJitoBundle(transactions) {
+    (0, generalUtils_1.consoleLog)("Sending bundle...");
+    const resp = await axios_1.default.post(`${solautoConstants_1.JITO_BLOCK_ENGINE}/api/v1/bundles`, {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "sendBundle",
+        params: [transactions],
+    });
+    const bundleId = resp.data.result;
+    return await pollBundleStatus(bundleId);
+}
+async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, priorityFeeSetting = types_1.PriorityFeeSetting.Min) {
+    (0, generalUtils_1.consoleLog)("Sending Jito bundle...");
+    (0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
+    (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
+    txs[0] = txs[0].prepend(await getTipInstruction(signer, 150000));
+    const feeEstimates = await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting)) ??
+        1000000));
+    let builtTxs = await umiToVersionedTransactions(umi, signer, txs, feeEstimates
+    // Array(txs.length).fill(1_400_000)
+    );
+    // // TODO: Skip over this for now, and instead don't specify a compute unit limit in the final bundle transactions
+    // const simulationResults = await simulateJitoBundle(builtTxs);
+    if (!simulateOnly) {
+        // let builtTxs = await umiToVersionedTransactions(
+        //   client.signer,
+        //   txs,
+        //   feeEstimates,
+        //   simulationResults.map((x) => x.unitsConsumed! * 1.15)
+        // );
+        const txSigs = await sendJitoBundle(builtTxs.map((x) => bs58_1.default.encode(x.serialize())));
+        return txSigs.length > 0 ? txSigs : undefined;
+    }
+    return undefined;
+}

package/dist/utils/priceUtils.d.ts

@@ -1,12 +1,7 @@
-import { Connection, PublicKey } from "@solana/web3.js";
+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 getSwitchboardPrices(conn: Connection, mints: PublicKey[]): Promise<{
-    mint: PublicKey;
-    price: number;
-    stale: boolean;
-}[]>;
 export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined;
 export declare function getJupTokenPrices(mints: PublicKey[]): Promise<number[]>;
 //# 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,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,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,wBAAsB,oBAAoB,CACxC,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,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,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;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;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAsBzD"}

package/dist/utils/priceUtils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchTokenPrices = fetchTokenPrices;
 exports.getPythPrices = getPythPrices;
-exports.getSwitchboardPrices = getSwitchboardPrices;
 exports.safeGetPrice = safeGetPrice;
 exports.getJupTokenPrices = getJupTokenPrices;
 const pythConstants_1 = require("../constants/pythConstants");
@@ -21,7 +20,7 @@ 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 getJupTokenPrices(switchboardMints)),
+        (0, generalUtils_1.zip)(switchboardMints, await (0, switchboardUtils_1.getSwitchboardPrices)(switchboardMints)),
     ]);
     const prices = mints.map((mint) => {
         const item = [...pythData, ...switchboardData].find((data) => data[0].equals(mint));
@@ -63,20 +62,6 @@ async function getPythPrices(mints) {
     }, 5, 200);
     return prices;
 }
-async function getSwitchboardPrices(conn, mints) {
-    if (mints.length === 0) {
-        return [];
-    }
-    const currSlot = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await conn.getSlot("confirmed"), 5);
-    const results = await Promise.all(mints.map(async (mint) => {
-        const feed = (0, switchboardUtils_1.getPullFeed)(conn, mint);
-        const result = await feed.loadData();
-        const price = Number(result.result.value) / Math.pow(10, 18);
-        const stale = currSlot > result.result.slot.toNumber() + result.maxStaleness;
-        return { mint, price, stale };
-    }));
-    return results;
-}
 function safeGetPrice(mint) {
     if (mint && mint?.toString() in solautoConstants_1.PRICES) {
         return solautoConstants_1.PRICES[mint.toString()].price;
@@ -89,9 +74,10 @@ async function getJupTokenPrices(mints) {
     }
     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(","))).json();
+            mints.map((x) => x.toString()).join(",") + "&showExtraInfo=true")).json();
         return res;
     }, 6);
+    console.log(data.data[mints[0].toString()].extraInfo.quotedPrice);
     const prices = Object.values(data.data).map((x) => parseFloat(x.price));
     return prices;
 }

package/dist/utils/solanaUtils.js

@@ -170,7 +170,7 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
     }
     return feeEstimate;
 }
-async function spamSendTransactionUntilConfirmed(connection, transaction, blockhash, spamInterval = 3000) {
+async function spamSendTransactionUntilConfirmed(connection, transaction, blockhash, spamInterval = 1500) {
     let transactionSignature = null;
     const sendTx = async () => {
         try {

package/dist/utils/switchboardUtils.d.ts

@@ -4,4 +4,10 @@ import { TransactionItemInputs } from "../types";
 import { Signer } from "@metaplex-foundation/umi";
 export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): PullFeed;
 export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;
+export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKey[]): Promise<{
+    mint: PublicKey;
+    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;AAMtE,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,CAiB5C"}
+{"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,CAiBnB"}

package/dist/utils/switchboardUtils.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 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");
@@ -12,6 +14,7 @@ const on_demand_1 = require("@switchboard-xyz/on-demand");
 const switchboardConstants_1 = require("../constants/switchboardConstants");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const generalUtils_1 = require("./generalUtils");
 function getPullFeed(conn, mint, wallet) {
     const dummyWallet = {
         publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
@@ -25,9 +28,9 @@ function getPullFeed(conn, mint, wallet) {
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
     const crossbar = new on_demand_1.CrossbarClient("https://crossbar.switchboard.xyz");
     const feed = getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
-    const [pullIx, responses] = await feed.fetchUpdateIx({
+    const [pullIx, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await feed.fetchUpdateIx({
         crossbarClient: crossbar,
-    });
+    }), 8, 200);
     return {
         tx: (0, umi_1.transactionBuilder)().add({
             bytesCreatedOnChain: 0,
@@ -39,3 +42,25 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
             .map((x) => x.oracle.lut.key.toString()),
     };
 }
+async function getSwitchboardFeedData(conn, mints) {
+    if (mints.length === 0) {
+        return [];
+    }
+    const currSlot = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await conn.getSlot("confirmed"), 5);
+    const results = await Promise.all(mints.map(async (mint) => {
+        const feed = getPullFeed(conn, mint);
+        const result = await feed.loadData();
+        const price = Number(result.result.value) / Math.pow(10, 18);
+        const stale = currSlot > result.result.slot.toNumber() + result.maxStaleness;
+        return { mint, price, stale };
+    }));
+    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 () => await crossbar.simulateSolanaFeeds("mainnet", mints.map((x) => switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()])), 8, 200);
+    return results.flatMap((x) => x.results[0]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.309",
+  "version": "1.0.311",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -26,6 +26,7 @@
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "^1.95.4",
     "@switchboard-xyz/on-demand": "^1.2.51",
+    "axios": "^1.7.8",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
     "rpc-websockets": "7.11.0"

package/src/constants/solautoConstants.ts

@@ -9,7 +9,6 @@ import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
-// import { JitoRpcConnection } from "jito-ts";
 import { SOLAUTO_MANAGER } from "./generalAccounts";
 import { JUPITER_PROGRAM_ID } from "../jupiter-sdk";
 
@@ -46,8 +45,4 @@ export const STANDARD_LUT_ACCOUNTS = [
   JUPITER_PROGRAM_ID,
 ].map((x) => x.toString());
 
-// export const JITO_BLOCK_ENGINE = "ny.mainnet.block-engine.jito.wtf";
-// export const JITO_CONNECTION = new JitoRpcConnection(
-//   `https://${JITO_BLOCK_ENGINE}`,
-//   "finalized"
-// );
+export const JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";