@haven-fi/solauto-sdk 1.0.582 → 1.0.583

package/dist/{transactions → services/transactions}/transactionUtils.js

@@ -2,30 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rebalanceChoresBefore = rebalanceChoresBefore;
 exports.getTransactionChores = getTransactionChores;
-exports.requiresRefreshBeforeRebalance = requiresRefreshBeforeRebalance;
-exports.buildSolautoRebalanceTransaction = buildSolautoRebalanceTransaction;
 exports.convertReferralFeesToDestination = convertReferralFeesToDestination;
 exports.getErrorInfo = getErrorInfo;
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
-const generated_1 = require("../generated");
-const solanaUtils_1 = require("../utils/solanaUtils");
-const jupiterUtils_1 = require("../utils/jupiterUtils");
-const rebalanceUtils_1 = require("../utils/solauto/rebalanceUtils");
-const generalUtils_1 = require("../utils/generalUtils");
-const numberUtils_1 = require("../utils/numberUtils");
-const generalUtils_2 = require("../utils/solauto/generalUtils");
-const accountUtils_1 = require("../utils/accountUtils");
-const marginfi_sdk_1 = require("../marginfi-sdk");
-const jupiter_sdk_1 = require("../jupiter-sdk");
-const constants_1 = require("../constants");
-const utils_1 = require("../utils");
-const transactions_1 = require("../types/transactions");
+const generated_1 = require("../../generated");
+const solanaUtils_1 = require("../../utils/solanaUtils");
+const generalUtils_1 = require("../../utils/generalUtils");
+const numberUtils_1 = require("../../utils/numberUtils");
+const accountUtils_1 = require("../../utils/accountUtils");
+const marginfi_sdk_1 = require("../../marginfi-sdk");
+const __1 = require("..");
+const jupiter_sdk_1 = require("../../jupiter-sdk");
+const utils_1 = require("../../utils");
+const transactions_1 = require("../../types/transactions");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
-    const supplyIsWsol = client.supplyMint.equals(spl_token_1.NATIVE_MINT);
-    const debtIsWsol = client.debtMint.equals(spl_token_1.NATIVE_MINT);
+    const supplyIsWsol = client.solautoPosition.supplyMint().equals(spl_token_1.NATIVE_MINT);
+    const debtIsWsol = client.solautoPosition.debtMint().equals(spl_token_1.NATIVE_MINT);
     if (!supplyIsWsol && !debtIsWsol) {
         return undefined;
     }
@@ -61,14 +56,14 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
         chores = chores.add(client.updateReferralStatesIx(undefined, client.authorityLutAddress));
     }
     if (client.selfManaged) {
-        if (client.solautoPositionData === null) {
-            chores = chores.add(client.openPosition());
-        }
-        else if (client.lendingPlatform === generated_1.LendingPlatform.Marginfi &&
+        if ((0, utils_1.isMarginfiClient)(client) &&
             !(await (0, generalUtils_1.getSolanaAccountCreated)(client.umi, client.marginfiAccountPk))) {
             chores = chores.add(client.marginfiAccountInitialize(client.marginfiAccount));
         }
         // TODO: PF
+        if (!client.solautoPosition.exists()) {
+            chores = chores.add(client.openPositionIx());
+        }
     }
     const wSolUsage = getWSolUsage(client, solautoActions, initiatingDcaIn, undefined);
     if (wSolUsage !== undefined) {
@@ -112,8 +107,8 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
         }
         if (!(0, generalUtils_1.getSolanaAccountCreated)(client.umi, tokenAccount)) {
             chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), (0, generated_1.isSolautoAction)("Withdraw", solautoAction)
-                ? client.supplyMint
-                : client.debtMint));
+                ? client.solautoPosition.supplyMint()
+                : client.solautoPosition.debtMint()));
             accountsGettingCreated.push(tokenAccount.toString());
         }
     }
@@ -129,8 +124,6 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
         .some((t) => t.keys.some((k) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(k.pubkey).equals(key)));
     const checkReferralSupplyTa = client.referredBySupplyTa() && usesAccount(client.referredBySupplyTa());
     const checkReferralDebtTa = client.referredByDebtTa() && usesAccount(client.referredByDebtTa());
