@defisaver/positions-sdk 1.0.30 → 1.0.32-dev-1

package/cjs/helpers/aaveHelpers/index.js

@@ -115,6 +115,7 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
         usedAssets,
         assetsData,
         isMorpho: (0, exports.isMorphoAave)({ selectedMarket }),
+        isAave: true,
     });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/cjs/liquityV2/index.d.ts

@@ -10,7 +10,7 @@ export declare const getLiquityV2UserTroveIds: (web3: Web3, network: NetworkNumb
 }>;
 export declare const getDebtInFrontForSingleMarketLiquityV2: (viewContract: any, marketAddress: EthAddress, troveId: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
 export declare const getDebtInFrontForInterestRateSingleMarketLiquityV2: (viewContract: any, marketAddress: EthAddress, interestRate: string, troveId?: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
-export declare const getAllMarketsUnbackedDebts: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, web3: Web3, network: NetworkNumber) => Promise<Record<LiquityV2Versions, string>>;
+export declare const getAllMarketsUnbackedDebts: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, isLegacy: boolean, web3: Web3, network: NetworkNumber) => Promise<Record<LiquityV2Versions, string>>;
 export declare const calculateDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string) => string;
 export declare const getDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, troveId: string) => Promise<string>;
 /**

package/cjs/liquityV2/index.js

@@ -174,10 +174,12 @@ const getUnbackedDebtForSingleMarket = (totalBorrowed, web3, network, stabilityP
     const totalBoldDepositsInEth = (0, tokens_1.assetAmountInEth)(totalBoldDeposits);
     return decimal_js_1.default.max(new decimal_js_1.default(totalBorrowed).sub(totalBoldDepositsInEth), 0).toString();
 });
-const getAllMarketsUnbackedDebts = (markets, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+const getAllMarketsUnbackedDebts = (markets, isLegacy, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
     const allMarketsUnbackedDebt = yield Promise.all(Object.entries(markets).map(([version, market]) => __awaiter(void 0, void 0, void 0, function* () {
         const { assetsData, marketData } = market;
-        const { debtToken } = (0, markets_1.LiquityV2Markets)(network)[version];
+        const { debtToken, isLegacy: isLegacyMarket } = (0, markets_1.LiquityV2Markets)(network)[version];
+        if (isLegacyMarket !== isLegacy)
+            return [version, '0'];
         const unbackedDebt = yield getUnbackedDebtForSingleMarket(assetsData[debtToken].totalBorrow, web3, network, marketData.stabilityPoolAddress);
         return [version, unbackedDebt];
     })));
@@ -186,10 +188,12 @@ const getAllMarketsUnbackedDebts = (markets, web3, network) => __awaiter(void 0,
 exports.getAllMarketsUnbackedDebts = getAllMarketsUnbackedDebts;
 const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront) => {
     const selectedMarketUnbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[selectedMarket]);
+    const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
     if (selectedMarketUnbackedDebt.eq(0))
-        return 'N/A';
+        return interestRateDebtInFront;
     const amountBeingReedemedOnEachMarket = Object.entries(markets).map(([version, market]) => {
-        if (version === selectedMarket)
+        const { isLegacy: isLegacyMarket } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
+        if (version === selectedMarket && isLegacyMarket !== isLegacy)
             return new decimal_js_1.default(interestRateDebtInFront);
         const { assetsData } = market;
         const { debtToken } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
@@ -202,7 +206,8 @@ const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnback
 };
 exports.calculateDebtInFrontLiquityV2 = calculateDebtInFrontLiquityV2;
 const getDebtInFrontLiquityV2 = (markets, selectedMarket, web3, network, viewContract, troveId) => __awaiter(void 0, void 0, void 0, function* () {
-    const allMarketsUnbackedDebts = yield (0, exports.getAllMarketsUnbackedDebts)(markets, web3, network);
+    const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
+    const allMarketsUnbackedDebts = yield (0, exports.getAllMarketsUnbackedDebts)(markets, isLegacy, web3, network);
     const interestRateDebtInFront = yield (0, exports.getDebtInFrontForSingleMarketLiquityV2)(viewContract, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, troveId);
     return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
@@ -217,7 +222,8 @@ exports.getDebtInFrontLiquityV2 = getDebtInFrontLiquityV2;
  * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
  */
 const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket, web3, network, viewContract, interestRate, debtInFrontBeingMoved = '0') => __awaiter(void 0, void 0, void 0, function* () {
-    const allMarketsUnbackedDebts = yield (0, exports.getAllMarketsUnbackedDebts)(markets, web3, network);
+    const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
+    const allMarketsUnbackedDebts = yield (0, exports.getAllMarketsUnbackedDebts)(markets, isLegacy, web3, network);
     const interestRateDebtInFront = new decimal_js_1.default(yield (0, exports.getDebtInFrontForInterestRateSingleMarketLiquityV2)(viewContract, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate))
         .sub(debtInFrontBeingMoved);
     return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());

package/cjs/multicall/index.js

@@ -17,7 +17,7 @@ const multicall = (calls, web3, network = common_1.NetworkNumber.Eth, blockNumbe
     const multicallContract = (0, contracts_1.UniMulticallContract)(web3, network);
     const formattedCalls = calls.map((call) => {
         const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
-        return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1500000 };
+        return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1800000 };
     });
     const callResult = yield multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
     let formattedResult = [];

