@haven-fi/solauto-sdk 1.0.647 → 1.0.649

package/src/pyth-sdk/accounts/index.ts

@@ -0,0 +1,9 @@
+/**
+ * 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
+ */
+
+export * from './priceUpdateV2Account';

package/src/pyth-sdk/accounts/priceUpdateV2Account.ts

@@ -0,0 +1,179 @@
+/**
+ * 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 {
+  Account,
+  Context,
+  Pda,
+  PublicKey,
+  RpcAccount,
+  RpcGetAccountOptions,
+  RpcGetAccountsOptions,
+  assertAccountExists,
+  deserializeAccount,
+  gpaBuilder,
+  publicKey as toPublicKey,
+} from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  array,
+  mapSerializer,
+  publicKey as publicKeySerializer,
+  struct,
+  u64,
+  u8,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  PriceMessage,
+  PriceMessageArgs,
+  getPriceMessageSerializer,
+} from '../types';
+
+export type PriceUpdateV2Account = Account<PriceUpdateV2AccountAccountData>;
+
+export type PriceUpdateV2AccountAccountData = {
+  discriminator: Array<number>;
+  writeAuthority: PublicKey;
+  verificationLevel: number;
+  priceMessage: PriceMessage;
+  postedSlot: bigint;
+};
+
+export type PriceUpdateV2AccountAccountDataArgs = {
+  writeAuthority: PublicKey;
+  verificationLevel: number;
+  priceMessage: PriceMessageArgs;
+  postedSlot: number | bigint;
+};
+
+export function getPriceUpdateV2AccountAccountDataSerializer(): Serializer<
+  PriceUpdateV2AccountAccountDataArgs,
+  PriceUpdateV2AccountAccountData
+> {
+  return mapSerializer<
+    PriceUpdateV2AccountAccountDataArgs,
+    any,
+    PriceUpdateV2AccountAccountData
+  >(
+    struct<PriceUpdateV2AccountAccountData>(
+      [
+        ['discriminator', array(u8(), { size: 8 })],
+        ['writeAuthority', publicKeySerializer()],
+        ['verificationLevel', u8()],
+        ['priceMessage', getPriceMessageSerializer()],
+        ['postedSlot', u64()],
+      ],
+      { description: 'PriceUpdateV2AccountAccountData' }
+    ),
+    (value) => ({
+      ...value,
+      discriminator: [93, 77, 250, 192, 211, 157, 97, 248],
+    })
+  ) as Serializer<
+    PriceUpdateV2AccountAccountDataArgs,
+    PriceUpdateV2AccountAccountData
+  >;
+}
+
+export function deserializePriceUpdateV2Account(
+  rawAccount: RpcAccount
+): PriceUpdateV2Account {
+  return deserializeAccount(
+    rawAccount,
+    getPriceUpdateV2AccountAccountDataSerializer()
+  );
+}
+
+export async function fetchPriceUpdateV2Account(
+  context: Pick<Context, 'rpc'>,
+  publicKey: PublicKey | Pda,
+  options?: RpcGetAccountOptions
+): Promise<PriceUpdateV2Account> {
+  const maybeAccount = await context.rpc.getAccount(
+    toPublicKey(publicKey, false),
+    options
+  );
+  assertAccountExists(maybeAccount, 'PriceUpdateV2Account');
+  return deserializePriceUpdateV2Account(maybeAccount);
+}
+
+export async function safeFetchPriceUpdateV2Account(
+  context: Pick<Context, 'rpc'>,
+  publicKey: PublicKey | Pda,
+  options?: RpcGetAccountOptions
+): Promise<PriceUpdateV2Account | null> {
+  const maybeAccount = await context.rpc.getAccount(
+    toPublicKey(publicKey, false),
+    options
+  );
+  return maybeAccount.exists
+    ? deserializePriceUpdateV2Account(maybeAccount)
+    : null;
+}
+
+export async function fetchAllPriceUpdateV2Account(
+  context: Pick<Context, 'rpc'>,
+  publicKeys: Array<PublicKey | Pda>,
+  options?: RpcGetAccountsOptions
+): Promise<PriceUpdateV2Account[]> {
+  const maybeAccounts = await context.rpc.getAccounts(
+    publicKeys.map((key) => toPublicKey(key, false)),
+    options
+  );
+  return maybeAccounts.map((maybeAccount) => {
+    assertAccountExists(maybeAccount, 'PriceUpdateV2Account');
+    return deserializePriceUpdateV2Account(maybeAccount);
+  });
+}
+
+export async function safeFetchAllPriceUpdateV2Account(
+  context: Pick<Context, 'rpc'>,
+  publicKeys: Array<PublicKey | Pda>,
+  options?: RpcGetAccountsOptions
+): Promise<PriceUpdateV2Account[]> {
+  const maybeAccounts = await context.rpc.getAccounts(
+    publicKeys.map((key) => toPublicKey(key, false)),
+    options
+  );
+  return maybeAccounts
+    .filter((maybeAccount) => maybeAccount.exists)
+    .map((maybeAccount) =>
+      deserializePriceUpdateV2Account(maybeAccount as RpcAccount)
+    );
+}
+
+export function getPriceUpdateV2AccountGpaBuilder(
+  context: Pick<Context, 'rpc' | 'programs'>
+) {
+  const programId = context.programs.getPublicKey(
+    '',
+    'pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT'
+  );
+  return gpaBuilder(context, programId)
+    .registerFields<{
+      discriminator: Array<number>;
+      writeAuthority: PublicKey;
+      verificationLevel: number;
+      priceMessage: PriceMessageArgs;
+      postedSlot: number | bigint;
+    }>({
+      discriminator: [0, array(u8(), { size: 8 })],
+      writeAuthority: [8, publicKeySerializer()],
+      verificationLevel: [40, u8()],
+      priceMessage: [41, getPriceMessageSerializer()],
+      postedSlot: [125, u64()],
+    })
+    .deserializeUsing<PriceUpdateV2Account>((account) =>
+      deserializePriceUpdateV2Account(account)
+    )
+    .whereField('discriminator', [93, 77, 250, 192, 211, 157, 97, 248]);
+}
+
+export function getPriceUpdateV2AccountSize(): number {
+  return 133;
+}

package/src/pyth-sdk/index.ts

@@ -0,0 +1,10 @@
+/**
+ * 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
+ */
+
+export * from './accounts';
+export * from './types';

