npm - @haven-fi/solauto-sdk - Versions diffs - 1.0.588 → 1.0.590 - Mend

@haven-fi/solauto-sdk 1.0.588 → 1.0.590

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/dist/services/rebalance/rebalanceSwapManager.js +11 -11
package/dist/services/rebalance/rebalanceTxBuilder.js +12 -12
package/dist/services/solauto/solautoClient.d.ts +1 -1
package/dist/services/solauto/solautoClient.d.ts.map +1 -1
package/dist/services/solauto/solautoClient.js +33 -34
package/dist/services/solauto/solautoMarginfiClient.js +17 -17
package/dist/services/transactions/transactionUtils.js +9 -9
package/dist/solautoPosition/solautoPositionEx.d.ts +1 -1
package/dist/solautoPosition/solautoPositionEx.d.ts.map +1 -1
package/dist/solautoPosition/solautoPositionEx.js +3 -1
package/package.json +1 -1
package/src/services/rebalance/rebalanceSwapManager.ts +12 -12
package/src/services/rebalance/rebalanceTxBuilder.ts +14 -14
package/src/services/solauto/solautoClient.ts +37 -46
package/src/services/solauto/solautoMarginfiClient.ts +17 -17
package/src/services/transactions/transactionUtils.ts +9 -9
package/src/solautoPosition/solautoPositionEx.ts +4 -2
package/tests/transactions/shared.ts +1 -1
package/tests/unit/rebalanceCalculations.ts +4 -4

package/dist/services/rebalance/rebalanceSwapManager.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/solautoPosition/solautoPositionEx.d.ts CHANGED Viewed

@@ -62,7 +62,7 @@ export declare abstract class SolautoPositionEx {
     protected canRefreshPositionState(): boolean;
     abstract refreshPositionState(): Promise<void>;
     utilizationRateBpsDrift(): Promise<number>;
-    updateWithLatestPrices(supplyPrice?: number, debtPrice?: number): Promise<void>;
+    updateWithLatestPrices(supplyPrice?: number, debtPrice?: number): Promise<PositionState>;
     refetchPositionData(): Promise<void>;
 }
 export {};

package/dist/solautoPosition/solautoPositionEx.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,WAAW,EAEX,eAAe,EACf,aAAa,EACb,eAAe,EACf,yBAAyB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAQL,cAAc,EASf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAQ3C,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,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,UAAU,qBAAsB,SAAQ,OAAO,CAAC,eAAe,CAAC;IAC9D,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,8BAAsB,iBAAiB;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,qBAAqB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,CAAa;IAC9B,aAAa,CAAC,EAAE,SAAS,CAAa;IAC7C,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAEhC,IAAI,EAAE,cAAc;IAgBhC,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM;IAIN,SAAS;IAMT,UAAU;IAIV,YAAY;IAOZ,IAAI,IAAI,qBAAqB;IAI7B,KAAK,IAAI,aAAa;IAItB,QAAQ,IAAI,yBAAyB,GAAG,SAAS;IAIjD,GAAG,IAAI,WAAW,GAAG,SAAS;IAI9B,UAAU,IAAI,SAAS;IAIvB,QAAQ,IAAI,SAAS;IAIrB,UAAU;IAOV,YAAY;IAIZ,UAAU;IAOV,YAAY;IAMZ,QAAQ;IAIR,WAAW;IAIX,WAAW;IAIX,SAAS;IAIT,SAAS;IAIT,OAAO;IAIP,6BAA6B;IAI7B,yBAAyB;IAIzB,QAAQ,CAAC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9D,QAAQ,CAAC,0BAA0B,IAAI,MAAM;IAC7C,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAC3C,QAAQ,CAAC,sBAAsB,IAAI,MAAM;IAEzC,0BAA0B;IA0B1B,oBAAoB,CAAC,oBAAoB,SAAI,GAAG,eAAe,GAAG,SAAS;IAqB3E,kBAAkB,IAAI,OAAO;IAS7B,SAAS,CAAC,uBAAuB;IAWjC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAExC,uBAAuB;IAiBvB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;~~IAQ/D~~,mBAAmB;CAM1B"}
1	+ {"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,WAAW,EAEX,eAAe,EACf,aAAa,EACb,eAAe,EACf,yBAAyB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAQL,cAAc,EASf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAQ3C,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,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,UAAU,qBAAsB,SAAQ,OAAO,CAAC,eAAe,CAAC;IAC9D,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,8BAAsB,iBAAiB;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,qBAAqB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,CAAa;IAC9B,aAAa,CAAC,EAAE,SAAS,CAAa;IAC7C,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAEhC,IAAI,EAAE,cAAc;IAgBhC,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM;IAIN,SAAS;IAMT,UAAU;IAIV,YAAY;IAOZ,IAAI,IAAI,qBAAqB;IAI7B,KAAK,IAAI,aAAa;IAItB,QAAQ,IAAI,yBAAyB,GAAG,SAAS;IAIjD,GAAG,IAAI,WAAW,GAAG,SAAS;IAI9B,UAAU,IAAI,SAAS;IAIvB,QAAQ,IAAI,SAAS;IAIrB,UAAU;IAOV,YAAY;IAIZ,UAAU;IAOV,YAAY;IAMZ,QAAQ;IAIR,WAAW;IAIX,WAAW;IAIX,SAAS;IAIT,SAAS;IAIT,OAAO;IAIP,6BAA6B;IAI7B,yBAAyB;IAIzB,QAAQ,CAAC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9D,QAAQ,CAAC,0BAA0B,IAAI,MAAM;IAC7C,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAC3C,QAAQ,CAAC,sBAAsB,IAAI,MAAM;IAEzC,0BAA0B;IA0B1B,oBAAoB,CAAC,oBAAoB,SAAI,GAAG,eAAe,GAAG,SAAS;IAqB3E,kBAAkB,IAAI,OAAO;IAS7B,SAAS,CAAC,uBAAuB;IAWjC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAExC,uBAAuB;IAiBvB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAUxF,mBAAmB;CAM1B"}

