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

package/cjs/services/priceService.js

@@ -12,12 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getChainlinkAssetAddress = exports.getEthPriceForFluid = exports.getBTCPriceForFluid = exports.getWstETHPriceFluid = exports.parseWeETHPriceCalls = exports.parseWstETHPriceCalls = exports.getWeETHChainLinkPriceCalls = exports.getWstETHChainLinkPriceCalls = exports.getWeETHPrice = exports.getWstETHPrice = exports.getCompPrice = exports.getUSDCPrice = exports.getEthPrice = void 0;
+exports.getChainlinkAssetAddress = exports.getEthPriceForFluid = exports.getBTCPriceForFluid = exports.getWstETHPriceFluid = exports.parseWeETHPriceCalls = exports.parseWstUSRPriceCalls = exports.parseSyrupUSDTPriceCalls = exports.parseWrsETHPriceCalls = exports.parseWstETHPriceCalls = exports.getWstUSRChainLinkPriceCalls = exports.getSyrupUSDTChainLinkPriceCalls = exports.getWsrETHChainLinkPriceCalls = exports.getWeETHChainLinkPriceCalls = exports.getWstETHChainLinkPriceCalls = exports.getWstUSRPrice = exports.getSyrupUSDTPrice = exports.getWsrETHPrice = exports.getWeETHPrice = exports.getWstETHPrice = exports.getCompPrice = exports.getUSDCPrice = exports.getEthPrice = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
 const utils_1 = require("./utils");
+const constants_1 = require("../constants");
 const getEthPrice = (client) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = (0, contracts_1.ETHPriceFeedContractViem)(client, common_1.NetworkNumber.Eth);
     const price = yield contract.read.latestAnswer();
@@ -62,6 +63,39 @@ const getWeETHPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...a
     return new decimal_js_1.default(ethPrice).mul(weETHRate).toString();
 });
 exports.getWeETHPrice = getWeETHPrice;
