@haven-fi/solauto-sdk 1.0.587 → 1.0.589

package/src/services/rebalance/rebalanceSwapManager.ts

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

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

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

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

@@ -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/types/solauto.ts

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

package/src/utils/marginfiUtils.ts

@@ -350,7 +350,7 @@ async function getBank(
 
 export async function getMarginfiAccountPositionState(
   umi: Umi,
-  protocolAccount: { pk?: PublicKey; data?: MarginfiAccount | null },
+  lpUserAccount: { pk?: PublicKey; data?: MarginfiAccount | null },
   marginfiGroup?: PublicKey,
   supply?: BankSelection,
   debt?: BankSelection,
@@ -360,9 +360,9 @@ export async function getMarginfiAccountPositionState(
   | undefined
 > {
   let marginfiAccount =
-    protocolAccount.data ??
-    (protocolAccount.pk
-      ? await safeFetchMarginfiAccount(umi, publicKey(protocolAccount.pk), {
+    lpUserAccount.data ??
+    (lpUserAccount.pk
+      ? await safeFetchMarginfiAccount(umi, publicKey(lpUserAccount.pk), {
           commitment: "confirmed",
         })
       : null);

package/src/utils/solautoUtils.ts

@@ -192,7 +192,7 @@ export async function getSolautoManagedPositions(
       positionId: position.positionId[0],
       lendingPlatform: position.position.lendingPlatform,
       positionType: position.positionType,
-      protocolAccount: toWeb3JsPublicKey(position.position.protocolUserAccount),
+      lpUserAccount: toWeb3JsPublicKey(position.position.protocolUserAccount),
       supplyMint: tokens![0],
       debtMint: tokens![1],
     };
@@ -296,7 +296,7 @@ export async function getAllPositionsByAuthority(
           positionId: 0,
           positionType: PositionType.Leverage,
           lendingPlatform: LendingPlatform.Marginfi,
-          protocolAccount: x.marginfiAccount,
+          lpUserAccount: x.marginfiAccount,
           supplyMint: x.supplyMint,
           debtMint: x.debtMint,
         }));

package/tests/transactions/shared.ts

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

@@ -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: {