@haven-fi/solauto-sdk 1.0.2 → 1.0.4

package/dist/constants/solautoConstants.d.ts

@@ -1,12 +1,9 @@
 import { Connection } from "@solana/web3.js";
-import { JitoRpcConnection } from "jito-ts";
 export declare const DEFAULT_RISK_AVERSION_BPS = 1500;
 export declare const DEFAULT_LIMIT_GAP_BPS = 1000;
 export declare const MIN_POSITION_STATE_FRESHNESS_SECS = 5;
 export declare const MAX_REPAY_GAP_BPS = 100;
 export declare const CONNECTION: Connection;
-export declare const JITO_BLOCK_ENGINE = "ny.mainnet.block-engine.jito.wtf";
-export declare const JITO_CONNECTION: JitoRpcConnection;
 export declare const UMI: import("@metaplex-foundation/umi").Umi;
 export declare const PRICES: {
     [key: string]: {

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

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,UAAU,EAEX,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAI5C,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,eAAO,MAAM,UAAU,YAGtB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qCAAqC,CAAC;AACpE,eAAO,MAAM,eAAe,mBAG3B,CAAC;AACF,eAAO,MAAM,GAAG,wCAId,CAAC;AAEH,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE,CAAA;CAAO,CAAC;AAE9E,eAAO,MAAM,kBAAkB,gDAAgD,CAAC;AAEhF,eAAO,MAAM,qBAAqB,UAWjC,CAAC"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,UAAU,EAEX,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,eAAO,MAAM,UAAU,YAGtB,CAAC;AAOF,eAAO,MAAM,GAAG,wCAId,CAAC;AAEH,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE,CAAA;CAAO,CAAC;AAE9E,eAAO,MAAM,kBAAkB,gDAAgD,CAAC;AAEhF,eAAO,MAAM,qBAAqB,UAWjC,CAAC"}

package/dist/constants/solautoConstants.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STANDARD_LUT_ACCOUNTS = exports.JUPITER_PROGRAM_ID = exports.PRICES = exports.UMI = exports.JITO_CONNECTION = exports.JITO_BLOCK_ENGINE = exports.CONNECTION = exports.MAX_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.DEFAULT_LIMIT_GAP_BPS = exports.DEFAULT_RISK_AVERSION_BPS = void 0;
+exports.STANDARD_LUT_ACCOUNTS = exports.JUPITER_PROGRAM_ID = exports.PRICES = exports.UMI = exports.CONNECTION = exports.MAX_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.DEFAULT_LIMIT_GAP_BPS = exports.DEFAULT_RISK_AVERSION_BPS = void 0;
 const umi_bundle_defaults_1 = require("@metaplex-foundation/umi-bundle-defaults");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
-const jito_ts_1 = require("jito-ts");
+// import { JitoRpcConnection } from "jito-ts";
 const generated_1 = require("../generated");
 const generalAccounts_1 = require("./generalAccounts");
 exports.DEFAULT_RISK_AVERSION_BPS = 1500;
@@ -12,8 +12,11 @@ exports.DEFAULT_LIMIT_GAP_BPS = 1000;
 exports.MIN_POSITION_STATE_FRESHNESS_SECS = 5;
 exports.MAX_REPAY_GAP_BPS = 100;
 exports.CONNECTION = new web3_js_1.Connection(`https://mainnet.helius-rpc.com/?api-key=${process.env.HELIUS_API_KEY}`, "finalized");
-exports.JITO_BLOCK_ENGINE = "ny.mainnet.block-engine.jito.wtf";
-exports.JITO_CONNECTION = new jito_ts_1.JitoRpcConnection(`https://${exports.JITO_BLOCK_ENGINE}`, "finalized");
+// export const JITO_BLOCK_ENGINE = "ny.mainnet.block-engine.jito.wtf";
+// export const JITO_CONNECTION = new JitoRpcConnection(
+//   `https://${JITO_BLOCK_ENGINE}`,
+//   "finalized"
+// );
 exports.UMI = (0, umi_bundle_defaults_1.createUmi)(exports.CONNECTION).use({
     install(umi) {
         umi.programs.add((0, generated_1.createSolautoProgram)(), false);

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;AAuCzD,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;CAKjC;AAsED,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;CA6HX"}
+{"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;AAuCzD,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;CAKjC;AAsED,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;CA8HX"}

package/dist/transactions/transactionsManager.js

@@ -10,7 +10,7 @@ const solanaUtils_1 = require("../utils/solanaUtils");
 const solautoConstants_1 = require("../constants/solautoConstants");
 const generalUtils_1 = require("../utils/generalUtils");
 const transactionUtils_1 = require("./transactionUtils");
-const jitoUtils_1 = require("../utils/jitoUtils");
+// import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 class LookupTables {
     constructor(client) {
         this.client = client;
@@ -190,10 +190,15 @@ class TransactionsManager {
             this.updateStatus(itemSet.name(), TransactionStatus.Queued);
         }
         if (this.mustBeAtomic && itemSets.length > 1) {
-            itemSets.forEach((set) => {
-                this.updateStatus(set.name(), TransactionStatus.Processing);
-            });
-            await (0, jitoUtils_1.sendJitoBundledTransactions)(this.client, await Promise.all(itemSets.map((x) => x.getSingleTransaction())), this.simulateOnly);
+            throw new Error(`${itemSets.length} transactions required but jito bundles are not currently supported`);
+            // itemSets.forEach((set) => {
+            //   this.updateStatus(set.name(), TransactionStatus.Processing);
+            // });
+            // await sendJitoBundledTransactions(
+            //   this.client,
+            //   await Promise.all(itemSets.map((x) => x.getSingleTransaction())),
+            //   this.simulateOnly
+            // );
             // TODO: check if successful or not
             // itemSets.forEach((set) => {
             //   this.updateStatus(set.name(), TransactionStatus.Successful);

package/dist/utils/jitoUtils.d.ts

@@ -1,15 +1 @@
-import { SolautoClient } from "../clients/solautoClient";
-import { PublicKey } from "@solana/web3.js";
-import { TransactionBuilder } from "@metaplex-foundation/umi";
-import { SearcherClient } from "jito-ts/dist/sdk/block-engine/searcher";
-import { BundleResult } from "jito-ts/dist/gen/block-engine/bundle";
-export declare function getSearcherClient(): SearcherClient;
-export declare function getRandomTipAccount(): Promise<PublicKey>;
-export declare function waitUntilJitoNextLeader(distanceFromJitoSlot?: number): Promise<void>;
-interface JitoTransactionsResult {
-    bundleResult: BundleResult;
-    txSigs: Uint8Array[];
-}
-export declare function sendJitoBundledTransactions(client: SolautoClient, txs: TransactionBuilder[], simulateOnly?: boolean): Promise<JitoTransactionsResult | undefined>;
-export {};
 //# 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":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAW,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAQ3E,OAAO,EAEL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EACL,cAAc,EAEf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEpE,wBAAgB,iBAAiB,IAAI,cAAc,CAKlD;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAI9D;AAED,wBAAsB,uBAAuB,CAC3C,oBAAoB,GAAE,MAAU,iBAYjC;AAuFD,UAAU,sBAAsB;IAC9B,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,EAAE,CAAC;CACtB;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAsC7C"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":""}

package/dist/utils/jitoUtils.js

@@ -1,107 +1,170 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendJitoBundledTransactions = exports.waitUntilJitoNextLeader = exports.getRandomTipAccount = exports.getSearcherClient = void 0;
-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 types_1 = require("jito-ts/dist/sdk/block-engine/types");
-const searcher_1 = require("jito-ts/dist/sdk/block-engine/searcher");
-function getSearcherClient() {
-    return (0, searcher_1.searcherClient)(solautoConstants_1.JITO_BLOCK_ENGINE, web3_js_1.Keypair.fromSecretKey((0, solanaUtils_1.getSecretKey)("jito-bundles")));
-}
-exports.getSearcherClient = getSearcherClient;
-async function getRandomTipAccount() {
-    const tipAccounts = await getSearcherClient().getTipAccounts();
-    const randomInt = Math.floor(Math.random() * tipAccounts.length);
-    return new web3_js_1.PublicKey(tipAccounts[randomInt]);
-}
-exports.getRandomTipAccount = getRandomTipAccount;
-async function waitUntilJitoNextLeader(distanceFromJitoSlot = 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;
-        console.log(`Next jito leader slot in ${numSlots} slots`);
-        await new Promise((r) => setTimeout(r, 500));
-    }
-}
-exports.waitUntilJitoNextLeader = waitUntilJitoNextLeader;
-async function getTipInstruction(client, tipLamports) {
-    return (0, solanaUtils_1.systemTransferUmiIx)(client.signer, await getRandomTipAccount(), BigInt(tipLamports));
-}
-async function simulateJitoBundle(txs) {
-    const simulationResult = await solautoConstants_1.JITO_CONNECTION.simulateBundle(txs, {
-        preExecutionAccountsConfigs: txs.map((x) => null),
-        postExecutionAccountsConfigs: txs.map((x) => null),
-        skipSigVerify: true,
-    });
-    simulationResult.value.transactionResults.forEach((tx) => {
-        if (tx.err) {
-            tx.logs?.forEach((x) => {
-                console.log(x);
-            });
-            throw tx.err;
-        }
-    });
-    return simulationResult.value.transactionResults;
-}
-async function umiToVersionedTransactions(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(solautoConstants_1.UMI)).buildAndSign(solautoConstants_1.UMI));
-        return versionedTx;
-    }));
-}
-async function sendJitoBundle(bundle) {
-    await waitUntilJitoNextLeader();
-    let searcher = getSearcherClient();
-    console.log("Sending bundle...");
-    try {
-        const resp = await searcher.sendBundle(bundle);
-        console.log("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 {
-                console.log(res);
-                return reject("Bundle not accepted");
-            }
-        }, (err) => {
-            console.log("Error: ", err);
-            return reject(err);
-        });
-    });
-}
-async function sendJitoBundledTransactions(client, txs, simulateOnly) {
-    client.log("Sending Jito bundle...");
-    client.log("Transactions: ", txs.length);
-    client.log("Transaction sizes: ", txs.map((x) => x.getTransactionSize(solautoConstants_1.UMI)));
-    txs[0] = txs[0].prepend(await getTipInstruction(client, 1000000));
-    const feeEstimates = await Promise.all(txs.map(solanaUtils_1.getComputeUnitPriceEstimate));
-    let builtTxs = await umiToVersionedTransactions(client.signer, txs, feeEstimates);
-    // // 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 types_1.Bundle(builtTxs, 100));
-        return {
-            bundleResult,
-            txSigs: builtTxs.map((x) => x.signatures).flat(),
-        };
-    }
-    return undefined;
-}
-exports.sendJitoBundledTransactions = sendJitoBundledTransactions;
+// 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;
+//     console.log(`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)
+//   );
+// }
+// async function simulateJitoBundle(
+//   txs: VersionedTransaction[]
+// ): Promise<SimulatedBundleTransactionResult[]> {
+//   const simulationResult = await JITO_CONNECTION.simulateBundle(txs, {
+//     preExecutionAccountsConfigs: txs.map((x) => null),
+//     postExecutionAccountsConfigs: txs.map((x) => null),
+//     skipSigVerify: true,
+//   });
+//   simulationResult.value.transactionResults.forEach((tx) => {
+//     if (tx.err) {
+//       tx.logs?.forEach((x) => {
+//         console.log(x);
+//       });
+//       throw tx.err;
+//     }
+//   });
+//   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();
+//   console.log("Sending bundle...");
+//   try {
+//     const resp = await searcher.sendBundle(bundle);
+//     console.log("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 {
+//           console.log(res);
+//           return reject("Bundle not accepted");
+//         }
+//       },
+//       (err) => {
+//         console.log("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;
+// }

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

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAIpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CA4D7B"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CA+D7B"}

