@haven-fi/solauto-sdk 1.0.629 → 1.0.631

package/src/services/solauto/solautoClient.ts

@@ -12,6 +12,7 @@ import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   DCASettingsInpArgs,
   LendingPlatform,
+  PriceType,
   RebalanceStep,
   SolautoActionArgs,
   SolautoSettingsParametersInpArgs,
@@ -109,29 +110,29 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     this.positionSupplyTa = getTokenAccount(
       this.pos.publicKey,
-      this.pos.supplyMint()
+      this.pos.supplyMint
     );
     this.signerSupplyTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
-      this.pos.supplyMint()
+      this.pos.supplyMint
     );
 
     this.positionDebtTa = getTokenAccount(
       this.pos.publicKey,
-      this.pos.debtMint()
+      this.pos.debtMint
     );
     this.signerDebtTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
-      this.pos.debtMint()
+      this.pos.debtMint
     );
 
     this.solautoFeesSupplyTa = getTokenAccount(
       SOLAUTO_FEES_WALLET,
-      this.pos.supplyMint()
+      this.pos.supplyMint
     );
     this.solautoFeesDebtTa = getTokenAccount(
       SOLAUTO_FEES_WALLET,
-      this.pos.debtMint()
+      this.pos.debtMint
     );
 
     this.authorityLutAddress =
@@ -146,30 +147,30 @@ export abstract class SolautoClient extends ReferralStateManager {
       this.umi,
       this.signer,
       this.authority,
-      this.pos.supplyMint(),
-      this.pos.debtMint(),
+      this.pos.supplyMint,
+      this.pos.debtMint,
       this.lpEnv
     );
     await this.flProvider.initialize();
     this.otherSigners.push(...this.flProvider.otherSigners());
 
-    this.log("Position state: ", this.pos.state());
-    this.log("Position settings: ", this.pos.settings());
-    this.log("Position DCA: ", this.pos.dca());
-    this.log("Supply mint:", this.pos.supplyMint().toString());
-    this.log("Debt mint:", this.pos.debtMint().toString());
+    this.log("Position state: ", this.pos.state);
+    this.log("Position settings: ", this.pos.settings);
+    this.log("Position DCA: ", this.pos.dca);
+    this.log("Supply mint:", this.pos.supplyMint.toString());
+    this.log("Debt mint:", this.pos.debtMint.toString());
   }
 
   referredBySupplyTa(): PublicKey | undefined {
     if (this.referredByState !== undefined) {
-      return getTokenAccount(this.referredByState, this.pos.supplyMint());
+      return getTokenAccount(this.referredByState, this.pos.supplyMint);
     }
     return undefined;
   }
 
   referredByDebtTa(): PublicKey | undefined {
     if (this.referredByState !== undefined) {
-      return getTokenAccount(this.referredByState, this.pos.debtMint());
+      return getTokenAccount(this.referredByState, this.pos.debtMint);
     }
     return undefined;
   }
