@haven-fi/solauto-sdk 1.0.582 → 1.0.584

package/src/generated/types/{positionTokenUsage.ts → positionTokenState.ts}

@@ -19,49 +19,46 @@ import {
 } from '@metaplex-foundation/umi/serializers';
 import { TokenAmount, TokenAmountArgs, getTokenAmountSerializer } from '.';
 
-export type PositionTokenUsage = {
+export type PositionTokenState = {
   mint: PublicKey;
   decimals: number;
   padding1: Array<number>;
+  borrowFeeBps: number;
   amountUsed: TokenAmount;
   amountCanBeUsed: TokenAmount;
   baseAmountMarketPriceUsd: bigint;
-  flashLoanFeeBps: number;
-  borrowFeeBps: number;
   padding2: Array<number>;
   padding: Uint8Array;
 };
 
-export type PositionTokenUsageArgs = {
+export type PositionTokenStateArgs = {
   mint: PublicKey;
   decimals: number;
   padding1: Array<number>;
+  borrowFeeBps: number;
   amountUsed: TokenAmountArgs;
   amountCanBeUsed: TokenAmountArgs;
   baseAmountMarketPriceUsd: number | bigint;
-  flashLoanFeeBps: number;
-  borrowFeeBps: number;
   padding2: Array<number>;
   padding: Uint8Array;
 };
 
-export function getPositionTokenUsageSerializer(): Serializer<
-  PositionTokenUsageArgs,
-  PositionTokenUsage
+export function getPositionTokenStateSerializer(): Serializer<
+  PositionTokenStateArgs,
+  PositionTokenState
 > {
-  return struct<PositionTokenUsage>(
+  return struct<PositionTokenState>(
     [
       ['mint', publicKeySerializer()],
       ['decimals', u8()],
-      ['padding1', array(u8(), { size: 7 })],
+      ['padding1', array(u8(), { size: 5 })],
+      ['borrowFeeBps', u16()],
       ['amountUsed', getTokenAmountSerializer()],
       ['amountCanBeUsed', getTokenAmountSerializer()],
       ['baseAmountMarketPriceUsd', u64()],
-      ['flashLoanFeeBps', u16()],
-      ['borrowFeeBps', u16()],
-      ['padding2', array(u8(), { size: 4 })],
+      ['padding2', array(u8(), { size: 8 })],
       ['padding', bytes({ size: 32 })],
     ],
-    { description: 'PositionTokenUsage' }
-  ) as Serializer<PositionTokenUsageArgs, PositionTokenUsage>;
+    { description: 'PositionTokenState' }
+  ) as Serializer<PositionTokenStateArgs, PositionTokenState>;
 }

package/src/generated/types/rebalanceData.ts

@@ -9,36 +9,28 @@
 import {
   Serializer,
   array,
-  bytes,
   struct,
-  u64,
-  u8,
+  u32,
 } from '@metaplex-foundation/umi/serializers';
 import {
-  RebalanceDirection,
-  RebalanceDirectionArgs,
-  SolautoRebalanceType,
-  SolautoRebalanceTypeArgs,
-  getRebalanceDirectionSerializer,
-  getSolautoRebalanceTypeSerializer,
+  RebalanceInstructionData,
+  RebalanceInstructionDataArgs,
+  RebalanceStateValues,
+  RebalanceStateValuesArgs,
+  getRebalanceInstructionDataSerializer,
+  getRebalanceStateValuesSerializer,
 } from '.';
 
 export type RebalanceData = {
-  rebalanceType: SolautoRebalanceType;
-  padding1: Array<number>;
-  rebalanceDirection: RebalanceDirection;
-  padding2: Array<number>;
-  flashLoanAmount: bigint;
-  padding: Uint8Array;
+  ixs: RebalanceInstructionData;
+  values: RebalanceStateValues;
+  padding: Array<number>;
 };
 
 export type RebalanceDataArgs = {
-  rebalanceType: SolautoRebalanceTypeArgs;
-  padding1: Array<number>;
-  rebalanceDirection: RebalanceDirectionArgs;
-  padding2: Array<number>;
-  flashLoanAmount: number | bigint;
-  padding: Uint8Array;
+  ixs: RebalanceInstructionDataArgs;
+  values: RebalanceStateValuesArgs;
+  padding: Array<number>;
 };
 
 export function getRebalanceDataSerializer(): Serializer<
@@ -47,12 +39,9 @@ export function getRebalanceDataSerializer(): Serializer<
 > {
   return struct<RebalanceData>(
     [
-      ['rebalanceType', getSolautoRebalanceTypeSerializer()],
-      ['padding1', array(u8(), { size: 7 })],
-      ['rebalanceDirection', getRebalanceDirectionSerializer()],
-      ['padding2', array(u8(), { size: 7 })],
-      ['flashLoanAmount', u64()],
-      ['padding', bytes({ size: 32 })],
+      ['ixs', getRebalanceInstructionDataSerializer()],
+      ['values', getRebalanceStateValuesSerializer()],
+      ['padding', array(u32(), { size: 4 })],
     ],
     { description: 'RebalanceData' }
   ) as Serializer<RebalanceDataArgs, RebalanceData>;

package/src/generated/types/rebalanceDirection.ts

@@ -9,6 +9,7 @@
 import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
 
 export enum RebalanceDirection {
+  None,
   Boost,
   Repay,
 }

package/src/generated/types/rebalanceInstructionData.ts

@@ -0,0 +1,62 @@
+/**
+ * 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,
+  array,
+  struct,
+  u32,
+  u64,
+  u8,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  PodBool,
+  PodBoolArgs,
+  SolautoRebalanceType,
+  SolautoRebalanceTypeArgs,
+  SwapType,
+  SwapTypeArgs,
+  getPodBoolSerializer,
+  getSolautoRebalanceTypeSerializer,
+  getSwapTypeSerializer,
+} from '.';
+
+export type RebalanceInstructionData = {
+  active: PodBool;
+  rebalanceType: SolautoRebalanceType;
+  swapType: SwapType;
+  padding1: Array<number>;
+  flashLoanAmount: bigint;
+  padding: Array<number>;
+};
+
+export type RebalanceInstructionDataArgs = {
+  active: PodBoolArgs;
+  rebalanceType: SolautoRebalanceTypeArgs;
+  swapType: SwapTypeArgs;
+  padding1: Array<number>;
+  flashLoanAmount: number | bigint;
+  padding: Array<number>;
+};
+
+export function getRebalanceInstructionDataSerializer(): Serializer<
+  RebalanceInstructionDataArgs,
+  RebalanceInstructionData
+> {
+  return struct<RebalanceInstructionData>(
+    [
+      ['active', getPodBoolSerializer()],
+      ['rebalanceType', getSolautoRebalanceTypeSerializer()],
+      ['swapType', getSwapTypeSerializer()],
+      ['padding1', array(u8(), { size: 5 })],
+      ['flashLoanAmount', u64()],
+      ['padding', array(u32(), { size: 4 })],
+    ],
+    { description: 'RebalanceInstructionData' }
+  ) as Serializer<RebalanceInstructionDataArgs, RebalanceInstructionData>;
+}

package/src/generated/types/rebalanceStateValues.ts

@@ -0,0 +1,59 @@
+/**
+ * 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,
+  array,
+  struct,
+  u32,
+  u64,
+  u8,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  RebalanceDirection,
+  RebalanceDirectionArgs,
+  TokenBalanceChange,
+  TokenBalanceChangeArgs,
+  getRebalanceDirectionSerializer,
+  getTokenBalanceChangeSerializer,
+} from '.';
+
+export type RebalanceStateValues = {
+  rebalanceDirection: RebalanceDirection;
+  padding1: Array<number>;
+  targetSupplyUsd: bigint;
+  targetDebtUsd: bigint;
+  tokenBalanceChange: TokenBalanceChange;
+  padding: Array<number>;
+};
+
+export type RebalanceStateValuesArgs = {
+  rebalanceDirection: RebalanceDirectionArgs;
+  padding1: Array<number>;
+  targetSupplyUsd: number | bigint;
+  targetDebtUsd: number | bigint;
+  tokenBalanceChange: TokenBalanceChangeArgs;
+  padding: Array<number>;
+};
+
+export function getRebalanceStateValuesSerializer(): Serializer<
+  RebalanceStateValuesArgs,
+  RebalanceStateValues
+> {
+  return struct<RebalanceStateValues>(
+    [
+      ['rebalanceDirection', getRebalanceDirectionSerializer()],
+      ['padding1', array(u8(), { size: 7 })],
+      ['targetSupplyUsd', u64()],
+      ['targetDebtUsd', u64()],
+      ['tokenBalanceChange', getTokenBalanceChangeSerializer()],
+      ['padding', array(u32(), { size: 4 })],
+    ],
+    { description: 'RebalanceStateValues' }
+  ) as Serializer<RebalanceStateValuesArgs, RebalanceStateValues>;
+}

package/src/generated/types/rebalanceStep.ts

@@ -0,0 +1,25 @@
+/**
+ * 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 RebalanceStep {
+  PreSwap,
+  PostSwap,
+}
+
+export type RebalanceStepArgs = RebalanceStep;
+
+export function getRebalanceStepSerializer(): Serializer<
+  RebalanceStepArgs,
+  RebalanceStep
+> {
+  return scalarEnum<RebalanceStep>(RebalanceStep, {
+    description: 'RebalanceStep',
+  }) as Serializer<RebalanceStepArgs, RebalanceStep>;
+}

package/src/generated/types/solautoRebalanceType.ts

@@ -9,7 +9,6 @@
 import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
 
 export enum SolautoRebalanceType {
-  None,
   Regular,
   DoubleRebalanceWithFL,
   FLSwapThenRebalance,

package/src/generated/types/solautoSettingsParameters.ts

@@ -9,38 +9,20 @@
 import {
   Serializer,
   array,
-  bytes,
   struct,
   u16,
-  u8,
+  u32,
 } from '@metaplex-foundation/umi/serializers';
-import {
-  AutomationSettings,
-  AutomationSettingsArgs,
-  getAutomationSettingsSerializer,
-} from '.';
 
 export type SolautoSettingsParameters = {
   boostToBps: number;
   boostGap: number;
   repayToBps: number;
   repayGap: number;
-  targetBoostToBps: number;
-  padding1: Array<number>;
-  automation: AutomationSettings;
-  padding: Uint8Array;
+  padding: Array<number>;
 };
 
-export type SolautoSettingsParametersArgs = {
-  boostToBps: number;
-  boostGap: number;
-  repayToBps: number;
-  repayGap: number;
-  targetBoostToBps: number;
-  padding1: Array<number>;
-  automation: AutomationSettingsArgs;
-  padding: Uint8Array;
-};
+export type SolautoSettingsParametersArgs = SolautoSettingsParameters;
 
 export function getSolautoSettingsParametersSerializer(): Serializer<
   SolautoSettingsParametersArgs,
@@ -52,10 +34,7 @@ export function getSolautoSettingsParametersSerializer(): Serializer<
       ['boostGap', u16()],
       ['repayToBps', u16()],
       ['repayGap', u16()],
-      ['targetBoostToBps', u16()],
-      ['padding1', array(u8(), { size: 6 })],
-      ['automation', getAutomationSettingsSerializer()],
-      ['padding', bytes({ size: 32 })],
+      ['padding', array(u32(), { size: 24 })],
     ],
     { description: 'SolautoSettingsParameters' }
   ) as Serializer<SolautoSettingsParametersArgs, SolautoSettingsParameters>;

package/src/generated/types/solautoSettingsParametersInp.ts

@@ -6,36 +6,16 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 
-import { Option, OptionOrNullable } from '@metaplex-foundation/umi';
-import {
-  Serializer,
-  option,
-  struct,
-  u16,
-} from '@metaplex-foundation/umi/serializers';
-import {
-  AutomationSettingsInp,
-  AutomationSettingsInpArgs,
-  getAutomationSettingsInpSerializer,
-} from '.';
+import { Serializer, struct, u16 } from '@metaplex-foundation/umi/serializers';
 
 export type SolautoSettingsParametersInp = {
   boostToBps: number;
   boostGap: number;
   repayToBps: number;
   repayGap: number;
-  targetBoostToBps: Option<number>;
-  automation: Option<AutomationSettingsInp>;
 };
 
-export type SolautoSettingsParametersInpArgs = {
-  boostToBps: number;
-  boostGap: number;
-  repayToBps: number;
-  repayGap: number;
-  targetBoostToBps: OptionOrNullable<number>;
-  automation: OptionOrNullable<AutomationSettingsInpArgs>;
-};
+export type SolautoSettingsParametersInpArgs = SolautoSettingsParametersInp;
 
 export function getSolautoSettingsParametersInpSerializer(): Serializer<
   SolautoSettingsParametersInpArgs,
@@ -47,8 +27,6 @@ export function getSolautoSettingsParametersInpSerializer(): Serializer<
       ['boostGap', u16()],
       ['repayToBps', u16()],
       ['repayGap', u16()],
-      ['targetBoostToBps', option(u16())],
-      ['automation', option(getAutomationSettingsInpSerializer())],
     ],
     { description: 'SolautoSettingsParametersInp' }
   ) as Serializer<

package/src/generated/types/swapType.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 SwapType {
+  ExactIn,
+  ExactOut,
+}
+
+export type SwapTypeArgs = SwapType;
+
+export function getSwapTypeSerializer(): Serializer<SwapTypeArgs, SwapType> {
+  return scalarEnum<SwapType>(SwapType, {
+    description: 'SwapType',
+  }) as Serializer<SwapTypeArgs, SwapType>;
+}

package/src/generated/types/tokenBalanceChange.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 {
+  Serializer,
+  array,
+  struct,
+  u64,
+  u8,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  TokenBalanceChangeType,
+  TokenBalanceChangeTypeArgs,
+  getTokenBalanceChangeTypeSerializer,
+} from '.';
+
+export type TokenBalanceChange = {
+  changeType: TokenBalanceChangeType;
+  padding1: Array<number>;
+  amountUsd: bigint;
+};
+
+export type TokenBalanceChangeArgs = {
+  changeType: TokenBalanceChangeTypeArgs;
+  padding1: Array<number>;
+  amountUsd: number | bigint;
+};
+
+export function getTokenBalanceChangeSerializer(): Serializer<
+  TokenBalanceChangeArgs,
+  TokenBalanceChange
+> {
+  return struct<TokenBalanceChange>(
+    [
+      ['changeType', getTokenBalanceChangeTypeSerializer()],
+      ['padding1', array(u8(), { size: 7 })],
+      ['amountUsd', u64()],
+    ],
+    { description: 'TokenBalanceChange' }
+  ) as Serializer<TokenBalanceChangeArgs, TokenBalanceChange>;
+}

package/src/generated/types/tokenBalanceChangeType.ts

@@ -0,0 +1,28 @@
+/**
+ * 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 TokenBalanceChangeType {
+  None,
+  PreSwapDeposit,
+  PostSwapDeposit,
+  PostRebalanceWithdrawSupplyToken,
+  PostRebalanceWithdrawDebtToken,
+}
+
+export type TokenBalanceChangeTypeArgs = TokenBalanceChangeType;
+
+export function getTokenBalanceChangeTypeSerializer(): Serializer<
+  TokenBalanceChangeTypeArgs,
+  TokenBalanceChangeType
+> {
+  return scalarEnum<TokenBalanceChangeType>(TokenBalanceChangeType, {
+    description: 'TokenBalanceChangeType',
+  }) as Serializer<TokenBalanceChangeTypeArgs, TokenBalanceChangeType>;
+}

package/src/generated/types/updatePositionData.ts

@@ -24,13 +24,13 @@ import {
 
 export type UpdatePositionData = {
   positionId: number;
-  settingParams: Option<SolautoSettingsParametersInp>;
+  settings: Option<SolautoSettingsParametersInp>;
   dca: Option<DCASettingsInp>;
 };
 
 export type UpdatePositionDataArgs = {
   positionId: number;
-  settingParams: OptionOrNullable<SolautoSettingsParametersInpArgs>;
+  settings: OptionOrNullable<SolautoSettingsParametersInpArgs>;
   dca: OptionOrNullable<DCASettingsInpArgs>;
 };
 
@@ -41,7 +41,7 @@ export function getUpdatePositionDataSerializer(): Serializer<
   return struct<UpdatePositionData>(
     [
       ['positionId', u8()],
-      ['settingParams', option(getSolautoSettingsParametersInpSerializer())],
+      ['settings', option(getSolautoSettingsParametersInpSerializer())],
       ['dca', option(getDCASettingsInpSerializer())],
     ],
     { description: 'UpdatePositionData' }

package/src/index.ts

@@ -1,8 +1,8 @@
-export * from './clients';
-export * from './constants';
-export * from './generated';
-export * from './transactions';
-export * from './types';
-export * from './utils';
-// export * from './marginfi-sdk';
-// export * from './jupiter-sdk';
+export * from "./constants";
+export * from "./generated/accounts";
+export * from "./generated/types";
+export * from "./marginfi-sdk/accounts";
+export * from "./services";
+export * from "./solautoPosition";
+export * from "./types";
+export * from "./utils";

package/src/marginfi-sdk/types/interestRateConfig.ts

@@ -11,6 +11,7 @@ import {
   array,
   struct,
   u128,
+  u32,
 } from '@metaplex-foundation/umi/serializers';
 import {
   WrappedI80F48,
@@ -26,7 +27,8 @@ export type InterestRateConfig = {
   insuranceIrFee: WrappedI80F48;
   protocolFixedFeeApr: WrappedI80F48;
   protocolIrFee: WrappedI80F48;
-  padding: Array<bigint>;
+  protocolOriginationFee: WrappedI80F48;
+  padding: Array<number>;
 };
 
 export type InterestRateConfigArgs = {
@@ -37,6 +39,7 @@ export type InterestRateConfigArgs = {
   insuranceIrFee: WrappedI80F48Args;
   protocolFixedFeeApr: WrappedI80F48Args;
   protocolIrFee: WrappedI80F48Args;
+  protocolOriginationFee: WrappedI80F48Args;
   padding: Array<number | bigint>;
 };
 
@@ -53,7 +56,8 @@ export function getInterestRateConfigSerializer(): Serializer<
       ['insuranceIrFee', getWrappedI80F48Serializer()],
       ['protocolFixedFeeApr', getWrappedI80F48Serializer()],
       ['protocolIrFee', getWrappedI80F48Serializer()],
-      ['padding', array(u128(), { size: 8 })],
+      ['protocolOriginationFee', getWrappedI80F48Serializer()],
+      ['padding', array(u32(), { size: 28 })],
     ],
     { description: 'InterestRateConfig' }
   ) as Serializer<InterestRateConfigArgs, InterestRateConfig>;

package/src/services/flashLoans/flProviderAggregator.ts

@@ -0,0 +1,74 @@
+import { FlProviderBase } from "./flProviderBase";
+import { PublicKey } from "@solana/web3.js";
+import { FlashLoanDetails, FlashLoanRequirements } from "../../types";
+import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { TokenType } from "../../generated";
+import { MarginfiFlProvider } from "./marginfiFlProvider";
+
+export class FlProviderAggregator extends FlProviderBase {
+  private marginfiFlProvider!: MarginfiFlProvider;
+
+  constructor(
+    umi: Umi,
+    signer: Signer,
+    supplyMint: PublicKey,
+    debtMint: PublicKey
+  ) {
+    super(umi, signer, supplyMint, debtMint);
+    this.marginfiFlProvider = new MarginfiFlProvider(
+      umi,
+      signer,
+      supplyMint,
+      debtMint
+    );
+  }
+
+  async initialize() {
+    // TODO: PF
+    // Once we have more than one, set the right fl provider for each liquidity source
+    await this.marginfiFlProvider.initialize();
+  }
+
+  async flAccountPrereqIxs(): Promise<TransactionBuilder> {
+    return await this.marginfiFlProvider.initializeIMfiAccounts();
+  }
+
+  otherSigners(): Signer[] {
+    // TODO: PF
+    return [...this.flSigners, ...this.marginfiFlProvider.otherSigners()];
+  }
+
+  lutAccountsToAdd(): PublicKey[] {
+    return [
+      ...super.lutAccountsToAdd(),
+      ...this.marginfiFlProvider.lutAccountsToAdd(),
+    ];
+  }
+
+  private flProvider(source: TokenType): FlProviderBase {
+    // TODO: PF
+    return this.marginfiFlProvider;
+  }
+
+  liquidityAvailable(source: TokenType): bigint {
+    return this.flProvider(source).liquidityAvailable(source);
+  }
+
+  flFeeBps(source: TokenType, signerFlashLoan?: boolean): number {
+    return this.flProvider(source).flFeeBps(source);
+  }
+
+  flashBorrow(
+    flashLoan: FlashLoanDetails,
+    destTokenAccount: PublicKey
+  ): TransactionBuilder {
+    return this.flProvider(flashLoan.liquiditySource).flashBorrow(
+      flashLoan,
+      destTokenAccount
+    );
+  }
+
+  flashRepay(flashLoan: FlashLoanDetails): TransactionBuilder {
+    return this.flProvider(flashLoan.liquiditySource).flashRepay(flashLoan);
+  }
+}