@haven-fi/solauto-sdk 1.0.581 → 1.0.583

package/src/{clients → services/solauto}/solautoClient.ts

@@ -1,7 +1,11 @@
 import "rpc-websockets/dist/lib/client";
-import { AddressLookupTableProgram, PublicKey } from "@solana/web3.js";
 import {
-  Signer,
+  AddressLookupTableProgram,
+  PublicKey,
+  RpcResponseAndContext,
+  TokenAmount,
+} from "@solana/web3.js";
+import {
   TransactionBuilder,
   isOption,
   publicKey,
@@ -11,74 +15,59 @@ import {
 } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
-  DCASettings,
   DCASettingsInpArgs,
   LendingPlatform,
-  PositionState,
+  RebalanceStep,
   SolautoActionArgs,
-  SolautoPosition,
-  SolautoRebalanceType,
-  SolautoRebalanceTypeArgs,
-  SolautoSettingsParameters,
   SolautoSettingsParametersInpArgs,
   TokenType,
   UpdatePositionDataArgs,
   cancelDCA,
-  closePosition,
-  safeFetchSolautoPosition,
   updatePosition,
-} from "../generated";
+} from "../../generated";
 import {
   getSolautoPositionAccount,
   getTokenAccount,
-} from "../utils/accountUtils";
-import { SOLAUTO_FEES_WALLET } from "../constants/generalAccounts";
+} from "../../utils/accountUtils";
+import { SOLAUTO_FEES_WALLET } from "../../constants/generalAccounts";
 import {
   getWrappedInstruction,
   splTokenTransferUmiIx,
-} from "../utils/solanaUtils";
-import {
-  FlashLoanDetails,
-  RebalanceValues,
-} from "../utils/solauto/rebalanceUtils";
-import {
-  MIN_POSITION_STATE_FRESHNESS_SECS,
-  SOLAUTO_LUT,
-} from "../constants/solautoConstants";
-import { currentUnixSeconds } from "../utils/generalUtils";
-import { ContextUpdates } from "../utils/solauto/generalUtils";
+} from "../../utils/solanaUtils";
+import { SOLAUTO_LUT } from "../../constants/solautoConstants";
+import { ContextUpdates } from "../../utils/solautoUtils";
 import {
   ReferralStateManager,
   ReferralStateManagerArgs,
 } from "./referralStateManager";
