@defisaver/positions-sdk 2.1.16 → 2.1.17

package/esm/types/fluid.d.ts

@@ -142,7 +142,30 @@ export declare enum FluidBaseVersions {
     FLUID_LBTC_USDC_21_BASE = "FLUID_LBTC_USDC_21_BASE",
     FLUID_LBTC_SUSDS_22_BASE = "FLUID_LBTC_SUSDS_22_BASE"
 }
-export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion;
+export declare enum FluidPlasmaVersions {
+    FLUID_ETH_USDT_1_PLASMA = "FLUID_ETH_USDT_1_PLASMA",
+    FLUID_ETH_USDE_2_PLASMA = "FLUID_ETH_USDE_2_PLASMA",
+    FLUID_WEETH_ETH_3_PLASMA = "FLUID_WEETH_ETH_3_PLASMA",
+    FLUID_SUSDE_USDT_4_PLASMA = "FLUID_SUSDE_USDT_4_PLASMA",
+    FLUID_WEETH_USDT_5_PLASMA = "FLUID_WEETH_USDT_5_PLASMA",
+    FLUID_WEETH_USDE_6_PLASMA = "FLUID_WEETH_USDE_6_PLASMA",
+    FLUID_XAUT_USDT_7_PLASMA = "FLUID_XAUT_USDT_7_PLASMA",
+    FLUID_XAUT_USDE_8_PLASMA = "FLUID_XAUT_USDE_8_PLASMA",
+    FLUID_USDE_USDT_9_PLASMA = "FLUID_USDE_USDT_9_PLASMA",
+    FLUID_USDAI_USDT_10_PLASMA = "FLUID_USDAI_USDT_10_PLASMA",
+    FLUID_ETH_WEETH_ETH_11_PLASMA = "FLUID_ETH_WEETH_ETH_11_PLASMA",
+    FLUID_SUSDE_USDT_USDT_12_PLASMA = "FLUID_SUSDE_USDT_USDT_12_PLASMA",
+    FLUID_USDE_USDT_USDT_13_PLASMA = "FLUID_USDE_USDT_USDT_13_PLASMA",
+    FLUID_USDAI_USDT_USDT_14_PLASMA = "FLUID_USDAI_USDT_USDT_14_PLASMA",
+    FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA = "FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA",
+    FLUID_XPL_USDT_16_PLASMA = "FLUID_XPL_USDT_16_PLASMA",
+    FLUID_XPL_USDE_17_PLASMA = "FLUID_XPL_USDE_17_PLASMA",
+    FLUID_WSTUSR_USDT_18_PLASMA = "FLUID_WSTUSR_USDT_18_PLASMA",
+    FLUID_WSTUSR_USDT_USDT_19_PLASMA = "FLUID_WSTUSR_USDT_USDT_19_PLASMA",
+    FLUID_SYRUPUSDT_USDT_20_PLASMA = "FLUID_SYRUPUSDT_USDT_20_PLASMA",
+    FLUID_ETH_WRSETH_ETH_21_PLASMA = "FLUID_ETH_WRSETH_ETH_21_PLASMA"
+}
+export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion | FluidPlasmaVersions;
 export declare enum FluidMainnetDepositToken {
     ETH = "ETH",
     wstETH = "wstETH",
@@ -169,10 +192,16 @@ export declare enum FluidBaseDepositToken {
     sUSDS = "sUSDS",
     GHO = "GHO"
 }
+export declare enum FluidPlasmaDepositToken {
+    USDe = "USDe",
+    USDT = "USDT",
+    ETH = "ETH"
+}
 export type FluidDepositTokenByNetwork = {
     [NetworkNumber.Eth]: FluidMainnetDepositToken;
     [NetworkNumber.Arb]: FluidArbitrumDepositToken;
     [NetworkNumber.Base]: FluidBaseDepositToken;
+    [NetworkNumber.Plasma]: FluidPlasmaDepositToken;
 };
 export declare enum FluidVaultType {
     T1 = "T1",

package/esm/types/fluid.js

@@ -125,6 +125,30 @@ export var FluidBaseVersions;
     FluidBaseVersions["FLUID_LBTC_USDC_21_BASE"] = "FLUID_LBTC_USDC_21_BASE";
     FluidBaseVersions["FLUID_LBTC_SUSDS_22_BASE"] = "FLUID_LBTC_SUSDS_22_BASE";
 })(FluidBaseVersions || (FluidBaseVersions = {}));
