@haven-fi/solauto-sdk 1.0.176 → 1.0.178

package/src/transactions/transactionUtils.ts

@@ -1,5 +1,6 @@
 import {
   Instruction,
+  ProgramError,
   TransactionBuilder,
   Umi,
   publicKey,
@@ -12,6 +13,7 @@ import {
   NATIVE_MINT,
 } from "@solana/spl-token";
 import {
+  InvalidRebalanceConditionError,
   LendingPlatform,
   ReferralState,
   SOLAUTO_PROGRAM_ID,
@@ -19,8 +21,10 @@ import {
   SolautoRebalanceType,
   TokenType,
   convertReferralFees,
+  createSolautoProgram,
   getMarginfiProtocolInteractionInstructionDataSerializer,
   getMarginfiRebalanceInstructionDataSerializer,
+  getSolautoErrorFromCode,
   isSolautoAction,
   solautoAction,
 } from "../generated";
@@ -50,12 +54,20 @@ import {
 import { eligibleForRebalance } from "../utils/solauto/generalUtils";
 import { getTokenAccount, getTokenAccountData } from "../utils/accountUtils";
 import {
+  createMarginfiProgram,
   getLendingAccountBorrowInstructionDataSerializer,
   getLendingAccountDepositInstructionDataSerializer,
   getLendingAccountRepayInstructionDataSerializer,
   getLendingAccountWithdrawInstructionDataSerializer,
+  getMarginfiErrorFromName,
   MARGINFI_PROGRAM_ID,
 } from "../marginfi-sdk";
+import { TxHandler } from "../clients";
+import {
+  createJupiterProgram,
+  getJupiterErrorFromName,
+  JUPITER_PROGRAM_ID,
+} from "../jupiter-sdk";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -577,17 +589,28 @@ export function requiresRefreshBeforeRebalance(client: SolautoClient) {
   ) {
     return true;
   } else if (client.solautoPositionData && !client.selfManaged) {
-    if (client.livePositionUpdates.supplyAdjustment > BigInt(0) || client.livePositionUpdates.debtAdjustment > BigInt(0)) {
+    if (
+      client.livePositionUpdates.supplyAdjustment > BigInt(0) ||
+      client.livePositionUpdates.debtAdjustment > BigInt(0)
+    ) {
       return false;
     }
 
-    const oldSupply = client.solautoPositionData.state.supply.amountUsed.baseUnit;
+    const oldSupply =
+      client.solautoPositionData.state.supply.amountUsed.baseUnit;
     const oldDebt = client.solautoPositionData.state.debt.amountUsed.baseUnit;
 
-    const supplyDiff = (client.solautoPositionState?.supply.amountUsed.baseUnit ?? BigInt(0)) - oldSupply;
-    const debtDiff = (client.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) - oldDebt;
+    const supplyDiff =
+      (client.solautoPositionState?.supply.amountUsed.baseUnit ?? BigInt(0)) -
+      oldSupply;
+    const debtDiff =
+      (client.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) -
+      oldDebt;
 
-    if (Math.abs(Number(supplyDiff)) / Number(oldSupply) >= 0.01 || Math.abs(Number(debtDiff)) / Number(oldDebt) >= 0.01) {
+    if (
+      Math.abs(Number(supplyDiff)) / Number(oldSupply) >= 0.01 ||
+      Math.abs(Number(debtDiff)) / Number(oldDebt) >= 0.01
+    ) {
       return true;
     }
   }
@@ -769,3 +792,47 @@ export async function convertReferralFeesToDestination(
 
   return [tx, lookupTableAddresses];
 }
+
+export function getErrorInfo(tx: TransactionBuilder, error: any) {
+  let canBeIgnored = false;
+  let errorName: string | undefined = undefined;
+  let errorInfo: string | undefined = undefined;
+
+  try {
+    let programError: ProgramError | null = null;
+
+    if (typeof error === "object" && (error as any)["InstructionError"]) {
+      const err = (error as any)["InstructionError"];
+      const errIx = tx.getInstructions()[Math.max(0, err[0] - 2)];
+      const errCode = err[1]["Custom"];
+
+      if (errIx.programId === SOLAUTO_PROGRAM_ID) {
+        programError = getSolautoErrorFromCode(errCode, createSolautoProgram());
+        if (
+          programError?.name ===
+          new InvalidRebalanceConditionError(createSolautoProgram()).name
+        ) {
+          canBeIgnored = true;
+        }
+      } else if (errIx.programId === MARGINFI_PROGRAM_ID) {
+        programError = getMarginfiErrorFromName(
+          errCode,
+          createMarginfiProgram()
+        );
+      } else if (errIx.programId === JUPITER_PROGRAM_ID) {
+        programError = getJupiterErrorFromName(errCode, createJupiterProgram());
+      }
+    }
+
+    if (programError) {
+      errorName = programError?.name;
+      errorName = programError?.message;
+    }
+  } catch {}
+
+  return {
+    errorName: errorName ?? "Unknown error",
+    errorInfo: errorInfo ?? "Unknown error",
+    canBeIgnored,
+  };
+}

package/src/transactions/transactionsManager.ts

@@ -14,7 +14,7 @@ import {
   ErrorsToThrow,
   retryWithExponentialBackoff,
 } from "../utils/generalUtils";
-import { getTransactionChores } from "./transactionUtils";
+import { getErrorInfo, getTransactionChores } from "./transactionUtils";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 import { ReferralStateManager, TxHandler } from "../clients";
 import {
@@ -183,10 +183,11 @@ export enum TransactionStatus {
 
 export type TransactionManagerStatuses = {
   name: string;
+  attemptNum: number;
   status: TransactionStatus;
+  moreInfo?: string;
   simulationSuccessful?: boolean;
   txSig?: string;
-  attemptNum: number;
 }[];
 
 export class TransactionsManager {
@@ -253,7 +254,8 @@ export class TransactionsManager {
     status: TransactionStatus,
     attemptNum: number,
     txSig?: string,
-    simulationSuccessful?: boolean
+    simulationSuccessful?: boolean,
+    moreInfo?: string
   ) {
     if (!this.statuses.filter((x) => x.name === name)) {
       this.statuses.push({
@@ -262,6 +264,7 @@ export class TransactionsManager {
         txSig,
         attemptNum,
         simulationSuccessful,
+        moreInfo,
       });
     } else {
       const idx = this.statuses.findIndex(
@@ -273,6 +276,9 @@ export class TransactionsManager {
         if (simulationSuccessful) {
           this.statuses[idx].simulationSuccessful = simulationSuccessful;
         }
+        if (moreInfo) {
+          this.statuses[idx].moreInfo = moreInfo;
+        }
       } else {
         this.statuses.push({
           name,
@@ -280,6 +286,7 @@ export class TransactionsManager {
           txSig,
           attemptNum,
           simulationSuccessful,
+          moreInfo,
         });
       }
     }
@@ -524,33 +531,23 @@ export class TransactionsManager {
         attemptNum,
         txSig ? bs58.encode(txSig) : undefined
       );
-    } catch (e) {
-      try {
-        if (typeof e === "object" && (e as any)["InstructionError"]) {
-          const err = (e as any)["InstructionError"];
-          const errIx = err[0];
-          const errCode = err[1]["Custom"];
-
-          const solautoProgram =
-            this.txHandler.umi.programs.get(SOLAUTO_PROGRAM_ID);
-          const invalidRebalanceError = new InvalidRebalanceConditionError(
-            solautoProgram
-          );
-
-          if (
-            tx.getInstructions()[Math.max(0, errIx - 2)].programId ===
-              SOLAUTO_PROGRAM_ID &&
-            solautoProgram.getErrorFromCode(errCode)?.name ===
-              invalidRebalanceError.name
-          ) {
-            this.updateStatus(txName, TransactionStatus.Skipped, attemptNum);
-            return;
-          }
-        }
-      } catch {}
+    } catch (e: any) {
+      const errorDetails = getErrorInfo(tx, e);
+      
+      this.updateStatus(
+        txName,
+        errorDetails.canBeIgnored
+          ? TransactionStatus.Skipped
+          : TransactionStatus.Failed,
+        attemptNum,
+        undefined,
+        undefined,
+        errorDetails.errorInfo
+      );
 
-      this.updateStatus(txName, TransactionStatus.Failed, attemptNum);
-      throw e;
+      if (!errorDetails.canBeIgnored) {
+        throw e;
+      }
     }
   }
 }