@haven-fi/solauto-sdk 1.0.581 → 1.0.583

package/dist/{clients → services/solauto}/referralStateManager.js

@@ -5,24 +5,16 @@ const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
-const umi_signer_wallet_adapters_1 = require("@metaplex-foundation/umi-signer-wallet-adapters");
-const generated_1 = require("../generated");
-const utils_1 = require("../utils");
+const generated_1 = require("../../generated");
+const utils_1 = require("../../utils");
 const txHandler_1 = require("./txHandler");
-const constants_1 = require("../constants");
+const constants_1 = require("../../constants");
 class ReferralStateManager extends txHandler_1.TxHandler {
     async initialize(args) {
-        if (!args.signer && !args.wallet) {
-            throw new Error("Signer or wallet must be provided");
-        }
-        this.umi = this.umi.use(args.signer
-            ? (0, umi_1.signerIdentity)(args.signer, true)
-            : (0, umi_signer_wallet_adapters_1.walletAdapterIdentity)(args.wallet, true));
-        this.signer = this.umi.identity;
         this.referralState =
             args.referralState ??
                 (0, utils_1.getReferralState)(args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.programId);
-        this.referralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.referralState), { commitment: "confirmed" });
+        await this.refetchReferralState();
         this.authority = this.referralStateData?.authority
             ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.authority)
             : (args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey));
@@ -37,6 +29,9 @@ class ReferralStateManager extends txHandler_1.TxHandler {
             ? [constants_1.SOLAUTO_LUT, this.referralStateData?.lookupTable.toString()]
             : [constants_1.SOLAUTO_LUT];
     }
+    async refetchReferralState() {
+        this.referralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.referralState), { commitment: "confirmed" });
+    }
     setReferredBy(referredBy) {
         const hasReferredBy = this.referralStateData &&
             this.referralStateData.referredByState !== (0, umi_1.publicKey)(web3_js_1.PublicKey.default);
@@ -53,6 +48,9 @@ class ReferralStateManager extends txHandler_1.TxHandler {
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.referredByState)
                 : undefined;
     }
