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

package/cjs/helpers/sparkHelpers/index.js

@@ -38,8 +38,8 @@ exports.sparkIsInIsolationMode = sparkIsInIsolationMode;
 const sparkGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets).filter(({ isSupplied, collateral }) => isSupplied && collateral);
 exports.sparkGetCollSuppliedAssets = sparkGetCollSuppliedAssets;
 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 = (0, exports.sparkGetCollSuppliedAssets)(data);
     const marketAssets = Object.values(assetsData);
     if ((0, exports.sparkIsInIsolationMode)(data)) {
@@ -50,27 +50,27 @@ const sparkGetSuppliableAssets = (_a) => {
 };
 exports.sparkGetSuppliableAssets = sparkGetSuppliableAssets;
 const sparkGetSuppliableAsCollAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    return (0, exports.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 (0, exports.sparkGetSuppliableAssets)(Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
 };
 exports.sparkGetSuppliableAsCollAssets = sparkGetSuppliableAsCollAssets;
-const sparkGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
-    var _a;
-    const asset = (0, utils_1.wethToEth)(_asset);
+const sparkGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
+    const asset = (0, utils_1.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 decimal_js_1.default(((_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 decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
         return ({ liquidationRatio, collateralFactor });
     }
-    const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
+    const { liquidationRatio, collateralFactor } = eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };
 exports.sparkGetEmodeMutableProps = sparkGetEmodeMutableProps;
 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 = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);

package/cjs/markets/aave/index.js

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

package/cjs/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/cjs/markets/aave/marketAssets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV3AssetsEtherfiMarket = exports.aaveV3AssetsEtherfiMarketEth = exports.aaveV3AssetsLidoMarket = exports.aaveV3AssetsLidoMarketEth = exports.aaveV3AssetsDefaultMarket = exports.aaveV3AssetsDefaultMarketLinea = exports.aaveV3AssetsDefaultMarketBase = exports.aaveV3AssetsDefaultMarketArb = exports.aaveV3AssetsDefaultMarketOpt = exports.aaveV3AssetsDefaultMarketEth = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = void 0;
+exports.aaveV3AssetsEtherfiMarket = exports.aaveV3AssetsEtherfiMarketEth = exports.aaveV3AssetsLidoMarket = exports.aaveV3AssetsLidoMarketEth = exports.aaveV3AssetsDefaultMarket = exports.aaveV3AssetsDefaultMarketPlasma = exports.aaveV3AssetsDefaultMarketLinea = exports.aaveV3AssetsDefaultMarketBase = exports.aaveV3AssetsDefaultMarketArb = exports.aaveV3AssetsDefaultMarketOpt = exports.aaveV3AssetsDefaultMarketEth = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = void 0;
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../../types/common");
 exports.aaveV1AssetsDefaultMarket = [
@@ -18,6 +18,7 @@ exports.aaveV3AssetsDefaultMarketOpt = [
 exports.aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
 exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
 exports.aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC'];
+exports.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`
 exports.aaveV3AssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.aaveV3AssetsDefaultMarketEth,
@@ -25,6 +26,7 @@ exports.aaveV3AssetsDefaultMarket = {
     [common_1.NetworkNumber.Arb]: exports.aaveV3AssetsDefaultMarketArb,
     [common_1.NetworkNumber.Base]: exports.aaveV3AssetsDefaultMarketBase,
     [common_1.NetworkNumber.Linea]: exports.aaveV3AssetsDefaultMarketLinea,
+    [common_1.NetworkNumber.Plasma]: exports.aaveV3AssetsDefaultMarketPlasma,
 };
 exports.aaveV3AssetsLidoMarketEth = ['ETH', 'wstETH', 'USDS', 'USDC', 'ezETH', 'sUSDe', 'GHO', 'rsETH', 'tETH'];
 exports.aaveV3AssetsLidoMarket = {
@@ -33,6 +35,7 @@ exports.aaveV3AssetsLidoMarket = {
     [common_1.NetworkNumber.Arb]: [],
     [common_1.NetworkNumber.Base]: [],
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };
 exports.aaveV3AssetsEtherfiMarketEth = ['weETH', 'USDC', 'PYUSD', 'FRAX'];
 exports.aaveV3AssetsEtherfiMarket = {
@@ -41,4 +44,5 @@ exports.aaveV3AssetsEtherfiMarket = {
     [common_1.NetworkNumber.Arb]: [],
     [common_1.NetworkNumber.Base]: [],
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };

package/cjs/markets/compound/index.js

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

package/cjs/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/cjs/markets/compound/marketsAssets.js

@@ -18,6 +18,7 @@ exports.v3USDCCollAssets = {
     [common_1.NetworkNumber.Arb]: exports.v3USDCCollAssetsArb,
     [common_1.NetworkNumber.Base]: exports.v3USDCCollAssetsBase,
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };
 exports.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`
@@ -27,6 +28,7 @@ exports.v3USDCeCollAssets = {
     [common_1.NetworkNumber.Arb]: exports.v3USDCeCollAssetsArb,
     [common_1.NetworkNumber.Base]: [],
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };
 exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH', 'tBTC', 'ETHx', 'tETH', 'pufETH', 'wOETH'];
 exports.v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC', 'wsuperOETHb'];
@@ -39,6 +41,7 @@ exports.v3ETHCollAssets = {
     [common_1.NetworkNumber.Arb]: exports.v3ETHCollAssetsArb,
     [common_1.NetworkNumber.Base]: exports.v3ETHCollAssetsBase,
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };
 exports.v3USDbCCollAssetsBase = ['ETH', 'cbETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
@@ -48,6 +51,7 @@ exports.v3USDbCCollAssets = {
     [common_1.NetworkNumber.Arb]: [],
     [common_1.NetworkNumber.Base]: exports.v3USDbCCollAssetsBase,
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };
 exports.v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX', 'mETH', 'weETH', 'sdeUSD', 'deUSD'];
 exports.v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
@@ -59,6 +63,7 @@ exports.v3USDTCollAssets = {
     [common_1.NetworkNumber.Arb]: exports.v3USDTCollAssetsArb,
     [common_1.NetworkNumber.Base]: [],
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };
 exports.v3USDSCollAssetsEth = ['wstETH', 'ETH', 'sUSDS', 'cbETH', 'tBTC', 'USDe'];
 exports.v3USDSCollAssetsBase = ['sUSDS', 'cbBTC'];
@@ -68,6 +73,7 @@ exports.v3USDSCollAssets = {
     [common_1.NetworkNumber.Arb]: [],
     [common_1.NetworkNumber.Base]: exports.v3USDSCollAssetsBase,
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };
 exports.v3wstETHCollAssetsEth = ['rsETH', 'ezETH'];
 exports.v3wstETHCollAssets = {
@@ -76,4 +82,5 @@ exports.v3wstETHCollAssets = {
     [common_1.NetworkNumber.Arb]: [],
     [common_1.NetworkNumber.Base]: [],
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };

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

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

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

@@ -10,4 +10,5 @@ exports.sparkAssetsDefaultMarket = {
     [common_1.NetworkNumber.Base]: [],
     [common_1.NetworkNumber.Arb]: [],
     [common_1.NetworkNumber.Linea]: [],
+    [common_1.NetworkNumber.Plasma]: [],
 };

package/cjs/portfolio/index.js

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

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

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { SparkEModeCategoryDataMapping, SparkAssetsData, SparkMarketData, SparkMarketsData, SparkPositionData, SparkUsedAssets } from '../types';
+import { SparkEModeCategoryDataMapping, SparkAssetsData, SparkMarketData, SparkMarketsData, SparkPositionData, SparkUsedAssets, EModeCategoriesData } from '../types';
 export declare const sparkEmodeCategoriesMapping: (extractedState: {
     assetsData: SparkAssetsData;
 }, usedAssets: SparkUsedAssets) => {
@@ -32,9 +32,11 @@ export declare const getSparkAccountBalances: (provider: EthereumProvider, netwo
 export declare const _getSparkAccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: {
     selectedMarket: SparkMarketData;
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 }) => Promise<SparkPositionData>;
 export declare const getSparkAccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: {
     selectedMarket: SparkMarketData;
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 }) => Promise<SparkPositionData>;
 export declare const getSparkFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: SparkMarketData) => Promise<SparkPositionData>;