@defisaver/positions-sdk 2.1.13-dev-plasma-fluid3 → 2.1.14

package/cjs/config/contracts.d.ts

@@ -71006,9 +71006,6 @@ export declare const ETHPriceFeed: {
         readonly "42161": {
             readonly address: "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612";
         };
-        readonly "9745": {
-            readonly address: "0x43A7dd2125266c5c4c26EB86cd61241132426Fe7";
-        };
     };
 };
 export declare const BTCPriceFeed: {
@@ -71418,9 +71415,6 @@ export declare const BTCPriceFeed: {
         readonly "42161": {
             readonly address: "0x6ce185860a4963106506C203335A2910413708e9";
         };
-        readonly "9745": {
-            readonly address: "0x3Bc5434dd1Fc6a1B68625e0269B9818cDd9E21B5";
-        };
     };
 };
 export declare const USDCPriceFeed: {
@@ -75043,9 +75037,6 @@ export declare const DFSFeedRegistry: {
         readonly "42161": {
             readonly address: "0x158E27De8B5E5bC3FA1C6D5b365a291c54f6b0Fd";
         };
-        readonly "9745": {
-            readonly address: "0x2226836ec16FF5974dFD8DF740CD461B42FAffD5";
-        };
     };
 };
 export declare const LlamaLendView: {
@@ -82004,9 +81995,6 @@ 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,8 +989,7 @@ exports.ETHPriceFeed = {
         "1": { "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419" },
         "10": { "address": "0x13e3Ee699D1909E989722E753853AE30b17e08c5" },
         "8453": { "address": "0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70" },
-        "42161": { "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612" },
-        "9745": { "address": "0x43A7dd2125266c5c4c26EB86cd61241132426Fe7" },
+        "42161": { "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612" }
     },
 };
 exports.BTCPriceFeed = {
@@ -999,8 +998,7 @@ exports.BTCPriceFeed = {
         "1": { "address": "0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c" },
         "10": { "address": "0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593" },
         "8453": { "address": "0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F" },
-        "42161": { "address": "0x6ce185860a4963106506C203335A2910413708e9" },
-        "9745": { "address": "0x3Bc5434dd1Fc6a1B68625e0269B9818cDd9E21B5" }
+        "42161": { "address": "0x6ce185860a4963106506C203335A2910413708e9" }
     },
 };
 exports.USDCPriceFeed = {
@@ -1068,8 +1066,7 @@ 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" },
-        "9745": { "address": "0x2226836ec16FF5974dFD8DF740CD461B42FAffD5" }
+        "42161": { "address": "0x158E27De8B5E5bC3FA1C6D5b365a291c54f6b0Fd" }
     }
 };
 exports.LlamaLendView = {
@@ -1129,7 +1126,6 @@ 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' && network !== common_1.NetworkNumber.Plasma)
+        if (assetInfo.symbol === 'weETH')
             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, _b;
+        var _a;
         const assetInfo = (0, tokens_1.getAssetInfoByAddress)(token, network);
         switch (assetInfo.symbol) {
             case 'USDA':
@@ -134,31 +134,16 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'weETH': {
-                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';
-                }
+                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();
                 break;
             }
             default:
                 // @ts-ignore
-                if ((_b = results[i + offset].result) === null || _b === void 0 ? void 0 : _b[1]) {
+                if ((_a = results[i + offset].result) === null || _a === void 0 ? void 0 : _a[1]) {
                     // @ts-ignore
                     acc[token] = new decimal_js_1.default(results[i + offset].result[1].toString()).div(1e8).toString();
                 }
@@ -191,14 +176,8 @@ const getTokenPriceFromChainlink = (asset, network, provider) => __awaiter(void
     else {
         // Currently only base network is supported
         const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(provider, network);
-        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';
-        }
+        const roundPriceData = isTokenUSDA ? [0, '100000000'] : yield feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, constants_1.USD_QUOTE]);
+        loanTokenPrice = roundPriceData[1].toString();
     }
     return new decimal_js_1.default(loanTokenPrice).div(1e8).toString();
 });
