@haven-fi/solauto-sdk 1.0.52 → 1.0.54

package/dist/utils/jupiterUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJupSwapTransaction = void 0;
+exports.getJupSwapTransaction = getJupSwapTransaction;
 const umi_1 = require("@metaplex-foundation/umi");
 const web3_js_1 = require("@solana/web3.js");
 const solanaUtils_1 = require("./solanaUtils");
@@ -61,4 +61,3 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
         swapIx: (0, umi_1.transactionBuilder)().add((0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(instructions.swapInstruction))),
     };
 }
-exports.getJupSwapTransaction = getJupSwapTransaction;

package/dist/utils/marginfiUtils.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUpToDateShareValues = exports.getMarginfiAccountPositionState = exports.getAllMarginfiAccountsByAuthority = exports.getMaxLtvAndLiqThreshold = exports.findMarginfiAccounts = void 0;
+exports.findMarginfiAccounts = findMarginfiAccounts;
+exports.getMaxLtvAndLiqThreshold = getMaxLtvAndLiqThreshold;
+exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;
+exports.getMarginfiAccountPositionState = getMarginfiAccountPositionState;
+exports.getUpToDateShareValues = getUpToDateShareValues;
 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");
@@ -23,7 +27,6 @@ function findMarginfiAccounts({ mint, bank, }) {
     }
     throw new Error(`Marginfi accounts not found by the mint: ${mint}`);
 }
-exports.findMarginfiAccounts = findMarginfiAccounts;
 async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
     if (!supply.bank) {
         supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({
@@ -58,7 +61,6 @@ async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
     }
     return [maxLtv, liqThreshold];
 }
-exports.getMaxLtvAndLiqThreshold = getMaxLtvAndLiqThreshold;
 async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithSolauto) {
     const marginfiAccounts = await umi.rpc.getProgramAccounts(marginfi_sdk_1.MARGINFI_PROGRAM_ID, {
         commitment: "finalized",
@@ -97,7 +99,6 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
         }));
     }
 }
-exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;
 async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
     let amountUsed = 0;
     let amountCanBeUsed = 0;
@@ -209,7 +210,6 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
         padding: [],
     };
 }
-exports.getMarginfiAccountPositionState = getMarginfiAccountPositionState;
 function marginfiInterestRateCurve(bank, utilizationRatio) {
     const optimalUr = (0, numberUtils_1.bytesToI80F48)(bank.config.interestRateConfig.optimalUtilizationRate.value);
     const plateauIr = (0, numberUtils_1.bytesToI80F48)(bank.config.interestRateConfig.plateauInterestRate.value);
@@ -253,4 +253,3 @@ async function getUpToDateShareValues(umi, bank) {
         calcAccruedInterestPaymentPerPeriod(borrowingApr, timeDelta, (0, numberUtils_1.bytesToI80F48)(bank.liabilityShareValue.value)),
     ];
 }
-exports.getUpToDateShareValues = getUpToDateShareValues;

