@haven-fi/solauto-sdk 1.0.624 → 1.0.625

package/dist/services/solauto/solautoMarginfiClient.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolautoMarginfiClient = void 0;
-const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
-const umi_1 = require("@metaplex-foundation/umi");
 const web3_js_1 = require("@solana/web3.js");
-const solautoClient_1 = require("./solautoClient");
-const marginfiAccounts_1 = require("../../constants/marginfiAccounts");
+const umi_1 = require("@metaplex-foundation/umi");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const constants_1 = require("../../constants");
 const generated_1 = require("../../generated");
-const accountUtils_1 = require("../../utils/accountUtils");
+const utils_1 = require("../../utils");
 const marginfi_sdk_1 = require("../../marginfi-sdk");
-const marginfiUtils_1 = require("../../utils/marginfiUtils");
-const solautoUtils_1 = require("../../utils/solautoUtils");
+const solautoClient_1 = require("./solautoClient");
 class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     constructor() {
         super(...arguments);
@@ -18,6 +16,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     }
     async initialize(args) {
         await super.initialize(args);
+        this.marginfiProgram = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.umi.programs.get("marginfi").publicKey);
         this.marginfiGroup = await this.pos.lendingPool();
         if (this.selfManaged) {
             this.marginfiAccount =
@@ -29,9 +28,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 this.marginfiAccount = this.pos.lpUserAccount;
             }
             else {
-                const accounts = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, this.pos.publicKey, this.marginfiGroup, false);
+                const accounts = await (0, utils_1.getAllMarginfiAccountsByAuthority)(this.umi, this.pos.publicKey, this.marginfiGroup, false);
                 const reusableAccounts = accounts.length > 0
-                    ? (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, accounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => (0, marginfiUtils_1.marginfiAccountEmpty)(x))
+                    ? (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, accounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => (0, utils_1.marginfiAccountEmpty)(x))
                     : [];
                 this.marginfiAccount =
                     reusableAccounts.length > 0
@@ -47,9 +46,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             this.otherSigners.push(this.marginfiAccount);
         }
         this.marginfiSupplyAccounts =
-            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.pos.supplyMint().toString()];
+            constants_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.pos.supplyMint().toString()];
         this.marginfiDebtAccounts =
-            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.pos.debtMint().toString()];
+            constants_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.pos.debtMint().toString()];
         // TODO: Don't dynamically pull oracle from bank until Marginfi sorts out their price oracle issues.
         // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
         //   publicKey(this.marginfiSupplyAccounts.bank),
