@haven-fi/solauto-sdk 1.0.0

package/dist/clients/index.d.ts

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

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

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

package/dist/clients/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./solautoMarginfiClient"), exports);

package/dist/clients/solautoClient.d.ts

@@ -0,0 +1,73 @@
+import "rpc-websockets/dist/lib/client";
+import { PublicKey } from "@solana/web3.js";
+import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, ReferralState, SolautoActionArgs, SolautoPosition, SolautoRebalanceTypeArgs, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../generated";
+import { JupSwapDetails } from "../utils/jupiterUtils";
+import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
+import { LivePositionUpdates } from "../utils/solauto/generalUtils";
+export interface SolautoClientArgs {
+    authority?: PublicKey;
+    positionId: number;
+    signer: Signer;
+    supplyLiquidityMint?: PublicKey;
+    debtLiquidityMint?: PublicKey;
+    referralFeesDestMint?: PublicKey;
+    referredByAuthority?: PublicKey;
+}
+export declare abstract class SolautoClient {
+    localTest: boolean;
+    umi: Umi;
+    lendingPlatform: LendingPlatform;
+    authority: PublicKey;
+    signer: Signer;
+    positionId: number;
+    selfManaged: boolean;
+    solautoPosition: PublicKey;
+    solautoPositionData: SolautoPosition | null;
+    solautoPositionState: PositionState | undefined;
+    supplyLiquidityMint: PublicKey;
+    positionSupplyLiquidityTa: PublicKey;
+    signerSupplyLiquidityTa: PublicKey;
+    debtLiquidityMint: PublicKey;
+    positionDebtLiquidityTa: PublicKey;
+    signerDebtLiquidityTa: PublicKey;
+    authorityReferralState: PublicKey;
+    authorityReferralStateData: ReferralState | null;
+    authorityReferralFeesDestMint: PublicKey;
+    authorityReferralDestTa: PublicKey;
+    referredByState?: PublicKey;
+    referredByAuthority?: PublicKey;
+    referredBySupplyTa?: PublicKey;
+    solautoFeesWallet: PublicKey;
+    solautoFeesSupplyTa: PublicKey;
+    authorityLutAddress?: PublicKey;
+    upToDateLutAccounts: PublicKey[];
+    livePositionUpdates: LivePositionUpdates;
+    constructor(localTest?: boolean);
+    initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform): Promise<void>;
+    log(...args: any[]): void;
+    resetLivePositionUpdates(): Promise<void>;
+    defaultLookupTables(): string[];
+    lutAccountsToAdd(): PublicKey[];
+    fetchExistingAuthorityLutAccounts(): Promise<PublicKey[]>;
+    updateLookupTable(): Promise<{
+        updateLutTx: TransactionBuilder;
+        needsToBeIsolated: boolean;
+    } | undefined>;
+    solautoPositionSettings(): SolautoSettingsParameters | undefined;
+    solautoPositionActiveDca(): DCASettings | undefined;
+    updateReferralStatesIx(): TransactionBuilder;
+    claimReferralFeesIx(): TransactionBuilder;
+    openPosition(settingParams?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
+    updatePositionIx(args: UpdatePositionDataArgs): TransactionBuilder;
+    closePositionIx(): TransactionBuilder;
+    cancelDCAIx(): TransactionBuilder;
+    abstract refresh(): TransactionBuilder;
+    protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
+    abstract flashBorrow(flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
+    abstract flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
+    abstract rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, targetLiqUtilizationRateBps?: number, limitGapBps?: number): TransactionBuilder;
+    positionStateWithLatestPrices(): Promise<PositionState | undefined>;
+    getFreshPositionState(): Promise<PositionState | undefined>;
+}
+//# sourceMappingURL=solautoClient.d.ts.map

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

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

package/dist/clients/solautoClient.js