@@ -177,14 +178,14 @@ export abstract class SolautoClient extends ReferralStateManager {
   async resetLiveTxUpdates(success?: boolean) {
     this.log("Resetting context updates...");
     if (success) {
-      if (!this.pos.exists()) {
+      if (!this.pos.exists) {
         await this.pos.refetchPositionData();
       } else {
         if (this.contextUpdates.settings) {
-          this.pos.data().position!.settings = this.contextUpdates.settings;
+          this.pos.updateSettings(this.contextUpdates.settings);
         }
         if (this.contextUpdates.dca) {
-          this.pos.data().position!.dca = this.contextUpdates.dca;
+          this.pos.updateDca(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
       }
@@ -307,7 +308,7 @@ export abstract class SolautoClient extends ReferralStateManager {
         await getWalletSplBalances(
           this.connection,
           toWeb3JsPublicKey(this.signer.publicKey),
-          [this.pos.supplyMint(), this.pos.debtMint()]
+          [this.pos.supplyMint, this.pos.debtMint]
         );
     }
 
@@ -352,11 +353,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.pos.supplyMint());
+        dcaMint = publicKey(this.pos.supplyMint);
         positionDcaTa = publicKey(this.positionSupplyTa);
         signerDcaTa = publicKey(this.signerSupplyTa);
       } else {
-        dcaMint = publicKey(this.pos.debtMint());
+        dcaMint = publicKey(this.pos.debtMint);
         positionDcaTa = publicKey(this.positionDebtTa);
         signerDcaTa = publicKey(this.signerDebtTa);
       }
@@ -407,21 +408,21 @@ export abstract class SolautoClient extends ReferralStateManager {
     let positionDcaTa: UmiPublicKey | undefined = undefined;
     let signerDcaTa: UmiPublicKey | undefined = undefined;
 
-    const currDca = this.pos.dca()!;
+    const currDca = this.pos.dca!;
     if (currDca.dcaInBaseUnit > 0) {
       if (currDca.tokenType === TokenType.Supply) {
-        dcaMint = publicKey(this.pos.supplyMint());
+        dcaMint = publicKey(this.pos.supplyMint);
         positionDcaTa = publicKey(this.positionSupplyTa);
         signerDcaTa = publicKey(this.signerSupplyTa);
       } else {
-        dcaMint = publicKey(this.pos.debtMint());
+        dcaMint = publicKey(this.pos.debtMint);
         positionDcaTa = publicKey(this.positionDebtTa);
         signerDcaTa = publicKey(this.signerDebtTa);
       }
 
       this.contextUpdates.new({
         type: "cancellingDca",
-        value: this.pos.dca()!.tokenType,
+        value: this.pos.dca!.tokenType,
       });
     }
 
@@ -434,7 +435,7 @@ export abstract class SolautoClient extends ReferralStateManager {
     });
   }
 
-  abstract refreshIx(): TransactionBuilder;
+  abstract refreshIx(priceType: PriceType): TransactionBuilder;
 
   protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder {
     let tx = transactionBuilder();
@@ -470,7 +471,7 @@ export abstract class SolautoClient extends ReferralStateManager {
               toWeb3JsPublicKey(this.signer.publicKey),
               BigInt(
                 Math.round(
-                  Number(this.pos.state().debt.amountUsed.baseUnit) * 1.01
+                  Number(this.pos.state.debt.amountUsed.baseUnit) * 1.01
                 )
               )
             )
@@ -494,7 +495,7 @@ export abstract class SolautoClient extends ReferralStateManager {
         this.contextUpdates.new({
           type: "supply",
           value:
-            (this.pos.state().supply.amountUsed.baseUnit ?? BigInt(0)) *
+            (this.pos.state.supply.amountUsed.baseUnit ?? BigInt(0)) *
             BigInt(-1),
         });
       }
@@ -513,8 +514,7 @@ export abstract class SolautoClient extends ReferralStateManager {
         this.contextUpdates.new({
           type: "debt",
           value:
-            (this.pos.state().debt.amountUsed.baseUnit ?? BigInt(0)) *
-            BigInt(-1),
+            (this.pos.state.debt.amountUsed.baseUnit ?? BigInt(0)) * BigInt(-1),
         });
       }
     }

package/src/services/solauto/solautoMarginfiClient.ts

@@ -13,6 +13,7 @@ import {
   DCASettingsInpArgs,
   LendingPlatform,
   PositionType,
+  PriceType,
   RebalanceDirection,
   RebalanceStep,
   SolautoActionArgs,
@@ -69,7 +70,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         args.lpUserAccount ??
         createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
     } else {
-      if (this.pos.exists()) {
+      if (this.pos.exists) {
         this.marginfiAccount = this.pos.lpUserAccount!;
       } else {
         const accounts = await getAllMarginfiAccountsByAuthority(
@@ -107,11 +108,11 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     this.marginfiSupplyAccounts =
       this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][
-        this.pos.supplyMint().toString()
+        this.pos.supplyMint.toString()
       ]!;
     this.marginfiDebtAccounts =
       this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][
-        this.pos.debtMint().toString()
+        this.pos.debtMint.toString()
       ]!;
 
     [this.supplyPriceOracle, this.debtPriceOracle] =
@@ -177,10 +178,10 @@ export class SolautoMarginfiClient extends SolautoClient {
         "publicKey" in this.marginfiAccount
           ? (this.marginfiAccount as Signer)
           : publicKey(this.marginfiAccount),
-      supplyMint: publicKey(this.pos.supplyMint()),
+      supplyMint: publicKey(this.pos.supplyMint),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
       positionSupplyTa: publicKey(this.positionSupplyTa),
-      debtMint: publicKey(this.pos.debtMint()),
+      debtMint: publicKey(this.pos.debtMint),
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
       positionDebtTa: publicKey(this.positionDebtTa),
       signerDebtTa: signerDebtTa,
@@ -205,7 +206,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     });
   }
 
-  refreshIx(): TransactionBuilder {
+  refreshIx(priceType: PriceType): TransactionBuilder {
     return marginfiRefreshData(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(this.mfiAccounts.program),
@@ -216,6 +217,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
       debtPriceOracle: publicKey(this.debtPriceOracle),
       solautoPosition: publicKey(this.pos.publicKey),
+      priceType,
     });
   }
 
@@ -359,10 +361,10 @@ export class SolautoMarginfiClient extends SolautoClient {
     data: RebalanceDetails
   ): TransactionBuilder {
     const inputIsSupply = new PublicKey(data.swapQuote.inputMint).equals(
-      this.pos.supplyMint()
+      this.pos.supplyMint
     );
     const outputIsSupply = new PublicKey(data.swapQuote.outputMint).equals(
-      this.pos.supplyMint()
+      this.pos.supplyMint
     );
 
     const preSwapRebalance = rebalanceStep === RebalanceStep.PreSwap;
@@ -419,7 +421,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       supplyPriceOracle: publicKey(this.supplyPriceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
       authoritySupplyTa: addAuthorityTas
-        ? publicKey(getTokenAccount(this.authority, this.pos.supplyMint()))
+        ? publicKey(getTokenAccount(this.authority, this.pos.supplyMint))
         : undefined,
       vaultSupplyTa: needSupplyAccounts
         ? publicKey(this.marginfiSupplyAccounts.liquidityVault)
@@ -431,7 +433,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       debtPriceOracle: publicKey(this.debtPriceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),
       authorityDebtTa: addAuthorityTas
-        ? publicKey(getTokenAccount(this.authority, this.pos.debtMint()))
+        ? publicKey(getTokenAccount(this.authority, this.pos.debtMint))
         : undefined,
       vaultDebtTa: needDebtAccounts
         ? publicKey(this.marginfiDebtAccounts.liquidityVault)
@@ -448,6 +450,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         data.swapQuote.swapMode === "ExactOut" && isFirstRebalance
           ? SwapType.ExactOut
           : null,
+      priceType: isFirstRebalance ? data.priceType : null,
       flashLoanFeeBps:
         data.flashLoan?.flFeeBps && isFirstRebalance
           ? data.flashLoan.flFeeBps

package/src/services/transactions/transactionUtils.ts

@@ -15,6 +15,7 @@ import {
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   InvalidRebalanceConditionError,
+  PriceType,
   SolautoAction,
   SolautoRebalanceType,
   SwapType,
@@ -71,8 +72,8 @@ function getWSolUsage(
   },
   cancellingDcaIn?: TokenType
 ): wSolTokenUsage | undefined {
-  const supplyIsWsol = client.pos.supplyMint().equals(NATIVE_MINT);
-  const debtIsWsol = client.pos.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;
   }
@@ -146,7 +147,7 @@ async function transactionChoresBefore(
     }
     // TODO: PF
 
-    if (!client.pos.exists()) {
+    if (!client.pos.exists) {
       chores = chores.add(client.openPositionIx());
     }
   }
@@ -227,8 +228,8 @@ async function transactionChoresBefore(
           client.signer,
           toWeb3JsPublicKey(client.signer.publicKey),
           isSolautoAction("Withdraw", solautoAction)
-            ? client.pos.supplyMint()
-            : client.pos.debtMint()
+            ? client.pos.supplyMint
+            : client.pos.debtMint
         )
       );
       accountsGettingCreated.push(tokenAccount.toString());
@@ -282,7 +283,7 @@ export async function rebalanceChoresBefore(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         client.referredByState!,
-        client.pos.supplyMint()
+        client.pos.supplyMint
       )
     );
   }
@@ -293,7 +294,7 @@ export async function rebalanceChoresBefore(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         client.referredByState!,
-        client.pos.debtMint()
+        client.pos.debtMint
       )
     );
   }