@@ -62,7 +61,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.log("Marginfi account:", this.marginfiAccountPk.toString());
     }
     defaultLookupTables() {
-        return [marginfiAccounts_1.MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
+        return [constants_1.MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
     }
     lutAccountsToAdd() {
         return [...super.lutAccountsToAdd(), this.marginfiAccountPk];
@@ -87,7 +86,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         }
         return (0, generated_1.marginfiOpenPosition)(this.umi, {
             signer: this.signer,
-            marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
+            marginfiProgram: (0, umi_1.publicKey)(this.marginfiProgram),
             signerReferralState: (0, umi_1.publicKey)(this.referralState),
             referredByState: this.referredByState
                 ? (0, umi_1.publicKey)(this.referredByState)
@@ -129,7 +128,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     refreshIx() {
         return (0, generated_1.marginfiRefreshData)(this.umi, {
             signer: this.signer,
-            marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
+            marginfiProgram: (0, umi_1.publicKey)(this.marginfiProgram),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccount),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
@@ -229,7 +228,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         }
         return (0, generated_1.marginfiProtocolInteraction)(this.umi, {
             signer: this.signer,
-            marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
+            marginfiProgram: (0, umi_1.publicKey)(this.marginfiProgram),
             solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
@@ -257,13 +256,13 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         const needDebtAccounts = (!inputIsSupply && preSwapRebalance) ||
             (!outputIsSupply && postSwapRebalance) ||
             (!inputIsSupply && data.flashLoan !== undefined && postSwapRebalance);
-        const isFirstRebalance = (preSwapRebalance && (0, solautoUtils_1.hasFirstRebalance)(data.rebalanceType)) ||
+        const isFirstRebalance = (preSwapRebalance && (0, utils_1.hasFirstRebalance)(data.rebalanceType)) ||
             (postSwapRebalance &&
                 data.rebalanceType === generated_1.SolautoRebalanceType.FLSwapThenRebalance);
         const addAuthorityTas = this.selfManaged || data.values.tokenBalanceChange !== undefined;
         return (0, generated_1.marginfiRebalance)(this.umi, {
             signer: this.signer,
-            marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
+            marginfiProgram: (0, umi_1.publicKey)(this.marginfiProgram),
             ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
             solautoFeesTa: (0, umi_1.publicKey)(data.values.rebalanceDirection === generated_1.RebalanceDirection.Boost
                 ? this.solautoFeesSupplyTa
@@ -280,12 +279,12 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
-            intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), new web3_js_1.PublicKey(data.swapQuote.inputMint))),
+            intermediaryTa: (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), new web3_js_1.PublicKey(data.swapQuote.inputMint))),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
             supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
             authoritySupplyTa: addAuthorityTas
-                ? (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)(this.authority, this.pos.supplyMint()))
+                ? (0, umi_1.publicKey)((0, utils_1.getTokenAccount)(this.authority, this.pos.supplyMint()))
                 : undefined,
             vaultSupplyTa: needSupplyAccounts
                 ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault)
@@ -297,7 +296,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             authorityDebtTa: addAuthorityTas
-                ? (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)(this.authority, this.pos.debtMint()))
+                ? (0, umi_1.publicKey)((0, utils_1.getTokenAccount)(this.authority, this.pos.debtMint()))
                 : undefined,
             vaultDebtTa: needDebtAccounts
                 ? (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault)

package/dist/services/solauto/txHandler.d.ts

@@ -1,18 +1,20 @@
-import { Signer, Umi } from "@metaplex-foundation/umi";
 import { Connection, PublicKey } from "@solana/web3.js";
+import { Signer, Umi } from "@metaplex-foundation/umi";
 import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
+import { ProgramEnv } from "../../types";
 export interface TxHandlerProps {
     signer?: Signer;
     wallet?: WalletAdapter;
     rpcUrl: string;
     showLogs?: boolean;
     programId?: PublicKey;
-    wsEndpoint?: string;
+    lpEnv?: ProgramEnv;
 }
 export declare abstract class TxHandler {
     rpcUrl: string;
     showLogs: boolean;
     programId: PublicKey;
+    lpEnv: ProgramEnv;
     connection: Connection;
     umi: Umi;
     signer: Signer;

package/dist/services/solauto/txHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AAEzD,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,8BAAsB,SAAS;IACtB,MAAM,EAAG,MAAM,CAAC;IAChB,QAAQ,UAAS;IACjB,SAAS,YAAwB;IAEjC,UAAU,EAAG,UAAU,CAAC;IACxB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAM;gBAEvB,KAAK,EAAE,cAAc;IAiCjC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}
+{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAkB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,8BAAsB,SAAS;IACtB,MAAM,EAAG,MAAM,CAAC;IAChB,QAAQ,UAAS;IACjB,SAAS,EAAG,SAAS,CAAC;IACtB,KAAK,EAAG,UAAU,CAAC;IAEnB,UAAU,EAAG,UAAU,CAAC;IACxB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAM;gBAEvB,KAAK,EAAE,cAAc;IAgCjC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}

package/dist/services/solauto/txHandler.js

@@ -2,19 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxHandler = void 0;
 const umi_1 = require("@metaplex-foundation/umi");
+const umi_signer_wallet_adapters_1 = require("@metaplex-foundation/umi-signer-wallet-adapters");
 const utils_1 = require("../../utils");
 const constants_1 = require("../../constants");
-const umi_signer_wallet_adapters_1 = require("@metaplex-foundation/umi-signer-wallet-adapters");
 class TxHandler {
     constructor(props) {
         this.showLogs = false;
-        this.programId = constants_1.SOLAUTO_PROD_PROGRAM;
         this.otherSigners = [];
-        if (props.programId !== undefined) {
-            this.programId = props.programId;
-        }
+        this.programId = props.programId ?? constants_1.SOLAUTO_PROD_PROGRAM;
+        this.lpEnv = props.lpEnv ?? "Prod";
         this.rpcUrl = props.rpcUrl;
-        const [connection, umi] = (0, utils_1.getSolanaRpcConnection)(this.rpcUrl, this.programId, props.wsEndpoint);
+        const [connection, umi] = (0, utils_1.getSolanaRpcConnection)(this.rpcUrl, this.programId, this.lpEnv);
         this.connection = connection;
         this.umi = umi;
         if (!props.signer && !props.wallet) {

package/dist/services/swap/jupSwapManager.d.ts

@@ -1,6 +1,6 @@
+import { PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
 import { QuoteResponse } from "@jup-ag/api";
-import { PublicKey } from "@solana/web3.js";
 import { TransactionItemInputs } from "../../types";
 export interface SwapInput {
     inputMint: PublicKey;

package/dist/services/swap/jupSwapManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YAoBhD,kBAAkB;IAsChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}
+{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAUrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YAoBhD,kBAAkB;IAsChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}

package/dist/services/swap/jupSwapManager.js

@@ -2,12 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JupSwapManager = void 0;
 const umi_1 = require("@metaplex-foundation/umi");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const api_1 = require("@jup-ag/api");
-const solanaUtils_1 = require("../../utils/solanaUtils");
-const numberUtils_1 = require("../../utils/numberUtils");
-const accountUtils_1 = require("../../utils/accountUtils");
 const utils_1 = require("../../utils");
-const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 class JupSwapManager {
     constructor(signer) {
         this.signer = signer;
@@ -39,7 +36,7 @@ class JupSwapManager {
                     quoteResponse: this.jupQuote,
                     wrapAndUnwrapSol: data.wrapAndUnwrapSol ?? false,
                     useTokenLedger: !data.exactOut && !data.exactIn,
-                    destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(data.destinationWallet ??
+                    destinationTokenAccount: (0, utils_1.getTokenAccount)(data.destinationWallet ??
                         (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), data.outputMint).toString(),
                 },
             });
@@ -54,7 +51,7 @@ class JupSwapManager {
         return instructions;
     }
     priceImpactBps() {
-        return Math.round((0, numberUtils_1.toBps)(parseFloat(this.jupQuote.priceImpactPct))) + 1;
+        return Math.round((0, utils_1.toBps)(parseFloat(this.jupQuote.priceImpactPct))) + 1;
     }
     adaptSlippageToPriceImpact(slippageIncFactor) {
         const finalPriceSlippageBps = Math.round(Math.max(20, this.jupQuote.slippageBps, this.priceImpactBps()) *
@@ -63,7 +60,7 @@ class JupSwapManager {
     }
     addInAmountSlippagePadding() {
         (0, utils_1.consoleLog)("Raw inAmount:", this.jupQuote.inAmount);
-        const inc = Math.max((0, numberUtils_1.fromBps)(this.priceImpactBps()) * 1.1, (0, numberUtils_1.fromBps)(this.jupQuote.slippageBps) * 0.1);
+        const inc = Math.max((0, utils_1.fromBps)(this.priceImpactBps()) * 1.1, (0, utils_1.fromBps)(this.jupQuote.slippageBps) * 0.1);
         (0, utils_1.consoleLog)("Inc:", inc);
         this.jupQuote.inAmount = Math.round(parseInt(this.jupQuote.inAmount) +
             parseInt(this.jupQuote.inAmount) * inc).toString();
@@ -84,13 +81,13 @@ class JupSwapManager {
         return {
             jupQuote: this.jupQuote,
             lookupTableAddresses: instructions.addressLookupTableAddresses,
-            setupIx: (0, umi_1.transactionBuilder)((instructions.setupInstructions ?? []).map((ix) => (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(ix)))),
+            setupIx: (0, umi_1.transactionBuilder)((instructions.setupInstructions ?? []).map((ix) => (0, utils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(ix)))),
             swapIx: (0, umi_1.transactionBuilder)([
-                (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(instructions.swapInstruction)),
+                (0, utils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(instructions.swapInstruction)),
             ]),
             cleanupIx: (0, umi_1.transactionBuilder)(instructions.cleanupInstruction
                 ? [
-                    (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(instructions.cleanupInstruction)),
+                    (0, utils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(instructions.cleanupInstruction)),
                 ]
                 : []),
         };

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

@@ -1,7 +1,6 @@
-import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
-import { SolautoClient } from "../solauto/solautoClient";
-import { ReferralStateManager } from "..";
+import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { SolautoClient, ReferralStateManager } from "../solauto";
 import { TransactionItemInputs } from "../../types";
 export declare function rebalanceChoresBefore(client: SolautoClient, tx: TransactionBuilder, accountsGettingCreated: string[]): Promise<TransactionBuilder>;
 export declare function getTransactionChores(client: SolautoClient, tx: TransactionBuilder): Promise<[TransactionBuilder, TransactionBuilder]>;

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/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;AAsBzD,OAAO,EAAkB,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAM1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAyLpD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA6LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EA6G/B"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAgBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA4BjE,OAAO,EAAE,qBAAqB,EAAyB,MAAM,aAAa,CAAC;AAuL3E,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA6LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EA8G/B"}

package/dist/services/transactions/transactionUtils.js

@@ -4,20 +4,16 @@ exports.rebalanceChoresBefore = rebalanceChoresBefore;
 exports.getTransactionChores = getTransactionChores;
 exports.convertReferralFeesToDestination = convertReferralFeesToDestination;
 exports.getErrorInfo = getErrorInfo;
-const umi_1 = require("@metaplex-foundation/umi");
-const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const umi_1 = require("@metaplex-foundation/umi");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const generated_1 = require("../../generated");
-const solanaUtils_1 = require("../../utils/solanaUtils");
-const generalUtils_1 = require("../../utils/generalUtils");
-const numberUtils_1 = require("../../utils/numberUtils");
-const accountUtils_1 = require("../../utils/accountUtils");
+const utils_1 = require("../../utils");
 const marginfi_sdk_1 = require("../../marginfi-sdk");
-const __1 = require("..");
+const swap_1 = require("../swap");
 const jupiter_sdk_1 = require("../../jupiter-sdk");
-const utils_1 = require("../../utils");
-const transactions_1 = require("../../types/transactions");
+const types_1 = require("../../types");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
     const supplyIsWsol = client.pos.supplyMint().equals(spl_token_1.NATIVE_MINT);
     const debtIsWsol = client.pos.debtMint().equals(spl_token_1.NATIVE_MINT);
@@ -57,7 +53,7 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
     }
     if (client.selfManaged) {
         if ((0, utils_1.isMarginfiClient)(client) &&
-            !(await (0, generalUtils_1.getSolanaAccountCreated)(client.umi, client.marginfiAccountPk))) {
+            !(await (0, utils_1.getSolanaAccountCreated)(client.umi, client.marginfiAccountPk))) {
             chores = chores.add(client.marginfiAccountInitialize(client.marginfiAccount));
         }
         // TODO: PF
@@ -67,9 +63,9 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
     }
     const wSolUsage = getWSolUsage(client, solautoActions, initiatingDcaIn, undefined);
     if (wSolUsage !== undefined) {
-        if (await (0, generalUtils_1.getSolanaAccountCreated)(client.umi, wSolUsage.wSolTokenAccount)) {
+        if (await (0, utils_1.getSolanaAccountCreated)(client.umi, wSolUsage.wSolTokenAccount)) {
             client.log(`Closing signer wSol TA`);
-            chores = chores.add((0, solanaUtils_1.closeTokenAccountUmiIx)(client.signer, wSolUsage.wSolTokenAccount, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey)));
+            chores = chores.add((0, utils_1.closeTokenAccountUmiIx)(client.signer, wSolUsage.wSolTokenAccount, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey)));
         }
         let amountToTransfer = BigInt(0);
         if (wSolUsage.solautoAction &&
@@ -88,10 +84,10 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
             const amount = amountToTransfer +
                 (await client.umi.rpc.getRent(spl_token_1.ACCOUNT_SIZE)).basisPoints;
             client.log(`Transferring ${amount} lamports to signer wSol TA`);
-            chores = chores.add((0, solanaUtils_1.systemTransferUmiIx)(client.signer, wSolUsage.wSolTokenAccount, amount));
+            chores = chores.add((0, utils_1.systemTransferUmiIx)(client.signer, wSolUsage.wSolTokenAccount, amount));
         }
         client.log("Creating signer wSol TA");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), spl_token_1.NATIVE_MINT));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), spl_token_1.NATIVE_MINT));
         accountsGettingCreated.push(wSolUsage.wSolTokenAccount.toString());
     }
     for (const solautoAction of solautoActions ?? []) {
@@ -105,8 +101,8 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
         if (accountsGettingCreated.includes(tokenAccount.toString())) {
             continue;
         }
-        if (!(0, generalUtils_1.getSolanaAccountCreated)(client.umi, tokenAccount)) {
-            chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), (0, generated_1.isSolautoAction)("Withdraw", solautoAction)
+        if (!(0, utils_1.getSolanaAccountCreated)(client.umi, tokenAccount)) {
+            chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), (0, generated_1.isSolautoAction)("Withdraw", solautoAction)
                 ? client.pos.supplyMint()
                 : client.pos.debtMint()));
             accountsGettingCreated.push(tokenAccount.toString());
@@ -136,26 +132,26 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     ];
     const [referredBySupplyTa, referredByDebtTa, signerSupplyTa, signerDebtTa] = await client.umi.rpc.getAccounts(accountsNeeded.map((x) => (0, umi_1.publicKey)(x ?? web3_js_1.PublicKey.default)));
     let chores = (0, umi_1.transactionBuilder)();
