@haven-fi/solauto-sdk 1.0.587 → 1.0.589

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -20,12 +20,12 @@ class RebalanceSwapManager {
         return Math.abs(this.values.debtAdjustmentUsd);
     }
     postRebalanceLiqUtilizationRateBps(swapOutputAmount) {
-        let supplyUsd = this.client.solautoPosition.supplyUsd();
+        let supplyUsd = this.client.pos.supplyUsd();
         // TODO: add token balance change
-        let debtUsd = this.client.solautoPosition.debtUsd();
+        let debtUsd = this.client.pos.debtUsd();
         const outputToken = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.isBoost()
-            ? this.client.solautoPosition.state().supply.mint
-            : this.client.solautoPosition.state().debt.mint);
+            ? this.client.pos.state().supply.mint
+            : this.client.pos.state().debt.mint);
         const swapOutputUsd = swapOutputAmount
             ? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)(outputToken).decimals) *
                 ((0, utils_1.safeGetPrice)(outputToken) ?? 0)
@@ -36,7 +36,7 @@ class RebalanceSwapManager {
         debtUsd = this.isBoost()
             ? debtUsd + this.usdToSwap()
             : debtUsd - swapOutputUsd;
-        return (0, utils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, this.client.solautoPosition.state().liqThresholdBps ?? 0);
+        return (0, utils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, this.client.pos.state().liqThresholdBps ?? 0);
     }
     async findSufficientQuote(swapInput, criteria) {
         let swapQuote;
@@ -63,11 +63,11 @@ class RebalanceSwapManager {
     }
     swapDetails() {
         const input = this.isBoost()
-            ? this.client.solautoPosition.state().debt
-            : this.client.solautoPosition.state().supply;
+            ? this.client.pos.state().debt
+            : this.client.pos.state().supply;
         const output = this.isBoost()
-            ? this.client.solautoPosition.state().supply
-            : this.client.solautoPosition.state().debt;
+            ? this.client.pos.state().supply
+            : this.client.pos.state().debt;
         let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(input.mint), input.decimals);
         return {
             input,
@@ -112,7 +112,7 @@ class RebalanceSwapManager {
             this.swapQuote = await this.findSufficientQuote(swapInput, {
                 minOutputAmount: rebalanceToZero ? outputAmount : undefined,
                 maxLiqUtilizationRateBps: this.values.repayingCloseToMaxLtv
-                    ? (0, utils_1.maxRepayToBps)(this.client.solautoPosition.state().maxLtvBps ?? 0, this.client.solautoPosition.state().liqThresholdBps ?? 0) - 15
+                    ? (0, utils_1.maxRepayToBps)(this.client.pos.state().maxLtvBps ?? 0, this.client.pos.state().liqThresholdBps ?? 0) - 15
                     : undefined,
             });
         }
@@ -127,7 +127,7 @@ class RebalanceSwapManager {
             ...swapInput,
             destinationWallet: flashLoanRepayFromDebt
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.client.signer.publicKey)
-                : this.client.solautoPosition.publicKey,
+                : this.client.pos.publicKey,
             slippageIncFactor: 0.2 + attemptNum * 0.25,
         };
     }

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -15,12 +15,12 @@ class RebalanceTxBuilder {
         this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
     }
     async shouldProceedWithRebalance() {
-        return (this.client.solautoPosition.supplyUsd() > 0 &&
+        return (this.client.pos.supplyUsd() > 0 &&
             (this.targetLiqUtilizationRateBps !== undefined ||
-                this.client.solautoPosition.eligibleForRebalance()));
+                this.client.pos.eligibleForRebalance()));
     }
     getRebalanceValues(flFee) {
-        return (0, rebalanceValues_1.getRebalanceValues)(this.client.solautoPosition, new solautoFees_1.SolautoFeesBps(this.client.isReferred(), this.targetLiqUtilizationRateBps, this.client.solautoPosition.netWorthUsd()), flFee ?? 0, this.targetLiqUtilizationRateBps);
+        return (0, rebalanceValues_1.getRebalanceValues)(this.client.pos, new solautoFees_1.SolautoFeesBps(this.client.isReferred(), this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd()), flFee ?? 0, this.targetLiqUtilizationRateBps);
     }
     getFlLiquiditySource(supplyLiquidityAvailable, debtLiquidityAvailable) {
         const debtAdjustmentUsd = Math.abs(this.values.debtAdjustmentUsd);
@@ -30,8 +30,8 @@ class RebalanceTxBuilder {
                     ((0, utils_1.safeGetPrice)(tokenMint) ?? 0) *
                     0.95);
         };