@@ -0,0 +1,416 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolautoClient = void 0;
+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 spl_token_1 = require("@solana/spl-token");
+const solautoConstants_1 = require("../constants/solautoConstants");
+const generalUtils_1 = require("../utils/generalUtils");
+const generalUtils_2 = require("../utils/solauto/generalUtils");
+const numberUtils_1 = require("../utils/numberUtils");
+class SolautoClient {
+    constructor(localTest) {
+        this.livePositionUpdates = new generalUtils_2.LivePositionUpdates();
+        this.localTest = Boolean(localTest);
+    }
+    async initialize(args, lendingPlatform) {
+        this.umi = solautoConstants_1.UMI.use((0, umi_1.signerIdentity)(args.signer));
+        this.signer = args.signer;
+        this.authority = args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(args.signer.publicKey);
+        this.positionId = args.positionId;
+        this.selfManaged = this.positionId === 0;
+        this.lendingPlatform = lendingPlatform;
+        this.solautoPosition = await (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId);
+        this.solautoPositionData = await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition));
+        this.solautoPositionState = this.solautoPositionData?.state;
+        this.supplyLiquidityMint =
+            args.supplyLiquidityMint ??
+                (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.supplyMint);
+        this.positionSupplyLiquidityTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.supplyLiquidityMint);
+        this.signerSupplyLiquidityTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.supplyLiquidityMint);
+        this.debtLiquidityMint =
+            args.debtLiquidityMint ??
+                (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.debtMint);
+        this.positionDebtLiquidityTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtLiquidityMint);
+        this.signerDebtLiquidityTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtLiquidityMint);
+        this.authorityReferralState = await (0, accountUtils_1.getReferralState)(this.authority);
+        this.authorityReferralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.authorityReferralState));
+        this.authorityReferralFeesDestMint = args.referralFeesDestMint
+            ? args.referralFeesDestMint
+            : this.authorityReferralStateData?.destFeesMint
+                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData?.destFeesMint)
+                : spl_token_1.NATIVE_MINT;
+        this.authorityReferralDestTa = (0, accountUtils_1.getTokenAccount)(this.authorityReferralState, this.authorityReferralFeesDestMint);
+        const referredByAuthority = args.referredByAuthority &&
+            !args.referredByAuthority.equals((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey))
+            ? args.referredByAuthority
+            : undefined;
+        this.referredByState =
+            this.authorityReferralStateData &&
+                this.authorityReferralStateData.referredByState !==
+                    (0, umi_1.publicKey)(web3_js_1.PublicKey.default)
+                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData.referredByState)
+                : referredByAuthority
+                    ? await (0, accountUtils_1.getReferralState)(referredByAuthority)
+                    : undefined;
+        this.referredByAuthority = referredByAuthority;
+        if (this.referredByState !== undefined) {
+            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)(this.referredByState, this.supplyLiquidityMint);
+        }
+        this.solautoFeesWallet = generalAccounts_1.SOLAUTO_FEES_WALLET;
+        this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoFeesWallet, this.supplyLiquidityMint);
+        this.authorityLutAddress = this.authorityReferralStateData?.lookupTable
+            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData?.lookupTable)
+            : undefined;
+        this.upToDateLutAccounts = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey).equals(this.authority)
+            ? await this.fetchExistingAuthorityLutAccounts()
+            : [];
+        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);
+    }
+    log(...args) {
+        if (this.localTest) {
+            console.log(...args);
+        }
+    }
+    async resetLivePositionUpdates() {
+        if (!this.solautoPositionData) {
+            this.solautoPositionData = await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition));
+        }
+        else {
+            if (this.livePositionUpdates.activeDca) {
+                this.solautoPositionData.position.dca =
+                    this.livePositionUpdates.activeDca;
+            }
+            if (this.livePositionUpdates.settings) {
+                this.solautoPositionData.position.settingParams =
+                    this.livePositionUpdates.settings;
+            }
+            // All other live position updates can be derived by getting a fresh position state, so we don't need to do anything else form livePositionUpdates
+        }
+        this.livePositionUpdates.reset();
+    }
+    defaultLookupTables() {
+        // TODO: solauto lookup table here
+        return [];
+    }
+    lutAccountsToAdd() {
+        return [
+            this.authority,
+            ...(this.signer.publicKey.toString() === this.authority.toString()
+                ? [this.signerSupplyLiquidityTa]
+                : []),
+            ...(this.signer.publicKey.toString() === this.authority.toString()
+                ? [this.signerDebtLiquidityTa]
+                : []),
+            this.solautoPosition,
+            this.positionSupplyLiquidityTa,
+            this.positionDebtLiquidityTa,
+            this.authorityReferralState,
+            ...(this.referredBySupplyTa ? [this.referredBySupplyTa] : []),
+        ];
+    }
+    async fetchExistingAuthorityLutAccounts() {
+        const lookupTable = this.authorityLutAddress
+            ? await solautoConstants_1.CONNECTION.getAddressLookupTable(this.authorityLutAddress)
+            : null;
+        if (lookupTable === null) {
+            this.authorityLutAddress = undefined;
+        }
+        return lookupTable?.value?.state.addresses ?? [];
+    }
+    async updateLookupTable() {
+        const existingLutAccounts = await this.fetchExistingAuthorityLutAccounts();
+        if (this.lutAccountsToAdd().every((element) => existingLutAccounts
+            .map((x) => x.toString().toLowerCase())
+            .includes(element.toString().toLowerCase()))) {
+            return undefined;
+        }
+        this.log("Updating authority lookup table...");
+        let tx = (0, umi_1.transactionBuilder)();
+        if (this.authorityLutAddress === undefined) {
+            const [createLookupTableInst, lookupTableAddress] = web3_js_1.AddressLookupTableProgram.createLookupTable({
+                authority: this.authority,
+                payer: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey),
+                recentSlot: await solautoConstants_1.CONNECTION.getSlot({ commitment: "finalized" }),
+            });
+            this.authorityLutAddress = lookupTableAddress;
+            tx = tx.add((0, solanaUtils_1.getWrappedInstruction)(this.signer, createLookupTableInst));
+        }
+        const accountsToAdd = this.lutAccountsToAdd().filter((x) => !existingLutAccounts
+            .map((x) => x.toString().toLowerCase())
+            .includes(x.toString().toLowerCase()));
+        this.upToDateLutAccounts = [...existingLutAccounts, ...accountsToAdd];
+        if (accountsToAdd.length > 0) {
+            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,
+            })));
+        }
+        const addingReferredBy = accountsToAdd.length === 1 &&
+            accountsToAdd[0].toString().toLowerCase() ===
+                this.referredBySupplyTa?.toString().toLowerCase();
+        return { updateLutTx: tx, needsToBeIsolated: !addingReferredBy };
+    }
+    solautoPositionSettings() {
+        return (this.livePositionUpdates.settings ??
+            this.solautoPositionData?.position.settingParams);
+    }
+    solautoPositionActiveDca() {
+        return (this.livePositionUpdates.activeDca ??
+            this.solautoPositionData?.position.dca);
+    }
+    updateReferralStatesIx() {
+        return (0, generated_1.updateReferralStates)(this.umi, {
+            signer: this.signer,
+            signerReferralState: (0, umi_1.publicKey)(this.authorityReferralState),
+            referralFeesDestMint: (0, umi_1.publicKey)(this.authorityReferralFeesDestMint),
+            referredByState: this.referredByState
+                ? (0, umi_1.publicKey)(this.referredByState)
+                : undefined,
+            referredByAuthority: this.referredByAuthority
+                ? (0, umi_1.publicKey)(this.referredByAuthority)
+                : undefined,
+            addressLookupTable: this.authorityLutAddress
+                ? (0, umi_1.some)((0, umi_1.publicKey)(this.authorityLutAddress))
+                : null,
+        });
+    }
+    claimReferralFeesIx() {
+        const feesDestinationTa = this.authorityReferralFeesDestMint !== spl_token_1.NATIVE_MINT
+            ? (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.authorityReferralFeesDestMint))
+            : undefined;
+        return (0, generated_1.claimReferralFees)(this.umi, {
+            signer: this.signer,
+            referralState: (0, umi_1.publicKey)(this.authorityReferralState),
+            referralFeesDestTa: (0, umi_1.publicKey)(this.authorityReferralDestTa),
+            referralFeesDestMint: (0, umi_1.publicKey)(this.authorityReferralFeesDestMint),
+            feesDestinationTa,
+        });
+    }
+    openPosition(settingParams, dca) {
+        const tx = (0, umi_1.transactionBuilder)();
+        if (dca && dca.debtToAddBaseUnit > 0) {
+            this.livePositionUpdates.new({
+                type: "debtDcaIn",
+                value: BigInt(dca.debtToAddBaseUnit),
+            });
+        }
+        if (settingParams) {
+            this.livePositionUpdates.new({
+                type: "settings",
+                value: settingParams,
+            });
+        }
+        if (dca) {
+            this.livePositionUpdates.new({
+                type: "dca",
+                value: dca,
+            });
+        }
+        return tx;
+    }
+    updatePositionIx(args) {
+        let debtMint = undefined;
+        let positionDebtTa = undefined;
+        let signerDebtTa = undefined;
+        if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
+            debtMint = (0, umi_1.publicKey)(this.debtLiquidityMint);
+            positionDebtTa = (0, umi_1.publicKey)(this.positionDebtLiquidityTa);
+            signerDebtTa = (0, umi_1.publicKey)(this.signerDebtLiquidityTa);
+            let addingToPos = false;
+            if ((0, umi_1.isOption)(args.dca) &&
+                (0, umi_1.isSome)(args.dca) &&
+                args.dca.value.debtToAddBaseUnit > 0) {
+                this.livePositionUpdates.new({
+                    type: "debtDcaIn",
+                    value: BigInt(args.dca.value.debtToAddBaseUnit),
+                });
+                addingToPos = true;
+            }
+            if (this.solautoPositionData?.position.dca.debtToAddBaseUnit &&
+                !addingToPos) {
+                this.livePositionUpdates.new({
+                    type: "debtDcaIn",
+                    value: this.solautoPositionData.position.dca.debtToAddBaseUnit *
+                        BigInt(-1),
+                });
+            }
+        }
+        if ((0, umi_1.isOption)(args.settingParams) && (0, umi_1.isSome)(args.settingParams)) {
+            this.livePositionUpdates.new({
+                type: "settings",
+                value: args.settingParams.value,
+            });
+        }
+        if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
+            this.livePositionUpdates.new({
+                type: "dca",
+                value: args.dca.value,
+            });
+        }
+        return (0, generated_1.updatePosition)(this.umi, {
+            signer: this.signer,
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
+            debtMint,
+            positionDebtTa,
+            signerDebtTa,
+            updatePositionData: args,
+        });
+    }
+    closePositionIx() {
+        return (0, generated_1.closePosition)(this.umi, {
+            signer: this.signer,
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
+            signerSupplyLiquidityTa: (0, umi_1.publicKey)(this.signerSupplyLiquidityTa),
+            positionSupplyLiquidityTa: (0, umi_1.publicKey)(this.positionSupplyLiquidityTa),
+            positionDebtLiquidityTa: (0, umi_1.publicKey)(this.positionDebtLiquidityTa),
+            signerDebtLiquidityTa: (0, umi_1.publicKey)(this.signerDebtLiquidityTa),
+        });
+    }
+    cancelDCAIx() {
+        let debtMint = undefined;
+        let positionDebtTa = undefined;
+        let signerDebtTa = undefined;
+        if (this.solautoPositionData !== null && !this.selfManaged) {
+            const positionData = this.solautoPositionData.position;
+            if (positionData.dca.debtToAddBaseUnit) {
+                debtMint = (0, umi_1.publicKey)(this.debtLiquidityMint);
+                positionDebtTa = (0, umi_1.publicKey)(this.positionDebtLiquidityTa);
+                signerDebtTa = (0, umi_1.publicKey)(this.signerDebtLiquidityTa);
+                this.livePositionUpdates.new({
+                    type: "debtDcaIn",
+                    value: positionData.dca.debtToAddBaseUnit * BigInt(-1),
+                });
+            }
+        }
+        return (0, generated_1.cancelDCA)(this.umi, {
+            signer: this.signer,
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
+            debtMint,
+            positionDebtTa,
+            signerDebtTa,
+        });
+    }
+    protocolInteraction(args) {
+        let tx = (0, umi_1.transactionBuilder)();
+        if (!this.selfManaged) {
+            if (args.__kind === "Deposit") {
+                tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerSupplyLiquidityTa, this.positionSupplyLiquidityTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0])));
+            }
+            else if (args.__kind === "Repay") {
+                if (args.fields[0].__kind === "Some") {
+                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtLiquidityTa, this.positionDebtLiquidityTa, (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.signerDebtLiquidityTa, this.positionDebtLiquidityTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.solautoPositionState.debt.amountUsed.baseUnit) *
+                        1.01))));
+                }
+            }
+        }
+        if (args.__kind === "Deposit") {
+            this.livePositionUpdates.new({
+                type: "supply",
+                value: BigInt(args.fields[0]),
+            });
+        }
+        else if (args.__kind === "Withdraw") {
+            if (args.fields[0].__kind === "Some") {
+                this.livePositionUpdates.new({
+                    type: "supply",
+                    value: BigInt(args.fields[0].fields[0]) * BigInt(-1),
+                });
+            }
+            else {
+                this.livePositionUpdates.new({
+                    type: "supply",
+                    value: (this.solautoPositionState?.supply.amountUsed.baseUnit ??
+                        BigInt(0)) + this.livePositionUpdates.supplyAdjustment,
+                });
+            }
+        }
+        else if (args.__kind === "Borrow") {
+            this.livePositionUpdates.new({
+                type: "debt",
+                value: BigInt(args.fields[0]),
+            });
+        }
+        else {
+            if (args.fields[0].__kind === "Some") {
+                this.livePositionUpdates.new({
+                    type: "debt",
+                    value: BigInt(args.fields[0].fields[0]) * BigInt(-1),
+                });
+            }
+            else {
+                this.livePositionUpdates.new({
+                    type: "debt",
+                    value: (this.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) +
+                        this.livePositionUpdates.debtAdjustment,
+                });
+            }
+        }
+        return tx;
+    }
+    async positionStateWithLatestPrices() {
+        if (!this.solautoPositionData) {
+            return undefined;
+        }
+        const state = this.solautoPositionState ?? this.solautoPositionData.state;
+        if ((0, generalUtils_1.currentUnixSeconds)() - Number(state.lastUpdated) > 60 * 60 * 24 * 7) {
+            return this.getFreshPositionState();
+        }
+        const [supplyPrice, debtPrice] = await (0, generalUtils_1.getTokenPrices)([
+            (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint),
+            (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint),
+        ]);
+        const supplyUsd = (0, numberUtils_1.fromBaseUnit)(state.supply.amountUsed.baseUnit, state.supply.decimals) *
+            supplyPrice;
+        const debtUsd = (0, numberUtils_1.fromBaseUnit)(state.debt.amountUsed.baseUnit, state.debt.decimals) *
+            debtPrice;
+        return {
+            ...state,
+            liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, state.liqThresholdBps),
+            netWorth: {
+                ...state.netWorth,
+                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd - debtUsd, generalAccounts_1.USD_DECIMALS),
+            },
+            supply: {
+                ...state.supply,
+                amountUsed: {
+                    ...state.supply.amountUsed,
+                    baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd, generalAccounts_1.USD_DECIMALS),
+                },
+            },
+            debt: {
+                ...state.debt,
+                amountUsed: {
+                    ...state.debt.amountUsed,
+                    baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(debtUsd, generalAccounts_1.USD_DECIMALS),
+                },
+            },
+        };
+    }
+    async getFreshPositionState() {
+        if (Boolean(this.solautoPositionState) &&
+            Number(this.solautoPositionState.lastUpdated) >
+                (0, generalUtils_1.currentUnixSeconds)() - solautoConstants_1.MIN_POSITION_STATE_FRESHNESS_SECS &&
+            !this.livePositionUpdates.hasUpdates()) {
+            return this.solautoPositionState;
+        }
+        return undefined;
+    }
+}
+exports.SolautoClient = SolautoClient;