+export var FluidPlasmaVersions;
+(function (FluidPlasmaVersions) {
+    FluidPlasmaVersions["FLUID_ETH_USDT_1_PLASMA"] = "FLUID_ETH_USDT_1_PLASMA";
+    FluidPlasmaVersions["FLUID_ETH_USDE_2_PLASMA"] = "FLUID_ETH_USDE_2_PLASMA";
+    FluidPlasmaVersions["FLUID_WEETH_ETH_3_PLASMA"] = "FLUID_WEETH_ETH_3_PLASMA";
+    FluidPlasmaVersions["FLUID_SUSDE_USDT_4_PLASMA"] = "FLUID_SUSDE_USDT_4_PLASMA";
+    FluidPlasmaVersions["FLUID_WEETH_USDT_5_PLASMA"] = "FLUID_WEETH_USDT_5_PLASMA";
+    FluidPlasmaVersions["FLUID_WEETH_USDE_6_PLASMA"] = "FLUID_WEETH_USDE_6_PLASMA";
+    FluidPlasmaVersions["FLUID_XAUT_USDT_7_PLASMA"] = "FLUID_XAUT_USDT_7_PLASMA";
+    FluidPlasmaVersions["FLUID_XAUT_USDE_8_PLASMA"] = "FLUID_XAUT_USDE_8_PLASMA";
+    FluidPlasmaVersions["FLUID_USDE_USDT_9_PLASMA"] = "FLUID_USDE_USDT_9_PLASMA";
+    FluidPlasmaVersions["FLUID_USDAI_USDT_10_PLASMA"] = "FLUID_USDAI_USDT_10_PLASMA";
+    FluidPlasmaVersions["FLUID_ETH_WEETH_ETH_11_PLASMA"] = "FLUID_ETH_WEETH_ETH_11_PLASMA";
+    FluidPlasmaVersions["FLUID_SUSDE_USDT_USDT_12_PLASMA"] = "FLUID_SUSDE_USDT_USDT_12_PLASMA";
+    FluidPlasmaVersions["FLUID_USDE_USDT_USDT_13_PLASMA"] = "FLUID_USDE_USDT_USDT_13_PLASMA";
+    FluidPlasmaVersions["FLUID_USDAI_USDT_USDT_14_PLASMA"] = "FLUID_USDAI_USDT_USDT_14_PLASMA";
+    FluidPlasmaVersions["FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA"] = "FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA";
+    FluidPlasmaVersions["FLUID_XPL_USDT_16_PLASMA"] = "FLUID_XPL_USDT_16_PLASMA";
+    FluidPlasmaVersions["FLUID_XPL_USDE_17_PLASMA"] = "FLUID_XPL_USDE_17_PLASMA";
+    FluidPlasmaVersions["FLUID_WSTUSR_USDT_18_PLASMA"] = "FLUID_WSTUSR_USDT_18_PLASMA";
+    FluidPlasmaVersions["FLUID_WSTUSR_USDT_USDT_19_PLASMA"] = "FLUID_WSTUSR_USDT_USDT_19_PLASMA";
+    FluidPlasmaVersions["FLUID_SYRUPUSDT_USDT_20_PLASMA"] = "FLUID_SYRUPUSDT_USDT_20_PLASMA";
+    FluidPlasmaVersions["FLUID_ETH_WRSETH_ETH_21_PLASMA"] = "FLUID_ETH_WRSETH_ETH_21_PLASMA";
+})(FluidPlasmaVersions || (FluidPlasmaVersions = {}));
 export var FluidMainnetDepositToken;
 (function (FluidMainnetDepositToken) {
     FluidMainnetDepositToken["ETH"] = "ETH";
@@ -154,6 +178,12 @@ export var FluidBaseDepositToken;
     FluidBaseDepositToken["sUSDS"] = "sUSDS";
     FluidBaseDepositToken["GHO"] = "GHO";
 })(FluidBaseDepositToken || (FluidBaseDepositToken = {}));