@@ -235,10 +214,8 @@ const getTradingApy = (poolAddress) => __awaiter(void 0, void 0, void 0, functio
 });
 const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
     var _a, _b;
-    const collAssetContract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
-    const collAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAssetContract.symbol), network);
-    const debtAssetContract = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
-    const debtAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(debtAssetContract.symbol), network);
+    const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
+    const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
     const supplyRate = new decimal_js_1.default(data.supplyRateVault).div(100).toString();
     const borrowRate = new decimal_js_1.default(data.borrowRateVault).div(100).toString();
     const oracleScaleFactor = new decimal_js_1.default(27).add(debtAsset.decimals).sub(collAsset.decimals).toString();
@@ -249,7 +226,7 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         debtPriceParsed = tokenPrices[debtAsset.symbol] || '0';
     }
     else {
-        debtPriceParsed = yield getTokenPriceFromChainlink(debtAssetContract, network, provider);
+        debtPriceParsed = yield getTokenPriceFromChainlink(debtAsset, network, provider);
     }
     const collAssetData = {
         symbol: collAsset.symbol,
@@ -347,12 +324,9 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
 });
 const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
     var _a, _b, _c;
-    const collAsset0Contract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
-    const collAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAsset0Contract.symbol), network);
-    const collAsset1Contract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
-    const collAsset1 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAsset1Contract.symbol), network);
-    const debtAssetContract = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
-    const debtAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(debtAssetContract.symbol), network);
+    const collAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
+    const collAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
+    const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
     // 18 because collateral is represented in shares for which they use 18 decimals
     const oracleScaleFactor = new decimal_js_1.default(27).add(debtAsset.decimals).sub(18).toString();
     const oracleScale = new decimal_js_1.default(10).pow(oracleScaleFactor).toString();
@@ -362,13 +336,13 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         prices = tokenPrices;
     }
     else {
-        prices = yield getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAssetContract.address], network, provider);
+        prices = yield getChainLinkPricesForTokens([collAsset0.address, collAsset1.address, debtAsset.address], network, provider);
     }
     const { supplyDexFee, totalSupplyShares, supplyRate1, totalSupplyToken1, token0PerSupplyShare, token1PerSupplyShare, totalSupplyToken0, maxSupplyShares, withdrawableToken0, withdrawable0, withdrawableToken1, withdrawable1, supplyRate0, utilizationSupply0, utilizationSupply1, withdrawableShares, reservesSupplyToken0, reservesSupplyToken1, } = (0, fluidHelpers_1.parseDexSupplyData)(data.dexSupplyData, collAsset0.symbol, collAsset1.symbol);
     const collFirstAssetData = {
         symbol: collAsset0.symbol,
         address: collAsset0.address,
-        price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
+        price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
         totalSupply: new decimal_js_1.default(totalSupplyShares).mul(token0PerSupplyShare).toString(),
         canBeSupplied: true,
         supplyRate: supplyRate0,
@@ -390,7 +364,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     const collSecondAssetData = {
         symbol: collAsset1.symbol,
         address: collAsset1.address,
-        price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
+        price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
         totalSupply: new decimal_js_1.default(totalSupplyShares).mul(token1PerSupplyShare).toString(),
         canBeSupplied: true,
         supplyRate: supplyRate1,
@@ -415,7 +389,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     const borrowRate = new decimal_js_1.default(data.borrowRateVault).div(100).toString();
     const debtAssetData = {
         symbol: debtAsset.symbol,
-        price: prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address],
+        price: prices[tokenPrices ? debtAsset.symbol : debtAsset.address],
         address: debtAsset.address,
         totalBorrow: data.totalBorrowVault.toString(),
         canBeBorrowed: true,
@@ -444,7 +418,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     const liquidationMaxLimit = new decimal_js_1.default(data.liquidationMaxLimit).div(100).toString();
     const liqFactor = new decimal_js_1.default(data.liquidationThreshold).div(10000).toString();
     const totalSupplySharesInVault = (0, tokens_1.assetAmountInEth)(data.totalSupplyVault.toString());
-    const collSharePrice = new decimal_js_1.default(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address]).toString();
+    const collSharePrice = new decimal_js_1.default(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAsset.address]).toString();
     const totalSupplyVaultUsd = new decimal_js_1.default(totalSupplySharesInVault).mul(collSharePrice).toString();
     const maxSupplySharesUsd = new decimal_js_1.default(maxSupplyShares).mul(collSharePrice).toString();
     const withdrawableUSD = new decimal_js_1.default(withdrawableShares).mul(collSharePrice).toString();
