@defisaver/positions-sdk 2.1.13-dev-plasma-fluid4 → 2.1.13-dev-plasma-fluid6

package/src/fluid/index.ts

@@ -47,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';
@@ -115,6 +124,9 @@ const getChainLinkPricesForTokens = async (
 
     if (assetInfo.symbol === 'wstETH') return getWstETHChainLinkPriceCalls(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);
@@ -165,6 +177,47 @@ const getChainLinkPricesForTokens = async (
         break;
       }
 
+      case 'wrsETH': {
+        const {
+          ethPrice,
+          wrsETHRate,
+        } = parseWrsETHPriceCalls(
+          results[i + offset].result!.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(
+          results[i + offset].result!.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(
+          results[i + offset].result!.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();
@@ -1622,6 +1675,18 @@ const getTokenPricePortfolio = async (token: string, provider: PublicClient, net
     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) {

package/src/services/priceService.ts

@@ -4,13 +4,15 @@ import { Client, PublicClient } from 'viem';
 import {
   BTCPriceFeedContractViem,
   COMPPriceFeedContractViem,
+  DFSFeedRegistryContractViem,
   ETHPriceFeedContractViem,
   USDCPriceFeedContractViem,
   WeETHPriceFeedContractViem,
   WstETHPriceFeedContractViem,
 } from '../contracts';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { EthAddress, NetworkNumber, HexString } from '../types/common';
 import { getEthAmountForDecimals } from './utils';
+import { USD_QUOTE } from '../constants';
 
 export const getEthPrice = async (client: Client) => {
   const contract = ETHPriceFeedContractViem(client, NetworkNumber.Eth);
@@ -64,6 +66,48 @@ export const getWeETHPrice = async (client: Client, network: NetworkNumber = Net
   return new Dec(ethPrice).mul(weETHRate).toString();
 };
 
+export const getWsrETHPrice = async (client: Client, network: NetworkNumber = NetworkNumber.Eth) => {
+  const feedRegistryContract = DFSFeedRegistryContractViem(client, network);
+  const [ethPriceWei, wrsETHRateWei] = await Promise.all([
+    feedRegistryContract.read.latestRoundData([getAssetInfo('WETH', network).address as HexString, USD_QUOTE]),
+    feedRegistryContract.read.latestRoundData([getAssetInfo('wrsETH', network).address as HexString, getAssetInfo('WETH', network).address as HexString]),
+  ]);
+
+  const ethPrice = new Dec(ethPriceWei[1].toString()).div(1e8);
+
+  const wrsETHRate = getEthAmountForDecimals(wrsETHRateWei[1].toString(), 18);
+
+  return new Dec(ethPrice).mul(wrsETHRate).toString();
+};
+
+export const getSyrupUSDTPrice = async (client: Client, network: NetworkNumber = NetworkNumber.Eth) => {
+  const feedRegistryContract = DFSFeedRegistryContractViem(client, network);
+  const [usdtPriceWei, syrupUSDTRateWei] = await Promise.all([
+    feedRegistryContract.read.latestRoundData([getAssetInfo('USDT', network).address as HexString, USD_QUOTE]),
+    feedRegistryContract.read.latestRoundData([getAssetInfo('syrupUSDT', network).address as HexString, getAssetInfo('USDT', network).address as HexString]),
+  ]);
+
+  const usdtPrice = new Dec(usdtPriceWei[1].toString()).div(1e8);
+
+  const syrupUSDTPrice = getEthAmountForDecimals(syrupUSDTRateWei[1].toString(), 18);
+
+  return new Dec(usdtPrice).mul(syrupUSDTPrice).toString();
+};
+
+export const getWstUSRPrice = async (client: Client, network: NetworkNumber = NetworkNumber.Eth) => {
+  const feedRegistryContract = DFSFeedRegistryContractViem(client, network);
+  const [usrPriceWei, wstUSRRateWei] = await Promise.all([
+    feedRegistryContract.read.latestRoundData([getAssetInfo('USR', network).address as HexString, USD_QUOTE]),
+    feedRegistryContract.read.latestRoundData([getAssetInfo('wstUSR', network).address as HexString, getAssetInfo('USR', network).address as HexString]),
+  ]);
+
+  const usrPrice = new Dec(usrPriceWei[1].toString()).div(1e8);
+
+  const wstUSRPrice = getEthAmountForDecimals(wstUSRRateWei[1].toString(), 18);
+
+  return new Dec(usrPrice).mul(wstUSRPrice).toString();
+};
+
 export const getWstETHChainLinkPriceCalls = (client: PublicClient, network: NetworkNumber) => {
   const wstETHFeedContract = WstETHPriceFeedContractViem(client, network);
   const ethFeedContract = ETHPriceFeedContractViem(client, network);
@@ -116,12 +160,87 @@ export const getWeETHChainLinkPriceCalls = (client: PublicClient, network: Netwo
   return calls;
 };
 
+export const getWsrETHChainLinkPriceCalls = (client: PublicClient, network: NetworkNumber) => {
+  const feedRegistryContract = DFSFeedRegistryContractViem(client, network);
+  const calls = [
+    {
+      address: feedRegistryContract.address,
+      abi: feedRegistryContract.abi,
+      functionName: 'latestRoundData',
+      args: [getAssetInfo('WETH', network).address, USD_QUOTE],
+    },
+    {
+      address: feedRegistryContract.address,
+      abi: feedRegistryContract.abi,
+      functionName: 'latestRoundData',
+      args: [getAssetInfo('wrsETH', network).address, getAssetInfo('WETH', network).address],
+    },
+  ];
+  return calls;
+};
+
+export const getSyrupUSDTChainLinkPriceCalls = (client: PublicClient, network: NetworkNumber) => {
+  const feedRegistryContract = DFSFeedRegistryContractViem(client, network);
+  const calls = [
+    {
+      address: feedRegistryContract.address,
+      abi: feedRegistryContract.abi,
+      functionName: 'latestRoundData',
+      args: [getAssetInfo('USDT', network).address, USD_QUOTE],
+    },
+    {
+      address: feedRegistryContract.address,
+      abi: feedRegistryContract.abi,
+      functionName: 'latestRoundData',
+      args: [getAssetInfo('syrupUSDT', network).address, getAssetInfo('USDT', network).address],
+    },
+  ];
+  return calls;
+};
+
+export const getWstUSRChainLinkPriceCalls = (client: PublicClient, network: NetworkNumber) => {
+  const feedRegistryContract = DFSFeedRegistryContractViem(client, network);
+  const calls = [
+    {
+      address: feedRegistryContract.address,
+      abi: feedRegistryContract.abi,
+      functionName: 'latestRoundData',
+      args: [getAssetInfo('USR', network).address, USD_QUOTE],
+    },
+    {
+      address: feedRegistryContract.address,
+      abi: feedRegistryContract.abi,
+      functionName: 'latestRoundData',
+      args: [getAssetInfo('wstUSR', network).address, getAssetInfo('USR', network).address],
+    },
+  ];
+  return calls;
+};
+
 export const parseWstETHPriceCalls = (_ethPrice: string, wstETHrateAnswer: string, decimals: string) => {
   const ethPrice = new Dec(_ethPrice).div(1e8);
   const wstETHRate = getEthAmountForDecimals(wstETHrateAnswer, decimals);
   return { ethPrice, wstETHRate };
 };
 
+export const parseWrsETHPriceCalls = (ethPriceAnswer: string, wrsETHrateAnswer: string) => {
+  const ethPrice = new Dec(ethPriceAnswer).div(1e8);
+  const wrsETHRate = new Dec(wrsETHrateAnswer).div(1e18);
+  return { ethPrice, wrsETHRate };
+};
+
+export const parseSyrupUSDTPriceCalls = (usdtPriceAnswer: string, syrupUSDTRateAnswer: string) => {
+  const syrupUSDTRate = new Dec(syrupUSDTRateAnswer).div(1e8);
+  const USDTRate = new Dec(usdtPriceAnswer).div(1e18);
+  return { syrupUSDTRate, USDTRate };
+};
+
+export const parseWstUSRPriceCalls = (usrPrice: string, _wstUSRRate: string) => {
+  const wstUSRRate = new Dec(_wstUSRRate).div(1e8);
+  const USRRate = new Dec(usrPrice).div(1e18);
+  return { wstUSRRate, USRRate };
+};
+
 export const parseWeETHPriceCalls = (_ethPrice: string, weETHrateAnswer: string, decimals: string) => {
   const ethPrice = new Dec(_ethPrice).div(1e8);
   const weETHRate = getEthAmountForDecimals(weETHrateAnswer, decimals);