@defisaver/positions-sdk 2.1.1 → 2.1.3

package/esm/portfolio/index.js

@@ -9,23 +9,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
-import { AaveMarkets, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
-import { _getMorphoBlueAccountData, _getMorphoBlueMarketData } from '../morphoBlue';
+import { AaveMarkets, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
+import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } from '../morphoBlue';
 import { AaveVersions, CompoundVersions, } from '../types';
 import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
 import { _getSparkAccountData, _getSparkMarketsData } from '../spark';
 import { _getEulerV2AccountData, _getEulerV2MarketsData } from '../eulerV2';
 import { _getCurveUsdGlobalData, _getCurveUsdUserData } from '../curveUsd';
 import { _getLlamaLendGlobalData, _getLlamaLendUserData } from '../llamaLend';
-import { _getAaveV3AccountData, _getAaveV3MarketData } from '../aaveV3';
+import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
 import { ZERO_ADDRESS } from '../constants';
 import { _getMakerCdpData, _getUserCdps } from '../maker';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getCompoundV2AccountData, _getCompoundV2MarketsData } from '../compoundV2';
 import { getViemProvider } from '../services/viem';
-import { _getLiquityTroveInfo } from '../liquity';
-import { _getUserPositionsPortfolio } from '../fluid';
+import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
+import { _getLiquityV2MarketData, getLiquitySAndYBold, getLiquityV2Staking } from '../liquityV2';
+import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getEulerV2SubAccounts } from '../helpers/eulerHelpers';
+import { getUmbrellaData } from '../umbrella';
+import { getMeritUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
+import { getCompoundV3Rewards } from '../claiming/compV3';
+import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
+import { fetchMorphoBlueRewards } from '../claiming/morphoBlue';
+import { getKingRewards } from '../claiming/king';
 export function getPortfolioData(provider, network, defaultProvider, addresses, summerFiAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const isMainnet = network === NetworkNumber.Eth;
@@ -39,6 +46,8 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
         const compoundV2Markets = [CompoundVersions.CompoundV2].map((version) => CompoundMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
         const crvUsdMarkets = Object.values(CrvUsdMarkets(network)).filter((market) => market.chainIds.includes(network));
         const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
+        const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
+        const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
         const client = getViemProvider(provider, network, {
             batch: {
                 multicall: {
@@ -63,7 +72,22 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
         const compoundV2MarketsData = {};
         const crvUsdMarketsData = {};
         const llamaLendMarketsData = {};
+        const liquityV2MarketsData = {};
+        const markets = {
+            morphoMarketsData,
+            compoundV3MarketsData,
+            sparkMarketsData,
+            eulerV2MarketsData,
+            aaveV3MarketsData,
+            aaveV2MarketsData,
+            compoundV2MarketsData,
+            crvUsdMarketsData,
+            llamaLendMarketsData,
+            liquityV2MarketsData,
+        };
         const positions = {};
+        const stakingPositions = {};
+        const rewardsData = {};
         const allAddresses = [...addresses, ...summerFiAddresses];
         for (const address of allAddresses) {
             positions[address.toLowerCase()] = {
@@ -84,7 +108,34 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                 },
             };
         }
+        // TODO: check default values, probably needed when fetching portfolio on unsupported networks
+        for (const address of addresses) {
+            stakingPositions[address.toLowerCase()] = {
+                aaveV3: {},
+                morphoBlue: {},
+                compoundV3: {},
+                spark: {},
+                aaveV2: {},
+                compoundV2: {},
+                liquity: {},
+                liquityV2: {},
+                fluid: {
+                    error: '',
+                    data: {},
+                },
+            };
+            rewardsData[address.toLowerCase()] = {
+                aaveV3merit: {},
+                aaveV3: {},
+                compV3: {},
+                spark: {},
+                spk: {},
+                king: {},
+                morpho: {},
+            };
+        }
         yield Promise.allSettled([
+            // === MARKET DATA (needs to be fetched first) ===
             ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield _getMorphoBlueMarketData(client, network, market);
                 morphoMarketsData[market.value] = marketData;
@@ -105,12 +156,6 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                 const marketData = yield _getAaveV3MarketData(client, network, market);
                 aaveV3MarketsData[market.value] = marketData;
             })),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                if (!isMainnet)
-                    return; // Maker CDPs are only available on mainnet
-                const makerCdp = yield _getUserCdps(client, network, address);
-                makerCdps[address.toLowerCase()] = makerCdp;
-            })),
             ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield _getAaveV2MarketsData(client, network, market);
                 aaveV2MarketsData[market.value] = marketData;
@@ -127,6 +172,17 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                 const marketData = yield _getLlamaLendGlobalData(client, network, market);
                 llamaLendMarketsData[market.value] = marketData;
             })),