-        const insufficientSupplyLiquidity = insufficientLiquidity(debtAdjustmentUsd, supplyLiquidityAvailable, this.client.solautoPosition.supplyMint());
-        const insufficientDebtLiquidity = insufficientLiquidity(debtAdjustmentUsd, debtLiquidityAvailable, this.client.solautoPosition.debtMint());
+        const insufficientSupplyLiquidity = insufficientLiquidity(debtAdjustmentUsd, supplyLiquidityAvailable, this.client.pos.supplyMint());
+        const insufficientDebtLiquidity = insufficientLiquidity(debtAdjustmentUsd, debtLiquidityAvailable, this.client.pos.debtMint());
         let useDebtLiquidity = this.values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
             insufficientSupplyLiquidity;
         if (useDebtLiquidity) {
@@ -42,7 +42,7 @@ class RebalanceTxBuilder {
         }
     }
     async flashLoanRequirements(attemptNum) {
-        const maxLtvRateBps = (0, utils_1.getMaxLiqUtilizationRateBps)(this.client.solautoPosition.state().maxLtvBps, this.client.solautoPosition.state().liqThresholdBps, 0.02);
+        const maxLtvRateBps = (0, utils_1.getMaxLiqUtilizationRateBps)(this.client.pos.state().maxLtvBps, this.client.pos.state().liqThresholdBps, 0.02);
         if (this.values.intermediaryLiqUtilizationRateBps < maxLtvRateBps) {
             return undefined;
         }
@@ -75,10 +75,10 @@ class RebalanceTxBuilder {
         const useDebtLiquidity = this.flRequirements.liquiditySource === generated_1.TokenType.Debt;
         let flashLoanToken = undefined;
         if (boosting || useDebtLiquidity) {
-            flashLoanToken = this.client.solautoPosition.state().debt;
+            flashLoanToken = this.client.pos.state().debt;
         }
         else {
-            flashLoanToken = this.client.solautoPosition.state().supply;
+            flashLoanToken = this.client.pos.state().supply;
         }
         return {
             ...this.flRequirements,
@@ -129,11 +129,11 @@ class RebalanceTxBuilder {
         if (this.client.selfManaged ||
             this.client.contextUpdates.supplyAdjustment > BigInt(0) ||
             this.client.contextUpdates.debtAdjustment > BigInt(0) ||
-            !this.client.solautoPosition.exists()) {
+            !this.client.pos.exists()) {
             return false;
         }
         // Rebalance ix will already refresh internally if position is self managed
-        const utilizationRateDiff = Math.abs(await this.client.solautoPosition.utilizationRateBpsDrift());
+        const utilizationRateDiff = Math.abs(await this.client.pos.utilizationRateBpsDrift());
         (0, utils_1.consoleLog)("Liq utilization rate diff:", utilizationRateDiff);
         if (utilizationRateDiff >= 10) {
             (0, utils_1.consoleLog)("Refreshing before rebalance");
@@ -169,7 +169,7 @@ class RebalanceTxBuilder {
             const addFirstRebalance = (0, utils_1.hasFirstRebalance)(this.rebalanceType);
             const addLastRebalance = (0, utils_1.hasLastRebalance)(this.rebalanceType);
             const flashBorrowDest = exactOut
-                ? (0, utils_1.getTokenAccount)(this.client.solautoPosition.publicKey, new web3_js_1.PublicKey(swapQuote.outputMint))
+                ? (0, utils_1.getTokenAccount)(this.client.pos.publicKey, new web3_js_1.PublicKey(swapQuote.outputMint))
                 : (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.client.signer.publicKey), new web3_js_1.PublicKey(swapQuote.inputMint));
             tx = tx.add([
                 setupInstructions,
@@ -186,7 +186,7 @@ class RebalanceTxBuilder {
         };
     }
     async buildRebalanceTx(attemptNum) {
-        await this.client.solautoPosition.refreshPositionState();
+        await this.client.pos.refreshPositionState();
         if (!this.shouldProceedWithRebalance()) {
             this.client.log("Not eligible for a rebalance");
             return undefined;

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

@@ -20,7 +20,7 @@ export declare abstract class SolautoClient extends ReferralStateManager {
     authority: PublicKey;
     positionId: number;
     selfManaged: boolean;
-    solautoPosition: SolautoPositionEx;
+    pos: SolautoPositionEx;
     positionSupplyTa: PublicKey;
     signerSupplyTa: PublicKey;
     positionDebtTa: PublicKey;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAEL,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,eAAe,EAAG,iBAAiB,CAAC;IAEpC,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA8ExC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAU3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAUnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAmB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAmBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA2DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IA8CF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAwFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAEL,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA8ExC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAmBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA2DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IA8CF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAsFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}

package/dist/services/solauto/solautoClient.js

@@ -28,55 +28,54 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             throw new Error("Self managed position is missing arguments");
         }
         const positionPk = (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId, this.programId);
-        this.solautoPosition = await (0, solautoPosition_1.getOrCreatePositionEx)(this.umi, positionPk, {
+        this.pos = await (0, solautoPosition_1.getOrCreatePositionEx)(this.umi, positionPk, {
             supplyMint: args.supplyMint,
             debtMint: args.debtMint,
             lpUserAccount: args.lpUserAccount,
             lendingPlatform: this.lendingPlatform,
         }, this.contextUpdates);
-        this.positionSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition.publicKey, this.solautoPosition.supplyMint());
-        this.signerSupplyTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.solautoPosition.supplyMint());
-        this.positionDebtTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition.publicKey, this.solautoPosition.debtMint());
-        this.signerDebtTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.solautoPosition.debtMint());
-        this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(generalAccounts_1.SOLAUTO_FEES_WALLET, this.solautoPosition.supplyMint());
-        this.solautoFeesDebtTa = (0, accountUtils_1.getTokenAccount)(generalAccounts_1.SOLAUTO_FEES_WALLET, this.solautoPosition.debtMint());
+        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.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.solautoPosition.supplyMint(), this.solautoPosition.debtMint());
+        this.flProvider = new flProviderAggregator_1.FlProviderAggregator(this.umi, this.signer, this.pos.supplyMint(), this.pos.debtMint());
         await this.flProvider.initialize();
         this.otherSigners.push(...this.flProvider.otherSigners());
-        this.log("Position state: ", this.solautoPosition.state());
-        this.log("Position settings: ", this.solautoPosition.settings());
-        this.log("Position DCA: ", this.solautoPosition.dca());
+        this.log("Position state: ", this.pos.state());
+        this.log("Position settings: ", this.pos.settings());
+        this.log("Position DCA: ", this.pos.dca());
     }
     referredBySupplyTa() {
         if (this.referredByState !== undefined) {
-            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.solautoPosition.supplyMint());
+            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.pos.supplyMint());
         }
         return undefined;
     }
     referredByDebtTa() {
         if (this.referredByState !== undefined) {
-            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.solautoPosition.debtMint());
+            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.pos.debtMint());
         }
         return undefined;
     }
     async resetLiveTxUpdates(success) {
         this.log("Resetting context updates...");
         if (success) {
-            if (!this.solautoPosition.exists()) {
-                await this.solautoPosition.refetchPositionData();
+            if (!this.pos.exists()) {
+                await this.pos.refetchPositionData();
             }
             else {
                 if (this.contextUpdates.settings) {
-                    this.solautoPosition.data().position.settings =
-                        this.contextUpdates.settings;
+                    this.pos.data().position.settings = this.contextUpdates.settings;
                 }
                 if (this.contextUpdates.dca) {
-                    this.solautoPosition.data().position.dca = this.contextUpdates.dca;
+                    this.pos.data().position.dca = this.contextUpdates.dca;
                 }
                 // All other live position updates can be derived by getting a fresh position state, so we don't need to do anything else form contextUpdates
             }
@@ -100,7 +99,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             ...((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey).equals(this.authority)
                 ? [this.signerDebtTa]
                 : []),
-            this.solautoPosition.publicKey,
+            this.pos.publicKey,
             this.positionSupplyTa,
             this.positionDebtTa,
             this.referralState,
@@ -170,7 +169,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             (async () => {
                 let data;
                 try {
-                    data = await this.connection.getTokenAccountBalance((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.solautoPosition.supplyMint()), "confirmed");
+                    data = await this.connection.getTokenAccountBalance((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.supplyMint()), "confirmed");
                 }
                 catch { }
                 return BigInt(parseInt(data?.value.amount ?? "0"));
@@ -178,7 +177,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             (async () => {
                 let data;
                 try {
-                    const data = await this.connection.getTokenAccountBalance((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.solautoPosition.debtMint()), "confirmed");
+                    const data = await this.connection.getTokenAccountBalance((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.debtMint()), "confirmed");
                 }
                 catch { }
                 return BigInt(parseInt(data?.value.amount ?? "0"));
@@ -219,12 +218,12 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         let signerDcaTa = undefined;
         if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
             if (args.dca.value.tokenType === generated_1.TokenType.Supply) {
-                dcaMint = (0, umi_1.publicKey)(this.solautoPosition.supplyMint());
+                dcaMint = (0, umi_1.publicKey)(this.pos.supplyMint());
                 positionDcaTa = (0, umi_1.publicKey)(this.positionSupplyTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerSupplyTa);
             }
             else {
-                dcaMint = (0, umi_1.publicKey)(this.solautoPosition.debtMint());
+                dcaMint = (0, umi_1.publicKey)(this.pos.debtMint());
                 positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
             }
@@ -254,7 +253,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         }
         return (0, generated_1.updatePosition)(this.umi, {
             signer: this.signer,
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             dcaMint,
             positionDcaTa,
             signerDcaTa,
@@ -265,26 +264,26 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         let dcaMint = undefined;
         let positionDcaTa = undefined;
         let signerDcaTa = undefined;
-        const currDca = this.solautoPosition.dca();
+        const currDca = this.pos.dca();
         if (currDca.dcaInBaseUnit > 0) {
             if (currDca.tokenType === generated_1.TokenType.Supply) {
-                dcaMint = (0, umi_1.publicKey)(this.solautoPosition.supplyMint());
+                dcaMint = (0, umi_1.publicKey)(this.pos.supplyMint());
                 positionDcaTa = (0, umi_1.publicKey)(this.positionSupplyTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerSupplyTa);
             }
             else {
-                dcaMint = (0, umi_1.publicKey)(this.solautoPosition.debtMint());
+                dcaMint = (0, umi_1.publicKey)(this.pos.debtMint());
                 positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
             }
             this.contextUpdates.new({
                 type: "cancellingDca",
-                value: this.solautoPosition.dca().tokenType,
+                value: this.pos.dca().tokenType,
             });
         }
         return (0, generated_1.cancelDCA)(this.umi, {
             signer: this.signer,
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             dcaMint,
             positionDcaTa,
             signerDcaTa,
@@ -301,7 +300,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                     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])));
                 }
                 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.solautoPosition.state().debt.amountUsed.baseUnit) * 1.01))));