@@ -308,7 +309,7 @@ export async function rebalanceChoresBefore(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         toWeb3JsPublicKey(client.signer.publicKey),
-        client.pos.supplyMint()
+        client.pos.supplyMint
       )
     );
     accountsGettingCreated.push(signerSupplyTa.publicKey.toString());
@@ -324,7 +325,7 @@ export async function rebalanceChoresBefore(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         toWeb3JsPublicKey(client.signer.publicKey),
-        client.pos.debtMint()
+        client.pos.debtMint
       )
     );
     accountsGettingCreated.push(signerDebtTa.publicKey.toString());
@@ -375,6 +376,7 @@ function getRebalanceInstructions(
           rebalanceType: SolautoRebalanceType.Regular,
           swapType: SwapType.ExactIn,
           targetLiqUtilizationRateBps: 0,
+          priceType: PriceType.Realtime,
           flashLoanFeeBps: null,
         })[0];
         const [data, _] = serializer.deserialize(x.data);

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -17,7 +17,7 @@ import {
 } from "../utils";
 import { getMarginfiAccounts } from "../constants";
 import { SolautoPositionEx } from "./solautoPositionEx";
-import { LendingPlatform } from "../generated";
+import { LendingPlatform, PriceType } from "../generated";
 
 export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   lendingPlatform = LendingPlatform.Marginfi;