-    const checkIntermediaryMfiAccount = client.lendingPlatform === generated_1.LendingPlatform.Marginfi &&
-        usesAccount(client.intermediaryMarginfiAccountPk);
     const checkSignerSupplyTa = usesAccount(client.signerSupplyTa);
     const checkSignerDebtTa = usesAccount(client.signerDebtTa);
     const accountsNeeded = [
@@ -138,41 +131,31 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
             checkReferralSupplyTa ? client.referredBySupplyTa() : web3_js_1.PublicKey.default,
         ],
         ...[checkReferralDebtTa ? client.referredByDebtTa() : web3_js_1.PublicKey.default],
-        ...[
-            checkIntermediaryMfiAccount
-                ? client.intermediaryMarginfiAccountPk
-                : web3_js_1.PublicKey.default,
-        ],
         ...[checkSignerSupplyTa ? client.signerSupplyTa : web3_js_1.PublicKey.default],
         ...[checkSignerDebtTa ? client.signerDebtTa : web3_js_1.PublicKey.default],
     ];
-    const [referredBySupplyTa, referredByDebtTa, intermediaryMarginfiAccount, signerSupplyTa, signerDebtTa,] = await client.umi.rpc.getAccounts(accountsNeeded.map((x) => (0, umi_1.publicKey)(x ?? web3_js_1.PublicKey.default)));
+    const [referredBySupplyTa, referredByDebtTa, signerSupplyTa, signerDebtTa] = await client.umi.rpc.getAccounts(accountsNeeded.map((x) => (0, umi_1.publicKey)(x ?? web3_js_1.PublicKey.default)));
     let chores = (0, umi_1.transactionBuilder)();
     if (checkReferralSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(referredBySupplyTa)) {
         client.log("Creating referred-by supply TA");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.supplyMint));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.solautoPosition.supplyMint()));
     }
     if (checkReferralDebtTa && !(0, generalUtils_1.rpcAccountCreated)(referredByDebtTa)) {
         client.log("Creating referred-by debt TA");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.debtMint));
-    }
-    if (checkIntermediaryMfiAccount &&
-        !(0, generalUtils_1.rpcAccountCreated)(intermediaryMarginfiAccount)) {
-        client.log("Creating intermediary marginfi account");
-        chores = chores.add(client.marginfiAccountInitialize(client.intermediaryMarginfiAccountSigner));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.solautoPosition.debtMint()));
     }
     if (checkSignerSupplyTa &&
         !(0, generalUtils_1.rpcAccountCreated)(signerSupplyTa) &&
         !accountsGettingCreated.includes(signerSupplyTa.publicKey.toString())) {
         client.log("Creating signer supply token account");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.supplyMint));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.solautoPosition.supplyMint()));
         accountsGettingCreated.push(signerSupplyTa.publicKey.toString());
     }
     if (checkSignerDebtTa &&
         !(0, generalUtils_1.rpcAccountCreated)(signerDebtTa) &&
         !accountsGettingCreated.includes(signerDebtTa.publicKey.toString())) {
         client.log("Creating signer debt token account");
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.debtMint));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.solautoPosition.debtMint()));
         accountsGettingCreated.push(signerDebtTa.publicKey.toString());
     }
     return chores;