-    if (checkReferralSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(referredBySupplyTa)) {
+    if (checkReferralSupplyTa && !(0, utils_1.rpcAccountCreated)(referredBySupplyTa)) {
         client.log("Creating referred-by supply TA");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.supplyMint()));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.supplyMint()));
     }
-    if (checkReferralDebtTa && !(0, generalUtils_1.rpcAccountCreated)(referredByDebtTa)) {
+    if (checkReferralDebtTa && !(0, utils_1.rpcAccountCreated)(referredByDebtTa)) {
         client.log("Creating referred-by debt TA");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.debtMint()));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.debtMint()));
     }
     if (checkSignerSupplyTa &&
-        !(0, generalUtils_1.rpcAccountCreated)(signerSupplyTa) &&
+        !(0, utils_1.rpcAccountCreated)(signerSupplyTa) &&
         !accountsGettingCreated.includes(signerSupplyTa.publicKey.toString())) {
         client.log("Creating signer supply token account");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.supplyMint()));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.supplyMint()));
         accountsGettingCreated.push(signerSupplyTa.publicKey.toString());
     }
     if (checkSignerDebtTa &&
-        !(0, generalUtils_1.rpcAccountCreated)(signerDebtTa) &&
+        !(0, utils_1.rpcAccountCreated)(signerDebtTa) &&
         !accountsGettingCreated.includes(signerDebtTa.publicKey.toString())) {
         client.log("Creating signer debt token account");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.debtMint()));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.debtMint()));
         accountsGettingCreated.push(signerDebtTa.publicKey.toString());
     }
     return chores;