package/dist/utils/numberUtils.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maxRepayTo = exports.maxRepayFrom = exports.getMaxLiqUtilizationRate = exports.getDebtAdjustmentUsd = exports.uint8ArrayToBigInt = exports.bytesToI80F48 = exports.toBps = exports.fromBps = exports.fromBaseUnit = exports.toBaseUnit = exports.getLiqUtilzationRateBps = void 0;
+exports.getLiqUtilzationRateBps = getLiqUtilzationRateBps;
+exports.toBaseUnit = toBaseUnit;
+exports.fromBaseUnit = fromBaseUnit;
+exports.fromBps = fromBps;
+exports.toBps = toBps;
+exports.bytesToI80F48 = bytesToI80F48;
+exports.uint8ArrayToBigInt = uint8ArrayToBigInt;
+exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
+exports.getMaxLiqUtilizationRate = getMaxLiqUtilizationRate;
+exports.maxRepayFrom = maxRepayFrom;
+exports.maxRepayTo = maxRepayTo;
 const constants_1 = require("../constants");
 function getLiqUtilzationRateBps(supplyUsd, debtUsd, liqThresholdBps) {
     if (supplyUsd === 0) {
@@ -8,23 +18,18 @@ function getLiqUtilzationRateBps(supplyUsd, debtUsd, liqThresholdBps) {
     }
     return toBps(debtUsd / (supplyUsd * fromBps(liqThresholdBps)));
 }
-exports.getLiqUtilzationRateBps = getLiqUtilzationRateBps;
 function toBaseUnit(value, decimals) {
     return BigInt(Math.round(value * Math.pow(10, decimals)));
 }
-exports.toBaseUnit = toBaseUnit;
 function fromBaseUnit(value, decimals) {
     return Number(value) / Math.pow(10, decimals);
 }
-exports.fromBaseUnit = fromBaseUnit;
 function fromBps(value) {
     return value / 10000;
 }
-exports.fromBps = fromBps;
 function toBps(value) {
     return Math.round(value * 10000);
 }
-exports.toBps = toBps;
 function bytesToI80F48(bytes) {
     if (bytes.length !== 16) {
         throw new Error('Byte array must be exactly 16 bytes.');
@@ -41,7 +46,6 @@ function bytesToI80F48(bytes) {
     const fullValue = integerPart * BigInt(2 ** 48) + fractionalPart;
     return Number(fullValue) / (2 ** 48);
 }
-exports.bytesToI80F48 = bytesToI80F48;
 function uint8ArrayToBigInt(uint8Array) {
     if (uint8Array.length !== 8) {
         throw new Error('Uint8Array must be exactly 8 bytes long to convert to u64.');
@@ -52,7 +56,6 @@ function uint8ArrayToBigInt(uint8Array) {
     const high = dataView.getUint32(4, true);
     return BigInt(high) << 32n | BigInt(low);
 }
-exports.uint8ArrayToBigInt = uint8ArrayToBigInt;
 function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtilizationRateBps, adjustmentFeeBps) {
     const adjustmentFee = adjustmentFeeBps && adjustmentFeeBps > 0 ? fromBps(adjustmentFeeBps) : 0;
     const liqThreshold = fromBps(liqThresholdBps);
@@ -60,16 +63,12 @@ function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtil
     const debtAdjustmentUsd = (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) / (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
     return debtAdjustmentUsd;
 }
-exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
 function getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps) {
     return toBps((fromBps(maxLtvBps) - 0.015) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
 }
-exports.getMaxLiqUtilizationRate = getMaxLiqUtilizationRate;
 function maxRepayFrom(maxLtvBps, liqThresholdBps) {
     return Math.min(9000, getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps - 1000));
 }
-exports.maxRepayFrom = maxRepayFrom;
 function maxRepayTo(maxLtvBps, liqThresholdBps) {
     return Math.min(maxRepayFrom(maxLtvBps, liqThresholdBps) - constants_1.MAX_REPAY_GAP_BPS, getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps));
 }
-exports.maxRepayTo = maxRepayTo;

package/dist/utils/solanaUtils.js

@@ -3,7 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendSingleOptimizedTransaction = exports.getComputeUnitPriceEstimate = exports.assembleFinalTransaction = exports.getAdressLookupInputs = exports.splTokenTransferUmiIx = exports.closeTokenAccountUmiIx = exports.systemTransferUmiIx = exports.createAssociatedTokenAccountUmiIx = exports.setComputeUnitPriceUmiIx = exports.setComputeUnitLimitUmiIx = exports.getWrappedInstruction = exports.currentUnixSecondsSolana = exports.getSolanaRpcConnection = void 0;
+exports.getSolanaRpcConnection = getSolanaRpcConnection;
+exports.currentUnixSecondsSolana = currentUnixSecondsSolana;
+exports.getWrappedInstruction = getWrappedInstruction;
+exports.setComputeUnitLimitUmiIx = setComputeUnitLimitUmiIx;
+exports.setComputeUnitPriceUmiIx = setComputeUnitPriceUmiIx;
+exports.createAssociatedTokenAccountUmiIx = createAssociatedTokenAccountUmiIx;
+exports.systemTransferUmiIx = systemTransferUmiIx;
+exports.closeTokenAccountUmiIx = closeTokenAccountUmiIx;
+exports.splTokenTransferUmiIx = splTokenTransferUmiIx;
+exports.getAdressLookupInputs = getAdressLookupInputs;
+exports.assembleFinalTransaction = assembleFinalTransaction;
+exports.getComputeUnitPriceEstimate = getComputeUnitPriceEstimate;
+exports.sendSingleOptimizedTransaction = sendSingleOptimizedTransaction;
 const bs58_1 = __importDefault(require("bs58"));
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
@@ -19,7 +31,6 @@ function getSolanaRpcConnection(heliusApiKey) {
     const umi = (0, umi_bundle_defaults_1.createUmi)(connection);
     return [connection, umi];
 }
-exports.getSolanaRpcConnection = getSolanaRpcConnection;
 async function currentUnixSecondsSolana(umi) {
     return await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const blockTime = await umi.rpc.getBlockTime(await umi.rpc.getSlot());
@@ -29,7 +40,6 @@ async function currentUnixSecondsSolana(umi) {
         return Number(blockTime);
     });
 }
-exports.currentUnixSecondsSolana = currentUnixSecondsSolana;
 function getWrappedInstruction(signer, ix) {
     return {
         instruction: (0, umi_web3js_adapters_1.fromWeb3JsInstruction)(ix),
@@ -37,23 +47,19 @@ function getWrappedInstruction(signer, ix) {
         bytesCreatedOnChain: 0,
     };
 }
-exports.getWrappedInstruction = getWrappedInstruction;
 function setComputeUnitLimitUmiIx(signer, maxComputeUnits) {
     return getWrappedInstruction(signer, web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
         units: maxComputeUnits,
     }));
 }
-exports.setComputeUnitLimitUmiIx = setComputeUnitLimitUmiIx;
 function setComputeUnitPriceUmiIx(signer, lamports) {
     return getWrappedInstruction(signer, web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
         microLamports: lamports,
     }));
 }
