@defisaver/positions-sdk 0.0.201-fluid-dev-4 → 0.0.201-fluid-dev-6

package/cjs/markets/fluid/index.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RSETH_WSTETH_79 = exports.RSETH_ETH_WSTETH_78 = exports.USDC_ETH_USDC_ETH_77 = exports.WEETH_ETH_WSTETH_74 = exports.GHO_USDC_GHO_USDC_61 = exports.SUSDS_GHO_58 = exports.WEETH_GHO_57 = exports.SUSDE_GHO_56 = exports.WSTETH_GHO_55 = exports.ETH_GHO_54 = exports.WBTC_CBBTC_USDT_53 = exports.WBTC_CBBTC_USDC_52 = exports.WBTC_CBBTC_WBTC_CBBTC_51 = exports.SUSDE_USDC_USDT_50 = exports.CBBTC_USDC_USDT_49 = exports.WBTC_USDC_USDT_48 = exports.WEETH_USDC_USDT_47 = exports.WSTETH_USDC_USDT_46 = exports.ETH_USDC_USDT_45 = exports.WSTETH_ETH_WSTETH_ETH_44 = exports.WEETH_CBBTC_32 = exports.ETH_CBBTC_31 = exports.CBBTC_USDT_30 = exports.CBBTC_USDC_29 = exports.CBBTC_ETH_28 = exports.WEETHS_WSTETH_27 = exports.WEETH_WBTC_26 = exports.WSTETH_WBTC_25 = exports.ETH_WBTC_24 = exports.WBTC_ETH_23 = exports.WBTC_USDT_22 = exports.WBTC_USDC_21 = exports.WEETH_USDT_20 = exports.WEETH_USDC_19 = exports.SUSDE_USDT_18 = exports.SUSDE_USDC_17 = exports.WEETH_WSTETH_16 = exports.WSTETH_USDT_15 = exports.WSTETH_USDC_14 = exports.WSTETH_ETH_13 = exports.ETH_USDT_12 = exports.ETH_USDC_11 = exports.WEETH_USDT_10 = exports.WEETH_USDC_9 = exports.WEETH_WSTETH_6 = exports.WSTETH_USDT_5 = exports.WSTETH_USDC_4 = exports.WSTETH_ETH_3 = exports.ETH_USDT_2 = exports.ETH_USDC_1 = void 0;
-exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.CBBTC_SUSDS_19_BASE = exports.WSTETH_SUSDS_18_BASE = exports.ETH_SUSDS_17_BASE = exports.WSTETH_CBBTC_16_BASE = exports.WEETH_CBBTC_15_BASE = exports.ETH_CBBTC_14_BASE = exports.CBBTC_ETH_13_BASE = exports.WSTETH_EURC_12_BASE = exports.WEETH_EURC_11_BASE = exports.ETH_EURC_10_BASE = exports.CBETH_EURC_9_BASE = exports.CBBTC_EURC_8_BASE = exports.CBBTC_USDC_7_BASE = exports.CBETH_USDC_6_BASE = exports.WEETH_USDC_5_BASE = exports.WEETH_WSTETH_4_BASE = exports.WSTETH_ETH_3_BASE = exports.WSTETH_USDC_2_BASE = exports.ETH_USDC_1_BASE = exports.WBTC_USDC_USDT_26_ARB = exports.WEETH_USDC_USDT_25_ARB = exports.WSTETH_USDC_USDT_24_ARB = exports.ETH_USDC_USDT_23_ARB = exports.USDC_ETH_USDC_ETH_22_ARB = exports.WEETH_WBTC_21_ARB = exports.WSTETH_WBTC_20_ARB = exports.ETH_WBTC_19_ARB = exports.WBTC_ETH_18_ARB = exports.WEETH_ETH_WSTETH_17_ARB = exports.WSTETH_ETH_WSTETH_ETH_16_ARB = exports.WBTC_USDT_13_ARB = exports.WBTC_USDC_12_ARB = exports.ARB_USDT_11_ARB = exports.ARB_USDC_10_ARB = exports.ETH_ARB_9_ARB = exports.WEETH_USDT_8_ARB = exports.WEETH_USDC_7_ARB = exports.WEETH_WSTETH_6_ARB = exports.WSTETH_ETH_5_ARB = exports.WSTETH_USDT_4_ARB = exports.WSTETH_USDC_3_ARB = exports.ETH_USDT_2_ARB = exports.ETH_USDC_1_ARB = exports.LBTC_CBBTC_WBTC_97 = exports.USDE_USDT_USDT_93 = exports.SUSDE_USDT_USDT_92 = exports.WEETHS_ETH_WSTETH_80 = void 0;
-exports.getFTokenAddress = exports.FluidFTokens = void 0;
+exports.getFTokenAddress = exports.FluidFTokens = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.WSTETH_CBBTC_16_BASE = exports.WEETH_CBBTC_15_BASE = exports.ETH_CBBTC_14_BASE = exports.CBBTC_ETH_13_BASE = exports.WSTETH_EURC_12_BASE = exports.WEETH_EURC_11_BASE = exports.ETH_EURC_10_BASE = exports.CBETH_EURC_9_BASE = exports.CBBTC_EURC_8_BASE = exports.CBBTC_USDC_7_BASE = exports.CBETH_USDC_6_BASE = exports.WEETH_USDC_5_BASE = exports.WEETH_WSTETH_4_BASE = exports.WSTETH_ETH_3_BASE = exports.WSTETH_USDC_2_BASE = exports.ETH_USDC_1_BASE = exports.WBTC_USDC_USDT_26_ARB = exports.WEETH_USDC_USDT_25_ARB = exports.WSTETH_USDC_USDT_24_ARB = exports.ETH_USDC_USDT_23_ARB = exports.USDC_ETH_USDC_ETH_22_ARB = exports.WEETH_WBTC_21_ARB = exports.WSTETH_WBTC_20_ARB = exports.ETH_WBTC_19_ARB = exports.WBTC_ETH_18_ARB = exports.WEETH_ETH_WSTETH_17_ARB = exports.WSTETH_ETH_WSTETH_ETH_16_ARB = exports.WBTC_USDT_13_ARB = exports.WBTC_USDC_12_ARB = exports.ARB_USDT_11_ARB = exports.ARB_USDC_10_ARB = exports.ETH_ARB_9_ARB = exports.WEETH_USDT_8_ARB = exports.WEETH_USDC_7_ARB = exports.WEETH_WSTETH_6_ARB = exports.WSTETH_ETH_5_ARB = exports.WSTETH_USDT_4_ARB = exports.WSTETH_USDC_3_ARB = exports.ETH_USDT_2_ARB = exports.ETH_USDC_1_ARB = exports.LBTC_CBBTC_WBTC_97 = exports.USDE_USDT_USDT_93 = exports.SUSDE_USDT_USDT_92 = exports.WEETHS_ETH_WSTETH_80 = void 0;
 const common_1 = require("../../types/common");
 const types_1 = require("../../types");
 const ETH_USDC_1 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -1791,63 +1790,62 @@ const WSTETH_CBBTC_16_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     debtAsset: 'cbBTC',
 });
 exports.WSTETH_CBBTC_16_BASE = WSTETH_CBBTC_16_BASE;