+    isReferred() {
+        return Boolean(this.referredByState);
+    }
     updateReferralStatesIx(destFeesMint, lookupTable) {
         return (0, generated_1.updateReferralStates)(this.umi, {
             signer: this.signer,

package/dist/services/solauto/solautoClient.d.ts

@@ -0,0 +1,59 @@
+import "rpc-websockets/dist/lib/client";
+import { PublicKey } from "@solana/web3.js";
+import { TransactionBuilder } from "@metaplex-foundation/umi";
+import { DCASettingsInpArgs, LendingPlatform, RebalanceStep, SolautoActionArgs, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../../generated";
+import { ContextUpdates } from "../../utils/solautoUtils";
+import { ReferralStateManager, ReferralStateManagerArgs } from "./referralStateManager";
+import { SolautoPositionEx } from "../../solautoPosition";
+import { RebalanceDetails } from "../../types";
+import { FlProviderAggregator } from "../flashLoans/flProviderAggregator";
+export interface SolautoClientArgs extends ReferralStateManagerArgs {
+    new?: boolean;
+    positionId?: number;
+    supplyMint?: PublicKey;
+    debtMint?: PublicKey;
+    lendingPool?: PublicKey;
+    lpUserAccount?: PublicKey;
+}
+export declare abstract class SolautoClient extends ReferralStateManager {
+    lendingPlatform: LendingPlatform;
+    authority: PublicKey;
+    positionId: number;
+    selfManaged: boolean;
+    solautoPosition: SolautoPositionEx;
+    positionSupplyTa: PublicKey;
+    signerSupplyTa: PublicKey;
+    positionDebtTa: PublicKey;
+    signerDebtTa: PublicKey;
+    solautoFeesSupplyTa: PublicKey;
+    solautoFeesDebtTa: PublicKey;
+    authorityLutAddress?: PublicKey;
+    flProvider: FlProviderAggregator;
+    contextUpdates: ContextUpdates;
+    private signerSupplyBalance;
+    private signerDebtBalance;
+    initialize(args: SolautoClientArgs): Promise<void>;
+    referredBySupplyTa(): PublicKey | undefined;
+    referredByDebtTa(): PublicKey | undefined;
+    resetLiveTxUpdates(success?: boolean): Promise<void>;
+    defaultLookupTables(): string[];
+    lutAccountsToAdd(): PublicKey[];
+    fetchExistingAuthorityLutAccounts(): Promise<PublicKey[]>;
+    updateLookupTable(): Promise<{
+        tx: TransactionBuilder;
+        new: boolean;
+        accountsToAdd: PublicKey[];
+    } | undefined>;
+    signerBalances(): Promise<{
+        supplyBalance: bigint;
+        debtBalance: bigint;
+    }>;
+    openPositionIx(settings?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
+    updatePositionIx(args: UpdatePositionDataArgs): TransactionBuilder;
+    abstract closePositionIx(): TransactionBuilder;
+    cancelDCAIx(): TransactionBuilder;
+    abstract refreshIx(): TransactionBuilder;
+    protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder;
+    abstract rebalanceIx(rebalanceStep: RebalanceStep, data: RebalanceDetails): TransactionBuilder;
+}
+//# sourceMappingURL=solautoClient.d.ts.map

package/dist/services/solauto/solautoClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAEL,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,eAAe,EAAG,iBAAiB,CAAC;IAEpC,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA8ExC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAU3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAUnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAmB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAmBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA2DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IA8CF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAwFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}

package/dist/{clients → services/solauto}/solautoClient.js

@@ -5,84 +5,79 @@ require("rpc-websockets/dist/lib/client");
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
-const generated_1 = require("../generated");
-const accountUtils_1 = require("../utils/accountUtils");
-const generalAccounts_1 = require("../constants/generalAccounts");
-const solanaUtils_1 = require("../utils/solanaUtils");
-const solautoConstants_1 = require("../constants/solautoConstants");
-const generalUtils_1 = require("../utils/generalUtils");
-const generalUtils_2 = require("../utils/solauto/generalUtils");
+const generated_1 = require("../../generated");
+const accountUtils_1 = require("../../utils/accountUtils");
+const generalAccounts_1 = require("../../constants/generalAccounts");
+const solanaUtils_1 = require("../../utils/solanaUtils");
+const solautoConstants_1 = require("../../constants/solautoConstants");
+const solautoUtils_1 = require("../../utils/solautoUtils");
 const referralStateManager_1 = require("./referralStateManager");
+const solautoPosition_1 = require("../../solautoPosition");
+const flProviderAggregator_1 = require("../flashLoans/flProviderAggregator");
 class SolautoClient extends referralStateManager_1.ReferralStateManager {
     constructor() {
         super(...arguments);
-        this.contextUpdates = new generalUtils_2.ContextUpdates();
+        this.contextUpdates = new solautoUtils_1.ContextUpdates();
     }
     async initialize(args) {
         await super.initialize(args);
         this.positionId = args.positionId ?? 0;
         this.selfManaged = this.positionId === 0;
-        this.solautoPosition = (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId, this.programId);
-        this.solautoPositionData = !args.new
-            ? await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition), { commitment: "confirmed" })
-            : null;
-        this.solautoPositionState = this.solautoPositionData?.state;
-        this.maxLtvBps = undefined;
-        this.liqThresholdBps = undefined;
-        this.supplyMint =
-            args.supplyMint ??
-                (this.solautoPositionData && !this.selfManaged
-                    ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.state.supply.mint)
-                    : web3_js_1.PublicKey.default);
-        this.positionSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.supplyMint);
-        this.signerSupplyTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.supplyMint);
-        this.debtMint =
-            args.debtMint ??
-                (this.solautoPositionData && !this.selfManaged
-                    ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.state.debt.mint)
-                    : web3_js_1.PublicKey.default);
-        this.positionDebtTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtMint);
-        this.signerDebtTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtMint);
-        this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(generalAccounts_1.SOLAUTO_FEES_WALLET, this.supplyMint);
-        this.solautoFeesDebtTa = (0, accountUtils_1.getTokenAccount)(generalAccounts_1.SOLAUTO_FEES_WALLET, this.debtMint);
+        if (this.selfManaged &&
+            (!args.supplyMint || !args.debtMint || !args.lpUserAccount)) {
+            throw new Error("Self managed position is missing arguments");
+        }
+        const positionPk = (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId, this.programId);
+        this.solautoPosition = await (0, solautoPosition_1.getOrCreatePositionEx)(this.umi, positionPk, {
+            supplyMint: args.supplyMint,
+            debtMint: args.debtMint,
+            lpUserAccount: args.lpUserAccount,
+            lendingPlatform: this.lendingPlatform,
+        }, this.contextUpdates);
+        this.positionSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition.publicKey, this.solautoPosition.supplyMint());
+        this.signerSupplyTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.solautoPosition.supplyMint());
+        this.positionDebtTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition.publicKey, this.solautoPosition.debtMint());
+        this.signerDebtTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.solautoPosition.debtMint());
+        this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(generalAccounts_1.SOLAUTO_FEES_WALLET, this.solautoPosition.supplyMint());
+        this.solautoFeesDebtTa = (0, accountUtils_1.getTokenAccount)(generalAccounts_1.SOLAUTO_FEES_WALLET, this.solautoPosition.debtMint());
         this.authorityLutAddress =
             this.referralStateData?.lookupTable &&
                 !(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable).equals(web3_js_1.PublicKey.default)
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable)
                 : undefined;