package/cjs/staking/staking.d.ts

@@ -4,10 +4,15 @@ import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: ((asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>) & memoize.Memoized<(asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
-export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
+export declare const isEligibleForEthenaUSDeRewards: (usedAssets: MMUsedAssets) => {
+    isEligible: boolean;
+    eligibleUSDAmount: string;
+};
+export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho, isAave, }: {
     usedAssets: MMUsedAssets;
     assetsData: MMAssetsData;
     isMorpho?: boolean | undefined;
+    isAave?: boolean | undefined;
 }) => {
     netApy: string;
     totalInterestUsd: string;

package/cjs/staking/staking.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = void 0;
+exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.isEligibleForEthenaUSDeRewards = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const memoizee_1 = __importDefault(require("memoizee"));
 const contracts_1 = require("../contracts");
@@ -177,7 +177,41 @@ const calculateInterestEarned = (principal, interest, type, apy = false) => {
     return (+principal * (Math.pow(((1 + (+interest / 100) / constants_1.BLOCKS_IN_A_YEAR)), (constants_1.BLOCKS_IN_A_YEAR * interval)))) - +principal; // eslint-disable-line
 };
 exports.calculateInterestEarned = calculateInterestEarned;
-const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) => {
+const USDE_REWARD_APY = '12';
+const isEligibleForEthenaUSDeRewards = (usedAssets) => {
+    var _a, _b;
+    const USDeUSDAmountSupplied = ((_a = usedAssets.USDe) === null || _a === void 0 ? void 0 : _a.suppliedUsd) || '0';
+    const sUSDeUSDAmountSupplied = ((_b = usedAssets.sUSDe) === null || _b === void 0 ? void 0 : _b.suppliedUsd) || '0';
+    const anythingElseSupplied = Object.values(usedAssets).some((asset) => asset.symbol !== 'USDe' && asset.symbol !== 'sUSDe' && asset.isSupplied);
+    if (anythingElseSupplied)
+        return { isEligible: false, eligibleUSDAmount: '0' };
+    const totalAmountSupplied = new decimal_js_1.default(USDeUSDAmountSupplied).add(sUSDeUSDAmountSupplied).toString();
+    const percentageInUSDe = new decimal_js_1.default(USDeUSDAmountSupplied).div(totalAmountSupplied).toNumber();
+    if (percentageInUSDe < 0.45 || percentageInUSDe > 0.55)
+        return { isEligible: false, eligibleUSDAmount: '0' }; // 45% - 55% of total amount supplied must be in USDe
+    const percentageInSUSDe = new decimal_js_1.default(sUSDeUSDAmountSupplied).div(totalAmountSupplied).toNumber();
+    if (percentageInSUSDe < 0.45 || percentageInSUSDe > 0.55)
+        return { isEligible: false, eligibleUSDAmount: '0' }; // 45% - 55% of total amount supplied must be in sUSDe
+    const allowedBorrowAssets = ['USDC', 'USDT', 'USDS'];
+    const anythingBorrowedNotAllowed = Object.values(usedAssets).some((asset) => asset.isBorrowed && !allowedBorrowAssets.includes(asset.symbol));
+    if (anythingBorrowedNotAllowed)
+        return { isEligible: false, eligibleUSDAmount: '0' };
+    const totalAmountBorrowed = Object.values(usedAssets).reduce((acc, asset) => {
+        if (asset.isBorrowed) {
+            return acc.add(asset.borrowedUsd);
+        }
+        return acc;
+    }, new decimal_js_1.default(0)).toString();
+    const borrowPercentage = new decimal_js_1.default(totalAmountBorrowed).div(totalAmountSupplied).toNumber();
+    if (borrowPercentage < 0.5)
+        return { isEligible: false, eligibleUSDAmount: '0' }; // must be looped at least once
+    const halfAmountSupplied = new decimal_js_1.default(totalAmountSupplied).div(2).toString();
+    const USDeAmountEligibleForRewards = decimal_js_1.default.min(USDeUSDAmountSupplied, halfAmountSupplied).toString(); // rewards are given to amount of USDe supplied up to half of total amount supplied
+    return { isEligible: true, eligibleUSDAmount: USDeAmountEligibleForRewards };
+};
+exports.isEligibleForEthenaUSDeRewards = isEligibleForEthenaUSDeRewards;
+const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false, isAave = false, }) => {
+    const { isEligible, eligibleUSDAmount } = isAave ? (0, exports.isEligibleForEthenaUSDeRewards)(usedAssets) : { isEligible: true, eligibleUSDAmount: '0' };
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
         const acc = Object.assign({}, _acc);
         const assetData = assetsData[usedAsset.symbol];
@@ -194,6 +228,10 @@ const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) => {
                 const incentiveInterest = (0, exports.calculateInterestEarned)(amount, assetData.incentiveSupplyApy, 'year', true);
                 acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
             }