+                    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))));
                 }
             }
         }
@@ -321,8 +320,8 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             else {
                 this.contextUpdates.new({
                     type: "supply",
-                    value: (this.solautoPosition.state().supply.amountUsed.baseUnit ??
-                        BigInt(0)) * BigInt(-1),
+                    value: (this.pos.state().supply.amountUsed.baseUnit ?? BigInt(0)) *
+                        BigInt(-1),
                 });
             }
         }
@@ -342,8 +341,8 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             else {
                 this.contextUpdates.new({
                     type: "debt",
-                    value: (this.solautoPosition.state().debt.amountUsed.baseUnit ??
-                        BigInt(0)) * BigInt(-1),
+                    value: (this.pos.state().debt.amountUsed.baseUnit ?? BigInt(0)) *
+                        BigInt(-1),
                 });
             }
         }

package/dist/services/solauto/solautoMarginfiClient.js

@@ -18,18 +18,18 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     }
     async initialize(args) {
         await super.initialize(args);
-        this.marginfiGroup = await this.solautoPosition.lendingPool();
+        this.marginfiGroup = await this.pos.lendingPool();
         if (this.selfManaged) {
             this.marginfiAccount =
                 args.marginfiAccount ??
                     (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
         }
         else {
-            if (this.solautoPosition.exists()) {
-                this.marginfiAccount = this.solautoPosition.lpUserAccount;
+            if (this.pos.exists()) {
+                this.marginfiAccount = this.pos.lpUserAccount;
             }
             else {
-                const accounts = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, this.solautoPosition.publicKey, this.marginfiGroup, false);
+                const accounts = await (0, marginfiUtils_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))
                     : [];
@@ -47,9 +47,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             this.otherSigners.push(this.marginfiAccount);
         }
         this.marginfiSupplyAccounts =
-            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.solautoPosition.supplyMint().toString()];
+            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.pos.supplyMint().toString()];
         this.marginfiDebtAccounts =