@@ -192,9 +175,11 @@ function getRebalanceInstructions(umi, tx) {
             try {
                 const serializer = (0, generated_1.getMarginfiRebalanceInstructionDataSerializer)();
                 const discriminator = serializer.serialize({
-                    targetInAmountBaseUnit: 0,
-                    rebalanceType: generated_1.SolautoRebalanceType.None,
+                    swapInAmountBaseUnit: 0,
+                    rebalanceType: generated_1.SolautoRebalanceType.Regular,
+                    swapType: generated_1.SwapType.ExactIn,
                     targetLiqUtilizationRateBps: 0,
+                    flashLoanFeeBps: null,
                 })[0];
                 const [data, _] = serializer.deserialize(x.data);
                 if (data.discriminator === discriminator) {
@@ -329,106 +314,13 @@ async function getTransactionChores(client, tx) {
     choresAfter = choresAfter.add(transactionChoresAfter(client, solautoActions, client.contextUpdates.cancellingDca));
     return [choresBefore, choresAfter];
 }
-async function requiresRefreshBeforeRebalance(client) {
-    const neverRefreshedBefore = client.solautoPositionData &&
-        client.solautoPositionData.state.supply.amountCanBeUsed.baseUnit ===
-            BigInt(0) &&
-        client.solautoPositionData.state.debt.amountCanBeUsed.baseUnit ===
-            BigInt(0);
-    const aboveMaxLtv = client.solautoPositionState.liqUtilizationRateBps >
-        (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.01);
-    if (aboveMaxLtv || neverRefreshedBefore) {
-        return true;
-    }
-    else if (client.solautoPositionData && !client.selfManaged) {
-        if (client.contextUpdates.supplyAdjustment > BigInt(0) ||
-            client.contextUpdates.debtAdjustment > BigInt(0)) {
-            return false;
-        }
-        const oldStateWithLatestPrices = await (0, generalUtils_2.positionStateWithLatestPrices)(client.solautoPositionData.state, constants_1.PRICES[client.supplyMint.toString()].price, constants_1.PRICES[client.debtMint.toString()].price);
-        const utilizationRateDiff = Math.abs((client.solautoPositionState?.liqUtilizationRateBps ?? 0) -
-            oldStateWithLatestPrices.liqUtilizationRateBps);
-        client.log("Liq utilization rate diff:", utilizationRateDiff);
-        if (client.contextUpdates.supplyAdjustment === BigInt(0) &&
-            client.contextUpdates.debtAdjustment === BigInt(0) &&
-            utilizationRateDiff >= 10) {
-            client.log("Choosing to refresh before rebalance. Utilization rate diff:", utilizationRateDiff);
-            return true;
-        }
-    }
-    // Rebalance ix will already refresh internally if position is self managed, has automation to update, or position state last updated >= 1 day ago
-    client.log("Not refreshing before rebalance");
-    return false;
-}
-async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRateBps, attemptNum) {
-    client.solautoPositionState = await client.getFreshPositionState();
-    const supplyPrice = (0, utils_1.safeGetPrice)(client.supplyMint) ?? 0;
-    const debtPrice = (0, utils_1.safeGetPrice)(client.debtMint) ?? 0;
-    if ((client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) &&
-        client.contextUpdates.supplyAdjustment === BigInt(0)) ||
-        (targetLiqUtilizationRateBps === undefined &&
-            !(0, generalUtils_2.eligibleForRebalance)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), supplyPrice, debtPrice))) {
-        client.log("Not eligible for a rebalance");
-        return undefined;
-    }
-    const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), supplyPrice, debtPrice, targetLiqUtilizationRateBps);
-    client.log("Rebalance values: ", values);
-    const flRequirements = await (0, rebalanceUtils_1.getFlashLoanRequirements)(client, values, attemptNum);
-    const swapDetails = await (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, flRequirements, targetLiqUtilizationRateBps, attemptNum);
-    const { jupQuote, lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);
-    const flashLoan = flRequirements
-        ? (0, rebalanceUtils_1.getFlashLoanDetails)(client, flRequirements, values, jupQuote)
-        : undefined;
-    let tx = (0, umi_1.transactionBuilder)();
-    if (await requiresRefreshBeforeRebalance(client)) {
-        tx = tx.add(client.refresh());
-    }
-    if (flashLoan) {
-        client.log("Flash loan details: ", flashLoan);
-        const addFirstRebalance = values.amountUsdToDcaIn > 0;
-        const rebalanceThenSwap = values.rebalanceDirection === generated_1.RebalanceDirection.Repay &&
-            flashLoan.useDebtLiquidity;
-        const rebalanceType = addFirstRebalance
-            ? generated_1.SolautoRebalanceType.DoubleRebalanceWithFL
-            : rebalanceThenSwap
-                ? generated_1.SolautoRebalanceType.FLRebalanceThenSwap
-                : generated_1.SolautoRebalanceType.FLSwapThenRebalance;
-        client.log("Rebalance type:", rebalanceType);
-        const firstRebalance = client.rebalance("A", jupQuote, rebalanceType, values, flashLoan, targetLiqUtilizationRateBps);
-        const lastRebalance = client.rebalance("B", jupQuote, rebalanceType, values, flashLoan, targetLiqUtilizationRateBps);
-        const flashBorrowDest = (0, accountUtils_1.getTokenAccount)(rebalanceThenSwap
-            ? client.solautoPosition
-            : (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), rebalanceThenSwap ? swapDetails.outputMint : swapDetails.inputMint);
-        tx = tx.add([
-            setupInstructions,
-            client.flashBorrow(rebalanceType, flashLoan, flashBorrowDest),
-            ...(addFirstRebalance ? [firstRebalance] : []),
-            ...(rebalanceThenSwap
-                ? [lastRebalance, swapIx]
-                : [swapIx, lastRebalance]),
-            client.flashRepay(flashLoan),
-        ]);
-    }
-    else {
-        const rebalanceType = generated_1.SolautoRebalanceType.Regular;
-        tx = tx.add([
-            setupInstructions,
-            client.rebalance("A", jupQuote, rebalanceType, values, undefined, targetLiqUtilizationRateBps),
-            swapIx,
-            client.rebalance("B", jupQuote, rebalanceType, values, undefined, targetLiqUtilizationRateBps),
-        ]);
-    }
-    return {
-        tx,
-        lookupTableAddresses,
-    };
-}
 async function convertReferralFeesToDestination(referralManager, tokenAccount, destinationMint) {
     const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(referralManager.umi, tokenAccount);
     if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
         return undefined;
     }