+            if (usedAsset.symbol === 'USDe' && isEligible) {
+                const incentiveInterest = (0, exports.calculateInterestEarned)(eligibleUSDAmount, USDE_REWARD_APY, 'year', true);
+                acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+            }
         }
         if (usedAsset.isBorrowed) {
             const amount = usedAsset.borrowedUsd;

package/esm/helpers/aaveHelpers/index.js

@@ -98,6 +98,7 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
         usedAssets,
         assetsData,
         isMorpho: isMorphoAave({ selectedMarket }),
+        isAave: true,
     });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/esm/liquityV2/index.d.ts

@@ -10,7 +10,7 @@ export declare const getLiquityV2UserTroveIds: (web3: Web3, network: NetworkNumb
 }>;
 export declare const getDebtInFrontForSingleMarketLiquityV2: (viewContract: any, marketAddress: EthAddress, troveId: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
 export declare const getDebtInFrontForInterestRateSingleMarketLiquityV2: (viewContract: any, marketAddress: EthAddress, interestRate: string, troveId?: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
-export declare const getAllMarketsUnbackedDebts: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, web3: Web3, network: NetworkNumber) => Promise<Record<LiquityV2Versions, string>>;
+export declare const getAllMarketsUnbackedDebts: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, isLegacy: boolean, web3: Web3, network: NetworkNumber) => Promise<Record<LiquityV2Versions, string>>;
 export declare const calculateDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string) => string;
 export declare const getDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, troveId: string) => Promise<string>;
 /**

package/esm/liquityV2/index.js

@@ -164,10 +164,12 @@ const getUnbackedDebtForSingleMarket = (totalBorrowed, web3, network, stabilityP
     const totalBoldDepositsInEth = assetAmountInEth(totalBoldDeposits);
     return Dec.max(new Dec(totalBorrowed).sub(totalBoldDepositsInEth), 0).toString();
 });
-export const getAllMarketsUnbackedDebts = (markets, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+export const getAllMarketsUnbackedDebts = (markets, isLegacy, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
     const allMarketsUnbackedDebt = yield Promise.all(Object.entries(markets).map(([version, market]) => __awaiter(void 0, void 0, void 0, function* () {
         const { assetsData, marketData } = market;
-        const { debtToken } = LiquityV2Markets(network)[version];
+        const { debtToken, isLegacy: isLegacyMarket } = LiquityV2Markets(network)[version];
+        if (isLegacyMarket !== isLegacy)
+            return [version, '0'];
         const unbackedDebt = yield getUnbackedDebtForSingleMarket(assetsData[debtToken].totalBorrow, web3, network, marketData.stabilityPoolAddress);
         return [version, unbackedDebt];
     })));
@@ -175,10 +177,12 @@ export const getAllMarketsUnbackedDebts = (markets, web3, network) => __awaiter(
 });
 export const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront) => {
     const selectedMarketUnbackedDebt = new Dec(allMarketsUnbackedDebts[selectedMarket]);
+    const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
     if (selectedMarketUnbackedDebt.eq(0))
-        return 'N/A';
+        return interestRateDebtInFront;
     const amountBeingReedemedOnEachMarket = Object.entries(markets).map(([version, market]) => {
-        if (version === selectedMarket)
+        const { isLegacy: isLegacyMarket } = LiquityV2Markets(NetworkNumber.Eth)[version];
+        if (version === selectedMarket && isLegacyMarket !== isLegacy)
             return new Dec(interestRateDebtInFront);
         const { assetsData } = market;
         const { debtToken } = LiquityV2Markets(NetworkNumber.Eth)[version];
@@ -190,7 +194,8 @@ export const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarket
     return amountBeingReedemedOnEachMarket.reduce((acc, val) => acc.plus(val), new Dec(0)).toString();
 };
 export const getDebtInFrontLiquityV2 = (markets, selectedMarket, web3, network, viewContract, troveId) => __awaiter(void 0, void 0, void 0, function* () {
-    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, web3, network);
+    const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
+    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, web3, network);
     const interestRateDebtInFront = yield getDebtInFrontForSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, troveId);
     return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
@@ -204,7 +209,8 @@ export const getDebtInFrontLiquityV2 = (markets, selectedMarket, web3, network,
  * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
  */
 export const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket, web3, network, viewContract, interestRate, debtInFrontBeingMoved = '0') => __awaiter(void 0, void 0, void 0, function* () {
-    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, web3, network);
+    const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
+    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, web3, network);
     const interestRateDebtInFront = new Dec(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, interestRate))
         .sub(debtInFrontBeingMoved);
     return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());