-            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.solautoPosition.debtMint().toString()];
+            marginfiAccounts_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),
@@ -95,15 +95,15 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             referredBySupplyTa: this.referredBySupplyTa()
                 ? (0, umi_1.publicKey)(this.referredBySupplyTa())
                 : undefined,
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: "publicKey" in this.marginfiAccount
                 ? this.marginfiAccount
                 : (0, umi_1.publicKey)(this.marginfiAccount),
-            supplyMint: (0, umi_1.publicKey)(this.solautoPosition.supplyMint()),
+            supplyMint: (0, umi_1.publicKey)(this.pos.supplyMint()),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
-            debtMint: (0, umi_1.publicKey)(this.solautoPosition.debtMint()),
+            debtMint: (0, umi_1.publicKey)(this.pos.debtMint()),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             signerDebtTa: signerDebtTa,
@@ -118,7 +118,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     closePositionIx() {
         return (0, generated_1.closePosition)(this.umi, {
             signer: this.signer,
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             signerSupplyTa: (0, umi_1.publicKey)(this.signerSupplyTa),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
@@ -136,7 +136,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
         });
     }
     protocolInteractionIx(args) {
@@ -230,7 +230,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),
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
@@ -247,8 +247,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         });
     }
     rebalanceIx(rebalanceStep, data) {
-        const inputIsSupply = new web3_js_1.PublicKey(data.swapQuote.inputMint).equals(this.solautoPosition.supplyMint());
-        const outputIsSupply = new web3_js_1.PublicKey(data.swapQuote.outputMint).equals(this.solautoPosition.supplyMint());
+        const inputIsSupply = new web3_js_1.PublicKey(data.swapQuote.inputMint).equals(this.pos.supplyMint());
+        const outputIsSupply = new web3_js_1.PublicKey(data.swapQuote.outputMint).equals(this.pos.supplyMint());
         const preSwapRebalance = rebalanceStep === generated_1.RebalanceStep.PreSwap;
         const postSwapRebalance = rebalanceStep === generated_1.RebalanceStep.PostSwap;
         const needSupplyAccounts = (inputIsSupply && preSwapRebalance) ||
@@ -277,7 +277,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             positionAuthority: data.values.tokenBalanceChange !== undefined
                 ? (0, umi_1.publicKey)(this.authority)
                 : undefined,
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            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))),
@@ -285,7 +285,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             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.solautoPosition.supplyMint()))
+                ? (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)(this.authority, this.pos.supplyMint()))
                 : undefined,
             vaultSupplyTa: needSupplyAccounts
                 ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault)
