@defisaver/positions-sdk 2.0.13 → 2.0.14-dev-portfolio

package/cjs/portfolio/index.js

@@ -32,6 +32,12 @@ const viem_1 = require("../services/viem");
 const liquity_1 = require("../liquity");
 const fluid_1 = require("../fluid");
 const eulerHelpers_1 = require("../helpers/eulerHelpers");
+const umbrella_1 = require("../umbrella");
+const aaveV3_2 = require("../claiming/aaveV3");
+const compV3_1 = require("../claiming/compV3");
+const spark_2 = require("../claiming/spark");
+const morphoBlue_2 = require("../claiming/morphoBlue");
+const king_1 = require("../claiming/king");
 function getPortfolioData(provider, network, defaultProvider, addresses, summerFiAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const isMainnet = network === common_1.NetworkNumber.Eth;
@@ -69,7 +75,20 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
         const compoundV2MarketsData = {};
         const crvUsdMarketsData = {};
         const llamaLendMarketsData = {};
+        const markets = {
+            morphoMarketsData,
+            compoundV3MarketsData,
+            sparkMarketsData,
+            eulerV2MarketsData,
+            aaveV3MarketsData,
+            aaveV2MarketsData,
+            compoundV2MarketsData,
+            crvUsdMarketsData,
+            llamaLendMarketsData,
+        };
         const positions = {};
+        const stakingPositions = {};
+        const rewardsData = {};
         const allAddresses = [...addresses, ...summerFiAddresses];
         for (const address of allAddresses) {
             positions[address.toLowerCase()] = {
@@ -90,7 +109,33 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
                 },
             };
         }
+        // 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: {},
+                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 (0, morphoBlue_1._getMorphoBlueMarketData)(client, network, market);
                 morphoMarketsData[market.value] = marketData;
@@ -111,12 +156,6 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
                 const marketData = yield (0, aaveV3_1._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 (0, maker_1._getUserCdps)(client, network, address);
-                makerCdps[address.toLowerCase()] = makerCdp;
-            })),
             ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield (0, aaveV2_1._getAaveV2MarketsData)(client, network, market);
                 aaveV2MarketsData[market.value] = marketData;
@@ -133,6 +172,13 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
                 const marketData = yield (0, llamaLend_1._getLlamaLendGlobalData)(client, network, market);
                 llamaLendMarketsData[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 (0, maker_1._getUserCdps)(client, network, address);
+                makerCdps[address.toLowerCase()] = makerCdp;
+            })),
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isFluidSupported)
@@ -152,6 +198,178 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
                     };
                 }
             })),
+            // === STAKING DATA (independent of market data) ===
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isFluidSupported)
+                        return;
+                    const fluidLendData = yield (0, fluid_1._getAllUserEarnPositionsWithFTokens)(client, network, address);
+                    stakingPositions[address.toLowerCase()].fluid = fluidLendData;
+                }
+                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;
+                    const liquityStakingData = yield (0, liquity_1.getLiquityStakingData)(client, network, address);
+                    stakingPositions[address.toLowerCase()].liquity = liquityStakingData;
+                }
+                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 (0, aaveV3_1.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;
+                    const umbrellaStakingData = yield (0, umbrella_1.getUmbrellaData)(client, network, address);
+                    stakingPositions[address.toLowerCase()].umbrella = umbrellaStakingData;
+                }
+                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 };
+                }
+            })),
+            // === 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 (0, king_1.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 (0, spark_2.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 (0, compV3_1.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 (0, aaveV3_2.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 (0, aaveV3_2.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 (0, morphoBlue_2.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()].king = { error: '', data: [] };
+                        }
+                        return;
+                    }
+                    const sparkAirdropRewards = yield (0, spark_2.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* () {
@@ -167,9 +385,32 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
             }))).flat(),
             ...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, morphoMarketsData[market.value]);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
+                    const [accDataPromise, earnDataPromise] = yield Promise.allSettled([
+                        (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, morphoMarketsData[market.value]),
+                        (0, morphoBlue_1.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 decimal_js_1.default(accData.suppliedUsd).gt(0))
+                            positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
+                    }
+                    if (earnDataPromise.status !== 'rejected') {
+                        const earnData = earnDataPromise.value;
+                        if (earnData && new decimal_js_1.default(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);
@@ -295,6 +536,11 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
                 }
             }))).flat(),
         ]);
-        return positions;
+        return {
+            positions,
+            stakingPositions,
+            rewardsData,
+            markets,
+        };
     });
 }

package/cjs/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/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.DEFAULT_TIMEOUT = exports.isMainnetNetwork = exports.isMaxuint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToArrayIf = exports.addToObjectIf = exports.isLayer2Network = void 0;
+exports.convertHybridArraysToObjects = exports.DEFAULT_TIMEOUT = exports.isMainnetNetwork = exports.isMaxuint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = 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");
@@ -64,3 +64,35 @@ exports.isMaxuint = isMaxuint;
 const isMainnetNetwork = (network) => network === common_1.NetworkNumber.Eth;
 exports.isMainnetNetwork = isMainnetNetwork;
 exports.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
+ */
+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] = (0, exports.convertHybridArraysToObjects)(val);
+                }
+            }
+            return result;
+        }
+        // Else, treat as a regular array
+        return value.map(exports.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] = (0, exports.convertHybridArraysToObjects)(val);
+        }
+        return result;
+    }
+    return value;
+};
+exports.convertHybridArraysToObjects = convertHybridArraysToObjects;

