@haven-fi/solauto-sdk 1.0.380 → 1.0.382

package/dist/constants/marginfiAccounts.js

@@ -190,19 +190,19 @@ exports.MARGINFI_ACCOUNTS = {
             priceOracle: USDC_PRICE_ORACLE,
         },
     },
-    // ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
-    //   [tokens.HMTR]: {
-    //     bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
-    //     liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
-    //     vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
-    //     priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
-    //   },
-    //   [tokens.USDC]: {
-    //     bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
-    //     liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
-    //     vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
-    //     priceOracle: USDC_PRICE_ORACLE,
-    //   }
-    // }
+    ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
+        [tokens.HMTR]: {
+            bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
+            liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
+            vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
+            priceOracle: switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
+        },
+        [tokens.USDC]: {
+            bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
+            liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
+            vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
+            priceOracle: USDC_PRICE_ORACLE,
+        }
+    }
 };
 exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";

package/dist/constants/tokenConstants.js

@@ -49,7 +49,7 @@ exports.ALL_SUPPORTED_TOKENS = [
     exports.POPCAT,
     exports.RETARDIO,
     exports.BILLY,
-    // HMTR,
+    exports.HMTR,
 ];
 exports.TOKEN_INFO = {
     [web3_js_1.PublicKey.default.toString()]: {

package/dist/marginfi-sdk/types/oracleSetup.d.ts

@@ -8,10 +8,8 @@
 import { Serializer } from '@metaplex-foundation/umi/serializers';
 export declare enum OracleSetup {
     None = 0,
-    PythLegacy = 1,
-    SwitchboardLegacy = 2,
-    PythPushOracle = 3,
-    SwitchboardPull = 4
+    PythEma = 1,
+    SwitchboardV2 = 2
 }
 export type OracleSetupArgs = OracleSetup;
 export declare function getOracleSetupSerializer(): Serializer<OracleSetupArgs, OracleSetup>;

package/dist/marginfi-sdk/types/oracleSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracleSetup.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/types/oracleSetup.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,UAAU,IAAA;IACV,iBAAiB,IAAA;IACjB,cAAc,IAAA;IACd,eAAe,IAAA;CAChB;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CAIA"}
+{"version":3,"file":"oracleSetup.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/types/oracleSetup.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,aAAa,IAAA;CACd;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CAIA"}

package/dist/marginfi-sdk/types/oracleSetup.js

@@ -13,10 +13,8 @@ const serializers_1 = require("@metaplex-foundation/umi/serializers");
 var OracleSetup;
 (function (OracleSetup) {
     OracleSetup[OracleSetup["None"] = 0] = "None";
-    OracleSetup[OracleSetup["PythLegacy"] = 1] = "PythLegacy";
-    OracleSetup[OracleSetup["SwitchboardLegacy"] = 2] = "SwitchboardLegacy";
-    OracleSetup[OracleSetup["PythPushOracle"] = 3] = "PythPushOracle";
-    OracleSetup[OracleSetup["SwitchboardPull"] = 4] = "SwitchboardPull";
+    OracleSetup[OracleSetup["PythEma"] = 1] = "PythEma";
+    OracleSetup[OracleSetup["SwitchboardV2"] = 2] = "SwitchboardV2";
 })(OracleSetup || (exports.OracleSetup = OracleSetup = {}));
 function getOracleSetupSerializer() {
     return (0, serializers_1.scalarEnum)(OracleSetup, {

package/dist/transactions/transactionUtils.d.ts

@@ -8,7 +8,7 @@ export declare function getTransactionChores(client: SolautoClient, tx: Transact
 export declare function requiresRefreshBeforeRebalance(client: SolautoClient): Promise<boolean>;
 export declare function buildSolautoRebalanceTransaction(client: SolautoClient, targetLiqUtilizationRateBps?: number, attemptNum?: number): Promise<TransactionItemInputs | undefined>;
 export declare function convertReferralFeesToDestination(referralManager: ReferralStateManager, tokenAccount: PublicKey, destinationMint: PublicKey): Promise<TransactionItemInputs | undefined>;
-export declare function getErrorInfo(umi: Umi, tx: TransactionBuilder, error: any, simulationSuccessful?: boolean): {
+export declare function getErrorInfo(umi: Umi, txs: TransactionBuilder[], error: Error, simulationSuccessful?: boolean): {
     errorName: string | undefined;
     errorInfo: string | undefined;
     canBeIgnored: boolean;

package/dist/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAmBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA2LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAoH7B;AA2LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAqDzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA2H5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AA0BD,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,GAAG,EACV,oBAAoB,CAAC,EAAE,OAAO;;;;EAyE/B"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAmBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA4LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAoH7B;AA2LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAqDzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA2H5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EA4F/B"}

package/dist/transactions/transactionUtils.js

@@ -22,6 +22,7 @@ const marginfi_sdk_1 = require("../marginfi-sdk");
 const jupiter_sdk_1 = require("../jupiter-sdk");
 const constants_1 = require("../constants");
 const utils_1 = require("../utils");
+const transactions_1 = require("../types/transactions");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
     const supplyIsWsol = client.supplyMint.equals(spl_token_1.NATIVE_MINT);
     const debtIsWsol = client.debtMint.equals(spl_token_1.NATIVE_MINT);
@@ -439,76 +440,76 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
         .add(swapIx);
     return { tx, lookupTableAddresses };
 }
-function parseJitoErrorMessage(message) {
-    const regex = /Error processing Instruction (\d+): custom program error: (0x[0-9A-Fa-f]+|\d+)/;
-    const match = message.match(regex);
-    if (match) {
-        const instructionIndex = parseInt(match[1], 10);
-        let errorCode;
-        if (match[2].toLowerCase().startsWith("0x")) {
-            errorCode = parseInt(match[2], 16);
-        }
-        else {
-            errorCode = parseInt(match[2], 10);
-        }
-        return {
-            instructionIndex,
-            errorCode,
-        };
-    }
-    else {
-        return null;
-    }
-}
-function getErrorInfo(umi, tx, error, simulationSuccessful) {
+function getErrorInfo(umi, txs, error, simulationSuccessful) {
     let canBeIgnored = false;
     let errorName = undefined;
     let errorInfo = undefined;
+    let errTxIdx;
+    let errIxIdx;
+    let errCode;
+    let errName;
+    const computeIxs = simulationSuccessful ? 2 : 1; // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
     try {
-        let programError = null;
         if (typeof error === "object" && error["InstructionError"]) {
             const err = error["InstructionError"];
-            const computeIxs = simulationSuccessful ? 2 : 1; // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
-            const errIxIdx = err[0] - computeIxs;
-            (0, generalUtils_1.consoleLog)("Transaction instructions:", tx
-                .getInstructions()
-                .map((x) => x.programId.toString())
-                .join(","));
-            (0, generalUtils_1.consoleLog)("Error instruction index:", errIxIdx);
-            const errIx = tx.getInstructions()[Math.max(0, errIxIdx)];
-            const errCode = typeof err[1] === "object" && "Custom" in err[1]
-                ? err[1]["Custom"]
-                : undefined;
-            const errName = errCode === undefined ? err[1] : undefined;
-            let programName = "";
-            if (errIx.programId.toString() ===
+            errTxIdx = 0;
+            errIxIdx = err[0] - computeIxs;
+            errCode =
+                typeof err[1] === "object" && "Custom" in err[1]
+                    ? err[1]["Custom"]
+                    : undefined;
+            errName = errCode === undefined ? err[1] : undefined;
+        }
+        else if (error instanceof transactions_1.BundleSimulationError) {
+            errTxIdx = error.details.transactionIdx;
+            errIxIdx = error.details.instructionIdx - computeIxs;
+            errCode = error.details.errorCode;
+        }
+        (0, generalUtils_1.consoleLog)("Transaction instructions:", txs.map((x) => x
+            .getInstructions()
+            .map((y) => y.programId.toString())
+            .join(",")));
+        let programError = null;
+        let programName = "";
+        const errIx = errTxIdx !== undefined && errIxIdx !== undefined
+            ? txs[errTxIdx].getInstructions()[Math.max(0, errIxIdx)]
+            : undefined;
+        (0, generalUtils_1.consoleLog)("Error transaction index:", errTxIdx);
+        (0, generalUtils_1.consoleLog)("Error instruction index:", errIxIdx);
+        (0, generalUtils_1.consoleLog)("Error code:", errCode);
+        (0, generalUtils_1.consoleLog)("Error instruction program:", errIx?.programId.toString());
+        const solautoError = (0, generated_1.getSolautoErrorFromCode)(errCode ?? -1, (0, generated_1.createSolautoProgram)());
+        const marginfiError = (0, marginfi_sdk_1.getMarginfiErrorFromCode)(errCode ?? -1, (0, marginfi_sdk_1.createMarginfiProgram)());
+        if (errCode &&
+            errIx?.programId.toString() ===
                 umi.programs.get("solauto").publicKey.toString()) {
-                programError = (0, generated_1.getSolautoErrorFromCode)(errCode, (0, generated_1.createSolautoProgram)());
-                programName = "Haven";
-                if (programError?.name ===
-                    new generated_1.InvalidRebalanceConditionError((0, generated_1.createSolautoProgram)()).name) {
-                    canBeIgnored = true;
-                }
-            }
-            else if (errIx.programId === marginfi_sdk_1.MARGINFI_PROGRAM_ID) {
-                programName = "Marginfi";
-                programError = (0, marginfi_sdk_1.getMarginfiErrorFromCode)(errCode, (0, marginfi_sdk_1.createMarginfiProgram)());
-            }
-            else if (errIx.programId === jupiter_sdk_1.JUPITER_PROGRAM_ID) {
-                programName = "Jupiter";
-                programError = (0, jupiter_sdk_1.getJupiterErrorFromCode)(errCode, (0, jupiter_sdk_1.createJupiterProgram)());
-            }
-            if (errName && errCode === undefined) {
-                errorName = `${programName ?? "Program"} error`;
-                errorInfo = errName;
+            programError = solautoError ?? marginfiError;
+            programName = "Haven";
+            if (programError?.name ===
+                new generated_1.InvalidRebalanceConditionError((0, generated_1.createSolautoProgram)()).name) {
+                canBeIgnored = true;
             }
         }
+        else if (errCode && errIx?.programId === marginfi_sdk_1.MARGINFI_PROGRAM_ID) {
+            programName = "Marginfi";
+            programError = marginfiError;
+        }
+        else if (errCode && errIx?.programId === jupiter_sdk_1.JUPITER_PROGRAM_ID) {
+            programName = "Jupiter";
+            programError = (0, jupiter_sdk_1.getJupiterErrorFromCode)(errCode, (0, jupiter_sdk_1.createJupiterProgram)());
+        }
         if (programError) {
             errorName = programError?.name;
             errorInfo = programError?.message;
         }
+        else if (errName) {
+            errorName = `${programName ?? "Program"} error`;
+            errorInfo = errName;
+        }
+    }
+    catch (e) {
+        (0, generalUtils_1.consoleLog)(e);
     }
-    catch { }
     return {
         errorName: errorName,
         errorInfo: errorInfo,

package/dist/transactions/transactionsManager.js

@@ -369,7 +369,7 @@ class TransactionsManager {
             this.updateStatusForSets(itemSets, TransactionStatus.Successful, attemptNum, txSigs);
         }, this.retries, this.retryDelay, this.errorsToThrow).catch((e) => {
             this.txHandler.log("Capturing error info...");
-            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, (0, umi_1.transactionBuilder)().add(transactions), e, itemSets.filter((x) => this.statuses.find((y) => x.name() === y.name)?.simulationSuccessful).length === itemSets.length);
+            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, transactions, e, itemSets.filter((x) => this.statuses.find((y) => x.name() === y.name)?.simulationSuccessful).length === itemSets.length);
             const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
             this.updateStatusForSets(itemSets, errorDetails.canBeIgnored
                 ? TransactionStatus.Skipped
@@ -427,7 +427,7 @@ class TransactionsManager {
         }
         catch (e) {
             this.txHandler.log("Capturing error info...");
-            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, tx, e, this.statuses.find((x) => x.name === txName)?.simulationSuccessful);
+            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, [tx], e, this.statuses.find((x) => x.name === txName)?.simulationSuccessful);
             const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
             this.updateStatus(txName, errorDetails.canBeIgnored
                 ? TransactionStatus.Skipped

package/dist/types/transactions.d.ts

@@ -0,0 +1,11 @@
+export interface BundleInstructionFailure {
+    transactionIdx: number;
+    instructionIdx: number;
+    errorCode: number;
+}
+export declare class BundleSimulationError extends Error {
+    statusCode: number;
+    details: BundleInstructionFailure;
+    constructor(message: string, statusCode: number, details: BundleInstructionFailure);
+}
+//# sourceMappingURL=transactions.d.ts.map

package/dist/types/transactions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transactions.d.ts","sourceRoot":"","sources":["../../src/types/transactions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,qBAAsB,SAAQ,KAAK;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,wBAAwB,CAAC;gBAGvC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,wBAAwB;CASpC"}

package/dist/types/transactions.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BundleSimulationError = void 0;
+class BundleSimulationError extends Error {
+    constructor(message, statusCode, details) {
+        super(message);
+        this.statusCode = statusCode;
+        this.details = details;
+        Object.setPrototypeOf(this, BundleSimulationError.prototype);
+    }
+}
+exports.BundleSimulationError = BundleSimulationError;

package/dist/utils/jitoUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAmKD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAuE/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAwMD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAuE/B"}

package/dist/utils/jitoUtils.js

@@ -13,6 +13,7 @@ const generalUtils_1 = require("./generalUtils");
 const types_1 = require("../types");
 const axios_1 = __importDefault(require("axios"));
 const bs58_1 = __importDefault(require("bs58"));
+const transactions_1 = require("../types/transactions");
 async function getRandomTipAccount() {
     const tipAccounts = [
         "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
@@ -30,6 +31,27 @@ async function getRandomTipAccount() {
 async function getTipInstruction(signer, tipLamports) {
     return (0, solanaUtils_1.systemTransferUmiIx)(signer, await getRandomTipAccount(), BigInt(tipLamports));
 }
+function parseJitoErrorMessage(message) {
+    const regex = /Error processing Instruction (\d+): custom program error: (0x[0-9A-Fa-f]+|\d+)/;
+    const match = message.match(regex);
+    if (match) {
+        const instructionIndex = parseInt(match[1], 10);
+        let errorCode;
+        if (match[2].toLowerCase().startsWith("0x")) {
+            errorCode = parseInt(match[2], 16);
+        }
+        else {
+            errorCode = parseInt(match[2], 10);
+        }
+        return {
+            instructionIndex,
+            errorCode,
+        };
+    }
+    else {
+        return null;
+    }
+}
 async function simulateJitoBundle(umi, txs) {
     const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const resp = await axios_1.default.post(umi.rpc.getEndpoint(), {
@@ -61,7 +83,18 @@ async function simulateJitoBundle(umi, txs) {
                     (0, generalUtils_1.consoleLog)(y);
                 });
             });
+            const failedTxIdx = transactionResults.length;
             const txFailure = res.summary.failed.error.TransactionFailure;
+            if (txFailure) {
+                const info = parseJitoErrorMessage(txFailure[1]);
+                if (info) {
+                    throw new transactions_1.BundleSimulationError("Failed to simulate transaction", 400, {
+                        transactionIdx: failedTxIdx,
+                        instructionIdx: info.instructionIndex,
+                        errorCode: info.errorCode,
+                    });
+                }
+            }
             throw new Error(txFailure ? txFailure[1] : res.summary.failed.toString());
         }
         return res;

package/package.json

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

package/src/constants/marginfiAccounts.ts

@@ -172,20 +172,20 @@ export const MARGINFI_ACCOUNTS: {
       priceOracle: USDC_PRICE_ORACLE,
     },
   },
-  // ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
-  //   [tokens.HMTR]: {
-  //     bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
-  //     liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
-  //     vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
-  //     priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
-  //   },
-  //   [tokens.USDC]: {
-  //     bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
-  //     liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
-  //     vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
-  //     priceOracle: USDC_PRICE_ORACLE,
-  //   }
-  // }
+  ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
+    [tokens.HMTR]: {
+      bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
+      liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
+      vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
+      priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
+    },
+    [tokens.USDC]: {
+      bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
+      liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
+      vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
+      priceOracle: USDC_PRICE_ORACLE,
+    }
+  }
 };
 
 export const MARGINFI_ACCOUNTS_LOOKUP_TABLE =

package/src/constants/tokenConstants.ts

@@ -48,7 +48,7 @@ export const ALL_SUPPORTED_TOKENS = [
   POPCAT,
   RETARDIO,
   BILLY,
-  // HMTR,
+  HMTR,
 ];
 
 interface TokenInfo {

package/src/marginfi-sdk/types/oracleSetup.ts

@@ -10,10 +10,8 @@ import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
 
 export enum OracleSetup {
   None,
-  PythLegacy,
-  SwitchboardLegacy,
-  PythPushOracle,
-  SwitchboardPull,
+  PythEma,
+  SwitchboardV2,
 }
 
 export type OracleSetupArgs = OracleSetup;

package/src/transactions/transactionUtils.ts

@@ -73,6 +73,7 @@ import {
 import { PRICES } from "../constants";
 import { TransactionItemInputs } from "../types";
 import { safeGetPrice } from "../utils";
+import { BundleSimulationError } from "../types/transactions";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -824,101 +825,96 @@ export async function convertReferralFeesToDestination(
   return { tx, lookupTableAddresses };
 }
 
-function parseJitoErrorMessage(message: string) {
-  const regex =
-    /Error processing Instruction (\d+): custom program error: (0x[0-9A-Fa-f]+|\d+)/;
-  const match = message.match(regex);
-
-  if (match) {
-    const instructionIndex = parseInt(match[1], 10);
-
-    let errorCode: number;
-    if (match[2].toLowerCase().startsWith("0x")) {
-      errorCode = parseInt(match[2], 16);
-    } else {
-      errorCode = parseInt(match[2], 10);
-    }
-
-    return {
-      instructionIndex,
-      errorCode,
-    };
-  } else {
-    return null;
-  }
-}
-
 export function getErrorInfo(
   umi: Umi,
-  tx: TransactionBuilder,
-  error: any,
+  txs: TransactionBuilder[],
+  error: Error,
   simulationSuccessful?: boolean
 ) {
   let canBeIgnored = false;
   let errorName: string | undefined = undefined;
   let errorInfo: string | undefined = undefined;
 
-  try {
-    let programError: ProgramError | null = null;
+  let errTxIdx: number | undefined;
+  let errIxIdx: number | undefined;
+  let errCode: number | undefined;
+  let errName: string | undefined;
 
+  const computeIxs = simulationSuccessful ? 2 : 1; // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
+
+  try {
     if (typeof error === "object" && (error as any)["InstructionError"]) {
       const err = (error as any)["InstructionError"];
 
-      const computeIxs = simulationSuccessful ? 2 : 1; // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
-      const errIxIdx = err[0] - computeIxs;
+      errTxIdx = 0;
+      errIxIdx = err[0] - computeIxs;
+      errCode =
+        typeof err[1] === "object" && "Custom" in err[1]
+          ? err[1]["Custom"]
+          : undefined;
+      errName = errCode === undefined ? (err[1] as string) : undefined;
+    } else if (error instanceof BundleSimulationError) {
+      errTxIdx = error.details.transactionIdx;
+      errIxIdx = error.details.instructionIdx - computeIxs;
+      errCode = error.details.errorCode;
+    }
 
-      consoleLog(
-        "Transaction instructions:",
-        tx
+    consoleLog(
+      "Transaction instructions:",
+      txs.map((x) =>
+        x
           .getInstructions()
-          .map((x) => x.programId.toString())
+          .map((y) => y.programId.toString())
           .join(",")
-      );
-      consoleLog("Error instruction index:", errIxIdx);
+      )
+    );
 
-      const errIx = tx.getInstructions()[Math.max(0, errIxIdx)];
+    let programError: ProgramError | null = null;
+    let programName = "";
+    const errIx =
+      errTxIdx !== undefined && errIxIdx !== undefined
+        ? txs[errTxIdx].getInstructions()[Math.max(0, errIxIdx)]
+        : undefined;
 
-      const errCode =
-        typeof err[1] === "object" && "Custom" in err[1]
-          ? err[1]["Custom"]
-          : undefined;
-      const errName = errCode === undefined ? (err[1] as string) : undefined;
-      let programName = "";
+    consoleLog("Error transaction index:", errTxIdx);
+    consoleLog("Error instruction index:", errIxIdx);
+    consoleLog("Error code:", errCode);
+    consoleLog("Error instruction program:", errIx?.programId.toString());
 
-      if (
-        errIx.programId.toString() ===
+    const solautoError = getSolautoErrorFromCode(errCode ?? -1, createSolautoProgram());
+    const marginfiError = getMarginfiErrorFromCode(errCode ?? -1, createMarginfiProgram());
+
+    if (
+      errCode &&
+      errIx?.programId.toString() ===
         umi.programs.get("solauto").publicKey.toString()
+    ) {
+      programError = solautoError ?? marginfiError;
+      programName = "Haven";
+      if (
+        programError?.name ===
+        new InvalidRebalanceConditionError(createSolautoProgram()).name
       ) {
-        programError = getSolautoErrorFromCode(errCode, createSolautoProgram());
-        programName = "Haven";
-        if (
-          programError?.name ===
-          new InvalidRebalanceConditionError(createSolautoProgram()).name
-        ) {
-          canBeIgnored = true;
-        }
-      } else if (errIx.programId === MARGINFI_PROGRAM_ID) {
-        programName = "Marginfi";
-        programError = getMarginfiErrorFromCode(
-          errCode,
-          createMarginfiProgram()
-        );
-      } else if (errIx.programId === JUPITER_PROGRAM_ID) {
-        programName = "Jupiter";
-        programError = getJupiterErrorFromCode(errCode, createJupiterProgram());
-      }
-
-      if (errName && errCode === undefined) {
-        errorName = `${programName ?? "Program"} error`;
-        errorInfo = errName;
+        canBeIgnored = true;
       }
+    } else if (errCode && errIx?.programId === MARGINFI_PROGRAM_ID) {
+      programName = "Marginfi";
+      programError = marginfiError;
+    } else if (errCode && errIx?.programId === JUPITER_PROGRAM_ID) {
+      programName = "Jupiter";
+      programError = getJupiterErrorFromCode(errCode, createJupiterProgram());
     }
 
     if (programError) {
       errorName = programError?.name;
       errorInfo = programError?.message;
+    } else if (errName) {
+      errorName = `${programName ?? "Program"} error`;
+      errorInfo = errName;
     }
-  } catch {}
+  } catch (e) {
+    consoleLog(e);
+  }
 
   return {
     errorName: errorName,

package/src/transactions/transactionsManager.ts

@@ -614,7 +614,7 @@ export class TransactionsManager {
       this.txHandler.log("Capturing error info...");
       const errorDetails = getErrorInfo(
         this.txHandler.umi,
-        transactionBuilder().add(transactions),
+        transactions,
         e,
         itemSets.filter(
           (x) =>
@@ -756,7 +756,7 @@ export class TransactionsManager {
       this.txHandler.log("Capturing error info...");
       const errorDetails = getErrorInfo(
         this.txHandler.umi,
-        tx,
+        [tx],
         e,
         this.statuses.find((x) => x.name === txName)?.simulationSuccessful
       );

package/src/types/transactions.ts

@@ -0,0 +1,23 @@
+export interface BundleInstructionFailure {
+  transactionIdx: number;
+  instructionIdx: number;
+  errorCode: number;
+}
+
+export class BundleSimulationError extends Error {
+  public statusCode: number;
+  public details: BundleInstructionFailure;
+
+  constructor(
+    message: string,
+    statusCode: number,
+    details: BundleInstructionFailure
+  ) {
+    super(message);
+
+    this.statusCode = statusCode;
+    this.details = details;
+
+    Object.setPrototypeOf(this, BundleSimulationError.prototype);
+  }
+}

package/src/utils/jitoUtils.ts

@@ -21,6 +21,7 @@ import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 import axios from "axios";
 import base58 from "bs58";
+import { BundleSimulationError } from "../types/transactions";
 
 export async function getRandomTipAccount(): Promise<PublicKey> {
   const tipAccounts = [
@@ -48,6 +49,30 @@ async function getTipInstruction(
   );
 }
 
+function parseJitoErrorMessage(message: string) {
+  const regex =
+    /Error processing Instruction (\d+): custom program error: (0x[0-9A-Fa-f]+|\d+)/;
+  const match = message.match(regex);
+
+  if (match) {
+    const instructionIndex = parseInt(match[1], 10);
+
+    let errorCode: number;
+    if (match[2].toLowerCase().startsWith("0x")) {
+      errorCode = parseInt(match[2], 16);
+    } else {
+      errorCode = parseInt(match[2], 10);
+    }
+
+    return {
+      instructionIndex,
+      errorCode,
+    };
+  } else {
+    return null;
+  }
+}
+
 async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
   const simulationResult = await retryWithExponentialBackoff(async () => {
     const resp = await axios.post(
@@ -89,7 +114,20 @@ async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
         });
       });
 
+      const failedTxIdx = transactionResults.length;
       const txFailure = res.summary.failed.error.TransactionFailure;
+
+      if (txFailure) {
+        const info = parseJitoErrorMessage(txFailure[1] as string);
+        if (info) {
+          throw new BundleSimulationError("Failed to simulate transaction", 400, {
+            transactionIdx: failedTxIdx,
+            instructionIdx: info.instructionIndex,
+            errorCode: info.errorCode,
+          });
+        }
+      }
+
       throw new Error(txFailure ? txFailure[1] : res.summary.failed.toString());
     }
 

package/tests/transactions/solautoMarginfi.ts

@@ -52,20 +52,20 @@ describe("Solauto Marginfi tests", async () => {
     const supplyDecimals = 6;
     const debtDecimals = 6;
 
-    // await client.initialize({
-    //   signer,
-    //   positionId,
-    //   authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
-    //   // new: true,
-    //   // marginfiAccount: new PublicKey(
-    //   //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
-    //   // ),
-    //   // marginfiGroup: new PublicKey("G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"),
-    //   // supplyMint: new PublicKey("3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump"),
-    //   // debtMint: new PublicKey(USDC),
-    // });
-
-    console.log(await getJupTokenPrices([new PublicKey(HMTR)]));
+    await client.initialize({
+      signer,
+      positionId,
+      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
+      // new: true,
+      // marginfiAccount: new PublicKey(
+      //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
+      // ),
+      // marginfiGroup: new PublicKey("G1rt3EpQ43K3bY457rhukQGRAo2QxydFAGRKqnjKzyr5"),
+      // supplyMint: new PublicKey("3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump"),
+      // debtMint: new PublicKey(USDC),
+    });
+
+    // console.log(await getJupTokenPrices([new PublicKey(HMTR)]));
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {
@@ -220,18 +220,19 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    // const temp = (statuses: TransactionManagerStatuses) =>
-    //   console.log(statuses);
+    const temp = (statuses: TransactionManagerStatuses) =>
+      console.log(statuses);
 
-    // const statuses = await new TransactionsManager(
-    //   client,
-    //   // temp,
-    //   undefined,
-    //   !payForTransactions ? "only-simulate" : "normal",
-    //   PriorityFeeSetting.Low,
-    //   true
-    // ).clientSend(transactionItems);
+    const statuses = await new TransactionsManager(
+      client,
+      temp,
+      !payForTransactions ? "only-simulate" : "normal",
+      PriorityFeeSetting.Low,
+      true,
+      undefined,
+      0
+    ).clientSend(transactionItems);
 
-    // console.log(statuses);
+    console.log(statuses);
   });
 });