package/src/pyth-sdk/types/index.ts

@@ -0,0 +1,10 @@
+/**
+ * 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
+ */
+
+export * from './priceMessage';
+export * from './priceUpdateV2';

package/src/pyth-sdk/types/priceMessage.ts

@@ -0,0 +1,58 @@
+/**
+ * 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 { PublicKey } from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  i32,
+  i64,
+  publicKey as publicKeySerializer,
+  struct,
+  u64,
+} from '@metaplex-foundation/umi/serializers';
+
+export type PriceMessage = {
+  feedId: PublicKey;
+  price: bigint;
+  conf: bigint;
+  exponent: number;
+  publishTime: bigint;
+  prevPublishTime: bigint;
+  emaPrice: bigint;
+  emaConf: bigint;
+};
+
+export type PriceMessageArgs = {
+  feedId: PublicKey;
+  price: number | bigint;
+  conf: number | bigint;
+  exponent: number;
+  publishTime: number | bigint;
+  prevPublishTime: number | bigint;
+  emaPrice: number | bigint;
+  emaConf: number | bigint;
+};
+
+export function getPriceMessageSerializer(): Serializer<
+  PriceMessageArgs,
+  PriceMessage
+> {
+  return struct<PriceMessage>(
+    [
+      ['feedId', publicKeySerializer()],
+      ['price', i64()],
+      ['conf', u64()],
+      ['exponent', i32()],
+      ['publishTime', i64()],
+      ['prevPublishTime', i64()],
+      ['emaPrice', i64()],
+      ['emaConf', u64()],
+    ],
+    { description: 'PriceMessage' }
+  ) as Serializer<PriceMessageArgs, PriceMessage>;
+}

package/src/pyth-sdk/types/priceUpdateV2.ts

@@ -0,0 +1,46 @@
+/**
+ * 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 { PublicKey } from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  publicKey as publicKeySerializer,
+  struct,
+  u64,
+  u8,
+} from '@metaplex-foundation/umi/serializers';
+import { PriceMessage, PriceMessageArgs, getPriceMessageSerializer } from '.';
+
+export type PriceUpdateV2 = {
+  writeAuthority: PublicKey;
+  verificationLevel: number;
+  priceMessage: PriceMessage;
+  postedSlot: bigint;
+};
+
+export type PriceUpdateV2Args = {
+  writeAuthority: PublicKey;
+  verificationLevel: number;
+  priceMessage: PriceMessageArgs;
+  postedSlot: number | bigint;
+};
+
+export function getPriceUpdateV2Serializer(): Serializer<
+  PriceUpdateV2Args,
+  PriceUpdateV2
+> {
+  return struct<PriceUpdateV2>(
+    [
+      ['writeAuthority', publicKeySerializer()],
+      ['verificationLevel', u8()],
+      ['priceMessage', getPriceMessageSerializer()],
+      ['postedSlot', u64()],
+    ],
+    { description: 'PriceUpdateV2' }
+  ) as Serializer<PriceUpdateV2Args, PriceUpdateV2>;
+}

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -166,15 +166,12 @@ export class RebalanceSwapManager {
 
     const inputMint = toWeb3JsPublicKey(input.mint);
     const outputMint = toWeb3JsPublicKey(output.mint);
-    const swappingMeme =
-      tokenInfo(inputMint).isMeme || tokenInfo(outputMint).isMeme;
     const swapInput: SwapInput = {
       inputMint,
       outputMint,
       exactIn,
       exactOut,
       amount: swapAmount,
-      slippageBps: swappingMeme ? 250 : 100,
     };
     consoleLog("Swap input:", swapInput);
 

package/src/services/solauto/solautoClient.ts

@@ -42,7 +42,6 @@ import {
 import { FlProviderAggregator } from "../flashLoans";
 
 export interface SolautoClientArgs extends ReferralStateManagerArgs {
-  new?: boolean;
   positionId?: number;
   supplyMint?: PublicKey;
   debtMint?: PublicKey;

package/src/services/swap/jupSwapManager.ts

@@ -18,6 +18,7 @@ import {
   toBps,
   getTokenAccount,
   jupIxToSolanaIx,
+  tokenInfo,
 } from "../../utils";
 import { TransactionItemInputs } from "../../types";
 
@@ -52,6 +53,10 @@ export class JupSwapManager {
   constructor(private signer: Signer) {}
 
   public async getQuote(data: SwapInput): Promise<QuoteResponse> {
+    const memeSwap =
+      tokenInfo(data.inputMint).isMeme || tokenInfo(data.outputMint).isMeme;
+    const slippageBps = data.slippageBps ?? (memeSwap ? 250 : 100);
+
     return await retryWithExponentialBackoff(
       async (attemptNum: number) =>
         await this.jupApi.quoteGet({
@@ -63,7 +68,7 @@ export class JupSwapManager {
             : data.exactIn
               ? "ExactIn"
               : undefined,
-          slippageBps: data.slippageBps ?? 10,
+          slippageBps,
           maxAccounts: !data.exactOut ? 15 + attemptNum * 5 : undefined,
         }),
       4,

package/src/solautoPosition/solautoPositionEx.ts

@@ -16,7 +16,6 @@ import {
 import {
   calcDebtUsd,
   calcNetWorth,
-  calcNetWorthUsd,
   calcSupplyUsd,
   calcTotalDebt,
   calcTotalSupply,
@@ -25,7 +24,6 @@ import {
   currentUnixSeconds,
   debtLiquidityAvailable,
   debtLiquidityUsdAvailable,
-  fetchTokenPrices,
   getLiqUtilzationRateBps,
   maxBoostToBps,
   maxRepayFromBps,
@@ -92,7 +90,7 @@ export abstract class SolautoPositionEx {
     this.lpUserAccount =
       args.customArgs?.lpUserAccount ??
       (args.data.position
-        ? toWeb3JsPublicKey(args.data.position!.protocolUserAccount)
+        ? toWeb3JsPublicKey(args.data.position!.lpUserAccount)
         : undefined);
     this.lpEnv = args.customArgs?.lpEnv ?? "Prod";
 
@@ -193,7 +191,10 @@ export abstract class SolautoPositionEx {
   }
 
   get repayFromBps() {
-    return (this.settings?.repayToBps ?? 0) + (this.settings?.repayGap ?? 0);
+    return Math.min(
+      (this.settings?.repayToBps ?? 0) + (this.settings?.repayGap ?? 0),
+      this.maxRepayFromBps
+    );
   }
 
   get maxRepayFromBps() {

package/src/utils/instructionUtils.ts

@@ -139,13 +139,11 @@ export function swapThenDeposit(
 ) {
   return [
     new TransactionItem(async () => {
-      const memeSwap = tokenInfo(client.pos.supplyMint).isMeme;
       const swapInput: SwapInput = {
         inputMint: depositMint,
         outputMint: client.pos.supplyMint,
         amount: depositAmountBaseUnit,
         exactIn: true,
-        slippageBps: memeSwap ? 250 : 100,
       };
       const jupSwapManager = new JupSwapManager(client.signer);
       const { setupIx, swapIx, cleanupIx, lookupTableAddresses } =

package/src/utils/numberUtils.ts

@@ -168,7 +168,7 @@ export function getMaxLiqUtilizationRateBps(
 
 export function maxRepayFromBps(maxLtvBps: number, liqThresholdBps: number) {
   return Math.min(
-    8750,
+    9000,
     getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps - 1000, OFFSET_FROM_MAX_LTV)
   );
 }

package/src/utils/pythUtils.ts

@@ -1,54 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
+import { publicKey, Umi } from "@metaplex-foundation/umi";
 import { PYTH_PUSH_PROGRAM } from "../constants";
 import { u16ToArrayBufferLE, zip } from "./generalUtils";
-import * as borsh from "borsh";
-import { Umi } from "@metaplex-foundation/umi";
-import { fromWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-
-type PriceUpdateV2 = {
-  writeAuthority: Buffer;
-  verificationLevel: number;
-  priceMessage: {
-    feedId: Buffer;
-    price: bigint;
-    conf: bigint;
-    exponent: number;
-    publishTime: bigint;
-    prevPublishTime: bigint;
-    emaPrice: bigint;
-    emaConf: bigint;
-  };
-};
-
-const priceUpdateV2Schema = {
-  struct: {
-    writeAuthority: {
-      array: { type: "u8", len: 32 },
-    },
-    verificationLevel: "u8",
-    priceMessage: {
-      struct: {
-        feedId: { array: { type: "u8", len: 32 } },
-        price: "i64",
-        conf: "u64",
-        exponent: "i32",
-        publishTime: "i64",
-        prevPublishTime: "i64",
-        emaPrice: "i64",
-        emaConf: "u64",
-      },
-    },
-    postedSlot: "u64",
-  },
-};
-
-export function parsePriceInfo(data: Uint8Array): PriceUpdateV2 {
-  let decoded: PriceUpdateV2 = borsh.deserialize(
-    priceUpdateV2Schema,
-    data
-  ) as any;
-  return decoded;
-}
+import { safeFetchAllPriceUpdateV2Account } from "../pyth-sdk";
 
 export async function getMostUpToDatePythOracle(
   umi: Umi,
@@ -56,12 +10,11 @@ export async function getMostUpToDatePythOracle(
 ) {
   const oracles = zip(
     oracleKeys,
-    (
-      await umi.rpc.getAccounts(
-        oracleKeys.map((x) => fromWeb3JsPublicKey(x)),
-        { commitment: "confirmed" }
-      )
-    ).map((x) => (x.exists ? parsePriceInfo(x!.data.slice(8)) : undefined))
+    await safeFetchAllPriceUpdateV2Account(
+      umi,
+      oracleKeys.map((x) => publicKey(x)),
+      { commitment: "confirmed" }
+    )
   ).sort(
     (a, b) =>
       Number(b[1]?.priceMessage.publishTime ?? 0) -

package/src/utils/solautoUtils.ts

@@ -177,10 +177,10 @@ export async function getSolautoManagedPositions(
     if (position.position.lendingPlatform === LendingPlatform.Marginfi) {
       tokens = [
         findMarginfiAccounts(
-          toWeb3JsPublicKey(position.position.protocolSupplyAccount)
+          toWeb3JsPublicKey(position.position.lpSupplyAccount)
         ).mint,
         findMarginfiAccounts(
-          toWeb3JsPublicKey(position.position.protocolDebtAccount)
+          toWeb3JsPublicKey(position.position.lpDebtAccount)
         ).mint,
       ];
     }
@@ -192,7 +192,7 @@ export async function getSolautoManagedPositions(
       positionId: position.positionId[0],
       lendingPlatform: position.position.lendingPlatform,
       positionType: position.positionType,
-      lpUserAccount: toWeb3JsPublicKey(position.position.protocolUserAccount),
+      lpUserAccount: toWeb3JsPublicKey(position.position.lpUserAccount),
       supplyMint: tokens![0],
       debtMint: tokens![1],
     };

package/tests/unit/rebalanceCalculations.ts

@@ -36,7 +36,7 @@ function assertAccurateRebalance(
     SolautoFeesBps.create(
       false,
       targetLiqUtilizationRateBps,
-      client.pos.netWorthUsd
+      client.pos.netWorthUsd()
     ),
     50
   );
@@ -99,9 +99,9 @@ async function getFakePosition(
       state: fakeState,
       position: {
         lendingPlatform: LendingPlatform.Marginfi,
-        protocolUserAccount: publicKey(PublicKey.default),
-        protocolSupplyAccount: publicKey(PublicKey.default),
-        protocolDebtAccount: publicKey(PublicKey.default),
+        lpUserAccount: publicKey(PublicKey.default),
+        lpSupplyAccount: publicKey(PublicKey.default),
+        lpDebtAccount: publicKey(PublicKey.default),
         settings,
         dca: null,
         padding: [],