@haven-fi/solauto-sdk 1.0.629 → 1.0.631

package/local/shared.ts

@@ -56,7 +56,7 @@ export async function createAndSendV0Tx(
     lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
   });
   if (confirmation.value.err) {
-    throw new Error(confirmation.value.err.toString());
+    throw confirmation.value.err;
   }
   console.log(txid);
 }

package/local/txSandbox.ts

@@ -3,19 +3,19 @@ import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   consoleLog,
+  fetchTokenPrices,
   getClient,
   getSolanaRpcConnection,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
   PriorityFeeSetting,
   rebalance,
-  RebalanceTxBuilder,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
-  TransactionItem,
   TransactionsManager,
 } from "../src";
 import { getSecretKey } from "./shared";
+import { NATIVE_MINT } from "@solana/spl-token";
 
 const payForTransaction = false;
 const testProgram = true;
@@ -31,32 +31,34 @@ export async function main() {
     fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
   );
 
-  const client = getClient(LendingPlatform.Marginfi, {
-    signer,
-    showLogs: true,
-    rpcUrl: LOCAL_IRONFORGE_API_URL,
-    programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
-  });
-
-  await client.initialize({
-    positionId: 3,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
-  });
-
-  const transactionItems = [rebalance(client)];
-
-  const txManager = new TransactionsManager(
-    client,
-    undefined,
-    payForTransaction ? "normal" : "only-simulate",
-    PriorityFeeSetting.Min,
-    true,
-    undefined,
-    { totalRetries: 5 }
-  );
-  const statuses = await txManager.clientSend(transactionItems);
+  await fetchTokenPrices([NATIVE_MINT]);
+
+  // const client = getClient(LendingPlatform.Marginfi, {
+  //   signer,
+  //   showLogs: true,
+  //   rpcUrl: LOCAL_IRONFORGE_API_URL,
+  //   programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+  // });
+
+  // await client.initialize({
+  //   positionId: 3,
+  //   authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+  // });
+
+  // const transactionItems = [rebalance(client)];
+
+  // const txManager = new TransactionsManager(
+  //   client,
+  //   undefined,
+  //   payForTransaction ? "normal" : "only-simulate",
+  //   PriorityFeeSetting.Min,
+  //   true,
+  //   undefined,
+  //   { totalRetries: 5 }
+  // );
+  // const statuses = await txManager.clientSend(transactionItems);
 
-  consoleLog(statuses);
+  // consoleLog(statuses);
 }
 
 main();

package/local/updateMarginfiLUT.ts

@@ -17,19 +17,26 @@ import {
   LOCAL_IRONFORGE_API_URL,
   getMarginfiAccounts,
   getAllBankRelatedAccounts,
+  umiWithMarginfiProgram,
+  ProgramEnv,
 } from "../src";
 import { createAndSendV0Tx, getSecretKey, updateLookupTable } from "./shared";
 
-const mfiAccounts = getMarginfiAccounts("Prod");
+const programEnv: ProgramEnv = "Prod";
+const mfiAccounts = getMarginfiAccounts(programEnv);
 
 const LOOKUP_TABLE_ADDRESS = mfiAccounts.lookupTable;
 let [, umi] = getSolanaRpcConnection(LOCAL_IRONFORGE_API_URL);