@@ -297,7 +297,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.solautoPosition.debtMint()))
+                ? (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)(this.authority, this.pos.debtMint()))
                 : undefined,
             vaultDebtTa: needDebtAccounts
                 ? (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault)

package/dist/services/transactions/transactionUtils.js

@@ -19,8 +19,8 @@ const jupiter_sdk_1 = require("../../jupiter-sdk");
 const utils_1 = require("../../utils");
 const transactions_1 = require("../../types/transactions");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
-    const supplyIsWsol = client.solautoPosition.supplyMint().equals(spl_token_1.NATIVE_MINT);
-    const debtIsWsol = client.solautoPosition.debtMint().equals(spl_token_1.NATIVE_MINT);
+    const supplyIsWsol = client.pos.supplyMint().equals(spl_token_1.NATIVE_MINT);
+    const debtIsWsol = client.pos.debtMint().equals(spl_token_1.NATIVE_MINT);
     if (!supplyIsWsol && !debtIsWsol) {
         return undefined;
     }
@@ -61,7 +61,7 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
             chores = chores.add(client.marginfiAccountInitialize(client.marginfiAccount));
         }
         // TODO: PF
-        if (!client.solautoPosition.exists()) {
+        if (!client.pos.exists()) {
             chores = chores.add(client.openPositionIx());
         }
     }
