@defisaver/positions-sdk 2.1.9-dev-spark-2 → 2.1.9-fluid-plasma

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/CLAUDE.md

@@ -0,0 +1,32 @@
+# DeFiSaver Positions SDK
+
+TypeScript SDK for DeFi positions tracking and management.
+
+## Commands
+
+```bash
+# Development
+npm run dev          # Watch mode compilation
+npm run build        # Lint and build both CJS and ESM
+npm run build:cjs    # Build CommonJS
+npm run build:esm    # Build ES modules
+
+# Linting
+npm run lint         # Lint and fix
+npm run lint-check   # Lint without fixing
+
+# Testing
+npm run test         # Run all tests
+npm run test-single  # Run single test (use --name=filename)
+npm run test:debugger # Run tests with debugger
+
+# Versioning
+npm run version-bump # Commit and bump patch version
+```
+
+## Project Structure
+
+- `src/` - TypeScript source code
+- `tests/` - Test files
+- `esm/` - ES module build output
+- `cjs/` - CommonJS build output

package/README.md

@@ -1,64 +1,64 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    provider,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    provider,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/config/contracts.d.ts

@@ -71006,6 +71006,9 @@ export declare const ETHPriceFeed: {
         readonly "42161": {
             readonly address: "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612";
         };
+        readonly "9745": {
+            readonly address: "0x43A7dd2125266c5c4c26EB86cd61241132426Fe7";
+        };
     };
 };
 export declare const BTCPriceFeed: {
@@ -71415,6 +71418,9 @@ export declare const BTCPriceFeed: {
         readonly "42161": {
             readonly address: "0x6ce185860a4963106506C203335A2910413708e9";
         };
+        readonly "9745": {
+            readonly address: "0x3Bc5434dd1Fc6a1B68625e0269B9818cDd9E21B5";
+        };
     };
 };
 export declare const USDCPriceFeed: {
@@ -75037,6 +75043,9 @@ export declare const DFSFeedRegistry: {
         readonly "42161": {
             readonly address: "0x158E27De8B5E5bC3FA1C6D5b365a291c54f6b0Fd";
         };
+        readonly "9745": {
+            readonly address: "0x2226836ec16FF5974dFD8DF740CD461B42FAffD5";
+        };
     };
 };
 export declare const LlamaLendView: {
@@ -81995,6 +82004,9 @@ export declare const FluidView: {
         readonly "8453": {
             readonly address: "0x6cd4D6af4F292817eA2A2311F099dF26cd015028";
         };
+        readonly "9745": {
+            readonly address: "0x27C0BAe2338cE28097122393faF90375B9395dd1";
+        };
         readonly "42161": {
             readonly address: "0xf9e6d5568887ac8eC6fA33B7eefD2A176A958e71";
         };

package/cjs/config/contracts.js

@@ -989,7 +989,8 @@ exports.ETHPriceFeed = {
         "1": { "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419" },
         "10": { "address": "0x13e3Ee699D1909E989722E753853AE30b17e08c5" },
         "8453": { "address": "0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70" },
-        "42161": { "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612" }
+        "42161": { "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612" },
+        "9745": { "address": "0x43A7dd2125266c5c4c26EB86cd61241132426Fe7" },
     },
 };
 exports.BTCPriceFeed = {
@@ -998,7 +999,8 @@ exports.BTCPriceFeed = {
         "1": { "address": "0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c" },
         "10": { "address": "0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593" },
         "8453": { "address": "0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F" },
-        "42161": { "address": "0x6ce185860a4963106506C203335A2910413708e9" }
+        "42161": { "address": "0x6ce185860a4963106506C203335A2910413708e9" },
+        "9745": { "address": "0x3Bc5434dd1Fc6a1B68625e0269B9818cDd9E21B5" }
     },
 };
 exports.USDCPriceFeed = {
@@ -1066,7 +1068,8 @@ exports.DFSFeedRegistry = {
     "abi": [{ "inputs": [], "name": "NonContractCall", "type": "error" }, { "inputs": [], "name": "SenderNotAdmin", "type": "error" }, { "inputs": [], "name": "SenderNotOwner", "type": "error" }, { "inputs": [], "name": "adminVault", "outputs": [{ "internalType": "contract AdminVault", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }], "name": "aggregators", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }], "name": "getFeed", "outputs": [{ "internalType": "address", "name": "aggregator", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "kill", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }], "name": "latestRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }, { "internalType": "address", "name": "aggregator", "type": "address" }], "name": "setFeed", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address[]", "name": "bases", "type": "address[]" }, { "internalType": "address[]", "name": "quotes", "type": "address[]" }, { "internalType": "address[]", "name": "aggregator", "type": "address[]" }], "name": "setFeeds", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_token", "type": "address" }, { "internalType": "address", "name": "_receiver", "type": "address" }, { "internalType": "uint256", "name": "_amount", "type": "uint256" }], "name": "withdrawStuckFunds", "outputs": [], "stateMutability": "nonpayable", "type": "function" }],
     "networks": {
         "8453": { "address": "0x7dFF34190d0307fC234fc7E8C152C9715083eB02" },
-        "42161": { "address": "0x158E27De8B5E5bC3FA1C6D5b365a291c54f6b0Fd" }
+        "42161": { "address": "0x158E27De8B5E5bC3FA1C6D5b365a291c54f6b0Fd" },
+        "9745": { "address": "0x2226836ec16FF5974dFD8DF740CD461B42FAffD5" }
     }
 };
 exports.LlamaLendView = {
@@ -1126,6 +1129,7 @@ exports.FluidView = {
     "networks": {
         "1": { "address": "0xc8df052bD7A8d76a34c09e758Dff3c6298C0115c" },
         "8453": { "address": "0x6cd4D6af4F292817eA2A2311F099dF26cd015028" },
+        "9745": { "address": "0x27C0BAe2338cE28097122393faF90375B9395dd1" },
         "42161": { "address": "0xf9e6d5568887ac8eC6fA33B7eefD2A176A958e71" }
     }
 };

package/cjs/fluid/index.js

@@ -72,7 +72,7 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
         const chainLinkFeedAddress = (0, priceService_1.getChainlinkAssetAddress)(assetInfo.symbol, network);
         if (assetInfo.symbol === 'wstETH')
             return (0, priceService_1.getWstETHChainLinkPriceCalls)(client, network);
-        if (assetInfo.symbol === 'weETH')
+        if (assetInfo.symbol === 'weETH' && network !== common_1.NetworkNumber.Plasma)
             return (0, priceService_1.getWeETHChainLinkPriceCalls)(client, network);
         if (isMainnet) {
             const feedRegistryContract = (0, contracts_1.FeedRegistryContractViem)(client, common_1.NetworkNumber.Eth);
@@ -98,7 +98,7 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
     const btcPriceChainlink = new decimal_js_1.default(results[1].result).div(1e8).toString();
     let offset = 2; // wstETH and weETH has 3 calls, while others have only 1, so we need to keep track. First 2 are static calls for eth and btc prices
     return noDuplicateTokens.reduce((acc, token, i) => {
-        var _a;
+        var _a, _b;
         const assetInfo = (0, tokens_1.getAssetInfoByAddress)(token, network);
         switch (assetInfo.symbol) {
             case 'USDA':
@@ -134,16 +134,31 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'weETH': {
-                const { ethPrice, weETHRate, } = (0, priceService_1.parseWeETHPriceCalls)(results[i + offset].result.toString(), 
-                // @ts-ignore
-                results[i + offset + 1].result[1].toString(), results[i + offset + 2].result.toString());
-                offset += 2;
-                acc[token] = new decimal_js_1.default(ethPrice).mul(weETHRate).toString();
+                if (network !== common_1.NetworkNumber.Plasma) {
+                    const { ethPrice, weETHRate, } = (0, priceService_1.parseWeETHPriceCalls)(results[i + offset].result.toString(), 
+                    // @ts-ignore
+                    results[i + offset + 1].result[1].toString(), results[i + offset + 2].result.toString());
+                    offset += 2;
+                    acc[token] = new decimal_js_1.default(ethPrice).mul(weETHRate).toString();
+                    // @ts-ignore
+                }
+                else if ((_a = results[i + offset].result) === null || _a === void 0 ? void 0 : _a[1]) {
+                    // For Plasma, use default chainlink feed (latestRoundData format)
+                    // @ts-ignore
+                    acc[token] = new decimal_js_1.default(results[i + offset].result[1].toString()).div(1e8).toString();
+                }
+                else if (results[i + offset].result) {
+                    // For Plasma, use default chainlink feed (latestAnswer format)
+                    acc[token] = new decimal_js_1.default(results[i + offset].result.toString()).div(1e8).toString();
+                }
+                else {
+                    acc[token] = '0';
+                }
                 break;
             }
             default:
                 // @ts-ignore
-                if ((_a = results[i + offset].result) === null || _a === void 0 ? void 0 : _a[1]) {
+                if ((_b = results[i + offset].result) === null || _b === void 0 ? void 0 : _b[1]) {
                     // @ts-ignore
                     acc[token] = new decimal_js_1.default(results[i + offset].result[1].toString()).div(1e8).toString();
                 }
@@ -176,8 +191,14 @@ const getTokenPriceFromChainlink = (asset, network, provider) => __awaiter(void
     else {
         // Currently only base network is supported
         const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(provider, network);
-        const roundPriceData = isTokenUSDA ? [0, '100000000'] : yield feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, constants_1.USD_QUOTE]);
-        loanTokenPrice = roundPriceData[1].toString();
+        try {
+            const roundPriceData = isTokenUSDA ? [0, '100000000'] : yield feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, constants_1.USD_QUOTE]);
+            loanTokenPrice = roundPriceData[1].toString();
+        }
+        catch (err) {
+            console.error(`Error fetching price for ${asset.symbol} on ${network}: ${err}`);
+            loanTokenPrice = '0';
+        }
     }
     return new decimal_js_1.default(loanTokenPrice).div(1e8).toString();
 });
@@ -1194,7 +1215,7 @@ const getTokenPricePortfolio = (token, provider, network) => __awaiter(void 0, v
     if (token === 'wstETH') {
         return (0, priceService_1.getWstETHPrice)(provider, network);
     }
-    if (token === 'weETH') {
+    if (token === 'weETH' && network !== common_1.NetworkNumber.Plasma) {
         return (0, priceService_1.getWeETHPrice)(provider, network);
     }
     const isMainnet = (0, utils_1.isMainnetNetwork)(network);

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 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/cjs/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, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
+export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
+export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const sparkGetEmodeMutableProps: ({ eModeCategory, eModeCategoriesData, assetsData, }: SparkHelperCommon, _asset: string) => {
+export declare const sparkGetEmodeMutableProps: ({ eModeCategory, assetsData, }: SparkHelperCommon, _asset: string) => {
     liquidationRatio: string;
     collateralFactor: string;
 };
-export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
+export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: SparkMarketData, actions: [{
     action: string;
     amount: string;

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, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
+    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);
     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, 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);
+    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);
 };
 exports.sparkGetSuppliableAsCollAssets = sparkGetSuppliableAsCollAssets;
-const sparkGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
-    const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
+const sparkGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
+    var _a;
+    const asset = (0, utils_1.wethToEth)(_asset);
     const assetData = assetsData[asset];
-    const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || { collateralAssets: [], collateralFactor: '0', liquidationRatio: '0' };
     if (eModeCategory === 0
-        || !eModeCategoryData.collateralAssets.includes(asset)
-        || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(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)) {
         const { liquidationRatio, collateralFactor } = assetData;
         return ({ liquidationRatio, collateralFactor });
     }
-    const { liquidationRatio, collateralFactor } = eModeCategoryData;
+    const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };
 exports.sparkGetEmodeMutableProps = sparkGetEmodeMutableProps;
 const sparkGetAggregatedPositionData = (_a) => {
-    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);
+    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);
     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/fluid/index.d.ts

