@haven-fi/solauto-sdk 1.0.623 → 1.0.625

package/dist/services/solauto/solautoClient.js

@@ -6,18 +6,15 @@ const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const generated_1 = require("../../generated");
-const accountUtils_1 = require("../../utils/accountUtils");
-const generalAccounts_1 = require("../../constants/generalAccounts");
-const solanaUtils_1 = require("../../utils/solanaUtils");
-const solautoConstants_1 = require("../../constants/solautoConstants");
-const solautoUtils_1 = require("../../utils/solautoUtils");
+const utils_1 = require("../../utils");
+const constants_1 = require("../../constants");
 const referralStateManager_1 = require("./referralStateManager");
 const solautoPosition_1 = require("../../solautoPosition");
-const flProviderAggregator_1 = require("../flashLoans/flProviderAggregator");
+const flashLoans_1 = require("../flashLoans");
 class SolautoClient extends referralStateManager_1.ReferralStateManager {
     constructor() {
         super(...arguments);
-        this.contextUpdates = new solautoUtils_1.ContextUpdates();
+        this.contextUpdates = new utils_1.ContextUpdates();
     }
     async initialize(args) {
         await super.initialize(args);
@@ -27,7 +24,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             (!args.supplyMint || !args.debtMint || !args.lpUserAccount)) {
             throw new Error("Self managed position is missing arguments");
         }
-        const positionPk = (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId, this.programId);
+        const positionPk = (0, utils_1.getSolautoPositionAccount)(this.authority, this.positionId, this.programId);
         this.pos = await (0, solautoPosition_1.getOrCreatePositionEx)(this.umi, positionPk, {
             supplyMint: args.supplyMint,
             debtMint: args.debtMint,
@@ -35,18 +32,18 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             lpUserAccount: args.lpUserAccount,
             lendingPlatform: this.lendingPlatform,
         }, this.contextUpdates);
-        this.positionSupplyTa = (0, accountUtils_1.getTokenAccount)(this.pos.publicKey, this.pos.supplyMint());
-        this.signerSupplyTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.supplyMint());
-        this.positionDebtTa = (0, accountUtils_1.getTokenAccount)(this.pos.publicKey, this.pos.debtMint());
-        this.signerDebtTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.debtMint());
-        this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(generalAccounts_1.SOLAUTO_FEES_WALLET, this.pos.supplyMint());
-        this.solautoFeesDebtTa = (0, accountUtils_1.getTokenAccount)(generalAccounts_1.SOLAUTO_FEES_WALLET, this.pos.debtMint());
+        this.positionSupplyTa = (0, utils_1.getTokenAccount)(this.pos.publicKey, this.pos.supplyMint());
+        this.signerSupplyTa = (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.supplyMint());
+        this.positionDebtTa = (0, utils_1.getTokenAccount)(this.pos.publicKey, this.pos.debtMint());
+        this.signerDebtTa = (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.debtMint());
+        this.solautoFeesSupplyTa = (0, utils_1.getTokenAccount)(constants_1.SOLAUTO_FEES_WALLET, this.pos.supplyMint());
+        this.solautoFeesDebtTa = (0, utils_1.getTokenAccount)(constants_1.SOLAUTO_FEES_WALLET, this.pos.debtMint());
         this.authorityLutAddress =
             this.referralStateData?.lookupTable &&
                 !(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable).equals(web3_js_1.PublicKey.default)
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable)
                 : undefined;
-        this.flProvider = new flProviderAggregator_1.FlProviderAggregator(this.umi, this.signer, this.authority, this.pos.supplyMint(), this.pos.debtMint());
+        this.flProvider = new flashLoans_1.FlProviderAggregator(this.umi, this.signer, this.authority, this.pos.supplyMint(), this.pos.debtMint(), this.lpEnv);
         await this.flProvider.initialize();
         this.otherSigners.push(...this.flProvider.otherSigners());
         this.log("Position state: ", this.pos.state());
