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

package/esm/markets/fluid/index.js

@@ -1692,60 +1692,62 @@ export const WSTETH_CBBTC_16_BASE = (networkId = NetworkNumber.Eth) => ({
     collateralAsset: 'wstETH',
     debtAsset: 'cbBTC',
 });
-export const ETH_SUSDS_17_BASE = (networkId = NetworkNumber.Eth) => ({
-    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.Eth) => ({
-    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.Eth) => ({
-    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',
-});
+// 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',
+// });
 export const FluidMarkets = (networkId) => ({
     [FluidMainnetVersion.ETH_USDC_1]: ETH_USDC_1(networkId),
     [FluidMainnetVersion.ETH_USDT_2]: ETH_USDT_2(networkId),
@@ -1843,9 +1845,6 @@ export const FluidMarkets = (networkId) => ({
     [FluidBaseVersions.ETH_CBBTC_14_BASE]: ETH_CBBTC_14_BASE(networkId),
     [FluidBaseVersions.WEETH_CBBTC_15_BASE]: WEETH_CBBTC_15_BASE(networkId),
     [FluidBaseVersions.WSTETH_CBBTC_16_BASE]: WSTETH_CBBTC_16_BASE(networkId),
-    [FluidBaseVersions.ETH_SUSDS_17_BASE]: ETH_SUSDS_17_BASE(networkId),
-    [FluidBaseVersions.WSTETH_SUSDS_18_BASE]: WSTETH_SUSDS_18_BASE(networkId),
-    [FluidBaseVersions.CBBTC_SUSDS_19_BASE]: CBBTC_SUSDS_19_BASE(networkId),
 });
 export const getFluidVersionsDataForNetwork = (network) => (Object.values(FluidMarkets(network)).filter(({ chainIds, marketAddress, type }) => !!marketAddress && chainIds.includes(network) && type === FluidVaultType.T1));
 export const getFluidMarketInfoById = (vaultId, network = 1) => getFluidVersionsDataForNetwork(network).find(({ id }) => id === vaultId);

package/esm/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/esm/services/priceService.js

@@ -12,6 +12,7 @@ import { getAssetInfo } from '@defisaver/tokens';
 import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { multicall } from '../multicall';
+import { getEthAmountForDecimals } from './utils';
 export const getEthPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
     const price = yield contract.methods.latestAnswer().call();
@@ -47,6 +48,32 @@ export const getWstETHPrice = (web3) => __awaiter(void 0, void 0, void 0, functi
     const wstETHRate = new Dec(multicallRes[1].answer).div(1e8);
     return new Dec(ethPrice).mul(wstETHRate).toString();
 });
+// 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
+export const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const wstETHFeedContract = WstETHPriceFeedContract(web3, network);
+    const ethFeedContract = 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 multicall(calls, web3, network);
+    const ethPrice = new Dec(multicallRes[0][0]).div(1e8);
+    const wstETHRate = getEthAmountForDecimals(multicallRes[1].answer, multicallRes[2][0]);
+    return new Dec(ethPrice).mul(wstETHRate).toString();
+});
 // chainlink price feed available only on mainnet
 export const getChainlinkAssetAddress = (symbol, network) => {
     // Chainlink only has BTC/USD feed so we use that for BTC derivatives

package/esm/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/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) {

package/package.json

@@ -1,51 +1,51 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.201-fluid-dev-4",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
-    "lint": "eslint src/ --fix",
-    "lint-check": "eslint src/",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "test-single": "mocha ./tests/$npm_config_name.ts",
-    "test:debugger": "mocha --inspect-brk tests/*",
-    "build-test": "npm run build && npm run test",
-    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@types/lodash": "^4.17.15",
-    "@defisaver/tokens": "^1.5.55",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "decimal.js": "^10.4.3",
-    "lodash": "^4.17.21"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@types/chai": "^5.0.0",
-    "@types/mocha": "^10.0.9",
-    "@types/web3": "^1.0.20",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "eslint-plugin-import": "^2.31.0",
-    "mocha": "^10.2.0",
-    "ts-node": "^10.9.2",
-    "typechain": "^8.3.1",
-    "typechain-target-web3-v1-3mihai3": "^6.0.2",
-    "typescript": "^5.2.2"
-  },
-  "peerDependencies": {
-    "web3": "^1.10.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "0.0.201-fluid-dev-6",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
+    "lint": "eslint src/ --fix",
+    "lint-check": "eslint src/",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "build-test": "npm run build && npm run test",
+    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@types/lodash": "^4.17.15",
+    "@defisaver/tokens": "^1.5.55",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "decimal.js": "^10.4.3",
+    "lodash": "^4.17.21"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "@types/chai": "^5.0.0",
+    "@types/mocha": "^10.0.9",
+    "@types/web3": "^1.0.20",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "eslint-plugin-import": "^2.31.0",
+    "mocha": "^10.2.0",
+    "ts-node": "^10.9.2",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}