@haven-fi/solauto-sdk 1.0.624 → 1.0.625

package/local/updateSolautoLUT.ts

@@ -1,23 +1,21 @@
 import { PublicKey } from "@solana/web3.js";
-import { getTokenAccounts } from "../src/utils/accountUtils";
 import {
   SOLAUTO_FEES_WALLET,
   SOLAUTO_MANAGER,
-} from "../src/constants/generalAccounts";
-import { ALL_SUPPORTED_TOKENS } from "../src/constants/tokenConstants";
-import { updateLookupTable } from "./shared";
-import {
   SOLAUTO_LUT,
   STANDARD_LUT_ACCOUNTS,
-} from "../src/constants/solautoConstants";
-import {
-  buildHeliusApiUrl,
+  SWITCHBOARD_PRICE_FEED_IDS,
+  ALL_SUPPORTED_TOKENS,
   getAllMarginfiAccountsByAuthority,
   getSolanaRpcConnection,
-} from "../src/utils";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../src/constants/switchboardConstants";
+  getTokenAccounts,
+  LOCAL_IRONFORGE_API_URL,
+} from "../src";
+import { updateLookupTable } from "./shared";
 
-const LOOKUP_TABLE_ADDRESS = Boolean(SOLAUTO_LUT) ? new PublicKey(SOLAUTO_LUT) : undefined;
+const LOOKUP_TABLE_ADDRESS = Boolean(SOLAUTO_LUT)
+  ? new PublicKey(SOLAUTO_LUT)
+  : undefined;
 const solautoManagerTokenAccounts = getTokenAccounts(
   SOLAUTO_MANAGER,
   ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x))
@@ -29,7 +27,7 @@ const solautoFeeWalletTokenAccounts = getTokenAccounts(
 
 export async function updateSolautoLut(additionalAccounts?: string[]) {
   const [_, umi] = getSolanaRpcConnection(
-    buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
+    LOCAL_IRONFORGE_API_URL
   );
   const ismAccounts = await getAllMarginfiAccountsByAuthority(
     umi,
@@ -43,7 +41,7 @@ export async function updateSolautoLut(additionalAccounts?: string[]) {
       ...solautoManagerTokenAccounts.map((x) => x.toString()),
       ...solautoFeeWalletTokenAccounts.map((x) => x.toString()),
       ...ismAccounts.map((x) => x.marginfiAccount.toString()),
-      ...Object.values(SWITCHBOARD_PRICE_FEED_IDS).map(x => x.feedId),
+      ...Object.values(SWITCHBOARD_PRICE_FEED_IDS).map((x) => x.feedId),
       ...(additionalAccounts ?? []),
     ],
     LOOKUP_TABLE_ADDRESS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.624",
+  "version": "1.0.625",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/constants/{generalAccounts.ts → generalConstants.ts}

@@ -1,5 +1,10 @@
 import { PublicKey } from "@solana/web3.js";
+import { buildIronforgeApiUrl } from "../utils";
 
 export const USD_DECIMALS = 9;
 export const SOLAUTO_FEES_WALLET = new PublicKey("AprYCPiVeKMCgjQ2ZufwChMzvQ5kFjJo2ekTLSkXsQDm");
-export const SOLAUTO_MANAGER = new PublicKey("MNGRcX4nc7quPdzBbNKJ4ScK5EE73JnwJVGxuJXhHCY");
+export const SOLAUTO_MANAGER = new PublicKey("MNGRcX4nc7quPdzBbNKJ4ScK5EE73JnwJVGxuJXhHCY");
+
+export const LOCAL_IRONFORGE_API_URL = buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!);
+
+export const BASIS_POINTS = 10000;

package/src/constants/index.ts

@@ -1,5 +1,6 @@
-export * from './generalAccounts';
-export * from './marginfiAccounts';
-export * from './pythConstants';
-export * from './solautoConstants';
-export * from './tokenConstants';
+export * from "./generalConstants";
+export * from "./marginfiAccounts";
+export * from "./pythConstants";
+export * from "./solautoConstants";
+export * from "./switchboardConstants";
+export * from "./tokenConstants";

package/src/constants/marginfiAccounts.ts

@@ -1,14 +1,19 @@
+import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import * as tokens from "./tokenConstants";
 import { MarginfiAssetAccounts } from "../types/accounts";
-import { PublicKey } from "@solana/web3.js";
 import { SWITCHBOARD_PRICE_FEED_IDS } from "./switchboardConstants";
 
+export const MARGINFI_PROD_PROGRAM = new PublicKey(
+  "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
+);
+export const MARGINFI_STAGING_PROGRAM = new PublicKey(
+  "stag8sTKds2h4KzjUw3zKTsxbqvT4XKHdaR9X9E6Rct"
+);
+
 export const DEFAULT_MARGINFI_GROUP =
   "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
-export const DEFAULT_PUBKEY = PublicKey.default.toString();
-
 const USDC_PRICE_ORACLE = "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX";
 
 export const MARGINFI_ACCOUNTS: {
@@ -149,7 +154,8 @@ export const MARGINFI_ACCOUNTS: {
       bank: "3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM",
       liquidityVault: "863K9YPVT3xbUGFZevrQJLqMux3UdRkwNQ6usAp4hJyy",
       vaultAuthority: "Qsv2rnNRdv59AwRU3YmGPMCTdKT41CDAKyYAr4srCJR",
-      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.RETARDIO.toString()].feedId,
+      priceOracle:
+        SWITCHBOARD_PRICE_FEED_IDS[tokens.RETARDIO.toString()].feedId,
     },
     [tokens.USDC]: {
       bank: "6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5",
@@ -184,9 +190,12 @@ export const MARGINFI_ACCOUNTS: {
       liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
       vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
       priceOracle: USDC_PRICE_ORACLE,
-    }
-  }
+    },
+  },
 };
 
 export const MARGINFI_ACCOUNTS_LOOKUP_TABLE =
   "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