-    const { lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(referralManager.umi.identity, {
+    const jupSwapManager = new __1.JupSwapManager(referralManager.umi.identity);
+    const { lookupTableAddresses, setupInstructions, swapIx, cleanupIx } = await jupSwapManager.getJupSwapTxData({
         amount: tokenAccountData.amount,
         destinationWallet: referralManager.referralState,
         inputMint: tokenAccountData.mint,

package/dist/{transactions → services/transactions}/transactionsManager.d.ts

@@ -1,8 +1,8 @@
 import { TransactionBuilder } from "@metaplex-foundation/umi";
-import { SolautoClient } from "../clients/solautoClient";
-import { ErrorsToThrow } from "../utils/generalUtils";
-import { PriorityFeeSetting, TransactionItemInputs, TransactionRunType } from "../types";
-import { ReferralStateManager } from "../clients";
+import { SolautoClient } from "../solauto/solautoClient";
+import { ErrorsToThrow } from "../../utils/generalUtils";
+import { PriorityFeeSetting, TransactionItemInputs, TransactionRunType } from "../../types";
+import { ReferralStateManager } from "..";
 export declare class TransactionTooLargeError extends Error {
     constructor(message: string);
 }

package/dist/services/transactions/transactionsManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAa,MAAM,IAAI,CAAC;AAarD,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAOhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAwGD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAsBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA0GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA4I7B,qBAAqB;YAgDrB,eAAe;YA0Df,eAAe;CA4D9B"}

package/dist/{transactions → services/transactions}/transactionsManager.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionsManager = exports.TransactionStatus = exports.TransactionItem = exports.TransactionTooLargeError = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const umi_1 = require("@metaplex-foundation/umi");
-const solanaUtils_1 = require("../utils/solanaUtils");
-const generalUtils_1 = require("../utils/generalUtils");
+const solanaUtils_1 = require("../../utils/solanaUtils");
+const generalUtils_1 = require("../../utils/generalUtils");
 const transactionUtils_1 = require("./transactionUtils");
-const types_1 = require("../types");
+const types_1 = require("../../types");
 const web3_js_1 = require("@solana/web3.js");
-const switchboardConstants_1 = require("../constants/switchboardConstants");
-const utils_1 = require("../utils");
-const jitoUtils_1 = require("../utils/jitoUtils");
-const constants_1 = require("../constants");
+const switchboardConstants_1 = require("../../constants/switchboardConstants");
+const utils_1 = require("../../utils");
+const jitoUtils_1 = require("../../utils/jitoUtils");
+const constants_1 = require("../../constants");
 const CHORES_TX_NAME = "account chores";
 const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
 class TransactionTooLargeError extends Error {
@@ -265,8 +265,10 @@ class TransactionsManager {
         });
     }
     async updateLut(tx, newLut) {
+        const lutInputs = await (0, solanaUtils_1.getAddressLookupInputs)(this.txHandler.umi, this.txHandler.defaultLookupTables());
         const updateLutTxName = `${newLut ? "create" : "update"} lookup table`;
-        await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => await this.sendTransaction(tx, updateLutTxName, attemptNum, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), "skip-simulation"), this.signableRetries, 150, this.errorsToThrow);
+        await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => await this.sendTransaction(tx.setAddressLookupTables(lutInputs), updateLutTxName, attemptNum, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), "skip-simulation"), this.signableRetries, 150, this.errorsToThrow);
+        await this.txHandler.refetchReferralState();
     }
     async clientSend(transactions) {
         const items = [...transactions];

package/dist/solautoPosition/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./solautoPositionEx";
+export * from "./marginfiSolautoPositionEx";
+export * from "./utils";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,SAAS,CAAC"}

package/dist/solautoPosition/index.js

@@ -0,0 +1,19 @@
+"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("./solautoPositionEx"), exports);
+__exportStar(require("./marginfiSolautoPositionEx"), exports);
+__exportStar(require("./utils"), exports);

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -0,0 +1,14 @@
+import { PublicKey } from "@solana/web3.js";
+import { SolautoPositionEx } from "./solautoPositionEx";
+export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
+    private marginfiAccountData;
+    private supplyBank;
+    private debtBank;
+    lendingPool(): Promise<PublicKey>;
+    maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
+    supplyLiquidityAvailable(): bigint;
+    supplyLiquidityDepositable(): bigint;
+    debtLiquidityAvailable(): bigint;
+    refreshPositionState(): Promise<void>;
+}
+//# sourceMappingURL=marginfiSolautoPositionEx.d.ts.map

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAkBxD,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwB3D,wBAAwB,IAAI,MAAM;IAIlC,0BAA0B,IAAI,MAAM;IAIpC,sBAAsB,IAAI,MAAM;IAI1B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB5C"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MarginfiSolautoPositionEx = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const solautoPositionEx_1 = require("./solautoPositionEx");
+const marginfi_sdk_1 = require("../marginfi-sdk");
+const umi_1 = require("@metaplex-foundation/umi");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const utils_1 = require("../utils");
+const constants_1 = require("../constants");
+class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
+    constructor() {
+        super(...arguments);
+        this.marginfiAccountData = null;
+        this.supplyBank = null;
+        this.debtBank = null;
+    }
+    async lendingPool() {
+        if (this.lp) {
+            return this.lp;
+        }
+        if (!this.marginfiAccountData &&
+            this.lpUserAccount &&
+            !this.lpUserAccount.equals(web3_js_1.PublicKey.default)) {
+            this.marginfiAccountData = await (0, marginfi_sdk_1.fetchMarginfiAccount)(this.umi, (0, umi_1.publicKey)(this.lpUserAccount), { commitment: "confirmed" });
+            this.lp = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.marginfiAccountData.group);
+        }
+        if (!this.lp) {
+            this.lp = new web3_js_1.PublicKey(constants_1.DEFAULT_MARGINFI_GROUP);
+        }
+        return this.lp;
+    }
+    async maxLtvAndLiqThresholdBps() {
+        if (!this.supplyBank || !this.debtBank) {
+            const group = (await this.lendingPool()).toString();
+            const supplyBank = constants_1.MARGINFI_ACCOUNTS[group][this.supplyMint().toString()].bank;
+            const debtBank = constants_1.MARGINFI_ACCOUNTS[group][this.debtMint().toString()].bank;
+            [this.supplyBank, this.debtBank] = await (0, marginfi_sdk_1.safeFetchAllBank)(this.umi, [
+                (0, umi_1.publicKey)(supplyBank),
+                (0, umi_1.publicKey)(debtBank),
+            ]);
+        }
+        const [supplyPrice] = await (0, utils_1.fetchTokenPrices)([this.supplyMint()]);
+        const [maxLtv, liqThreshold] = (0, utils_1.calcMarginfiMaxLtvAndLiqThreshold)(this.supplyBank, this.debtBank, supplyPrice);
+        return [(0, utils_1.toBps)(maxLtv), (0, utils_1.toBps)(liqThreshold)];
+    }
+    supplyLiquidityAvailable() {
+        return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false);
+    }
+    supplyLiquidityDepositable() {
+        return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, true);
+    }
+    debtLiquidityAvailable() {
+        return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.debtBank, false);
+    }
+    async refreshPositionState() {
+        if (!this.canRefreshPositionState()) {
+            return;
+        }
+        const useDesignatedMint = !this._data.position || !this._data.selfManaged;
+        const resp = await (0, utils_1.getMarginfiAccountPositionState)(this.umi, { pk: this.lpUserAccount }, await this.lendingPool(), useDesignatedMint
+            ? { mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().supply.mint) }
+            : undefined, useDesignatedMint
+            ? { mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().debt.mint) }
+            : undefined, this.contextUpdates);
+        if (resp) {
+            this.supplyBank = resp.supplyBank;
+            this.debtBank = resp.debtBank;
+            this._data.state = resp.state;
+        }
+    }
+}
+exports.MarginfiSolautoPositionEx = MarginfiSolautoPositionEx;

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -0,0 +1,67 @@
+import { PublicKey } from "@solana/web3.js";
+import { DCASettings, LendingPlatform, PositionState, SolautoPosition, SolautoSettingsParameters } from "../generated";
+import { Umi } from "@metaplex-foundation/umi";
+import { ContextUpdates } from "../utils";
+import { RebalanceAction } from "../types";
+export interface PositionCustomArgs {
+    lendingPlatform: LendingPlatform;
+    supplyMint?: PublicKey;
+    debtMint?: PublicKey;
+    lendingPool?: PublicKey;
+    lpUserAccount?: PublicKey;
+}
+interface SolautoPositionExData extends Partial<SolautoPosition> {
+    state: PositionState;
+}
+interface PositionExArgs {
+    umi: Umi;
+    publicKey: PublicKey;
+    data: SolautoPositionExData;
+    customArgs?: PositionCustomArgs;
+    contextUpdates?: ContextUpdates;
+}
+export declare abstract class SolautoPositionEx {
+    umi: Umi;
+    publicKey: PublicKey;
+    protected _data: SolautoPositionExData;
+    protected lp?: PublicKey;
+    lpUserAccount?: PublicKey;
+    protected contextUpdates?: ContextUpdates;
+    private readonly firstState;
+    constructor(args: PositionExArgs);
+    abstract lendingPool(): Promise<PublicKey>;
+    exists(): boolean;
+    strategyName(): string;
+    data(): SolautoPositionExData;
+    state(): PositionState;
+    settings(): SolautoSettingsParameters | undefined;
+    dca(): DCASettings | undefined;
+    supplyMint(): PublicKey;
+    debtMint(): PublicKey;
+    boostToBps(): number;
+    boostFromBps(): number;
+    repayToBps(): number;
+    repayFromBps(): number;
+    netWorth(): number;
+    netWorthUsd(): number;
+    totalSupply(): number;
+    supplyUsd(): number;
+    totalDebt(): number;
+    debtUsd(): number;
+    supplyLiquidityUsdDepositable(): number;
+    debtLiquidityUsdAvailable(): number;
+    abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
+    abstract supplyLiquidityDepositable(): bigint;
+    abstract supplyLiquidityAvailable(): bigint;
+    abstract debtLiquidityAvailable(): bigint;
+    sufficientLiquidityToBoost(): boolean;
+    eligibleForRebalance(bpsDistanceThreshold?: number): RebalanceAction | undefined;
+    eligibleForRefresh(): boolean;
+    protected canRefreshPositionState(): boolean;
+    abstract refreshPositionState(): Promise<void>;
+    utilizationRateBpsDrift(): Promise<number>;
+    updateWithLatestPrices(supplyPrice?: number, debtPrice?: number): Promise<void>;
+    refetchPositionData(): Promise<void>;
+}
+export {};
+//# sourceMappingURL=solautoPositionEx.d.ts.map

