@defisaver/positions-sdk 2.1.79-aave-v4-2-dev → 2.1.79-aave-v4-4-dev

package/cjs/aaveV4/index.js

@@ -203,8 +203,8 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         totalDrawn: (0, tokens_1.assetAmountInEth)(totalDrawnRaw.toString(), symbol),
         totalPremium: (0, tokens_1.assetAmountInEth)(totalPremiumRaw.toString(), symbol),
         totalDebt: (0, tokens_1.assetAmountInEth)(totalDebtRaw.toString(), symbol),
-        supplyCap: (0, tokens_1.assetAmountInEth)(supplyCapRaw.toString(), symbol),
-        borrowCap: (0, tokens_1.assetAmountInEth)(borrowCapRaw.toString(), symbol),
+        supplyCap: (0, utils_1.isMaxUint)(supplyCapRaw.toString()) ? supplyCapRaw.toString() : (0, tokens_1.assetAmountInEth)(supplyCapRaw.toString(), symbol),
+        borrowCap: (0, utils_1.isMaxUint)(borrowCapRaw.toString()) ? borrowCapRaw.toString() : (0, tokens_1.assetAmountInEth)(borrowCapRaw.toString(), symbol),
         spokeActive: reserveAsset.spokeActive,
         spokeHalted: reserveAsset.spokeHalted,
         drawnRate: drawnRate.toString(),