-import { QuoteResponse } from "@jup-ag/api";
+import {
+  getOrCreatePositionEx,
+  SolautoPositionEx,
+} from "../../solautoPosition";
+import { RebalanceDetails } from "../../types";
+import { FlProviderAggregator } from "../flashLoans/flProviderAggregator";
 
 export interface SolautoClientArgs extends ReferralStateManagerArgs {
   new?: boolean;
   positionId?: number;
   supplyMint?: PublicKey;
   debtMint?: PublicKey;
+  lendingPool?: PublicKey;
+  lpUserAccount?: PublicKey;
 }
 
 export abstract class SolautoClient extends ReferralStateManager {
-  public lendingPlatform?: LendingPlatform;
+  public lendingPlatform!: LendingPlatform;
 
   public authority!: PublicKey;
 
   public positionId!: number;
   public selfManaged!: boolean;
-  public solautoPosition!: PublicKey;
-  public solautoPositionData!: SolautoPosition | null;
-  public solautoPositionState!: PositionState | undefined;
+  public solautoPosition!: SolautoPositionEx;
 
-  public maxLtvBps?: number;
-  public liqThresholdBps?: number;
-
-  public supplyMint!: PublicKey;
   public positionSupplyTa!: PublicKey;
   public signerSupplyTa!: PublicKey;
 
-  public debtMint!: PublicKey;
   public positionDebtTa!: PublicKey;
   public signerDebtTa!: PublicKey;
 
@@ -87,6 +76,7 @@ export abstract class SolautoClient extends ReferralStateManager {
 
   public authorityLutAddress?: PublicKey;
 
+  public flProvider!: FlProviderAggregator;
   public contextUpdates: ContextUpdates = new ContextUpdates();
 
   private signerSupplyBalance: bigint | undefined;
@@ -97,55 +87,55 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     this.positionId = args.positionId ?? 0;
     this.selfManaged = this.positionId === 0;
-    this.solautoPosition = getSolautoPositionAccount(
+    if (
+      this.selfManaged &&
+      (!args.supplyMint || !args.debtMint || !args.lpUserAccount)
+    ) {
+      throw new Error("Self managed position is missing arguments");
+    }
+
+    const positionPk = getSolautoPositionAccount(
       this.authority,
       this.positionId,
       this.programId
     );
-    this.solautoPositionData = !args.new
-      ? await safeFetchSolautoPosition(
-          this.umi,
-          publicKey(this.solautoPosition),
-          { commitment: "confirmed" }
-        )
-      : null;
-    this.solautoPositionState = this.solautoPositionData?.state;
-
-    this.maxLtvBps = undefined;
-    this.liqThresholdBps = undefined;
+    this.solautoPosition = await getOrCreatePositionEx(
+      this.umi,
+      positionPk,
+      {
+        supplyMint: args.supplyMint,
+        debtMint: args.debtMint,
+        lpUserAccount: args.lpUserAccount,
+        lendingPlatform: this.lendingPlatform,
+      },
+      this.contextUpdates
+    );
 
-    this.supplyMint =
-      args.supplyMint ??
-      (this.solautoPositionData && !this.selfManaged
-        ? toWeb3JsPublicKey(this.solautoPositionData!.state.supply.mint)
-        : PublicKey.default);
     this.positionSupplyTa = getTokenAccount(
-      this.solautoPosition,
-      this.supplyMint
+      this.solautoPosition.publicKey,
+      this.solautoPosition.supplyMint()
     );
     this.signerSupplyTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
-      this.supplyMint
+      this.solautoPosition.supplyMint()
     );
 
-    this.debtMint =
-      args.debtMint ??
-      (this.solautoPositionData && !this.selfManaged
-        ? toWeb3JsPublicKey(this.solautoPositionData!.state.debt.mint)
-        : PublicKey.default);
-    this.positionDebtTa = getTokenAccount(this.solautoPosition, this.debtMint);
+    this.positionDebtTa = getTokenAccount(
+      this.solautoPosition.publicKey,
+      this.solautoPosition.debtMint()
+    );
     this.signerDebtTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
-      this.debtMint
+      this.solautoPosition.debtMint()
     );
 
     this.solautoFeesSupplyTa = getTokenAccount(
       SOLAUTO_FEES_WALLET,
-      this.supplyMint
+      this.solautoPosition.supplyMint()
     );
     this.solautoFeesDebtTa = getTokenAccount(
       SOLAUTO_FEES_WALLET,
-      this.debtMint
+      this.solautoPosition.debtMint()
     );
 
     this.authorityLutAddress =
@@ -156,59 +146,59 @@ export abstract class SolautoClient extends ReferralStateManager {
         ? toWeb3JsPublicKey(this.referralStateData.lookupTable)
         : undefined;
 
-    this.log("Position state: ", this.solautoPositionState);
-    this.log(
-      "Position settings: ",
-      this.solautoPositionData?.position?.settingParams
-    );
-    this.log(
-      "Position DCA: ",
-      (this.solautoPositionData?.position?.dca?.automation?.targetPeriods ??
-        0) > 0
-        ? this.solautoPositionData?.position?.dca
-        : undefined
+    this.flProvider = new FlProviderAggregator(
+      this.umi,
+      this.signer,
+      this.solautoPosition.supplyMint(),
+      this.solautoPosition.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());
   }
 
   referredBySupplyTa(): PublicKey | undefined {
     if (this.referredByState !== undefined) {
-      return getTokenAccount(this.referredByState, this.supplyMint);
+      return getTokenAccount(
+        this.referredByState,
+        this.solautoPosition.supplyMint()
+      );
     }
     return undefined;
   }
 
   referredByDebtTa(): PublicKey | undefined {
     if (this.referredByState !== undefined) {
-      return getTokenAccount(this.referredByState, this.debtMint);
+      return getTokenAccount(
+        this.referredByState,
+        this.solautoPosition.debtMint()
+      );
     }
     return undefined;
   }
 
   async resetLiveTxUpdates(success?: boolean) {
+    this.log("Resetting context updates...");
     if (success) {
-      if (!this.solautoPositionData) {
-        this.solautoPositionData = await safeFetchSolautoPosition(
-          this.umi,
-          publicKey(this.solautoPosition),
-          { commitment: "confirmed" }
-        );
+      if (!this.solautoPosition.exists()) {
+        await this.solautoPosition.refetchPositionData();
       } else {
-        if (this.contextUpdates.activeDca) {
-          this.solautoPositionData.position.dca =
-            this.contextUpdates.activeDca;
-        }
         if (this.contextUpdates.settings) {
-          this.solautoPositionData.position.settingParams =
+          this.solautoPosition.data().position!.settings =
             this.contextUpdates.settings;
         }
+        if (this.contextUpdates.dca) {
+          this.solautoPosition.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
       }
     }
     this.contextUpdates.reset();
   }
 
-  abstract protocolAccount(): PublicKey;
-
   defaultLookupTables(): string[] {
     return [
       SOLAUTO_LUT,
@@ -227,12 +217,13 @@ export abstract class SolautoClient extends ReferralStateManager {
       ...(toWeb3JsPublicKey(this.signer.publicKey).equals(this.authority)
         ? [this.signerDebtTa]
         : []),
-      this.solautoPosition,
+      this.solautoPosition.publicKey,
       this.positionSupplyTa,
       this.positionDebtTa,
       this.referralState,
       ...(this.referredBySupplyTa() ? [this.referredBySupplyTa()!] : []),
       ...(this.referredByDebtTa() ? [this.referredByDebtTa()!] : []),
+      ...this.flProvider.lutAccountsToAdd(),
     ];
   }
 
@@ -254,10 +245,6 @@ export abstract class SolautoClient extends ReferralStateManager {
       }
     | undefined
   > {
-    if (this.selfManaged) {
-      return undefined;
-    }
-
     const existingLutAccounts = await this.fetchExistingAuthorityLutAccounts();
     if (
       this.lutAccountsToAdd().every((element) =>
@@ -279,7 +266,9 @@ export abstract class SolautoClient extends ReferralStateManager {
           recentSlot: await this.umi.rpc.getSlot({ commitment: "finalized" }),
         });
       this.authorityLutAddress = lookupTableAddress;
-      tx = tx.add(getWrappedInstruction(this.signer, createLookupTableInst));
+      tx = tx
+        .add(getWrappedInstruction(this.signer, createLookupTableInst))
+        .add(this.updateReferralStatesIx(undefined, this.authorityLutAddress));
     }
 
     const accountsToAdd: PublicKey[] = this.lutAccountsToAdd().filter(
@@ -292,17 +281,19 @@ export abstract class SolautoClient extends ReferralStateManager {
       return undefined;
     }
 
-    tx = tx.add(
-      getWrappedInstruction(
-        this.signer,
-        AddressLookupTableProgram.extendLookupTable({
-          payer: toWeb3JsPublicKey(this.signer.publicKey),
-          authority: this.authority,
-          lookupTable: this.authorityLutAddress,
-          addresses: accountsToAdd,
-        })
+    tx = tx
+      .add(
+        getWrappedInstruction(
+          this.signer,
+          AddressLookupTableProgram.extendLookupTable({
+            payer: toWeb3JsPublicKey(this.signer.publicKey),
+            authority: this.authority,
+            lookupTable: this.authorityLutAddress,
+            addresses: accountsToAdd,
+          })
+        )
       )
-    );
+      .add(await this.flProvider.flAccountPrereqIxs());
 
     this.log("Requires authority LUT update...");
     return {
@@ -328,23 +319,29 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     [this.signerSupplyBalance, this.signerDebtBalance] = await Promise.all([
       (async () => {
-        const data = await this.connection.getTokenAccountBalance(
-          getTokenAccount(
-            toWeb3JsPublicKey(this.signer.publicKey),
-            this.supplyMint
-          ),
-          "confirmed"
-        );
+        let data: RpcResponseAndContext<TokenAmount> | undefined;
+        try {
+          data = await this.connection.getTokenAccountBalance(
+            getTokenAccount(
+              toWeb3JsPublicKey(this.signer.publicKey),
+              this.solautoPosition.supplyMint()
+            ),
+            "confirmed"
+          );
+        } catch {}
         return BigInt(parseInt(data?.value.amount ?? "0"));
       })(),
       (async () => {
-        const data = await this.connection.getTokenAccountBalance(
-          getTokenAccount(
-            toWeb3JsPublicKey(this.signer.publicKey),
-            this.debtMint
-          ),
-          "confirmed"
-        );
+        let data: RpcResponseAndContext<TokenAmount> | undefined;
+        try {
+          const data = await this.connection.getTokenAccountBalance(
+            getTokenAccount(
+              toWeb3JsPublicKey(this.signer.publicKey),
+              this.solautoPosition.debtMint()
+            ),
+            "confirmed"
+          );
+        } catch {}
         return BigInt(parseInt(data?.value.amount ?? "0"));
       })(),
     ]);
@@ -355,29 +352,8 @@ export abstract class SolautoClient extends ReferralStateManager {
     };
   }
 
-  solautoPositionSettings(): SolautoSettingsParameters | undefined {
-    return (
-      this.contextUpdates.settings ??
-      this.solautoPositionData?.position.settingParams
-    );
-  }
-
-  solautoPositionActiveDca(): DCASettings | undefined {
-    return (
-      this.contextUpdates.activeDca ??
-      this.solautoPositionData?.position.dca
-    );
-  }
-
-  async maxLtvAndLiqThresholdBps(): Promise<[number, number]> {
-    if (this.maxLtvBps !== undefined && this.liqThresholdBps !== undefined) {
-      return [this.maxLtvBps, this.liqThresholdBps];
-    }
-    return [0, 0];
-  }
-
-  openPosition(
-    settingParams?: SolautoSettingsParametersInpArgs,
+  openPositionIx(
+    settings?: SolautoSettingsParametersInpArgs,
     dca?: DCASettingsInpArgs
   ): TransactionBuilder {
     if (dca && dca.dcaInBaseUnit > 0) {
@@ -389,10 +365,10 @@ export abstract class SolautoClient extends ReferralStateManager {
         },
       });
     }
-    if (settingParams) {
+    if (settings) {
       this.contextUpdates.new({
         type: "settings",
-        value: settingParams,
+        value: settings,
       });
     }
     if (dca) {
@@ -411,11 +387,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.supplyMint);
+        dcaMint = publicKey(this.solautoPosition.supplyMint());
         positionDcaTa = publicKey(this.positionSupplyTa);
         signerDcaTa = publicKey(this.signerSupplyTa);
       } else {
-        dcaMint = publicKey(this.debtMint);
+        dcaMint = publicKey(this.solautoPosition.debtMint());
         positionDcaTa = publicKey(this.positionDebtTa);
         signerDcaTa = publicKey(this.signerDebtTa);
       }
@@ -435,10 +411,10 @@ export abstract class SolautoClient extends ReferralStateManager {
       }
     }
 
-    if (isOption(args.settingParams) && isSome(args.settingParams)) {
+    if (isOption(args.settings) && isSome(args.settings)) {
       this.contextUpdates.new({
         type: "settings",
-        value: args.settingParams.value,
+        value: args.settings.value,
       });
     }
 
@@ -451,7 +427,7 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     return updatePosition(this.umi, {
       signer: this.signer,
-      solautoPosition: publicKey(this.solautoPosition),
+      solautoPosition: publicKey(this.solautoPosition.publicKey),
       dcaMint,
       positionDcaTa,
       signerDcaTa,
@@ -459,53 +435,43 @@ export abstract class SolautoClient extends ReferralStateManager {
     });
   }
 
-  closePositionIx(): TransactionBuilder {
-    return closePosition(this.umi, {
-      signer: this.signer,
-      solautoPosition: publicKey(this.solautoPosition),
-      signerSupplyTa: publicKey(this.signerSupplyTa),
-      positionSupplyTa: publicKey(this.positionSupplyTa),
-      positionDebtTa: publicKey(this.positionDebtTa),
-      signerDebtTa: publicKey(this.signerDebtTa),
-      protocolAccount: publicKey(this.protocolAccount()),
-    });
-  }
+  abstract closePositionIx(): TransactionBuilder;
 
   cancelDCAIx(): TransactionBuilder {
     let dcaMint: UmiPublicKey | undefined = undefined;
     let positionDcaTa: UmiPublicKey | undefined = undefined;
     let signerDcaTa: UmiPublicKey | undefined = undefined;
 
-    const currDca = this.solautoPositionActiveDca()!;
+    const currDca = this.solautoPosition.dca()!;
     if (currDca.dcaInBaseUnit > 0) {
       if (currDca.tokenType === TokenType.Supply) {
-        dcaMint = publicKey(this.supplyMint);
+        dcaMint = publicKey(this.solautoPosition.supplyMint());
         positionDcaTa = publicKey(this.positionSupplyTa);
         signerDcaTa = publicKey(this.signerSupplyTa);
       } else {
-        dcaMint = publicKey(this.debtMint);
+        dcaMint = publicKey(this.solautoPosition.debtMint());
         positionDcaTa = publicKey(this.positionDebtTa);
         signerDcaTa = publicKey(this.signerDebtTa);
       }
 
       this.contextUpdates.new({
         type: "cancellingDca",
-        value: this.solautoPositionData!.position.dca.tokenType,
+        value: this.solautoPosition.dca()!.tokenType,
       });
     }
 
     return cancelDCA(this.umi, {
       signer: this.signer,
-      solautoPosition: publicKey(this.solautoPosition),
+      solautoPosition: publicKey(this.solautoPosition.publicKey),
       dcaMint,
       positionDcaTa,
       signerDcaTa,
     });
   }
 
-  abstract refresh(): TransactionBuilder;
+  abstract refreshIx(): TransactionBuilder;
 
-  protocolInteraction(args: SolautoActionArgs): TransactionBuilder {
+  protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder {
     let tx = transactionBuilder();
 
     if (!this.selfManaged) {
@@ -539,8 +505,9 @@ export abstract class SolautoClient extends ReferralStateManager {
               toWeb3JsPublicKey(this.signer.publicKey),
               BigInt(
                 Math.round(
-                  Number(this.solautoPositionState!.debt.amountUsed.baseUnit) *
-                    1.01
+                  Number(
+                    this.solautoPosition.state().debt.amountUsed.baseUnit
+                  ) * 1.01
                 )
               )
             )
@@ -564,7 +531,7 @@ export abstract class SolautoClient extends ReferralStateManager {
         this.contextUpdates.new({
           type: "supply",
           value:
-            (this.solautoPositionState?.supply.amountUsed.baseUnit ??
+            (this.solautoPosition.state().supply.amountUsed.baseUnit ??
               BigInt(0)) * BigInt(-1),
         });
       }
@@ -583,8 +550,8 @@ export abstract class SolautoClient extends ReferralStateManager {
         this.contextUpdates.new({
           type: "debt",
           value:
-            (this.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) *
-            BigInt(-1),
+            (this.solautoPosition.state().debt.amountUsed.baseUnit ??
+              BigInt(0)) * BigInt(-1),
         });
       }
     }
@@ -592,38 +559,8 @@ export abstract class SolautoClient extends ReferralStateManager {
     return tx;
   }
 
-  abstract flashBorrow(
-    rebalanceType: SolautoRebalanceType,
-    flashLoanDetails: FlashLoanDetails,
-    destinationTokenAccount: PublicKey
+  abstract rebalanceIx(
+    rebalanceStep: RebalanceStep,
+    data: RebalanceDetails
   ): TransactionBuilder;
-
-  abstract flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
-
-  abstract rebalance(
-    rebalanceStep: "A" | "B",
-    jupQuote: QuoteResponse,
-    rebalanceType: SolautoRebalanceTypeArgs,
-    rebalanceValues: RebalanceValues,
-    flashLoan?: FlashLoanDetails,
-    targetLiqUtilizationRateBps?: number
-  ): TransactionBuilder;
-
-  async getFreshPositionState(): Promise<PositionState | undefined> {
-    if (
-      Boolean(this.solautoPositionData) &&
-      Boolean(this.solautoPositionState) &&
-      Number(this.solautoPositionState!.lastUpdated) >
-        currentUnixSeconds() - MIN_POSITION_STATE_FRESHNESS_SECS &&
-      !this.contextUpdates.positionUpdates()
-    ) {
-      return this.solautoPositionState;
-    }
-
-    return undefined;
-  }
-
-  abstract supplyLiquidityAvailable(): bigint;
-  abstract supplyLiquidityDepositable(): bigint;
-  abstract debtLiquidityAvailable(): bigint;
 }