+export var FluidPlasmaDepositToken;
+(function (FluidPlasmaDepositToken) {
+    FluidPlasmaDepositToken["USDe"] = "USDe";
+    FluidPlasmaDepositToken["USDT"] = "USDT";
+    FluidPlasmaDepositToken["ETH"] = "ETH";
+})(FluidPlasmaDepositToken || (FluidPlasmaDepositToken = {}));
 export var FluidVaultType;
 (function (FluidVaultType) {
     FluidVaultType["T1"] = "T1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.16",
+  "version": "2.1.17",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.7",
+    "@defisaver/tokens": "^1.7.9",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/config/contracts.ts

@@ -987,7 +987,8 @@ export const ETHPriceFeed =  {
       "1": { "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419" },
       "10": { "address": "0x13e3Ee699D1909E989722E753853AE30b17e08c5" },
       "8453": { "address": "0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70" },
-      "42161": { "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612" }
+      "42161": { "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612" },
+      "9745": { "address": "0x43A7dd2125266c5c4c26EB86cd61241132426Fe7" },
     },
   } as const;
 export const BTCPriceFeed = {
@@ -996,7 +997,8 @@ export const BTCPriceFeed = {
       "1": { "address": "0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c" },
       "10": { "address": "0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593" },
       "8453": { "address": "0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F" },
-      "42161": { "address": "0x6ce185860a4963106506C203335A2910413708e9" }
+      "42161": { "address": "0x6ce185860a4963106506C203335A2910413708e9" },
+      "9745": { "address": "0x3Bc5434dd1Fc6a1B68625e0269B9818cDd9E21B5" }
     },
 } as const;
 export const USDCPriceFeed =  {
@@ -1064,7 +1066,8 @@ export const 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" }
     }
   } as const;
 export const LlamaLendView =  {
@@ -1124,6 +1127,7 @@ export const FluidView =  {
     "networks": {
       "1": { "address": "0xc8df052bD7A8d76a34c09e758Dff3c6298C0115c" },
       "8453": { "address": "0x6cd4D6af4F292817eA2A2311F099dF26cd015028" },
+      "9745": { "address": "0x27C0BAe2338cE28097122393faF90375B9395dd1" },
       "42161": { "address": "0xf9e6d5568887ac8eC6fA33B7eefD2A176A958e71" }
     }
   } as const;

package/src/fluid/index.ts

@@ -1,7 +1,6 @@
 import Dec from 'decimal.js';
 import {
-  assetAmountInEth,
-  AssetData, getAssetInfo, getAssetInfoByAddress,
+  assetAmountInEth, AssetData, getAssetInfo, getAssetInfoByAddress,
 } from '@defisaver/tokens';
 import { Client, PublicClient } from 'viem';
 import {
@@ -9,7 +8,8 @@ import {
 } from '../types/common';
 import {
   FluidAggregatedVaultData,
-  FluidAssetData, FluidAssetsData,
+  FluidAssetData,
+  FluidAssetsData,
   FluidFTokenDataStructOutput,
   FluidMarketData,
   FluidMarketInfo,
@@ -19,13 +19,22 @@ import {
   FluidUserPositionStructOutputStruct,
   FluidVaultData,
   FluidVaultDataStructOutputStruct,
-  FluidVaultType, InnerFluidMarketData,
+  FluidVaultType,
+  InnerFluidMarketData,
 } from '../types';
 import {
-  BTCPriceFeedContractViem, DFSFeedRegistryContractViem, ETHPriceFeedContractViem, FeedRegistryContractViem, FluidViewContractViem,
+  BTCPriceFeedContractViem,
+  DFSFeedRegistryContractViem,
+  ETHPriceFeedContractViem,
+  FeedRegistryContractViem,
+  FluidViewContractViem,
 } from '../contracts';
 import {
-  compareAddresses, DEFAULT_TIMEOUT, getEthAmountForDecimals, isMainnetNetwork,
+  compareAddresses,
+  DEFAULT_TIMEOUT,
+  getEthAmountForDecimals,
+  getNativeAssetFromWrapped,
+  isMainnetNetwork,
 } from '../services/utils';
 import {
   getFluidAggregatedData,
@@ -38,13 +47,22 @@ import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddres
 import { USD_QUOTE, ZERO_ADDRESS } from '../constants';
 import {
   getChainlinkAssetAddress,
+  getSyrupUSDTChainLinkPriceCalls,
+  getSyrupUSDTPrice,
   getWeETHChainLinkPriceCalls,
   getWeETHPrice,
+  getWsrETHChainLinkPriceCalls,
+  getWsrETHPrice,
   getWstETHChainLinkPriceCalls,
   getWstETHPrice,
   getWstETHPriceFluid,
+  getWstUSRChainLinkPriceCalls,
+  getWstUSRPrice,
+  parseSyrupUSDTPriceCalls,
   parseWeETHPriceCalls,
+  parseWrsETHPriceCalls,
   parseWstETHPriceCalls,
+  parseWstUSRPriceCalls,
 } from '../services/priceService';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getViemProvider } from '../services/viem';
@@ -105,7 +123,10 @@ const getChainLinkPricesForTokens = async (
     const chainLinkFeedAddress = getChainlinkAssetAddress(assetInfo.symbol, network);
 
     if (assetInfo.symbol === 'wstETH') return getWstETHChainLinkPriceCalls(client, network);
-    if (assetInfo.symbol === 'weETH') return getWeETHChainLinkPriceCalls(client, network);
+    if (assetInfo.symbol === 'weETH' && network !== NetworkNumber.Plasma) return getWeETHChainLinkPriceCalls(client, network);
+    if (assetInfo.symbol === 'wrsETH' && network === NetworkNumber.Plasma) return getWsrETHChainLinkPriceCalls(client, network);
+    if (assetInfo.symbol === 'syrupUSDT') return getSyrupUSDTChainLinkPriceCalls(client, network);
+    if (assetInfo.symbol === 'wstUSR') return getWstUSRChainLinkPriceCalls(client, network);
 
     if (isMainnet) {
       const feedRegistryContract = FeedRegistryContractViem(client, NetworkNumber.Eth);
@@ -156,6 +177,50 @@ const getChainLinkPricesForTokens = async (
         break;
       }
 
+      case 'wrsETH': {
+        const {
+          ethPrice,
+          wrsETHRate,
+        } = parseWrsETHPriceCalls(
+          // @ts-ignore
+          results[i + offset].result[1]!.toString(),
+          // @ts-ignore
+          results[i + offset + 1].result[1]!.toString(),
+        );
+        offset += 1;
+        acc[token] = new Dec(ethPrice).mul(wrsETHRate).toString();
+        break;
+      }
+
+      case 'syrupUSDT': {
+        const {
+          syrupUSDTRate,
+          USDTRate,
+        } = parseSyrupUSDTPriceCalls(
+          // @ts-ignore
+          results[i + offset].result[1]!.toString(),
+          // @ts-ignore
+          results[i + offset + 1].result[1]!.toString(),
+        );
+        offset += 1;
+        acc[token] = new Dec(syrupUSDTRate).mul(USDTRate).toString();
+        break;
+      }
+      case 'wstUSR': {
+        const {
+          wstUSRRate,
+          USRRate,
+        } = parseWstUSRPriceCalls(
+          // @ts-ignore
+          results[i + offset].result[1]!.toString(),
+          // @ts-ignore
+          results[i + offset + 1].result[1]!.toString(),
+        );
+        offset += 1;
+        acc[token] = new Dec(wstUSRRate).mul(USRRate).toString();
+        break;
+      }
+
       // TODO: These addresses do not have chainlink feeds, so we need to handle them separately, this is hotfix
       case 'ezETH': {
         acc[token] = new Dec(ethPriceChainlink).mul(1.049).toString();
@@ -179,17 +244,29 @@ const getChainLinkPricesForTokens = async (
       }
 
       case 'weETH': {
-        const {
-          ethPrice,
-          weETHRate,
-        } = parseWeETHPriceCalls(
-          results[i + offset].result!.toString(),
+        if (network !== NetworkNumber.Plasma) {
+          const {
+            ethPrice,
+            weETHRate,
+          } = 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 Dec(ethPrice).mul(weETHRate).toString();
           // @ts-ignore
-          results[i + offset + 1].result[1]!.toString(),
-          results[i + offset + 2].result!.toString(),
-        );
-        offset += 2;
-        acc[token] = new Dec(ethPrice).mul(weETHRate).toString();
+        } else if (results[i + offset].result?.[1]) {
+          // For Plasma, use default chainlink feed (latestRoundData format)
+          // @ts-ignore
+          acc[token] = new Dec(results[i + offset].result[1]!.toString() as string).div(1e8).toString();
+        } else if (results[i + offset].result) {
+          // For Plasma, use default chainlink feed (latestAnswer format)
+          acc[token] = new Dec(results[i + offset].result!.toString() as string).div(1e8).toString();
+        } else {
+          acc[token] = '0';
+        }
         break;
       }
 
@@ -226,8 +303,13 @@ const getTokenPriceFromChainlink = async (asset: AssetData, network: NetworkNumb
   } else {
     // Currently only base network is supported
     const feedRegistryContract = DFSFeedRegistryContractViem(provider, network);
-    const roundPriceData = isTokenUSDA ? [0, '100000000'] : await feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]);
-    loanTokenPrice = roundPriceData[1].toString();
+    try {
+      const roundPriceData = isTokenUSDA ? [0, '100000000'] : await feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]);
+      loanTokenPrice = roundPriceData[1].toString();
+    } catch (err) {
+      console.error(`Error fetching price for ${asset.symbol} on ${network}: ${err}`);
+      loanTokenPrice = '0';
+    }
   }
 
   return new Dec(loanTokenPrice).div(1e8).toString();
@@ -274,8 +356,10 @@ const getTradingApy = async (poolAddress: EthAddress) => {
 };
 
 const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
-  const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
-  const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
+  const collAssetContract = getAssetInfoByAddress(data.supplyToken0, network);
+  const collAsset = getAssetInfo(getNativeAssetFromWrapped(collAssetContract.symbol), network);
+  const debtAssetContract = getAssetInfoByAddress(data.borrowToken0, network);
+  const debtAsset = getAssetInfo(getNativeAssetFromWrapped(debtAssetContract.symbol), network);
 
   const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
   const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
@@ -287,7 +371,7 @@ const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   if (tokenPrices) {
     debtPriceParsed = tokenPrices[debtAsset.symbol] || '0';
   } else {
-    debtPriceParsed = await getTokenPriceFromChainlink(debtAsset, network, provider);
+    debtPriceParsed = await getTokenPriceFromChainlink(debtAssetContract, network, provider);
   }
 
   const collAssetData: FluidAssetData = {
@@ -392,9 +476,12 @@ const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStr
 };
 
 const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
-  const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
-  const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
-  const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
+  const collAsset0Contract = getAssetInfoByAddress(data.supplyToken0, network);
+  const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(collAsset0Contract.symbol), network);
+  const collAsset1Contract = getAssetInfoByAddress(data.supplyToken1, network);
+  const collAsset1 = getAssetInfo(getNativeAssetFromWrapped(collAsset1Contract.symbol), network);
+  const debtAssetContract = getAssetInfoByAddress(data.borrowToken0, network);
+  const debtAsset = getAssetInfo(getNativeAssetFromWrapped(debtAssetContract.symbol), network);
 
   // 18 because collateral is represented in shares for which they use 18 decimals
   const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(18).toString();
@@ -405,7 +492,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   if (tokenPrices) {
     prices = tokenPrices;
   } else {
-    prices = await getChainLinkPricesForTokens([collAsset0.address, collAsset1.address, debtAsset.address], network, provider);
+    prices = await getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAssetContract.address], network, provider);
   }
 
   const {
@@ -432,7 +519,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const collFirstAssetData: Partial<FluidAssetData> = {
     symbol: collAsset0.symbol,
     address: collAsset0.address,
-    price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
+    price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
     totalSupply: new Dec(totalSupplyShares).mul(token0PerSupplyShare).toString(),
     canBeSupplied: true,
     supplyRate: supplyRate0,
@@ -455,7 +542,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const collSecondAssetData: Partial<FluidAssetData> = {
     symbol: collAsset1.symbol,
     address: collAsset1.address,
-    price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
+    price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
     totalSupply: new Dec(totalSupplyShares).mul(token1PerSupplyShare).toString(),
     canBeSupplied: true,
     supplyRate: supplyRate1,
@@ -482,7 +569,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
   const debtAssetData: Partial<FluidAssetData> = {
     symbol: debtAsset.symbol,
-    price: prices[tokenPrices ? debtAsset.symbol : debtAsset.address],
+    price: prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address],
     address: debtAsset.address,
     totalBorrow: data.totalBorrowVault.toString(),
     canBeBorrowed: true,
@@ -520,7 +607,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const liqFactor = new Dec(data.liquidationThreshold).div(10_000).toString();
 
   const totalSupplySharesInVault = assetAmountInEth(data.totalSupplyVault.toString());
-  const collSharePrice = new Dec(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAsset.address]).toString();
+  const collSharePrice = new Dec(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address]).toString();
   const totalSupplyVaultUsd = new Dec(totalSupplySharesInVault).mul(collSharePrice).toString();
   const maxSupplySharesUsd = new Dec(maxSupplyShares).mul(collSharePrice).toString();
 
@@ -582,9 +669,12 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
 };
 
 const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
