@defisaver/positions-sdk 2.1.7 → 2.1.9

package/cjs/services/utils.js

@@ -3,20 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.getNativeAssetFromWrapped = exports.getWrappedNativeAssetFromUnwrapped = exports.wxplToXpl = exports.xplToWxpl = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.convertHybridArraysToObjects = 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");
-const isLayer2Network = (networkId) => [common_1.NetworkNumber.Opt, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Linea].includes(+networkId);
+const isLayer2Network = (networkId) => [common_1.NetworkNumber.Opt, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Linea, common_1.NetworkNumber.Plasma].includes(+networkId);
 exports.isLayer2Network = isLayer2Network;
 const addToObjectIf = (condition, item) => (condition ? item : {});
 exports.addToObjectIf = addToObjectIf;
 const addToArrayIf = (condition, ...items) => (condition ? items : []);
 exports.addToArrayIf = addToArrayIf;
-const ethToWeth = (maybeEth) => maybeEth === null || maybeEth === void 0 ? void 0 : maybeEth.replace(/^ETH$/, 'WETH');
-exports.ethToWeth = ethToWeth;
-const wethToEth = (maybeWeth) => maybeWeth === null || maybeWeth === void 0 ? void 0 : maybeWeth.replace(/^WETH$/, 'ETH');
-exports.wethToEth = wethToEth;
 const stEthToWstEth = (maybeStEth) => maybeStEth === null || maybeStEth === void 0 ? void 0 : maybeStEth.replace(/^stETH$/, 'wstETH');
 exports.stEthToWstEth = stEthToWstEth;
 const wstEthToStEth = (maybeStEth) => maybeStEth === null || maybeStEth === void 0 ? void 0 : maybeStEth.replace(/^wstETH$/, 'stETH');
@@ -34,10 +30,6 @@ const getEthAmountForDecimals = (amount, decimals) => new decimal_js_1.default(a
 exports.getEthAmountForDecimals = getEthAmountForDecimals;
 const handleWbtcLegacy = (asset) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);
 exports.handleWbtcLegacy = handleWbtcLegacy;
-const wethToEthByAddress = (maybeWethAddr, chainId = common_1.NetworkNumber.Eth) => (0, tokens_1.getAssetInfo)((0, exports.wethToEth)((0, tokens_1.getAssetInfoByAddress)(maybeWethAddr, chainId).symbol), chainId).address;
-exports.wethToEthByAddress = wethToEthByAddress;
-const ethToWethByAddress = (maybeEthAddr, chainId = common_1.NetworkNumber.Eth) => (0, tokens_1.getAssetInfo)((0, exports.ethToWeth)((0, tokens_1.getAssetInfoByAddress)(maybeEthAddr, chainId).symbol), chainId).address;
-exports.ethToWethByAddress = ethToWethByAddress;
 const bytesToString = (hex) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
     .toString()
     // eslint-disable-next-line no-control-regex
@@ -96,3 +88,31 @@ const convertHybridArraysToObjects = (value) => {
     return value;
 };
 exports.convertHybridArraysToObjects = convertHybridArraysToObjects;
+const ethToWeth = (maybeEth) => maybeEth === null || maybeEth === void 0 ? void 0 : maybeEth.replace(/^ETH$/, 'WETH');
+exports.ethToWeth = ethToWeth;
+const wethToEth = (maybeWeth) => maybeWeth === null || maybeWeth === void 0 ? void 0 : maybeWeth.replace(/^WETH$/, 'ETH');
+exports.wethToEth = wethToEth;
+const wethToEthByAddress = (maybeWethAddr, chainId = common_1.NetworkNumber.Eth) => (0, tokens_1.getAssetInfo)((0, exports.wethToEth)((0, tokens_1.getAssetInfoByAddress)(maybeWethAddr, chainId).symbol), chainId).address;
+exports.wethToEthByAddress = wethToEthByAddress;
+const ethToWethByAddress = (maybeEthAddr, chainId = common_1.NetworkNumber.Eth) => (0, tokens_1.getAssetInfo)((0, exports.ethToWeth)((0, tokens_1.getAssetInfoByAddress)(maybeEthAddr, chainId).symbol), chainId).address;
+exports.ethToWethByAddress = ethToWethByAddress;
+const xplToWxpl = (maybeXpl) => maybeXpl === null || maybeXpl === void 0 ? void 0 : maybeXpl.replace(/^XPL$/, 'WXPL');
+exports.xplToWxpl = xplToWxpl;
+const wxplToXpl = (maybeWxpl) => maybeWxpl === null || maybeWxpl === void 0 ? void 0 : maybeWxpl.replace(/^WXPL$/, 'XPL');
+exports.wxplToXpl = wxplToXpl;
+const getWrappedNativeAssetFromUnwrapped = (symbol) => {
+    if (symbol === 'ETH')
+        return 'WETH';
+    if (symbol === 'XPL')
+        return 'WXPL';
+    return symbol;
+};
+exports.getWrappedNativeAssetFromUnwrapped = getWrappedNativeAssetFromUnwrapped;
+const getNativeAssetFromWrapped = (symbol) => {
+    if (symbol === 'WETH')
+        return 'ETH';
+    if (symbol === 'WXPL')
+        return 'XPL';
+    return symbol;
+};
+exports.getNativeAssetFromWrapped = getNativeAssetFromWrapped;