package/dist/solautoPosition/solautoPositionEx.js CHANGED Viewed

@@ -142,7 +142,9 @@ class SolautoPositionEx {
         return newState.liqUtilizationRateBps - oldState.liqUtilizationRateBps;
     }
     async updateWithLatestPrices(supplyPrice, debtPrice) {
-        this._data.state = await (0, utils_1.positionStateWithLatestPrices)(this.state(), supplyPrice, debtPrice);
+        const newState = await (0, utils_1.positionStateWithLatestPrices)(this.state(), supplyPrice, debtPrice);
+        this._data.state = newState;
+        return newState;
     }
     async refetchPositionData() {
         this._data = await (0, generated_1.fetchSolautoPosition)(this.umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(this.publicKey));

package/package.json CHANGED Viewed

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

package/src/services/rebalance/rebalanceSwapManager.ts CHANGED Viewed

@@ -40,14 +40,14 @@ export class RebalanceSwapManager {
   }
   private postRebalanceLiqUtilizationRateBps(swapOutputAmount?: bigint) {
-    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 = 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
       ? fromBaseUnit(swapOutputAmount, tokenInfo(outputToken).decimals) *
@@ -64,7 +64,7 @@ export class RebalanceSwapManager {
     return getLiqUtilzationRateBps(
       supplyUsd,
       debtUsd,
-      this.client.solautoPosition.state().liqThresholdBps ?? 0
+      this.client.pos.state().liqThresholdBps ?? 0
     );
   }
@@ -106,11 +106,11 @@ export class RebalanceSwapManager {
   private 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 = toBaseUnit(
       this.usdToSwap() / safeGetPrice(input.mint)!,
@@ -180,8 +180,8 @@ export class RebalanceSwapManager {
         minOutputAmount: rebalanceToZero ? outputAmount : undefined,
         maxLiqUtilizationRateBps: this.values.repayingCloseToMaxLtv
           ? maxRepayToBps(
-              this.client.solautoPosition.state().maxLtvBps ?? 0,
-              this.client.solautoPosition.state().liqThresholdBps ?? 0
+              this.client.pos.state().maxLtvBps ?? 0,
+              this.client.pos.state().liqThresholdBps ?? 0
             ) - 15
           : undefined,
       });
@@ -199,7 +199,7 @@ export class RebalanceSwapManager {
       ...swapInput,
       destinationWallet: flashLoanRepayFromDebt
         ? toWeb3JsPublicKey(this.client.signer.publicKey)
-        : this.client.solautoPosition.publicKey,
+        : this.client.pos.publicKey,
       slippageIncFactor: 0.2 + attemptNum * 0.25,
     };
   }

package/src/services/rebalance/rebalanceTxBuilder.ts CHANGED Viewed

@@ -43,19 +43,19 @@ export class RebalanceTxBuilder {
   private async shouldProceedWithRebalance() {
     return (
-      this.client.solautoPosition.supplyUsd() > 0 &&
+      this.client.pos.supplyUsd() > 0 &&
       (this.targetLiqUtilizationRateBps !== undefined ||
-        this.client.solautoPosition.eligibleForRebalance())
+        this.client.pos.eligibleForRebalance())
     );
   }
   private getRebalanceValues(flFee?: number) {
     return getRebalanceValues(
-      this.client.solautoPosition,
+      this.client.pos,
       new SolautoFeesBps(
         this.client.isReferred(),
         this.targetLiqUtilizationRateBps,
-        this.client.solautoPosition.netWorthUsd()
+        this.client.pos.netWorthUsd()
       ),
       flFee ?? 0,
       this.targetLiqUtilizationRateBps
@@ -84,12 +84,12 @@ export class RebalanceTxBuilder {
     const insufficientSupplyLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       supplyLiquidityAvailable,
-      this.client.solautoPosition.supplyMint()
+      this.client.pos.supplyMint()
     );
     const insufficientDebtLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       debtLiquidityAvailable,
-      this.client.solautoPosition.debtMint()
+      this.client.pos.debtMint()
     );
     let useDebtLiquidity =
@@ -107,8 +107,8 @@ export class RebalanceTxBuilder {
     attemptNum: number
   ): Promise<FlashLoanRequirements | undefined> {
     const maxLtvRateBps = getMaxLiqUtilizationRateBps(
-      this.client.solautoPosition.state().maxLtvBps,
-      this.client.solautoPosition.state().liqThresholdBps,
+      this.client.pos.state().maxLtvBps,
+      this.client.pos.state().liqThresholdBps,
       0.02
     );
@@ -156,9 +156,9 @@ export class RebalanceTxBuilder {
     let flashLoanToken: PositionTokenState | undefined = 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 {
@@ -225,14 +225,14 @@ export class RebalanceTxBuilder {
       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()
+      await this.client.pos.utilizationRateBpsDrift()
     );
     consoleLog("Liq utilization rate diff:", utilizationRateDiff);
@@ -287,7 +287,7 @@ export class RebalanceTxBuilder {
       const flashBorrowDest = exactOut
         ? getTokenAccount(
-            this.client.solautoPosition.publicKey,
+            this.client.pos.publicKey,
             new PublicKey(swapQuote.outputMint)
           )
         : getTokenAccount(
@@ -314,7 +314,7 @@ export class RebalanceTxBuilder {
   public async buildRebalanceTx(
     attemptNum: number
   ): Promise<TransactionItemInputs | undefined> {
-    await this.client.solautoPosition.refreshPositionState();
+    await this.client.pos.refreshPositionState();
     if (!this.shouldProceedWithRebalance()) {
       this.client.log("Not eligible for a rebalance");

package/src/services/solauto/solautoClient.ts CHANGED Viewed

@@ -63,7 +63,7 @@ export abstract class SolautoClient extends ReferralStateManager {
   public positionId!: number;
   public selfManaged!: boolean;
-  public solautoPosition!: SolautoPositionEx;
+  public pos!: SolautoPositionEx;
   public positionSupplyTa!: PublicKey;
   public signerSupplyTa!: PublicKey;
@@ -99,7 +99,7 @@ export abstract class SolautoClient extends ReferralStateManager {
       this.positionId,
       this.programId
     );
-    this.solautoPosition = await getOrCreatePositionEx(
+    this.pos = await getOrCreatePositionEx(
       this.umi,
       positionPk,
       {
@@ -112,30 +112,30 @@ export abstract class SolautoClient extends ReferralStateManager {
     );
     this.positionSupplyTa = getTokenAccount(
-      this.solautoPosition.publicKey,
-      this.solautoPosition.supplyMint()
+      this.pos.publicKey,
+      this.pos.supplyMint()
     );
     this.signerSupplyTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
-      this.solautoPosition.supplyMint()
+      this.pos.supplyMint()
     );
     this.positionDebtTa = getTokenAccount(
-      this.solautoPosition.publicKey,
-      this.solautoPosition.debtMint()
+      this.pos.publicKey,
+      this.pos.debtMint()
     );
     this.signerDebtTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
-      this.solautoPosition.debtMint()
+      this.pos.debtMint()
     );
     this.solautoFeesSupplyTa = getTokenAccount(
       SOLAUTO_FEES_WALLET,
-      this.solautoPosition.supplyMint()
+      this.pos.supplyMint()
     );
     this.solautoFeesDebtTa = getTokenAccount(
       SOLAUTO_FEES_WALLET,
-      this.solautoPosition.debtMint()
+      this.pos.debtMint()
     );
     this.authorityLutAddress =
@@ -149,33 +149,27 @@ export abstract class SolautoClient extends ReferralStateManager {
     this.flProvider = new FlProviderAggregator(
       this.umi,
       this.signer,
-      this.solautoPosition.supplyMint(),
-      this.solautoPosition.debtMint()
+      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(): PublicKey | undefined {
     if (this.referredByState !== undefined) {
-      return getTokenAccount(
-        this.referredByState,
-        this.solautoPosition.supplyMint()
-      );
+      return getTokenAccount(this.referredByState, this.pos.supplyMint());
     }
     return undefined;
   }
   referredByDebtTa(): PublicKey | undefined {
     if (this.referredByState !== undefined) {
-      return getTokenAccount(
-        this.referredByState,
-        this.solautoPosition.debtMint()
-      );
+      return getTokenAccount(this.referredByState, this.pos.debtMint());
     }
     return undefined;
   }
@@ -183,15 +177,14 @@ export abstract class SolautoClient extends ReferralStateManager {
   async resetLiveTxUpdates(success?: boolean) {
     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
       }
@@ -217,7 +210,7 @@ export abstract class SolautoClient extends ReferralStateManager {
       ...(toWeb3JsPublicKey(this.signer.publicKey).equals(this.authority)
         ? [this.signerDebtTa]
         : []),
-      this.solautoPosition.publicKey,
+      this.pos.publicKey,
       this.positionSupplyTa,
       this.positionDebtTa,
       this.referralState,
@@ -324,7 +317,7 @@ export abstract class SolautoClient extends ReferralStateManager {
           data = await this.connection.getTokenAccountBalance(
             getTokenAccount(
               toWeb3JsPublicKey(this.signer.publicKey),
-              this.solautoPosition.supplyMint()
+              this.pos.supplyMint()
             ),
             "confirmed"
           );
@@ -337,7 +330,7 @@ export abstract class SolautoClient extends ReferralStateManager {
           const data = await this.connection.getTokenAccountBalance(
             getTokenAccount(
               toWeb3JsPublicKey(this.signer.publicKey),
-              this.solautoPosition.debtMint()
+              this.pos.debtMint()
             ),
             "confirmed"
           );
@@ -387,11 +380,11 @@ export abstract class SolautoClient extends ReferralStateManager {
     let signerDcaTa: UmiPublicKey | undefined = undefined;
     if (isOption(args.dca) && isSome(args.dca)) {
       if (args.dca.value.tokenType === TokenType.Supply) {
-        dcaMint = publicKey(this.solautoPosition.supplyMint());
+        dcaMint = publicKey(this.pos.supplyMint());
         positionDcaTa = publicKey(this.positionSupplyTa);
         signerDcaTa = publicKey(this.signerSupplyTa);
       } else {
-        dcaMint = publicKey(this.solautoPosition.debtMint());
+        dcaMint = publicKey(this.pos.debtMint());
         positionDcaTa = publicKey(this.positionDebtTa);
         signerDcaTa = publicKey(this.signerDebtTa);
       }
@@ -427,7 +420,7 @@ export abstract class SolautoClient extends ReferralStateManager {
     return updatePosition(this.umi, {
       signer: this.signer,
-      solautoPosition: publicKey(this.solautoPosition.publicKey),
+      solautoPosition: publicKey(this.pos.publicKey),
       dcaMint,
       positionDcaTa,
       signerDcaTa,
@@ -442,27 +435,27 @@ export abstract class SolautoClient extends ReferralStateManager {
     let positionDcaTa: UmiPublicKey | undefined = undefined;
     let signerDcaTa: UmiPublicKey | undefined = undefined;
-    const currDca = this.solautoPosition.dca()!;
+    const currDca = this.pos.dca()!;
     if (currDca.dcaInBaseUnit > 0) {
       if (currDca.tokenType === TokenType.Supply) {
-        dcaMint = publicKey(this.solautoPosition.supplyMint());
+        dcaMint = publicKey(this.pos.supplyMint());
         positionDcaTa = publicKey(this.positionSupplyTa);
         signerDcaTa = publicKey(this.signerSupplyTa);
       } else {
-        dcaMint = publicKey(this.solautoPosition.debtMint());
+        dcaMint = publicKey(this.pos.debtMint());
         positionDcaTa = publicKey(this.positionDebtTa);
         signerDcaTa = publicKey(this.signerDebtTa);
       }
       this.contextUpdates.new({
         type: "cancellingDca",
-        value: this.solautoPosition.dca()!.tokenType,
+        value: this.pos.dca()!.tokenType,
       });
     }
     return cancelDCA(this.umi, {
       signer: this.signer,
-      solautoPosition: publicKey(this.solautoPosition.publicKey),
+      solautoPosition: publicKey(this.pos.publicKey),
       dcaMint,
       positionDcaTa,
       signerDcaTa,
@@ -505,9 +498,7 @@ export abstract class SolautoClient extends ReferralStateManager {
               toWeb3JsPublicKey(this.signer.publicKey),
               BigInt(
                 Math.round(
-                  Number(
-                    this.solautoPosition.state().debt.amountUsed.baseUnit
-                  ) * 1.01
+                  Number(this.pos.state().debt.amountUsed.baseUnit) * 1.01
                 )
               )
             )
@@ -531,8 +522,8 @@ export abstract class SolautoClient extends ReferralStateManager {
         this.contextUpdates.new({
           type: "supply",
           value:
-            (this.solautoPosition.state().supply.amountUsed.baseUnit ??
-              BigInt(0)) * BigInt(-1),
+            (this.pos.state().supply.amountUsed.baseUnit ?? BigInt(0)) *
+            BigInt(-1),
         });
       }
     } else if (args.__kind === "Borrow") {
@@ -550,8 +541,8 @@ export abstract class SolautoClient extends ReferralStateManager {
         this.contextUpdates.new({
           type: "debt",
           value:
-            (this.solautoPosition.state().debt.amountUsed.baseUnit ??
-              BigInt(0)) * BigInt(-1),
+            (this.pos.state().debt.amountUsed.baseUnit ?? BigInt(0)) *
+            BigInt(-1),
         });
       }
     }

package/src/services/solauto/solautoMarginfiClient.ts CHANGED Viewed

@@ -69,19 +69,19 @@ export class SolautoMarginfiClient extends SolautoClient {
   async initialize(args: SolautoMarginfiClientArgs) {
     await super.initialize(args);
-    this.marginfiGroup = await this.solautoPosition.lendingPool();
+    this.marginfiGroup = await this.pos.lendingPool();
     if (this.selfManaged) {
       this.marginfiAccount =
         args.marginfiAccount ??
         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 getAllMarginfiAccountsByAuthority(
           this.umi,
-          this.solautoPosition.publicKey,
+          this.pos.publicKey,
           this.marginfiGroup,
           false
         );
@@ -114,11 +114,11 @@ export class SolautoMarginfiClient extends SolautoClient {
     this.marginfiSupplyAccounts =
       MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
-        this.solautoPosition.supplyMint().toString()
+        this.pos.supplyMint().toString()
       ]!;
     this.marginfiDebtAccounts =
       MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
-        this.solautoPosition.debtMint().toString()
+        this.pos.debtMint().toString()
       ]!;
     // TODO: Don't dynamically pull oracle from bank until Marginfi sorts out their price oracle issues.
@@ -182,16 +182,16 @@ export class SolautoMarginfiClient extends SolautoClient {
       referredBySupplyTa: this.referredBySupplyTa()
         ? publicKey(this.referredBySupplyTa()!)
         : undefined,
-      solautoPosition: publicKey(this.solautoPosition.publicKey),
+      solautoPosition: publicKey(this.pos.publicKey),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount:
         "publicKey" in this.marginfiAccount
           ? (this.marginfiAccount as Signer)
           : publicKey(this.marginfiAccount),
-      supplyMint: publicKey(this.solautoPosition.supplyMint()),
+      supplyMint: publicKey(this.pos.supplyMint()),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
       positionSupplyTa: publicKey(this.positionSupplyTa),
-      debtMint: publicKey(this.solautoPosition.debtMint()),
+      debtMint: publicKey(this.pos.debtMint()),
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
       positionDebtTa: publicKey(this.positionDebtTa),
       signerDebtTa: signerDebtTa,
@@ -207,7 +207,7 @@ export class SolautoMarginfiClient extends SolautoClient {
   closePositionIx(): TransactionBuilder {
     return closePosition(this.umi, {
       signer: this.signer,
-      solautoPosition: publicKey(this.solautoPosition.publicKey),
+      solautoPosition: publicKey(this.pos.publicKey),
       signerSupplyTa: publicKey(this.signerSupplyTa),
       positionSupplyTa: publicKey(this.positionSupplyTa),
       positionDebtTa: publicKey(this.positionDebtTa),
@@ -226,7 +226,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       supplyPriceOracle: publicKey(this.supplyPriceOracle),
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
       debtPriceOracle: publicKey(this.debtPriceOracle),
-      solautoPosition: publicKey(this.solautoPosition.publicKey),
+      solautoPosition: publicKey(this.pos.publicKey),
     });
   }
@@ -348,7 +348,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     return marginfiProtocolInteraction(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
-      solautoPosition: publicKey(this.solautoPosition.publicKey),
+      solautoPosition: publicKey(this.pos.publicKey),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccountPk),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
@@ -370,10 +370,10 @@ export class SolautoMarginfiClient extends SolautoClient {
     data: RebalanceDetails
   ): TransactionBuilder {
     const inputIsSupply = new PublicKey(data.swapQuote.inputMint).equals(
-      this.solautoPosition.supplyMint()
+      this.pos.supplyMint()
     );
     const outputIsSupply = new PublicKey(data.swapQuote.outputMint).equals(
-      this.solautoPosition.supplyMint()
+      this.pos.supplyMint()
     );
     const preSwapRebalance = rebalanceStep === RebalanceStep.PreSwap;
@@ -417,7 +417,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         data.values.tokenBalanceChange !== undefined
           ? publicKey(this.authority)
           : undefined,
-      solautoPosition: publicKey(this.solautoPosition.publicKey),
+      solautoPosition: publicKey(this.pos.publicKey),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccountPk),
       intermediaryTa: publicKey(
@@ -431,7 +431,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       positionSupplyTa: publicKey(this.positionSupplyTa),
       authoritySupplyTa: addAuthorityTas
         ? publicKey(
-            getTokenAccount(this.authority, this.solautoPosition.supplyMint())
+            getTokenAccount(this.authority, this.pos.supplyMint())
           )
         : undefined,
       vaultSupplyTa: needSupplyAccounts
@@ -445,7 +445,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       positionDebtTa: publicKey(this.positionDebtTa),
       authorityDebtTa: addAuthorityTas
         ? publicKey(
-            getTokenAccount(this.authority, this.solautoPosition.debtMint())
+            getTokenAccount(this.authority, this.pos.debtMint())
           )
         : undefined,
       vaultDebtTa: needDebtAccounts

package/src/services/transactions/transactionUtils.ts CHANGED Viewed

@@ -73,8 +73,8 @@ function getWSolUsage(
   },
   cancellingDcaIn?: TokenType
 ): wSolTokenUsage | undefined {
-  const supplyIsWsol = client.solautoPosition.supplyMint().equals(NATIVE_MINT);
-  const debtIsWsol = client.solautoPosition.debtMint().equals(NATIVE_MINT);
+  const supplyIsWsol = client.pos.supplyMint().equals(NATIVE_MINT);
+  const debtIsWsol = client.pos.debtMint().equals(NATIVE_MINT);
   if (!supplyIsWsol && !debtIsWsol) {
     return undefined;
   }
@@ -148,7 +148,7 @@ async function transactionChoresBefore(
     }
     // TODO: PF
-    if (!client.solautoPosition.exists()) {
+    if (!client.pos.exists()) {
       chores = chores.add(client.openPositionIx());
     }
   }
@@ -229,8 +229,8 @@ async function transactionChoresBefore(
           client.signer,
           toWeb3JsPublicKey(client.signer.publicKey),
           isSolautoAction("Withdraw", solautoAction)
-            ? client.solautoPosition.supplyMint()
-            : client.solautoPosition.debtMint()
+            ? client.pos.supplyMint()
+            : client.pos.debtMint()
         )
       );
       accountsGettingCreated.push(tokenAccount.toString());
@@ -284,7 +284,7 @@ export async function rebalanceChoresBefore(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         client.referredByState!,
-        client.solautoPosition.supplyMint()
+        client.pos.supplyMint()
       )
     );
   }
@@ -295,7 +295,7 @@ export async function rebalanceChoresBefore(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         client.referredByState!,
-        client.solautoPosition.debtMint()
+        client.pos.debtMint()
       )
     );
   }
@@ -310,7 +310,7 @@ export async function rebalanceChoresBefore(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         toWeb3JsPublicKey(client.signer.publicKey),
-        client.solautoPosition.supplyMint()
+        client.pos.supplyMint()
       )
     );
     accountsGettingCreated.push(signerSupplyTa.publicKey.toString());
@@ -326,7 +326,7 @@ export async function rebalanceChoresBefore(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         toWeb3JsPublicKey(client.signer.publicKey),
-        client.solautoPosition.debtMint()
+        client.pos.debtMint()
       )
     );
     accountsGettingCreated.push(signerDebtTa.publicKey.toString());

package/src/solautoPosition/solautoPositionEx.ts CHANGED Viewed

@@ -274,12 +274,14 @@ export abstract class SolautoPositionEx {
     return newState.liqUtilizationRateBps - oldState.liqUtilizationRateBps;
   }
-  async updateWithLatestPrices(supplyPrice?: number, debtPrice?: number) {
-    this._data.state = await positionStateWithLatestPrices(
+  async updateWithLatestPrices(supplyPrice?: number, debtPrice?: number): Promise<PositionState> {
+    const newState = await positionStateWithLatestPrices(
       this.state(),
       supplyPrice,
       debtPrice
     );
+    this._data.state = newState;
+    return newState;
   }
   async refetchPositionData() {

package/tests/transactions/shared.ts CHANGED Viewed

@@ -44,7 +44,7 @@ export async function e2eTransactionTest(
   });
   const [maxLtvBps, liqThresholdBps] =
-    await client.solautoPosition.maxLtvAndLiqThresholdBps();
+    await client.pos.maxLtvAndLiqThresholdBps();
   const settings: SolautoSettingsParametersInpArgs = {
     boostToBps: maxBoostToBps(maxLtvBps, liqThresholdBps) - 200,
     boostGap: 50,

package/tests/unit/rebalanceCalculations.ts CHANGED Viewed

@@ -37,11 +37,11 @@ function assertAccurateRebalance(
   targetLiqUtilizationRateBps?: number
 ) {
   const { endResult } = getRebalanceValues(
-    client.solautoPosition,
+    client.pos,
     new SolautoFeesBps(
       false,
       targetLiqUtilizationRateBps,
-      client.solautoPosition.netWorthUsd()
+      client.pos.netWorthUsd()
     ),
     50,
     targetLiqUtilizationRateBps
@@ -50,7 +50,7 @@ function assertAccurateRebalance(
   const newLiqUtilizationRateBps = getLiqUtilzationRateBps(
     endResult.supplyUsd,
     endResult.debtUsd,
-    client.solautoPosition.state().liqThresholdBps
+    client.pos.state().liqThresholdBps
   );
   assert(
     Math.round(newLiqUtilizationRateBps) ===
@@ -98,7 +98,7 @@ async function getFakePosition(
     liqThresholdBps
   );
-  client.solautoPosition = new MarginfiSolautoPositionEx({
+  client.pos = new MarginfiSolautoPositionEx({
     umi: client.umi,
     publicKey: PublicKey.default,
     data: {