-  const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
-  const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
-  const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
+  const collAssetContract = getAssetInfoByAddress(data.supplyToken0, network);
+  const collAsset = getAssetInfo(getNativeAssetFromWrapped(collAssetContract.symbol), network);
+  const debtAsset0Contract = getAssetInfoByAddress(data.borrowToken0, network);
+  const debtAsset0 = getAssetInfo(getNativeAssetFromWrapped(debtAsset0Contract.symbol), network);
+  const debtAsset1Contract = getAssetInfoByAddress(data.borrowToken1, network);
+  const debtAsset1 = getAssetInfo(getNativeAssetFromWrapped(debtAsset1Contract.symbol), network);
 
   const {
     borrowableShares,
@@ -616,14 +706,14 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   if (tokenPrices) {
     prices = tokenPrices;
   } else {
-    prices = await getChainLinkPricesForTokens([collAsset.address, debtAsset0.address, debtAsset1.address], network, provider);
+    prices = await getChainLinkPricesForTokens([collAssetContract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider);
   }
 
   const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
   const collAssetData: Partial<FluidAssetData> = {
     symbol: collAsset.symbol,
     address: collAsset.address,
-    price: prices[tokenPrices ? collAsset.symbol : collAsset.address],
+    price: prices[tokenPrices ? collAsset.symbol : collAssetContract.address],
     totalSupply: data.totalSupplyVault.toString(),
     canBeSupplied: true,
     supplyRate,
@@ -644,7 +734,7 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const debtAsset0Data: Partial<FluidAssetData> = {
     symbol: debtAsset0.symbol,
     address: debtAsset0.address,
-    price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
+    price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
     totalBorrow: new Dec(totalBorrowShares).mul(token0PerBorrowShare).toString(),
     canBeBorrowed: true,
     borrowRate: borrowRate0,
@@ -667,7 +757,7 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const debtAsset1Data: Partial<FluidAssetData> = {
     symbol: debtAsset1.symbol,
     address: debtAsset1.address,
-    price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
+    price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
     totalBorrow: new Dec(totalBorrowShares).mul(token1PerBorrowShare).toString(),
     canBeBorrowed: true,
     borrowRate: borrowRate1,
@@ -769,10 +859,14 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
 };
 
 const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
-  const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
-  const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
-  const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
-  const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
+  const collAsset0Contract = getAssetInfoByAddress(data.supplyToken0, network);
+  const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(collAsset0Contract.symbol), network);
+  const collAsset1Contract = getAssetInfoByAddress(data.supplyToken1, network);
+  const collAsset1 = getAssetInfo(getNativeAssetFromWrapped(collAsset1Contract.symbol), network);
+  const debtAsset0Contract = getAssetInfoByAddress(data.borrowToken0, network);
+  const debtAsset0 = getAssetInfo(getNativeAssetFromWrapped(debtAsset0Contract.symbol), network);
+  const debtAsset1Contract = getAssetInfoByAddress(data.borrowToken1, network);
+  const debtAsset1 = getAssetInfo(getNativeAssetFromWrapped(debtAsset1Contract.symbol), network);
   const quoteToken = getAssetInfoByAddress(data.dexBorrowData.quoteToken, network);
 
   // 27 - 18 + 18
@@ -785,7 +879,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
     prices = tokenPrices;
   } else {
     prices = await getChainLinkPricesForTokens(
-      [collAsset0.address, collAsset1.address, debtAsset0.address, debtAsset1.address],
+      [collAsset0Contract.address, collAsset1Contract.address, debtAsset0Contract.address, debtAsset1Contract.address],
       network, provider);
   }
 
@@ -835,7 +929,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const collAsset0Data: Partial<FluidAssetData> = {
     symbol: collAsset0.symbol,
     address: collAsset0.address,
-    price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
+    price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
     totalSupply: new Dec(totalSupplyShares).mul(token0PerSupplyShare).toString(),
     canBeSupplied: true,
     supplyRate: supplyRate0,
@@ -858,7 +952,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const collAsset1Data: Partial<FluidAssetData> = {
     symbol: collAsset1.symbol,
     address: collAsset1.address,
-    price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
+    price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
     totalSupply: new Dec(totalSupplyShares).mul(token1PerSupplyShare).toString(),
     canBeSupplied: true,
     supplyRate: supplyRate1,
@@ -881,7 +975,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const debtAsset0Data: Partial<FluidAssetData> = {
     symbol: debtAsset0.symbol,
     address: debtAsset0.address,
-    price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
+    price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
     totalBorrow: new Dec(totalBorrowShares).mul(token0PerBorrowShare).toString(),
     canBeBorrowed: true,
     borrowRate: borrowRate0,
@@ -904,7 +998,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
   const debtAsset1Data: Partial<FluidAssetData> = {
     symbol: debtAsset1.symbol,
     address: debtAsset1.address,
-    price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
+    price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
     totalBorrow: new Dec(totalBorrowShares).mul(token1PerBorrowShare).toString(),
     canBeBorrowed: true,
     borrowRate: borrowRate1,
@@ -1580,10 +1674,22 @@ const getTokenPricePortfolio = async (token: string, provider: PublicClient, net
   if (token === 'wstETH') {
     return getWstETHPrice(provider, network);
   }
-  if (token === 'weETH') {
+  if (token === 'weETH' && network !== NetworkNumber.Plasma) {
     return getWeETHPrice(provider, network);
   }
 
+  if (token === 'wrsETH') {
+    return getWsrETHPrice(provider, network);
+  }
+
+  if (token === 'syrupUSDT') {
+    return getSyrupUSDTPrice(provider, network);
+  }
+
+  if (token === 'wstUSR') {
+    return getWstUSRPrice(provider, network);
+  }
+
   const isMainnet = isMainnetNetwork(network);
   const chainLinkFeedAddress = getChainlinkAssetAddress(token, network);
   if (isMainnet) {