@haven-fi/solauto-sdk 1.0.667 → 1.0.669

package/src/marginfi-sdk/instructions/lendingAccountDeposit.ts

@@ -8,6 +8,8 @@
 
 import {
   Context,
+  Option,
+  OptionOrNullable,
   Pda,
   PublicKey,
   Signer,
@@ -17,7 +19,9 @@ import {
 import {
   Serializer,
   array,
+  bool,
   mapSerializer,
+  option,
   struct,
   u64,
   u8,
@@ -43,10 +47,12 @@ export type LendingAccountDepositInstructionAccounts = {
 export type LendingAccountDepositInstructionData = {
   discriminator: Array<number>;
   amount: bigint;
+  depositUpToLimit: Option<boolean>;
 };
 
 export type LendingAccountDepositInstructionDataArgs = {
   amount: number | bigint;
+  depositUpToLimit: OptionOrNullable<boolean>;
 };
 
 export function getLendingAccountDepositInstructionDataSerializer(): Serializer<
@@ -62,6 +68,7 @@ export function getLendingAccountDepositInstructionDataSerializer(): Serializer<
       [
         ['discriminator', array(u8(), { size: 8 })],
         ['amount', u64()],
+        ['depositUpToLimit', option(bool())],
       ],
       { description: 'LendingAccountDepositInstructionData' }
     ),

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -210,7 +210,7 @@ export class RebalanceTxBuilder {
     }
 
     if (
-      !this.client.pos.rebalanceHelper.validRealtimePricesBoost(
+      !this.client.pos.rebalance.validRealtimePricesBoost(
         rebalanceValues.debtAdjustmentUsd
       )
     ) {

package/src/services/solauto/solautoMarginfiClient.ts

@@ -259,7 +259,6 @@ export class SolautoMarginfiClient extends SolautoClient {
     switch (args.__kind) {
       case "Deposit": {
         return lendingAccountDeposit(this.umi, {
-          amount: args.fields[0],
           signer: this.signer,
           signerTokenAccount: publicKey(this.signerSupplyTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
@@ -268,6 +267,8 @@ export class SolautoMarginfiClient extends SolautoClient {
           bankLiquidityVault: publicKey(
             this.marginfiSupplyAccounts.liquidityVault
           ),
+          amount: args.fields[0],
+          depositUpToLimit: true,
         });
       }
       case "Borrow": {

package/src/services/transactions/transactionUtils.ts

@@ -417,6 +417,7 @@ function getSolautoActions(umi: Umi, tx: TransactionBuilder): SolautoAction[] {
           serializer
             .serialize({
               amount: 0,
+              depositUpToLimit: true
             })
             .slice(0, 8)
         );

package/src/solautoPosition/positionUtils.ts

@@ -29,7 +29,6 @@ import {
   SolautoPositionEx,
 } from "./solautoPositionEx";
 import { MarginfiSolautoPositionEx } from "./marginfiSolautoPositionEx";
-import { assert } from "console";
 
 export function createSolautoSettings(
   settings: SolautoSettingsParametersInpArgs

package/src/solautoPosition/solautoPositionEx.ts

@@ -91,7 +91,7 @@ export abstract class SolautoPositionEx {
   private _supplyPrice?: number;
   private _debtPrice?: number;
 
-  public rebalanceHelper!: PositionRebalanceHelper;
+  public rebalance!: PositionRebalanceHelper;
 
   constructor(args: PositionExArgs) {
     this.umi = args.umi;
@@ -120,7 +120,7 @@ export abstract class SolautoPositionEx {
     this._data = args.data;
     this.firstState = { ...args.data.state };
 
-    this.rebalanceHelper = new PositionRebalanceHelper(this);
+    this.rebalance = new PositionRebalanceHelper(this);
   }
 
   abstract lendingPool(): Promise<PublicKey>;
@@ -288,9 +288,13 @@ export abstract class SolautoPositionEx {
   }
 
   eligibleForRebalance(
-    bpsDistanceThreshold: number = 0
+    bpsDistanceThreshold: number = 0,
+    skipExtraChecks?: boolean
   ): RebalanceAction | undefined {
-    return this.rebalanceHelper.eligibleForRebalance(bpsDistanceThreshold);
+    return this.rebalance.eligibleForRebalance(
+      bpsDistanceThreshold,
+      skipExtraChecks
+    );
   }
 
   eligibleForRefresh(): boolean {
@@ -457,11 +461,21 @@ class PositionRebalanceHelper {
   }
 
   private validBoostFromHere() {
+    const realtimeSupplyUsd = this.pos.supplyUsd(PriceType.Realtime);
+    const realtimeDebtUsd = this.pos.debtUsd(PriceType.Realtime);
+
+    if (
+      realtimeSupplyUsd === this.pos.supplyUsd(PriceType.Ema) &&
+      realtimeDebtUsd === this.pos.debtUsd(PriceType.Ema)
+    ) {
+      return true;
+    }
+
     const { debtAdjustmentUsd } = getDebtAdjustment(
       this.pos.state.liqThresholdBps,
       {
-        supplyUsd: this.pos.supplyUsd(PriceType.Realtime),
-        debtUsd: this.pos.debtUsd(PriceType.Realtime),
+        supplyUsd: realtimeSupplyUsd,
+        debtUsd: realtimeDebtUsd,
       },
       this.pos.boostToBps,
       { solauto: 25, lpBorrow: 0, flashLoan: 0 } // Undershoot fees
@@ -471,7 +485,8 @@ class PositionRebalanceHelper {
   }
 
   eligibleForRebalance(
-    bpsDistanceThreshold: number
+    bpsDistanceThreshold: number,
+    skipExtraChecks?: boolean
   ): RebalanceAction | undefined {
     if (!this.pos.settings || !this.pos.supplyUsd()) {
       return undefined;
@@ -488,8 +503,8 @@ class PositionRebalanceHelper {
       return "repay";
     } else if (
       realtimeLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold &&
-      this.validBoostFromHere() &&
-      this.sufficientLiquidityToBoost()
+      (!skipExtraChecks ||
+        (this.validBoostFromHere() && this.sufficientLiquidityToBoost()))
     ) {
       return "boost";
     }

package/src/utils/index.ts

@@ -3,7 +3,7 @@ export * from "./generalUtils";
 export * from "./instructionUtils";
 export * from "./jitoUtils";
 export * from "./jupiterUtils";
-export * from "./marginfiUtils";
+export * from "./marginfi";
 export * from "./numberUtils";
 export * from "./solautoUtils";
 export * from "./solanaUtils";

package/src/utils/{marginfiUtils.ts → marginfi/data.ts}

@@ -1,37 +1,28 @@
 import { PublicKey } from "@solana/web3.js";
-import { AccountMeta, Program, publicKey, Umi } from "@metaplex-foundation/umi";
+import { publicKey, Umi } from "@metaplex-foundation/umi";
 import {
-  fromWeb3JsPublicKey,
   toWeb3JsPublicKey,
 } from "@metaplex-foundation/umi-web3js-adapters";
-import { ProgramEnv, MarginfiAssetAccounts } from "../types";
-import { PositionState, PositionTokenState, PriceType } from "../generated";
+import { ProgramEnv } from "../../types";
+import { PositionState, PositionTokenState, PriceType } from "../../generated";
 import {
   ALL_SUPPORTED_TOKENS,
   getMarginfiAccounts,
-  MARGINFI_SPONSORED_SHARD_ID,
-  MarginfiBankAccountsMap,
-  PYTH_SPONSORED_SHARD_ID,
   TOKEN_INFO,
   USD_DECIMALS,
-} from "../constants";
+} from "../../constants";
 import {
-  Balance,
   Bank,
   deserializeMarginfiAccount,
-  fetchBank,
   getMarginfiAccountSize,
-  getMarginfiErrorFromCode,
-  getMarginfiErrorFromName,
   MarginfiAccount,
   OracleSetup,
-  safeFetchAllBank,
   safeFetchBank,
   safeFetchMarginfiAccount,
-} from "../marginfi-sdk";
-import { ContextUpdates } from "./solautoUtils";
-import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
-import { currentUnixSeconds, validPubkey } from "./generalUtils";
+} from "../../marginfi-sdk";
+import { ContextUpdates } from "../solautoUtils";
+import { fetchTokenPrices, safeGetPrice } from "../priceUtils";
+import { currentUnixSeconds, validPubkey } from "../generalUtils";
 import {
   bytesToI80F48,
   calcNetWorthUsd,
@@ -39,198 +30,8 @@ import {
   getLiqUtilzationRateBps,
   toBaseUnit,
   toBps,
-} from "./numberUtils";
-import { getTokenAccountData } from "./accountUtils";
-import {
-  getMostUpToDatePythOracle,
-  getPythPushOracleAddress,
-} from "./pythUtils";
-import { getAccountMeta } from "./solanaUtils";
-
-export function createDynamicMarginfiProgram(env?: ProgramEnv): Program {
-  return {
-    name: "marginfi",
-    publicKey: publicKey(getMarginfiAccounts(env ?? "Prod").program),
-    getErrorFromCode(code: number, cause?: Error) {
-      return getMarginfiErrorFromCode(code, this, cause);
-    },
-    getErrorFromName(name: string, cause?: Error) {
-      return getMarginfiErrorFromName(name, this, cause);
-    },
-    isOnCluster() {
-      return true;
-    },
-  };
-}
-
-export function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv) {
-  return umi.use({
-    install(umi) {
-      umi.programs.add(
-        createDynamicMarginfiProgram(marginfiEnv ?? "Prod"),
-        false
-      );
-    },
-  });
-}
-
-export async function getAllBankRelatedAccounts(
-  umi: Umi,
-  bankAccountsMap: MarginfiBankAccountsMap
-): Promise<PublicKey[]> {
-  const banks = Object.values(bankAccountsMap).flatMap((group) =>
-    Object.values(group).map((accounts) => accounts.bank)
-  );
-  const banksData = await safeFetchAllBank(
-    umi,
-    banks.map((x) => publicKey(x))
-  );
-
-  const oracles = banksData
-    .map((bank) => {
-      const oracleKey = toWeb3JsPublicKey(bank.config.oracleKeys[0]);
-      return bank.config.oracleSetup === OracleSetup.PythPushOracle
-        ? [
-            getPythPushOracleAddress(oracleKey, PYTH_SPONSORED_SHARD_ID),
-            getPythPushOracleAddress(oracleKey, MARGINFI_SPONSORED_SHARD_ID),
-          ]
-        : [oracleKey];
-    })
-    .flat()
-    .map((x) => x.toString());
-
-  const otherAccounts = Object.entries(bankAccountsMap).flatMap(
-    ([groupName, tokenMap]) =>
-      Object.values(tokenMap).flatMap((accounts) => [
-        groupName,
-        accounts.liquidityVault,
-        accounts.vaultAuthority,
-      ])
-  );
-
-  return Array.from(new Set([...banks, ...oracles, ...otherAccounts]))
-    .filter((x) => x !== PublicKey.default.toString())
-    .map((x) => new PublicKey(x));
-}
-
-export async function fetchBankAddresses(umi: Umi, bankPk: PublicKey) {
-  const bank = await fetchBank(umi, fromWeb3JsPublicKey(bankPk));
-  const liquidityVault = toWeb3JsPublicKey(bank!.liquidityVault);
-  const vaultAuthority = (await getTokenAccountData(umi, liquidityVault))
-    ?.owner;
-  const priceOracle = await getMarginfiPriceOracle(umi, { data: bank });
-
-  return {
-    bank: bankPk,
-    liquidityVault,
-    vaultAuthority,
-    priceOracle,
-  };
-}
-
-export async function getMarginfiPriceOracle(
-  umi: Umi,
-  bank: { pk?: PublicKey; data?: Bank }
-) {
-  if (!bank.data) {
-    bank.data = await fetchBank(umi, fromWeb3JsPublicKey(bank.pk!));
-  }
-
-  const oracleKey = toWeb3JsPublicKey(bank.data.config.oracleKeys[0]);
-  const priceOracle =
-    bank.data.config.oracleSetup === OracleSetup.PythPushOracle
-      ? await getMostUpToDatePythOracle(umi, [
-          getPythPushOracleAddress(oracleKey, PYTH_SPONSORED_SHARD_ID),
-          getPythPushOracleAddress(oracleKey, MARGINFI_SPONSORED_SHARD_ID),
-        ])
-      : oracleKey;
-
-  return priceOracle;
-}
-
-interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
-  mint: PublicKey;
-}
-
-export function findMarginfiAccounts(
-  bank: PublicKey
-): AllMarginfiAssetAccounts {
-  const search = (bankAccounts: MarginfiBankAccountsMap) => {
-    for (const group in bankAccounts) {
-      for (const key in bankAccounts[group]) {
-        const account = bankAccounts[group][key];
-        if (
-          account.bank.toString().toLowerCase() ===
-          bank.toString().toLowerCase()
-        ) {
-          return { ...account, mint: new PublicKey(key) };
-        }
-      }
-    }
-  };
-
-  let res = search(getMarginfiAccounts("Prod").bankAccounts);
-  if (res) {
-    return res;
-  }
-  res = search(getMarginfiAccounts("Staging").bankAccounts);
-  if (res) {
-    return res;
-  }
-
-  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,
-  supplyPrice: number
-): [number, number] {
-  let maxLtv =
-    bytesToI80F48(supplyBank.config.assetWeightInit.value) /
-    bytesToI80F48(debtBank.config.liabilityWeightInit.value);
-  const liqThreshold =
-    bytesToI80F48(supplyBank.config.assetWeightMaint.value) /
-    bytesToI80F48(debtBank.config.liabilityWeightMaint.value);
-
-  const totalDepositedUsdValue =
-    fromBaseUnit(
-      BigInt(
-        Math.round(
-          bytesToI80F48(supplyBank.totalAssetShares.value) *
-            bytesToI80F48(supplyBank.assetShareValue.value)
-        )
-      ),
-      supplyBank.mintDecimals
-    ) * supplyPrice!;
-  if (
-    supplyBank.config.totalAssetValueInitLimit !== BigInt(0) &&
-    totalDepositedUsdValue > supplyBank.config.totalAssetValueInitLimit
-  ) {
-    const discount =
-      Number(supplyBank.config.totalAssetValueInitLimit) /
-      totalDepositedUsdValue;
-    maxLtv = maxLtv * Number(discount);
-  }
-
-  return [toBps(maxLtv, "Floor"), toBps(liqThreshold, "Floor")];
-}
+} from "../numberUtils";
+import { calcMarginfiMaxLtvAndLiqThresholdBps, marginfiAccountEmpty } from "./general";
 
 export async function getMarginfiMaxLtvAndLiqThresholdBps(
   umi: Umi,
@@ -777,14 +578,3 @@ export function getUpToDateShareValues(bank: Bank): [number, number] {
     ),
   ];
 }
-
-export function marginfiAccountEmpty(marginfiAccount: MarginfiAccount) {
-  return (
-    marginfiAccount.lendingAccount.balances.find(
-      (x) =>
-        x.bankPk.toString() !== PublicKey.default.toString() &&
-        (bytesToI80F48(x.assetShares.value) > 0.000001 ||
-          bytesToI80F48(x.liabilityShares.value) > 0.000001)
-    ) === undefined
-  );
-}

package/src/utils/marginfi/general.ts

@@ -0,0 +1,226 @@
+import { PublicKey } from "@solana/web3.js";
+import { AccountMeta, Program, publicKey, Umi } from "@metaplex-foundation/umi";
+import {
+  fromWeb3JsPublicKey,
+  toWeb3JsPublicKey,
+} from "@metaplex-foundation/umi-web3js-adapters";
+import { ProgramEnv, MarginfiAssetAccounts } from "../../types";
+import {
+  getMarginfiAccounts,
+  MARGINFI_SPONSORED_SHARD_ID,
+  MarginfiBankAccountsMap,
+  PYTH_SPONSORED_SHARD_ID,
+} from "../../constants";
+import {
+  Balance,
+  Bank,
+  fetchBank,
+  getMarginfiErrorFromCode,
+  getMarginfiErrorFromName,
+  MarginfiAccount,
+  OracleSetup,
+  safeFetchAllBank,
+} from "../../marginfi-sdk";
+import { bytesToI80F48, fromBaseUnit, toBps } from "../numberUtils";
+import { getTokenAccountData } from "../accountUtils";
+import {
+  getMostUpToDatePythOracle,
+  getPythPushOracleAddress,
+} from "../pythUtils";
+import { getAccountMeta } from "../solanaUtils";
+
+export function createDynamicMarginfiProgram(env?: ProgramEnv): Program {
+  return {
+    name: "marginfi",
+    publicKey: publicKey(getMarginfiAccounts(env ?? "Prod").program),
+    getErrorFromCode(code: number, cause?: Error) {
+      return getMarginfiErrorFromCode(code, this, cause);
+    },
+    getErrorFromName(name: string, cause?: Error) {
+      return getMarginfiErrorFromName(name, this, cause);
+    },
+    isOnCluster() {
+      return true;
+    },
+  };
+}
+
+export function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv) {
+  return umi.use({
+    install(umi) {
+      umi.programs.add(
+        createDynamicMarginfiProgram(marginfiEnv ?? "Prod"),
+        false
+      );
+    },
+  });
+}
+
+export async function getAllBankRelatedAccounts(
+  umi: Umi,
+  bankAccountsMap: MarginfiBankAccountsMap
+): Promise<PublicKey[]> {
+  const banks = Object.values(bankAccountsMap).flatMap((group) =>
+    Object.values(group).map((accounts) => accounts.bank)
+  );
+  const banksData = await safeFetchAllBank(
+    umi,
+    banks.map((x) => publicKey(x))
+  );
+
+  const oracles = banksData
+    .map((bank) => {
+      const oracleKey = toWeb3JsPublicKey(bank.config.oracleKeys[0]);
+      return bank.config.oracleSetup === OracleSetup.PythPushOracle
+        ? [
+            getPythPushOracleAddress(oracleKey, PYTH_SPONSORED_SHARD_ID),
+            getPythPushOracleAddress(oracleKey, MARGINFI_SPONSORED_SHARD_ID),
+          ]
+        : [oracleKey];
+    })
+    .flat()
+    .map((x) => x.toString());
+
+  const otherAccounts = Object.entries(bankAccountsMap).flatMap(
+    ([groupName, tokenMap]) =>
+      Object.values(tokenMap).flatMap((accounts) => [
+        groupName,
+        accounts.liquidityVault,
+        accounts.vaultAuthority,
+      ])
+  );
+
+  return Array.from(new Set([...banks, ...oracles, ...otherAccounts]))
+    .filter((x) => x !== PublicKey.default.toString())
+    .map((x) => new PublicKey(x));
+}
+
+export async function fetchBankAddresses(umi: Umi, bankPk: PublicKey) {
+  const bank = await fetchBank(umi, fromWeb3JsPublicKey(bankPk));
+  const liquidityVault = toWeb3JsPublicKey(bank!.liquidityVault);
+  const vaultAuthority = (await getTokenAccountData(umi, liquidityVault))
+    ?.owner;
+  const priceOracle = await getMarginfiPriceOracle(umi, { data: bank });
+
+  return {
+    bank: bankPk,
+    liquidityVault,
+    vaultAuthority,
+    priceOracle,
+  };
+}
+
+export async function getMarginfiPriceOracle(
+  umi: Umi,
+  bank: { pk?: PublicKey; data?: Bank }
+) {
+  if (!bank.data) {
+    bank.data = await fetchBank(umi, fromWeb3JsPublicKey(bank.pk!));
+  }
+
+  const oracleKey = toWeb3JsPublicKey(bank.data.config.oracleKeys[0]);
+  const priceOracle =
+    bank.data.config.oracleSetup === OracleSetup.PythPushOracle
+      ? await getMostUpToDatePythOracle(umi, [
+          getPythPushOracleAddress(oracleKey, PYTH_SPONSORED_SHARD_ID),
+          getPythPushOracleAddress(oracleKey, MARGINFI_SPONSORED_SHARD_ID),
+        ])
+      : oracleKey;
+
+  return priceOracle;
+}
+
+interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
+  mint: PublicKey;
+}
+
+export function findMarginfiAccounts(
+  bank: PublicKey
+): AllMarginfiAssetAccounts {
+  const search = (bankAccounts: MarginfiBankAccountsMap) => {
+    for (const group in bankAccounts) {
+      for (const key in bankAccounts[group]) {
+        const account = bankAccounts[group][key];
+        if (
+          account.bank.toString().toLowerCase() ===
+          bank.toString().toLowerCase()
+        ) {
+          return { ...account, mint: new PublicKey(key) };
+        }
+      }
+    }
+  };
+
+  let res = search(getMarginfiAccounts("Prod").bankAccounts);
+  if (res) {
+    return res;
+  }
+  res = search(getMarginfiAccounts("Staging").bankAccounts);
+  if (res) {
+    return res;
+  }
+
+  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,
+  supplyPrice: number
+): [number, number] {
+  let maxLtv =
+    bytesToI80F48(supplyBank.config.assetWeightInit.value) /
+    bytesToI80F48(debtBank.config.liabilityWeightInit.value);
+  const liqThreshold =
+    bytesToI80F48(supplyBank.config.assetWeightMaint.value) /
+    bytesToI80F48(debtBank.config.liabilityWeightMaint.value);
+
+  const totalDepositedUsdValue =
+    fromBaseUnit(
+      BigInt(
+        Math.round(
+          bytesToI80F48(supplyBank.totalAssetShares.value) *
+            bytesToI80F48(supplyBank.assetShareValue.value)
+        )
+      ),
+      supplyBank.mintDecimals
+    ) * supplyPrice!;
+  if (
+    supplyBank.config.totalAssetValueInitLimit !== BigInt(0) &&
+    totalDepositedUsdValue > supplyBank.config.totalAssetValueInitLimit
+  ) {
+    const discount =
+      Number(supplyBank.config.totalAssetValueInitLimit) /
+      totalDepositedUsdValue;
+    maxLtv = maxLtv * Number(discount);
+  }
+
+  return [toBps(maxLtv, "Floor"), toBps(liqThreshold, "Floor")];
+}
+
+export function marginfiAccountEmpty(marginfiAccount: MarginfiAccount) {
+  return (
+    marginfiAccount.lendingAccount.balances.find(
+      (x) =>
+        x.bankPk.toString() !== PublicKey.default.toString() &&
+        (bytesToI80F48(x.assetShares.value) > 0.000001 ||
+          bytesToI80F48(x.liabilityShares.value) > 0.000001)
+    ) === undefined
+  );
+}

package/src/utils/marginfi/index.ts

@@ -0,0 +1,2 @@
+export * from "./data";
+export * from "./general";