@defisaver/positions-sdk 0.0.201-fluid-dev-3 → 0.0.201-fluid-dev-5

package/esm/types/fluid.js

@@ -7,8 +7,6 @@ export var FluidMainnetVersion;
     FluidMainnetVersion["WSTETH_USDC_4"] = "WSTETH_USDC_4";
     FluidMainnetVersion["WSTETH_USDT_5"] = "WSTETH_USDT_5";
     FluidMainnetVersion["WEETH_WSTETH_6"] = "WEETH_WSTETH_6";
-    FluidMainnetVersion["SUSDE_USDC_7"] = "SUSDE_USDC_7";
-    FluidMainnetVersion["SUSDE_USDT_8"] = "SUSDE_USDT_8";
     FluidMainnetVersion["WEETH_USDC_9"] = "WEETH_USDC_9";
     FluidMainnetVersion["WEETH_USDT_10"] = "WEETH_USDT_10";
     FluidMainnetVersion["ETH_USDC_11"] = "ETH_USDC_11";
@@ -33,7 +31,6 @@ export var FluidMainnetVersion;
     FluidMainnetVersion["CBBTC_USDT_30"] = "CBBTC_USDT_30";
     FluidMainnetVersion["ETH_CBBTC_31"] = "ETH_CBBTC_31";
     FluidMainnetVersion["WEETH_CBBTC_32"] = "WEETH_CBBTC_32";
-    FluidMainnetVersion["WSTETH_CBBTC_33"] = "WSTETH_CBBTC_33";
     FluidMainnetVersion["WSTETH_ETH_WSTETH_ETH_44"] = "WSTETH_ETH_WSTETH_ETH_44";
     FluidMainnetVersion["ETH_USDC_USDT_45"] = "ETH_USDC_USDT_45";
     FluidMainnetVersion["WSTETH_USDC_USDT_46"] = "WSTETH_USDC_USDT_46";
@@ -49,8 +46,6 @@ export var FluidMainnetVersion;
     FluidMainnetVersion["SUSDE_GHO_56"] = "SUSDE_GHO_56";
     FluidMainnetVersion["WEETH_GHO_57"] = "WEETH_GHO_57";
     FluidMainnetVersion["SUSDS_GHO_58"] = "SUSDS_GHO_58";
-    FluidMainnetVersion["WBTC_GHO_59"] = "WBTC_GHO_59";
-    FluidMainnetVersion["CBBTC_GHO_60"] = "CBBTC_GHO_60";
     FluidMainnetVersion["GHO_USDC_GHO_USDC_61"] = "GHO_USDC_GHO_USDC_61";
     FluidMainnetVersion["WEETH_ETH_WSTETH_74"] = "WEETH_ETH_WSTETH_74";
     FluidMainnetVersion["USDC_ETH_USDC_ETH_77"] = "USDC_ETH_USDC_ETH_77";
@@ -106,9 +101,6 @@ export var FluidBaseVersions;
     FluidBaseVersions["ETH_CBBTC_14_BASE"] = "ETH_CBBTC_14_BASE";
     FluidBaseVersions["WEETH_CBBTC_15_BASE"] = "WEETH_CBBTC_15_BASE";
     FluidBaseVersions["WSTETH_CBBTC_16_BASE"] = "WSTETH_CBBTC_16_BASE";