package/cjs/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/cjs/spark/index.js

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

package/cjs/staking/staking.js

@@ -65,7 +65,7 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
         return '0';
     }
 });
-exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov'];
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov'];
 exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -112,6 +112,8 @@ exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, voi
             return yield getApyFromDfsApi('USDe');
         if (asset === 'PT sUSDe Nov')
             return yield getApyFromDfsApi('PT sUSDe Nov');
+        if (asset === 'PT USDe Nov')
+            return yield getApyFromDfsApi('PT USDe Nov');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/cjs/types/claiming.d.ts

@@ -0,0 +1,93 @@
+import { EthAddress } from './common';
+export declare enum ClaimType {
+    /** Rewards from AAVE - various tokens & aTokens (supplied to protocol) */
+    AAVE_REWARDS = "AAVE_REWARDS",
+    /** Merit rewards from AAVE (various tokens) */
+    AAVE_MERIT_REWARDS = "AAVE_MERIT_REWARDS",
+    /** Rewards from Compound V3 (only in COMP) */
+    COMPOUND_V3_COMP = "COMPOUND_V3_COMP",
+    /** Rewards from Spark (wstETH only for now) */
+    SPARK_REWARDS = "SPARK_REWARDS",
+    /** Rewards from Morpho */
+    MORPHO = "MORPHO",
+    /** Rewards from King (prev LTR^2 - received for weETH holding) */
+    KING_REWARDS = "KING_REWARDS",
+    /** Spark Airdrop */
+    SPARK_AIRDROP = "SPARK_AIRDROP",
+    /** Spark Airdrop */
+    SPARK_WST_ETH_REWARDS = "SPARK_WST_ETH_REWARDS"
+}
+type _ClaimableTokenPartial = {
+    symbol: string;
+    underlyingSymbol: string;
+    tokenAddress: EthAddress;
+    amount: string;
+    walletAddress: EthAddress;
+    label: string;
+};
+export type AaveRewardsClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.AAVE_REWARDS;
+    additionalClaimFields: {
+        marketAddress: EthAddress;
+        aTokenAddresses: string[];
+        isAaveToken: boolean;
+    };
+};
+export type AaveMeritRewardsClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.AAVE_MERIT_REWARDS;
+    additionalClaimFields: {
+        accumulated: string;
+        proof: string[];
+        decimals: string;
+        unclaimed: string;
+    };
+};
+export type SparkRewardsClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.SPARK_REWARDS;
+    additionalClaimFields: {
+        sparkAssetAddresses: string[];
+    };
+};
+export type KingRewardsClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.KING_REWARDS;
+    additionalClaimFields: {
+        allRewardsAmount: string;
+        merkleRoot: string;
+        merkleProofs: string[];
+    };
+};
+export type MorphoClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.MORPHO;
+    additionalClaimFields: {
+        originalAmount: string;
+        merkleProofs: string[];
+        distributor: EthAddress;
+        isLegacy: boolean;
+        txData: string;
+    };
+};
+export type CompoundV3CompClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.COMPOUND_V3_COMP;
+    additionalClaimFields: {
+        marketAddress: EthAddress;
+    };
+};
+export declare enum SparkAirdropType {
+    SPARK_IGNITION = "spark-ignition",
+    PRE_FARMING_AND_SOCIAL = "pre-farming-and-social"
+}
+export type SparkAirdropClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.SPARK_AIRDROP;
+    additionalClaimFields: {
+        merkleRoot: string;
+        merkleProofs: string[];
+        epoch: number;
+        rewardType: SparkAirdropType;
+        allRewardsAmount: string;
+    };
+};
+export type SparkWstEthRewardsClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.SPARK_WST_ETH_REWARDS;
+};
+export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | MorphoClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken;
+export {};

package/cjs/types/claiming.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SparkAirdropType = exports.ClaimType = void 0;
+var ClaimType;
+(function (ClaimType) {
+    /** Rewards from AAVE - various tokens & aTokens (supplied to protocol) */
+    ClaimType["AAVE_REWARDS"] = "AAVE_REWARDS";
+    /** Merit rewards from AAVE (various tokens) */
+    ClaimType["AAVE_MERIT_REWARDS"] = "AAVE_MERIT_REWARDS";
+    /** Rewards from Compound V3 (only in COMP) */
+    ClaimType["COMPOUND_V3_COMP"] = "COMPOUND_V3_COMP";
+    /** Rewards from Spark (wstETH only for now) */
+    ClaimType["SPARK_REWARDS"] = "SPARK_REWARDS";
+    /** Rewards from Morpho */
+    ClaimType["MORPHO"] = "MORPHO";
+    /** Rewards from King (prev LTR^2 - received for weETH holding) */
+    ClaimType["KING_REWARDS"] = "KING_REWARDS";
+    /** Spark Airdrop */
+    ClaimType["SPARK_AIRDROP"] = "SPARK_AIRDROP";
+    /** Spark Airdrop */
+    ClaimType["SPARK_WST_ETH_REWARDS"] = "SPARK_WST_ETH_REWARDS";
+})(ClaimType || (exports.ClaimType = ClaimType = {}));
+var SparkAirdropType;
+(function (SparkAirdropType) {
+    SparkAirdropType["SPARK_IGNITION"] = "spark-ignition";
+    SparkAirdropType["PRE_FARMING_AND_SOCIAL"] = "pre-farming-and-social";
+})(SparkAirdropType || (exports.SparkAirdropType = SparkAirdropType = {}));