-        this.log("Position state: ", this.solautoPositionState);
-        this.log("Position settings: ", this.solautoPositionData?.position?.settingParams);
-        this.log("Position DCA: ", (this.solautoPositionData?.position?.dca?.automation?.targetPeriods ??
-            0) > 0
-            ? this.solautoPositionData?.position?.dca
-            : undefined);
+        this.flProvider = new flProviderAggregator_1.FlProviderAggregator(this.umi, this.signer, this.solautoPosition.supplyMint(), this.solautoPosition.debtMint());
+        await this.flProvider.initialize();
+        this.otherSigners.push(...this.flProvider.otherSigners());
+        this.log("Position state: ", this.solautoPosition.state());
+        this.log("Position settings: ", this.solautoPosition.settings());
+        this.log("Position DCA: ", this.solautoPosition.dca());
     }
     referredBySupplyTa() {
         if (this.referredByState !== undefined) {
-            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.supplyMint);
+            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.solautoPosition.supplyMint());
         }
         return undefined;
     }
     referredByDebtTa() {
         if (this.referredByState !== undefined) {
-            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.debtMint);
+            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.solautoPosition.debtMint());
         }
         return undefined;
     }
     async resetLiveTxUpdates(success) {
+        this.log("Resetting context updates...");
         if (success) {
-            if (!this.solautoPositionData) {
-                this.solautoPositionData = await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition), { commitment: "confirmed" });
+            if (!this.solautoPosition.exists()) {
+                await this.solautoPosition.refetchPositionData();
             }
             else {
-                if (this.contextUpdates.activeDca) {
-                    this.solautoPositionData.position.dca =
-                        this.contextUpdates.activeDca;
-                }
                 if (this.contextUpdates.settings) {
-                    this.solautoPositionData.position.settingParams =
+                    this.solautoPosition.data().position.settings =
                         this.contextUpdates.settings;
                 }
+                if (this.contextUpdates.dca) {
+                    this.solautoPosition.data().position.dca = this.contextUpdates.dca;
+                }
                 // All other live position updates can be derived by getting a fresh position state, so we don't need to do anything else form contextUpdates
             }
         }
@@ -105,12 +100,13 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             ...((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey).equals(this.authority)
                 ? [this.signerDebtTa]
                 : []),
-            this.solautoPosition,
+            this.solautoPosition.publicKey,
             this.positionSupplyTa,
             this.positionDebtTa,
             this.referralState,
             ...(this.referredBySupplyTa() ? [this.referredBySupplyTa()] : []),
             ...(this.referredByDebtTa() ? [this.referredByDebtTa()] : []),
+            ...this.flProvider.lutAccountsToAdd(),
         ];
     }
     async fetchExistingAuthorityLutAccounts() {
@@ -123,9 +119,6 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         return lookupTable?.value?.state.addresses ?? [];
     }
     async updateLookupTable() {
-        if (this.selfManaged) {
-            return undefined;
-        }
         const existingLutAccounts = await this.fetchExistingAuthorityLutAccounts();
         if (this.lutAccountsToAdd().every((element) => existingLutAccounts
             .map((x) => x.toString().toLowerCase())
@@ -140,7 +133,9 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                 recentSlot: await this.umi.rpc.getSlot({ commitment: "finalized" }),
             });
             this.authorityLutAddress = lookupTableAddress;
-            tx = tx.add((0, solanaUtils_1.getWrappedInstruction)(this.signer, createLookupTableInst));
+            tx = tx
+                .add((0, solanaUtils_1.getWrappedInstruction)(this.signer, createLookupTableInst))
+                .add(this.updateReferralStatesIx(undefined, this.authorityLutAddress));
         }
         const accountsToAdd = this.lutAccountsToAdd().filter((x) => !existingLutAccounts
             .map((x) => x.toString().toLowerCase())
@@ -148,12 +143,14 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         if (accountsToAdd.length === 0) {
             return undefined;
         }
-        tx = tx.add((0, solanaUtils_1.getWrappedInstruction)(this.signer, web3_js_1.AddressLookupTableProgram.extendLookupTable({
+        tx = tx
+            .add((0, solanaUtils_1.getWrappedInstruction)(this.signer, web3_js_1.AddressLookupTableProgram.extendLookupTable({
             payer: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey),
             authority: this.authority,
             lookupTable: this.authorityLutAddress,
             addresses: accountsToAdd,
-        })));
+        })))
+            .add(await this.flProvider.flAccountPrereqIxs());
         this.log("Requires authority LUT update...");
         return {
             tx,
@@ -171,11 +168,19 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         }
         [this.signerSupplyBalance, this.signerDebtBalance] = await Promise.all([
             (async () => {
-                const data = await this.connection.getTokenAccountBalance((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.supplyMint), "confirmed");
+                let data;
+                try {
+                    data = await this.connection.getTokenAccountBalance((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.solautoPosition.supplyMint()), "confirmed");
+                }
+                catch { }
                 return BigInt(parseInt(data?.value.amount ?? "0"));
             })(),
             (async () => {
-                const data = await this.connection.getTokenAccountBalance((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtMint), "confirmed");
+                let data;
+                try {
+                    const data = await this.connection.getTokenAccountBalance((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.solautoPosition.debtMint()), "confirmed");
+                }
+                catch { }
                 return BigInt(parseInt(data?.value.amount ?? "0"));
             })(),
         ]);
