@haven-fi/solauto-sdk 1.0.624 → 1.0.626

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,7 +7,8 @@ import {
   transactionBuilder,
   TransactionBuilder,
 } from "@metaplex-foundation/umi";
-import { MARGINFI_ACCOUNTS } from "../../constants";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { getMarginfiAccounts } from "../../constants";
 import {
   Bank,
   lendingAccountBorrow,
@@ -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;
@@ -69,14 +69,16 @@ export class MarginfiFlProvider extends FlProviderBase {
   }
 
   private async setAvailableBanks() {
+    const bankAccounts = getMarginfiAccounts(this.programEnv).bankAccounts;
+
     const availableBanks: string[] = [];
     const checkIfUsable = (group: string, mint: PublicKey) => {
-      if (Object.keys(MARGINFI_ACCOUNTS[group]).includes(mint.toString())) {
-        availableBanks.push(MARGINFI_ACCOUNTS[group][mint.toString()].bank);
+      if (Object.keys(bankAccounts[group]).includes(mint.toString())) {
+        availableBanks.push(bankAccounts[group][mint.toString()].bank);
       }
     };
 
-    for (const group of Object.keys(MARGINFI_ACCOUNTS)) {
+    for (const group of Object.keys(bankAccounts)) {
       checkIfUsable(group, this.supplyMint);
       checkIfUsable(group, this.debtMint);
     }
@@ -116,7 +118,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;
 
@@ -109,6 +102,7 @@ export abstract class SolautoClient extends ReferralStateManager {
         lendingPool: args.lendingPool,
         lpUserAccount: args.lpUserAccount,
         lendingPlatform: this.lendingPlatform,
+        lpEnv: this.lpEnv,
       },
       this.contextUpdates
     );
@@ -153,7 +147,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,9 @@ 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 {
-  MARGINFI_ACCOUNTS,
-  MARGINFI_ACCOUNTS_LOOKUP_TABLE,
-} from "../../constants/marginfiAccounts";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { MarginfiAssetAccounts, RebalanceDetails } from "../../types";
+import { getMarginfiAccounts, MarginfiProgramAccounts } from "../../constants";
 import {
   DCASettingsInpArgs,
   LendingPlatform,
@@ -29,9 +25,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,17 +39,12 @@ 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;
 
-  public marginfiProgram!: PublicKey;
+  public mfiAccounts!: MarginfiProgramAccounts;
 
   public marginfiAccount!: PublicKey | Signer;
   public marginfiAccountPk!: PublicKey;
@@ -64,6 +59,8 @@ export class SolautoMarginfiClient extends SolautoClient {
   async initialize(args: SolautoClientArgs) {
     await super.initialize(args);
 
+    this.mfiAccounts = getMarginfiAccounts(this.lpEnv);
+
     this.marginfiGroup = await this.pos.lendingPool();
 
     if (this.selfManaged) {
@@ -108,11 +105,11 @@ export class SolautoMarginfiClient extends SolautoClient {
     }
 
     this.marginfiSupplyAccounts =
-      MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
+      this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][
         this.pos.supplyMint().toString()
       ]!;
     this.marginfiDebtAccounts =
-      MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
+      this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][
         this.pos.debtMint().toString()
       ]!;
 
@@ -132,7 +129,10 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   defaultLookupTables(): string[] {
-    return [MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
+    return [
+      this.mfiAccounts.lookupTable.toString(),
+      ...super.defaultLookupTables(),
+    ];
   }
 
   lutAccountsToAdd(): PublicKey[] {
@@ -169,7 +169,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiOpenPosition(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      marginfiProgram: publicKey(this.mfiAccounts.program),
       signerReferralState: publicKey(this.referralState),
       referredByState: this.referredByState
         ? publicKey(this.referredByState)
@@ -214,7 +214,7 @@ export class SolautoMarginfiClient extends SolautoClient {
   refreshIx(): TransactionBuilder {
     return marginfiRefreshData(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      marginfiProgram: publicKey(this.mfiAccounts.program),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccount),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
@@ -342,7 +342,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiProtocolInteraction(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      marginfiProgram: publicKey(this.mfiAccounts.program),
       solautoPosition: publicKey(this.pos.publicKey),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccountPk),
@@ -393,7 +393,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiRebalance(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      marginfiProgram: publicKey(this.mfiAccounts.program),
       ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
       solautoFeesTa: publicKey(
         data.values.rebalanceDirection === RebalanceDirection.Boost
@@ -425,9 +425,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 +437,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;