package/dist/utils/jupiterUtils.js

@@ -5,7 +5,6 @@ const umi_1 = require("@metaplex-foundation/umi");
 const web3_js_1 = require("@solana/web3.js");
 const solanaUtils_1 = require("./solanaUtils");
 const numberUtils_1 = require("./numberUtils");
-const console_1 = require("console");
 const api_1 = require("@jup-ag/api");
 const accountUtils_1 = require("./accountUtils");
 const jupApi = (0, api_1.createJupiterApiClient)();
@@ -47,7 +46,9 @@ async function getJupSwapTransaction(signer, swapDetails) {
             destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(swapDetails.destinationWallet, swapDetails.outputMint).toString(),
         },
     });
-    (0, console_1.assert)(instructions.swapInstruction !== undefined);
+    if (!instructions.swapInstruction) {
+        throw new Error("No swap instruction was returned by Jupiter");
+    }
     return {
         jupQuote: quoteResponse,
         lookupTableAddresses: instructions.addressLookupTableAddresses,

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAGL,SAAS,EAIT,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAQzD,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,cAGhD;AAED,wBAAgB,YAAY,CAAC,eAAe,GAAE,MAAa,GAAG,UAAU,CAIvE;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC,CAQhE;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,qBAAqB,CACzC,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,MAAM,sBA4D1B;AAiBD,wBAAsB,2BAA2B,CAC/C,EAAE,EAAE,kBAAkB,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,YAAY,CAAC,EAAE,OAAO,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAoDjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAGL,SAAS,EAIT,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAQzD,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,cAGhD;AAED,wBAAgB,YAAY,CAAC,eAAe,GAAE,MAAa,GAAG,UAAU,CAIvE;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC,CAQhE;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,qBAAqB,CACzC,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,MAAM,sBA4D1B;AAiBD,wBAAsB,2BAA2B,CAC/C,EAAE,EAAE,kBAAkB,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAcjB;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,YAAY,CAAC,EAAE,OAAO,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAqDjC"}

package/dist/utils/solanaUtils.js

@@ -152,7 +152,6 @@ async function getComputeUnitPriceEstimate(tx, attemptNum) {
         },
     ]);
     const feeEstimate = Math.round(resp.priorityFeeEstimate);