@@ -250,7 +250,8 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, spokeData, address, blockNumber = 'latest') {
         const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
         const loanData = yield viewContract.read.getLoanData([spokeData.address, address]);
-        const healthFactor = new decimal_js_1.default(loanData.healthFactor).div(1e18).toString();
+        const healthFactorFromContract = new decimal_js_1.default(loanData.healthFactor.toString());
+        const healthFactor = (0, utils_1.isMaxUint)(healthFactorFromContract.toString()) ? '0' : healthFactorFromContract.div(1e18).toString();
         const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
             const identifier = `${(0, utils_1.wethToEth)((0, tokens_1.getAssetInfoByAddress)(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
             const reserveData = spokeData.assetsData[identifier];

package/cjs/eulerV2/index.d.ts

@@ -1,6 +1,5 @@
 import { Client } from 'viem';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { EulerV2AssetsData, EulerV2FullMarketData, EulerV2Market, EulerV2MarketInfoData, EulerV2PositionData } from '../types';
+import { EulerV2AssetsData, EulerV2FullMarketData, EulerV2Market, EulerV2MarketInfoData, EulerV2PositionData, EthAddress, EthereumProvider, NetworkNumber } from '../types';
 export declare const EMPTY_USED_ASSET: {
     isSupplied: boolean;
     isBorrowed: boolean;

package/cjs/eulerV2/index.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEulerV2AccountData = exports._getEulerV2AccountData = exports.EMPTY_EULER_V2_DATA = exports.getEulerV2MarketsData = exports._getEulerV2MarketsData = exports.EMPTY_USED_ASSET = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
-const common_1 = require("../types/common");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const types_1 = require("../types");
@@ -65,7 +64,7 @@ const _getEulerV2MarketsData = (provider, network, selectedMarket) => __awaiter(
             collateralFactor: new decimal_js_1.default(collateral.borrowLTV).div(10000).toString(),
             totalBorrow: (0, utils_1.getEthAmountForDecimals)(collateral.totalBorrows.toString(), decimals), // parse
             cash: (0, utils_1.getEthAmountForDecimals)(collateral.cash.toString(), decimals),
-            supplyCap: (0, utils_1.isMaxuint)(collateral.supplyCap.toString()) ? collateral.supplyCap.toString() : (0, utils_1.getEthAmountForDecimals)(collateral.supplyCap.toString(), decimals),
+            supplyCap: (0, utils_1.isMaxUint)(collateral.supplyCap.toString()) ? collateral.supplyCap.toString() : (0, utils_1.getEthAmountForDecimals)(collateral.supplyCap.toString(), decimals),
             borrowCap: '0',
             price: isInUSD ? (0, tokens_1.assetAmountInEth)(collateral.assetPriceInUnit.toString()) : new decimal_js_1.default((0, tokens_1.assetAmountInEth)(collateral.assetPriceInUnit.toString())).mul(usdPrice).toString(), // 1e18 -> price in unitOfAccount (so it could be USD or any other token)
             canBeBorrowed: false,
@@ -83,7 +82,7 @@ const _getEulerV2MarketsData = (provider, network, selectedMarket) => __awaiter(
             coll.supplyIncentives.push({
                 apy: yield (0, staking_1.getStakingApy)(coll.symbol),
                 token: coll.symbol,
-                incentiveKind: common_1.IncentiveKind.Staking,
+                incentiveKind: types_1.IncentiveKind.Staking,
                 description: `Native ${coll.symbol} yield.`,
             });
         }
@@ -105,8 +104,8 @@ const _getEulerV2MarketsData = (provider, network, selectedMarket) => __awaiter(
         decimals,
         totalBorrow: (0, utils_1.getEthAmountForDecimals)(data.totalBorrows.toString(), decimals), // parse
         cash: (0, utils_1.getEthAmountForDecimals)(data.cash.toString(), decimals),
-        supplyCap: (0, utils_1.isMaxuint)(data.supplyCap.toString()) ? data.supplyCap.toString() : (0, utils_1.getEthAmountForDecimals)(data.supplyCap.toString(), decimals),
-        borrowCap: (0, utils_1.isMaxuint)(data.supplyCap.toString()) ? data.borrowCap.toString() : (0, utils_1.getEthAmountForDecimals)(data.borrowCap.toString(), decimals),
+        supplyCap: (0, utils_1.isMaxUint)(data.supplyCap.toString()) ? data.supplyCap.toString() : (0, utils_1.getEthAmountForDecimals)(data.supplyCap.toString(), decimals),
+        borrowCap: (0, utils_1.isMaxUint)(data.supplyCap.toString()) ? data.borrowCap.toString() : (0, utils_1.getEthAmountForDecimals)(data.borrowCap.toString(), decimals),
         price: isInUSD ? (0, tokens_1.assetAmountInEth)(data.assetPriceInUnit.toString()) : new decimal_js_1.default((0, tokens_1.assetAmountInEth)(data.assetPriceInUnit.toString())).mul(usdPrice).toString(), // 1e18 -> price in unitOfAccount (so it could be USD or any other token)
         sortIndex: 0,
         canBeBorrowed: true,

package/cjs/moneymarket/moneymarketCommonService.js

@@ -32,7 +32,7 @@ exports.STABLE_ASSETS = [
     'DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'USDA',
     'USDe', 'sUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
     'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
-    'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr',
+    'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'frxUSD',
 ];
 const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

package/cjs/services/utils.d.ts

@@ -18,7 +18,7 @@ export declare const bytesToString: (hex: string) => string;
 export declare const mapRange: (input: number | string, minInput: number | string, maxInput: number | string, minOutput: number | string, maxOutput: number | string) => number;
 export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => bigint;
 export declare const MAXUINT: string;
-export declare const isMaxuint: (amount: string) => boolean;
+export declare const isMaxUint: (amount: string) => boolean;
 export declare const isMainnetNetwork: (network: NetworkNumber) => network is NetworkNumber.Eth;
 export declare const DEFAULT_TIMEOUT = 2000;
 export declare const LONGER_TIMEOUT = 5000;

package/cjs/services/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNativeAssetFromWrapped = exports.getWrappedNativeAssetFromUnwrapped = exports.wxplToXpl = exports.xplToWxpl = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.convertHybridArraysToObjects = exports.LONGER_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.isMainnetNetwork = exports.isMaxuint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.addToArrayIf = exports.addToObjectIf = exports.isLayer2Network = void 0;
+exports.getNativeAssetFromWrapped = exports.getWrappedNativeAssetFromUnwrapped = exports.wxplToXpl = exports.xplToWxpl = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.convertHybridArraysToObjects = exports.LONGER_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.isMainnetNetwork = exports.isMaxUint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.addToArrayIf = exports.addToObjectIf = exports.isLayer2Network = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -51,8 +51,8 @@ exports.mapRange = mapRange;
 const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 exports.isEnabledOnBitmap = isEnabledOnBitmap;
 exports.MAXUINT = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-const isMaxuint = (amount) => (0, exports.compareAddresses)(exports.MAXUINT, amount);
-exports.isMaxuint = isMaxuint;
+const isMaxUint = (amount) => (0, exports.compareAddresses)(exports.MAXUINT, amount);
+exports.isMaxUint = isMaxUint;
 const isMainnetNetwork = (network) => network === common_1.NetworkNumber.Eth;
 exports.isMainnetNetwork = isMainnetNetwork;
 exports.DEFAULT_TIMEOUT = 2000; // 2 seconds

package/esm/aaveV4/index.js

@@ -13,7 +13,7 @@ import { getViemProvider } from '../services/viem';
 import { IncentiveKind, } from '../types';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { wethToEth } from '../services/utils';
+import { isMaxUint, wethToEth } from '../services/utils';
 import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
@@ -160,8 +160,8 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         totalDrawn: assetAmountInEth(totalDrawnRaw.toString(), symbol),
         totalPremium: assetAmountInEth(totalPremiumRaw.toString(), symbol),
         totalDebt: assetAmountInEth(totalDebtRaw.toString(), symbol),
-        supplyCap: assetAmountInEth(supplyCapRaw.toString(), symbol),
-        borrowCap: assetAmountInEth(borrowCapRaw.toString(), symbol),
+        supplyCap: isMaxUint(supplyCapRaw.toString()) ? supplyCapRaw.toString() : assetAmountInEth(supplyCapRaw.toString(), symbol),
+        borrowCap: isMaxUint(borrowCapRaw.toString()) ? borrowCapRaw.toString() : assetAmountInEth(borrowCapRaw.toString(), symbol),
         spokeActive: reserveAsset.spokeActive,
         spokeHalted: reserveAsset.spokeHalted,
         drawnRate: drawnRate.toString(),
@@ -207,7 +207,8 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
     return __awaiter(this, arguments, void 0, function* (provider, network, spokeData, address, blockNumber = 'latest') {
         const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
         const loanData = yield viewContract.read.getLoanData([spokeData.address, address]);
-        const healthFactor = new Dec(loanData.healthFactor).div(1e18).toString();
+        const healthFactorFromContract = new Dec(loanData.healthFactor.toString());
+        const healthFactor = isMaxUint(healthFactorFromContract.toString()) ? '0' : healthFactorFromContract.div(1e18).toString();
         const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
             const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
             const reserveData = spokeData.assetsData[identifier];

package/esm/eulerV2/index.d.ts

@@ -1,6 +1,5 @@
 import { Client } from 'viem';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { EulerV2AssetsData, EulerV2FullMarketData, EulerV2Market, EulerV2MarketInfoData, EulerV2PositionData } from '../types';
+import { EulerV2AssetsData, EulerV2FullMarketData, EulerV2Market, EulerV2MarketInfoData, EulerV2PositionData, EthAddress, EthereumProvider, NetworkNumber } from '../types';
 export declare const EMPTY_USED_ASSET: {
     isSupplied: boolean;
     isBorrowed: boolean;

package/esm/eulerV2/index.js

@@ -9,10 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import { IncentiveKind, } from '../types/common';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { compareAddresses, getEthAmountForDecimals, isMaxuint, wethToEth, wethToEthByAddress, } from '../services/utils';
-import { EulerV2VaultType, } from '../types';
+import { compareAddresses, getEthAmountForDecimals, isMaxUint, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { EulerV2VaultType, IncentiveKind, } from '../types';
 import { getEulerV2AggregatedData, getEulerV2BorrowRate, getEulerV2SupplyRate, getUtilizationRate, } from '../helpers/eulerHelpers';
 import { ZERO_ADDRESS } from '../constants';
 import { EulerV2ViewContractViem } from '../contracts';
@@ -59,7 +58,7 @@ export const _getEulerV2MarketsData = (provider, network, selectedMarket) => __a
             collateralFactor: new Dec(collateral.borrowLTV).div(10000).toString(),
             totalBorrow: getEthAmountForDecimals(collateral.totalBorrows.toString(), decimals), // parse
             cash: getEthAmountForDecimals(collateral.cash.toString(), decimals),
-            supplyCap: isMaxuint(collateral.supplyCap.toString()) ? collateral.supplyCap.toString() : getEthAmountForDecimals(collateral.supplyCap.toString(), decimals),
+            supplyCap: isMaxUint(collateral.supplyCap.toString()) ? collateral.supplyCap.toString() : getEthAmountForDecimals(collateral.supplyCap.toString(), decimals),
             borrowCap: '0',
             price: isInUSD ? assetAmountInEth(collateral.assetPriceInUnit.toString()) : new Dec(assetAmountInEth(collateral.assetPriceInUnit.toString())).mul(usdPrice).toString(), // 1e18 -> price in unitOfAccount (so it could be USD or any other token)
             canBeBorrowed: false,
@@ -99,8 +98,8 @@ export const _getEulerV2MarketsData = (provider, network, selectedMarket) => __a
         decimals,
         totalBorrow: getEthAmountForDecimals(data.totalBorrows.toString(), decimals), // parse
         cash: getEthAmountForDecimals(data.cash.toString(), decimals),
-        supplyCap: isMaxuint(data.supplyCap.toString()) ? data.supplyCap.toString() : getEthAmountForDecimals(data.supplyCap.toString(), decimals),
-        borrowCap: isMaxuint(data.supplyCap.toString()) ? data.borrowCap.toString() : getEthAmountForDecimals(data.borrowCap.toString(), decimals),
+        supplyCap: isMaxUint(data.supplyCap.toString()) ? data.supplyCap.toString() : getEthAmountForDecimals(data.supplyCap.toString(), decimals),
+        borrowCap: isMaxUint(data.supplyCap.toString()) ? data.borrowCap.toString() : getEthAmountForDecimals(data.borrowCap.toString(), decimals),
         price: isInUSD ? assetAmountInEth(data.assetPriceInUnit.toString()) : new Dec(assetAmountInEth(data.assetPriceInUnit.toString())).mul(usdPrice).toString(), // 1e18 -> price in unitOfAccount (so it could be USD or any other token)
         sortIndex: 0,
         canBeBorrowed: true,

package/esm/moneymarket/moneymarketCommonService.js

@@ -21,7 +21,7 @@ export const STABLE_ASSETS = [
     'DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'USDA',
     'USDe', 'sUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
     'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
-    'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr',
+    'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'frxUSD',
 ];
 export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

package/esm/services/utils.d.ts

@@ -18,7 +18,7 @@ export declare const bytesToString: (hex: string) => string;
 export declare const mapRange: (input: number | string, minInput: number | string, maxInput: number | string, minOutput: number | string, maxOutput: number | string) => number;
 export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => bigint;
 export declare const MAXUINT: string;
-export declare const isMaxuint: (amount: string) => boolean;
+export declare const isMaxUint: (amount: string) => boolean;
 export declare const isMainnetNetwork: (network: NetworkNumber) => network is NetworkNumber.Eth;
 export declare const DEFAULT_TIMEOUT = 2000;
 export declare const LONGER_TIMEOUT = 5000;

package/esm/services/utils.js

@@ -31,7 +31,7 @@ export const mapRange = (input, minInput, maxInput, minOutput, maxOutput) => {
 // eslint-disable-next-line no-bitwise
 export const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 export const MAXUINT = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-export const isMaxuint = (amount) => compareAddresses(MAXUINT, amount);
+export const isMaxUint = (amount) => compareAddresses(MAXUINT, amount);
 export const isMainnetNetwork = (network) => network === NetworkNumber.Eth;
 export const DEFAULT_TIMEOUT = 2000; // 2 seconds
 export const LONGER_TIMEOUT = 5000; // 5 seconds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.79-aave-v4-2-dev",
+  "version": "2.1.79-aave-v4-4-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV4/index.ts

@@ -20,7 +20,7 @@ import {
 } from '../types';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { wethToEth } from '../services/utils';
+import { isMaxUint, wethToEth } from '../services/utils';
 import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
@@ -189,8 +189,8 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
     totalDrawn: assetAmountInEth(totalDrawnRaw.toString(), symbol),
     totalPremium: assetAmountInEth(totalPremiumRaw.toString(), symbol),
     totalDebt: assetAmountInEth(totalDebtRaw.toString(), symbol),
-    supplyCap: assetAmountInEth(supplyCapRaw.toString(), symbol),
-    borrowCap: assetAmountInEth(borrowCapRaw.toString(), symbol),
+    supplyCap: isMaxUint(supplyCapRaw.toString()) ? supplyCapRaw.toString() : assetAmountInEth(supplyCapRaw.toString(), symbol),
+    borrowCap: isMaxUint(borrowCapRaw.toString()) ? borrowCapRaw.toString() : assetAmountInEth(borrowCapRaw.toString(), symbol),
     spokeActive: reserveAsset.spokeActive,
     spokeHalted: reserveAsset.spokeHalted,
     drawnRate: drawnRate.toString(),
@@ -239,7 +239,8 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
 
   const loanData = await viewContract.read.getLoanData([spokeData.address, address]);
 
-  const healthFactor = new Dec(loanData.healthFactor).div(1e18).toString();
+  const healthFactorFromContract = new Dec(loanData.healthFactor.toString());
+  const healthFactor = isMaxUint(healthFactorFromContract.toString()) ? '0' : healthFactorFromContract.div(1e18).toString();
   const usedAssets = loanData.reserves.reduce((acc: AaveV4UsedReserveAssets, usedReserveAsset) => {
     const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
     const reserveData = spokeData.assetsData[identifier];

package/src/eulerV2/index.ts

@@ -1,12 +1,13 @@
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import { Client } from 'viem';
-import {
-  EthAddress, EthereumProvider, IncentiveKind, NetworkNumber,
-} from '../types/common';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import {
-  compareAddresses, getEthAmountForDecimals, isMaxuint, wethToEth, wethToEthByAddress,
+  compareAddresses,
+  getEthAmountForDecimals,
+  isMaxUint,
+  wethToEth,
+  wethToEthByAddress,
 } from '../services/utils';
 import {
   EulerV2AssetData,
@@ -17,6 +18,10 @@ import {
   EulerV2PositionData,
   EulerV2UsedAssets,
   EulerV2VaultType,
+  EthAddress,
+  EthereumProvider,
+  IncentiveKind,
+  NetworkNumber,
 } from '../types';
 import {
   getEulerV2AggregatedData,
@@ -80,7 +85,7 @@ export const _getEulerV2MarketsData = async (provider: Client, network: NetworkN
       collateralFactor: new Dec(collateral.borrowLTV).div(10_000).toString(),
       totalBorrow: getEthAmountForDecimals(collateral.totalBorrows.toString(), decimals), // parse
       cash: getEthAmountForDecimals(collateral.cash.toString(), decimals),
-      supplyCap: isMaxuint(collateral.supplyCap.toString()) ? collateral.supplyCap.toString() : getEthAmountForDecimals(collateral.supplyCap.toString(), decimals),
+      supplyCap: isMaxUint(collateral.supplyCap.toString()) ? collateral.supplyCap.toString() : getEthAmountForDecimals(collateral.supplyCap.toString(), decimals),
       borrowCap: '0',
       price: isInUSD ? assetAmountInEth(collateral.assetPriceInUnit.toString()) : new Dec(assetAmountInEth(collateral.assetPriceInUnit.toString())).mul(usdPrice).toString(), // 1e18 -> price in unitOfAccount (so it could be USD or any other token)
       canBeBorrowed: false,
@@ -128,8 +133,8 @@ export const _getEulerV2MarketsData = async (provider: Client, network: NetworkN
     decimals,
     totalBorrow: getEthAmountForDecimals(data.totalBorrows.toString(), decimals), // parse
     cash: getEthAmountForDecimals(data.cash.toString(), decimals),
-    supplyCap: isMaxuint(data.supplyCap.toString()) ? data.supplyCap.toString() : getEthAmountForDecimals(data.supplyCap.toString(), decimals),
-    borrowCap: isMaxuint(data.supplyCap.toString()) ? data.borrowCap.toString() : getEthAmountForDecimals(data.borrowCap.toString(), decimals),
+    supplyCap: isMaxUint(data.supplyCap.toString()) ? data.supplyCap.toString() : getEthAmountForDecimals(data.supplyCap.toString(), decimals),
+    borrowCap: isMaxUint(data.supplyCap.toString()) ? data.borrowCap.toString() : getEthAmountForDecimals(data.borrowCap.toString(), decimals),
     price: isInUSD ? assetAmountInEth(data.assetPriceInUnit.toString()) : new Dec(assetAmountInEth(data.assetPriceInUnit.toString())).mul(usdPrice).toString(), // 1e18 -> price in unitOfAccount (so it could be USD or any other token)
     sortIndex: 0,
     canBeBorrowed: true,

package/src/moneymarket/moneymarketCommonService.ts

@@ -24,7 +24,7 @@ export const STABLE_ASSETS = [
   'DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'USDA',
   'USDe', 'sUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
   'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
-  'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr',
+  'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'frxUSD',
 ];
 
 export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {

package/src/services/utils.ts

@@ -49,7 +49,7 @@ export const isEnabledOnBitmap = (bitmap: number, assetId: number) => (BigInt(bi
 
 export const MAXUINT:string = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
 
-export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);
+export const isMaxUint = (amount: string) => compareAddresses(MAXUINT, amount);
 
 export const isMainnetNetwork = (network: NetworkNumber) => network === NetworkNumber.Eth;