+const getWsrETHPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth) {
+    const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
+    const [ethPriceWei, wrsETHRateWei] = yield Promise.all([
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('WETH', network).address, constants_1.USD_QUOTE]),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('wrsETH', network).address, (0, tokens_1.getAssetInfo)('WETH', network).address]),
+    ]);
+    const ethPrice = new decimal_js_1.default(ethPriceWei[1].toString()).div(1e8);
+    const wrsETHRate = (0, utils_1.getEthAmountForDecimals)(wrsETHRateWei[1].toString(), 18);
+    return new decimal_js_1.default(ethPrice).mul(wrsETHRate).toString();
+});
+exports.getWsrETHPrice = getWsrETHPrice;
+const getSyrupUSDTPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth) {
+    const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
+    const [usdtPriceWei, syrupUSDTRateWei] = yield Promise.all([
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('USDT', network).address, constants_1.USD_QUOTE]),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('syrupUSDT', network).address, (0, tokens_1.getAssetInfo)('USDT', network).address]),
+    ]);
+    const usdtPrice = new decimal_js_1.default(usdtPriceWei[1].toString()).div(1e8);
+    const syrupUSDTPrice = (0, utils_1.getEthAmountForDecimals)(syrupUSDTRateWei[1].toString(), 18);
+    return new decimal_js_1.default(usdtPrice).mul(syrupUSDTPrice).toString();
+});
+exports.getSyrupUSDTPrice = getSyrupUSDTPrice;
+const getWstUSRPrice = (client_1, ...args_1) => __awaiter(void 0, [client_1, ...args_1], void 0, function* (client, network = common_1.NetworkNumber.Eth) {
+    const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
+    const [usrPriceWei, wstUSRRateWei] = yield Promise.all([
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('USR', network).address, constants_1.USD_QUOTE]),
+        feedRegistryContract.read.latestRoundData([(0, tokens_1.getAssetInfo)('wstUSR', network).address, (0, tokens_1.getAssetInfo)('USR', network).address]),
+    ]);
+    const usrPrice = new decimal_js_1.default(usrPriceWei[1].toString()).div(1e8);
+    const wstUSRPrice = (0, utils_1.getEthAmountForDecimals)(wstUSRRateWei[1].toString(), 18);
+    return new decimal_js_1.default(usrPrice).mul(wstUSRPrice).toString();
+});
+exports.getWstUSRPrice = getWstUSRPrice;
 const getWstETHChainLinkPriceCalls = (client, network) => {
     const wstETHFeedContract = (0, contracts_1.WstETHPriceFeedContractViem)(client, network);
     const ethFeedContract = (0, contracts_1.ETHPriceFeedContractViem)(client, network);
@@ -114,12 +148,87 @@ const getWeETHChainLinkPriceCalls = (client, network) => {
     return calls;
 };
 exports.getWeETHChainLinkPriceCalls = getWeETHChainLinkPriceCalls;
+const getWsrETHChainLinkPriceCalls = (client, network) => {
+    const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
+    const calls = [
+        {
+            address: feedRegistryContract.address,
+            abi: feedRegistryContract.abi,
+            functionName: 'latestRoundData',
+            args: [(0, tokens_1.getAssetInfo)('WETH', network).address, constants_1.USD_QUOTE],
+        },
+        {
+            address: feedRegistryContract.address,
+            abi: feedRegistryContract.abi,
+            functionName: 'latestRoundData',
+            args: [(0, tokens_1.getAssetInfo)('wrsETH', network).address, (0, tokens_1.getAssetInfo)('WETH', network).address],
+        },
+    ];
+    return calls;
+};
+exports.getWsrETHChainLinkPriceCalls = getWsrETHChainLinkPriceCalls;
+const getSyrupUSDTChainLinkPriceCalls = (client, network) => {
+    const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
+    const calls = [
+        {
+            address: feedRegistryContract.address,
+            abi: feedRegistryContract.abi,
+            functionName: 'latestRoundData',
+            args: [(0, tokens_1.getAssetInfo)('USDT', network).address, constants_1.USD_QUOTE],
+        },
+        {
+            address: feedRegistryContract.address,
+            abi: feedRegistryContract.abi,
+            functionName: 'latestRoundData',
+            args: [(0, tokens_1.getAssetInfo)('syrupUSDT', network).address, (0, tokens_1.getAssetInfo)('USDT', network).address],
+        },
+    ];
+    return calls;
+};
+exports.getSyrupUSDTChainLinkPriceCalls = getSyrupUSDTChainLinkPriceCalls;
+const getWstUSRChainLinkPriceCalls = (client, network) => {
+    const feedRegistryContract = (0, contracts_1.DFSFeedRegistryContractViem)(client, network);
+    const calls = [
+        {
+            address: feedRegistryContract.address,
+            abi: feedRegistryContract.abi,
+            functionName: 'latestRoundData',
+            args: [(0, tokens_1.getAssetInfo)('USR', network).address, constants_1.USD_QUOTE],
+        },
+        {
+            address: feedRegistryContract.address,
+            abi: feedRegistryContract.abi,
+            functionName: 'latestRoundData',
+            args: [(0, tokens_1.getAssetInfo)('wstUSR', network).address, (0, tokens_1.getAssetInfo)('USR', network).address],
+        },
+    ];
+    return calls;
+};
+exports.getWstUSRChainLinkPriceCalls = getWstUSRChainLinkPriceCalls;
 const parseWstETHPriceCalls = (_ethPrice, wstETHrateAnswer, decimals) => {
     const ethPrice = new decimal_js_1.default(_ethPrice).div(1e8);
     const wstETHRate = (0, utils_1.getEthAmountForDecimals)(wstETHrateAnswer, decimals);
     return { ethPrice, wstETHRate };
 };
 exports.parseWstETHPriceCalls = parseWstETHPriceCalls;
+const parseWrsETHPriceCalls = (ethPriceAnswer, wrsETHrateAnswer) => {
+    const ethPrice = new decimal_js_1.default(ethPriceAnswer).div(1e8);
+    const wrsETHRate = new decimal_js_1.default(wrsETHrateAnswer).div(1e18);
+    return { ethPrice, wrsETHRate };
+};
+exports.parseWrsETHPriceCalls = parseWrsETHPriceCalls;
+const parseSyrupUSDTPriceCalls = (usdtPriceAnswer, syrupUSDTRateAnswer) => {
+    const syrupUSDTRate = new decimal_js_1.default(syrupUSDTRateAnswer).div(1e8);
+    const USDTRate = new decimal_js_1.default(usdtPriceAnswer).div(1e18);
+    return { syrupUSDTRate, USDTRate };
+};
+exports.parseSyrupUSDTPriceCalls = parseSyrupUSDTPriceCalls;
+const parseWstUSRPriceCalls = (usrPrice, _wstUSRRate) => {
+    const wstUSRRate = new decimal_js_1.default(_wstUSRRate).div(1e8);
+    const USRRate = new decimal_js_1.default(usrPrice).div(1e18);
+    return { wstUSRRate, USRRate };
+};
+exports.parseWstUSRPriceCalls = parseWstUSRPriceCalls;
 const parseWeETHPriceCalls = (_ethPrice, weETHrateAnswer, decimals) => {
     const ethPrice = new decimal_js_1.default(_ethPrice).div(1e8);
     const weETHRate = (0, utils_1.getEthAmountForDecimals)(weETHrateAnswer, decimals);

package/cjs/types/fluid.d.ts

@@ -153,7 +153,7 @@ export declare enum FluidPlasmaVersions {
     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_WEETH_ETH_ETH_11_PLASMA = "FLUID_WEETH_ETH_ETH_11_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",

package/cjs/types/fluid.js

@@ -140,7 +140,7 @@ var FluidPlasmaVersions;
     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_WEETH_ETH_ETH_11_PLASMA"] = "FLUID_WEETH_ETH_ETH_11_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";

package/esm/fluid/index.js

@@ -16,7 +16,7 @@ import { compareAddresses, DEFAULT_TIMEOUT, getEthAmountForDecimals, getNativeAs
 import { getFluidAggregatedData, mergeAssetData, mergeUsedAssets, parseDexBorrowData, parseDexSupplyData, } from '../helpers/fluidHelpers';
 import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE, ZERO_ADDRESS } from '../constants';
-import { getChainlinkAssetAddress, getWeETHChainLinkPriceCalls, getWeETHPrice, getWstETHChainLinkPriceCalls, getWstETHPrice, getWstETHPriceFluid, parseWeETHPriceCalls, parseWstETHPriceCalls, } from '../services/priceService';
+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';
 export const EMPTY_USED_ASSET = {
@@ -68,6 +68,12 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
             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);
             return ({
@@ -106,6 +112,30 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
                 acc[token] = new Dec(ethPrice).mul(wstETHRate).toString();
                 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();
@@ -1206,6 +1236,15 @@ const getTokenPricePortfolio = (token, provider, network) => __awaiter(void 0, v
     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) {

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

@@ -126,7 +126,7 @@ export declare const FLUID_XAUT_USDT_7_PLASMA: (networkId?: NetworkNumber) => Fl
 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_ETH_WEETH_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;
@@ -264,7 +264,7 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     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_ETH_WEETH_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;

package/esm/markets/fluid/index.js

@@ -2339,7 +2339,7 @@ export const FLUID_USDAI_USDT_10_PLASMA = (networkId = NetworkNumber.Eth) => ({
     collateralAsset0: 'USDai',
     debtAsset0: 'USDT',
 });
-export const FLUID_WEETH_ETH_ETH_11_PLASMA = (networkId = NetworkNumber.Eth) => ({
+export const FLUID_ETH_WEETH_ETH_11_PLASMA = (networkId = NetworkNumber.Eth) => ({
     stableBased: false,
     btcBased: false,
     wstETHBased: false,
@@ -2347,15 +2347,15 @@ export const FLUID_WEETH_ETH_ETH_11_PLASMA = (networkId = NetworkNumber.Eth) =>
     type: FluidVaultType.T2,
     id: 11,
     chainIds: [NetworkNumber.Plasma],
-    label: '#11 (weETH-ETH / ETH)',
-    shortLabel: 'weETH-ETH/ETH',
-    value: FluidPlasmaVersions.FLUID_WEETH_ETH_ETH_11_PLASMA,
-    url: 'weeth-eth-eth-11-plasma',
+    label: '#11 (ETH-weETH / ETH)',
+    shortLabel: 'ETH-weETH/ETH',
+    value: FluidPlasmaVersions.FLUID_ETH_WEETH_ETH_11_PLASMA,
+    url: 'eth-weeth-eth-11-plasma',
     marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
     hasSmartCollateral: true,
     hasSmartDebt: false,
-    collateralAsset0: 'weETH',
-    collateralAsset1: 'ETH',
+    collateralAsset0: 'ETH',
+    collateralAsset1: 'weETH',
     debtAsset0: 'ETH',
 });
 export const FLUID_SUSDE_USDT_USDT_12_PLASMA = (networkId = NetworkNumber.Eth) => ({
@@ -2675,7 +2675,7 @@ export const FluidMarkets = (networkId) => ({
     [FluidPlasmaVersions.FLUID_XAUT_USDE_8_PLASMA]: FLUID_XAUT_USDE_8_PLASMA(networkId),
     [FluidPlasmaVersions.FLUID_USDE_USDT_9_PLASMA]: FLUID_USDE_USDT_9_PLASMA(networkId),
     [FluidPlasmaVersions.FLUID_USDAI_USDT_10_PLASMA]: FLUID_USDAI_USDT_10_PLASMA(networkId),
-    [FluidPlasmaVersions.FLUID_WEETH_ETH_ETH_11_PLASMA]: FLUID_WEETH_ETH_ETH_11_PLASMA(networkId),
+    [FluidPlasmaVersions.FLUID_ETH_WEETH_ETH_11_PLASMA]: FLUID_ETH_WEETH_ETH_11_PLASMA(networkId),
     [FluidPlasmaVersions.FLUID_SUSDE_USDT_USDT_12_PLASMA]: FLUID_SUSDE_USDT_USDT_12_PLASMA(networkId),
     [FluidPlasmaVersions.FLUID_USDE_USDT_USDT_13_PLASMA]: FLUID_USDE_USDT_USDT_13_PLASMA(networkId),
     [FluidPlasmaVersions.FLUID_USDAI_USDT_USDT_14_PLASMA]: FLUID_USDAI_USDT_USDT_14_PLASMA(networkId),