-    FluidBaseVersions["ETH_SUSDS_17_BASE"] = "ETH_SUSDS_17_BASE";
-    FluidBaseVersions["WSTETH_SUSDS_18_BASE"] = "WSTETH_SUSDS_18_BASE";
-    FluidBaseVersions["CBBTC_SUSDS_19_BASE"] = "CBBTC_SUSDS_19_BASE";
 })(FluidBaseVersions || (FluidBaseVersions = {}));
 export var FluidMainnetDepositToken;
 (function (FluidMainnetDepositToken) {
@@ -117,6 +109,7 @@ export var FluidMainnetDepositToken;
     FluidMainnetDepositToken["USDC"] = "USDC";
     FluidMainnetDepositToken["USDT"] = "USDT";
     FluidMainnetDepositToken["GHO"] = "GHO";
+    FluidMainnetDepositToken["sUSDS"] = "sUSDS";
 })(FluidMainnetDepositToken || (FluidMainnetDepositToken = {}));
 export var FluidArbitrumDepositToken;
 (function (FluidArbitrumDepositToken) {
@@ -132,6 +125,7 @@ export var FluidBaseDepositToken;
     FluidBaseDepositToken["USDC"] = "USDC";
     FluidBaseDepositToken["wstETH"] = "wstETH";
     FluidBaseDepositToken["EURC"] = "EURC";
+    FluidBaseDepositToken["sUSDS"] = "sUSDS";
 })(FluidBaseDepositToken || (FluidBaseDepositToken = {}));
 export var FluidVaultType;
 (function (FluidVaultType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.201-fluid-dev-3",
+  "version": "0.0.201-fluid-dev-5",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/config/contracts.js

@@ -1015,7 +1015,9 @@ module.exports = {
   "ETHPriceFeed": {
     "abi": [{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"},{"internalType":"address","name":"_accessController","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"int256","name":"current","type":"int256"},{"indexed":true,"internalType":"uint256","name":"roundId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"updatedAt","type":"uint256"}],"name":"AnswerUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"roundId","type":"uint256"},{"indexed":true,"internalType":"address","name":"startedBy","type":"address"},{"indexed":false,"internalType":"uint256","name":"startedAt","type":"uint256"}],"name":"NewRound","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferRequested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"accessController","outputs":[{"internalType":"contract AccessControllerInterface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"aggregator","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"}],"name":"confirmAggregator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"description","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_roundId","type":"uint256"}],"name":"getAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"getRoundData","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":"uint256","name":"_roundId","type":"uint256"}],"name":"getTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestRound","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"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":[],"name":"latestTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address payable","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint16","name":"","type":"uint16"}],"name":"phaseAggregators","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"phaseId","outputs":[{"internalType":"uint16","name":"","type":"uint16"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"}],"name":"proposeAggregator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"proposedAggregator","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"proposedGetRoundData","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":[],"name":"proposedLatestRoundData","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":"_accessController","type":"address"}],"name":"setController","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"version","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
     "networks": {
-      "1": { "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419" }
+      "1": { "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419" },
+      "8453": { "address": "0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70" },
+      "42161": { "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612" }
     },
   },
   "USDCPriceFeed": {
@@ -1027,7 +1029,9 @@ module.exports = {
   "WstETHPriceFeed": {
     "abi": [{"inputs":[{"internalType":"address","name":"stETHtoETHPriceFeed_","type":"address"},{"internalType":"address","name":"wstETH_","type":"address"},{"internalType":"uint8","name":"decimals_","type":"uint8"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"BadDecimals","type":"error"},{"inputs":[],"name":"InvalidInt256","type":"error"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"description","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"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":[],"name":"stETHToETHPriceFeedDecimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"stETHtoETHPriceFeed","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"version","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"wstETH","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"wstETHScale","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"}],
     "networks": {
-      "1": { "address": "0x4F67e4d9BD67eFa28236013288737D39AeF48e79" }
+      "1": { "address": "0x4F67e4d9BD67eFa28236013288737D39AeF48e79" },
+      "8453": { "address": "0x43a5C292A453A3bF3606fa856197f09D7B74251a" },
+      "42161": { "address": "0xb523AE262D20A936BC152e6023996e46FDC2A95D" }
     }
   },
   "MorphoBlueView": {
@@ -1073,6 +1077,7 @@ module.exports = {
     "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" }
     }
   },
   "LlamaLendView": {

package/src/fluid/index.ts

@@ -1,6 +1,6 @@
 import Web3 from 'web3';
 import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { EthAddress, NetworkNumber } from '../types/common';
 import {
   FluidAggregatedVaultData,
@@ -17,9 +17,9 @@ import { getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
 import { getFluidAggregatedData } from '../helpers/fluidHelpers';
 import { FluidView } from '../types/contracts/generated';
 import { chunkAndMulticall } from '../multicall';
-import { getFluidMarketInfoById, getFluidVersionsDataForNetwork } from '../markets';
+import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE } from '../constants';
-import { getChainlinkAssetAddress, getWstETHPrice } from '../services/priceService';
+import { getChainlinkAssetAddress, getWstETHPriceFluid } from '../services/priceService';
 
 export const EMPTY_USED_ASSET = {
   isSupplied: false,
@@ -43,8 +43,8 @@ const parseVaultType = (vaultType: number) => {
 };
 
 const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutputStruct, network: NetworkNumber) => {
-  const collAsset = getAssetInfoByAddress(data.supplyToken0);
-  const debtAsset = getAssetInfoByAddress(data.borrowToken0);
+  const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
+  const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
 
   const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
   const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
@@ -60,7 +60,7 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
   let loanTokenPrice;
   if (debtAsset.symbol === 'wstETH') {
     // need to handle wstETH for l2s inside getWstETHPrice
-    loanTokenPrice = await getWstETHPrice(web3);
+    loanTokenPrice = await getWstETHPriceFluid(web3, network);
   } else if (isMainnet) {
     const feedRegistryContract = FeedRegistryContract(web3, NetworkNumber.Eth);
     loanTokenPrice = isTokenUSDA ? '100000000' : await feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call();
@@ -275,5 +275,24 @@ export const getAllFluidMarketDataChunked = async (network: NetworkNumber, web3:
   }));
 
   const data = await chunkAndMulticall(calls, 10, 'latest', web3, network);
+  // @ts-ignore
   return Promise.all(data.map(async (item, i) => parseMarketData(web3, item.vaultData, network)));
-};
+};
+
+export const getFluidTokenData = async (web3: Web3, network: NetworkNumber, token: string) => {
+  const view = FluidViewContract(web3, network);
+  const fTokenAddress = getFTokenAddress(token, network);
+  const data = await view.methods.getFTokenData(fTokenAddress).call();
+  const supplyRate = new Dec(data.supplyRate).div(100).toString();
+  const decimals = data.decimals;
+  const rewardsRate = new Dec(assetAmountInEth(data.rewardsRate)).div(100).toString();
+  return {
+    fTokenAddress,
+    fTokenSymbol: data.symbol,
+    decimals,
+    totalDeposited: getEthAmountForDecimals(data.totalAssets, decimals),
+    withdrawable: getEthAmountForDecimals(data.withdrawable, decimals),
+    apy: new Dec(supplyRate).add(rewardsRate).toString(),
+  };
+};
+