@@ -184,21 +189,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             debtBalance: this.signerDebtBalance,
         };
     }
-    solautoPositionSettings() {
-        return (this.contextUpdates.settings ??
-            this.solautoPositionData?.position.settingParams);
-    }
-    solautoPositionActiveDca() {
-        return (this.contextUpdates.activeDca ??
-            this.solautoPositionData?.position.dca);
-    }
-    async maxLtvAndLiqThresholdBps() {
-        if (this.maxLtvBps !== undefined && this.liqThresholdBps !== undefined) {
-            return [this.maxLtvBps, this.liqThresholdBps];
-        }
-        return [0, 0];
-    }
-    openPosition(settingParams, dca) {
+    openPositionIx(settings, dca) {
         if (dca && dca.dcaInBaseUnit > 0) {
             this.contextUpdates.new({
                 type: "dcaInBalance",
@@ -208,10 +199,10 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                 },
             });
         }
-        if (settingParams) {
+        if (settings) {
             this.contextUpdates.new({
                 type: "settings",
-                value: settingParams,
+                value: settings,
             });
         }
         if (dca) {
@@ -228,12 +219,12 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         let signerDcaTa = undefined;
         if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
             if (args.dca.value.tokenType === generated_1.TokenType.Supply) {
-                dcaMint = (0, umi_1.publicKey)(this.supplyMint);
+                dcaMint = (0, umi_1.publicKey)(this.solautoPosition.supplyMint());
                 positionDcaTa = (0, umi_1.publicKey)(this.positionSupplyTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerSupplyTa);
             }
             else {
-                dcaMint = (0, umi_1.publicKey)(this.debtMint);
+                dcaMint = (0, umi_1.publicKey)(this.solautoPosition.debtMint());
                 positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
             }
@@ -249,10 +240,10 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                 });
             }
         }
-        if ((0, umi_1.isOption)(args.settingParams) && (0, umi_1.isSome)(args.settingParams)) {
+        if ((0, umi_1.isOption)(args.settings) && (0, umi_1.isSome)(args.settings)) {
             this.contextUpdates.new({
                 type: "settings",
-                value: args.settingParams.value,
+                value: args.settings.value,
             });
         }
         if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
@@ -263,54 +254,43 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         }
         return (0, generated_1.updatePosition)(this.umi, {
             signer: this.signer,
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
             dcaMint,
             positionDcaTa,
             signerDcaTa,
             updatePositionData: args,
         });
     }
-    closePositionIx() {
-        return (0, generated_1.closePosition)(this.umi, {
-            signer: this.signer,
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
-            signerSupplyTa: (0, umi_1.publicKey)(this.signerSupplyTa),
-            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
-            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
-            signerDebtTa: (0, umi_1.publicKey)(this.signerDebtTa),
-            protocolAccount: (0, umi_1.publicKey)(this.protocolAccount()),
-        });
-    }
     cancelDCAIx() {
         let dcaMint = undefined;
         let positionDcaTa = undefined;
         let signerDcaTa = undefined;
-        const currDca = this.solautoPositionActiveDca();
+        const currDca = this.solautoPosition.dca();
         if (currDca.dcaInBaseUnit > 0) {
             if (currDca.tokenType === generated_1.TokenType.Supply) {
-                dcaMint = (0, umi_1.publicKey)(this.supplyMint);
+                dcaMint = (0, umi_1.publicKey)(this.solautoPosition.supplyMint());
                 positionDcaTa = (0, umi_1.publicKey)(this.positionSupplyTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerSupplyTa);
             }
             else {
-                dcaMint = (0, umi_1.publicKey)(this.debtMint);
+                dcaMint = (0, umi_1.publicKey)(this.solautoPosition.debtMint());
                 positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
             }
             this.contextUpdates.new({
                 type: "cancellingDca",
-                value: this.solautoPositionData.position.dca.tokenType,
+                value: this.solautoPosition.dca().tokenType,
             });
         }
         return (0, generated_1.cancelDCA)(this.umi, {
             signer: this.signer,
-            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
             dcaMint,
             positionDcaTa,
             signerDcaTa,
         });
     }