-const ETH_SUSDS_17_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: false,
-    ethBased: true,
-    type: types_1.FluidVaultType.T1,
-    id: 17,
-    chainIds: [common_1.NetworkNumber.Base],
-    label: 'ETH / sUSDS Market 17',
-    shortLabel: 'ETH/sUSDS',
-    value: types_1.FluidBaseVersions.ETH_SUSDS_17_BASE,
-    url: 'eth-susds-17-base',
-    marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'ETH',
-    debtAsset: 'sSUDS',
-});
-exports.ETH_SUSDS_17_BASE = ETH_SUSDS_17_BASE;
-const WSTETH_SUSDS_18_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: true,
-    ethBased: true,
-    type: types_1.FluidVaultType.T1,
-    id: 18,
-    chainIds: [common_1.NetworkNumber.Base],
-    label: 'wstETH / sUSDS Market 18',
-    shortLabel: 'wstETH/sUSDS',
-    value: types_1.FluidBaseVersions.WSTETH_SUSDS_18_BASE,
-    url: 'wsteth-susds-18-base',
-    marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'wstETH',
-    debtAsset: 'sUSDS',
-});
-exports.WSTETH_SUSDS_18_BASE = WSTETH_SUSDS_18_BASE;
-const CBBTC_SUSDS_19_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: false,
-    ethBased: false,
-    type: types_1.FluidVaultType.T1,
-    id: 19,
-    chainIds: [common_1.NetworkNumber.Base],
-    label: 'cbBTC / sUSDS Market 19',
-    shortLabel: 'cbBTC/sUSDS',
-    value: types_1.FluidBaseVersions.CBBTC_SUSDS_19_BASE,
-    url: 'cbbtc-susds-19-base',
-    marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'cbBTC',
-    debtAsset: 'sUSDS',
-});
-exports.CBBTC_SUSDS_19_BASE = CBBTC_SUSDS_19_BASE;
+// export const ETH_SUSDS_17_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
+//   stableBased: true,
+//   btcBased: false,
+//   wstETHBased: false,
+//   ethBased: true,
+//   type: FluidVaultType.T1,
+//   id: 17,
+//   chainIds: [NetworkNumber.Base],
+//   label: 'ETH / sUSDS Market 17',
+//   shortLabel: 'ETH/sUSDS',
+//   value: FluidBaseVersions.ETH_SUSDS_17_BASE,
+//   url: 'eth-susds-17-base',
+//   marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
+//   hasSmartCollateral: false,
+//   hasSmartDebt: false,
+//   collateralAsset: 'ETH',
+//   debtAsset: 'sSUDS',
+// });
+//
+// export const WSTETH_SUSDS_18_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
+//   stableBased: true,
+//   btcBased: false,
+//   wstETHBased: true,
+//   ethBased: true,
+//   type: FluidVaultType.T1,
+//   id: 18,
+//   chainIds: [NetworkNumber.Base],
+//   label: 'wstETH / sUSDS Market 18',
+//   shortLabel: 'wstETH/sUSDS',
+//   value: FluidBaseVersions.WSTETH_SUSDS_18_BASE,
+//   url: 'wsteth-susds-18-base',
+//   marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
+//   hasSmartCollateral: false,
+//   hasSmartDebt: false,
+//   collateralAsset: 'wstETH',
+//   debtAsset: 'sUSDS',
+// });
+//
+// export const CBBTC_SUSDS_19_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
+//   stableBased: true,
+//   btcBased: false,
+//   wstETHBased: false,
+//   ethBased: false,
+//   type: FluidVaultType.T1,
+//   id: 19,
+//   chainIds: [NetworkNumber.Base],
+//   label: 'cbBTC / sUSDS Market 19',
+//   shortLabel: 'cbBTC/sUSDS',
+//   value: FluidBaseVersions.CBBTC_SUSDS_19_BASE,
+//   url: 'cbbtc-susds-19-base',
+//   marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
+//   hasSmartCollateral: false,
+//   hasSmartDebt: false,
+//   collateralAsset: 'cbBTC',
+//   debtAsset: 'sUSDS',
+// });
 const FluidMarkets = (networkId) => ({
     [types_1.FluidMainnetVersion.ETH_USDC_1]: (0, exports.ETH_USDC_1)(networkId),
     [types_1.FluidMainnetVersion.ETH_USDT_2]: (0, exports.ETH_USDT_2)(networkId),
@@ -1945,9 +1943,6 @@ const FluidMarkets = (networkId) => ({
     [types_1.FluidBaseVersions.ETH_CBBTC_14_BASE]: (0, exports.ETH_CBBTC_14_BASE)(networkId),
     [types_1.FluidBaseVersions.WEETH_CBBTC_15_BASE]: (0, exports.WEETH_CBBTC_15_BASE)(networkId),
     [types_1.FluidBaseVersions.WSTETH_CBBTC_16_BASE]: (0, exports.WSTETH_CBBTC_16_BASE)(networkId),
-    [types_1.FluidBaseVersions.ETH_SUSDS_17_BASE]: (0, exports.ETH_SUSDS_17_BASE)(networkId),
-    [types_1.FluidBaseVersions.WSTETH_SUSDS_18_BASE]: (0, exports.WSTETH_SUSDS_18_BASE)(networkId),
-    [types_1.FluidBaseVersions.CBBTC_SUSDS_19_BASE]: (0, exports.CBBTC_SUSDS_19_BASE)(networkId),
 });
 exports.FluidMarkets = FluidMarkets;
 const getFluidVersionsDataForNetwork = (network) => (Object.values((0, exports.FluidMarkets)(network)).filter(({ chainIds, marketAddress, type }) => !!marketAddress && chainIds.includes(network) && type === types_1.FluidVaultType.T1));

package/cjs/services/priceService.d.ts

@@ -4,4 +4,5 @@ export declare const getEthPrice: (web3: Web3) => Promise<string>;
 export declare const getUSDCPrice: (web3: Web3) => Promise<string>;
 export declare const getCompPrice: (web3: Web3) => Promise<string>;
 export declare const getWstETHPrice: (web3: Web3) => Promise<string>;
+export declare const getWstETHPriceFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
 export declare const getChainlinkAssetAddress: (symbol: string, network: NetworkNumber) => string;

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.getWstETHPrice = exports.getCompPrice = exports.getUSDCPrice = exports.getEthPrice = void 0;
+exports.getChainlinkAssetAddress = exports.getWstETHPriceFluid = 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 multicall_1 = require("../multicall");
+const utils_1 = require("./utils");
 const getEthPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = (0, contracts_1.ETHPriceFeedContract)(web3, common_1.NetworkNumber.Eth);
     const price = yield contract.methods.latestAnswer().call();
@@ -57,6 +58,33 @@ const getWstETHPrice = (web3) => __awaiter(void 0, void 0, void 0, function* ()
     return new decimal_js_1.default(ethPrice).mul(wstETHRate).toString();
 });
 exports.getWstETHPrice = getWstETHPrice;
+// this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
+const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const wstETHFeedContract = (0, contracts_1.WstETHPriceFeedContract)(web3, network);
+    const ethFeedContract = (0, contracts_1.ETHPriceFeedContract)(web3, network);
+    const calls = [
+        {
+            target: ethFeedContract.options.address,
+            abiItem: ethFeedContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
+            params: [],
+        },
+        {
+            target: wstETHFeedContract.options.address,
+            abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
+            params: [],
+        },
+        {
+            target: wstETHFeedContract.options.address,
+            abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'decimals'),
+            params: [],
+        },
+    ];
+    const multicallRes = yield (0, multicall_1.multicall)(calls, web3, network);
+    const ethPrice = new decimal_js_1.default(multicallRes[0][0]).div(1e8);
+    const wstETHRate = (0, utils_1.getEthAmountForDecimals)(multicallRes[1].answer, multicallRes[2][0]);
+    return new decimal_js_1.default(ethPrice).mul(wstETHRate).toString();
+});
+exports.getWstETHPriceFluid = getWstETHPriceFluid;
 // chainlink price feed available only on mainnet
 const getChainlinkAssetAddress = (symbol, network) => {
     // Chainlink only has BTC/USD feed so we use that for BTC derivatives

package/cjs/types/fluid.d.ts

@@ -24,8 +24,6 @@ export declare enum FluidMainnetVersion {
     WSTETH_USDC_4 = "WSTETH_USDC_4",
     WSTETH_USDT_5 = "WSTETH_USDT_5",
     WEETH_WSTETH_6 = "WEETH_WSTETH_6",
-    SUSDE_USDC_7 = "SUSDE_USDC_7",
-    SUSDE_USDT_8 = "SUSDE_USDT_8",
     WEETH_USDC_9 = "WEETH_USDC_9",
     WEETH_USDT_10 = "WEETH_USDT_10",
     ETH_USDC_11 = "ETH_USDC_11",
@@ -50,7 +48,6 @@ export declare enum FluidMainnetVersion {
     CBBTC_USDT_30 = "CBBTC_USDT_30",
     ETH_CBBTC_31 = "ETH_CBBTC_31",
     WEETH_CBBTC_32 = "WEETH_CBBTC_32",
-    WSTETH_CBBTC_33 = "WSTETH_CBBTC_33",
     WSTETH_ETH_WSTETH_ETH_44 = "WSTETH_ETH_WSTETH_ETH_44",
     ETH_USDC_USDT_45 = "ETH_USDC_USDT_45",
     WSTETH_USDC_USDT_46 = "WSTETH_USDC_USDT_46",
@@ -66,8 +63,6 @@ export declare enum FluidMainnetVersion {
     SUSDE_GHO_56 = "SUSDE_GHO_56",
     WEETH_GHO_57 = "WEETH_GHO_57",
     SUSDS_GHO_58 = "SUSDS_GHO_58",
-    WBTC_GHO_59 = "WBTC_GHO_59",
-    CBBTC_GHO_60 = "CBBTC_GHO_60",
     GHO_USDC_GHO_USDC_61 = "GHO_USDC_GHO_USDC_61",
     WEETH_ETH_WSTETH_74 = "WEETH_ETH_WSTETH_74",
     USDC_ETH_USDC_ETH_77 = "USDC_ETH_USDC_ETH_77",
@@ -120,10 +115,7 @@ export declare enum FluidBaseVersions {
     CBBTC_ETH_13_BASE = "CBBTC_ETH_13_BASE",
     ETH_CBBTC_14_BASE = "ETH_CBBTC_14_BASE",
     WEETH_CBBTC_15_BASE = "WEETH_CBBTC_15_BASE",
-    WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE",
-    ETH_SUSDS_17_BASE = "ETH_SUSDS_17_BASE",
-    WSTETH_SUSDS_18_BASE = "WSTETH_SUSDS_18_BASE",
-    CBBTC_SUSDS_19_BASE = "CBBTC_SUSDS_19_BASE"
+    WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE"
 }
 export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion;
 export declare enum FluidMainnetDepositToken {

package/cjs/types/fluid.js

@@ -10,8 +10,6 @@ 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";
@@ -36,7 +34,6 @@ 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";
@@ -52,8 +49,6 @@ 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";
@@ -109,9 +104,6 @@ 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 || (exports.FluidBaseVersions = FluidBaseVersions = {}));
 var FluidMainnetDepositToken;
 (function (FluidMainnetDepositToken) {

package/esm/config/contracts.d.ts

@@ -6715,6 +6715,12 @@ export namespace ETHPriceFeed {
         "1": {
             address: string;
         };
+        "8453": {
+            address: string;
+        };
+        "42161": {
+            address: string;
+        };
     };
     export { networks_73 as networks };
 }
@@ -6799,6 +6805,12 @@ export namespace WstETHPriceFeed {
         "1": {
             address: string;
         };
+        "8453": {
+            address: string;
+        };
+        "42161": {
+            address: string;
+        };
     };
     export { networks_75 as networks };
 }
@@ -7283,6 +7295,9 @@ export namespace DFSFeedRegistry {
         "8453": {
             address: string;
         };
+        "42161": {
+            address: string;
+        };
     };
     export { networks_78 as networks };
 }

package/esm/config/contracts.js

@@ -1014,7 +1014,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": {
@@ -1026,7 +1028,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": {
@@ -1072,6 +1076,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/esm/fluid/index.d.ts

@@ -44,4 +44,18 @@ export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, tok
     totalDeposited: string;
     withdrawable: string;
     apy: string;
+    depositRate: string;
+    withdrawRate: string;
+}>;
+export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
+    fTokenAddress: any;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
 }>;

package/esm/fluid/index.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { NetworkNumber } from '../types/common';
 import { FluidVaultType, } from '../types';
 import { DFSFeedRegistryContract, FeedRegistryContract, FluidViewContract } from '../contracts';
@@ -17,7 +17,7 @@ import { getFluidAggregatedData } from '../helpers/fluidHelpers';
 import { chunkAndMulticall } from '../multicall';
 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,
     isBorrowed: false,
@@ -38,8 +38,8 @@ const parseVaultType = (vaultType) => {
     }
 };
 const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void 0, function* () {
-    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();
     const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(collAsset.decimals).toString();
@@ -51,7 +51,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
     let loanTokenPrice;
     if (debtAsset.symbol === 'wstETH') {
         // need to handle wstETH for l2s inside getWstETHPrice
-        loanTokenPrice = yield getWstETHPrice(web3);
+        loanTokenPrice = yield getWstETHPriceFluid(web3, network);
     }
     else if (isMainnet) {
         const feedRegistryContract = FeedRegistryContract(web3, NetworkNumber.Eth);
@@ -211,8 +211,10 @@ export const getFluidTokenData = (web3, network, token) => __awaiter(void 0, voi
     const fTokenAddress = getFTokenAddress(token, network);
     const data = yield view.methods.getFTokenData(fTokenAddress).call();
     const supplyRate = new Dec(data.supplyRate).div(100).toString();
+    const rewardsRate = new Dec(data.rewardsRate).div(1e12).toString();
     const decimals = data.decimals;
-    const rewardsRate = new Dec(assetAmountInEth(data.rewardsRate)).div(100).toString();
+    const depositRate = new Dec(getEthAmountForDecimals(data.convertToShares, decimals)).toString();
+    const withdrawRate = new Dec(getEthAmountForDecimals(data.convertToAssets, decimals)).toString();
     return {
         fTokenAddress,
         fTokenSymbol: data.symbol,
@@ -220,5 +222,29 @@ export const getFluidTokenData = (web3, network, token) => __awaiter(void 0, voi
         totalDeposited: getEthAmountForDecimals(data.totalAssets, decimals),
         withdrawable: getEthAmountForDecimals(data.withdrawable, decimals),
         apy: new Dec(supplyRate).add(rewardsRate).toString(),
+        depositRate,
+        withdrawRate,
+    };
+});
+export const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = FluidViewContract(web3, network);
+    const fTokenAddress = getFTokenAddress(token, network);
+    const { fTokenData, userPosition } = yield view.methods.getUserEarnPositionWithFToken(fTokenAddress, address).call();
+    const supplyRate = new Dec(fTokenData.supplyRate).div(100).toString();
+    const rewardsRate = new Dec(fTokenData.rewardsRate).div(1e12).toString();
+    const decimals = fTokenData.decimals;
+    const depositRate = new Dec(getEthAmountForDecimals(fTokenData.convertToShares, decimals)).toString();
+    const withdrawRate = new Dec(getEthAmountForDecimals(fTokenData.convertToAssets, decimals)).toString();
+    return {
+        fTokenAddress,
+        fTokenSymbol: fTokenData.symbol,
+        decimals,
+        totalDeposited: getEthAmountForDecimals(fTokenData.totalAssets, decimals),
+        withdrawable: getEthAmountForDecimals(fTokenData.withdrawable, decimals),
+        apy: new Dec(supplyRate).add(rewardsRate).toString(),
+        depositRate,
+        withdrawRate,
+        deposited: getEthAmountForDecimals(userPosition.underlyingAssets, decimals),
+        depositedShares: getEthAmountForDecimals(userPosition.fTokenShares, decimals),
     };
 });

package/esm/helpers/morphoBlueHelpers/index.js

@@ -105,73 +105,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, web3, netwo
     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/fluid/index.d.ts

@@ -94,9 +94,6 @@ export declare const CBBTC_ETH_13_BASE: (networkId?: NetworkNumber) => FluidMark
 export declare const ETH_CBBTC_14_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_CBBTC_15_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_CBBTC_16_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const ETH_SUSDS_17_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const WSTETH_SUSDS_18_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const CBBTC_SUSDS_19_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FluidMarkets: (networkId: NetworkNumber) => {
     ETH_USDC_1: FluidMarketInfo;
     ETH_USDT_2: FluidMarketInfo;
@@ -192,9 +189,6 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     ETH_CBBTC_14_BASE: FluidMarketInfo;
     WEETH_CBBTC_15_BASE: FluidMarketInfo;
     WSTETH_CBBTC_16_BASE: FluidMarketInfo;
-    ETH_SUSDS_17_BASE: FluidMarketInfo;
-    WSTETH_SUSDS_18_BASE: FluidMarketInfo;
-    CBBTC_SUSDS_19_BASE: FluidMarketInfo;
 };
 export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
 export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;