@@ -57,13 +54,13 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
     }
     referredBySupplyTa() {
         if (this.referredByState !== undefined) {
-            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.pos.supplyMint());
+            return (0, utils_1.getTokenAccount)(this.referredByState, this.pos.supplyMint());
         }
         return undefined;
     }
     referredByDebtTa() {
         if (this.referredByState !== undefined) {
-            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.pos.debtMint());
+            return (0, utils_1.getTokenAccount)(this.referredByState, this.pos.debtMint());
         }
         return undefined;
     }
@@ -87,7 +84,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
     }
     defaultLookupTables() {
         return [
-            solautoConstants_1.SOLAUTO_LUT,
+            constants_1.SOLAUTO_LUT,
             ...(this.authorityLutAddress
                 ? [this.authorityLutAddress.toString()]
                 : []),
@@ -137,7 +134,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             });
             this.authorityLutAddress = lookupTableAddress;
             tx = tx
-                .add((0, solanaUtils_1.getWrappedInstruction)(this.signer, createLookupTableInst))
+                .add((0, utils_1.getWrappedInstruction)(this.signer, createLookupTableInst))
                 .add(this.updateReferralStatesIx(undefined, this.authorityLutAddress));
         }
         const accountsToAdd = this.lutAccountsToAdd().filter((x) => !existingLutAccounts
@@ -147,7 +144,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             return undefined;
         }
         tx = tx
-            .add((0, solanaUtils_1.getWrappedInstruction)(this.signer, web3_js_1.AddressLookupTableProgram.extendLookupTable({
+            .add((0, utils_1.getWrappedInstruction)(this.signer, web3_js_1.AddressLookupTableProgram.extendLookupTable({
             payer: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey),
             authority: this.authority,
             lookupTable: this.authorityLutAddress,
@@ -165,7 +162,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
     async signerBalances() {
         if (!this.signerSupplyBalance || !this.signerDebtBalance) {
             [this.signerSupplyBalance, this.signerDebtBalance] =
-                await (0, solanaUtils_1.getWalletSplBalances)(this.connection, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), [this.pos.supplyMint(), this.pos.debtMint()]);
+                await (0, utils_1.getWalletSplBalances)(this.connection, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), [this.pos.supplyMint(), this.pos.debtMint()]);
         }
         return {
             supplyBalance: this.signerSupplyBalance,
@@ -277,14 +274,14 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         let tx = (0, umi_1.transactionBuilder)();
         if (!this.selfManaged) {
             if (args.__kind === "Deposit") {
-                tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerSupplyTa, this.positionSupplyTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0])));
+                tx = tx.add((0, utils_1.splTokenTransferUmiIx)(this.signer, this.signerSupplyTa, this.positionSupplyTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0])));
             }
             else if (args.__kind === "Repay") {
                 if (args.fields[0].__kind === "Some") {
-                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0].fields[0])));
+                    tx = tx.add((0, utils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0].fields[0])));
                 }
                 else {
-                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.pos.state().debt.amountUsed.baseUnit) * 1.01))));
+                    tx = tx.add((0, utils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.pos.state().debt.amountUsed.baseUnit) * 1.01))));
                 }
             }
         }

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

@@ -1,9 +1,8 @@
-import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
-import { SolautoClient, SolautoClientArgs } from "./solautoClient";
-import { MarginfiAssetAccounts } from "../../types/accounts";
+import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
+import { MarginfiAssetAccounts, RebalanceDetails } from "../../types";
 import { DCASettingsInpArgs, LendingPlatform, RebalanceStep, SolautoActionArgs, SolautoSettingsParametersInpArgs } from "../../generated";
-import { RebalanceDetails } from "../../types";
+import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 export declare class SolautoMarginfiClient extends SolautoClient {
     lendingPlatform: LendingPlatform;
     marginfiProgram: PublicKey;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAK7D,OAAO,EACL,kBAAkB,EAClB,eAAe,EAGf,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,eAAe,EAAG,SAAS,CAAC;IAE5B,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAsExC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,IAAI,kBAAkB;IAc/B,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CAqGtB"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAKtE,OAAO,EACL,kBAAkB,EAClB,eAAe,EAGf,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAezB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,eAAe,EAAG,SAAS,CAAC;IAE5B,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA0ExC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,IAAI,kBAAkB;IAc/B,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CAiGtB"}

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"}