package/esm/multicall/index.js

@@ -14,7 +14,7 @@ export const multicall = (calls, web3, network = NetworkNumber.Eth, blockNumber
     const multicallContract = UniMulticallContract(web3, network);
     const formattedCalls = calls.map((call) => {
         const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
-        return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1500000 };
+        return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1800000 };
     });
     const callResult = yield multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
     let formattedResult = [];

package/esm/staking/staking.d.ts

@@ -4,10 +4,15 @@ import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: ((asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>) & memoize.Memoized<(asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
-export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
+export declare const isEligibleForEthenaUSDeRewards: (usedAssets: MMUsedAssets) => {
+    isEligible: boolean;
+    eligibleUSDAmount: string;
+};
+export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho, isAave, }: {
     usedAssets: MMUsedAssets;
     assetsData: MMAssetsData;
     isMorpho?: boolean | undefined;
+    isAave?: boolean | undefined;
 }) => {
     netApy: string;
     totalInterestUsd: string;

package/esm/staking/staking.js

@@ -170,7 +170,40 @@ export const calculateInterestEarned = (principal, interest, type, apy = false)
     }
     return (+principal * (Math.pow(((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)), (BLOCKS_IN_A_YEAR * interval)))) - +principal; // eslint-disable-line
 };
-export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) => {
+const USDE_REWARD_APY = '12';
+export const isEligibleForEthenaUSDeRewards = (usedAssets) => {
+    var _a, _b;
+    const USDeUSDAmountSupplied = ((_a = usedAssets.USDe) === null || _a === void 0 ? void 0 : _a.suppliedUsd) || '0';
+    const sUSDeUSDAmountSupplied = ((_b = usedAssets.sUSDe) === null || _b === void 0 ? void 0 : _b.suppliedUsd) || '0';
+    const anythingElseSupplied = Object.values(usedAssets).some((asset) => asset.symbol !== 'USDe' && asset.symbol !== 'sUSDe' && asset.isSupplied);
+    if (anythingElseSupplied)
+        return { isEligible: false, eligibleUSDAmount: '0' };
+    const totalAmountSupplied = new Dec(USDeUSDAmountSupplied).add(sUSDeUSDAmountSupplied).toString();
+    const percentageInUSDe = new Dec(USDeUSDAmountSupplied).div(totalAmountSupplied).toNumber();
+    if (percentageInUSDe < 0.45 || percentageInUSDe > 0.55)
+        return { isEligible: false, eligibleUSDAmount: '0' }; // 45% - 55% of total amount supplied must be in USDe
+    const percentageInSUSDe = new Dec(sUSDeUSDAmountSupplied).div(totalAmountSupplied).toNumber();
+    if (percentageInSUSDe < 0.45 || percentageInSUSDe > 0.55)
+        return { isEligible: false, eligibleUSDAmount: '0' }; // 45% - 55% of total amount supplied must be in sUSDe
+    const allowedBorrowAssets = ['USDC', 'USDT', 'USDS'];
+    const anythingBorrowedNotAllowed = Object.values(usedAssets).some((asset) => asset.isBorrowed && !allowedBorrowAssets.includes(asset.symbol));
+    if (anythingBorrowedNotAllowed)
+        return { isEligible: false, eligibleUSDAmount: '0' };
+    const totalAmountBorrowed = Object.values(usedAssets).reduce((acc, asset) => {
+        if (asset.isBorrowed) {
+            return acc.add(asset.borrowedUsd);
+        }
+        return acc;
+    }, new Dec(0)).toString();
+    const borrowPercentage = new Dec(totalAmountBorrowed).div(totalAmountSupplied).toNumber();
+    if (borrowPercentage < 0.5)
+        return { isEligible: false, eligibleUSDAmount: '0' }; // must be looped at least once
+    const halfAmountSupplied = new Dec(totalAmountSupplied).div(2).toString();
+    const USDeAmountEligibleForRewards = Dec.min(USDeUSDAmountSupplied, halfAmountSupplied).toString(); // rewards are given to amount of USDe supplied up to half of total amount supplied
+    return { isEligible: true, eligibleUSDAmount: USDeAmountEligibleForRewards };
+};
+export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false, isAave = false, }) => {
+    const { isEligible, eligibleUSDAmount } = isAave ? isEligibleForEthenaUSDeRewards(usedAssets) : { isEligible: true, eligibleUSDAmount: '0' };
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
         const acc = Object.assign({}, _acc);
         const assetData = assetsData[usedAsset.symbol];
@@ -187,6 +220,10 @@ export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) =>
                 const incentiveInterest = calculateInterestEarned(amount, assetData.incentiveSupplyApy, 'year', true);
                 acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
             }
