@haven-fi/solauto-sdk 1.0.581 → 1.0.583

package/src/clients/solautoMarginfiClient.ts

@@ -1,774 +0,0 @@
-import {
-  fromWeb3JsPublicKey,
-  toWeb3JsPublicKey,
-} from "@metaplex-foundation/umi-web3js-adapters";
-import {
-  Signer,
-  TransactionBuilder,
-  publicKey,
-  PublicKey as UmiPublicKey,
-  transactionBuilder,
-  createSignerFromKeypair,
-  AccountMeta,
-} from "@metaplex-foundation/umi";
-import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
-import { SolautoClient, SolautoClientArgs } from "./solautoClient";
-import { MarginfiAssetAccounts } from "../types/accounts";
-import {
-  DEFAULT_MARGINFI_GROUP,
-  MARGINFI_ACCOUNTS,
-  MARGINFI_ACCOUNTS_LOOKUP_TABLE,
-} from "../constants/marginfiAccounts";
-import {
-  DCASettingsInpArgs,
-  LendingPlatform,
-  PositionState,
-  PositionType,
-  RebalanceDirection,
-  SolautoActionArgs,
-  SolautoRebalanceType,
-  SolautoRebalanceTypeArgs,
-  SolautoSettingsParametersInpArgs,
-  marginfiOpenPosition,
-  marginfiProtocolInteraction,
-  marginfiRebalance,
-  marginfiRefreshData,
-} from "../generated";
-import { getTokenAccount } from "../utils/accountUtils";
-import {
-  Bank,
-  MARGINFI_PROGRAM_ID,
-  MarginfiAccount,
-  lendingAccountBorrow,
-  lendingAccountDeposit,
-  lendingAccountEndFlashloan,
-  lendingAccountRepay,
-  lendingAccountStartFlashloan,
-  lendingAccountWithdraw,
-  marginfiAccountInitialize,
-  safeFetchAllMarginfiAccount,
-  safeFetchMarginfiAccount,
-} from "../marginfi-sdk";
-import {
-  FlashLoanDetails,
-  RebalanceValues,
-} from "../utils/solauto/rebalanceUtils";
-import {
-  findMarginfiAccounts,
-  getAllMarginfiAccountsByAuthority,
-  getBankLiquidityAvailableBaseUnit,
-  getMarginfiAccountPositionState,
-  getMarginfiMaxLtvAndLiqThreshold,
-  marginfiAccountEmpty,
-} from "../utils/marginfiUtils";
-import { fromBaseUnit, toBps } from "../utils/numberUtils";
-import { QuoteResponse } from "@jup-ag/api";
-import { consoleLog, safeGetPrice, splTokenTransferUmiIx } from "../utils";
-
-export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
-  marginfiAccount?: PublicKey | Signer;
-  marginfiAccountSeedIdx?: bigint;
-  marginfiGroup?: PublicKey;
-}
-
-export class SolautoMarginfiClient extends SolautoClient {
-  private initializedFor?: PublicKey;
-
-  public marginfiProgram!: PublicKey;
-
-  public marginfiAccountSeedIdx: bigint = BigInt(0);
-  public marginfiAccount!: PublicKey | Signer;
-  public marginfiAccountPk!: PublicKey;
-  public marginfiGroup!: PublicKey;
-
-  public marginfiSupplyAccounts!: MarginfiAssetAccounts;
-  public marginfiDebtAccounts!: MarginfiAssetAccounts;
-
-  public supplyPriceOracle!: PublicKey;
-  public debtPriceOracle!: PublicKey;
-
-  // For flash loans
-  public intermediaryMarginfiAccountSigner?: Signer;
-  public intermediaryMarginfiAccountPk!: PublicKey;
-  public intermediaryMarginfiAccount?: MarginfiAccount;
-
-  private supplyBank: Bank | null = null;
-  private debtBank: Bank | null = null;
-
-  async initialize(args: SolautoMarginfiClientArgs) {
-    await super.initialize(args);
-
-    this.lendingPlatform = LendingPlatform.Marginfi;
-
-    if (this.selfManaged) {
-      this.marginfiAccount =
-        args.marginfiAccount ??
-        createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
-    } else {
-      if (this.solautoPositionData) {
-        this.marginfiAccount = toWeb3JsPublicKey(
-          this.solautoPositionData.position.protocolUserAccount
-        );
-      } else {
-        const accounts = await getAllMarginfiAccountsByAuthority(
-          this.umi,
-          this.solautoPosition,
-          args.marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP),
-          false
-        );
-        const reusableAccounts =
-          accounts.length > 0
-            ? (
-                await safeFetchAllMarginfiAccount(
-                  this.umi,
-                  accounts.map((x) => publicKey(x.marginfiAccount))
-                )
-              ).filter((x) => marginfiAccountEmpty(x))
-            : [];
-        this.marginfiAccount =
-          reusableAccounts.length > 0
-            ? toWeb3JsPublicKey(reusableAccounts[0].publicKey)
-            : createSignerFromKeypair(
-                this.umi,
-                this.umi.eddsa.generateKeypair()
-              );
-      }
-    }
-    this.marginfiAccountPk =
-      "publicKey" in this.marginfiAccount
-        ? toWeb3JsPublicKey(this.marginfiAccount.publicKey)
-        : this.marginfiAccount;
-
-    if ("publicKey" in this.marginfiAccount) {
-      this.otherSigners.push(this.marginfiAccount);
-    }
-
-    const marginfiAccountData = !args.new
-      ? await safeFetchMarginfiAccount(
-          this.umi,
-          publicKey(this.marginfiAccountPk),
-          { commitment: "confirmed" }
-        )
-      : null;
-    this.marginfiGroup = new PublicKey(
-      marginfiAccountData
-        ? marginfiAccountData.group.toString()
-        : (args.marginfiGroup ?? DEFAULT_MARGINFI_GROUP)
-    );
-
-    this.marginfiSupplyAccounts =
-      MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
-        this.supplyMint.toString()
-      ]!;
-    this.marginfiDebtAccounts =
-      MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
-        this.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),
-    //   publicKey(this.marginfiDebtAccounts.bank),
-    // ]);
-    // this.supplyPriceOracle = toWeb3JsPublicKey(supplyBank.config.oracleKeys[0]);
-    // this.debtPriceOracle = toWeb3JsPublicKey(debtBank.config.oracleKeys[0]);
-    this.supplyPriceOracle = new PublicKey(
-      this.marginfiSupplyAccounts.priceOracle
-    );
-    this.debtPriceOracle = new PublicKey(this.marginfiDebtAccounts.priceOracle);
-
-    if (
-      !this.initializedFor ||
-      !this.initializedFor.equals(toWeb3JsPublicKey(this.signer.publicKey))
-    ) {
-      await this.setIntermediaryMarginfiDetails();
-      this.initializedFor = toWeb3JsPublicKey(this.signer.publicKey);
-    }
-
-    consoleLog("Marginfi account:", this.marginfiAccountPk.toString());
-    consoleLog(
-      "Intermediary MF account:",
-      this.intermediaryMarginfiAccountPk.toString()
-    );
-  }
-
-  async setIntermediaryMarginfiDetails() {
-    const existingMarginfiAccounts = (
-      await getAllMarginfiAccountsByAuthority(
-        this.umi,
-        toWeb3JsPublicKey(this.signer.publicKey),
-        this.marginfiGroup
-      )
-    )
-      .filter((x) => !x.marginfiAccount.equals(this.marginfiAccountPk))
-      .sort((a, b) =>
-        a.marginfiAccount.toString().localeCompare(b.marginfiAccount.toString())
-      );
-    const compatibleMarginfiAccounts =
-      existingMarginfiAccounts.length > 0
-        ? (
-            await safeFetchAllMarginfiAccount(
-              this.umi,
-              existingMarginfiAccounts.map((x) => publicKey(x.marginfiAccount))
-            )
-          ).filter((x) => marginfiAccountEmpty(x))
-        : [];
-
-    this.intermediaryMarginfiAccountSigner =
-      compatibleMarginfiAccounts.length > 0
-        ? undefined
-        : createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
-    this.intermediaryMarginfiAccountPk =
-      compatibleMarginfiAccounts.length > 0
-        ? toWeb3JsPublicKey(compatibleMarginfiAccounts[0].publicKey)
-        : toWeb3JsPublicKey(this.intermediaryMarginfiAccountSigner!.publicKey);
-    this.intermediaryMarginfiAccount =
-      compatibleMarginfiAccounts.length > 0
-        ? compatibleMarginfiAccounts[0]
-        : undefined;
-
-    if (this.intermediaryMarginfiAccountSigner) {
-      this.otherSigners.push(this.intermediaryMarginfiAccountSigner);
-    }
-  }
-
-  protocolAccount(): PublicKey {
-    return this.marginfiAccountPk;
-  }
-
-  defaultLookupTables(): string[] {
-    return [MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
-  }
-
-  lutAccountsToAdd(): PublicKey[] {
-    return [
-      ...super.lutAccountsToAdd(),
-      this.marginfiAccountPk,
-      ...(this.signer.publicKey.toString() === this.authority.toString()
-        ? [this.intermediaryMarginfiAccountPk]
-        : []),
-    ];
-  }
-
-  async maxLtvAndLiqThresholdBps(): Promise<[number, number]> {
-    const result = await super.maxLtvAndLiqThresholdBps();
-    if (result[0] && result[1]) {
-      return result;
-    } else if (
-      this.supplyMint.equals(PublicKey.default) ||
-      this.debtMint.equals(PublicKey.default)
-    ) {
-      return [0, 0];
-    } else {
-      const [maxLtv, liqThreshold] = await getMarginfiMaxLtvAndLiqThreshold(
-        this.umi,
-        this.marginfiGroup,
-        {
-          mint: this.supplyMint,
-        },
-        {
-          mint: this.debtMint,
-        }
-      );
-      this.maxLtvBps = toBps(maxLtv);
-      this.liqThresholdBps = toBps(liqThreshold);
-      return [this.maxLtvBps, this.liqThresholdBps];
-    }
-  }
-
-  marginfiAccountInitialize(marginfiAccount: Signer): TransactionBuilder {
-    return marginfiAccountInitialize(this.umi, {
-      marginfiAccount: marginfiAccount,
-      marginfiGroup: publicKey(this.marginfiGroup),
-      authority: this.signer,
-      feePayer: this.signer,
-    });
-  }
-
-  openPosition(
-    settingParams?: SolautoSettingsParametersInpArgs,
-    dca?: DCASettingsInpArgs
-  ): TransactionBuilder {
-    return super
-      .openPosition(settingParams, dca)
-      .add(this.marginfiOpenPositionIx(settingParams, dca));
-  }
-
-  private marginfiOpenPositionIx(
-    settingParams?: SolautoSettingsParametersInpArgs,
-    dca?: DCASettingsInpArgs,
-    positionType?: PositionType
-  ): TransactionBuilder {
-    let signerDebtTa: UmiPublicKey | undefined = undefined;
-    if (dca) {
-      signerDebtTa = publicKey(this.signerDebtTa);
-    }
-
-    return marginfiOpenPosition(this.umi, {
-      signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
-      signerReferralState: publicKey(this.referralState),
-      referredByState: this.referredByState
-        ? publicKey(this.referredByState)
-        : undefined,
-      referredBySupplyTa: this.referredBySupplyTa()
-        ? publicKey(this.referredBySupplyTa()!)
-        : undefined,
-      solautoPosition: publicKey(this.solautoPosition),
-      marginfiGroup: publicKey(this.marginfiGroup),
-      marginfiAccount:
-        "publicKey" in this.marginfiAccount
-          ? (this.marginfiAccount as Signer)
-          : publicKey(this.marginfiAccount),
-      supplyMint: publicKey(this.supplyMint),
-      supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
-      positionSupplyTa: publicKey(this.positionSupplyTa),
-      debtMint: publicKey(this.debtMint),
-      debtBank: publicKey(this.marginfiDebtAccounts.bank),
-      positionDebtTa: publicKey(this.positionDebtTa),
-      signerDebtTa: signerDebtTa,
-      positionType: positionType ?? PositionType.Leverage,
-      positionData: {
-        positionId: this.positionId!,
-        settingParams: settingParams ?? null,
-        dca: dca ?? null,
-      },
-      marginfiAccountSeedIdx: !this.selfManaged
-        ? this.marginfiAccountSeedIdx
-        : null,
-    });
-  }
-
-  refresh(): TransactionBuilder {
-    return marginfiRefreshData(this.umi, {
-      signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
-      marginfiGroup: publicKey(this.marginfiGroup),
-      marginfiAccount: publicKey(this.marginfiAccount),
-      supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
-      supplyPriceOracle: publicKey(this.supplyPriceOracle),
-      debtBank: publicKey(this.marginfiDebtAccounts.bank),
-      debtPriceOracle: publicKey(this.debtPriceOracle),
-      solautoPosition: publicKey(this.solautoPosition),
-    });
-  }
-
-  protocolInteraction(args: SolautoActionArgs): TransactionBuilder {
-    let tx = super.protocolInteraction(args);
-
-    if (this.selfManaged) {
-      return tx.add(this.marginfiProtocolInteractionIx(args));
-    } else {
-      return tx.add(this.marginfiSolautoProtocolInteractionIx(args));
-    }
-  }
-
-  private marginfiProtocolInteractionIx(args: SolautoActionArgs) {
-    switch (args.__kind) {
-      case "Deposit": {
-        return lendingAccountDeposit(this.umi, {
-          amount: args.fields[0],
-          signer: this.signer,
-          signerTokenAccount: publicKey(this.signerSupplyTa),
-          marginfiAccount: publicKey(this.marginfiAccountPk),
-          marginfiGroup: publicKey(this.marginfiGroup),
-          bank: publicKey(this.marginfiSupplyAccounts.bank),
-          bankLiquidityVault: publicKey(
-            this.marginfiSupplyAccounts.liquidityVault
-          ),
-        });
-      }
-      case "Borrow": {
-        return lendingAccountBorrow(this.umi, {
-          amount: args.fields[0],
-          signer: this.signer,
-          destinationTokenAccount: publicKey(this.signerDebtTa),
-          marginfiAccount: publicKey(this.marginfiAccountPk),
-          marginfiGroup: publicKey(this.marginfiGroup),
-          bank: publicKey(this.marginfiDebtAccounts.bank),
-          bankLiquidityVault: publicKey(
-            this.marginfiDebtAccounts.liquidityVault
-          ),
-          bankLiquidityVaultAuthority: publicKey(
-            this.marginfiDebtAccounts.vaultAuthority
-          ),
-        });
-      }
-      case "Repay": {
-        return lendingAccountRepay(this.umi, {
-          amount:
-            args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
-          repayAll: args.fields[0].__kind === "All" ? true : false,
-          signer: this.signer,
-          signerTokenAccount: publicKey(this.signerDebtTa),
-          marginfiAccount: publicKey(this.marginfiAccountPk),
-          marginfiGroup: publicKey(this.marginfiGroup),
-          bank: publicKey(this.marginfiDebtAccounts.bank),
-          bankLiquidityVault: publicKey(
-            this.marginfiDebtAccounts.liquidityVault
-          ),
-        });
-      }
-      case "Withdraw": {
-        return lendingAccountWithdraw(this.umi, {
-          amount:
-            args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
-          withdrawAll: args.fields[0].__kind === "All" ? true : false,
-          signer: this.signer,
-          destinationTokenAccount: publicKey(this.signerSupplyTa),
-          marginfiAccount: publicKey(this.marginfiAccountPk),
-          marginfiGroup: publicKey(this.marginfiGroup),
-          bank: publicKey(this.marginfiSupplyAccounts.bank),
-          bankLiquidityVault: publicKey(
-            this.marginfiSupplyAccounts.liquidityVault
-          ),
-          bankLiquidityVaultAuthority: publicKey(
-            this.marginfiSupplyAccounts.vaultAuthority
-          ),
-        });
-      }
-    }
-  }
-
-  private marginfiSolautoProtocolInteractionIx(
-    args: SolautoActionArgs
-  ): TransactionBuilder {
-    let positionSupplyTa: UmiPublicKey | undefined = undefined;
-    let vaultSupplyTa: UmiPublicKey | undefined = undefined;
-    let supplyVaultAuthority: UmiPublicKey | undefined = undefined;
-    if (args.__kind === "Deposit" || args.__kind === "Withdraw") {
-      positionSupplyTa = publicKey(
-        args.__kind === "Withdraw" || this.selfManaged
-          ? this.signerSupplyTa
-          : this.positionSupplyTa
-      );
-      vaultSupplyTa = publicKey(this.marginfiSupplyAccounts.liquidityVault);
-      supplyVaultAuthority = publicKey(
-        this.marginfiSupplyAccounts.vaultAuthority
-      );
-    }
-
-    let positionDebtTa: UmiPublicKey | undefined = undefined;
-    let vaultDebtTa: UmiPublicKey | undefined = undefined;
-    let debtVaultAuthority: UmiPublicKey | undefined = undefined;
-    if (args.__kind === "Borrow" || args.__kind === "Repay") {
-      positionDebtTa = publicKey(
-        args.__kind === "Borrow" || this.selfManaged
-          ? this.signerDebtTa
-          : this.positionDebtTa
-      );
-      vaultDebtTa = publicKey(this.marginfiDebtAccounts.liquidityVault);
-      debtVaultAuthority = publicKey(this.marginfiDebtAccounts.vaultAuthority);
-    }
-
-    let supplyPriceOracle: UmiPublicKey | undefined = undefined;
-    let debtPriceOracle: UmiPublicKey | undefined = undefined;
-    if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
-      supplyPriceOracle = publicKey(this.supplyPriceOracle);
-      debtPriceOracle = publicKey(this.debtPriceOracle);
-    }
-
-    return marginfiProtocolInteraction(this.umi, {
-      signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
-      solautoPosition: publicKey(this.solautoPosition),
-      marginfiGroup: publicKey(this.marginfiGroup),
-      marginfiAccount: publicKey(this.marginfiAccountPk),
-      supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
-      supplyPriceOracle,
-      positionSupplyTa,
-      vaultSupplyTa,
-      supplyVaultAuthority,
-      debtBank: publicKey(this.marginfiDebtAccounts.bank),
-      debtPriceOracle,
-      positionDebtTa,
-      vaultDebtTa,
-      debtVaultAuthority,
-      solautoAction: args,
-    });
-  }
-
-  rebalance(
-    rebalanceStep: "A" | "B",
-    jupQuote: QuoteResponse,
-    rebalanceType: SolautoRebalanceTypeArgs,
-    rebalanceValues: RebalanceValues,
-    flashLoan?: FlashLoanDetails,
-    targetLiqUtilizationRateBps?: number
-  ): TransactionBuilder {
-    const inputIsSupply = new PublicKey(jupQuote.inputMint).equals(
-      this.supplyMint
-    );
-    const outputIsSupply = new PublicKey(jupQuote.outputMint).equals(
-      this.supplyMint
-    );
-    const needSupplyAccounts =
-      (inputIsSupply && rebalanceStep === "A") ||
-      (outputIsSupply && rebalanceStep === "B") ||
-      (inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
-    const needDebtAccounts =
-      (!inputIsSupply && rebalanceStep === "A") ||
-      (!outputIsSupply && rebalanceStep === "B") ||
-      (!inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
-
-    return marginfiRebalance(this.umi, {
-      signer: this.signer,
-      marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
-      ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
-      solautoFeesTa:
-        rebalanceStep === "B"
-          ? publicKey(
-              rebalanceValues.rebalanceDirection === RebalanceDirection.Boost
-                ? this.solautoFeesSupplyTa
-                : this.solautoFeesDebtTa
-            )
-          : undefined,
-      authorityReferralState: publicKey(this.referralState),
-      referredByTa: this.referredByState
-        ? publicKey(
-            rebalanceValues.rebalanceDirection === RebalanceDirection.Boost
-              ? this.referredBySupplyTa()!
-              : this.referredByDebtTa()!
-          )
-        : undefined,
-      positionAuthority:
-        rebalanceValues.rebalanceAction === "dca"
-          ? publicKey(this.authority)
-          : undefined,
-      solautoPosition: publicKey(this.solautoPosition),
-      marginfiGroup: publicKey(this.marginfiGroup),
-      marginfiAccount: publicKey(this.marginfiAccountPk),
-      intermediaryTa: publicKey(
-        getTokenAccount(
-          toWeb3JsPublicKey(this.signer.publicKey),
-          new PublicKey(jupQuote.inputMint)
-        )
-      ),
-      supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
-      supplyPriceOracle: publicKey(this.supplyPriceOracle),
-      positionSupplyTa: publicKey(this.positionSupplyTa),
-      authoritySupplyTa: this.selfManaged
-        ? publicKey(getTokenAccount(this.authority, this.supplyMint))
-        : undefined,
-      vaultSupplyTa: needSupplyAccounts
-        ? publicKey(this.marginfiSupplyAccounts.liquidityVault)
-        : undefined,
-      supplyVaultAuthority: needSupplyAccounts
-        ? publicKey(this.marginfiSupplyAccounts.vaultAuthority)
-        : undefined,
-      debtBank: publicKey(this.marginfiDebtAccounts.bank),
-      debtPriceOracle: publicKey(this.debtPriceOracle),
-      positionDebtTa: publicKey(this.positionDebtTa),
-      authorityDebtTa: this.selfManaged
-        ? publicKey(getTokenAccount(this.authority, this.debtMint))
-        : undefined,
-      vaultDebtTa: needDebtAccounts
-        ? publicKey(this.marginfiDebtAccounts.liquidityVault)
-        : undefined,
-      debtVaultAuthority: needDebtAccounts
-        ? publicKey(this.marginfiDebtAccounts.vaultAuthority)
-        : undefined,
-      rebalanceType,
-      targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
-      targetInAmountBaseUnit: parseInt(jupQuote.inAmount),
-    });
-  }
-
-  flashBorrow(
-    rebalanceType: SolautoRebalanceType,
-    flashLoanDetails: FlashLoanDetails,
-    destinationTokenAccount: PublicKey
-  ): TransactionBuilder {
-    if (flashLoanDetails.signerFlashLoan) {
-      if (rebalanceType === SolautoRebalanceType.FLRebalanceThenSwap) {
-        return transactionBuilder().add(
-          splTokenTransferUmiIx(
-            this.signer,
-            getTokenAccount(toWeb3JsPublicKey(this.signer.publicKey), this.debtMint),
-            destinationTokenAccount,
-            toWeb3JsPublicKey(this.signer.publicKey),
-            flashLoanDetails.baseUnitAmount
-          )
-        );
-      } else {
-        return transactionBuilder();
-      }
-    }
-
-    const bank = flashLoanDetails.mint.equals(this.supplyMint)
-      ? this.marginfiSupplyAccounts
-      : this.marginfiDebtAccounts;
-    return transactionBuilder()
-      .add(
-        lendingAccountStartFlashloan(this.umi, {
-          endIndex: 0, // We set this after building the transaction
-          ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
-          marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
-          signer: this.signer,
-        })
-      )
-      .add(
-        lendingAccountBorrow(this.umi, {
-          amount: flashLoanDetails.baseUnitAmount,
-          bank: publicKey(bank.bank),
-          bankLiquidityVault: publicKey(bank.liquidityVault),
-          bankLiquidityVaultAuthority: publicKey(bank.vaultAuthority),
-          destinationTokenAccount: publicKey(destinationTokenAccount),
-          marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
-          marginfiGroup: publicKey(this.marginfiGroup),
-          signer: this.signer,
-        })
-      );
-  }
-
-  flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder {
-    if (flashLoanDetails.signerFlashLoan) {
-      return transactionBuilder();
-    }
-
-    const accounts = flashLoanDetails.useDebtLiquidity
-      ? { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle }
-      : { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle };
-
-    const remainingAccounts: AccountMeta[] = [];
-    let includedFlashLoanToken = false;
-
-    if (this.intermediaryMarginfiAccount) {
-      this.intermediaryMarginfiAccount.lendingAccount.balances.forEach(
-        async (x) => {
-          if (x.active) {
-            if (x.bankPk === accounts.data.bank) {
-              includedFlashLoanToken = true;
-            }
-
-            // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
-            // const bankData = await safeFetchBank(this.umi, publicKey(accounts.data.bank));
-            // const priceOracle = bankData!.config.oracleKeys[0];
-            const priceOracle = publicKey(
-              findMarginfiAccounts(toWeb3JsPublicKey(x.bankPk)).priceOracle
-            );
-
-            remainingAccounts.push(
-              ...[
-                {
-                  pubkey: x.bankPk,
-                  isSigner: false,
-                  isWritable: false,
-                },
-                {
-                  pubkey: priceOracle,
-                  isSigner: false,
-                  isWritable: false,
-                },
-              ]
-            );
-          }
-        }
-      );
-    }
-    if (!this.intermediaryMarginfiAccount || !includedFlashLoanToken) {
-      remainingAccounts.push(
-        ...[
-          {
-            pubkey: fromWeb3JsPublicKey(new PublicKey(accounts.data.bank)),
-            isSigner: false,
-            isWritable: false,
-          },
-          {
-            pubkey: fromWeb3JsPublicKey(new PublicKey(accounts.oracle)),
-            isSigner: false,
-            isWritable: false,
-          },
-        ]
-      );
-    }
-
-    return transactionBuilder()
-      .add(
-        lendingAccountRepay(this.umi, {
-          amount: flashLoanDetails.baseUnitAmount,
-          repayAll: null,
-          bank: publicKey(accounts.data.bank),
-          bankLiquidityVault: publicKey(accounts.data.liquidityVault),
-          marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
-          marginfiGroup: publicKey(this.marginfiGroup),
-          signer: this.signer,
-          signerTokenAccount: publicKey(
-            getTokenAccount(
-              toWeb3JsPublicKey(this.signer.publicKey),
-              flashLoanDetails.mint
-            )
-          ),
-        })
-      )
-      .add(
-        lendingAccountEndFlashloan(this.umi, {
-          marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
-          signer: this.signer,
-        }).addRemainingAccounts(remainingAccounts)
-      );
-  }
-
-  async getFreshPositionState(): Promise<PositionState | undefined> {
-    const state = await super.getFreshPositionState();
-    if (state) {
-      return state;
-    }
-
-    const useDesignatedMint =
-      !this.selfManaged &&
-      (this.solautoPositionData === null ||
-        !toWeb3JsPublicKey(this.signer.publicKey).equals(this.authority));
-
-    const resp = await getMarginfiAccountPositionState(
-      this.umi,
-      { pk: this.marginfiAccountPk },
-      this.marginfiGroup,
-      useDesignatedMint ? { mint: this.supplyMint } : undefined,
-      useDesignatedMint ? { mint: this.debtMint } : undefined,
-      this.contextUpdates
-    );
-
-    if (resp) {
-      this.supplyBank = resp?.supplyBank;
-      this.debtBank = resp?.debtBank;
-      const freshState = resp.state;
-
-      this.log("Fresh state", freshState);
-      const supplyPrice = safeGetPrice(freshState?.supply.mint)!;
-      const debtPrice = safeGetPrice(freshState?.debt.mint)!;
-      this.log("Supply price: ", supplyPrice);
-      this.log("Debt price: ", debtPrice);
-      this.log("Liq threshold bps:", freshState.liqThresholdBps);
-      this.log("Liq utilization rate bps:", freshState.liqUtilizationRateBps);
-      this.log(
-        "Supply USD:",
-        fromBaseUnit(
-          freshState.supply.amountUsed.baseUnit,
-          freshState.supply.decimals
-        ) * supplyPrice
-      );
-      this.log(
-        "Debt USD:",
-        fromBaseUnit(
-          freshState.debt.amountUsed.baseUnit,
-          freshState.debt.decimals
-        ) * debtPrice
-      );
-    }
-
-    return resp?.state;
-  }
-
-  supplyLiquidityAvailable(): bigint {
-    return getBankLiquidityAvailableBaseUnit(this.supplyBank, false);
-  }
-
-  supplyLiquidityDepositable(): bigint {
-    return getBankLiquidityAvailableBaseUnit(this.supplyBank, true);
-  }
-
-  debtLiquidityAvailable(): bigint {
-    return getBankLiquidityAvailableBaseUnit(this.debtBank, false);
-  }
-}