-exports.setComputeUnitPriceUmiIx = setComputeUnitPriceUmiIx;
 function createAssociatedTokenAccountUmiIx(signer, wallet, mint) {
     return getWrappedInstruction(signer, (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey), (0, accountUtils_1.getTokenAccount)(wallet, mint), wallet, mint));
 }
-exports.createAssociatedTokenAccountUmiIx = createAssociatedTokenAccountUmiIx;
 function systemTransferUmiIx(signer, destination, lamports) {
     return getWrappedInstruction(signer, web3_js_1.SystemProgram.transfer({
         fromPubkey: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey),
@@ -61,15 +67,12 @@ function systemTransferUmiIx(signer, destination, lamports) {
         lamports,
     }));
 }
-exports.systemTransferUmiIx = systemTransferUmiIx;
 function closeTokenAccountUmiIx(signer, tokenAccount, authority) {
     return getWrappedInstruction(signer, (0, spl_token_1.createCloseAccountInstruction)(tokenAccount, authority, authority));
 }
-exports.closeTokenAccountUmiIx = closeTokenAccountUmiIx;
 function splTokenTransferUmiIx(signer, fromTa, toTa, authority, amount) {
     return getWrappedInstruction(signer, (0, spl_token_1.createTransferInstruction)(fromTa, toTa, authority, amount));
 }
-exports.splTokenTransferUmiIx = splTokenTransferUmiIx;
 async function getAdressLookupInputs(umi, lookupTableAddresses) {
     const addressLookupTableAccountInfos = await umi.rpc.getAccounts(lookupTableAddresses.map((key) => (0, umi_1.publicKey)(key)));
     return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
@@ -83,7 +86,6 @@ async function getAdressLookupInputs(umi, lookupTableAddresses) {
         return acc;
     }, new Array());
 }
-exports.getAdressLookupInputs = getAdressLookupInputs;
 function assembleFinalTransaction(signer, tx, computeUnitPrice, computeUnitLimit) {
     tx = tx
         .prepend(setComputeUnitPriceUmiIx(signer, computeUnitPrice))
@@ -125,7 +127,6 @@ function assembleFinalTransaction(signer, tx, computeUnitPrice, computeUnitLimit
     }
     return tx;
 }