@@ -503,12 +477,9 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
 });
 const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
     var _a, _b, _c, _d;
-    const collAssetContract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
-    const collAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAssetContract.symbol), network);
-    const debtAsset0Contract = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
-    const debtAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(debtAsset0Contract.symbol), network);
-    const debtAsset1Contract = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network);
-    const debtAsset1 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(debtAsset1Contract.symbol), network);
+    const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
+    const debtAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
+    const debtAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network);
     const { borrowableShares, maxBorrowShares, borrowDexFee, utilizationBorrow0, utilizationBorrow1, borrowable0, borrowable1, borrowRate0, borrowRate1, totalBorrowShares, token0PerBorrowShare, token1PerBorrowShare, borrowableToken0, borrowableToken1, totalBorrowToken0, totalBorrowToken1, reservesBorrowToken0, reservesBorrowToken1, } = (0, fluidHelpers_1.parseDexBorrowData)(data.dexBorrowData, debtAsset0.symbol, debtAsset1.symbol);
     // 18 because debt is represented in shares for which they use 18 decimals
     const oracleScaleFactor = new decimal_js_1.default(27).add(18).sub(collAsset.decimals).toString();
@@ -519,13 +490,13 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         prices = tokenPrices;
     }
     else {
-        prices = yield getChainLinkPricesForTokens([collAssetContract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider);
+        prices = yield getChainLinkPricesForTokens([collAsset.address, debtAsset0.address, debtAsset1.address], network, provider);
     }
     const supplyRate = new decimal_js_1.default(data.supplyRateVault).div(100).toString();
     const collAssetData = {
         symbol: collAsset.symbol,
         address: collAsset.address,
-        price: prices[tokenPrices ? collAsset.symbol : collAssetContract.address],
+        price: prices[tokenPrices ? collAsset.symbol : collAsset.address],
         totalSupply: data.totalSupplyVault.toString(),
         canBeSupplied: true,
         supplyRate,
@@ -544,7 +515,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     const debtAsset0Data = {
         symbol: debtAsset0.symbol,
         address: debtAsset0.address,
-        price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
+        price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
         totalBorrow: new decimal_js_1.default(totalBorrowShares).mul(token0PerBorrowShare).toString(),
         canBeBorrowed: true,
         borrowRate: borrowRate0,
@@ -566,7 +537,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     const debtAsset1Data = {
         symbol: debtAsset1.symbol,
         address: debtAsset1.address,
-        price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
+        price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
         totalBorrow: new decimal_js_1.default(totalBorrowShares).mul(token1PerBorrowShare).toString(),
         canBeBorrowed: true,
         borrowRate: borrowRate1,
@@ -655,14 +626,10 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
 });
 const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
     var _a, _b, _c, _d;
-    const collAsset0Contract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
-    const collAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAsset0Contract.symbol), network);
-    const collAsset1Contract = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
-    const collAsset1 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(collAsset1Contract.symbol), network);
-    const debtAsset0Contract = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
-    const debtAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(debtAsset0Contract.symbol), network);
-    const debtAsset1Contract = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network);
-    const debtAsset1 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)(debtAsset1Contract.symbol), network);
+    const collAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
+    const collAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
+    const debtAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
+    const debtAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network);
     const quoteToken = (0, tokens_1.getAssetInfoByAddress)(data.dexBorrowData.quoteToken, network);
     // 27 - 18 + 18
     const oracleScaleFactor = new decimal_js_1.default(27).toString();