@@ -116,6 +116,27 @@ export declare const FLUID_WSTETH_SUSDS_18_BASE: (networkId?: NetworkNumber) =>
 export declare const FLUID_CBBTC_SUSDS_19_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_LBTC_USDC_21_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_LBTC_SUSDS_22_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_ETH_USDT_1_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_ETH_USDE_2_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_WEETH_ETH_3_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_SUSDE_USDT_4_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_WEETH_USDT_5_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_WEETH_USDE_6_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_XAUT_USDT_7_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_XAUT_USDE_8_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_USDE_USDT_9_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_USDAI_USDT_10_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_WEETH_ETH_ETH_11_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_SUSDE_USDT_USDT_12_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_USDE_USDT_USDT_13_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_USDAI_USDT_USDT_14_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_XPL_USDT_16_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_XPL_USDE_17_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_WSTUSR_USDT_18_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_WSTUSR_USDT_USDT_19_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_SYRUPUSDT_USDT_20_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const FLUID_ETH_WRSETH_ETH_21_PLASMA: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FluidMarkets: (networkId: NetworkNumber) => {
     FLUID_ETH_USDC_1: FluidMarketInfo;
     FLUID_ETH_USDT_2: FluidMarketInfo;
@@ -233,6 +254,27 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     FLUID_CBBTC_SUSDS_19_BASE: FluidMarketInfo;
     FLUID_LBTC_USDC_21_BASE: FluidMarketInfo;
     FLUID_LBTC_SUSDS_22_BASE: FluidMarketInfo;
+    FLUID_ETH_USDT_1_PLASMA: FluidMarketInfo;
+    FLUID_ETH_USDE_2_PLASMA: FluidMarketInfo;
+    FLUID_WEETH_ETH_3_PLASMA: FluidMarketInfo;
+    FLUID_SUSDE_USDT_4_PLASMA: FluidMarketInfo;
+    FLUID_WEETH_USDT_5_PLASMA: FluidMarketInfo;
+    FLUID_WEETH_USDE_6_PLASMA: FluidMarketInfo;
+    FLUID_XAUT_USDT_7_PLASMA: FluidMarketInfo;
+    FLUID_XAUT_USDE_8_PLASMA: FluidMarketInfo;
+    FLUID_USDE_USDT_9_PLASMA: FluidMarketInfo;
+    FLUID_USDE_USDT_10_PLASMA: FluidMarketInfo;
+    FLUID_WEETH_ETH_ETH_11_PLASMA: FluidMarketInfo;
+    FLUID_SUSDE_USDT_USDT_12_PLASMA: FluidMarketInfo;
+    FLUID_USDE_USDT_USDT_13_PLASMA: FluidMarketInfo;
+    FLUID_USDAI_USDT_USDT_14_PLASMA: FluidMarketInfo;
+    FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA: FluidMarketInfo;
+    FLUID_XPL_USDT_16_PLASMA: FluidMarketInfo;
+    FLUID_XPL_USDE_17_PLASMA: FluidMarketInfo;
+    FLUID_WSTUSR_USDT_18_PLASMA: FluidMarketInfo;
+    FLUID_WSTUSR_USDT_USDT_19_PLASMA: FluidMarketInfo;
+    FLUID_SYRUPUSDT_USDT_20_PLASMA: FluidMarketInfo;
+    FLUID_ETH_WRSETH_ETH_21_PLASMA: FluidMarketInfo;
 };
 export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
 export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;
@@ -260,5 +302,9 @@ export declare const FluidFTokens: (networkId: NetworkNumber) => {
     wstETH: string;
     sUSDS: string;
     GHO: string;
+} | {
+    ETH: string;
+    USDT: string;
+    USDe: string;
 };
 export declare const getFTokenAddress: (token: string, networkId: NetworkNumber) => any;