@@ -55,8 +55,8 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     if (!this.supplyBank || !this.debtBank) {
       const group = (await this.lendingPool()).toString();
       const bankAccounts = getMarginfiAccounts(this.lpEnv).bankAccounts;
-      const supplyBank = bankAccounts[group][this.supplyMint().toString()].bank;
-      const debtBank = bankAccounts[group][this.debtMint().toString()].bank;
+      const supplyBank = bankAccounts[group][this.supplyMint.toString()].bank;
+      const debtBank = bankAccounts[group][this.debtMint.toString()].bank;
 
       [this.supplyBank, this.debtBank] = await safeFetchAllBank(this.umi, [
         publicKey(supplyBank),
@@ -79,7 +79,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   async maxLtvAndLiqThresholdBps(): Promise<[number, number]> {
     const [supplyBank, debtBank] = await this.getBanks();
 
-    const [supplyPrice] = await fetchTokenPrices([this.supplyMint()]);
+    const [supplyPrice] = await fetchTokenPrices([this.supplyMint]);
     const [maxLtvBps, liqThresholdBps] = calcMarginfiMaxLtvAndLiqThresholdBps(
       supplyBank,
       debtBank,
@@ -89,14 +89,14 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     return [maxLtvBps, liqThresholdBps];
   }
 
-  supplyLiquidityAvailable(): number {
+  get supplyLiquidityAvailable(): number {
     return fromBaseUnit(
       getBankLiquidityAvailableBaseUnit(this.supplyBank, false),
-      this.state().supply.decimals
+      this.state.supply.decimals
     );
   }
 
-  async refreshPositionState(): Promise<void> {
+  async refreshPositionState(priceType?: PriceType): Promise<void> {
     if (!this.canRefreshPositionState()) {
       return;
     }
@@ -107,13 +107,14 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
       { pk: this.lpUserAccount },
       await this.lendingPool(),
       useDesignatedMint
-        ? { mint: toWeb3JsPublicKey(this.state().supply.mint) }
+        ? { mint: toWeb3JsPublicKey(this.state.supply.mint) }
         : undefined,
       useDesignatedMint
-        ? { mint: toWeb3JsPublicKey(this.state().debt.mint) }
+        ? { mint: toWeb3JsPublicKey(this.state.debt.mint) }
         : undefined,
       this.lpEnv,
-      this.contextUpdates
+      this.contextUpdates,
+      priceType
     );
 
     if (resp) {