-    protocolInteraction(args) {
+    protocolInteractionIx(args) {
         let tx = (0, umi_1.transactionBuilder)();
         if (!this.selfManaged) {
             if (args.__kind === "Deposit") {
@@ -321,8 +301,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                     tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0].fields[0])));
                 }
                 else {
-                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.solautoPositionState.debt.amountUsed.baseUnit) *
-                        1.01))));
+                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.solautoPosition.state().debt.amountUsed.baseUnit) * 1.01))));
                 }
             }
         }
@@ -342,7 +321,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             else {
                 this.contextUpdates.new({
                     type: "supply",
-                    value: (this.solautoPositionState?.supply.amountUsed.baseUnit ??
+                    value: (this.solautoPosition.state().supply.amountUsed.baseUnit ??
                         BigInt(0)) * BigInt(-1),
                 });
             }
@@ -363,22 +342,12 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             else {
                 this.contextUpdates.new({
                     type: "debt",
-                    value: (this.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) *
-                        BigInt(-1),
+                    value: (this.solautoPosition.state().debt.amountUsed.baseUnit ??
+                        BigInt(0)) * BigInt(-1),
                 });
             }
         }
         return tx;
     }
-    async getFreshPositionState() {
-        if (Boolean(this.solautoPositionData) &&
-            Boolean(this.solautoPositionState) &&
-            Number(this.solautoPositionState.lastUpdated) >
-                (0, generalUtils_1.currentUnixSeconds)() - solautoConstants_1.MIN_POSITION_STATE_FRESHNESS_SECS &&
-            !this.contextUpdates.positionUpdates()) {
-            return this.solautoPositionState;
-        }
-        return undefined;
-    }
 }
 exports.SolautoClient = SolautoClient;

package/dist/services/solauto/solautoMarginfiClient.d.ts

@@ -0,0 +1,34 @@
+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, LendingPlatform, RebalanceStep, SolautoActionArgs, SolautoSettingsParametersInpArgs } from "../../generated";
+import { RebalanceDetails } from "../../types";
+export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
+    marginfiAccount?: PublicKey | Signer;
+    marginfiAccountSeedIdx?: bigint;
+}
+export declare class SolautoMarginfiClient extends SolautoClient {
+    lendingPlatform: LendingPlatform;
+    marginfiProgram: PublicKey;
+    marginfiAccount: PublicKey | Signer;
+    marginfiAccountPk: PublicKey;
+    marginfiGroup: PublicKey;
+    marginfiSupplyAccounts: MarginfiAssetAccounts;
+    marginfiDebtAccounts: MarginfiAssetAccounts;
+    supplyPriceOracle: PublicKey;
+    debtPriceOracle: PublicKey;
+    initialize(args: SolautoMarginfiClientArgs): Promise<void>;
+    defaultLookupTables(): string[];
+    lutAccountsToAdd(): PublicKey[];
+    marginfiAccountInitialize(marginfiAccount: Signer): TransactionBuilder;
+    openPositionIx(settings?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
+    private marginfiOpenPositionIx;
+    closePositionIx(): TransactionBuilder;
+    refreshIx(): TransactionBuilder;
+    protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder;
+    private marginfiProtocolInteractionIx;
+    private marginfiSolautoProtocolInteractionIx;
+    rebalanceIx(rebalanceStep: RebalanceStep, data: RebalanceDetails): TransactionBuilder;
+}
+//# sourceMappingURL=solautoMarginfiClient.d.ts.map

package/dist/services/solauto/solautoMarginfiClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,kBAAkB,EAInB,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,sBAAsB,CAAC;AAK7D,OAAO,EACL,kBAAkB,EAClB,eAAe,EAGf,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,eAAe,EAAG,SAAS,CAAC;IAE5B,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;IAE7B,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAsEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,IAAI,kBAAkB;IAc/B,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CAqGtB"}