-exports.assembleFinalTransaction = assembleFinalTransaction;
 async function simulateTransaction(connection, transaction) {
     const simulationResult = await connection.simulateTransaction(transaction, {
         sigVerify: false,
@@ -153,7 +154,6 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, attemptNum)
     const feeEstimate = Math.round(resp.priorityFeeEstimate);
     return feeEstimate;
 }
-exports.getComputeUnitPriceEstimate = getComputeUnitPriceEstimate;
 async function sendSingleOptimizedTransaction(umi, connection, tx, simulateOnly, attemptNum, prioritySetting = types_1.PriorityFeeSetting.Default) {
     console.log("Sending single optimized transaction...");
     console.log("Instructions: ", tx.getInstructions().length);
@@ -179,4 +179,3 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, simulateOnly,
     }
     return undefined;
 }
-exports.sendSingleOptimizedTransaction = sendSingleOptimizedTransaction;

package/dist/utils/solauto/generalUtils.d.ts.map

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

package/dist/utils/solauto/generalUtils.js

@@ -1,6 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LivePositionUpdates = exports.positionStateWithLatestPrices = exports.getAllPositionsByAuthority = exports.getReferralsByUser = exports.getAllReferralStates = exports.getSolautoManagedPositions = exports.eligibleForRefresh = exports.eligibleForRebalance = exports.getSolautoFeesBps = exports.getAdjustedSettingsFromAutomation = exports.getUpdatedValueFromAutomation = exports.eligibleForNextAutomationPeriod = exports.nextAutomationPeriodTimestamp = void 0;
+exports.LivePositionUpdates = void 0;
+exports.nextAutomationPeriodTimestamp = nextAutomationPeriodTimestamp;
+exports.eligibleForNextAutomationPeriod = eligibleForNextAutomationPeriod;
+exports.getUpdatedValueFromAutomation = getUpdatedValueFromAutomation;
+exports.getAdjustedSettingsFromAutomation = getAdjustedSettingsFromAutomation;
+exports.getSolautoFeesBps = getSolautoFeesBps;
+exports.eligibleForRebalance = eligibleForRebalance;
+exports.eligibleForRefresh = eligibleForRefresh;
+exports.getSolautoManagedPositions = getSolautoManagedPositions;
+exports.getAllReferralStates = getAllReferralStates;
+exports.getReferralsByUser = getReferralsByUser;
+exports.getAllPositionsByAuthority = getAllPositionsByAuthority;
+exports.positionStateWithLatestPrices = positionStateWithLatestPrices;
+const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const generated_1 = require("../../generated");
 const generalUtils_1 = require("../generalUtils");
@@ -20,11 +33,9 @@ function nextAutomationPeriodTimestamp(automation) {
         : Number(automation.unixStartDate) +
             automation.periodsPassed * Number(automation.intervalSeconds);
 }
-exports.nextAutomationPeriodTimestamp = nextAutomationPeriodTimestamp;
 function eligibleForNextAutomationPeriod(automation) {
     return (0, generalUtils_1.currentUnixSeconds)() >= nextAutomationPeriodTimestamp(automation);
 }