@@ -673,14 +640,14 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         prices = tokenPrices;
     }
     else {
-        prices = yield getChainLinkPricesForTokens([collAsset0Contract.address, collAsset1Contract.address, debtAsset0Contract.address, debtAsset1Contract.address], network, provider);
+        prices = yield getChainLinkPricesForTokens([collAsset0.address, collAsset1.address, debtAsset0.address, debtAsset1.address], network, provider);
     }
     const { supplyDexFee, totalSupplyShares, supplyRate1, token0PerSupplyShare, token1PerSupplyShare, totalSupplyToken0, totalSupplyToken1, maxSupplyShares, withdrawableToken0, withdrawable0, withdrawableToken1, withdrawable1, supplyRate0, utilizationSupply0, utilizationSupply1, withdrawableShares, reservesSupplyToken0, reservesSupplyToken1, } = (0, fluidHelpers_1.parseDexSupplyData)(data.dexSupplyData, collAsset0.symbol, collAsset1.symbol);
     const { borrowableShares, maxBorrowShares, borrowDexFee, utilizationBorrow0, utilizationBorrow1, borrowable0, borrowable1, borrowRate0, borrowRate1, totalBorrowShares, token0PerBorrowShare, token1PerBorrowShare, borrowableToken0, borrowableToken1, totalBorrowToken0, totalBorrowToken1, quoteTokensPerShare, reservesBorrowToken0, reservesBorrowToken1, } = (0, fluidHelpers_1.parseDexBorrowData)(data.dexBorrowData, debtAsset0.symbol, debtAsset1.symbol);
     const collAsset0Data = {
         symbol: collAsset0.symbol,
         address: collAsset0.address,
-        price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
+        price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
         totalSupply: new decimal_js_1.default(totalSupplyShares).mul(token0PerSupplyShare).toString(),
         canBeSupplied: true,
         supplyRate: supplyRate0,
@@ -702,7 +669,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     const collAsset1Data = {
         symbol: collAsset1.symbol,
         address: collAsset1.address,
-        price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
+        price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
         totalSupply: new decimal_js_1.default(totalSupplyShares).mul(token1PerSupplyShare).toString(),
         canBeSupplied: true,
         supplyRate: supplyRate1,
@@ -724,7 +691,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     const debtAsset0Data = {
         symbol: debtAsset0.symbol,
         address: debtAsset0.address,
-        price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
+        price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
         totalBorrow: new decimal_js_1.default(totalBorrowShares).mul(token0PerBorrowShare).toString(),
         canBeBorrowed: true,
         borrowRate: borrowRate0,
@@ -746,7 +713,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     const debtAsset1Data = {
         symbol: debtAsset1.symbol,
         address: debtAsset1.address,
-        price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
+        price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
         totalBorrow: new decimal_js_1.default(totalBorrowShares).mul(token1PerBorrowShare).toString(),
         canBeBorrowed: true,
         borrowRate: borrowRate1,
@@ -1227,7 +1194,7 @@ const getTokenPricePortfolio = (token, provider, network) => __awaiter(void 0, v
     if (token === 'wstETH') {
         return (0, priceService_1.getWstETHPrice)(provider, network);
     }
-    if (token === 'weETH' && network !== common_1.NetworkNumber.Plasma) {
+    if (token === 'weETH') {
         return (0, priceService_1.getWeETHPrice)(provider, network);
     }
     const isMainnet = (0, utils_1.isMainnetNetwork)(network);

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

@@ -116,27 +116,6 @@ 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;
@@ -254,27 +233,6 @@ 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_USDAI_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;
@@ -302,9 +260,5 @@ 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;