+            if (usedAsset.symbol === 'USDe' && isEligible) {
+                const incentiveInterest = calculateInterestEarned(eligibleUSDAmount, USDE_REWARD_APY, 'year', true);
+                acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+            }
         }
         if (usedAsset.isBorrowed) {
             const amount = usedAsset.borrowedUsd;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "1.0.30",
+  "version": "1.0.32-dev-1",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/helpers/aaveHelpers/index.ts

@@ -129,6 +129,7 @@ export const aaveAnyGetAggregatedPositionData = ({
     usedAssets,
     assetsData,
     isMorpho: isMorphoAave({ selectedMarket }),
+    isAave: true,
   });
   payload.netApy = netApy;
   payload.incentiveUsd = incentiveUsd;

package/src/liquityV2/index.ts

@@ -188,10 +188,11 @@ const getUnbackedDebtForSingleMarket = async (totalBorrowed: string, web3: Web3,
   return Dec.max(new Dec(totalBorrowed).sub(totalBoldDepositsInEth), 0).toString();
 };
 
-export const getAllMarketsUnbackedDebts = async (markets: Record<LiquityV2Versions, LiquityV2MarketData>, web3: Web3, network: NetworkNumber): Promise<Record<LiquityV2Versions, string>> => {
+export const getAllMarketsUnbackedDebts = async (markets: Record<LiquityV2Versions, LiquityV2MarketData>, isLegacy: boolean, web3: Web3, network: NetworkNumber): Promise<Record<LiquityV2Versions, string>> => {
   const allMarketsUnbackedDebt = await Promise.all(Object.entries(markets).map(async ([version, market]) => {
     const { assetsData, marketData } = market;
-    const { debtToken } = LiquityV2Markets(network)[version as LiquityV2Versions];
+    const { debtToken, isLegacy: isLegacyMarket } = LiquityV2Markets(network)[version as LiquityV2Versions];
+    if (isLegacyMarket !== isLegacy) return [version, '0'];
     const unbackedDebt = await getUnbackedDebtForSingleMarket(assetsData[debtToken].totalBorrow, web3, network, marketData.stabilityPoolAddress);
     return [version, unbackedDebt];
   }));
@@ -201,10 +202,12 @@ export const getAllMarketsUnbackedDebts = async (markets: Record<LiquityV2Versio
 
 export const calculateDebtInFrontLiquityV2 = (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string): string => {
   const selectedMarketUnbackedDebt = new Dec(allMarketsUnbackedDebts[selectedMarket]);
-  if (selectedMarketUnbackedDebt.eq(0)) return 'N/A';
+  const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
+  if (selectedMarketUnbackedDebt.eq(0)) return interestRateDebtInFront;
 
   const amountBeingReedemedOnEachMarket = Object.entries(markets).map(([version, market]) => {
-    if (version === selectedMarket) return new Dec(interestRateDebtInFront);
+    const { isLegacy: isLegacyMarket } = LiquityV2Markets(NetworkNumber.Eth)[version as LiquityV2Versions];
+    if (version === selectedMarket && isLegacyMarket !== isLegacy) return new Dec(interestRateDebtInFront);
     const { assetsData } = market;
     const { debtToken } = LiquityV2Markets(NetworkNumber.Eth)[version as LiquityV2Versions];
     const unbackedDebt = new Dec(allMarketsUnbackedDebts[version as LiquityV2Versions]);
@@ -217,7 +220,8 @@ export const calculateDebtInFrontLiquityV2 = (markets: Record<LiquityV2Versions,
 };
 
 export const getDebtInFrontLiquityV2 = async (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, troveId: string) => {
-  const allMarketsUnbackedDebts = await getAllMarketsUnbackedDebts(markets, web3, network);
+  const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
+  const allMarketsUnbackedDebts = await getAllMarketsUnbackedDebts(markets, isLegacy, web3, network);
   const interestRateDebtInFront = await getDebtInFrontForSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, troveId);
 
   return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
@@ -233,7 +237,8 @@ export const getDebtInFrontLiquityV2 = async (markets: Record<LiquityV2Versions,
  * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
  */
 export const getDebtInFrontForInterestRateLiquityV2 = async (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, interestRate: string, debtInFrontBeingMoved: string = '0') => {
-  const allMarketsUnbackedDebts = await getAllMarketsUnbackedDebts(markets, web3, network);
+  const { isLegacy } = LiquityV2Markets(NetworkNumber.Eth)[selectedMarket];
+  const allMarketsUnbackedDebts = await getAllMarketsUnbackedDebts(markets, isLegacy, web3, network);
   const interestRateDebtInFront = new Dec(await getDebtInFrontForInterestRateSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, interestRate))
     .sub(debtInFrontBeingMoved);
 

package/src/multicall/index.ts

@@ -7,7 +7,7 @@ export const multicall = async (calls: any[], web3: Web3, network: NetworkNumber
   const multicallContract = UniMulticallContract(web3, network);
   const formattedCalls = calls.map((call) => {
     const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
-    return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1500000 };
+    return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1800000 };
   });
   const callResult = await multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
 

package/src/staking/staking.ts

@@ -155,7 +155,43 @@ export const calculateInterestEarned = (principal: string, interest: string, typ
   return (+principal * (((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)) ** (BLOCKS_IN_A_YEAR * interval))) - +principal; // eslint-disable-line
 };
 
-export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }: { usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean }) => {
+const USDE_REWARD_APY = '12';
+
+export const isEligibleForEthenaUSDeRewards = (usedAssets: MMUsedAssets) => {
+  const USDeUSDAmountSupplied = usedAssets.USDe?.suppliedUsd || '0';
+  const sUSDeUSDAmountSupplied = usedAssets.sUSDe?.suppliedUsd || '0';
+  const anythingElseSupplied = Object.values(usedAssets).some((asset) => asset.symbol !== 'USDe' && asset.symbol !== 'sUSDe' && asset.isSupplied);
+  if (anythingElseSupplied) return { isEligible: false, eligibleUSDAmount: '0' };
+  const totalAmountSupplied = new Dec(USDeUSDAmountSupplied).add(sUSDeUSDAmountSupplied).toString();
+  const percentageInUSDe = new Dec(USDeUSDAmountSupplied).div(totalAmountSupplied).toNumber();
+  if (percentageInUSDe < 0.45 || percentageInUSDe > 0.55) return { isEligible: false, eligibleUSDAmount: '0' }; // 45% - 55% of total amount supplied must be in USDe
+  const percentageInSUSDe = new Dec(sUSDeUSDAmountSupplied).div(totalAmountSupplied).toNumber();
+  if (percentageInSUSDe < 0.45 || percentageInSUSDe > 0.55) return { isEligible: false, eligibleUSDAmount: '0' }; // 45% - 55% of total amount supplied must be in sUSDe
+
+  const allowedBorrowAssets = ['USDC', 'USDT', 'USDS'];
+  const anythingBorrowedNotAllowed = Object.values(usedAssets).some((asset) => asset.isBorrowed && !allowedBorrowAssets.includes(asset.symbol));
+  if (anythingBorrowedNotAllowed) return { isEligible: false, eligibleUSDAmount: '0' };
+
+  const totalAmountBorrowed = Object.values(usedAssets).reduce((acc, asset) => {
+    if (asset.isBorrowed) {
+      return acc.add(asset.borrowedUsd);
+    }
+    return acc;
+  }, new Dec(0)).toString();
+
+  const borrowPercentage = new Dec(totalAmountBorrowed).div(totalAmountSupplied).toNumber();
+  if (borrowPercentage < 0.5) return { isEligible: false, eligibleUSDAmount: '0' }; // must be looped at least once
+
+  const halfAmountSupplied = new Dec(totalAmountSupplied).div(2).toString();
+  const USDeAmountEligibleForRewards = Dec.min(USDeUSDAmountSupplied, halfAmountSupplied).toString(); // rewards are given to amount of USDe supplied up to half of total amount supplied
+
+  return { isEligible: true, eligibleUSDAmount: USDeAmountEligibleForRewards };
+};
+
+export const calculateNetApy = ({
+  usedAssets, assetsData, isMorpho = false, isAave = false,
+}: { usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean, isAave?: boolean }) => {
+  const { isEligible, eligibleUSDAmount } = isAave ? isEligibleForEthenaUSDeRewards(usedAssets) : { isEligible: true, eligibleUSDAmount: '0' };
   const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
     const acc = { ..._acc };
     const assetData = assetsData[usedAsset.symbol];
@@ -173,6 +209,11 @@ export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }: {
         const incentiveInterest = calculateInterestEarned(amount, assetData.incentiveSupplyApy, 'year', true);
         acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
       }
+
+      if (usedAsset.symbol === 'USDe' && isEligible) {
+        const incentiveInterest = calculateInterestEarned(eligibleUSDAmount, USDE_REWARD_APY, 'year', true);
+        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+      }
     }
 
     if (usedAsset.isBorrowed) {