-exports.eligibleForNextAutomationPeriod = eligibleForNextAutomationPeriod;
 function getUpdatedValueFromAutomation(currValue, targetValue, automation, currentUnixTimestamp) {
     const currRateDiff = currValue - targetValue;
     const progressPct = 1 /
@@ -33,7 +44,6 @@ function getUpdatedValueFromAutomation(currValue, targetValue, automation, curre
     const newValue = currValue - currRateDiff * progressPct;
     return newValue;
 }
-exports.getUpdatedValueFromAutomation = getUpdatedValueFromAutomation;
 function getAdjustedSettingsFromAutomation(settings, currentUnixSeconds) {
     const boostToBps = settings.automation.targetPeriods > 0 &&
         eligibleForNextAutomationPeriod(settings.automation)
@@ -44,7 +54,6 @@ function getAdjustedSettingsFromAutomation(settings, currentUnixSeconds) {
         boostToBps,
     };
 }
-exports.getAdjustedSettingsFromAutomation = getAdjustedSettingsFromAutomation;
 function getSolautoFeesBps(isReferred, feeType) {
     const fees = feeType === generated_1.FeeType.Small ? 100 : 500;
     let referrer = 0;
@@ -57,11 +66,10 @@ function getSolautoFeesBps(isReferred, feeType) {
         total: fees,
     };
 }
-exports.getSolautoFeesBps = getSolautoFeesBps;
 function eligibleForRebalance(positionState, positionSettings, positionDca) {
     if (positionDca.automation.targetPeriods > 0 &&
         eligibleForNextAutomationPeriod(positionDca.automation)) {
-        return 'dca';
+        return "dca";
     }
     if (positionState.supply.amountUsed.baseUnit === BigInt(0)) {
         return undefined;
@@ -73,14 +81,13 @@ function eligibleForRebalance(positionState, positionSettings, positionDca) {
     const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;
     const boostFrom = boostToBps - positionSettings.boostGap;
     if (positionState.liqUtilizationRateBps <= boostFrom) {
-        return 'boost';
+        return "boost";
     }
     else if (positionState.liqUtilizationRateBps >= repayFrom) {
-        return 'repay';
+        return "repay";
     }
     return undefined;
 }
-exports.eligibleForRebalance = eligibleForRebalance;
 function eligibleForRefresh(positionState, positionSettings) {
     if (positionSettings.automation.targetPeriods > 0) {
         return eligibleForNextAutomationPeriod(positionSettings.automation);
@@ -90,7 +97,6 @@ function eligibleForRefresh(positionState, positionSettings) {
             60 * 60 * 24 * 7);
     }
 }
-exports.eligibleForRefresh = eligibleForRefresh;
 async function getSolautoManagedPositions(umi, authority) {
     // bump: [u8; 1]
     // position_id: [u8; 1]
@@ -139,7 +145,6 @@ async function getSolautoManagedPositions(umi, authority) {
         };
     });
 }
-exports.getSolautoManagedPositions = getSolautoManagedPositions;
 async function getAllReferralStates(umi) {
     const accounts = await umi.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
         commitment: "finalized",
@@ -155,7 +160,6 @@ async function getAllReferralStates(umi) {
     });
     return accounts.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey));
 }
-exports.getAllReferralStates = getAllReferralStates;
 async function getReferralsByUser(umi, user) {
     // bump: [u8; 1],
     // padding: [u8; 7],
@@ -182,7 +186,6 @@ async function getReferralsByUser(umi, user) {
     });
     return accounts.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey));
 }
-exports.getReferralsByUser = getReferralsByUser;
 async function getAllPositionsByAuthority(umi, user) {
     const allPositions = [];
     const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
@@ -192,7 +195,10 @@ async function getAllPositionsByAuthority(umi, user) {
         positionId: x.positionId,
         lendingPlatform: x.lendingPlatform,
     })));
