@haven-fi/solauto-sdk 1.0.624 → 1.0.625

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

package/src/utils/marginfiUtils.ts

@@ -1,16 +1,30 @@
 import { PublicKey } from "@solana/web3.js";
-import { publicKey, Umi } from "@metaplex-foundation/umi";
+import { Program, publicKey, Umi } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { ProgramEnv, MarginfiAssetAccounts } from "../types";
+import { PositionState, PositionTokenState } from "../generated";
+import {
+  DEFAULT_MARGINFI_GROUP,
+  MARGINFI_ACCOUNTS,
+  ALL_SUPPORTED_TOKENS,
+  MARGINFI_PROD_PROGRAM,
+  MARGINFI_STAGING_PROGRAM,
+  TOKEN_INFO,
+  USD_DECIMALS,
+} from "../constants";
 import {
   Bank,
   deserializeMarginfiAccount,
   getMarginfiAccountSize,
-  MARGINFI_PROGRAM_ID,
+  getMarginfiErrorFromCode,
+  getMarginfiErrorFromName,
   MarginfiAccount,
   OracleSetup,
   safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
+import { ContextUpdates } from "./solautoUtils";
+import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
 import { currentUnixSeconds } from "./generalUtils";
 import {
   bytesToI80F48,
@@ -20,16 +34,44 @@ import {
   toBaseUnit,
   toBps,
 } from "./numberUtils";
-import {
-  DEFAULT_MARGINFI_GROUP,
-  MARGINFI_ACCOUNTS,
-} from "../constants/marginfiAccounts";
-import { MarginfiAssetAccounts } from "../types/accounts";
-import { PositionState, PositionTokenState } from "../generated";
-import { USD_DECIMALS } from "../constants/generalAccounts";
-import { ContextUpdates } from "./solautoUtils";
-import { ALL_SUPPORTED_TOKENS, TOKEN_INFO } from "../constants";
-import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
+
+export function getMarginfiProgram(env: ProgramEnv) {
+  return env === "Prod" ? MARGINFI_PROD_PROGRAM : MARGINFI_STAGING_PROGRAM;
+}
+
+export function isMarginfiProgram(programId: PublicKey) {
+  return (
+    programId.equals(MARGINFI_PROD_PROGRAM) ||
+    programId.equals(MARGINFI_STAGING_PROGRAM)
+  );
+}
+
+export function createDynamicMarginfiProgram(env?: ProgramEnv): Program {
+  return {
+    name: "marginfi",
+    publicKey: publicKey(getMarginfiProgram(env ?? "Prod")),
+    getErrorFromCode(code: number, cause?: Error) {
+      return getMarginfiErrorFromCode(code, this, cause);
+    },
+    getErrorFromName(name: string, cause?: Error) {
+      return getMarginfiErrorFromName(name, this, cause);
+    },
+    isOnCluster() {
+      return true;
+    },
+  };
+}
+
+export function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv) {
+  return umi.use({
+    install(umi) {
+      umi.programs.add(
+        createDynamicMarginfiProgram(marginfiEnv ?? "Prod"),
+        false
+      );
+    },
+  });
+}
 
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
   mint: PublicKey;
@@ -149,7 +191,7 @@ export async function getEmptyMarginfiAccountsByAuthority(
   authority: PublicKey
 ): Promise<MarginfiAccount[]> {
   const marginfiAccounts = await umi.rpc.getProgramAccounts(
-    MARGINFI_PROGRAM_ID,
+    umi.programs.get("marginfi").publicKey,
     {
       commitment: "confirmed",
       filters: [
@@ -187,7 +229,7 @@ export async function getAllMarginfiAccountsByAuthority(
   { marginfiAccount: PublicKey; supplyMint?: PublicKey; debtMint?: PublicKey }[]
 > {
   const marginfiAccounts = await umi.rpc.getProgramAccounts(
-    MARGINFI_PROGRAM_ID,
+    umi.programs.get("marginfi").publicKey,
     {
       commitment: "confirmed",
       dataSlice: {

package/src/utils/numberUtils.ts

@@ -1,6 +1,5 @@
 import { BASIS_POINTS, MIN_REPAY_GAP_BPS, USD_DECIMALS } from "../constants";
 import { PositionState } from "../generated";
-import { tokenInfo } from "./generalUtils";
 
 export function calcNetWorthUsd(state?: PositionState) {
   return fromRoundedUsdValue(state?.netWorth.baseAmountUsdValue ?? BigInt(0));

package/src/utils/priceUtils.ts

@@ -1,16 +1,18 @@
 import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
-import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
-import { fromBaseUnit, toBaseUnit, toBps } from "./numberUtils";
-import { PRICES } from "../constants/solautoConstants";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
+import * as SwbCommon from "@switchboard-xyz/common";
+import {
+  PYTH_PRICE_FEED_IDS,
+  PRICES,
+  SWITCHBOARD_PRICE_FEED_IDS,
+} from "../constants";
+import { fromBaseUnit, toBaseUnit } from "./numberUtils";
 import {
   consoleLog,
   currentUnixSeconds,
   retryWithExponentialBackoff,
   zip,
 } from "./generalUtils";
-import * as SwbCommon from "@switchboard-xyz/common";
 import { getJupPriceData } from "./jupiterUtils";
 
 export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {

package/src/utils/solanaUtils.ts

@@ -1,19 +1,4 @@
 import bs58 from "bs58";
-import {
-  AddressLookupTableInput,
-  Signer,
-  TransactionBuilder,
-  Umi,
-  WrappedInstruction,
-  publicKey,
-  transactionBuilder,
-} from "@metaplex-foundation/umi";
-import {
-  fromWeb3JsInstruction,
-  toWeb3JsPublicKey,
-  toWeb3JsTransaction,
-} from "@metaplex-foundation/umi-web3js-adapters";
-import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import {
   AddressLookupTableAccount,
   BlockhashWithExpiryBlockHeight,
@@ -32,6 +17,26 @@ import {
   createCloseAccountInstruction,
   createTransferInstruction,
 } from "@solana/spl-token";
+import {
+  AddressLookupTableInput,
+  Signer,
+  TransactionBuilder,
+  Umi,
+  WrappedInstruction,
+  publicKey,
+  transactionBuilder,
+} from "@metaplex-foundation/umi";
+import {
+  fromWeb3JsInstruction,
+  toWeb3JsPublicKey,
+  toWeb3JsTransaction,
+} from "@metaplex-foundation/umi-web3js-adapters";
+import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
+import { PriorityFeeSetting, ProgramEnv, TransactionRunType } from "../types";
+import {
+  getLendingAccountEndFlashloanInstructionDataSerializer,
+  getLendingAccountStartFlashloanInstructionDataSerializer,
+} from "../marginfi-sdk";
 import { getTokenAccount } from "./accountUtils";
 import {
   arraysAreEqual,
@@ -39,34 +44,21 @@ import {
   customRpcCall,
   retryWithExponentialBackoff,
 } from "./generalUtils";
-import {
-  getLendingAccountEndFlashloanInstructionDataSerializer,
-  getLendingAccountStartFlashloanInstructionDataSerializer,
-} from "../marginfi-sdk";
-import { PriorityFeeSetting, TransactionRunType } from "../types";
-import { SOLAUTO_PROD_PROGRAM } from "../constants";
 import { createDynamicSolautoProgram } from "./solautoUtils";
-
-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}`;
-}
+import { createDynamicMarginfiProgram } from "./marginfiUtils";
 
 export function getSolanaRpcConnection(
   rpcUrl: string,
-  programId: PublicKey = SOLAUTO_PROD_PROGRAM,
-  wsEndpoint?: string
+  programId?: PublicKey,
+  lpEnv?: ProgramEnv
 ): [Connection, Umi] {
   const connection = new Connection(rpcUrl, {
     commitment: "confirmed",
-    wsEndpoint: wsEndpoint,
   });
   const umi = createUmi(connection).use({
     install(umi) {
       umi.programs.add(createDynamicSolautoProgram(programId), false);
+      umi.programs.add(createDynamicMarginfiProgram(lpEnv), false);
     },
   });
   return [connection, umi];

package/src/utils/solautoUtils.ts

@@ -1,5 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { Program, publicKey, Umi } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { QuoteResponse } from "@jup-ag/api";
 import {
   AutomationSettings,
   DCASettings,
@@ -17,21 +19,15 @@ import {
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
 } from "../generated";
-import { getReferralState } from "./accountUtils";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { ALL_SUPPORTED_TOKENS } from "../constants";
-import {
-  findMarginfiAccounts,
-  getAllMarginfiAccountsByAuthority,
-} from "./marginfiUtils";
-import { SolautoPositionDetails } from "../types/solauto";
-import { QuoteResponse } from "@jup-ag/api";
-import { createSolautoSettings } from "../solautoPosition";
+import { ALL_SUPPORTED_TOKENS, SOLAUTO_PROD_PROGRAM } from "../constants";
+import { SolautoPositionDetails } from "../types";
 import {
   SolautoClient,
   SolautoMarginfiClient,
   TxHandlerProps,
 } from "../services";
+import { createSolautoSettings } from "../solautoPosition";
+import { getReferralState } from "./accountUtils";
 import {
   calcTotalDebt,
   calcTotalSupply,
@@ -41,11 +37,15 @@ import {
   toRoundedUsdValue,
 } from "./numberUtils";
 import { fetchTokenPrices } from "./priceUtils";
+import {
+  findMarginfiAccounts,
+  getAllMarginfiAccountsByAuthority,
+} from "./marginfiUtils";
 
-export function createDynamicSolautoProgram(programId: PublicKey): Program {
+export function createDynamicSolautoProgram(programId?: PublicKey): Program {
   return {
     name: "solauto",
-    publicKey: publicKey(programId),
+    publicKey: publicKey(programId ?? SOLAUTO_PROD_PROGRAM),
     getErrorFromCode(code: number, cause?: Error) {
       return getSolautoErrorFromCode(code, this, cause);
     },
@@ -471,4 +471,4 @@ export function hasLastRebalance(rebalanceType: SolautoRebalanceType) {
     SolautoRebalanceType.DoubleRebalanceWithFL,
     SolautoRebalanceType.FLSwapThenRebalance,
   ].includes(rebalanceType);
-}
+}

package/src/utils/stringUtils.ts

@@ -1,14 +1,14 @@
+import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { WBTC, WETH } from "../constants";
-import { PublicKey } from "@solana/web3.js";
 import { tokenInfo } from "./generalUtils";
 
 export const StrategyTypes = ["Long", "Short", "Ratio"] as const;
 export type StrategyType = (typeof StrategyTypes)[number];
 
 const MAJORS_PRIO = {
-  [WBTC.toString()]: 0,
-  [WETH.toString()]: 1,
+  [WBTC]: 0,
+  [WETH]: 1,
   [NATIVE_MINT.toString()]: 2,
 };
 

package/src/utils/switchboardUtils.ts

@@ -1,16 +1,16 @@
-import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
-import switchboardIdl from "../idls/switchboard.json";
 import {
   Connection,
   PublicKey,
   Transaction,
   VersionedTransaction,
 } from "@solana/web3.js";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
-import { TransactionItemInputs } from "../types";
 import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
 import * as OnDemand from "@switchboard-xyz/on-demand";
+import switchboardIdl from "../idls/switchboard.json";
+import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
+import { TransactionItemInputs } from "../types";
 import { retryWithExponentialBackoff } from "./generalUtils";
 import { getWrappedInstruction } from "./solanaUtils";