@haven-fi/solauto-sdk 1.0.661 → 1.0.663

package/local/txSandbox.ts

@@ -2,6 +2,7 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
+  borrow,
   consoleLog,
   getClient,
   getSolanaRpcConnection,
@@ -12,7 +13,10 @@ import {
   rebalance,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
+  toBaseUnit,
+  tokenInfo,
   TransactionsManager,
+  USDC,
 } from "../src";
 import { getSecretKey } from "./shared";
 
@@ -29,7 +33,7 @@ export async function main() {
 
   const signer = createSignerFromKeypair(
     umi,
-    fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
+    fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
   );
 
   const client = getClient(LendingPlatform.Marginfi, {
@@ -41,14 +45,16 @@ export async function main() {
   });
 
   await client.initialize({
-    positionId: 1,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
-    // lpUserAccount: new PublicKey(
-    //   "EyATEtRH6FQRCJCn4nVzEnKXnzyGaUV1nt4sHqBrQ2fZ"
-    // ),
+    positionId: 0,
+    // authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+    lpUserAccount: new PublicKey(
+      "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
+    ),
   });
 
-  const transactionItems = [rebalance(client)];
+  const transactionItems = [
+    rebalance(client, 300),
+  ];
 
   const txManager = new TransactionsManager(
     client,

package/package.json

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

package/src/services/flashLoans/flProviderAggregator.ts

@@ -76,6 +76,8 @@ export class FlProviderAggregator extends FlProviderBase {
   }
 
   flashRepay(flashLoan: FlashLoanDetails): TransactionBuilder {
-    return this.flProvider(flashLoan.liquiditySource).flashRepay(flashLoan);
+    return this.flProvider(flashLoan.liquiditySource).flashRepay(
+      flashLoan
+    );
   }
 }

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -30,6 +30,7 @@ import {
   getBankLiquidityAvailableBaseUnit,
   getEmptyMarginfiAccountsByAuthority,
   getMarginfiPriceOracle,
+  getRemainingAccountsForMarginfiHealthCheck,
   getTokenAccount,
   rpcAccountCreated,
   safeGetPrice,
@@ -49,8 +50,11 @@ export class MarginfiFlProvider extends FlProviderBase {
   private existingMarginfiAccounts!: MarginfiAccount[];
   private supplyBankLiquiditySource!: Bank;
   private debtBankLiquiditySource!: Bank;
+
   private supplyImfiAccount!: IMFIAccount;
   private debtImfiAccount!: IMFIAccount;
+  private supplyRemainingAccounts!: AccountMeta[];
+  private debtRemainingAccounts!: AccountMeta[];
 
   async initialize() {
     await this.setAvailableBanks();
@@ -62,10 +66,10 @@ export class MarginfiFlProvider extends FlProviderBase {
       this.liquidityBank(TokenType.Supply).group.toString() !==
       this.liquidityBank(TokenType.Debt).group.toString()
     ) {
-      this.setIntermediaryAccount([TokenType.Supply]);
-      this.setIntermediaryAccount([TokenType.Debt]);
+      await this.setIntermediaryAccount([TokenType.Supply]);
+      await this.setIntermediaryAccount([TokenType.Debt]);
     } else {
-      this.setIntermediaryAccount([TokenType.Supply, TokenType.Debt]);
+      await this.setIntermediaryAccount([TokenType.Supply, TokenType.Debt]);
     }
   }
 
@@ -114,7 +118,7 @@ export class MarginfiFlProvider extends FlProviderBase {
     this.debtBankLiquiditySource = debtBanks[0][1];
   }
 
-  private setIntermediaryAccount(sources: TokenType[]) {
+  private async setIntermediaryAccount(sources: TokenType[]) {
     const compatibleMarginfiAccounts = this.existingMarginfiAccounts.filter(
       (x) => x.group.toString() == this.liquidityBank(sources[0]).group
     );
@@ -136,6 +140,16 @@ export class MarginfiFlProvider extends FlProviderBase {
       this.flSigners.push(signer);
     }
 
+    const remainingAccounts = accountData
+      ? (
+          await Promise.all(
+            accountData.lendingAccount.balances.map((balance) =>
+              getRemainingAccountsForMarginfiHealthCheck(this.umi, balance)
+            )
+          )
+        ).flat()
+      : [];
+
     for (const s of sources) {
       const data: IMFIAccount = {
         signer,
@@ -146,8 +160,10 @@ export class MarginfiFlProvider extends FlProviderBase {
       const supply = s === TokenType.Supply;
       if (supply) {
         this.supplyImfiAccount = data;
+        this.supplyRemainingAccounts = remainingAccounts;
       } else {
         this.debtImfiAccount = data;
+        this.debtRemainingAccounts = remainingAccounts;
       }
       consoleLog(
         `${supply ? "Supply" : "Debt"} iMfi account:`,
@@ -292,45 +308,19 @@ export class MarginfiFlProvider extends FlProviderBase {
     );
     const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource)!;
 
-    const remainingAccounts: AccountMeta[] = [];
-    let flBankHadPrevBalance = false;
-
-    if (iMfiAccount?.accountData) {
-      iMfiAccount.accountData.lendingAccount.balances.forEach(async (x) => {
-        if (x.active) {
-          if (x.bankPk.toString() === bank.publicKey.toString()) {
-            flBankHadPrevBalance = true;
-          }
-
-          const priceOracle = publicKey(
-            await getMarginfiPriceOracle(this.umi, {
-              pk: toWeb3JsPublicKey(x.bankPk),
-            })
-          );
-
-          remainingAccounts.push(
-            ...[
-              {
-                pubkey: x.bankPk,
-                isSigner: false,
-                isWritable: false,
-              },
-              {
-                pubkey: priceOracle,
-                isSigner: false,
-                isWritable: false,
-              },
-            ]
-          );
-        }
-      });
-    }
+    const remainingAccounts: AccountMeta[] =
+      flashLoan.liquiditySource === TokenType.Supply
+        ? this.supplyRemainingAccounts
+        : this.debtRemainingAccounts;
+    let iMfiAccountHadPrevFlBalance = remainingAccounts.find(
+      (x) => x.pubkey.toString() === bank.publicKey.toString()
+    );
 
     return transactionBuilder()
       .add(
         lendingAccountRepay(this.umi, {
           amount: flashLoan.baseUnitAmount,
-          repayAll: !flBankHadPrevBalance,
+          repayAll: !iMfiAccountHadPrevFlBalance,
           bank: bank.publicKey,
           bankLiquidityVault: publicKey(associatedBankAccs.liquidityVault),
           marginfiAccount: publicKey(iMfiAccount.accountPk),

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -15,6 +15,7 @@ import {
   getTokenAccount,
   hasFirstRebalance,
   hasLastRebalance,
+  realtimeUsdToEmaUsd,
   safeGetPrice,
   tokenInfo,
 } from "../../utils";
@@ -202,31 +203,17 @@ export class RebalanceTxBuilder {
     }
   }
 
-  private realtimeUsdToEmaUsd(realtimeAmountUsd: number, mint: PublicKey) {
-    return (
-      (realtimeAmountUsd / safeGetPrice(mint, PriceType.Realtime)!) *
-      safeGetPrice(mint, PriceType.Ema)!
-    );
-  }
-
   private getInitialRebalanceValues() {
     let rebalanceValues = this.getRebalanceValues();
     if (!rebalanceValues) {
       return undefined;
     }
 
-    const postRebalanceEmaUtilRateBps = getLiqUtilzationRateBps(
-      this.realtimeUsdToEmaUsd(
-        rebalanceValues.endResult.supplyUsd,
-        this.client.pos.supplyMint
-      ),
-      this.realtimeUsdToEmaUsd(
-        rebalanceValues.endResult.debtUsd,
-        this.client.pos.debtMint
-      ),
-      this.client.pos.state.liqThresholdBps
-    );
-    if (postRebalanceEmaUtilRateBps > this.client.pos.maxBoostToBps) {
+    if (
+      !this.client.pos.rebalanceHelper.validRealtimePricesBoost(
+        rebalanceValues.debtAdjustmentUsd
+      )
+    ) {
       this.priceType = PriceType.Ema;
       rebalanceValues = this.getRebalanceValues();
       if (!rebalanceValues) {

package/src/services/solauto/solautoClient.ts

@@ -78,9 +78,6 @@ export abstract class SolautoClient extends ReferralStateManager {
     await super.initialize(args);
 
     const positionId = args.positionId ?? 0;
-    if (positionId === 0 && !args.lpUserAccount) {
-      throw new Error("Self managed position is missing arguments");
-    }
     this.pos = await getOrCreatePositionEx(
       this.umi,
       this.authority,
@@ -96,7 +93,7 @@ export abstract class SolautoClient extends ReferralStateManager {
       },
       this.contextUpdates
     );
-    if (this.pos.selfManaged && (!args.supplyMint || !args.debtMint)) {
+    if (this.pos.selfManaged) {
       await this.pos.refreshPositionState();
     }
 

package/src/services/solauto/solautoMarginfiClient.ts

@@ -5,8 +5,12 @@ import {
   publicKey,
   PublicKey as UmiPublicKey,
   createSignerFromKeypair,
+  AccountMeta,
 } from "@metaplex-foundation/umi";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import {
+  fromWeb3JsPublicKey,
+  toWeb3JsPublicKey,
+} from "@metaplex-foundation/umi-web3js-adapters";
 import { MarginfiAssetAccounts, RebalanceDetails } from "../../types";
 import { getMarginfiAccounts, MarginfiProgramAccounts } from "../../constants";
 import {
@@ -31,18 +35,26 @@ import {
   marginfiAccountEmpty,
   getTokenAccount,
   hasFirstRebalance,
+  getRemainingAccountsForMarginfiHealthCheck,
+  getAccountMeta,
 } from "../../utils";
 import {
   Bank,
+  fetchMarginfiAccount,
   lendingAccountBorrow,
   lendingAccountDeposit,
   lendingAccountRepay,
   lendingAccountWithdraw,
   marginfiAccountInitialize,
   safeFetchAllMarginfiAccount,
+  safeFetchMarginfiAccount,
 } from "../../marginfi-sdk";
 import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 
+function isSigner(account: PublicKey | Signer): account is Signer {
+  return "publicKey" in account;
+}
+
 export class SolautoMarginfiClient extends SolautoClient {
   public lendingPlatform = LendingPlatform.Marginfi;
 
@@ -50,6 +62,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
   public marginfiAccount!: PublicKey | Signer;
   public marginfiAccountPk!: PublicKey;
+  public healthCheckRemainingAccounts?: AccountMeta[];
   public marginfiGroup!: PublicKey;
 
   public marginfiSupplyAccounts!: MarginfiAssetAccounts;
@@ -97,13 +110,25 @@ export class SolautoMarginfiClient extends SolautoClient {
               );
       }
     }
-    this.marginfiAccountPk =
-      "publicKey" in this.marginfiAccount
-        ? toWeb3JsPublicKey(this.marginfiAccount.publicKey)
-        : this.marginfiAccount;
 
-    if ("publicKey" in this.marginfiAccount) {
+    this.marginfiAccountPk = isSigner(this.marginfiAccount)
+      ? toWeb3JsPublicKey(this.marginfiAccount.publicKey)
+      : this.marginfiAccount;
+
+    if (isSigner(this.marginfiAccount)) {
       this.otherSigners.push(this.marginfiAccount);
+    } else if (this.pos.selfManaged) {
+      const accountData = await fetchMarginfiAccount(
+        this.umi,
+        fromWeb3JsPublicKey(this.marginfiAccount as PublicKey)
+      );
+      this.healthCheckRemainingAccounts = (
+        await Promise.all(
+          accountData.lendingAccount.balances.map((balance) =>
+            getRemainingAccountsForMarginfiHealthCheck(this.umi, balance)
+          )
+        )
+      ).flat();
     }
 
     this.marginfiSupplyAccounts =
@@ -247,6 +272,20 @@ export class SolautoMarginfiClient extends SolautoClient {
         });
       }
       case "Borrow": {
+        const remainingAccounts = this.healthCheckRemainingAccounts ?? [];
+        if (
+          !remainingAccounts.find(
+            (x) =>
+              x.pubkey.toString() === this.marginfiDebtAccounts.bank.toString()
+          )
+        ) {
+          remainingAccounts.push(
+            ...[
+              getAccountMeta(new PublicKey(this.marginfiDebtAccounts.bank)),
+              getAccountMeta(this.debtPriceOracle),
+            ]
+          );
+        }
         return lendingAccountBorrow(this.umi, {
           amount: args.fields[0],
           signer: this.signer,
@@ -260,7 +299,7 @@ export class SolautoMarginfiClient extends SolautoClient {
           bankLiquidityVaultAuthority: publicKey(
             this.marginfiDebtAccounts.vaultAuthority
           ),
-        });
+        }).addRemainingAccounts(remainingAccounts);
       }
       case "Repay": {
         return lendingAccountRepay(this.umi, {
@@ -293,7 +332,7 @@ export class SolautoMarginfiClient extends SolautoClient {
           bankLiquidityVaultAuthority: publicKey(
             this.marginfiSupplyAccounts.vaultAuthority
           ),
-        });
+        }).addRemainingAccounts(this.healthCheckRemainingAccounts ?? []);
       }
     }
   }
@@ -408,7 +447,9 @@ export class SolautoMarginfiClient extends SolautoClient {
         ? publicKey(getTokenAccount(this.authority, this.pos.supplyMint))
         : undefined,
       vaultSupplyTa: publicKey(this.marginfiSupplyAccounts.liquidityVault),
-      supplyVaultAuthority: publicKey(this.marginfiSupplyAccounts.vaultAuthority),
+      supplyVaultAuthority: publicKey(
+        this.marginfiSupplyAccounts.vaultAuthority
+      ),
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
       debtPriceOracle: publicKey(this.debtPriceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),

package/src/solautoPosition/solautoPositionEx.ts

@@ -30,6 +30,7 @@ import {
   maxRepayFromBps,
   maxRepayToBps,
   positionStateWithLatestPrices,
+  realtimeUsdToEmaUsd,
   safeGetPrice,
   solautoStrategyName,
   supplyLiquidityDepositable,
@@ -87,6 +88,8 @@ export abstract class SolautoPositionEx {
   protected _supplyPrice?: number;
   protected _debtPrice?: number;
 
+  public rebalanceHelper!: PositionRebalanceHelper;
+
   constructor(args: PositionExArgs) {
     this.umi = args.umi;
     this.contextUpdates = args.contextUpdates;
@@ -111,6 +114,8 @@ export abstract class SolautoPositionEx {
 
     this._data = args.data;
     this.firstState = { ...args.data.state };
+
+    this.rebalanceHelper = new PositionRebalanceHelper(this);
   }
 
   abstract lendingPool(): Promise<PublicKey>;
@@ -277,53 +282,12 @@ export abstract class SolautoPositionEx {
     return tokenInfo(this.supplyMint).isMeme || tokenInfo(this.debtMint).isMeme;
   }
 
-  private sufficientLiquidityToBoost() {
-    const limitsUpToDate =
-      this.debtLiquidityUsdAvailable !== 0 ||
-      this.supplyLiquidityUsdDepositable !== 0;
-
-    if (limitsUpToDate) {
-      const { debtAdjustmentUsd } = getDebtAdjustment(
-        this.state.liqThresholdBps,
-        { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() },
-        this.boostToBps,
-        { solauto: 50, lpBorrow: 50, flashLoan: 50 } // TODO: get true data here instead of magic numbers
-      );
-
-      const sufficientLiquidity =
-        this.debtLiquidityUsdAvailable * 0.95 > debtAdjustmentUsd &&
-        this.supplyLiquidityUsdDepositable * 0.95 > debtAdjustmentUsd;
-
-      if (!sufficientLiquidity) {
-        consoleLog("Insufficient liquidity to further boost");
-      }
-      return sufficientLiquidity;
-    }
-
-    return true;
-  }
-
-  eligibleForRebalance(bpsDistanceThreshold = 0): RebalanceAction | undefined {
-    if (!this.settings || !this.supplyUsd()) {
-      return undefined;
-    }
-
-    const realtimeLiqUtilRateBps = this.liqUtilizationRateBps(
-      PriceType.Realtime
+  eligibleForRebalance(
+    bpsDistanceThreshold: number = 0
+  ): RebalanceAction | undefined {
+    return this.rebalanceHelper.eligibleForRebalance(
+      bpsDistanceThreshold
     );
-    const emaLiqUtilRateBps = this.liqUtilizationRateBps(PriceType.Ema);
-
-    if (this.repayFromBps - realtimeLiqUtilRateBps <= bpsDistanceThreshold) {
-      return "repay";
-    } else if (
-      realtimeLiqUtilRateBps - this.boostFromBps <= bpsDistanceThreshold ||
-      emaLiqUtilRateBps - this.boostFromBps <= bpsDistanceThreshold
-    ) {
-      const sufficientLiquidity = this.sufficientLiquidityToBoost();
-      return sufficientLiquidity ? "boost" : undefined;
-    }
-
-    return undefined;
   }
 
   eligibleForRefresh(): boolean {
@@ -438,3 +402,97 @@ export abstract class SolautoPositionEx {
     );
   }
 }
+
+class PositionRebalanceHelper {
+  constructor(private pos: SolautoPositionEx) {}
+
+  private sufficientLiquidityToBoost() {
+    const limitsUpToDate =
+      this.pos.debtLiquidityUsdAvailable !== 0 ||
+      this.pos.supplyLiquidityUsdDepositable !== 0;
+
+    if (limitsUpToDate) {
+      const { debtAdjustmentUsd } = getDebtAdjustment(
+        this.pos.state.liqThresholdBps,
+        { supplyUsd: this.pos.supplyUsd(), debtUsd: this.pos.debtUsd() },
+        this.pos.boostToBps,
+        { solauto: 50, lpBorrow: 50, flashLoan: 50 } // Overshoot fees
+      );
+
+      const sufficientLiquidity =
+        this.pos.debtLiquidityUsdAvailable * 0.95 > debtAdjustmentUsd &&
+        this.pos.supplyLiquidityUsdDepositable * 0.95 > debtAdjustmentUsd;
+
+      if (!sufficientLiquidity) {
+        consoleLog("Insufficient liquidity to further boost");
+      }
+      return sufficientLiquidity;
+    }
+
+    return true;
+  }
+
+  validRealtimePricesBoost(debtAdjustmentUsd: number) {
+    if (this.pos.lendingPlatform !== LendingPlatform.Marginfi) {
+      // TODO: LP
+      return true;
+    }
+
+    const postRebalanceLiqUtilRate = getLiqUtilzationRateBps(
+      realtimeUsdToEmaUsd(
+        this.pos.supplyUsd() + debtAdjustmentUsd,
+        this.pos.supplyMint
+      ),
+      realtimeUsdToEmaUsd(
+        this.pos.debtUsd() + debtAdjustmentUsd,
+        this.pos.debtMint
+      ),
+      this.pos.state.liqThresholdBps
+    );
+
+    return postRebalanceLiqUtilRate <= this.pos.maxBoostToBps;
+  }
+
+  private validBoostFromHere() {
+    const { debtAdjustmentUsd } = getDebtAdjustment(
+      this.pos.state.liqThresholdBps,
+      {
+        supplyUsd: this.pos.supplyUsd(PriceType.Realtime),
+        debtUsd: this.pos.debtUsd(PriceType.Realtime),
+      },
+      this.pos.boostToBps,
+      { solauto: 25, lpBorrow: 0, flashLoan: 0 } // Undershoot fees
+    );
+
+    return this.validRealtimePricesBoost(debtAdjustmentUsd);
+  }
+
+  eligibleForRebalance(
+    bpsDistanceThreshold: number
+  ): RebalanceAction | undefined {
+    if (!this.pos.settings || !this.pos.supplyUsd()) {
+      return undefined;
+    }
+
+    const realtimeLiqUtilRateBps = this.pos.liqUtilizationRateBps(
+      PriceType.Realtime
+    );
+    const emaLiqUtilRateBps = this.pos.liqUtilizationRateBps(PriceType.Ema);
+
+    if (
+      this.pos.repayFromBps - realtimeLiqUtilRateBps <=
+      bpsDistanceThreshold
+    ) {
+      return "repay";
+    } else if (
+      (realtimeLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold ||
+        emaLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold) &&
+      this.validBoostFromHere()
+    ) {
+      const sufficientLiquidity = this.sufficientLiquidityToBoost();
+      return sufficientLiquidity ? "boost" : undefined;
+    }
+
+    return undefined;
+  }
+}

package/src/utils/marginfiUtils.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { Program, publicKey, Umi } from "@metaplex-foundation/umi";
+import { AccountMeta, Program, publicKey, Umi } from "@metaplex-foundation/umi";
 import {
   fromWeb3JsPublicKey,
   toWeb3JsPublicKey,
@@ -16,6 +16,7 @@ import {
   USD_DECIMALS,
 } from "../constants";
 import {
+  Balance,
   Bank,
   deserializeMarginfiAccount,
   fetchBank,
@@ -44,6 +45,7 @@ import {
   getMostUpToDatePythOracle,
   getPythPushOracleAddress,
 } from "./pythUtils";
+import { getAccountMeta } from "./solanaUtils";
 
 export function createDynamicMarginfiProgram(env?: ProgramEnv): Program {
   return {
@@ -179,6 +181,22 @@ export function findMarginfiAccounts(
   throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
 
+export async function getRemainingAccountsForMarginfiHealthCheck(
+  umi: Umi,
+  balance: Balance
+): Promise<AccountMeta[]> {
+  if (!balance.active) {
+    return [];
+  }
+  const priceOracle = await getMarginfiPriceOracle(umi, {
+    pk: toWeb3JsPublicKey(balance.bankPk),
+  });
+  return [
+    getAccountMeta(toWeb3JsPublicKey(balance.bankPk)),
+    getAccountMeta(priceOracle),
+  ];
+}
+
 export function calcMarginfiMaxLtvAndLiqThresholdBps(
   supplyBank: Bank,
   debtBank: Bank,

package/src/utils/numberUtils.ts

@@ -1,11 +1,13 @@
+import { PublicKey } from "@solana/web3.js";
 import {
   BASIS_POINTS,
   MIN_REPAY_GAP_BPS,
   OFFSET_FROM_MAX_LTV,
   USD_DECIMALS,
 } from "../constants";
-import { PositionState } from "../generated";
+import { PositionState, PriceType } from "../generated";
 import { RoundAction } from "../types";
+import { safeGetPrice } from "./priceUtils";
 
 export function calcNetWorthUsd(state?: PositionState) {
   return fromRoundedUsdValue(state?.netWorth.baseAmountUsdValue ?? BigInt(0));
@@ -203,3 +205,13 @@ export function maxBoostToBps(maxLtvBps: number, liqThresholdBps: number) {
     getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, OFFSET_FROM_MAX_LTV)
   );
 }
+
+export function realtimeUsdToEmaUsd(
+  realtimeAmountUsd: number,
+  mint: PublicKey
+) {
+  return (
+    (realtimeAmountUsd / safeGetPrice(mint, PriceType.Realtime)!) *
+    safeGetPrice(mint, PriceType.Ema)!
+  );
+}

package/src/utils/solanaUtils.ts

@@ -18,6 +18,7 @@ import {
   createTransferInstruction,
 } from "@solana/spl-token";
 import {
+  AccountMeta,
   AddressLookupTableInput,
   Signer,
   TransactionBuilder,
@@ -28,6 +29,7 @@ import {
 } from "@metaplex-foundation/umi";
 import {
   fromWeb3JsInstruction,
+  fromWeb3JsPublicKey,
   toWeb3JsPublicKey,
   toWeb3JsTransaction,
 } from "@metaplex-foundation/umi-web3js-adapters";
@@ -154,6 +156,14 @@ export function splTokenTransferUmiIx(
   );
 }
 
+export function getAccountMeta(
+  pubkey: PublicKey,
+  isSigner: boolean = false,
+  isWritable: boolean = false
+): AccountMeta {
+  return { pubkey: fromWeb3JsPublicKey(pubkey), isSigner, isWritable };
+}
+
 export async function getWalletSplBalances(
   conn: Connection,
   wallet: PublicKey,