package/dist/solautoPosition/solautoPositionEx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,WAAW,EAEX,eAAe,EACf,aAAa,EACb,eAAe,EACf,yBAAyB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAQL,cAAc,EASf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAQ3C,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,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,UAAU,qBAAsB,SAAQ,OAAO,CAAC,eAAe,CAAC;IAC9D,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,8BAAsB,iBAAiB;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,qBAAqB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,CAAa;IAC9B,aAAa,CAAC,EAAE,SAAS,CAAa;IAC7C,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAEhC,IAAI,EAAE,cAAc;IAgBhC,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM;IAIN,YAAY;IAOZ,IAAI,IAAI,qBAAqB;IAI7B,KAAK,IAAI,aAAa;IAItB,QAAQ,IAAI,yBAAyB,GAAG,SAAS;IAIjD,GAAG,IAAI,WAAW,GAAG,SAAS;IAI9B,UAAU,IAAI,SAAS;IAIvB,QAAQ,IAAI,SAAS;IAIrB,UAAU;IAOV,YAAY;IAIZ,UAAU;IAOV,YAAY;IAMZ,QAAQ;IAIR,WAAW;IAIX,WAAW;IAIX,SAAS;IAIT,SAAS;IAIT,OAAO;IAIP,6BAA6B;IAI7B,yBAAyB;IAIzB,QAAQ,CAAC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9D,QAAQ,CAAC,0BAA0B,IAAI,MAAM;IAC7C,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAC3C,QAAQ,CAAC,sBAAsB,IAAI,MAAM;IAEzC,0BAA0B;IA0B1B,oBAAoB,CAAC,oBAAoB,SAAI,GAAG,eAAe,GAAG,SAAS;IAqB3E,kBAAkB,IAAI,OAAO;IAS7B,SAAS,CAAC,uBAAuB;IAWjC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAExC,uBAAuB;IAiBvB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAQ/D,mBAAmB;CAM1B"}