+            ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield _getLiquityV2MarketData(client, network, market);
+                liquityV2MarketsData[market.value] = marketData;
+            })),
+            // === INDEPENDENT USER DATA (doesn't depend on market data) ===
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                if (!isMainnet)
+                    return; // Maker CDPs are only available on mainnet
+                const makerCdp = yield _getUserCdps(client, network, address);
+                makerCdps[address.toLowerCase()] = makerCdp;
+            })),
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isFluidSupported)
@@ -146,6 +202,190 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                     };
                 }
             })),
+            // === STAKING DATA (independent of market data) ===
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isFluidSupported)
+                        return;
+                    stakingPositions[address.toLowerCase()].fluid = yield _getAllUserEarnPositionsWithFTokens(client, network, address);
+                }
+                catch (error) {
+                    console.error(`Error fetching Fluid lend data for address ${address}:`, error);
+                    stakingPositions[address.toLowerCase()].fluid = { error: `Error fetching Fluid lend data for address ${address}`, data: null };
+                }
+            })),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet)
+                        return;
+                    stakingPositions[address.toLowerCase()].liquity = yield getLiquityStakingData(client, network, address);
+                }
+                catch (error) {
+                    console.error(`Error fetching Liquity staking data for address ${address}:`, error);
+                    stakingPositions[address.toLowerCase()].liquity = { error: `Error fetching Liquity staking data for address ${address}`, data: null };
+                }
+            })),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet)
+                        return;
+                    stakingPositions[address.toLowerCase()].aaveV3 = yield getStakeAaveData(client, network, address);
+                }
+                catch (error) {
+                    console.error(`Error fetching Aave V3 staking data for address ${address}:`, error);
+                    stakingPositions[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 staking data for address ${address}`, data: null };
+                }
+            })),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet)
+                        return;
+                    stakingPositions[address.toLowerCase()].umbrella = yield getUmbrellaData(client, network, address);
+                }
+                catch (error) {
+                    console.error(`Error fetching Umbrella staking data for address ${address}:`, error);
+                    stakingPositions[address.toLowerCase()].umbrella = { error: `Error fetching Umbrella staking data for address ${address}`, data: null };
+                }
+            })),
+            // Liquity V2 staking
+            ...liquityV2MarketsStaking.map(market => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: null };
+                        return;
+                    }
+                    const liquityV2StakingData = yield getLiquityV2Staking(client, network, market.value, address);
+                    stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: liquityV2StakingData };
+                }
+                catch (error) {
+                    console.error(`Error fetching Liquity V2 staking data for address ${address}, market ${market.value}:`, error);
+                    stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: `Error fetching Liquity V2 staking data for address ${address}`, data: null };
+                }
+            }))).flat(),
+            // === REWARDS DATA (independent of market data) ===
+            // Batch King rewards
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        for (const address of addresses) {
+                            rewardsData[address.toLowerCase()].king = { error: '', data: [] };
+                        }
+                        return;
+                    }
+                    const kingRewards = yield getKingRewards(client, network, addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].king = {
+                            error: '',
+                            data: kingRewards[lowerAddress] || [],
+                        };
+                    }
+                }
+                catch (error) {
+                    console.error('Error fetching King rewards data in batch:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].king = {
+                            error: 'Error fetching King rewards data in batch',
+                            data: null,
+                        };
+                    }
+                }
+            }))(),
+            ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: [] };
+                        return;
+                    }
+                    const sparkData = yield fetchSparkRewards(client, network, address, market.providerAddress);
+                    rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: sparkData };
+                }
+                catch (error) {
+                    console.error(`Error fetching Spark rewards data for address ${address}, market ${market.value}:`, error);
+                    rewardsData[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark rewards data for address ${address}`, data: null };
+                }
+            }))).flat(),
+            // CompV3 rewards
+            ...compoundV3Markets.map(market => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const compV3Rewards = yield getCompoundV3Rewards(client, network, address, market.baseMarketAddress);
+                    rewardsData[address.toLowerCase()].compV3[market.value] = { error: '', data: compV3Rewards };
+                }
+                catch (error) {
+                    console.error(`Error fetching Compound V3 rewards data for address ${address}:`, error);
+                    rewardsData[address.toLowerCase()].compV3[market.value] = { error: `Error fetching Compound V3 rewards data for address ${address}`, data: null };
+                }
+            }))).flat(),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const aaveMeritData = yield getMeritUnclaimedRewards(address, network);
+                    rewardsData[address.toLowerCase()].aaveV3merit = { error: '', data: aaveMeritData };
+                }
+                catch (error) {
+                    console.error(`Error fetching Aave V3 Merit rewards data for address ${address}:`, error);
+                    rewardsData[address.toLowerCase()].aaveV3merit = { error: `Error fetching Aave V3 Merit rewards data for address ${address}`, data: null };
+                }
+            })),
+            ...aaveV3Markets.map(market => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const aaveData = yield getUnclaimedRewardsForAllMarkets(client, network, address, market.providerAddress);
+                    rewardsData[address.toLowerCase()].aaveV3[market.value] = { error: '', data: aaveData };
+                }
+                catch (error) {
+                    console.error(`Error fetching Aave V3 Merit rewards data for address ${address}:`, error);
+                    rewardsData[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 rewards data for address ${address}`, data: null };
+                }
+            }))).flat(),
+            // Batch Morpho Blue rewards
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const morphoRewards = yield fetchMorphoBlueRewards(client, network, addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].morpho = {
+                            error: '',
+                            data: morphoRewards[lowerAddress] || [],
+                        };
+                    }
+                }
+                catch (error) {
+                    console.error('Error fetching Morpho Blue rewards data in batch:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].morpho = {
+                            error: 'Error fetching Morpho Blue rewards data in batch',
+                            data: null,
+                        };
+                    }
+                }
+            }))(),
+            // Batch Spark Airdrop rewards
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        for (const address of addresses) {
+                            rewardsData[address.toLowerCase()].spk = { error: '', data: [] };
+                        }
+                        return;
+                    }
+                    const sparkAirdropRewards = yield fetchSparkAirdropRewards(client, network, addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].spk = {
+                            error: '',
+                            data: sparkAirdropRewards[lowerAddress] || [],
+                        };
+                    }
+                }
+                catch (error) {
+                    console.error('Error fetching Spark Airdrop rewards data in batch:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].spk = {
+                            error: 'Error fetching Spark Airdrop rewards data in batch',
+                            data: null,
+                        };
+                    }
+                }
+            }))(),
         ]);
         yield Promise.all([
             ...aaveV3Markets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
@@ -161,9 +401,32 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
             }))).flat(),
             ...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getMorphoBlueAccountData(client, network, address, market, morphoMarketsData[market.value]);
-                    if (new Dec(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
+                    const [accDataPromise, earnDataPromise] = yield Promise.allSettled([
+                        _getMorphoBlueAccountData(client, network, address, market, morphoMarketsData[market.value]),
+                        getMorphoEarn(client, network, address, market, morphoMarketsData[market.value]),
+                    ]);
+                    if (accDataPromise.status === 'rejected') {
+                        console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, accDataPromise.reason);
+                        positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
+                    }
+                    if (earnDataPromise.status === 'rejected') {
+                        console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, earnDataPromise.reason);
+                        positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
+                    }
+                    if (accDataPromise.status !== 'rejected') {
+                        const accData = accDataPromise.value;
+                        if (new Dec(accData.suppliedUsd).gt(0))
+                            positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
+                    }
+                    if (earnDataPromise.status !== 'rejected') {
+                        const earnData = earnDataPromise.value;
+                        if (earnData && new Dec(earnData.amount).gt(0)) {
+                            stakingPositions[address.toLowerCase()].morphoBlue[market.value] = {
+                                error: '',
+                                data: earnData,
+                            };
+                        }
+                    }
                 }
                 catch (error) {
                     console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, error);
@@ -288,7 +551,27 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                     positions[address.toLowerCase()].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
+            // liquity sBold/yBold and staking options
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data: null };
+                        return;
+                    }
+                    const data = yield getLiquitySAndYBold(client, network, stakingPositions[address.toLowerCase()].liquityV2, address);
+                    stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data };
+                }
+                catch (error) {
+                    console.error(`Error fetching SBold/YBold data for address ${address}:`, error);
+                    stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: `Error fetching sBold/yBold data for address ${address}`, data: null };
+                }
+            })),
         ]);
-        return positions;
+        return {
+            positions,
+            stakingPositions,
+            rewardsData,
+            markets,
+        };
     });
 }

package/esm/services/utils.d.ts

@@ -25,3 +25,8 @@ export declare const MAXUINT: string;
 export declare const isMaxuint: (amount: string) => boolean;
 export declare const isMainnetNetwork: (network: NetworkNumber) => network is NetworkNumber.Eth;
 export declare const DEFAULT_TIMEOUT = 2000;
+/**
+ * Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
+ * @param value
+ */
+export declare const convertHybridArraysToObjects: (value: any) => any;

package/esm/services/utils.js

@@ -38,3 +38,34 @@ export const MAXUINT = '11579208923731619542357098500868790785326998466564056403
 export const isMaxuint = (amount) => compareAddresses(MAXUINT, amount);
 export const isMainnetNetwork = (network) => network === NetworkNumber.Eth;
 export const DEFAULT_TIMEOUT = 2000; // 2 seconds
+/**
+ * Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
+ * @param value
+ */
+export const convertHybridArraysToObjects = (value) => {
+    if (Array.isArray(value)) {
+        const keys = Object.keys(value);
+        const hasNamedKeys = keys.some((key) => Number.isNaN(Number(key)));
+        // If array has named keys, treat it as an object and keep only those
+        if (hasNamedKeys) {
+            const result = {};
+            for (const [key, val] of Object.entries(value)) {
+                if (Number.isNaN(Number(key))) {
+                    result[key] = convertHybridArraysToObjects(val);
+                }
+            }
+            return result;
+        }
+        // Else, treat as a regular array
+        return value.map(convertHybridArraysToObjects);
+    }
+    // If it's an object (but not an array), recurse into its values
+    if (value && typeof value === 'object') {
+        const result = {};
+        for (const [key, val] of Object.entries(value)) {
+            result[key] = convertHybridArraysToObjects(val);
+        }
+        return result;
+    }
+    return value;
+};

package/esm/services/viem.d.ts

@@ -795,9 +795,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
+            nonce: number;
             type: "legacy";
             gas: bigint;
-            nonce: number;
             maxFeePerBlobGas?: undefined | undefined;
             gasPrice: bigint;
             maxFeePerGas?: undefined | undefined;
@@ -820,9 +820,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
+            nonce: number;
             type: "eip2930";
             gas: bigint;
-            nonce: number;
             maxFeePerBlobGas?: undefined | undefined;
             gasPrice: bigint;
             maxFeePerGas?: undefined | undefined;
@@ -845,9 +845,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
+            nonce: number;
             type: "eip1559";
             gas: bigint;
-            nonce: number;
             maxFeePerBlobGas?: undefined | undefined;
             gasPrice?: undefined | undefined;
             maxFeePerGas: bigint;
@@ -870,9 +870,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
+            nonce: number;
             type: "eip4844";
             gas: bigint;
-            nonce: number;
             maxFeePerBlobGas: bigint;
             gasPrice?: undefined | undefined;
             maxFeePerGas: bigint;
@@ -895,9 +895,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
+            nonce: number;
             type: "eip7702";
             gas: bigint;
-            nonce: number;
             maxFeePerBlobGas?: undefined | undefined;
             gasPrice?: undefined | undefined;
             maxFeePerGas: bigint;
@@ -945,9 +945,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
+        nonce: number;
         type: "legacy";
         gas: bigint;
-        nonce: number;
         maxFeePerBlobGas?: undefined | undefined;
         gasPrice: bigint;
         maxFeePerGas?: undefined | undefined;
@@ -970,9 +970,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
+        nonce: number;
         type: "eip2930";
         gas: bigint;
-        nonce: number;
         maxFeePerBlobGas?: undefined | undefined;
         gasPrice: bigint;
         maxFeePerGas?: undefined | undefined;
@@ -995,9 +995,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
+        nonce: number;
         type: "eip1559";
         gas: bigint;
-        nonce: number;
         maxFeePerBlobGas?: undefined | undefined;
         gasPrice?: undefined | undefined;
         maxFeePerGas: bigint;
@@ -1020,9 +1020,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
+        nonce: number;
         type: "eip4844";
         gas: bigint;
-        nonce: number;
         maxFeePerBlobGas: bigint;
         gasPrice?: undefined | undefined;
         maxFeePerGas: bigint;
@@ -1045,9 +1045,9 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
+        nonce: number;
         type: "eip7702";
         gas: bigint;
-        nonce: number;
         maxFeePerBlobGas?: undefined | undefined;
         gasPrice?: undefined | undefined;
         maxFeePerGas: bigint;
@@ -4320,7 +4320,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         authorizationList: import("viem").TransactionSerializableEIP7702["authorizationList"];
     } ? "eip7702" : never) | (request["type"] extends string | undefined ? Extract<request["type"], string> : never)>) ? T_25 extends "eip7702" ? import("viem").TransactionRequestEIP7702 : never : never : never)>> & {
         chainId?: number | undefined;
-    }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees" | "chainId") extends infer T_26 ? T_26 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees" | "chainId") ? T_26 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_26 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: (import("viem").UnionRequiredBy<Extract<import("viem").UnionOmit<import("viem").ExtractChainFormatterParameters<import("viem").DeriveChain<undefined, chainOverride>, "transactionRequest", import("viem").TransactionRequest>, "from"> & (import("viem").DeriveChain<undefined, chainOverride> extends infer T_1 ? T_1 extends import("viem").DeriveChain<undefined, chainOverride> ? T_1 extends import("viem").Chain ? {
+    }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "nonce" | "type" | "gas" | "blobVersionedHashes" | "fees" | "chainId") extends infer T_26 ? T_26 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "nonce" | "type" | "gas" | "blobVersionedHashes" | "fees" | "chainId") ? T_26 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_26 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: (import("viem").UnionRequiredBy<Extract<import("viem").UnionOmit<import("viem").ExtractChainFormatterParameters<import("viem").DeriveChain<undefined, chainOverride>, "transactionRequest", import("viem").TransactionRequest>, "from"> & (import("viem").DeriveChain<undefined, chainOverride> extends infer T_1 ? T_1 extends import("viem").DeriveChain<undefined, chainOverride> ? T_1 extends import("viem").Chain ? {
         chain: T_1;
     } : {
         chain?: undefined;
@@ -7572,7 +7572,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         authorizationList: import("viem").TransactionSerializableEIP7702["authorizationList"];
     } ? "eip7702" : never) | (request["type"] extends string | undefined ? Extract<request["type"], string> : never)>) ? T_12 extends "eip7702" ? import("viem").TransactionRequestEIP7702 : never : never : never)>> & {
         chainId?: number | undefined;
-    }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">))[K]; } : never>;
+    }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "nonce" | "type" | "gas" | "blobVersionedHashes" | "fees" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "nonce" | "type" | "gas" | "blobVersionedHashes" | "fees" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">))[K]; } : never>;
     readContract: <const abi extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "pure" | "view">, const args extends import("viem").ContractFunctionArgs<abi, "pure" | "view", functionName>>(args: import("viem").ReadContractParameters<abi, functionName, args>) => Promise<import("viem").ReadContractReturnType<abi, functionName, args>>;
     sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<import("viem").SendRawTransactionReturnType>;
     simulate: <const calls extends readonly unknown[]>(args: import("viem").SimulateBlocksParameters<calls>) => Promise<import("viem").SimulateBlocksReturnType<calls>>;

package/esm/spark/index.js

@@ -235,6 +235,7 @@ export const _getSparkAccountBalances = (provider, network, block, addressMappin
     const marketAddress = market.providerAddress;
     // @ts-ignore
     const protocolDataProviderContract = createViemContractFromConfigFunc(market.protocolData, market.protocolDataAddress)(provider, network);
+    // @ts-ignore
     const reserveTokens = yield protocolDataProviderContract.read.getAllReservesTokens(setViemBlockNumber(block));
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);

package/esm/staking/eligibility.d.ts

@@ -1,5 +1,7 @@
 import { IncentiveEligibilityId, MMUsedAssets } from '../types/common';
-export declare const isEligibleForEthenaUSDeRewards: (usedAssets: MMUsedAssets) => {
+export declare const isEligibleForEthenaUSDeRewards: (usedAssets: MMUsedAssets, { healthRatio }: {
+    healthRatio: string;
+}) => {
     isEligible: boolean;
     eligibleUSDAmount: string;
 };
@@ -12,7 +14,7 @@ export declare const isEligibleForAaveV3ArbitrumETHLSBorrow: (usedAssets: MMUsed
     eligibleUSDAmount: string;
 };
 export declare const EligibilityMapping: {
-    [key in IncentiveEligibilityId]: (usedAssets: MMUsedAssets) => {
+    [key in IncentiveEligibilityId]: (usedAssets: MMUsedAssets, optionalData: any) => {
         isEligible: boolean;
         eligibleUSDAmount: string;
     };

package/esm/staking/eligibility.js

@@ -1,6 +1,6 @@
 import Dec from 'decimal.js';
 import { IncentiveEligibilityId } from '../types/common';
-export const isEligibleForEthenaUSDeRewards = (usedAssets) => {
+export const isEligibleForEthenaUSDeRewards = (usedAssets, { healthRatio }) => {
     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';
@@ -24,9 +24,8 @@ export const isEligibleForEthenaUSDeRewards = (usedAssets) => {
         }
         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
+    if (new Dec(healthRatio).gte(2.5))
+        return { isEligible: false, eligibleUSDAmount: '0' }; // health ratio must be below 2.5
     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 };

package/esm/staking/staking.d.ts

@@ -3,9 +3,10 @@ import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: ((asset: string) => Promise<string>) & memoize.Memoized<(asset: string) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
-export declare const calculateNetApy: ({ usedAssets, assetsData, }: {
+export declare const calculateNetApy: ({ usedAssets, assetsData, optionalData, }: {
     usedAssets: MMUsedAssets;
     assetsData: MMAssetsData;
+    optionalData?: any;
 }) => {
     netApy: string;
     totalInterestUsd: string;

package/esm/staking/staking.js

@@ -129,7 +129,7 @@ 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, }) => {
+export const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
         var _a;
         const acc = Object.assign({}, _acc);
@@ -144,7 +144,7 @@ export const calculateNetApy = ({ usedAssets, assetsData, }) => {
                 const { apy, eligibilityId } = supplyIncentive;
                 const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
                 if (eligibilityCheck) {
-                    const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets);
+                    const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
                     const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
                     acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
                 }
@@ -164,7 +164,7 @@ export const calculateNetApy = ({ usedAssets, assetsData, }) => {
                 const { apy, eligibilityId } = borrowIncentive;
                 const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
                 if (eligibilityCheck) {
-                    const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets);
+                    const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
                     const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
                     acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
                 }