package/cjs/services/viem.d.ts

@@ -7,14 +7,11 @@ export declare const getViemChain: (network: NetworkNumber) => {
             readonly apiUrl: "https://api.etherscan.io/api";
         };
     };
-    blockTime?: number | undefined | undefined;
+    blockTime: 12000;
     contracts: {
-        readonly ensRegistry: {
-            readonly address: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e";
-        };
         readonly ensUniversalResolver: {
-            readonly address: "0xce01f8eee7E479C928F8919abD53E553a36CeF67";
-            readonly blockCreated: 19258213;
+            readonly address: "0xeeeeeeee14d718c2b47d9923deab1335e144eeee";
+            readonly blockCreated: 23085558;
         };
         readonly multicall3: {
             readonly address: "0xca11bde05977b3631167028862be2a173976ca11";
@@ -29,6 +26,7 @@ export declare const getViemChain: (network: NetworkNumber) => {
         readonly symbol: "ETH";
         readonly decimals: 18;
     };
+    experimental_preconfirmationTime?: number | undefined | undefined;
     rpcUrls: {
         readonly default: {
             readonly http: readonly ["https://eth.merkle.io"];
@@ -101,6 +99,7 @@ export declare const getViemChain: (network: NetworkNumber) => {
         readonly symbol: "ETH";
         readonly decimals: 18;
     };
+    experimental_preconfirmationTime?: number | undefined | undefined;
     rpcUrls: {
         readonly default: {
             readonly http: readonly ["https://mainnet.optimism.io"];
@@ -174,16 +173,16 @@ export declare const getViemChain: (network: NetworkNumber) => {
                 r: import("viem").Hex;
                 s: import("viem").Hex;
                 v: bigint;
+                value: bigint;
+                gas: bigint;
                 to: import("viem").Address | null;
                 from: import("viem").Address;
-                gas: bigint;
                 nonce: number;
-                value: bigint;
                 blockHash: `0x${string}` | null;
                 blockNumber: bigint | null;
+                transactionIndex: number | null;
                 hash: import("viem").Hash;
                 input: import("viem").Hex;
-                transactionIndex: number | null;
                 typeHex: import("viem").Hex | null;
                 accessList?: undefined | undefined;
                 authorizationList?: undefined | undefined;
@@ -352,7 +351,7 @@ export declare const getViemChain: (network: NetworkNumber) => {
             readonly apiUrl: "https://api.arbiscan.io/api";
         };
     };
-    blockTime?: number | undefined | undefined;
+    blockTime: 250;
     contracts: {
         readonly multicall3: {
             readonly address: "0xca11bde05977b3631167028862be2a173976ca11";
@@ -367,6 +366,7 @@ export declare const getViemChain: (network: NetworkNumber) => {
         readonly symbol: "ETH";
         readonly decimals: 18;
     };
+    experimental_preconfirmationTime?: number | undefined | undefined;
     rpcUrls: {
         readonly default: {
             readonly http: readonly ["https://arb1.arbitrum.io/rpc"];
@@ -441,6 +441,7 @@ export declare const getViemChain: (network: NetworkNumber) => {
         readonly symbol: "ETH";
         readonly decimals: 18;
     };
+    experimental_preconfirmationTime?: number | undefined | undefined;
     rpcUrls: {
         readonly default: {
             readonly http: readonly ["https://mainnet.base.org"];
@@ -514,16 +515,16 @@ export declare const getViemChain: (network: NetworkNumber) => {
                 r: import("viem").Hex;
                 s: import("viem").Hex;
                 v: bigint;
+                value: bigint;
+                gas: bigint;
                 to: import("viem").Address | null;
                 from: import("viem").Address;
-                gas: bigint;
                 nonce: number;
-                value: bigint;
                 blockHash: `0x${string}` | null;
                 blockNumber: bigint | null;
+                transactionIndex: number | null;
                 hash: import("viem").Hash;
                 input: import("viem").Hex;
-                transactionIndex: number | null;
                 typeHex: import("viem").Hex | null;
                 accessList?: undefined | undefined;
                 authorizationList?: undefined | undefined;
@@ -703,8 +704,8 @@ export declare const getViemChain: (network: NetworkNumber) => {
             readonly blockCreated: 6682888;
         };
         readonly ensUniversalResolver: {
-            readonly address: "0x3aA974fb3f8C1E02796048BDCdeD79e9D53a6965";
-            readonly blockCreated: 6683000;
+            readonly address: "0x4D41762915F83c76EcaF6776d9b08076aA32b492";
+            readonly blockCreated: 22222151;
         };
     };
     ensTlds: readonly [".linea.eth"];
@@ -715,6 +716,7 @@ export declare const getViemChain: (network: NetworkNumber) => {
         readonly symbol: "ETH";
         readonly decimals: 18;
     };
+    experimental_preconfirmationTime?: number | undefined | undefined;
     rpcUrls: {
         readonly default: {
             readonly http: readonly ["https://rpc.linea.build"];
@@ -730,6 +732,40 @@ export declare const getViemChain: (network: NetworkNumber) => {
     };
     formatters?: undefined;
     serializers?: import("viem").ChainSerializers<undefined, import("viem").TransactionSerializable> | undefined;
+} | {
+    blockExplorers: {
+        readonly default: {
+            readonly name: "PlasmaScan";
+            readonly url: "https://plasmascan.to";
+        };
+    };
+    blockTime?: number | undefined | undefined;
+    contracts: {
+        readonly multicall3: {
+            readonly address: "0xcA11bde05977b3631167028862bE2a173976CA11";
+            readonly blockCreated: 0;
+        };
+    };
+    ensTlds?: readonly string[] | undefined;
+    id: 9745;
+    name: "Plasma";
+    nativeCurrency: {
+        readonly name: "Plasma";
+        readonly symbol: "XPL";
+        readonly decimals: 18;
+    };
+    experimental_preconfirmationTime?: number | undefined | undefined;
+    rpcUrls: {
+        readonly default: {
+            readonly http: readonly ["https://rpc.plasma.to"];
+        };
+    };
+    sourceId?: number | undefined | undefined;
+    testnet?: boolean | undefined | undefined;
+    custom?: Record<string, unknown> | undefined;
+    fees?: import("viem").ChainFees<undefined> | undefined;
+    formatters?: undefined;
+    serializers?: import("viem").ChainSerializers<undefined, import("viem").TransactionSerializable> | undefined;
 };
 export declare const getViemProvider: (provider: EthereumProvider, network: NetworkNumber, options?: any) => {
     account: undefined;
@@ -741,6 +777,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         request?: (parameters: import("viem").CcipRequestParameters) => Promise<`0x${string}`>;
     } | undefined;
     chain: undefined;
+    experimental_blockTag?: import("viem").BlockTag | undefined;
     key: string;
     name: string;
     pollingInterval: number;
@@ -7579,6 +7616,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
     simulateBlocks: <const calls extends readonly unknown[]>(args: import("viem").SimulateBlocksParameters<calls>) => Promise<import("viem").SimulateBlocksReturnType<calls>>;
     simulateCalls: <const calls extends readonly unknown[]>(args: import("viem").SimulateCallsParameters<calls>) => Promise<import("viem").SimulateCallsReturnType<calls>>;
     simulateContract: <const abi extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "nonpayable" | "payable">, const args_1 extends import("viem").ContractFunctionArgs<abi, "nonpayable" | "payable", functionName>, chainOverride extends import("viem").Chain | undefined, accountOverride extends import("viem").Account | import("viem").Address | undefined = undefined>(args: import("viem").SimulateContractParameters<abi, functionName, args_1, undefined, chainOverride, accountOverride>) => Promise<import("viem").SimulateContractReturnType<abi, functionName, args_1, undefined, import("viem").Account | undefined, chainOverride, accountOverride>>;
+    verifyHash: (args: import("viem").VerifyHashActionParameters) => Promise<import("viem").VerifyHashActionReturnType>;
     verifyMessage: (args: import("viem").VerifyMessageActionParameters) => Promise<import("viem").VerifyMessageActionReturnType>;
     verifySiweMessage: (args: {
         blockNumber?: bigint | undefined | undefined;
@@ -7606,6 +7644,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         cacheTime?: undefined;
         ccipRead?: undefined;
         chain?: undefined;
+        experimental_blockTag?: undefined;
         key?: undefined;
         name?: undefined;
         pollingInterval?: undefined;

package/cjs/services/viem.js

@@ -16,6 +16,8 @@ const getViemChain = (network) => {
             return chains_1.base;
         case common_1.NetworkNumber.Linea:
             return chains_1.linea;
+        case common_1.NetworkNumber.Plasma:
+            return chains_1.plasma;
         default:
             throw new Error(`Unsupported network: ${network}`);
     }

package/cjs/staking/eligibility.js

@@ -24,12 +24,6 @@ const isEligibleForEthenaUSDeRewards = (usedAssets, { healthRatio }) => {
     const anythingBorrowedNotAllowed = Object.values(usedAssets).some((asset) => asset.isBorrowed && !allowedBorrowAssets.includes(asset.symbol));
     if (anythingBorrowedNotAllowed)
         return { isEligible: false, eligibleUSDAmount: '0' };
-    const totalAmountBorrowed = Object.values(usedAssets).reduce((acc, asset) => {
-        if (asset.isBorrowed) {
-            return acc.add(asset.borrowedUsd);
-        }
-        return acc;
-    }, new decimal_js_1.default(0)).toString();
     if (new decimal_js_1.default(healthRatio).gte(2.5))
         return { isEligible: false, eligibleUSDAmount: '0' }; // health ratio must be below 2.5
     const halfAmountSupplied = new decimal_js_1.default(totalAmountSupplied).div(2).toString();
@@ -63,4 +57,5 @@ exports.EligibilityMapping = {
     [common_1.IncentiveEligibilityId.AaveV3EthenaLiquidLeverage]: exports.isEligibleForEthenaUSDeRewards,
     [common_1.IncentiveEligibilityId.AaveV3ArbitrumEthSupply]: exports.isEligibleForAaveV3ArbitrumEthSupply,
     [common_1.IncentiveEligibilityId.AaveV3ArbitrumETHLSBorrow]: exports.isEligibleForAaveV3ArbitrumETHLSBorrow,
+    [common_1.IncentiveEligibilityId.AaveV3EthenaLiquidLeveragePlasma]: exports.isEligibleForEthenaUSDeRewards,
 };

package/cjs/types/common.d.ts

@@ -5,7 +5,8 @@ export declare enum IncentiveKind {
 export declare enum IncentiveEligibilityId {
     AaveV3EthenaLiquidLeverage = "0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL",
     AaveV3ArbitrumEthSupply = "0x5d16261c6715a653248269861bbacf68a9774cde",
-    AaveV3ArbitrumETHLSBorrow = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351"
+    AaveV3ArbitrumETHLSBorrow = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351",
+    AaveV3EthenaLiquidLeveragePlasma = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL"
 }
 export interface IncentiveData {
     token: string;
@@ -23,7 +24,8 @@ export declare enum NetworkNumber {
     Opt = 10,
     Arb = 42161,
     Base = 8453,
-    Linea = 59144
+    Linea = 59144,
+    Plasma = 9745
 }
 export type Networkish = string | NetworkNumber;
 export interface MMAssetData {

package/cjs/types/common.js

@@ -11,6 +11,7 @@ var IncentiveEligibilityId;
     IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL";
     IncentiveEligibilityId["AaveV3ArbitrumEthSupply"] = "0x5d16261c6715a653248269861bbacf68a9774cde";
     IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
+    IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL";
 })(IncentiveEligibilityId || (exports.IncentiveEligibilityId = IncentiveEligibilityId = {}));
 var NetworkNumber;
 (function (NetworkNumber) {
@@ -19,4 +20,5 @@ var NetworkNumber;
     NetworkNumber[NetworkNumber["Arb"] = 42161] = "Arb";
     NetworkNumber[NetworkNumber["Base"] = 8453] = "Base";
     NetworkNumber[NetworkNumber["Linea"] = 59144] = "Linea";
+    NetworkNumber[NetworkNumber["Plasma"] = 9745] = "Plasma";
 })(NetworkNumber || (exports.NetworkNumber = NetworkNumber = {}));

package/cjs/types/fluid.d.ts

@@ -149,21 +149,25 @@ export declare enum FluidMainnetDepositToken {
     USDC = "USDC",
     USDT = "USDT",
     GHO = "GHO",
-    sUSDS = "sUSDS"
+    sUSDS = "sUSDS",
+    USDtb = "USDtb"
 }
 export declare enum FluidArbitrumDepositToken {
     ETH = "ETH",
     wstETH = "wstETH",
     USDC = "USDC",
     USDT = "USDT",
-    ARB = "ARB"
+    ARB = "ARB",
+    GHO = "GHO",
+    sUSDS = "sUSDS"
 }
 export declare enum FluidBaseDepositToken {
     ETH = "ETH",
     USDC = "USDC",
     wstETH = "wstETH",
     EURC = "EURC",
-    sUSDS = "sUSDS"
+    sUSDS = "sUSDS",
+    GHO = "GHO"
 }
 export type FluidDepositTokenByNetwork = {
     [NetworkNumber.Eth]: FluidMainnetDepositToken;

package/cjs/types/fluid.js

@@ -136,6 +136,7 @@ var FluidMainnetDepositToken;
     FluidMainnetDepositToken["USDT"] = "USDT";
     FluidMainnetDepositToken["GHO"] = "GHO";
     FluidMainnetDepositToken["sUSDS"] = "sUSDS";
+    FluidMainnetDepositToken["USDtb"] = "USDtb";
 })(FluidMainnetDepositToken || (exports.FluidMainnetDepositToken = FluidMainnetDepositToken = {}));
 var FluidArbitrumDepositToken;
 (function (FluidArbitrumDepositToken) {
@@ -144,6 +145,8 @@ var FluidArbitrumDepositToken;
     FluidArbitrumDepositToken["USDC"] = "USDC";
     FluidArbitrumDepositToken["USDT"] = "USDT";
     FluidArbitrumDepositToken["ARB"] = "ARB";
+    FluidArbitrumDepositToken["GHO"] = "GHO";
+    FluidArbitrumDepositToken["sUSDS"] = "sUSDS";
 })(FluidArbitrumDepositToken || (exports.FluidArbitrumDepositToken = FluidArbitrumDepositToken = {}));
 var FluidBaseDepositToken;
 (function (FluidBaseDepositToken) {
@@ -152,6 +155,7 @@ var FluidBaseDepositToken;
     FluidBaseDepositToken["wstETH"] = "wstETH";
     FluidBaseDepositToken["EURC"] = "EURC";
     FluidBaseDepositToken["sUSDS"] = "sUSDS";
+    FluidBaseDepositToken["GHO"] = "GHO";
 })(FluidBaseDepositToken || (exports.FluidBaseDepositToken = FluidBaseDepositToken = {}));
 var FluidVaultType;
 (function (FluidVaultType) {

package/esm/aaveV3/index.js

@@ -13,7 +13,7 @@ import { AaveIncentiveDataProviderV3ContractViem, AaveIncentivesControllerViem,
 import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
-import { ethToWeth, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { getWrappedNativeAssetFromUnwrapped, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { IncentiveKind, NetworkNumber, } from '../types/common';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
@@ -47,12 +47,12 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 };
 export function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
-        const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
+        const _addresses = market.assets.map(a => getAssetInfo(getWrappedNativeAssetFromUnwrapped(a), network).address);
         const isL2 = isLayer2Network(network);
         const loanInfoContract = AaveV3ViewContractViem(provider, network);
         const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
         const marketAddress = market.providerAddress;
-        const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea];
+        const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea, NetworkNumber.Plasma];
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap, meritRewardsMap] = yield Promise.all([
             loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], setViemBlockNumber(blockNumber)),
@@ -353,7 +353,7 @@ export const _getAaveV3AccountData = (provider_1, network_1, address_1, extracte
     const loanInfoContract = AaveV3ViewContractViem(provider, network);
     const lendingPoolContract = createViemContractFromConfigFunc(market.lendingPool, market.lendingPoolAddress)(provider, network);
     const marketAddress = market.providerAddress;
-    const _addresses = market.assets.map((a) => getAssetInfo(ethToWeth(a), network).address);
+    const _addresses = market.assets.map((a) => getAssetInfo(getWrappedNativeAssetFromUnwrapped(a), network).address);
     const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
     const [eModeCategory, tokenBalances1, tokenBalances2] = yield Promise.all([
         lendingPoolContract.read.getUserEMode([address], setViemBlockNumber(blockNumber)),

package/esm/aaveV3/merit.js

@@ -42,6 +42,9 @@ const MERIT_DATA_MAP = {
     [NetworkNumber.Linea]: {
         [AaveVersions.AaveV3]: {},
     },
+    [NetworkNumber.Plasma]: {
+        [AaveVersions.AaveV3]: {},
+    },
 };
 /**
  * Fetches merit rewards data from Aave API

package/esm/aaveV3/merkl.d.ts

@@ -1,6 +1,6 @@
 import { MerkleRewardMap } from '../types';
 import { NetworkNumber } from '../types/common';
-export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;
 /**
  * aEthLidoUSDC -> aUSDC
  * USDC -> USDC

package/esm/config/contracts.d.ts

@@ -28303,6 +28303,11 @@ export declare const AaveV3View: {
                 };
             };
         };
+        readonly "9745": {
+            readonly address: "0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C";
+            readonly createdBlock: 1880799;
+            readonly oldVersions: {};
+        };
     };
 };
 export declare const AaveV3PoolAddressesProvider: {
@@ -28763,6 +28768,9 @@ export declare const AaveV3PoolAddressesProvider: {
         readonly "59144": {
             readonly address: "0x89502c3731F69DDC95B65753708A07F8Cd0373F4";
         };
+        readonly "9745": {
+            readonly address: "0x061D8e131F26512348ee5FA42e2DF1bA9d6505E9";
+        };
     };
 };
 export declare const AaveV3LidoPoolAddressesProvider: {
@@ -31133,6 +31141,9 @@ export declare const AaveV3LendingPool: {
         readonly "59144": {
             readonly address: "0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac";
         };
+        readonly "9745": {
+            readonly address: "0x925a2A7214Ed92428B5b1B090F80b25700095e12";
+        };
     };
 };
 export declare const AaveV3LidoLendingPool: {
@@ -34467,6 +34478,9 @@ export declare const AaveV3ProtocolDataProvider: {
         readonly "59144": {
             readonly address: "0x47cd4b507B81cB831669c71c7077f4daF6762FF4";
         };
+        readonly "9745": {
+            readonly address: "0xf2D6E38B407e31E7E7e4a16E6769728b76c7419F";
+        };
     };
 };
 export declare const AaveV3LidoProtocolDataProvider: {
@@ -35805,6 +35819,9 @@ export declare const AaveUiIncentiveDataProviderV3: {
         readonly "59144": {
             readonly address: "0x117684358D990E42Eb1649E7e8C4691951dc1E71";
         };
+        readonly "9745": {
+            readonly address: "0xcb85C501B3A5e9851850d66648d69B26A4c90942";
+        };
     };
 };
 export declare const cUSDCv3: {
@@ -84964,6 +84981,9 @@ export declare const AaveRewardsController: {
         readonly "59144": {
             readonly address: "0xc67bb8F2314fA0df50cBa314c6509A7bdAD500C0";
         };
+        readonly "9745": {
+            readonly address: "0x3A57eAa3Ca3794D66977326af7991eB3F6dD5a5A";
+        };
     };
 };
 export declare const LiquityV2ActivePool: {

package/esm/config/contracts.js

@@ -227,6 +227,11 @@ export const AaveV3View = {
                     "address": "0xc9D6EfA6e08B66a5Cdc516Bcd5807c2fa69E0f2A"
                 }
             },
+        },
+        "9745": {
+            "address": "0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C",
+            "createdBlock": 1880799,
+            "oldVersions": {},
         }
     }
 };
@@ -247,6 +252,9 @@ export const AaveV3PoolAddressesProvider = {
         },
         "59144": {
             "address": "0x89502c3731F69DDC95B65753708A07F8Cd0373F4"
+        },
+        "9745": {
+            "address": "0x061D8e131F26512348ee5FA42e2DF1bA9d6505E9"
         }
     }
 };
@@ -283,6 +291,9 @@ export const AaveV3LendingPool = {
         },
         "59144": {
             "address": "0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac"
+        },
+        "9745": {
+            "address": "0x925a2A7214Ed92428B5b1B090F80b25700095e12"
         }
     }
 };
@@ -319,6 +330,9 @@ export const AaveV3ProtocolDataProvider = {
         },
         "59144": {
             "address": "0x47cd4b507B81cB831669c71c7077f4daF6762FF4"
+        },
+        "9745": {
+            "address": "0xf2D6E38B407e31E7E7e4a16E6769728b76c7419F"
         }
     }
 };
@@ -355,6 +369,9 @@ export const AaveUiIncentiveDataProviderV3 = {
         },
         "59144": {
             "address": "0x117684358D990E42Eb1649E7e8C4691951dc1E71"
+        },
+        "9745": {
+            "address": "0xcb85C501B3A5e9851850d66648d69B26A4c90942"
         }
     }
 };
@@ -1205,6 +1222,9 @@ export const AaveRewardsController = {
         },
         "59144": {
             "address": "0xc67bb8F2314fA0df50cBa314c6509A7bdAD500C0"
+        },
+        "9745": {
+            "address": "0x3A57eAa3Ca3794D66977326af7991eB3F6dD5a5A"
         }
     }
 };

package/esm/fluid/index.js

@@ -1081,19 +1081,21 @@ export const _getFluidTokenData = (provider, network, token) => __awaiter(void 0
     };
 });
 export const getFluidTokenData = (provider, network, token) => __awaiter(void 0, void 0, void 0, function* () { return _getFluidTokenData(getViemProvider(provider, network), network, token); });
-const parseFDepositTokenData = (fTokenData, userPosition, fTokenAddress) => {
-    const supplyRate = new Dec(fTokenData.supplyRate).div(100).toString();
-    const rewardsRate = new Dec(fTokenData.rewardsRate).div(1e12).toString();
+const parseFDepositTokenData = (fTokenData, userPosition, apiData, fTokenAddress) => {
+    var _a, _b;
     const decimals = fTokenData.decimals.toString();
     const depositRate = new Dec(getEthAmountForDecimals(fTokenData.convertToShares.toString(), decimals)).toString();
     const withdrawRate = new Dec(getEthAmountForDecimals(fTokenData.convertToAssets.toString(), decimals)).toString();
+    const supplyRate = new Dec((apiData === null || apiData === void 0 ? void 0 : apiData.supplyRate) || '0').div(100).toString();
+    const rewardRates = ((_a = apiData === null || apiData === void 0 ? void 0 : apiData.rewards) === null || _a === void 0 ? void 0 : _a.reduce((acc, item) => acc.add(new Dec(item.rate || '0').div(100)), new Dec(0))) || '0';
+    const stakeRate = new Dec(((_b = apiData === null || apiData === void 0 ? void 0 : apiData.asset) === null || _b === void 0 ? void 0 : _b.stakingApr) || '0').div(100).toString();
     return {
         fTokenAddress,
         fTokenSymbol: fTokenData.symbol,
         decimals,
         totalDeposited: getEthAmountForDecimals(fTokenData.totalAssets.toString(), decimals),
         withdrawable: getEthAmountForDecimals(fTokenData.withdrawable.toString(), decimals),
-        apy: new Dec(supplyRate).add(rewardsRate).toString(),
+        apy: new Dec(supplyRate).plus(rewardRates).plus(stakeRate).toString(),
         depositRate,
         withdrawRate,
         deposited: getEthAmountForDecimals(userPosition.underlyingAssets.toString(), decimals),
@@ -1103,19 +1105,42 @@ const parseFDepositTokenData = (fTokenData, userPosition, fTokenAddress) => {
 export const _getFluidDepositData = (provider, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContractViem(provider, network);
     const fTokenAddress = getFTokenAddress(token, network);
-    const [userPosition, fTokenData] = yield view.read.getUserEarnPositionWithFToken([fTokenAddress, address]);
-    return parseFDepositTokenData(fTokenData, userPosition, fTokenAddress);
+    const [[userPosition, fTokenData], rewardsApiResponse,] = yield Promise.all([
+        view.read.getUserEarnPositionWithFToken([fTokenAddress, address]),
+        fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
+    ]);
+    let rewardsData = { rewards: [] };
+    if (!rewardsApiResponse.ok) {
+        console.log('External API Failure: Failed to fetch fluid rewards APY');
+    }
+    else {
+        rewardsData = yield rewardsApiResponse.json();
+    }
+    return parseFDepositTokenData(fTokenData, userPosition, rewardsData, fTokenAddress);
 });
 export const getFluidDepositData = (provider, network, token, address) => __awaiter(void 0, void 0, void 0, function* () { return _getFluidDepositData(getViemProvider(provider, network), network, token, address); });
 export const _getAllUserEarnPositionsWithFTokens = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContractViem(provider, network);
-    const [userPositions, fTokensData] = yield view.read.getAllUserEarnPositionsWithFTokens([user]);
+    const [[userPositions, fTokensData], rewardsApiResponse,] = yield Promise.all([
+        view.read.getAllUserEarnPositionsWithFTokens([user]),
+        fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens`),
+    ]);
+    let rewardsData = {
+        data: [{ address: ZERO_ADDRESS, rewards: [] }],
+    };
+    if (!rewardsApiResponse.ok) {
+        console.log('External API Failure: Failed to fetch fluid rewards APY');
+    }
+    else {
+        rewardsData = yield rewardsApiResponse.json();
+    }
     const parsedRes = fTokensData.reduce((acc, fTokenData, i) => {
         const userPosition = userPositions[i];
         const deposited = userPosition === null || userPosition === void 0 ? void 0 : userPosition.underlyingAssets;
         if (Number(deposited) > 0) {
             const fTokenAddress = fTokenData.tokenAddress;
-            acc.push(parseFDepositTokenData(fTokenData, userPosition, fTokenAddress));
+            const apiData = rewardsData.data.find((item) => compareAddresses(item.address, fTokenAddress));
+            acc.push(parseFDepositTokenData(fTokenData, userPosition, apiData, fTokenAddress));
         }
         return acc;
     }, []);
@@ -1160,19 +1185,22 @@ const getTokenPricePortfolio = (token, provider, network) => __awaiter(void 0, v
 const tokensWithoutChainlinkPrices = ['sUSDS', 'USDA', 'ezETH', 'rsETH', 'weETHs', 'LBTC'];
 const handleTokenWithoutChainlinkPrice = (token, prices) => {
     if (token === 'sUSDS') {
-        return new Dec('105276929').div(1e8).toString();
+        return new Dec('107057929').div(1e8).toString();
     }
     if (token === 'USDA') {
         return new Dec('100000000').div(1e8).toString();
     }
+    if (token === 'wstUSR') {
+        return new Dec('111280000').div(1e8).toString();
+    }
     if (token === 'ezETH') {
-        return new Dec(prices.ETH).mul(1.049).toString();
+        return new Dec(prices.ETH).mul(1.06).toString();
     }
     if (token === 'rsETH') {
-        return new Dec(prices.wstETH).mul(1.0454).toString();
+        return new Dec(prices.wstETH).mul(1.0557).toString();
     }
     if (token === 'weETHs') {
-        return new Dec(prices.wstETH).mul(1.026).toString();
+        return new Dec(prices.wstETH).mul(1.032).toString();
     }
     if (token === 'LBTC') {
         return prices.WBTC;

package/esm/helpers/aaveHelpers/index.d.ts

@@ -44,4 +44,4 @@ export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInf
 /**
  * won't cover all cases
  */
-export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;