@defisaver/positions-sdk 2.1.7 → 2.1.9-dev-spark-1

package/esm/helpers/morphoBlueHelpers/index.js

@@ -118,73 +118,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, provider, n
     return { borrowRate, supplyRate };
 });
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

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

@@ -7,19 +7,19 @@ export declare const sparkIsInIsolationMode: ({ usedAssets, assetsData }: {
 export declare const sparkGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: SparkUsedAssets;
 }) => import("../../types").SparkUsedAsset[];
-export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
+export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
+export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const sparkGetEmodeMutableProps: ({ eModeCategory, assetsData, }: SparkHelperCommon, _asset: string) => {
+export declare const sparkGetEmodeMutableProps: ({ eModeCategory, eModeCategoriesData, assetsData, }: SparkHelperCommon, _asset: string) => {
     liquidationRatio: string;
     collateralFactor: string;
 };
-export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
+export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: SparkMarketData, actions: [{
     action: string;
     amount: string;

package/esm/helpers/sparkHelpers/index.js

@@ -22,7 +22,7 @@ import Dec from 'decimal.js';
 import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
-import { ethToWeth, wethToEth } from '../../services/utils';
+import { ethToWeth, getNativeAssetFromWrapped, wethToEth } from '../../services/utils';
 import { SparkViewContractViem } from '../../contracts';
 import { NetworkNumber } from '../../types/common';
 import { borrowOperations } from '../../constants';
@@ -30,8 +30,8 @@ import { getViemProvider } from '../../services/viem';
 export const sparkIsInIsolationMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
 export const sparkGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets).filter(({ isSupplied, collateral }) => isSupplied && collateral);
 export const sparkGetSuppliableAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const collAccountAssets = sparkGetCollSuppliedAssets(data);
     const marketAssets = Object.values(assetsData);
     if (sparkIsInIsolationMode(data)) {
@@ -41,25 +41,25 @@ export const sparkGetSuppliableAssets = (_a) => {
     return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
 };
 export const sparkGetSuppliableAsCollAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    return sparkGetSuppliableAssets(Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    return sparkGetSuppliableAssets(Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
 };
-export const sparkGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
-    var _a;
-    const asset = wethToEth(_asset);
+export const sparkGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
+    const asset = getNativeAssetFromWrapped(_asset);
     const assetData = assetsData[asset];
+    const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || { collateralAssets: [], collateralFactor: '0', liquidationRatio: '0' };
     if (eModeCategory === 0
-        || assetData.eModeCategory !== eModeCategory
-        || new Dec(((_a = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _a === void 0 ? void 0 : _a.collateralFactor) || 0).eq(0)) {
+        || !eModeCategoryData.collateralAssets.includes(asset)
+        || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
         return ({ liquidationRatio, collateralFactor });
     }
-    const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
+    const { liquidationRatio, collateralFactor } = eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };
 export const sparkGetAggregatedPositionData = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
+    var { usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategoriesData", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network }, rest);
     const payload = {};
     payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);

package/esm/markets/aave/index.js

@@ -39,7 +39,7 @@ export const AAVE_V2 = {
     protocolName: 'aave',
 };
 export const AAVE_V3 = (networkId) => ({
-    chainIds: [NetworkNumber.Eth, NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Linea],
+    chainIds: [NetworkNumber.Eth, NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Linea, NetworkNumber.Plasma],
     label: networkId === NetworkNumber.Eth ? 'Aave v3 Core' : 'Aave v3',
     shortLabel: 'v3',
     value: AaveVersions.AaveV3,

package/esm/markets/aave/marketAssets.d.ts

@@ -6,12 +6,14 @@ export declare const aaveV3AssetsDefaultMarketOpt: string[];
 export declare const aaveV3AssetsDefaultMarketArb: string[];
 export declare const aaveV3AssetsDefaultMarketBase: string[];
 export declare const aaveV3AssetsDefaultMarketLinea: string[];
+export declare const aaveV3AssetsDefaultMarketPlasma: string[];
 export declare const aaveV3AssetsDefaultMarket: {
     readonly 1: string[];
     readonly 10: string[];
     readonly 42161: string[];
     readonly 8453: string[];
     readonly 59144: string[];
+    readonly 9745: string[];
 };
 export declare const aaveV3AssetsLidoMarketEth: string[];
 export declare const aaveV3AssetsLidoMarket: {
@@ -20,6 +22,7 @@ export declare const aaveV3AssetsLidoMarket: {
     readonly 42161: readonly [];
     readonly 8453: readonly [];
     readonly 59144: readonly [];
+    readonly 9745: readonly [];
 };
 export declare const aaveV3AssetsEtherfiMarketEth: string[];
 export declare const aaveV3AssetsEtherfiMarket: {
@@ -28,4 +31,5 @@ export declare const aaveV3AssetsEtherfiMarket: {
     readonly 42161: readonly [];
     readonly 8453: readonly [];
     readonly 59144: readonly [];
+    readonly 9745: readonly [];
 };

package/esm/markets/aave/marketAssets.js

@@ -15,6 +15,7 @@ export const aaveV3AssetsDefaultMarketOpt = [
 export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
 export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
 export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC'];
+export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const aaveV3AssetsDefaultMarket = {
     [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,
@@ -22,6 +23,7 @@ export const aaveV3AssetsDefaultMarket = {
     [NetworkNumber.Arb]: aaveV3AssetsDefaultMarketArb,
     [NetworkNumber.Base]: aaveV3AssetsDefaultMarketBase,
     [NetworkNumber.Linea]: aaveV3AssetsDefaultMarketLinea,
+    [NetworkNumber.Plasma]: aaveV3AssetsDefaultMarketPlasma,
 };
 export const aaveV3AssetsLidoMarketEth = ['ETH', 'wstETH', 'USDS', 'USDC', 'ezETH', 'sUSDe', 'GHO', 'rsETH', 'tETH'];
 export const aaveV3AssetsLidoMarket = {
@@ -30,6 +32,7 @@ export const aaveV3AssetsLidoMarket = {
     [NetworkNumber.Arb]: [],
     [NetworkNumber.Base]: [],
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };
 export const aaveV3AssetsEtherfiMarketEth = ['weETH', 'USDC', 'PYUSD', 'FRAX'];
 export const aaveV3AssetsEtherfiMarket = {
@@ -38,4 +41,5 @@ export const aaveV3AssetsEtherfiMarket = {
     [NetworkNumber.Arb]: [],
     [NetworkNumber.Base]: [],
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };

package/esm/markets/compound/index.js

@@ -65,6 +65,17 @@ const BULKER_OPTIONS = {
         [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
     },
+    [NetworkNumber.Plasma]: {
+        // Non-existing markets, keeping it because of typescript
+        [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDT]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
+    },
 };
 export const COMPOUND_V2 = {
     chainIds: [NetworkNumber.Eth],

package/esm/markets/compound/marketsAssets.d.ts

@@ -10,6 +10,7 @@ export declare const v3USDCCollAssets: {
     readonly 42161: string[];
     readonly 8453: string[];
     readonly 59144: readonly [];
+    readonly 9745: readonly [];
 };
 export declare const v3USDCeCollAssetsArb: string[];
 export declare const v3USDCeCollAssets: {
@@ -18,6 +19,7 @@ export declare const v3USDCeCollAssets: {
     readonly 42161: string[];
     readonly 8453: readonly [];
     readonly 59144: readonly [];
+    readonly 9745: readonly [];
 };
 export declare const v3ETHCollAssetsEth: string[];
 export declare const v3ETHCollAssetsBase: string[];
@@ -29,6 +31,7 @@ export declare const v3ETHCollAssets: {
     readonly 42161: string[];
     readonly 8453: string[];
     readonly 59144: readonly [];
+    readonly 9745: readonly [];
 };
 export declare const v3USDbCCollAssetsBase: string[];
 export declare const v3USDbCCollAssets: {
@@ -37,6 +40,7 @@ export declare const v3USDbCCollAssets: {
     42161: never[];
     8453: string[];
     59144: never[];
+    9745: never[];
 };
 export declare const v3USDTCollAssetsEth: string[];
 export declare const v3USDTCollAssetsArb: string[];
@@ -47,6 +51,7 @@ export declare const v3USDTCollAssets: {
     42161: string[];
     8453: never[];
     59144: never[];
+    9745: never[];
 };
 export declare const v3USDSCollAssetsEth: string[];
 export declare const v3USDSCollAssetsBase: string[];
@@ -56,6 +61,7 @@ export declare const v3USDSCollAssets: {
     42161: never[];
     8453: string[];
     59144: never[];
+    9745: never[];
 };
 export declare const v3wstETHCollAssetsEth: string[];
 export declare const v3wstETHCollAssets: {
@@ -64,4 +70,5 @@ export declare const v3wstETHCollAssets: {
     42161: never[];
     8453: never[];
     59144: never[];
+    9745: never[];
 };

package/esm/markets/compound/marketsAssets.js

@@ -15,6 +15,7 @@ export const v3USDCCollAssets = {
     [NetworkNumber.Arb]: v3USDCCollAssetsArb,
     [NetworkNumber.Base]: v3USDCCollAssetsBase,
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };
 export const v3USDCeCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
@@ -24,6 +25,7 @@ export const v3USDCeCollAssets = {
     [NetworkNumber.Arb]: v3USDCeCollAssetsArb,
     [NetworkNumber.Base]: [],
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };
 export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC', 'ETHx', 'tETH', 'pufETH', 'wOETH'];
 export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC', 'wsuperOETHb'];
@@ -36,6 +38,7 @@ export const v3ETHCollAssets = {
     [NetworkNumber.Arb]: v3ETHCollAssetsArb,
     [NetworkNumber.Base]: v3ETHCollAssetsBase,
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };
 export const v3USDbCCollAssetsBase = ['ETH', 'cbETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
@@ -45,6 +48,7 @@ export const v3USDbCCollAssets = {
     [NetworkNumber.Arb]: [],
     [NetworkNumber.Base]: v3USDbCCollAssetsBase,
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };
 export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX', 'mETH', 'weETH', 'sdeUSD', 'deUSD'];
 export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
@@ -56,6 +60,7 @@ export const v3USDTCollAssets = {
     [NetworkNumber.Arb]: v3USDTCollAssetsArb,
     [NetworkNumber.Base]: [],
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };
 export const v3USDSCollAssetsEth = ['wstETH', 'ETH', 'sUSDS', 'cbETH', 'tBTC', 'USDe'];
 export const v3USDSCollAssetsBase = ['sUSDS', 'cbBTC'];
@@ -65,6 +70,7 @@ export const v3USDSCollAssets = {
     [NetworkNumber.Arb]: [],
     [NetworkNumber.Base]: v3USDSCollAssetsBase,
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };
 export const v3wstETHCollAssetsEth = ['rsETH', 'ezETH'];
 export const v3wstETHCollAssets = {
@@ -73,4 +79,5 @@ export const v3wstETHCollAssets = {
     [NetworkNumber.Arb]: [],
     [NetworkNumber.Base]: [],
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };

package/esm/markets/fluid/index.d.ts

@@ -244,17 +244,21 @@ export declare const FluidFTokens: (networkId: NetworkNumber) => {
     wstETH: string;
     GHO: string;
     sUSDS: string;
+    USDtb: string;
 } | {
     ETH: string;
     USDC: string;
     USDT: string;
     wstETH: string;
     ARB: string;
+    GHO: string;
+    sUSDS: string;
 } | {
     ETH: string;
     USDC: string;
     EURC: string;
     wstETH: string;
     sUSDS: string;
+    GHO: string;
 };
 export declare const getFTokenAddress: (token: string, networkId: NetworkNumber) => any;

package/esm/markets/fluid/index.js

@@ -2290,6 +2290,7 @@ const FluidMainnetFTokenAddresses = {
     [FluidMainnetDepositToken.wstETH]: '0x2411802D8BEA09be0aF8fD8D08314a63e706b29C',
     [FluidMainnetDepositToken.GHO]: '0x6A29A46E21C730DcA1d8b23d637c101cec605C5B',
     [FluidMainnetDepositToken.sUSDS]: '0x2BBE31d63E6813E3AC858C04dae43FB2a72B0D11',
+    [FluidMainnetDepositToken.USDtb]: '0x15e8c742614b5D8Db4083A41Df1A14F5D2bFB400',
 };
 const FluidArbitrumFTokenAddresses = {
     [FluidArbitrumDepositToken.ETH]: '0x45Df0656F8aDf017590009d2f1898eeca4F0a205',
@@ -2297,6 +2298,8 @@ const FluidArbitrumFTokenAddresses = {
     [FluidArbitrumDepositToken.USDT]: '0x4A03F37e7d3fC243e3f99341d36f4b829BEe5E03',
     [FluidArbitrumDepositToken.wstETH]: '0x66C25Cd75EBdAA7E04816F643d8E46cecd3183c9',
     [FluidArbitrumDepositToken.ARB]: '0xbE3860FD4c3facDf8ad57Aa8c1A36D6dc4390a49',
+    [FluidArbitrumDepositToken.GHO]: '0x037dFf1C12805707d7c29F163E0F09fC9102657A',
+    [FluidArbitrumDepositToken.sUSDS]: '0x3459fcc94390C3372c0F7B4cD3F8795F0E5aFE96',
 };
 const FluidBaseFTokenAddresses = {
     [FluidBaseDepositToken.ETH]: '0x9272D6153133175175Bc276512B2336BE3931CE9',
@@ -2304,6 +2307,7 @@ const FluidBaseFTokenAddresses = {
     [FluidBaseDepositToken.EURC]: '0x1943FA26360f038230442525Cf1B9125b5DCB401',
     [FluidBaseDepositToken.wstETH]: '0x896E39f0E9af61ECA9dD2938E14543506ef2c2b5',
     [FluidBaseDepositToken.sUSDS]: '0xf62e339f21d8018940f188F6987Bcdf02A849619',
+    [FluidBaseDepositToken.GHO]: '0x8DdbfFA3CFda2355a23d6B11105AC624BDbE3631',
 };
 export const FluidFTokens = (networkId) => {
     switch (networkId) {

package/esm/markets/spark/marketAssets.d.ts

@@ -5,4 +5,5 @@ export declare const sparkAssetsDefaultMarket: {
     readonly 8453: readonly [];
     readonly 42161: readonly [];
     readonly 59144: readonly [];
+    readonly 9745: readonly [];
 };

package/esm/markets/spark/marketAssets.js

@@ -7,4 +7,5 @@ export const sparkAssetsDefaultMarket = {
     [NetworkNumber.Base]: [],
     [NetworkNumber.Arb]: [],
     [NetworkNumber.Linea]: [],
+    [NetworkNumber.Plasma]: [],
 };

package/esm/portfolio/index.js

@@ -446,7 +446,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
             }))).flat(),
             ...sparkMarkets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
+                    const accData = yield _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData, eModeCategoriesData: sparkMarketsData[market.value].eModeCategoriesData });
                     if (new Dec(accData.suppliedUsd).gt(0))
                         positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
                 }

package/esm/services/utils.d.ts

@@ -2,8 +2,6 @@ import { NetworkNumber } from '../types/common';
 export declare const isLayer2Network: (networkId: NetworkNumber) => boolean;
 export declare const addToObjectIf: (condition: any, item: any) => any;
 export declare const addToArrayIf: (condition: any, ...items: any[]) => any[];
-export declare const ethToWeth: (maybeEth: any) => any;
-export declare const wethToEth: (maybeWeth: any) => any;
 export declare const stEthToWstEth: (maybeStEth: any) => any;
 export declare const wstEthToStEth: (maybeStEth: any) => any;
 export declare const getAbiItem: (abi: any, methodName: string) => any;
@@ -13,8 +11,6 @@ export declare const compareAddresses: (addr1?: string, addr2?: string) => boole
 export declare const getWeiAmountForDecimals: (amount: string | number, decimals: number) => string;
 export declare const getEthAmountForDecimals: (amount: string | number, decimals: string | number) => string;
 export declare const handleWbtcLegacy: (asset: string) => string;
-export declare const wethToEthByAddress: (maybeWethAddr: string, chainId?: NetworkNumber) => string;
-export declare const ethToWethByAddress: (maybeEthAddr: string, chainId?: NetworkNumber) => string;
 export declare const bytesToString: (hex: string) => string;
 /**
  * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
@@ -30,3 +26,11 @@ export declare const DEFAULT_TIMEOUT = 2000;
  * @param value
  */
 export declare const convertHybridArraysToObjects: (value: any) => any;
+export declare const ethToWeth: (maybeEth: string) => string;
+export declare const wethToEth: (maybeWeth: string) => string;
+export declare const wethToEthByAddress: (maybeWethAddr: string, chainId?: NetworkNumber) => string;
+export declare const ethToWethByAddress: (maybeEthAddr: string, chainId?: NetworkNumber) => string;
+export declare const xplToWxpl: (maybeXpl: string) => string;
+export declare const wxplToXpl: (maybeWxpl: string) => string;
+export declare const getWrappedNativeAssetFromUnwrapped: (symbol: string) => string;
+export declare const getNativeAssetFromWrapped: (symbol: string) => string;

package/esm/services/utils.js

@@ -1,11 +1,9 @@
 import Dec from 'decimal.js';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { NetworkNumber } from '../types/common';
-export const isLayer2Network = (networkId) => [NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Linea].includes(+networkId);
+export const isLayer2Network = (networkId) => [NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Linea, NetworkNumber.Plasma].includes(+networkId);
 export const addToObjectIf = (condition, item) => (condition ? item : {});
 export const addToArrayIf = (condition, ...items) => (condition ? items : []);
-export const ethToWeth = (maybeEth) => maybeEth === null || maybeEth === void 0 ? void 0 : maybeEth.replace(/^ETH$/, 'WETH');
-export const wethToEth = (maybeWeth) => maybeWeth === null || maybeWeth === void 0 ? void 0 : maybeWeth.replace(/^WETH$/, 'ETH');
 export const stEthToWstEth = (maybeStEth) => maybeStEth === null || maybeStEth === void 0 ? void 0 : maybeStEth.replace(/^stETH$/, 'wstETH');
 export const wstEthToStEth = (maybeStEth) => maybeStEth === null || maybeStEth === void 0 ? void 0 : maybeStEth.replace(/^wstETH$/, 'stETH');
 export const getAbiItem = (abi, methodName) => abi.find((i) => i.name === methodName);
@@ -15,8 +13,6 @@ export const compareAddresses = (addr1 = '', addr2 = '') => addr1.toLowerCase()
 export const getWeiAmountForDecimals = (amount, decimals) => new Dec(amount).mul(Math.pow(10, decimals)).floor().toString();
 export const getEthAmountForDecimals = (amount, decimals) => new Dec(amount).div(Math.pow(10, +decimals)).toString();
 export const handleWbtcLegacy = (asset) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);
-export const wethToEthByAddress = (maybeWethAddr, chainId = NetworkNumber.Eth) => getAssetInfo(wethToEth(getAssetInfoByAddress(maybeWethAddr, chainId).symbol), chainId).address;
-export const ethToWethByAddress = (maybeEthAddr, chainId = NetworkNumber.Eth) => getAssetInfo(ethToWeth(getAssetInfoByAddress(maybeEthAddr, chainId).symbol), chainId).address;
 export const bytesToString = (hex) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
     .toString()
     // eslint-disable-next-line no-control-regex
@@ -69,3 +65,23 @@ export const convertHybridArraysToObjects = (value) => {
     }
     return value;
 };
+export const ethToWeth = (maybeEth) => maybeEth === null || maybeEth === void 0 ? void 0 : maybeEth.replace(/^ETH$/, 'WETH');
+export const wethToEth = (maybeWeth) => maybeWeth === null || maybeWeth === void 0 ? void 0 : maybeWeth.replace(/^WETH$/, 'ETH');
+export const wethToEthByAddress = (maybeWethAddr, chainId = NetworkNumber.Eth) => getAssetInfo(wethToEth(getAssetInfoByAddress(maybeWethAddr, chainId).symbol), chainId).address;
+export const ethToWethByAddress = (maybeEthAddr, chainId = NetworkNumber.Eth) => getAssetInfo(ethToWeth(getAssetInfoByAddress(maybeEthAddr, chainId).symbol), chainId).address;
+export const xplToWxpl = (maybeXpl) => maybeXpl === null || maybeXpl === void 0 ? void 0 : maybeXpl.replace(/^XPL$/, 'WXPL');
+export const wxplToXpl = (maybeWxpl) => maybeWxpl === null || maybeWxpl === void 0 ? void 0 : maybeWxpl.replace(/^WXPL$/, 'XPL');
+export const getWrappedNativeAssetFromUnwrapped = (symbol) => {
+    if (symbol === 'ETH')
+        return 'WETH';
+    if (symbol === 'XPL')
+        return 'WXPL';
+    return symbol;
+};
+export const getNativeAssetFromWrapped = (symbol) => {
+    if (symbol === 'WETH')
+        return 'ETH';
+    if (symbol === 'WXPL')
+        return 'XPL';
+    return symbol;
+};