@@ -107,8 +107,8 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
         }
         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)
-                ? client.solautoPosition.supplyMint()
-                : client.solautoPosition.debtMint()));
+                ? client.pos.supplyMint()
+                : client.pos.debtMint()));
             accountsGettingCreated.push(tokenAccount.toString());
         }
     }
@@ -138,24 +138,24 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     let chores = (0, umi_1.transactionBuilder)();
     if (checkReferralSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(referredBySupplyTa)) {
         client.log("Creating referred-by supply TA");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.solautoPosition.supplyMint()));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.supplyMint()));
     }
     if (checkReferralDebtTa && !(0, generalUtils_1.rpcAccountCreated)(referredByDebtTa)) {
         client.log("Creating referred-by debt TA");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.solautoPosition.debtMint()));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.debtMint()));
     }
     if (checkSignerSupplyTa &&
         !(0, generalUtils_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.solautoPosition.supplyMint()));
+        chores = chores.add((0, solanaUtils_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) &&
         !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.solautoPosition.debtMint()));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.debtMint()));
         accountsGettingCreated.push(signerDebtTa.publicKey.toString());
     }
     return chores;

package/dist/types/solauto.d.ts

@@ -9,7 +9,7 @@ export interface SolautoPositionDetails {
     positionId: number;
     positionType: PositionType;
     lendingPlatform: LendingPlatform;
-    protocolAccount?: PublicKey;
+    lpUserAccount?: PublicKey;
     supplyMint?: PublicKey;
     debtMint?: PublicKey;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,YAAY,EACZ,oBAAoB,EACpB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,wBAAwB,EAEhC,kBAAkB,EAAE,CAAC;AAE1B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,EAAE,SAAS,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,YAAY,EACZ,oBAAoB,EACpB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,wBAAwB,EAEhC,kBAAkB,EAAE,CAAC;AAE1B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,EAAE,SAAS,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC"}

package/dist/utils/marginfiUtils.d.ts

@@ -32,7 +32,7 @@ type BanksCache = {
         [mint: string]: Bank;
     };
 };
-export declare function getMarginfiAccountPositionState(umi: Umi, protocolAccount: {
+export declare function getMarginfiAccountPositionState(umi: Umi, lpUserAccount: {
     pk?: PublicKey;
     data?: MarginfiAccount | null;
 }, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, contextUpdates?: ContextUpdates): Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAIJ,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA4C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AAsDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAsBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAClE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CACN;IAAE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GACxE,SAAS,CACZ,CAyKA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAIJ,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA4C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AAsDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAsBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAChE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CACN;IAAE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GACxE,SAAS,CACZ,CAyKA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}

package/dist/utils/marginfiUtils.js

@@ -200,10 +200,10 @@ async function getBank(umi, data, marginfiGroup) {
             ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][data?.mint.toString()].bank), { commitment: "confirmed" })
             : null;
 }
-async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGroup, supply, debt, contextUpdates) {
-    let marginfiAccount = protocolAccount.data ??
-        (protocolAccount.pk
-            ? await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(protocolAccount.pk), {
+async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup, supply, debt, contextUpdates) {
+    let marginfiAccount = lpUserAccount.data ??
+        (lpUserAccount.pk
+            ? await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(lpUserAccount.pk), {
                 commitment: "confirmed",
             })
             : null);

package/dist/utils/solautoUtils.js

@@ -131,7 +131,7 @@ async function getSolautoManagedPositions(umi, authority, positionTypeFilter) {
             positionId: position.positionId[0],
             lendingPlatform: position.position.lendingPlatform,
             positionType: position.positionType,
-            protocolAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.protocolUserAccount),
+            lpUserAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.protocolUserAccount),
             supplyMint: tokens[0],
             debtMint: tokens[1],
         };
@@ -202,7 +202,7 @@ async function getAllPositionsByAuthority(umi, user, positionTypeFilter) {
                 positionId: 0,
                 positionType: generated_1.PositionType.Leverage,
                 lendingPlatform: generated_1.LendingPlatform.Marginfi,
-                protocolAccount: x.marginfiAccount,
+                lpUserAccount: x.marginfiAccount,
                 supplyMint: x.supplyMint,
                 debtMint: x.debtMint,
             }));

package/package.json

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