@haven-fi/solauto-sdk 1.0.623 → 1.0.625

package/src/services/rebalance/rebalanceValues.ts

@@ -3,13 +3,13 @@ import {
   TokenBalanceChange,
   TokenBalanceChangeType,
 } from "../../generated";
-import { SolautoPositionEx } from "../../solautoPosition";
 import {
   fromBps,
   getLiqUtilzationRateBps,
   maxRepayToBps,
   toBps,
 } from "../../utils";
+import { SolautoPositionEx } from "../../solautoPosition";
 import { SolautoFeesBps } from "./solautoFees";
 
 export interface PositionValues {

package/src/services/rebalance/solautoFees.ts

@@ -37,10 +37,9 @@ export class SolautoFeesBps {
 
     let feeBps: number = 0;
 
-    if (
-      this.targetLiqUtilizationRateBps !== undefined ||
-      rebalanceDirection === RebalanceDirection.Repay
-    ) {
+    if (this.targetLiqUtilizationRateBps !== undefined) {
+      feeBps = 15;
+    } else if (rebalanceDirection === RebalanceDirection.Repay) {
       feeBps = 25;
     } else if (this.positionNetWorthUsd <= minSize) {
       feeBps = maxFeeBps;

package/src/services/solauto/solautoClient.ts

@@ -1,10 +1,5 @@
 import "rpc-websockets/dist/lib/client";
-import {
-  AddressLookupTableProgram,
-  PublicKey,
-  RpcResponseAndContext,
-  TokenAmount,
-} from "@solana/web3.js";
+import { AddressLookupTableProgram, PublicKey } from "@solana/web3.js";
 import {
   TransactionBuilder,
   isOption,
@@ -28,15 +23,13 @@ import {
 import {
   getSolautoPositionAccount,
   getTokenAccount,
-} from "../../utils/accountUtils";
-import { SOLAUTO_FEES_WALLET } from "../../constants/generalAccounts";
-import {
   getWalletSplBalances,
   getWrappedInstruction,
   splTokenTransferUmiIx,
-} from "../../utils/solanaUtils";
-import { SOLAUTO_LUT } from "../../constants/solautoConstants";
-import { ContextUpdates } from "../../utils/solautoUtils";
+  ContextUpdates,
+} from "../../utils";
+import { SOLAUTO_FEES_WALLET, SOLAUTO_LUT } from "../../constants";
+import { ProgramEnv, RebalanceDetails } from "../../types";
 import {
   ReferralStateManager,
   ReferralStateManagerArgs,
@@ -45,8 +38,7 @@ import {
   getOrCreatePositionEx,
   SolautoPositionEx,
 } from "../../solautoPosition";
-import { RebalanceDetails } from "../../types";
-import { FlProviderAggregator } from "../flashLoans/flProviderAggregator";
+import { FlProviderAggregator } from "../flashLoans";
 
 export interface SolautoClientArgs extends ReferralStateManagerArgs {
   new?: boolean;
@@ -59,6 +51,7 @@ export interface SolautoClientArgs extends ReferralStateManagerArgs {
 
 export abstract class SolautoClient extends ReferralStateManager {
   public lendingPlatform!: LendingPlatform;
+  public lpEnv!: ProgramEnv;
 
   public authority!: PublicKey;
 
@@ -153,7 +146,8 @@ export abstract class SolautoClient extends ReferralStateManager {
       this.signer,
       this.authority,
       this.pos.supplyMint(),
-      this.pos.debtMint()
+      this.pos.debtMint(),
+      this.lpEnv
     );
     await this.flProvider.initialize();
     this.otherSigners.push(...this.flProvider.otherSigners());

package/src/services/solauto/solautoMarginfiClient.ts

@@ -1,4 +1,4 @@
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
 import {
   Signer,
   TransactionBuilder,
@@ -6,13 +6,12 @@ import {
   PublicKey as UmiPublicKey,
   createSignerFromKeypair,
 } from "@metaplex-foundation/umi";
-import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
-import { SolautoClient, SolautoClientArgs } from "./solautoClient";
-import { MarginfiAssetAccounts } from "../../types/accounts";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { MarginfiAssetAccounts, RebalanceDetails } from "../../types";
 import {
   MARGINFI_ACCOUNTS,
   MARGINFI_ACCOUNTS_LOOKUP_TABLE,
-} from "../../constants/marginfiAccounts";
+} from "../../constants";
 import {
   DCASettingsInpArgs,
   LendingPlatform,
@@ -29,9 +28,13 @@ import {
   marginfiRebalance,
   marginfiRefreshData,
 } from "../../generated";
-import { getTokenAccount } from "../../utils/accountUtils";
 import {
-  MARGINFI_PROGRAM_ID,
+  getAllMarginfiAccountsByAuthority,
+  marginfiAccountEmpty,
+  getTokenAccount,
+  hasFirstRebalance,
+} from "../../utils";
+import {
   lendingAccountBorrow,
   lendingAccountDeposit,
   lendingAccountRepay,
@@ -39,12 +42,7 @@ import {
   marginfiAccountInitialize,
   safeFetchAllMarginfiAccount,
 } from "../../marginfi-sdk";
-import {
-  getAllMarginfiAccountsByAuthority,
-  marginfiAccountEmpty,
-} from "../../utils/marginfiUtils";
-import { hasFirstRebalance } from "../../utils/solautoUtils";
-import { RebalanceDetails } from "../../types";
+import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 
 export class SolautoMarginfiClient extends SolautoClient {
   public lendingPlatform = LendingPlatform.Marginfi;
@@ -64,6 +62,10 @@ export class SolautoMarginfiClient extends SolautoClient {
   async initialize(args: SolautoClientArgs) {
     await super.initialize(args);
 
+    this.marginfiProgram = toWeb3JsPublicKey(
+      this.umi.programs.get("marginfi").publicKey
+    );
+
     this.marginfiGroup = await this.pos.lendingPool();
 
     if (this.selfManaged) {
@@ -169,7 +171,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiOpenPosition(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      marginfiProgram: publicKey(this.marginfiProgram),
       signerReferralState: publicKey(this.referralState),
       referredByState: this.referredByState
         ? publicKey(this.referredByState)
@@ -214,7 +216,7 @@ export class SolautoMarginfiClient extends SolautoClient {
   refreshIx(): TransactionBuilder {
     return marginfiRefreshData(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      marginfiProgram: publicKey(this.marginfiProgram),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccount),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
@@ -342,7 +344,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiProtocolInteraction(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      marginfiProgram: publicKey(this.marginfiProgram),
       solautoPosition: publicKey(this.pos.publicKey),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccountPk),
@@ -393,7 +395,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiRebalance(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      marginfiProgram: publicKey(this.marginfiProgram),
       ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
       solautoFeesTa: publicKey(
         data.values.rebalanceDirection === RebalanceDirection.Boost
@@ -425,9 +427,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       supplyPriceOracle: publicKey(this.supplyPriceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
       authoritySupplyTa: addAuthorityTas
-        ? publicKey(
-            getTokenAccount(this.authority, this.pos.supplyMint())
-          )
+        ? publicKey(getTokenAccount(this.authority, this.pos.supplyMint()))
         : undefined,
       vaultSupplyTa: needSupplyAccounts
         ? publicKey(this.marginfiSupplyAccounts.liquidityVault)
@@ -439,9 +439,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       debtPriceOracle: publicKey(this.debtPriceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),
       authorityDebtTa: addAuthorityTas
-        ? publicKey(
-            getTokenAccount(this.authority, this.pos.debtMint())
-          )
+        ? publicKey(getTokenAccount(this.authority, this.pos.debtMint()))
         : undefined,
       vaultDebtTa: needDebtAccounts
         ? publicKey(this.marginfiDebtAccounts.liquidityVault)

package/src/services/solauto/txHandler.ts

@@ -1,11 +1,12 @@
-import { Signer, signerIdentity, Umi } from "@metaplex-foundation/umi";
 import { Connection, PublicKey } from "@solana/web3.js";
-import { consoleLog, getSolanaRpcConnection } from "../../utils";
-import { SOLAUTO_PROD_PROGRAM } from "../../constants";
+import { Signer, signerIdentity, Umi } from "@metaplex-foundation/umi";
 import {
   WalletAdapter,
   walletAdapterIdentity,
 } from "@metaplex-foundation/umi-signer-wallet-adapters";
+import { consoleLog, getSolanaRpcConnection } from "../../utils";
+import { SOLAUTO_PROD_PROGRAM } from "../../constants";
+import { ProgramEnv } from "../../types";
 
 export interface TxHandlerProps {
   signer?: Signer;
@@ -13,13 +14,14 @@ export interface TxHandlerProps {
   rpcUrl: string;
   showLogs?: boolean;
   programId?: PublicKey;
-  wsEndpoint?: string;
+  lpEnv?: ProgramEnv;
 }
 
 export abstract class TxHandler {
   public rpcUrl!: string;
   public showLogs = false;
-  public programId = SOLAUTO_PROD_PROGRAM;
+  public programId!: PublicKey;
+  public lpEnv!: ProgramEnv;
 
   public connection!: Connection;
   public umi!: Umi;
@@ -27,15 +29,14 @@ export abstract class TxHandler {
   public otherSigners: Signer[] = [];
 
   constructor(props: TxHandlerProps) {
-    if (props.programId !== undefined) {
-      this.programId = props.programId;
-    }
+    this.programId = props.programId ?? SOLAUTO_PROD_PROGRAM;
+    this.lpEnv = props.lpEnv ?? "Prod";
 
     this.rpcUrl = props.rpcUrl;
     const [connection, umi] = getSolanaRpcConnection(
       this.rpcUrl,
       this.programId,
-      props.wsEndpoint
+      this.lpEnv
     );
     this.connection = connection;
     this.umi = umi;

package/src/services/swap/jupSwapManager.ts

@@ -1,24 +1,25 @@
+import { PublicKey } from "@solana/web3.js";
 import {
   Signer,
   TransactionBuilder,
   transactionBuilder,
 } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   createJupiterApiClient,
   QuoteResponse,
   SwapInstructionsResponse,
 } from "@jup-ag/api";
-import { getWrappedInstruction } from "../../utils/solanaUtils";
-import { fromBps, toBps } from "../../utils/numberUtils";
-import { getTokenAccount } from "../../utils/accountUtils";
-import { PublicKey } from "@solana/web3.js";
 import {
   consoleLog,
-  jupIxToSolanaIx,
   retryWithExponentialBackoff,
+  getWrappedInstruction,
+  fromBps,
+  toBps,
+  getTokenAccount,
+  jupIxToSolanaIx,
 } from "../../utils";
 import { TransactionItemInputs } from "../../types";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 export interface SwapInput {
   inputMint: PublicKey;

package/src/services/transactions/transactionUtils.ts

@@ -1,3 +1,8 @@
+import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
+import {
+  ACCOUNT_SIZE as TOKEN_ACCOUNT_SIZE,
+  NATIVE_MINT,
+} from "@solana/spl-token";
 import {
   Instruction,
   ProgramError,
@@ -8,11 +13,6 @@ import {
   transactionBuilder,
 } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
-import {
-  ACCOUNT_SIZE as TOKEN_ACCOUNT_SIZE,
-  NATIVE_MINT,
-} from "@solana/spl-token";
 import {
   InvalidRebalanceConditionError,
   SolautoAction,
@@ -27,19 +27,20 @@ import {
   isSolautoAction,
   solautoAction,
 } from "../../generated";
-import { SolautoClient } from "../solauto/solautoClient";
+import { SolautoClient, ReferralStateManager } from "../solauto";
 import {
   closeTokenAccountUmiIx,
   createAssociatedTokenAccountUmiIx,
   systemTransferUmiIx,
-} from "../../utils/solanaUtils";
-import {
   consoleLog,
   getSolanaAccountCreated,
   rpcAccountCreated,
-} from "../../utils/generalUtils";
-import { uint8ArrayToBigInt } from "../../utils/numberUtils";
-import { getTokenAccount, getTokenAccountData } from "../../utils/accountUtils";
+  uint8ArrayToBigInt,
+  getTokenAccount,
+  getTokenAccountData,
+  isMarginfiClient,
+  isMarginfiProgram,
+} from "../../utils";
 import {
   createMarginfiProgram,
   getLendingAccountBorrowInstructionDataSerializer,
@@ -47,17 +48,14 @@ import {
   getLendingAccountRepayInstructionDataSerializer,
   getLendingAccountWithdrawInstructionDataSerializer,
   getMarginfiErrorFromCode,
-  MARGINFI_PROGRAM_ID,
 } from "../../marginfi-sdk";
-import { JupSwapManager, ReferralStateManager } from "..";
+import { JupSwapManager } from "../swap";
 import {
   createJupiterProgram,
   getJupiterErrorFromCode,
   JUPITER_PROGRAM_ID,
 } from "../../jupiter-sdk";
-import { TransactionItemInputs } from "../../types";
-import { isMarginfiClient } from "../../utils";
-import { BundleSimulationError } from "../../types/transactions";
+import { TransactionItemInputs, BundleSimulationError } from "../../types";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -410,7 +408,7 @@ function getSolautoActions(umi: Umi, tx: TransactionBuilder): SolautoAction[] {
       } catch {}
     }
 
-    if (x.programId === MARGINFI_PROGRAM_ID) {
+    if (isMarginfiProgram(toWeb3JsPublicKey(x.programId))) {
       try {
         const serializer = getLendingAccountDepositInstructionDataSerializer();
         const discriminator = uint8ArrayToBigInt(
@@ -680,7 +678,8 @@ export function getErrorInfo(
       }
     } else if (
       errCode !== undefined &&
-      errIx?.programId === MARGINFI_PROGRAM_ID
+      errIx &&
+      isMarginfiProgram(toWeb3JsPublicKey(errIx.programId))
     ) {
       programName = "Marginfi";
       programError = marginfiError;

package/src/services/transactions/transactionsManager.ts

@@ -1,37 +1,38 @@
 import bs58 from "bs58";
+import {
+  PublicKey,
+  TransactionExpiredBlockheightExceededError,
+} from "@solana/web3.js";
 import {
   AddressLookupTableInput,
   transactionBuilder,
   TransactionBuilder,
   Umi,
 } from "@metaplex-foundation/umi";
-import { SolautoClient } from "../solauto/solautoClient";
-import {
-  addTxOptimizations,
-  getAddressLookupInputs,
-  sendSingleOptimizedTransaction,
-} from "../../utils/solanaUtils";
-import {
-  consoleLog,
-  ErrorsToThrow,
-  retryWithExponentialBackoff,
-} from "../../utils/generalUtils";
-import { getErrorInfo, getTransactionChores } from "./transactionUtils";
 import {
   PriorityFeeSetting,
   priorityFeeSettingValues,
   TransactionItemInputs,
   TransactionRunType,
 } from "../../types";
-import { ReferralStateManager, TxHandler } from "..";
 import {
-  PublicKey,
-  TransactionExpiredBlockheightExceededError,
-} from "@solana/web3.js";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../../constants/switchboardConstants";
-import { buildSwbSubmitResponseTx, getSwitchboardFeedData } from "../../utils";
-import { sendJitoBundledTransactions } from "../../utils/jitoUtils";
-import { SOLAUTO_PROD_PROGRAM, SOLAUTO_TEST_PROGRAM } from "../../constants";
+  SOLAUTO_PROD_PROGRAM,
+  SOLAUTO_TEST_PROGRAM,
+  SWITCHBOARD_PRICE_FEED_IDS,
+} from "../../constants";
+import {
+  consoleLog,
+  ErrorsToThrow,
+  retryWithExponentialBackoff,
+  addTxOptimizations,
+  getAddressLookupInputs,
+  sendSingleOptimizedTransaction,
+  buildSwbSubmitResponseTx,
+  getSwitchboardFeedData,
+  sendJitoBundledTransactions,
+} from "../../utils";
+import { SolautoClient, ReferralStateManager, TxHandler } from "../solauto";
+import { getErrorInfo, getTransactionChores } from "./transactionUtils";
 
 const CHORES_TX_NAME = "account chores";
 const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
@@ -257,7 +258,7 @@ export class TransactionsManager {
     private statusCallback?: (statuses: TransactionManagerStatuses) => void,
     private txType?: TransactionRunType,
     private priorityFeeSetting: PriorityFeeSetting = PriorityFeeSetting.Min,
-    private atomically: boolean = false,
+    private atomically: boolean = true,
     private errorsToThrow?: ErrorsToThrow,
     retryConfig?: RetryConfig
   ) {
@@ -266,7 +267,7 @@ export class TransactionsManager {
       this.txHandler.umi
     );
     this.signableRetries =
-      retryConfig?.signableRetries ?? retryConfig?.totalRetries ?? 3;
+      retryConfig?.signableRetries ?? retryConfig?.totalRetries ?? 4;
     this.totalRetries =
       retryConfig?.totalRetries ?? retryConfig?.signableRetries ?? 4;
     this.retryDelay = retryConfig?.retryDelay ?? 150;

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -1,5 +1,4 @@
 import { PublicKey } from "@solana/web3.js";
-import { SolautoPositionEx } from "./solautoPositionEx";
 import {
   Bank,
   fetchMarginfiAccount,
@@ -14,9 +13,9 @@ import {
   fromBaseUnit,
   getBankLiquidityAvailableBaseUnit,
   getMarginfiAccountPositionState,
-  toBps,
 } from "../utils";
 import { DEFAULT_MARGINFI_GROUP, MARGINFI_ACCOUNTS } from "../constants";
+import { SolautoPositionEx } from "./solautoPositionEx";
 
 export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   private marginfiAccountData: MarginfiAccount | null = null;

package/src/solautoPosition/solautoPositionEx.ts

@@ -1,4 +1,9 @@
 import { PublicKey } from "@solana/web3.js";
+import { Umi } from "@metaplex-foundation/umi";
+import {
+  fromWeb3JsPublicKey,
+  toWeb3JsPublicKey,
+} from "@metaplex-foundation/umi-web3js-adapters";
 import {
   DCASettings,
   fetchSolautoPosition,
@@ -7,7 +12,6 @@ import {
   SolautoPosition,
   SolautoSettingsParameters,
 } from "../generated";
-import { Umi } from "@metaplex-foundation/umi";
 import {
   calcDebtUsd,
   calcNetWorth,
@@ -40,10 +44,6 @@ import {
   SolautoFeesBps,
 } from "../services/rebalance";
 import { MIN_POSITION_STATE_FRESHNESS_SECS, TokenInfo } from "../constants";
-import {
-  fromWeb3JsPublicKey,
-  toWeb3JsPublicKey,
-} from "@metaplex-foundation/umi-web3js-adapters";
 
 export interface PositionCustomArgs {
   lendingPlatform: LendingPlatform;

package/src/solautoPosition/utils.ts

@@ -1,4 +1,9 @@
+import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
+import {
+  fromWeb3JsPublicKey,
+  toWeb3JsPublicKey,
+} from "@metaplex-foundation/umi-web3js-adapters";
 import {
   LendingPlatform,
   PositionState,
@@ -7,13 +12,6 @@ import {
   SolautoSettingsParameters,
   SolautoSettingsParametersInpArgs,
 } from "../generated";
-import { PublicKey } from "@solana/web3.js";
-import { PositionCustomArgs, SolautoPositionEx } from "./solautoPositionEx";
-import {
-  fromWeb3JsPublicKey,
-  toWeb3JsPublicKey,
-} from "@metaplex-foundation/umi-web3js-adapters";
-import { MarginfiSolautoPositionEx } from "./marginfiSolautoPositionEx";
 import {
   ContextUpdates,
   currentUnixSeconds,
@@ -24,6 +22,8 @@ import {
   tokenInfo,
   toRoundedUsdValue,
 } from "../utils";
+import { PositionCustomArgs, SolautoPositionEx } from "./solautoPositionEx";
+import { MarginfiSolautoPositionEx } from "./marginfiSolautoPositionEx";
 
 export function createSolautoSettings(
   settings: SolautoSettingsParametersInpArgs

package/src/types/solauto.ts

@@ -61,3 +61,5 @@ export interface RebalanceDetails {
   swapQuote: QuoteResponse;
   targetLiqUtilizationRateBps?: number;
 }
+
+export type ProgramEnv = "Prod" | "Staging";

package/src/utils/generalUtils.ts

@@ -1,7 +1,15 @@
+import axios from "axios";
 import { PublicKey } from "@solana/web3.js";
 import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
 import { TOKEN_INFO, TokenInfo } from "../constants";
-import axios from "axios";
+
+export function buildHeliusApiUrl(heliusApiKey: string) {
+  return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;
+}
+
+export function buildIronforgeApiUrl(ironforgeApiKey: string) {
+  return `https://rpc.ironforge.network/mainnet?apiKey=${ironforgeApiKey}`;
+}
 
 export function consoleLog(...args: any[]): void {
   if ((globalThis as any).SHOW_LOGS) {

package/src/utils/index.ts

@@ -1,5 +1,6 @@
 export * from "./accountUtils";
 export * from "./generalUtils";
+export * from "./jitoUtils";
 export * from "./jupiterUtils";
 export * from "./marginfiUtils";
 export * from "./numberUtils";

package/src/utils/jitoUtils.ts

@@ -5,8 +5,6 @@ import {
   TransactionExpiredBlockheightExceededError,
   VersionedTransaction,
 } from "@solana/web3.js";
-import { toWeb3JsTransaction } from "@metaplex-foundation/umi-web3js-adapters";
-import { JITO_TIP_ACCOUNTS } from "../constants/solautoConstants";
 import {
   Signer,
   TransactionBuilder,
@@ -14,6 +12,10 @@ import {
   WrappedInstruction,
   TransactionMessage,
 } from "@metaplex-foundation/umi";
+import { toWeb3JsTransaction } from "@metaplex-foundation/umi-web3js-adapters";
+import { JITO_TIP_ACCOUNTS } from "../constants";
+import { PriorityFeeSetting, TransactionRunType } from "../types";
+import { BundleSimulationError } from "../types";
 import {
   assembleFinalTransaction,
   getComputeUnitPriceEstimate,
@@ -25,10 +27,7 @@ import {
   customRpcCall,
   retryWithExponentialBackoff,
 } from "./generalUtils";
-import { PriorityFeeSetting, TransactionRunType } from "../types";
 import base58 from "bs58";
-import { BundleSimulationError } from "../types/transactions";
-import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 
 export function getRandomTipAccount(): PublicKey {
   const randomInt = Math.floor(Math.random() * JITO_TIP_ACCOUNTS.length);
@@ -190,14 +189,18 @@ async function pollBundleStatus(
   while (Date.now() < endTime) {
     await new Promise((resolve) => setTimeout(resolve, interval));
 
-    const statuses = await retryWithExponentialBackoff(async () => {
-      const resp = await getBundleStatus(umi, bundleId);
-      // TODO: remove me
-      if (resp?.value?.length > 0 && resp.value[0] === null) {
-        throw new Error("No confirmation status");
-      }
-      return resp;
-    }, 3, 250);
+    const statuses = await retryWithExponentialBackoff(
+      async () => {
+        const resp = await getBundleStatus(umi, bundleId);
+        // TODO: remove me
+        if (resp?.value?.length > 0 && resp.value[0] === null) {
+          throw new Error("No confirmation status");
+        }
+        return resp;
+      },
+      3,
+      250
+    );
 
     if (statuses?.value?.length > 0) {
       consoleLog("Statuses:", statuses);
@@ -283,7 +286,7 @@ export async function sendJitoBundledTransactions(
       priorityFeeSetting,
       onAwaitingSign
     );
-    return resp ? [bs58.encode(resp)] : undefined;
+    return resp ? [base58.encode(resp)] : undefined;
   }
 
   consoleLog("Sending Jito bundle...");

package/src/utils/jupiterUtils.ts

@@ -1,6 +1,6 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { retryWithExponentialBackoff } from "./generalUtils";
 import { Instruction } from "@jup-ag/api";
+import { retryWithExponentialBackoff } from "./generalUtils";
 
 export function jupIxToSolanaIx(
   instruction: Instruction