@defisaver/positions-sdk 2.1.11 → 2.1.13-dev-plasma-fluid

package/esm/fluid/index.js

@@ -12,7 +12,7 @@ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress, } from '@defisav
 import { IncentiveKind, NetworkNumber, } from '../types/common';
 import { FluidVaultType, } from '../types';
 import { BTCPriceFeedContractViem, DFSFeedRegistryContractViem, ETHPriceFeedContractViem, FeedRegistryContractViem, FluidViewContractViem, } from '../contracts';
-import { compareAddresses, DEFAULT_TIMEOUT, getEthAmountForDecimals, isMainnetNetwork, } from '../services/utils';
+import { compareAddresses, DEFAULT_TIMEOUT, getEthAmountForDecimals, getNativeAssetFromWrapped, isMainnetNetwork, } from '../services/utils';
 import { getFluidAggregatedData, mergeAssetData, mergeUsedAssets, parseDexBorrowData, parseDexSupplyData, } from '../helpers/fluidHelpers';
 import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE, ZERO_ADDRESS } from '../constants';
@@ -66,7 +66,7 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
         const chainLinkFeedAddress = getChainlinkAssetAddress(assetInfo.symbol, network);
         if (assetInfo.symbol === 'wstETH')
             return getWstETHChainLinkPriceCalls(client, network);
-        if (assetInfo.symbol === 'weETH')
+        if (assetInfo.symbol === 'weETH' && network !== NetworkNumber.Plasma)
             return getWeETHChainLinkPriceCalls(client, network);
         if (isMainnet) {
             const feedRegistryContract = FeedRegistryContractViem(client, NetworkNumber.Eth);
@@ -92,7 +92,7 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
     const btcPriceChainlink = new Dec(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 = getAssetInfoByAddress(token, network);
         switch (assetInfo.symbol) {
             case 'USDA':
@@ -128,16 +128,31 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 break;
             }
             case 'weETH': {
-                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();
+                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
+                }
+                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 Dec(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 Dec(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 Dec(results[i + offset].result[1].toString()).div(1e8).toString();
                 }
@@ -170,8 +185,14 @@ const getTokenPriceFromChainlink = (asset, network, provider) => __awaiter(void
     else {
         // Currently only base network is supported
         const feedRegistryContract = DFSFeedRegistryContractViem(provider, network);
-        const roundPriceData = isTokenUSDA ? [0, '100000000'] : yield feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]);
-        loanTokenPrice = roundPriceData[1].toString();
+        try {
+            const roundPriceData = isTokenUSDA ? [0, '100000000'] : yield 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();
 });
@@ -208,8 +229,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 collAsset = getAssetInfoByAddress(data.supplyToken0, network);
-    const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
+    const collAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
+    const debtAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
     const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
     const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
     const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(collAsset.decimals).toString();
@@ -318,9 +339,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 collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
-    const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
-    const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
+    const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
+    const collAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken1, network).symbol), network);
+    const debtAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).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();
     const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
@@ -471,9 +492,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 collAsset = getAssetInfoByAddress(data.supplyToken0, network);
-    const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
-    const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
+    const collAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
+    const debtAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
+    const debtAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken1, network).symbol), network);
     const { borrowableShares, maxBorrowShares, borrowDexFee, utilizationBorrow0, utilizationBorrow1, borrowable0, borrowable1, borrowRate0, borrowRate1, totalBorrowShares, token0PerBorrowShare, token1PerBorrowShare, borrowableToken0, borrowableToken1, totalBorrowToken0, totalBorrowToken1, reservesBorrowToken0, reservesBorrowToken1, } = parseDexBorrowData(data.dexBorrowData, debtAsset0.symbol, debtAsset1.symbol);
     // 18 because debt is represented in shares for which they use 18 decimals
     const oracleScaleFactor = new Dec(27).add(18).sub(collAsset.decimals).toString();
@@ -620,10 +641,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 collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
-    const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
-    const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
-    const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
+    const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
+    const collAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken1, network).symbol), network);
+    const debtAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
+    const debtAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken1, network).symbol), network);
     const quoteToken = getAssetInfoByAddress(data.dexBorrowData.quoteToken, network);
     // 27 - 18 + 18
     const oracleScaleFactor = new Dec(27).toString();
@@ -1170,7 +1191,7 @@ const getTokenPricePortfolio = (token, provider, network) => __awaiter(void 0, v
     if (token === 'wstETH') {
         return getWstETHPrice(provider, network);
     }
-    if (token === 'weETH') {
+    if (token === 'weETH' && network !== NetworkNumber.Plasma) {
         return getWeETHPrice(provider, network);
     }
     const isMainnet = isMainnetNetwork(network);

package/esm/helpers/morphoBlueHelpers/index.js

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

package/esm/markets/aave/marketAssets.js

@@ -15,7 +15,7 @@ export const aaveV3AssetsDefaultMarketOpt = [
 export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
 export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
 export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC'];
-export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH'];
+export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const aaveV3AssetsDefaultMarket = {
     [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,

package/esm/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_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;
@@ -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;