+
+export const MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE =
+  "EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7";

package/src/constants/solautoConstants.ts

@@ -9,9 +9,8 @@ import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
-import { SOLAUTO_MANAGER } from "./generalAccounts";
+import { SOLAUTO_MANAGER } from "./generalConstants";
 import { JUPITER_PROGRAM_ID } from "../jupiter-sdk";
-import { HNT, JLP, JTO, JUP, PYTH, WETH } from "./tokenConstants";
 
 export const SOLAUTO_PROD_PROGRAM = new PublicKey(
   "AutoyKBRaHSBHy9RsmXCZMy6nNFAg5FYijrvZyQcNLV"
@@ -22,8 +21,6 @@ export const SOLAUTO_TEST_PROGRAM = new PublicKey(
 
 (globalThis as any).SHOW_LOGS = false;
 
-export const BASIS_POINTS = 10000;
-
 export const MIN_POSITION_STATE_FRESHNESS_SECS = 5;
 export const MIN_REPAY_GAP_BPS = 50;
 export const MIN_BOOST_GAP_BPS = 50;
@@ -33,8 +30,6 @@ export const REFERRER_PERCENTAGE = 0.15;
 
 export const PRICES: { [key: string]: { price: number; time: number } } = {};
 
-export const JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";
-
 export const JITO_TIP_ACCOUNTS = [
   "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
   "HFqU5x63VTqvQss8hp11i4wVV8bD44PvwucfZ2bU7gRe",
@@ -59,7 +54,4 @@ export const STANDARD_LUT_ACCOUNTS = [
   SYSVAR_RENT_PUBKEY,
   SYSVAR_INSTRUCTIONS_PUBKEY,
   JUPITER_PROGRAM_ID,
-].map((x) => x.toString());
-
-// TODO:
-export const BROKEN_TOKENS = [JUP, JLP, WETH, HNT, JTO, PYTH];
+].map((x) => x.toString());

package/src/services/flashLoans/flProviderAggregator.ts

@@ -1,10 +1,10 @@
-import { FlProviderBase } from "./flProviderBase";
 import { PublicKey } from "@solana/web3.js";
-import { FlashLoanDetails, FlashLoanRequirements } from "../../types";
 import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { FlProviderBase } from "./flProviderBase";
+import { FlashLoanDetails, ProgramEnv } from "../../types";
 import { TokenType } from "../../generated";
 import { MarginfiFlProvider } from "./marginfiFlProvider";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 export class FlProviderAggregator extends FlProviderBase {
   private marginfiFlProvider!: MarginfiFlProvider;
@@ -14,15 +14,17 @@ export class FlProviderAggregator extends FlProviderBase {
     signer: Signer,
     authority: PublicKey,
     supplyMint: PublicKey,
-    debtMint: PublicKey
+    debtMint: PublicKey,
+    programEnv?: ProgramEnv
   ) {
-    super(umi, signer, authority, supplyMint, debtMint);
+    super(umi, signer, authority, supplyMint, debtMint, programEnv);
     this.marginfiFlProvider = new MarginfiFlProvider(
       umi,
       signer,
       authority,
       supplyMint,
-      debtMint
+      debtMint,
+      programEnv
     );
   }
 
@@ -60,7 +62,7 @@ export class FlProviderAggregator extends FlProviderBase {
   }
 
   flFeeBps(source: TokenType, signerFlashLoan?: boolean): number {
-    return this.flProvider(source).flFeeBps(source);
+    return this.flProvider(source).flFeeBps(source, signerFlashLoan);
   }
 
   flashBorrow(

package/src/services/flashLoans/flProviderBase.ts

@@ -1,10 +1,11 @@
+import { PublicKey } from "@solana/web3.js";
 import {
   Signer,
   transactionBuilder,
   TransactionBuilder,
   Umi,
 } from "@metaplex-foundation/umi";
-import { PublicKey } from "@solana/web3.js";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   fromBaseUnit,
   getTokenAccount,
@@ -13,8 +14,7 @@ import {
   tokenInfo,
 } from "../../utils";
 import { TokenType } from "../../generated";
-import { FlashLoanDetails } from "../../types";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { FlashLoanDetails, ProgramEnv } from "../../types";
 
 export abstract class FlProviderBase {
   protected flSigners: Signer[] = [];
@@ -24,7 +24,8 @@ export abstract class FlProviderBase {
     protected signer: Signer,
     protected authority: PublicKey,
     protected supplyMint: PublicKey,
-    protected debtMint: PublicKey
+    protected debtMint: PublicKey,
+    protected programEnv: ProgramEnv = "Prod"
   ) {}
 
   abstract initialize(): Promise<void>;

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -1,3 +1,4 @@
+import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
 import {
   AccountMeta,
   createSignerFromKeypair,
@@ -6,6 +7,7 @@ import {
   transactionBuilder,
   TransactionBuilder,
 } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { MARGINFI_ACCOUNTS } from "../../constants";
 import {
   Bank,
@@ -19,7 +21,6 @@ import {
   safeFetchAllBank,
 } from "../../marginfi-sdk";
 import { FlProviderBase } from "./flProviderBase";
-import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
 import {
   bytesToI80F48,
   consoleLog,
@@ -34,9 +35,8 @@ import {
   toBps,
   tokenInfo,
 } from "../../utils";
-import { TokenType } from "../../generated";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { FlashLoanDetails } from "../../types";
+import { TokenType } from "../../generated";
 
 interface IMFIAccount {
   signer?: Signer;
@@ -116,7 +116,6 @@ export class MarginfiFlProvider extends FlProviderBase {
       (x) => x.group.toString() == this.liquidityBank(sources[0]).group
     );
 
-    // TODO: instead of picking first compatibleMarginfiAccoutn, pick one where we already have it in the marginfi Lut
     const signer =
       compatibleMarginfiAccounts.length > 0
         ? undefined

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -1,4 +1,5 @@
 import { QuoteResponse } from "@jup-ag/api";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { FlashLoanRequirements } from "../../types";
 import { SolautoClient } from "../solauto";
 import { JupSwapManager, SwapParams, SwapInput } from "../swap";
@@ -13,7 +14,6 @@ import {
   toBaseUnit,
   tokenInfo,
 } from "../../utils";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 export class RebalanceSwapManager {
   public swapParams!: SwapParams;

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -1,3 +1,6 @@
+import { PublicKey } from "@solana/web3.js";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { transactionBuilder } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../solauto";
 import {
   FlashLoanRequirements,
@@ -14,8 +17,6 @@ import {
   safeGetPrice,
   tokenInfo,
 } from "../../utils";
-import { getRebalanceValues, RebalanceValues } from "./rebalanceValues";
-import { SolautoFeesBps } from "./solautoFees";
 import {
   PositionTokenState,
   RebalanceDirection,
@@ -25,10 +26,9 @@ import {
   TokenBalanceChangeType,
   TokenType,
 } from "../../generated";
-import { PublicKey } from "@solana/web3.js";
+import { getRebalanceValues, RebalanceValues } from "./rebalanceValues";
+import { SolautoFeesBps } from "./solautoFees";
 import { RebalanceSwapManager } from "./rebalanceSwapManager";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { transactionBuilder } from "@metaplex-foundation/umi";
 
 export class RebalanceTxBuilder {
   private values!: RebalanceValues;

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;