@haven-fi/solauto-sdk 1.0.581 → 1.0.583

package/tests/unit/rebalanceCalculations.ts

@@ -2,39 +2,14 @@ import { describe, it, before } from "mocha";
 import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { assert } from "chai";
-import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import { setupTest } from "../shared";
-import { getRebalanceValues } from "../../src/utils/solauto/rebalanceUtils";
 import { publicKey } from "@metaplex-foundation/umi";
-import { SolautoClient } from "../../src/clients/solautoClient";
 import {
-  DCASettings,
   LendingPlatform,
-  PositionType,
-  RebalanceDirection,
-  SolautoRebalanceType,
   SolautoSettingsParameters,
-  TokenType,
 } from "../../src/generated";
-import {
-  calcDebtUsd,
-  calcNetWorthUsd,
-  calcSupplyUsd,
-  fromBaseUnit,
-  fromBps,
-  getLiqUtilzationRateBps,
-  getSolautoFeesBps,
-  toBaseUnit,
-} from "../../src/utils/numberUtils";
-import { USD_DECIMALS } from "../../src/constants/generalAccounts";
-import {
-  createFakePositionState,
-  eligibleForNextAutomationPeriod,
-  getAdjustedSettingsFromAutomation,
-  getUpdatedValueFromAutomation,
-  positionStateWithLatestPrices,
-} from "../../src/utils/solauto/generalUtils";
-import { currentUnixSeconds } from "../../src/utils/generalUtils";
+import { fromBps, getLiqUtilzationRateBps } from "../../src/utils/numberUtils";
+import { getClient } from "../../src/utils/solautoUtils";
 import { USDC } from "../../src/constants/tokenConstants";
 import {
   buildHeliusApiUrl,
@@ -42,6 +17,14 @@ import {
   getSolanaRpcConnection,
   safeGetPrice,
 } from "../../src/utils";
+import {
+  createFakePositionState,
+  getRebalanceValues,
+  MarginfiSolautoPositionEx,
+  SolautoClient,
+} from "../../src";
+import { SolautoFeesBps } from "../../src/services/rebalance/solautoFees";
+import { buildIronforgeApiUrl } from "../../dist";
 
 const signer = setupTest(undefined, true);
 const [conn, _] = getSolanaRpcConnection(
@@ -51,45 +34,23 @@ const [conn, _] = getSolanaRpcConnection(
 function assertAccurateRebalance(
   client: SolautoClient,
   expectedLiqUtilizationRateBps: number,
-  targetLiqUtilizationRateBps?: number,
-  expectedUsdToDcaIn?: number
+  targetLiqUtilizationRateBps?: number
 ) {
-  const { rebalanceDirection, debtAdjustmentUsd, amountUsdToDcaIn } =
-    getRebalanceValues(
-      client.solautoPositionState!,
-      client.solautoPositionSettings(),
-      client.solautoPositionActiveDca(),
-      currentUnixSeconds(),
-      safeGetPrice(client.supplyMint)!,
-      safeGetPrice(client.debtMint)!,
-      targetLiqUtilizationRateBps
-    );
-
-  let adjustmentFeeBps = 0;
-  adjustmentFeeBps = getSolautoFeesBps(
-    client.referredBy !== undefined,
-    targetLiqUtilizationRateBps,
-    calcNetWorthUsd(client.solautoPositionState),
-    rebalanceDirection
-  ).total;
-
-  assert(
-    Math.round(amountUsdToDcaIn) === Math.round(expectedUsdToDcaIn ?? 0),
-    `Expected DCA-in amount does not match ${Math.round(
-      amountUsdToDcaIn
-    )}, ${Math.round(expectedUsdToDcaIn ?? 0)}`
+  const { endResult } = getRebalanceValues(
+    client.solautoPosition,
+    new SolautoFeesBps(
+      false,
+      targetLiqUtilizationRateBps,
+      client.solautoPosition.netWorthUsd()
+    ),
+    50,
+    targetLiqUtilizationRateBps
   );
 
-  const newSupply =
-    calcSupplyUsd(client.solautoPositionState) +
-    (debtAdjustmentUsd - debtAdjustmentUsd * fromBps(adjustmentFeeBps)) +
-    amountUsdToDcaIn;
-  const newDebt = calcDebtUsd(client.solautoPositionState) + debtAdjustmentUsd;
-
   const newLiqUtilizationRateBps = getLiqUtilzationRateBps(
-    newSupply,
-    newDebt,
-    client.solautoPositionState!.liqThresholdBps
+    endResult.supplyUsd,
+    endResult.debtUsd,
+    client.solautoPosition.state().liqThresholdBps
   );
   assert(
     Math.round(newLiqUtilizationRateBps) ===
@@ -102,16 +63,14 @@ async function getFakePosition(
   supplyPrice: number,
   debtPrice: number,
   fakeLiqUtilizationRateBps: number,
-  settings: SolautoSettingsParameters,
-  dca?: DCASettings
+  settings: SolautoSettingsParameters
 ): Promise<SolautoClient> {
-  const client = new SolautoMarginfiClient(
-    buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
-    true
-  );
+  const client = getClient(LendingPlatform.Marginfi, {
+    signer,
+    rpcUrl: buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+  });
   await client.initialize({
     positionId: 1,
-    signer,
     supplyMint: new PublicKey(NATIVE_MINT),
     debtMint: new PublicKey(USDC),
   });
@@ -119,81 +78,43 @@ async function getFakePosition(
   const supplyUsd = 1000;
   const maxLtvBps = 6400;
   const liqThresholdBps = 8181;
-  client.solautoPositionState = await positionStateWithLatestPrices(
-    createFakePositionState(
-      {
-        amountUsed: supplyUsd / supplyPrice,
-        price: safeGetPrice(NATIVE_MINT)!,
-        mint: NATIVE_MINT,
-      },
-      {
-        amountUsed:
-          (supplyUsd *
-            fromBps(liqThresholdBps) *
-            fromBps(fakeLiqUtilizationRateBps)) /
-          debtPrice,
-        price: 1,
-        mint: new PublicKey(USDC),
-      },
-      maxLtvBps,
-      liqThresholdBps
-    )
-  );
 
-  client.solautoPositionData = {
-    positionId: [1],
-    bump: [0],
-    selfManaged: {
-      val: false,
+  const fakeState = createFakePositionState(
+    {
+      amountUsed: supplyUsd / supplyPrice,
+      price: safeGetPrice(NATIVE_MINT)!,
+      mint: NATIVE_MINT,
     },
-    authority: client.signer.publicKey,
-    position: {
-      dca: dca ?? {
-        automation: {
-          targetPeriods: 0,
-          periodsPassed: 0,
-          unixStartDate: BigInt(0),
-          intervalSeconds: BigInt(0),
-          padding1: [],
-          padding: new Uint8Array([]),
-        },
-        dcaInBaseUnit: BigInt(0),
-        tokenType: TokenType.Debt,
-        padding: [],
-      },
-      lendingPlatform: LendingPlatform.Marginfi,
-      protocolSupplyAccount: publicKey(PublicKey.default),
-      protocolDebtAccount: publicKey(PublicKey.default),
-      protocolUserAccount: publicKey(PublicKey.default),
-      settingParams: settings,
-      padding1: [],
-      padding: [],
-    },
-    state: client.solautoPositionState!,
-    rebalance: {
-      rebalanceType: SolautoRebalanceType.Regular,
-      rebalanceDirection: RebalanceDirection.Boost,
-      flashLoanAmount: BigInt(0),
-      padding1: [],
-      padding2: [],
-      padding: new Uint8Array([]),
+    {
+      amountUsed:
+        (supplyUsd *
+          fromBps(liqThresholdBps) *
+          fromBps(fakeLiqUtilizationRateBps)) /
+        debtPrice,
+      price: 1,
+      mint: new PublicKey(USDC),
     },
-    positionType: PositionType.Leverage,
-    padding1: [],
-    padding: [],
-    publicKey: publicKey(PublicKey.default),
-    header: {
-      executable: false,
-      lamports: {
-        basisPoints: BigInt(0),
-        decimals: 9,
-        identifier: "SOL",
+    maxLtvBps,
+    liqThresholdBps
+  );
+
+  client.solautoPosition = new MarginfiSolautoPositionEx({
+    umi: client.umi,
+    publicKey: PublicKey.default,
+    data: {
+      state: fakeState,
+      position: {
+        lendingPlatform: LendingPlatform.Marginfi,
+        protocolUserAccount: publicKey(PublicKey.default),
+        protocolSupplyAccount: publicKey(PublicKey.default),
+        protocolDebtAccount: publicKey(PublicKey.default),
+        settings,
+        dca: null,
+        padding: [],
+        padding1: [],
       },
-      owner: publicKey(PublicKey.default),
     },
-  };
-
-  client.solautoPositionState!.lastUpdated = BigInt(currentUnixSeconds());
+  });
 
   return client;
 }
@@ -211,71 +132,13 @@ async function rebalanceFromFakePosition(
     settings
   );
 
-  const adjustedSettings = getAdjustedSettingsFromAutomation(
-    settings,
-    currentUnixSeconds()
-  );
   const expectedLiqUtilizationRateBps =
-    fakeLiqUtilizationRateBps <
-    adjustedSettings.boostToBps - adjustedSettings.boostGap
-      ? adjustedSettings.boostToBps
-      : adjustedSettings.repayToBps;
+    fakeLiqUtilizationRateBps < settings.boostToBps - settings.boostGap
+      ? settings.boostToBps
+      : settings.repayToBps;
   assertAccurateRebalance(client, expectedLiqUtilizationRateBps);
 }
 
-async function dcaRebalanceFromFakePosition(
-  supplyPrice: number,
-  debtPrice: number,
-  fakeLiqUtilizationRateBps: number,
-  settings: SolautoSettingsParameters,
-  dca: DCASettings
-) {
-  const client = await getFakePosition(
-    supplyPrice,
-    debtPrice,
-    fakeLiqUtilizationRateBps,
-    settings,
-    dca
-  );
-
-  const adjustedSettings = getAdjustedSettingsFromAutomation(
-    settings,
-    currentUnixSeconds()
-  );
-  const expectedLiqUtilizationRateBps =
-    dca.dcaInBaseUnit > BigInt(0)
-      ? Math.max(fakeLiqUtilizationRateBps, adjustedSettings.boostToBps)
-      : adjustedSettings.boostToBps;
-
-  const expectedDcaInAmount =
-    dca.dcaInBaseUnit > BigInt(0) &&
-    eligibleForNextAutomationPeriod(dca.automation, currentUnixSeconds())
-      ? dca.dcaInBaseUnit -
-        BigInt(
-          Math.round(
-            getUpdatedValueFromAutomation(
-              Number(dca.dcaInBaseUnit),
-              0,
-              dca.automation,
-              currentUnixSeconds()
-            )
-          )
-        )
-      : BigInt(0);
-  const expectedUsdToDcaIn =
-    fromBaseUnit(
-      BigInt(Math.round(Number(expectedDcaInAmount))),
-      client.solautoPositionState!.debt.decimals
-    ) * debtPrice;
-
-  assertAccurateRebalance(
-    client,
-    expectedLiqUtilizationRateBps,
-    undefined,
-    expectedUsdToDcaIn
-  );
-}
-
 describe("Rebalance tests", async () => {
   let supplyPrice: number, debtPrice: number;
 
@@ -292,17 +155,7 @@ describe("Rebalance tests", async () => {
       boostGap: 100,
       repayToBps: 7000,
       repayGap: 250,
-      automation: {
-        targetPeriods: 0,
-        periodsPassed: 0,
-        unixStartDate: BigInt(0),
-        intervalSeconds: BigInt(0),
-        padding1: [],
-        padding: new Uint8Array([]),
-      },
-      targetBoostToBps: 0,
-      padding1: [],
-      padding: new Uint8Array([]),
+      padding: [],
     });
 
     assertAccurateRebalance(client, 5000, 5000);
@@ -311,145 +164,14 @@ describe("Rebalance tests", async () => {
 
   it("Standard boost or repay", async () => {
     const settings: SolautoSettingsParameters = {
-      automation: {
-        targetPeriods: 0,
-        periodsPassed: 0,
-        unixStartDate: BigInt(0),
-        intervalSeconds: BigInt(0),
-        padding1: [],
-        padding: new Uint8Array([]),
-      },
-      targetBoostToBps: 0,
       boostGap: 1000,
       boostToBps: 4000,
       repayGap: 1000,
       repayToBps: 7500,
-      padding1: [],
-      padding: new Uint8Array([]),
+      padding: [],
     };
 
     await rebalanceFromFakePosition(supplyPrice, debtPrice, 1000, settings);
     await rebalanceFromFakePosition(supplyPrice, debtPrice, 9000, settings);
   });
-
-  it("Rebalance with settings automation", async () => {
-    const settings: SolautoSettingsParameters = {
-      automation: {
-        targetPeriods: 2,
-        periodsPassed: 1,
-        intervalSeconds: BigInt(5),
-        unixStartDate: BigInt(currentUnixSeconds() - 5),
-        padding1: [],
-        padding: new Uint8Array([]),
-      },
-      targetBoostToBps: 5000,
-      boostGap: 1000,
-      boostToBps: 4000,
-      repayGap: 1000,
-      repayToBps: 7500,
-      padding1: [],
-      padding: new Uint8Array([]),
-    };
-    await rebalanceFromFakePosition(supplyPrice, debtPrice, 3500, settings);
-
-    settings.automation.targetPeriods = 5;
-    await rebalanceFromFakePosition(supplyPrice, debtPrice, 3100, settings);
-
-    settings.automation.periodsPassed = 0;
-    settings.automation.unixStartDate = BigInt(currentUnixSeconds());
-    await rebalanceFromFakePosition(supplyPrice, debtPrice, 3100, settings);
-  });
-
-  it("Rebalance DCA out", async () => {
-    const settings: SolautoSettingsParameters = {
-      automation: {
-        targetPeriods: 4,
-        periodsPassed: 0,
-        intervalSeconds: BigInt(5),
-        unixStartDate: BigInt(currentUnixSeconds()),
-        padding1: [],
-        padding: new Uint8Array([]),
-      },
-      targetBoostToBps: 0,
-      boostGap: 1000,
-      boostToBps: 4000,
-      repayGap: 1000,
-      repayToBps: 7500,
-      padding1: [],
-      padding: new Uint8Array([]),
-    };
-    const dca: DCASettings = {
-      automation: {
-        targetPeriods: 4,
-        periodsPassed: 0,
-        intervalSeconds: BigInt(5),
-        unixStartDate: BigInt(currentUnixSeconds()),
-        padding1: [],
-        padding: new Uint8Array([]),
-      },
-      dcaInBaseUnit: BigInt(0),
-      tokenType: TokenType.Debt,
-      padding: [],
-    };
-    await dcaRebalanceFromFakePosition(
-      supplyPrice,
-      debtPrice,
-      3500,
-      settings,
-      dca
-    );
-
-    settings.boostToBps = 1500;
-    settings.automation.periodsPassed = 3;
-    settings.automation.unixStartDate = BigInt(currentUnixSeconds() - 3 * 5);
-    dca.automation.periodsPassed = 3;
-    dca.automation.unixStartDate = BigInt(currentUnixSeconds() - 3 * 5);
-    await dcaRebalanceFromFakePosition(
-      supplyPrice,
-      debtPrice,
-      3500,
-      settings,
-      dca
-    );
-  });
-
-  it("Rebalance DCA in", async () => {
-    const settings: SolautoSettingsParameters = {
-      automation: {
-        targetPeriods: 3,
-        periodsPassed: 0,
-        intervalSeconds: BigInt(5),
-        unixStartDate: BigInt(currentUnixSeconds()),
-        padding1: [],
-        padding: new Uint8Array([]),
-      },
-      targetBoostToBps: 5000,
-      boostGap: 1000,
-      boostToBps: 4000,
-      repayGap: 1000,
-      repayToBps: 7500,
-      padding1: [],
-      padding: new Uint8Array([]),
-    };
-    const dca: DCASettings = {
-      automation: {
-        targetPeriods: 4,
-        periodsPassed: 0,
-        intervalSeconds: BigInt(5),
-        unixStartDate: BigInt(currentUnixSeconds()),
-        padding1: [],
-        padding: new Uint8Array([]),
-      },
-      dcaInBaseUnit: toBaseUnit(debtPrice * 300, 6),
-      tokenType: TokenType.Debt,
-      padding: [],
-    };
-    await dcaRebalanceFromFakePosition(
-      supplyPrice,
-      debtPrice,
-      3500,
-      settings,
-      dca
-    );
-  });
 });

package/dist/clients/index.d.ts

@@ -1,5 +0,0 @@
-export * from './solautoMarginfiClient';
-export * from './solautoClient';
-export * from './referralStateManager';
-export * from './txHandler';
-//# sourceMappingURL=index.d.ts.map

package/dist/clients/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/clients/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC"}

package/dist/clients/referralStateManager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"referralStateManager.d.ts","sourceRoot":"","sources":["../../src/clients/referralStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAEL,MAAM,EAEN,kBAAkB,EAClB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAEL,aAAa,EAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IAC1C,GAAG,EAAG,GAAG,CAAC;IAEV,aAAa,EAAG,SAAS,CAAC;IAC1B,iBAAiB,EAAG,aAAa,GAAG,IAAI,CAAC;IACzC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,eAAe,CAAC,EAAE,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAkC/C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS;IAsBpC,sBAAsB,CACpB,YAAY,CAAC,EAAE,SAAS,EACxB,WAAW,CAAC,EAAE,SAAS,GACtB,kBAAkB;IAerB,mBAAmB,IAAI,kBAAkB;IA0BnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC3D"}

package/dist/clients/solautoClient.d.ts

@@ -1,71 +0,0 @@
-import "rpc-websockets/dist/lib/client";
-import { PublicKey } from "@solana/web3.js";
-import { TransactionBuilder } from "@metaplex-foundation/umi";
-import { DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, SolautoActionArgs, SolautoPosition, SolautoRebalanceType, SolautoRebalanceTypeArgs, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../generated";
-import { FlashLoanDetails, RebalanceValues } from "../utils/solauto/rebalanceUtils";
-import { ContextUpdates } from "../utils/solauto/generalUtils";
-import { ReferralStateManager, ReferralStateManagerArgs } from "./referralStateManager";
-import { QuoteResponse } from "@jup-ag/api";
-export interface SolautoClientArgs extends ReferralStateManagerArgs {
-    new?: boolean;
-    positionId?: number;
-    supplyMint?: PublicKey;
-    debtMint?: PublicKey;
-}
-export declare abstract class SolautoClient extends ReferralStateManager {
-    lendingPlatform?: LendingPlatform;
-    authority: PublicKey;
-    positionId: number;
-    selfManaged: boolean;
-    solautoPosition: PublicKey;
-    solautoPositionData: SolautoPosition | null;
-    solautoPositionState: PositionState | undefined;
-    maxLtvBps?: number;
-    liqThresholdBps?: number;
-    supplyMint: PublicKey;
-    positionSupplyTa: PublicKey;
-    signerSupplyTa: PublicKey;
-    debtMint: PublicKey;
-    positionDebtTa: PublicKey;
-    signerDebtTa: PublicKey;
-    solautoFeesSupplyTa: PublicKey;
-    solautoFeesDebtTa: PublicKey;
-    authorityLutAddress?: PublicKey;
-    contextUpdates: ContextUpdates;
-    private signerSupplyBalance;
-    private signerDebtBalance;
-    initialize(args: SolautoClientArgs): Promise<void>;
-    referredBySupplyTa(): PublicKey | undefined;
-    referredByDebtTa(): PublicKey | undefined;
-    resetLiveTxUpdates(success?: boolean): Promise<void>;
-    abstract protocolAccount(): PublicKey;
-    defaultLookupTables(): string[];
-    lutAccountsToAdd(): PublicKey[];
-    fetchExistingAuthorityLutAccounts(): Promise<PublicKey[]>;
-    updateLookupTable(): Promise<{
-        tx: TransactionBuilder;
-        new: boolean;
-        accountsToAdd: PublicKey[];
-    } | undefined>;
-    signerBalances(): Promise<{
-        supplyBalance: bigint;
-        debtBalance: bigint;
-    }>;
-    solautoPositionSettings(): SolautoSettingsParameters | undefined;
-    solautoPositionActiveDca(): DCASettings | undefined;
-    maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
-    openPosition(settingParams?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
-    updatePositionIx(args: UpdatePositionDataArgs): TransactionBuilder;
-    closePositionIx(): TransactionBuilder;
-    cancelDCAIx(): TransactionBuilder;
-    abstract refresh(): TransactionBuilder;
-    protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
-    abstract flashBorrow(rebalanceType: SolautoRebalanceType, flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
-    abstract flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
-    abstract rebalance(rebalanceStep: "A" | "B", jupQuote: QuoteResponse, rebalanceType: SolautoRebalanceTypeArgs, rebalanceValues: RebalanceValues, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number): TransactionBuilder;
-    getFreshPositionState(): Promise<PositionState | undefined>;
-    abstract supplyLiquidityAvailable(): bigint;
-    abstract supplyLiquidityDepositable(): bigint;
-    abstract debtLiquidityAvailable(): bigint;
-}
-//# sourceMappingURL=solautoClient.d.ts.map

package/dist/clients/solautoClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/solautoMarginfiClient.d.ts

@@ -1,51 +0,0 @@
-import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
-import { PublicKey } from "@solana/web3.js";
-import { SolautoClient, SolautoClientArgs } from "./solautoClient";
-import { MarginfiAssetAccounts } from "../types/accounts";
-import { DCASettingsInpArgs, PositionState, SolautoActionArgs, SolautoRebalanceType, SolautoRebalanceTypeArgs, SolautoSettingsParametersInpArgs } from "../generated";
-import { MarginfiAccount } from "../marginfi-sdk";
-import { FlashLoanDetails, RebalanceValues } from "../utils/solauto/rebalanceUtils";
-import { QuoteResponse } from "@jup-ag/api";
-export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
-    marginfiAccount?: PublicKey | Signer;
-    marginfiAccountSeedIdx?: bigint;
-    marginfiGroup?: PublicKey;
-}
-export declare class SolautoMarginfiClient extends SolautoClient {
-    private initializedFor?;
-    marginfiProgram: PublicKey;
-    marginfiAccountSeedIdx: bigint;
-    marginfiAccount: PublicKey | Signer;
-    marginfiAccountPk: PublicKey;
-    marginfiGroup: PublicKey;
-    marginfiSupplyAccounts: MarginfiAssetAccounts;
-    marginfiDebtAccounts: MarginfiAssetAccounts;
-    supplyPriceOracle: PublicKey;
-    debtPriceOracle: PublicKey;
-    intermediaryMarginfiAccountSigner?: Signer;
-    intermediaryMarginfiAccountPk: PublicKey;
-    intermediaryMarginfiAccount?: MarginfiAccount;
-    private supplyBank;
-    private debtBank;
-    initialize(args: SolautoMarginfiClientArgs): Promise<void>;
-    setIntermediaryMarginfiDetails(): Promise<void>;
-    protocolAccount(): PublicKey;
-    defaultLookupTables(): string[];
-    lutAccountsToAdd(): PublicKey[];
-    maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
-    marginfiAccountInitialize(marginfiAccount: Signer): TransactionBuilder;
-    openPosition(settingParams?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
-    private marginfiOpenPositionIx;
-    refresh(): TransactionBuilder;
-    protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
-    private marginfiProtocolInteractionIx;
-    private marginfiSolautoProtocolInteractionIx;
-    rebalance(rebalanceStep: "A" | "B", jupQuote: QuoteResponse, rebalanceType: SolautoRebalanceTypeArgs, rebalanceValues: RebalanceValues, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number): TransactionBuilder;
-    flashBorrow(rebalanceType: SolautoRebalanceType, flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
-    flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
-    getFreshPositionState(): Promise<PositionState | undefined>;
-    supplyLiquidityAvailable(): bigint;
-    supplyLiquidityDepositable(): bigint;
-    debtLiquidityAvailable(): bigint;
-}
-//# sourceMappingURL=solautoMarginfiClient.d.ts.map

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAGb,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAGL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAUzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,cAAc,CAAC,CAAY;IAE5B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAErD,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAE/B,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAiG1C,8BAA8B;IAwCpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA0B3D,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IA+ErB,WAAW,CACT,aAAa,EAAE,oBAAoB,EACnC,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2CrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAwF5D,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAmDjE,wBAAwB,IAAI,MAAM;IAIlC,0BAA0B,IAAI,MAAM;IAIpC,sBAAsB,IAAI,MAAM;CAGjC"}