-    console.log("Compute unit price: ", feeEstimate);
     return feeEstimate;
 }
 exports.getComputeUnitPriceEstimate = getComputeUnitPriceEstimate;
@@ -161,9 +160,10 @@ async function sendSingleOptimizedTransaction(client, tx, simulateOnly, attemptN
     client.log("Instructions: ", tx.getInstructions().length);
     client.log("Serialized transaction size: ", tx.getTransactionSize(solautoConstants_1.UMI));
     const feeEstimate = await getComputeUnitPriceEstimate(tx, attemptNum);
+    client.log("Compute unit price: ", feeEstimate);
     const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction((0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(client.signer, tx, feeEstimate, 1400000).setLatestBlockhash(solautoConstants_1.UMI)).buildAndSign(solautoConstants_1.UMI))));
     const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.15);
-    console.log("Compute unit limit: ", computeUnitLimit);
+    client.log("Compute unit limit: ", computeUnitLimit);
     if (!simulateOnly) {
         const result = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await assembleFinalTransaction(client.signer, tx, feeEstimate, computeUnitLimit).sendAndConfirm(solautoConstants_1.UMI, {
             send: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -24,7 +24,6 @@
     "@types/node": "^20.14.8",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
-    "jito-ts": "^4.0.1",
     "rpc-websockets": "7.11.0"
   },
   "devDependencies": {

package/src/constants/solautoConstants.ts

@@ -11,7 +11,7 @@ import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
-import { JitoRpcConnection } from "jito-ts";
+// import { JitoRpcConnection } from "jito-ts";
 import { createSolautoProgram, SOLAUTO_PROGRAM_ID } from "../generated";
 import { SOLAUTO_MANAGER } from "./generalAccounts";
 
@@ -25,11 +25,11 @@ export const CONNECTION = new Connection(
   "finalized"
 );
 
-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 = "ny.mainnet.block-engine.jito.wtf";
+// export const JITO_CONNECTION = new JitoRpcConnection(
+//   `https://${JITO_BLOCK_ENGINE}`,
+//   "finalized"
+// );
 export const UMI = createUmi(CONNECTION).use({
   install(umi) {
     umi.programs.add(createSolautoProgram(), false);

package/src/transactions/transactionsManager.ts

@@ -12,7 +12,7 @@ import {
 import { UMI } from "../constants/solautoConstants";
 import { retryWithExponentialBackoff } from "../utils/generalUtils";
 import { getTransactionChores } from "./transactionUtils";
-import { sendJitoBundledTransactions } from "../utils/jitoUtils";
+// import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
 class LookupTables {
   defaultLuts: string[] = [];
@@ -264,14 +264,15 @@ export class TransactionsManager {
     }
 
     if (this.mustBeAtomic && itemSets.length > 1) {
-      itemSets.forEach((set) => {
-        this.updateStatus(set.name(), TransactionStatus.Processing);
-      });
-      await sendJitoBundledTransactions(
-        this.client,
-        await Promise.all(itemSets.map((x) => x.getSingleTransaction())),
-        this.simulateOnly
-      );
+      throw new Error(`${itemSets.length} transactions required but jito bundles are not currently supported`);
+      // itemSets.forEach((set) => {
+      //   this.updateStatus(set.name(), TransactionStatus.Processing);
+      // });
+      // await sendJitoBundledTransactions(
+      //   this.client,
+      //   await Promise.all(itemSets.map((x) => x.getSingleTransaction())),
+      //   this.simulateOnly
+      // );
       // TODO: check if successful or not
       // itemSets.forEach((set) => {
       //   this.updateStatus(set.name(), TransactionStatus.Successful);

package/src/utils/jitoUtils.ts

@@ -1,188 +1,188 @@
-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;
-    console.log(`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)
-  );
-}
-
-async function simulateJitoBundle(
-  txs: VersionedTransaction[]
-): Promise<SimulatedBundleTransactionResult[]> {
-  const simulationResult = await JITO_CONNECTION.simulateBundle(txs, {
-    preExecutionAccountsConfigs: txs.map((x) => null),
-    postExecutionAccountsConfigs: txs.map((x) => null),
-    skipSigVerify: true,
-  });
-
-  simulationResult.value.transactionResults.forEach((tx) => {
-    if (tx.err) {
-      tx.logs?.forEach((x) => {
-        console.log(x);
-      });
-      throw tx.err;
-    }
-  });
-
-  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();
-
-  console.log("Sending bundle...");
-  try {
-    const resp = await searcher.sendBundle(bundle);
-    console.log("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 {
-          console.log(res);
-          return reject("Bundle not accepted");
-        }
-      },
-      (err) => {
-        console.log("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;
-}
+// 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;
+//     console.log(`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)
+//   );
+// }
+
+// async function simulateJitoBundle(
+//   txs: VersionedTransaction[]
+// ): Promise<SimulatedBundleTransactionResult[]> {
+//   const simulationResult = await JITO_CONNECTION.simulateBundle(txs, {
+//     preExecutionAccountsConfigs: txs.map((x) => null),
+//     postExecutionAccountsConfigs: txs.map((x) => null),
+//     skipSigVerify: true,
+//   });
+
+//   simulationResult.value.transactionResults.forEach((tx) => {
+//     if (tx.err) {
+//       tx.logs?.forEach((x) => {
+//         console.log(x);
+//       });
+//       throw tx.err;
+//     }
+//   });
+
+//   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();
+
+//   console.log("Sending bundle...");
+//   try {
+//     const resp = await searcher.sendBundle(bundle);
+//     console.log("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 {
+//           console.log(res);
+//           return reject("Bundle not accepted");
+//         }
+//       },
+//       (err) => {
+//         console.log("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;
+// }

package/src/utils/jupiterUtils.ts

@@ -6,7 +6,6 @@ import {
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { getWrappedInstruction } from "./solanaUtils";
 import { toBps } from "./numberUtils";
-import { assert } from "console";
 import {
   createJupiterApiClient,
   Instruction,
@@ -87,7 +86,10 @@ export async function getJupSwapTransaction(
     },
   });
 
-  assert(instructions.swapInstruction !== undefined);
+  if (!instructions.swapInstruction) {
+    throw new Error("No swap instruction was returned by Jupiter");
+  }
+
   return {
     jupQuote: quoteResponse,
     lookupTableAddresses: instructions.addressLookupTableAddresses,

package/src/utils/solanaUtils.ts

@@ -268,7 +268,6 @@ export async function getComputeUnitPriceEstimate(
     },
   ]);
   const feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
-  console.log("Compute unit price: ", feeEstimate);
 
   return feeEstimate;
 }
@@ -284,6 +283,7 @@ export async function sendSingleOptimizedTransaction(
   client.log("Serialized transaction size: ", tx.getTransactionSize(UMI));
 
   const feeEstimate = await getComputeUnitPriceEstimate(tx, attemptNum);
+  client.log("Compute unit price: ", feeEstimate);
 
   const simulationResult = await retryWithExponentialBackoff(
     async () =>
@@ -304,7 +304,7 @@ export async function sendSingleOptimizedTransaction(
   const computeUnitLimit = Math.round(
     simulationResult.value.unitsConsumed! * 1.15
   );
-  console.log("Compute unit limit: ", computeUnitLimit);
+  client.log("Compute unit limit: ", computeUnitLimit);
 
   if (!simulateOnly) {
     const result = await retryWithExponentialBackoff(