-umi = umi.use(
-  signerIdentity(
-    createSignerFromKeypair(umi, umi.eddsa.generateKeypair()),
-    true
-  )
+umi = umiWithMarginfiProgram(
+  umi.use(
+    signerIdentity(
+      createSignerFromKeypair(umi, umi.eddsa.generateKeypair()),
+      true
+    )
+  ),
+  programEnv
 );
+
 const solautoManagerKeypair = Keypair.fromSecretKey(
   getSecretKey("solauto-manager")
 );

package/package.json

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

package/src/constants/marginfiAccounts.ts

@@ -2,7 +2,6 @@ import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import * as tokens from "./tokenConstants";
 import { MarginfiAssetAccounts } from "../types/accounts";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "./switchboardConstants";
 import { ProgramEnv } from "../types";
 
 const MARGINFI_PROD_PROGRAM = new PublicKey(

package/src/constants/solautoConstants.ts

@@ -28,7 +28,7 @@ export const MIN_USD_SUPPORTED_POSITION = 1000;
 
 export const REFERRER_PERCENTAGE = 0.15;
 
-export const PRICES: { [key: string]: { price: number; time: number } } = {};
+export const PRICES: { [key: string]: { realtimePrice: number; emaPrice: number; time: number } } = {};
 
 export const JITO_TIP_ACCOUNTS = [
   "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",

package/src/generated/instructions/marginfiRebalance.ts

@@ -31,10 +31,13 @@ import {
   getAccountMetasAndSigners,
 } from '../shared';
 import {
+  PriceType,
+  PriceTypeArgs,
   SolautoRebalanceType,
   SolautoRebalanceTypeArgs,
   SwapType,
   SwapTypeArgs,
+  getPriceTypeSerializer,
   getSolautoRebalanceTypeSerializer,
   getSwapTypeSerializer,
 } from '../types';
@@ -72,17 +75,19 @@ export type MarginfiRebalanceInstructionAccounts = {
 export type MarginfiRebalanceInstructionData = {
   discriminator: number;
   rebalanceType: SolautoRebalanceType;
-  targetLiqUtilizationRateBps: Option<number>;
   swapInAmountBaseUnit: Option<bigint>;
+  targetLiqUtilizationRateBps: Option<number>;
   flashLoanFeeBps: Option<number>;
+  priceType: Option<PriceType>;
   swapType: Option<SwapType>;
 };
 
 export type MarginfiRebalanceInstructionDataArgs = {
   rebalanceType: SolautoRebalanceTypeArgs;
-  targetLiqUtilizationRateBps: OptionOrNullable<number>;
   swapInAmountBaseUnit: OptionOrNullable<number | bigint>;
+  targetLiqUtilizationRateBps: OptionOrNullable<number>;
   flashLoanFeeBps: OptionOrNullable<number>;
+  priceType: OptionOrNullable<PriceTypeArgs>;
   swapType: OptionOrNullable<SwapTypeArgs>;
 };
 
@@ -99,9 +104,10 @@ export function getMarginfiRebalanceInstructionDataSerializer(): Serializer<
       [
         ['discriminator', u8()],
         ['rebalanceType', getSolautoRebalanceTypeSerializer()],
-        ['targetLiqUtilizationRateBps', option(u16())],
         ['swapInAmountBaseUnit', option(u64())],
+        ['targetLiqUtilizationRateBps', option(u16())],
         ['flashLoanFeeBps', option(u16())],
+        ['priceType', option(getPriceTypeSerializer())],
         ['swapType', option(getSwapTypeSerializer())],
       ],
       { description: 'MarginfiRebalanceInstructionData' }

package/src/generated/instructions/marginfiRefreshData.ts

@@ -25,6 +25,7 @@ import {
   ResolvedAccountsWithIndices,
   getAccountMetasAndSigners,
 } from '../shared';
+import { PriceType, PriceTypeArgs, getPriceTypeSerializer } from '../types';
 
 // Accounts.
 export type MarginfiRefreshDataInstructionAccounts = {
@@ -40,9 +41,14 @@ export type MarginfiRefreshDataInstructionAccounts = {
 };
 
 // Data.
-export type MarginfiRefreshDataInstructionData = { discriminator: number };
+export type MarginfiRefreshDataInstructionData = {
+  discriminator: number;
+  priceType: PriceType;
+};
 
-export type MarginfiRefreshDataInstructionDataArgs = {};
+export type MarginfiRefreshDataInstructionDataArgs = {
+  priceType: PriceTypeArgs;
+};
 
 export function getMarginfiRefreshDataInstructionDataSerializer(): Serializer<
   MarginfiRefreshDataInstructionDataArgs,
@@ -53,9 +59,13 @@ export function getMarginfiRefreshDataInstructionDataSerializer(): Serializer<
     any,
     MarginfiRefreshDataInstructionData
   >(
-    struct<MarginfiRefreshDataInstructionData>([['discriminator', u8()]], {
-      description: 'MarginfiRefreshDataInstructionData',
-    }),
+    struct<MarginfiRefreshDataInstructionData>(
+      [
+        ['discriminator', u8()],
+        ['priceType', getPriceTypeSerializer()],
+      ],
+      { description: 'MarginfiRefreshDataInstructionData' }
+    ),
     (value) => ({ ...value, discriminator: 7 })
   ) as Serializer<
     MarginfiRefreshDataInstructionDataArgs,
@@ -63,10 +73,15 @@ export function getMarginfiRefreshDataInstructionDataSerializer(): Serializer<
   >;
 }
 
+// Args.
+export type MarginfiRefreshDataInstructionArgs =
+  MarginfiRefreshDataInstructionDataArgs;
+
 // Instruction.
 export function marginfiRefreshData(
   context: Pick<Context, 'programs'>,
-  input: MarginfiRefreshDataInstructionAccounts
+  input: MarginfiRefreshDataInstructionAccounts &
+    MarginfiRefreshDataInstructionArgs
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
@@ -123,6 +138,9 @@ export function marginfiRefreshData(
     },
   } satisfies ResolvedAccountsWithIndices;
 
+  // Arguments.
+  const resolvedArgs: MarginfiRefreshDataInstructionArgs = { ...input };
+
   // Accounts in order.
   const orderedAccounts: ResolvedAccount[] = Object.values(
     resolvedAccounts
@@ -136,7 +154,9 @@ export function marginfiRefreshData(
   );
 
   // Data.
-  const data = getMarginfiRefreshDataInstructionDataSerializer().serialize({});
+  const data = getMarginfiRefreshDataInstructionDataSerializer().serialize(
+    resolvedArgs as MarginfiRefreshDataInstructionDataArgs
+  );
 
   // Bytes Created On Chain.
   const bytesCreatedOnChain = 0;

package/src/generated/types/index.ts

@@ -16,6 +16,7 @@ export * from './positionData';
 export * from './positionState';
 export * from './positionTokenState';
 export * from './positionType';
+export * from './priceType';
 export * from './rebalanceData';
 export * from './rebalanceDirection';
 export * from './rebalanceInstructionData';

package/src/generated/types/priceType.ts

@@ -0,0 +1,22 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+
+import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
+
+export enum PriceType {
+  Realtime,
+  Ema,
+}
+
+export type PriceTypeArgs = PriceType;
+
+export function getPriceTypeSerializer(): Serializer<PriceTypeArgs, PriceType> {
+  return scalarEnum<PriceType>(PriceType, {
+    description: 'PriceType',
+  }) as Serializer<PriceTypeArgs, PriceType>;
+}

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -9,7 +9,6 @@ import {
   consoleLog,
   fromBaseUnit,
   getLiqUtilzationRateBps,
-  maxRepayToBps,
   safeGetPrice,
   toBaseUnit,
   tokenInfo,
@@ -46,8 +45,8 @@ export class RebalanceSwapManager {
 
     const outputToken = toWeb3JsPublicKey(
       this.isBoost()
-        ? this.client.pos.state().supply.mint
-        : this.client.pos.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 +63,7 @@ export class RebalanceSwapManager {
     return getLiqUtilzationRateBps(
       supplyUsd,
       debtUsd,
-      this.client.pos.state().liqThresholdBps ?? 0
+      this.client.pos.state.liqThresholdBps ?? 0
     );
   }
 
@@ -106,11 +105,11 @@ export class RebalanceSwapManager {
 
   private swapDetails() {
     const input = this.isBoost()
-      ? this.client.pos.state().debt
-      : this.client.pos.state().supply;
+      ? this.client.pos.state.debt
+      : this.client.pos.state.supply;
     const output = this.isBoost()
-      ? this.client.pos.state().supply
-      : this.client.pos.state().debt;
+      ? this.client.pos.state.supply
+      : this.client.pos.state.debt;
 
     let inputAmount = toBaseUnit(
       this.usdToSwap() / safeGetPrice(input.mint)!,
@@ -185,10 +184,7 @@ export class RebalanceSwapManager {
       this.swapQuote = await this.findSufficientQuote(swapInput, {
         minOutputAmount: rebalanceToZero ? outputAmount : undefined,
         maxLiqUtilizationRateBps: this.values.repayingCloseToMaxLtv
-          ? maxRepayToBps(
-              this.client.pos.state().maxLtvBps ?? 0,
-              this.client.pos.state().liqThresholdBps ?? 0
-            ) - 15
+          ? this.client.pos.maxRepayToBps - 15
           : undefined,
       });
     }

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -10,6 +10,7 @@ import {
 import {
   consoleLog,
   fromBaseUnit,
+  getLiqUtilzationRateBps,
   getMaxLiqUtilizationRateBps,
   getTokenAccount,
   hasFirstRebalance,
@@ -19,6 +20,7 @@ import {
 } from "../../utils";
 import {
   PositionTokenState,
+  PriceType,
   RebalanceDirection,
   RebalanceStep,
   SolautoRebalanceType,
@@ -35,6 +37,7 @@ export class RebalanceTxBuilder {
   private rebalanceType!: SolautoRebalanceType;
   private swapManager!: RebalanceSwapManager;
   private flRequirements?: FlashLoanRequirements;
+  private priceType!: PriceType;
 
   constructor(
     private client: SolautoClient,
@@ -49,14 +52,15 @@ export class RebalanceTxBuilder {
     );
   }
 
-  private getRebalanceValues(flFee?: number) {
+  private getRebalanceValues(priceType: PriceType, flFee?: number) {
     return getRebalanceValues(
       this.client.pos,
+      priceType,
       this.targetLiqUtilizationRateBps,
       SolautoFeesBps.create(
         this.client.isReferred(),
         this.targetLiqUtilizationRateBps,
-        this.client.pos.netWorthUsd()
+        this.client.pos.netWorthUsd
       ),
       flFee ?? 0
     );
@@ -84,12 +88,12 @@ export class RebalanceTxBuilder {
     const insufficientSupplyLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       supplyLiquidityAvailable,
-      this.client.pos.supplyMint()
+      this.client.pos.supplyMint
     );
     const insufficientDebtLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       debtLiquidityAvailable,
-      this.client.pos.debtMint()
+      this.client.pos.debtMint
     );
 
     let useDebtLiquidity =
@@ -107,8 +111,8 @@ export class RebalanceTxBuilder {
     attemptNum: number
   ): Promise<FlashLoanRequirements | undefined> {
     const maxLtvRateBps = getMaxLiqUtilizationRateBps(
-      this.client.pos.state().maxLtvBps,
-      this.client.pos.state().liqThresholdBps,
+      this.client.pos.state.maxLtvBps,
+      this.client.pos.state.liqThresholdBps,
       0.02
     );
 
@@ -156,9 +160,9 @@ export class RebalanceTxBuilder {
 
     let flashLoanToken: PositionTokenState | undefined = undefined;
     if (boosting || useDebtLiquidity) {
-      flashLoanToken = this.client.pos.state().debt;
+      flashLoanToken = this.client.pos.state.debt;
     } else {
-      flashLoanToken = this.client.pos.state().supply;
+      flashLoanToken = this.client.pos.state.supply;
     }
 
     return {
@@ -199,8 +203,33 @@ export class RebalanceTxBuilder {
     }
   }
 
+  private realtimeUsdToEmaUsd(realtimeAmountUsd: number, mint: PublicKey) {
+    return (
+      (realtimeAmountUsd / safeGetPrice(mint, PriceType.Realtime)!) *
+      safeGetPrice(mint, PriceType.Ema)!
+    );
+  }
+
   private async setRebalanceDetails(attemptNum: number) {
-    this.values = this.getRebalanceValues();
+    this.priceType = PriceType.Realtime;
+    this.values = this.getRebalanceValues(this.priceType);
+
+    const postRebalanceEmaUtilRateBps = getLiqUtilzationRateBps(
+      this.realtimeUsdToEmaUsd(
+        this.values.endResult.supplyUsd,
+        this.client.pos.supplyMint
+      ),
+      this.realtimeUsdToEmaUsd(
+        this.values.endResult.debtUsd,
+        this.client.pos.debtMint
+      ),
+      this.client.pos.state.liqThresholdBps
+    );
+    if (postRebalanceEmaUtilRateBps > this.client.pos.maxBoostToBps) {
+      this.priceType = PriceType.Ema;
+      this.values = this.getRebalanceValues(this.priceType);
+    }
+
     this.flRequirements = await this.flashLoanRequirements(attemptNum);
 
     if (this.flRequirements?.flFeeBps) {
@@ -223,7 +252,7 @@ export class RebalanceTxBuilder {
       this.client.selfManaged ||
       this.client.contextUpdates.supplyAdjustment > BigInt(0) ||
       this.client.contextUpdates.debtAdjustment > BigInt(0) ||
-      !this.client.pos.exists()
+      !this.client.pos.exists
     ) {
       return false;
     }
@@ -254,7 +283,7 @@ export class RebalanceTxBuilder {
     let tx = transactionBuilder();
 
     if (await this.refreshBeforeRebalance()) {
-      tx = tx.add(this.client.refreshIx());
+      tx = tx.add(this.client.refreshIx(this.priceType));
     }
 
     const rebalanceDetails: RebalanceDetails = {
@@ -263,6 +292,7 @@ export class RebalanceTxBuilder {
       flashLoan: flashLoanDetails,
       swapQuote,
       targetLiqUtilizationRateBps: this.targetLiqUtilizationRateBps,
+      priceType: this.priceType,
     };
     consoleLog("Rebalance details:", rebalanceDetails);
 

package/src/services/rebalance/rebalanceValues.ts

@@ -1,4 +1,5 @@
 import {
+  PriceType,
   RebalanceDirection,
   TokenBalanceChange,
   TokenBalanceChangeType,
@@ -117,6 +118,7 @@ function getTokenBalanceChange(): TokenBalanceChange | undefined {
 
 function getTargetLiqUtilizationRateBps(
   solautoPosition: SolautoPositionEx,
+  priceType: PriceType,
   targetLiqUtilizationRateBps: number | undefined,
   tokenBalanceChange: TokenBalanceChange | undefined
 ): number {
@@ -124,12 +126,16 @@ function getTargetLiqUtilizationRateBps(
     return targetLiqUtilizationRateBps;
   }
 
-  const currentRate = solautoPosition.state().liqUtilizationRateBps;
-
-  if (currentRate <= solautoPosition.boostFromBps()) {
-    return solautoPosition.settings()!.boostToBps;
-  } else if (currentRate >= solautoPosition.repayFromBps()) {
-    return solautoPosition.settings()!.repayToBps;
+  if (
+    solautoPosition.liqUtilizationRateBps(PriceType.Realtime) >=
+    solautoPosition.repayFromBps
+  ) {
+    return solautoPosition.settings!.repayToBps;
+  } else if (
+    solautoPosition.liqUtilizationRateBps(priceType) <=
+    solautoPosition.boostFromBps
+  ) {
+    return solautoPosition.settings!.boostToBps;
   }
   // TODO: DCA, limit orders, take profit, stop loss, etc.
   //   else if (tokenBalanceChange !== null) {
@@ -141,10 +147,11 @@ function getTargetLiqUtilizationRateBps(
 
 function getAdjustedPositionValues(
   solautoPosition: SolautoPositionEx,
+  priceType: PriceType,
   tokenBalanceChange: TokenBalanceChange | undefined
 ): PositionValues {
-  let supplyUsd = solautoPosition.supplyUsd();
-  const debtUsd = solautoPosition.debtUsd();
+  let supplyUsd = solautoPosition.supplyUsd(priceType);
+  const debtUsd = solautoPosition.debtUsd(priceType);
 
   if (tokenBalanceChange) {
     const tb = tokenBalanceChange;
@@ -172,7 +179,7 @@ function getRebalanceDirection(
   solautoPosition: SolautoPositionEx,
   targetLtvBps: number
 ): RebalanceDirection {
-  return solautoPosition.state().liqUtilizationRateBps < targetLtvBps
+  return solautoPosition.state.liqUtilizationRateBps < targetLtvBps
     ? RebalanceDirection.Boost
     : RebalanceDirection.Repay;
 }
@@ -185,6 +192,7 @@ export interface RebalanceValues extends DebtAdjustment {
 
 export function getRebalanceValues(
   solautoPosition: SolautoPositionEx,
+  priceType: PriceType,
   targetLiqUtilizationRateBps?: number,
   solautoFeeBps?: SolautoFeesBps,
   flFeeBps?: number
@@ -193,6 +201,7 @@ export function getRebalanceValues(
 
   const targetRate = getTargetLiqUtilizationRateBps(
     solautoPosition,
+    priceType,
     targetLiqUtilizationRateBps,
     tokenBalanceChange
   );
@@ -201,6 +210,7 @@ export function getRebalanceValues(
 
   const position = getAdjustedPositionValues(
     solautoPosition,
+    priceType,
     tokenBalanceChange
   );
 
@@ -208,12 +218,12 @@ export function getRebalanceValues(
     solauto: solautoFeeBps
       ? solautoFeeBps.getSolautoFeesBps(rebalanceDirection).total
       : 0,
-    lpBorrow: solautoPosition.state().debt.borrowFeeBps,
+    lpBorrow: solautoPosition.state.debt.borrowFeeBps,
     flashLoan: flFeeBps ?? 0,
   };
 
   const debtAdjustment = getDebtAdjustment(
-    solautoPosition.state().liqThresholdBps,
+    solautoPosition.state.liqThresholdBps,
     position,
     targetRate,
     fees
@@ -221,11 +231,7 @@ export function getRebalanceValues(
 
   const repayingCloseToMaxLtv =
     rebalanceDirection === RebalanceDirection.Repay &&
-    targetRate >=
-      maxRepayToBps(
-        solautoPosition.state().maxLtvBps,
-        solautoPosition.state().liqThresholdBps
-      );
+    targetRate >= solautoPosition.maxRepayToBps;
 
   return {
     ...debtAdjustment,