@haven-fi/solauto-sdk 1.0.624 → 1.0.626

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 { getMarginfiAccounts } from "../constants";
+import { SolautoPositionEx } from "./solautoPositionEx";
 
 export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   private marginfiAccountData: MarginfiAccount | null = null;
@@ -42,7 +41,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     }
 
     if (!this.lp) {
-      this.lp = new PublicKey(DEFAULT_MARGINFI_GROUP);
+      this.lp = getMarginfiAccounts(this.lpEnv).defaultGroup;
     }
 
     return this.lp;
@@ -51,10 +50,9 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   async maxLtvAndLiqThresholdBps(): Promise<[number, number]> {
     if (!this.supplyBank || !this.debtBank) {
       const group = (await this.lendingPool()).toString();
-      const supplyBank =
-        MARGINFI_ACCOUNTS[group][this.supplyMint().toString()].bank;
-      const debtBank =
-        MARGINFI_ACCOUNTS[group][this.debtMint().toString()].bank;
+      const bankAccounts = getMarginfiAccounts(this.lpEnv).bankAccounts;
+      const supplyBank = bankAccounts[group][this.supplyMint().toString()].bank;
+      const debtBank = bankAccounts[group][this.debtMint().toString()].bank;
 
       [this.supplyBank, this.debtBank] = await safeFetchAllBank(this.umi, [
         publicKey(supplyBank),
@@ -95,6 +93,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
       useDesignatedMint
         ? { mint: toWeb3JsPublicKey(this.state().debt.mint) }
         : undefined,
+      this.lpEnv,
       this.contextUpdates
     );
 

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,
@@ -33,17 +37,13 @@ import {
   tokenInfo,
   toRoundedUsdValue,
 } from "../utils";
-import { RebalanceAction } from "../types";
+import { ProgramEnv, RebalanceAction } from "../types";
 import {
   getDebtAdjustment,
   getRebalanceValues,
   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;
@@ -51,6 +51,7 @@ export interface PositionCustomArgs {
   debtMint?: PublicKey;
   lendingPool?: PublicKey;
   lpUserAccount?: PublicKey;
+  lpEnv?: ProgramEnv;
 }
 
 interface SolautoPositionExData extends Partial<SolautoPosition> {
@@ -70,6 +71,7 @@ export abstract class SolautoPositionEx {
   public publicKey!: PublicKey;
   protected _data!: SolautoPositionExData;
   protected lp?: PublicKey = undefined;
+  protected lpEnv!: ProgramEnv;
   public lpUserAccount?: PublicKey = undefined;
   protected contextUpdates?: ContextUpdates;
 
@@ -86,6 +88,7 @@ export abstract class SolautoPositionEx {
       (args.data.position
         ? toWeb3JsPublicKey(args.data.position!.protocolUserAccount)
         : undefined);
+    this.lpEnv = args.customArgs?.lpEnv ?? "Prod";
 
     this._data = args.data;
     this.firstState = { ...args.data.state };
@@ -183,7 +186,10 @@ export abstract class SolautoPositionEx {
   }
 
   supplyUsd() {
-    return calcSupplyUsd(this.state());
+    const supplyPrice = safeGetPrice(this.supplyMint());
+    return supplyPrice
+      ? calcTotalSupply(this.state()) * supplyPrice
+      : calcSupplyUsd(this.state());
   }
 
   totalDebt() {
@@ -191,7 +197,10 @@ export abstract class SolautoPositionEx {
   }
 
   debtUsd() {
-    return calcDebtUsd(this.state());
+    const debtPrice = safeGetPrice(this.debtMint());
+    return debtPrice
+      ? calcTotalDebt(this.state()) * debtPrice
+      : calcDebtUsd(this.state());
   }
 
   supplyLiquidityDepositable() {
@@ -203,7 +212,9 @@ export abstract class SolautoPositionEx {
   }
 
   supplyLiquidityUsdAvailable() {
-    return this.supplyLiquidityAvailable() * (safeGetPrice(this.supplyMint()) ?? 0);
+    return (
+      this.supplyLiquidityAvailable() * (safeGetPrice(this.supplyMint()) ?? 0)
+    );
   }
 
   debtLiquidityAvailable() {
@@ -244,7 +255,7 @@ export abstract class SolautoPositionEx {
   }
 
   eligibleForRebalance(bpsDistanceThreshold = 0): RebalanceAction | undefined {
-    if (!this.settings() || !calcSupplyUsd(this.state())) {
+    if (!this.settings() || !this.supplyUsd()) {
       return undefined;
     }
 

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,33 @@
 import { PublicKey } from "@solana/web3.js";
-import { publicKey, Umi } from "@metaplex-foundation/umi";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { Program, publicKey, Umi } from "@metaplex-foundation/umi";
+import {
+  fromWeb3JsPublicKey,
+  toWeb3JsPublicKey,
+} from "@metaplex-foundation/umi-web3js-adapters";
+import { ProgramEnv, MarginfiAssetAccounts } from "../types";
+import { PositionState, PositionTokenState } from "../generated";
+import {
+  ALL_SUPPORTED_TOKENS,
+  getMarginfiAccounts,
+  MARGINFI_PROD_PROGRAM,
+  MARGINFI_STAGING_PROGRAM,
+  MarginfiAccountsMap,
+  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 +37,57 @@ 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";
+import { getTokenAccountData } from "./accountUtils";
+
+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
+      );
+    },
+  });
+}
+
+export async function fetchBankAddresses(umi: Umi, bankPk: PublicKey) {
+  const bank = await safeFetchBank(umi, fromWeb3JsPublicKey(bankPk));
+  const liquidityVault = toWeb3JsPublicKey(bank!.liquidityVault);
+  const vaultAuthority = (await getTokenAccountData(umi, liquidityVault))
+    ?.owner;
+  return {
+    bank: bankPk,
+    liquidityVault,
+    vaultAuthority,
+  };
+}
 
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
   mint: PublicKey;
@@ -38,16 +96,29 @@ interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
 export function findMarginfiAccounts(
   bank: PublicKey
 ): AllMarginfiAssetAccounts {
-  for (const group in MARGINFI_ACCOUNTS) {
-    for (const key in MARGINFI_ACCOUNTS[group]) {
-      const account = MARGINFI_ACCOUNTS[group][key];
-      if (
-        account.bank.toString().toLowerCase() === bank.toString().toLowerCase()
-      ) {
-        return { ...account, mint: new PublicKey(key) };
+  const search = (bankAccounts: MarginfiAccountsMap) => {
+    for (const group in bankAccounts) {
+      for (const key in bankAccounts[group]) {
+        const account = bankAccounts[group][key];
+        if (
+          account.bank.toString().toLowerCase() ===
+          bank.toString().toLowerCase()
+        ) {
+          return { ...account, mint: new PublicKey(key) };
+        }
       }
     }
+  };
+
+  let res = search(getMarginfiAccounts("Prod").bankAccounts);
+  if (res) {
+    return res;
+  }
+  res = search(getMarginfiAccounts("Staging").bankAccounts);
+  if (res) {
+    return res;
   }
+
   throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
 
@@ -103,11 +174,16 @@ export async function getMarginfiMaxLtvAndLiqThresholdBps(
     return [0, 0];
   }
 
+  const bankAccounts = getMarginfiAccounts(
+    undefined,
+    marginfiGroup
+  ).bankAccounts;
+
   if (!supply.bank || supply.bank === null) {
     supply.bank = await safeFetchBank(
       umi,
       publicKey(
-        MARGINFI_ACCOUNTS[marginfiGroup.toString()][supply.mint.toString()].bank
+        bankAccounts[marginfiGroup.toString()][supply.mint.toString()].bank
       ),
       { commitment: "confirmed" }
     );
@@ -120,7 +196,7 @@ export async function getMarginfiMaxLtvAndLiqThresholdBps(
     debt.bank = await safeFetchBank(
       umi,
       publicKey(
-        MARGINFI_ACCOUNTS[marginfiGroup.toString()][debt.mint.toString()].bank
+        bankAccounts[marginfiGroup.toString()][debt.mint.toString()].bank
       ),
       { commitment: "confirmed" }
     );
@@ -149,7 +225,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 +263,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: {
@@ -339,9 +415,9 @@ async function getBank(
       ? await safeFetchBank(
           umi,
           publicKey(
-            MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][
-              data?.mint.toString()
-            ].bank
+            getMarginfiAccounts(undefined, marginfiGroup).bankAccounts[
+              marginfiGroup?.toString() ?? ""
+            ][data?.mint.toString()].bank
           ),
           { commitment: "confirmed" }
         )
@@ -354,6 +430,7 @@ export async function getMarginfiAccountPositionState(
   marginfiGroup?: PublicKey,
   supply?: BankSelection,
   debt?: BankSelection,
+  programEnv?: ProgramEnv,
   contextUpdates?: ContextUpdates
 ): Promise<
   | { supplyBank: Bank | null; debtBank: Bank | null; state: PositionState }
@@ -481,7 +558,7 @@ export async function getMarginfiAccountPositionState(
   const supplyPrice = safeGetPrice(supply.mint!)!;
   let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(
     umi,
-    marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP),
+    marginfiGroup ?? getMarginfiAccounts(programEnv).defaultGroup,
     {
       mint: toWeb3JsPublicKey(supplyBank.mint),
       bank: supplyBank,

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);
-}
+}