package/dist/clients/solautoMarginfiClient.d.ts

@@ -0,0 +1,40 @@
+import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
+import { PublicKey } from "@solana/web3.js";
+import { SolautoClient, SolautoClientArgs } from "./solautoClient";
+import { MarginfiTokenAccounts } from "../types/accounts";
+import { DCASettingsInpArgs, PositionState, SolautoActionArgs, SolautoRebalanceTypeArgs, SolautoSettingsParametersInpArgs } from "../generated";
+import { MarginfiAccount } from "../marginfi-sdk";
+import { JupSwapDetails } from "../utils/jupiterUtils";
+import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
+export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
+    marginfiAccount?: PublicKey | Signer;
+    marginfiAccountSeedIdx?: bigint;
+    marginfiGroup?: PublicKey;
+}
+export declare function newMarginfiSolautoManagedPositionArgs(positionId: number, signer: Signer, supplyMint: PublicKey, debtMint: PublicKey, referredByAuthority?: PublicKey): SolautoMarginfiClientArgs;
+export declare class SolautoMarginfiClient extends SolautoClient {
+    marginfiProgram: PublicKey;
+    marginfiAccountSeedIdx?: bigint;
+    marginfiAccount: PublicKey | Signer;
+    marginfiAccountPk: PublicKey;
+    marginfiGroup: PublicKey;
+    marginfiSupplyBankAccounts: MarginfiTokenAccounts;
+    marginfiDebtBankAccounts: MarginfiTokenAccounts;
+    intermediaryMarginfiAccountSigner?: Signer;
+    intermediaryMarginfiAccountPk: PublicKey;
+    intermediaryMarginfiAccount?: MarginfiAccount;
+    initialize(args: SolautoMarginfiClientArgs): Promise<void>;
+    defaultLookupTables(): string[];
+    lutAccountsToAdd(): PublicKey[];
+    openPosition(settingParams?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
+    private marginfiOpenPositionIx;
+    refresh(): TransactionBuilder;
+    protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
+    private marginfiProtocolInteractionIx;
+    rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, targetLiqUtilizationRateBps?: number, limitGapBps?: number): TransactionBuilder;
+    flashBorrow(flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
+    flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
+    createIntermediaryMarginfiAccount(): TransactionBuilder;
+    getFreshPositionState(): Promise<PositionState | undefined>;
+}
+//# sourceMappingURL=solautoMarginfiClient.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAOhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,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,wBAAgB,qCAAqC,CACnD,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAS3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAgEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAMhE,OAAO,CAAC,6BAA6B;IA8DrC,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4CrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAqBlE"}