-    const marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
+    let marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
+    marginfiPositions = marginfiPositions.filter((x) => x.supplyMint &&
+        (x.debtMint.equals(web3_js_1.PublicKey.default) ||
+            constants_1.ALL_SUPPORTED_TOKENS.includes(x.debtMint.toString())));
     allPositions.push(...marginfiPositions.map((x) => ({
         publicKey: x.marginfiAccount,
         authority: user,
@@ -205,7 +211,6 @@ async function getAllPositionsByAuthority(umi, user) {
     // TODO support other platforms
     return allPositions;
 }
-exports.getAllPositionsByAuthority = getAllPositionsByAuthority;
 async function positionStateWithLatestPrices(umi, state, protocolAccount, lendingPlatform) {
     if ((0, generalUtils_1.currentUnixSeconds)() - Number(state.lastUpdated) > 60 * 60 * 24 * 7) {
         if (lendingPlatform === generated_1.LendingPlatform.Marginfi) {
@@ -246,7 +251,6 @@ async function positionStateWithLatestPrices(umi, state, protocolAccount, lendin
         },
     };
 }
-exports.positionStateWithLatestPrices = positionStateWithLatestPrices;
 class LivePositionUpdates {
     constructor() {
         this.supplyAdjustment = BigInt(0);

package/dist/utils/solauto/rebalanceUtils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJupSwapRebalanceDetails = exports.getFlashLoanDetails = exports.getRebalanceValues = void 0;
+exports.getRebalanceValues = getRebalanceValues;
+exports.getFlashLoanDetails = getFlashLoanDetails;
+exports.getJupSwapRebalanceDetails = getJupSwapRebalanceDetails;
 const generated_1 = require("../../generated");
 const generalUtils_1 = require("./generalUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
@@ -127,7 +129,6 @@ function getRebalanceValues(client, targetLiqUtilizationRateBps, limitGapBps) {
         amountUsdToDcaIn,
     };
 }
-exports.getRebalanceValues = getRebalanceValues;
 function getFlashLoanDetails(client, values, jupQuote) {
     let supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
     let debtUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
@@ -168,7 +169,6 @@ function getFlashLoanDetails(client, values, jupQuote) {
         }
         : undefined;
 }
-exports.getFlashLoanDetails = getFlashLoanDetails;
 function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps, attemptNum) {
     const input = values.increasingLeverage
         ? client.solautoPositionState.debt
@@ -196,4 +196,3 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         exactOut: rebalancingToZero,
     };
 }
-exports.getJupSwapRebalanceDetails = getJupSwapRebalanceDetails;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -32,6 +32,7 @@
     "@types/mocha": "^9.1.1",
     "chai": "^4.3.4",
     "mocha": "^9.2.2",
-    "ts-mocha": "^10.0.0"
+    "ts-mocha": "^10.0.0",
+    "typescript": "^5.5.4"
   }
 }

package/src/clients/solautoClient.ts

@@ -419,8 +419,6 @@ export abstract class SolautoClient {
     settingParams?: SolautoSettingsParametersInpArgs,
     dca?: DCASettingsInpArgs
   ): TransactionBuilder {
-    let tx = transactionBuilder();
-
     if (dca && dca.debtToAddBaseUnit > 0) {
       this.livePositionUpdates.new({
         type: "debtDcaIn",
@@ -440,14 +438,7 @@ export abstract class SolautoClient {
       });
     }
 
-    if (!this.selfManaged) {
-      // Tip Solauto Manager
-      tx = tx.add(
-        systemTransferUmiIx(this.signer, SOLAUTO_MANAGER, toBaseUnit(0.1, 9))
-      );
-    }
-
-    return tx;
+    return transactionBuilder();
   }
 
   updatePositionIx(args: UpdatePositionDataArgs): TransactionBuilder {

package/src/clients/solautoMarginfiClient.ts

@@ -53,6 +53,7 @@ import {
   getMarginfiAccountPositionState,
 } from "../utils/marginfiUtils";
 import { bytesToI80F48 } from "../utils/numberUtils";
+import { SOLAUTO_MANAGER } from "../constants";
 
 export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
   marginfiAccount?: PublicKey | Signer;
@@ -204,6 +205,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     return marginfiOpenPosition(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
+      solautoManager: publicKey(SOLAUTO_MANAGER),
       solautoFeesWallet: publicKey(this.solautoFeesWallet),
       solautoFeesSupplyTa: publicKey(this.solautoFeesSupplyTa),
       signerReferralState: publicKey(this.authorityReferralState),

package/src/generated/instructions/marginfiOpenPosition.ts

@@ -44,6 +44,7 @@ export type MarginfiOpenPositionInstructionAccounts = {
   tokenProgram?: PublicKey | Pda;
   ataProgram?: PublicKey | Pda;
   rent?: PublicKey | Pda;
+  solautoManager: PublicKey | Pda;
   solautoFeesWallet: PublicKey | Pda;
   solautoFeesSupplyTa: PublicKey | Pda;
   signerReferralState: PublicKey | Pda;
@@ -141,78 +142,83 @@ export function marginfiOpenPosition(
       value: input.ataProgram ?? null,
     },
     rent: { index: 5, isWritable: false as boolean, value: input.rent ?? null },
-    solautoFeesWallet: {
+    solautoManager: {
       index: 6,
+      isWritable: true as boolean,
+      value: input.solautoManager ?? null,
+    },
+    solautoFeesWallet: {
+      index: 7,
       isWritable: false as boolean,
       value: input.solautoFeesWallet ?? null,
     },
     solautoFeesSupplyTa: {
-      index: 7,
+      index: 8,
       isWritable: true as boolean,
       value: input.solautoFeesSupplyTa ?? null,
     },
     signerReferralState: {
-      index: 8,
+      index: 9,
       isWritable: false as boolean,
       value: input.signerReferralState ?? null,
     },
     referredByState: {
-      index: 9,
+      index: 10,
       isWritable: false as boolean,
       value: input.referredByState ?? null,
     },
     referredBySupplyTa: {
-      index: 10,
+      index: 11,
       isWritable: true as boolean,
       value: input.referredBySupplyTa ?? null,
     },
     solautoPosition: {
-      index: 11,
+      index: 12,
       isWritable: true as boolean,
       value: input.solautoPosition ?? null,
     },
     marginfiGroup: {
-      index: 12,
+      index: 13,
       isWritable: false as boolean,
       value: input.marginfiGroup ?? null,
     },
     marginfiAccount: {
-      index: 13,
+      index: 14,
       isWritable: true as boolean,
       value: input.marginfiAccount ?? null,
     },
     supplyMint: {
-      index: 14,
+      index: 15,
       isWritable: false as boolean,
       value: input.supplyMint ?? null,
     },
     supplyBank: {
-      index: 15,
+      index: 16,
       isWritable: false as boolean,
       value: input.supplyBank ?? null,
     },
     positionSupplyTa: {
-      index: 16,
+      index: 17,
       isWritable: true as boolean,
       value: input.positionSupplyTa ?? null,
     },
     debtMint: {
-      index: 17,
+      index: 18,
       isWritable: false as boolean,
       value: input.debtMint ?? null,
     },
     debtBank: {
-      index: 18,
+      index: 19,
       isWritable: false as boolean,
       value: input.debtBank ?? null,
     },
     positionDebtTa: {
-      index: 19,
+      index: 20,
       isWritable: true as boolean,
       value: input.positionDebtTa ?? null,
     },
     signerDebtTa: {
-      index: 20,
+      index: 21,
       isWritable: true as boolean,
       value: input.signerDebtTa ?? null,
     },

package/src/utils/generalUtils.ts

@@ -3,7 +3,6 @@ import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
 import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
 import { fromBaseUnit, toBaseUnit } from "./numberUtils";
 import { PRICES } from "../constants/solautoConstants";
-import { ResponseError } from "@jup-ag/api";
 
 export function generateRandomU8(): number {
   return Math.floor(Math.random() * 255 + 1);

package/src/utils/solauto/generalUtils.ts

@@ -22,7 +22,7 @@ import {
 } from "../numberUtils";
 import { getReferralState } from "../accountUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { USD_DECIMALS } from "../../constants";
+import { ALL_SUPPORTED_TOKENS, USD_DECIMALS } from "../../constants";
 import {
   getAllMarginfiAccountsByAuthority,
   getMarginfiAccountPositionState,
@@ -127,7 +127,7 @@ export function eligibleForRebalance(
     positionDca.automation.targetPeriods > 0 &&
     eligibleForNextAutomationPeriod(positionDca.automation)
   ) {
-    return 'dca';
+    return "dca";
   }
 
   if (positionState.supply.amountUsed.baseUnit === BigInt(0)) {
@@ -148,11 +148,9 @@ export function eligibleForRebalance(
   const boostFrom = boostToBps - positionSettings.boostGap;
 
   if (positionState.liqUtilizationRateBps <= boostFrom) {
-    return 'boost';
-  } else if (
-    positionState.liqUtilizationRateBps >= repayFrom
-  ) {
-    return 'repay';
+    return "boost";
+  } else if (positionState.liqUtilizationRateBps >= repayFrom) {
+    return "repay";
   }
 
   return undefined;
@@ -293,11 +291,17 @@ export async function getAllPositionsByAuthority(
     }))
   );
 
-  const marginfiPositions = await getAllMarginfiAccountsByAuthority(
+  let marginfiPositions = await getAllMarginfiAccountsByAuthority(
     umi,
     user,
     true
   );
+  marginfiPositions = marginfiPositions.filter(
+    (x) =>
+      x.supplyMint &&
+      (x.debtMint!.equals(PublicKey.default) ||
+        ALL_SUPPORTED_TOKENS.includes(x.debtMint!.toString()))
+  );
   allPositions.push(
     ...marginfiPositions.map((x) => ({
       publicKey: x.marginfiAccount,
@@ -327,7 +331,7 @@ export async function positionStateWithLatestPrices(
         umi,
         protocolAccount,
         toWeb3JsPublicKey(state.supply.mint),
-        toWeb3JsPublicKey(state.debt.mint),
+        toWeb3JsPublicKey(state.debt.mint)
       );
     } else {
       throw new Error("Lending platorm not yet supported");