package/dist/solautoPosition/solautoPositionEx.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolautoPositionEx = void 0;
+const generated_1 = require("../generated");
+const utils_1 = require("../utils");
+const rebalance_1 = require("../services/rebalance");
+const constants_1 = require("../constants");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+class SolautoPositionEx {
+    constructor(args) {
+        this.lp = undefined;
+        this.lpUserAccount = undefined;
+        this.umi = args.umi;
+        this.publicKey = args.publicKey;
+        this.contextUpdates = args.contextUpdates;
+        this.lp = args.customArgs?.lendingPool;
+        this.lpUserAccount =
+            args.customArgs?.lpUserAccount ??
+                (args.data.position
+                    ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(args.data.position.protocolUserAccount)
+                    : undefined);
+        this._data = args.data;
+        this.firstState = { ...args.data.state };
+    }
+    exists() {
+        return this._data.position !== undefined;
+    }
+    strategyName() {
+        return (0, utils_1.solautoStrategyName)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().supply.mint), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().debt.mint));
+    }
+    data() {
+        return this._data;
+    }
+    state() {
+        return this.data().state;
+    }
+    settings() {
+        return this.contextUpdates?.settings ?? this.data().position?.settings;
+    }
+    dca() {
+        return this.contextUpdates?.dca ?? this.data().position?.dca;
+    }
+    supplyMint() {
+        return (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().supply.mint);
+    }
+    debtMint() {
+        return (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().debt.mint);
+    }
+    boostToBps() {
+        return Math.min(this.settings()?.boostToBps ?? 0, (0, utils_1.maxBoostToBps)(this.state().maxLtvBps, this.state().liqThresholdBps));
+    }
+    boostFromBps() {
+        return this.boostToBps() - (this.settings()?.boostGap ?? 0);
+    }
+    repayToBps() {
+        return Math.min(this.settings()?.repayToBps ?? 0, (0, utils_1.maxRepayToBps)(this.state().maxLtvBps, this.state().liqThresholdBps));
+    }
+    repayFromBps() {
+        return ((this.settings()?.repayToBps ?? 0) + (this.settings()?.repayGap ?? 0));
+    }
+    netWorth() {
+        return (0, utils_1.calcNetWorth)(this.state());
+    }
+    netWorthUsd() {
+        return (0, utils_1.calcNetWorthUsd)(this.state());
+    }
+    totalSupply() {
+        return (0, utils_1.calcTotalSupply)(this.state());
+    }
+    supplyUsd() {
+        return (0, utils_1.calcSupplyUsd)(this.state());
+    }
+    totalDebt() {
+        return (0, utils_1.calcTotalDebt)(this.state());
+    }
+    debtUsd() {
+        return (0, utils_1.calcDebtUsd)(this.state());
+    }
+    supplyLiquidityUsdDepositable() {
+        return (0, utils_1.supplyLiquidityUsdDepositable)(this.state());
+    }
+    debtLiquidityUsdAvailable() {
+        return (0, utils_1.debtLiquidityUsdAvailable)(this.state());
+    }
+    sufficientLiquidityToBoost() {
+        const limitsUpToDate = this.debtLiquidityUsdAvailable() !== 0 ||
+            this.supplyLiquidityUsdDepositable() !== 0;
+        if (limitsUpToDate) {
+            const { debtAdjustmentUsd } = (0, rebalance_1.getDebtAdjustment)(this.state().liqThresholdBps, { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() }, { solauto: 50, lpBorrow: 50, flashLoan: 50 }, // TODO: add better fix here instead of magic numbers
+            this.boostToBps());
+            const sufficientLiquidity = this.debtLiquidityUsdAvailable() * 0.95 > debtAdjustmentUsd &&
+                this.supplyLiquidityUsdDepositable() * 0.95 > debtAdjustmentUsd;
+            if (!sufficientLiquidity) {
+                (0, utils_1.consoleLog)("Insufficient liquidity to further boost");
+            }
+            return sufficientLiquidity;
+        }
+        return true;
+    }
+    eligibleForRebalance(bpsDistanceThreshold = 0) {
+        if (!this.settings() || !(0, utils_1.calcSupplyUsd)(this.state())) {
+            return undefined;
+        }
+        if (this.state().liqUtilizationRateBps - this.boostFromBps() <=
+            bpsDistanceThreshold) {
+            const sufficientLiquidity = this.sufficientLiquidityToBoost();
+            return sufficientLiquidity ? "boost" : undefined;
+        }
+        else if (this.repayFromBps() - this.state().liqUtilizationRateBps <=
+            bpsDistanceThreshold) {
+            return "repay";
+        }
+        return undefined;
+    }
+    eligibleForRefresh() {
+        if (this._data.selfManaged)
+            return false;
+        return ((0, utils_1.currentUnixSeconds)() - Number(this.state().lastRefreshed) >
+            60 * 60 * 24 * 7);
+    }
+    canRefreshPositionState() {
+        if (Number(this.state().lastRefreshed) >
+            (0, utils_1.currentUnixSeconds)() - constants_1.MIN_POSITION_STATE_FRESHNESS_SECS &&
+            !this.contextUpdates?.positionUpdates()) {
+            return false;
+        }
+        return true;
+    }
+    async utilizationRateBpsDrift() {
+        const supplyPrice = (0, utils_1.safeGetPrice)(this.state().supply.mint) ?? 0;
+        const debtPrice = (0, utils_1.safeGetPrice)(this.state().debt.mint) ?? 0;
+        const oldState = await (0, utils_1.positionStateWithLatestPrices)(this.firstState, supplyPrice, debtPrice);
+        const newState = await (0, utils_1.positionStateWithLatestPrices)(this.state(), supplyPrice, debtPrice);
+        return newState.liqUtilizationRateBps - oldState.liqUtilizationRateBps;
+    }
+    async updateWithLatestPrices(supplyPrice, debtPrice) {
+        this._data.state = await (0, utils_1.positionStateWithLatestPrices)(this.state(), supplyPrice, debtPrice);
+    }
+    async refetchPositionData() {
+        this._data = await (0, generated_1.fetchSolautoPosition)(this.umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(this.publicKey));
+    }
+}
+exports.SolautoPositionEx = SolautoPositionEx;