@@ -164,7 +160,7 @@ function transactionChoresAfter(client, solautoActions, cancellingDcaIn) {
     let chores = (0, umi_1.transactionBuilder)();
     const wSolUsage = getWSolUsage(client, solautoActions, undefined, cancellingDcaIn);
     if (wSolUsage) {
-        chores = chores.add((0, solanaUtils_1.closeTokenAccountUmiIx)(client.signer, wSolUsage.wSolTokenAccount, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey)));
+        chores = chores.add((0, utils_1.closeTokenAccountUmiIx)(client.signer, wSolUsage.wSolTokenAccount, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey)));
     }
     return chores;
 }
@@ -208,16 +204,16 @@ function getSolautoActions(umi, tx) {
             }
             catch { }
         }
-        if (x.programId === marginfi_sdk_1.MARGINFI_PROGRAM_ID) {
+        if ((0, utils_1.isMarginfiProgram)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.programId))) {
             try {
                 const serializer = (0, marginfi_sdk_1.getLendingAccountDepositInstructionDataSerializer)();
-                const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
+                const discriminator = (0, utils_1.uint8ArrayToBigInt)(serializer
                     .serialize({
                     amount: 0,
                 })
                     .slice(0, 8));
                 const [data, _] = serializer.deserialize(x.data);
-                if ((0, numberUtils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
+                if ((0, utils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
                     discriminator) {
                     solautoActions?.push({
                         __kind: "Deposit",
@@ -228,13 +224,13 @@ function getSolautoActions(umi, tx) {
             catch { }
             try {
                 const serializer = (0, marginfi_sdk_1.getLendingAccountBorrowInstructionDataSerializer)();
-                const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
+                const discriminator = (0, utils_1.uint8ArrayToBigInt)(serializer
                     .serialize({
                     amount: 0,
                 })
                     .slice(0, 8));
                 const [data, _] = serializer.deserialize(x.data);
-                if ((0, numberUtils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
+                if ((0, utils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
                     discriminator) {
                     solautoActions?.push({
                         __kind: "Borrow",
@@ -245,14 +241,14 @@ function getSolautoActions(umi, tx) {
             catch { }
             try {
                 const serializer = (0, marginfi_sdk_1.getLendingAccountWithdrawInstructionDataSerializer)();
-                const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
+                const discriminator = (0, utils_1.uint8ArrayToBigInt)(serializer
                     .serialize({
                     amount: 0,
                     withdrawAll: false,
                 })
                     .slice(0, 8));
                 const [data, _] = serializer.deserialize(x.data);
-                if ((0, numberUtils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
+                if ((0, utils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
                     discriminator) {
                     solautoActions?.push({
                         __kind: "Withdraw",
@@ -272,14 +268,14 @@ function getSolautoActions(umi, tx) {
             catch { }
             try {
                 const serializer = (0, marginfi_sdk_1.getLendingAccountRepayInstructionDataSerializer)();
-                const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
+                const discriminator = (0, utils_1.uint8ArrayToBigInt)(serializer
                     .serialize({
                     amount: 0,
                     repayAll: false,
                 })
                     .slice(0, 8));
                 const [data, _] = serializer.deserialize(x.data);
-                if ((0, numberUtils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
+                if ((0, utils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
                     discriminator) {
                     solautoActions?.push({
                         __kind: "Repay",
@@ -315,11 +311,11 @@ async function getTransactionChores(client, tx) {
     return [choresBefore, choresAfter];
 }
 async function convertReferralFeesToDestination(referralManager, tokenAccount, destinationMint) {
-    const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(referralManager.umi, tokenAccount);
+    const tokenAccountData = await (0, utils_1.getTokenAccountData)(referralManager.umi, tokenAccount);
     if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
         return undefined;
     }
-    const jupSwapManager = new __1.JupSwapManager(referralManager.umi.identity);
+    const jupSwapManager = new swap_1.JupSwapManager(referralManager.umi.identity);
     const { lookupTableAddresses, setupIx, swapIx, cleanupIx } = await jupSwapManager.getJupSwapTxData({
         amount: tokenAccountData.amount,
         destinationWallet: referralManager.referralState,
@@ -332,7 +328,7 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
         .add(setupIx)
         .add((0, generated_1.convertReferralFees)(referralManager.umi, {
         signer: referralManager.signer,
-        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralManager.umi.identity.publicKey), tokenAccountData.mint)),
+        intermediaryTa: (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralManager.umi.identity.publicKey), tokenAccountData.mint)),
         ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
         referralState: (0, umi_1.publicKey)(referralManager.referralState),
         referralFeesTa: (0, umi_1.publicKey)(tokenAccount),
@@ -350,7 +346,7 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
     let errName;
     const computeIxs = simulationSuccessful ? 2 : 1; // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
     try {
-        if (error instanceof transactions_1.BundleSimulationError) {
+        if (error instanceof types_1.BundleSimulationError) {
             errTxIdx = error.details.transactionIdx;
             errIxIdx = error.details.instructionIdx - computeIxs;
             errCode = error.details.errorCode;
@@ -365,7 +361,7 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
                     : undefined;
             errName = errCode === undefined ? err[1] : undefined;
         }
-        (0, generalUtils_1.consoleLog)("Transaction instructions:", txs.map((x) => x
+        (0, utils_1.consoleLog)("Transaction instructions:", txs.map((x) => x
             .getInstructions()
             .map((y) => y.programId.toString())
             .join(",")));
@@ -374,10 +370,10 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
         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());
+        (0, utils_1.consoleLog)("Error transaction index:", errTxIdx);
+        (0, utils_1.consoleLog)("Error instruction index:", errIxIdx);
+        (0, utils_1.consoleLog)("Error code:", errCode);
+        (0, utils_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 !== undefined &&
@@ -391,7 +387,8 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
             }
         }
         else if (errCode !== undefined &&
-            errIx?.programId === marginfi_sdk_1.MARGINFI_PROGRAM_ID) {
+            errIx &&
+            (0, utils_1.isMarginfiProgram)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(errIx.programId))) {
             programName = "Marginfi";
             programError = marginfiError;
         }
@@ -410,13 +407,13 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
         }
     }
     catch (e) {
-        (0, generalUtils_1.consoleLog)(e);
+        (0, utils_1.consoleLog)(e);
     }
     const errData = {
         errorName,
         errorInfo,
         canBeIgnored,
     };
-    (0, generalUtils_1.consoleLog)(errData);
+    (0, utils_1.consoleLog)(errData);
     return errData;
 }

package/dist/services/transactions/transactionsManager.d.ts

@@ -1,8 +1,7 @@
 import { TransactionBuilder } from "@metaplex-foundation/umi";
-import { SolautoClient } from "../solauto/solautoClient";
-import { ErrorsToThrow } from "../../utils/generalUtils";
 import { PriorityFeeSetting, TransactionItemInputs, TransactionRunType } from "../../types";
-import { ReferralStateManager } from "..";
+import { ErrorsToThrow } from "../../utils";
+import { SolautoClient, ReferralStateManager } from "../solauto";
 export declare class TransactionTooLargeError extends Error {
     constructor(message: string);
 }

package/dist/services/transactions/transactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAa,MAAM,IAAI,CAAC;AAarD,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAOhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAwGD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAmBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA4I7B,qBAAqB;YAgDrB,eAAe;YA0Df,eAAe;CA4D9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionsManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAMrB,OAAO,EAEL,aAAa,EAQd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAM5E,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAOhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAwGD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAc,EAC1B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAmBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA4I7B,qBAAqB;YAgDrB,eAAe;YA0Df,eAAe;CA4D9B"}