@defisaver/positions-sdk 0.0.34 → 0.0.35

package/README.md

@@ -1,63 +1,63 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)

package/cjs/compoundV3/index.js

@@ -17,13 +17,12 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
 const multicall_1 = require("../multicall");
-const compound_1 = require("../types/compound");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const constants_1 = require("../constants");
 const moneymarket_1 = require("../moneymarket");
 const compoundHelpers_1 = require("../helpers/compoundHelpers");
-const compound_2 = require("../markets/compound");
+const compound_1 = require("../markets/compound");
 const priceService_1 = require("../services/priceService");
 const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? yield (0, priceService_1.getEthPrice)(defaultWeb3) : yield (0, priceService_1.getUSDCPrice)(defaultWeb3);
@@ -44,35 +43,33 @@ const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) =>
     ];
     const data = yield (0, multicall_1.multicall)(calls, web3, network);
     const colls = data[1].colls.map((coll) => (0, compoundHelpers_1.formatMarketData)(coll, network, baseAssetPrice));
-    if (selectedMarket.value === compound_1.CompoundVersions.CompoundV3ETH) {
-        for (const coll of colls) {
-            if (coll.symbol === 'wstETH') {
-                // eslint-disable-next-line no-await-in-loop
-                const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
-                    (0, staking_1.getStETHByWstETHMultiple)([
-                        (0, tokens_1.assetAmountInWei)(coll.totalSupply, 'wstETH'),
-                        (0, tokens_1.assetAmountInWei)(coll.supplyCap, 'wstETH'),
-                    ], defaultWeb3),
-                    (0, staking_1.getWstETHByStETH)((0, tokens_1.assetAmountInWei)(1, 'stETH'), defaultWeb3),
-                ]);
-                coll.totalSupplyAlternative = (0, tokens_1.assetAmountInEth)(totalSupplyAlternative, 'stETH');
-                coll.supplyCapAlternative = (0, tokens_1.assetAmountInEth)(supplyCapAlternative, 'stETH');
-                coll.priceAlternative = (0, tokens_1.assetAmountInEth)(priceAlternative, 'wstETH');
-                // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(defaultWeb3);
-                coll.incentiveSupplyToken = 'wstETH';
-            }
-            if (coll.symbol === 'cbETH') {
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(defaultWeb3);
-                coll.incentiveSupplyToken = 'cbETH';
-            }
-            if (coll.symbol === 'rETH') {
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield (0, staking_1.getREthApr)(defaultWeb3);
-                coll.incentiveSupplyToken = 'rETH';
-            }
+    for (const coll of colls) {
+        if (coll.symbol === 'wstETH') {
+            // eslint-disable-next-line no-await-in-loop
+            const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
+                (0, staking_1.getStETHByWstETHMultiple)([
+                    (0, tokens_1.assetAmountInWei)(coll.totalSupply, 'wstETH'),
+                    (0, tokens_1.assetAmountInWei)(coll.supplyCap, 'wstETH'),
+                ], defaultWeb3),
+                (0, staking_1.getWstETHByStETH)((0, tokens_1.assetAmountInWei)(1, 'stETH'), defaultWeb3),
+            ]);
+            coll.totalSupplyAlternative = (0, tokens_1.assetAmountInEth)(totalSupplyAlternative, 'stETH');
+            coll.supplyCapAlternative = (0, tokens_1.assetAmountInEth)(supplyCapAlternative, 'stETH');
+            coll.priceAlternative = (0, tokens_1.assetAmountInEth)(priceAlternative, 'wstETH');
+            // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(defaultWeb3);
+            coll.incentiveSupplyToken = 'wstETH';
+        }
+        if (coll.symbol === 'cbETH') {
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(defaultWeb3);
+            coll.incentiveSupplyToken = 'cbETH';
+        }
+        if (coll.symbol === 'rETH') {
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield (0, staking_1.getREthApr)(defaultWeb3);
+            coll.incentiveSupplyToken = 'rETH';
         }
     }
     const base = (0, compoundHelpers_1.formatBaseData)(data[0].baseToken, network, baseAssetPrice);
@@ -127,9 +124,9 @@ const getCompoundV3AccountBalances = (web3, network, block, addressMapping, addr
         return balances;
     }
     const market = ({
-        [(0, compound_2.COMPOUND_V3_ETH)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_ETH)(network),
-        [(0, compound_2.COMPOUND_V3_USDC)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_USDC)(network),
-        [(0, compound_2.COMPOUND_V3_USDBC)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_USDBC)(network),
+        [(0, compound_1.COMPOUND_V3_ETH)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_ETH)(network),
+        [(0, compound_1.COMPOUND_V3_USDC)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_USDC)(network),
+        [(0, compound_1.COMPOUND_V3_USDBC)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_USDBC)(network),
     })[marketAddress.toLowerCase()];
     const loanInfoContract = (0, contracts_1.CompV3ViewContract)(web3, network, block);
     const loanInfo = yield loanInfoContract.methods.getLoanData(market.baseMarketAddress, address).call({}, block);
@@ -182,7 +179,7 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
     if (loanData.borrowAmount.toString() !== '0') {
         usedAssets[baseAssetSymbol].isBorrowed = true;
         usedAssets[baseAssetSymbol].borrowed = (0, tokens_1.assetAmountInEth)(loanData.borrowAmount, baseAssetInfo.symbol);
-        if (selectedMarket.value === (0, compound_2.COMPOUND_V3_ETH)(network).value) {
+        if (selectedMarket.value === (0, compound_1.COMPOUND_V3_ETH)(network).value) {
             usedAssets[baseAssetSymbol].borrowedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol))
                 .mul(assetsData[baseAssetSymbol].price)
                 .toString();

package/cjs/markets/curveUsd/index.js

@@ -5,9 +5,9 @@ const contracts_1 = require("../../contracts");
 const types_1 = require("../../types");
 const CRVUSD_WSTETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'wstETH',
+    label: 'CurveUSD - wstETH',
     shortLabel: 'wstETH',
-    value: types_1.CrvUSDVersions.wstETH,
+    value: types_1.CrvUSDVersions.crvUSDwstETH,
     collAsset: 'wstETH',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDwstETHController', networkId),
@@ -17,9 +17,9 @@ const CRVUSD_WSTETH_MARKET = (networkId) => ({
 exports.CRVUSD_WSTETH_MARKET = CRVUSD_WSTETH_MARKET;
 const CRVUSD_ETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'ETH',
+    label: 'CurveUSD - ETH',
     shortLabel: 'ETH',
-    value: types_1.CrvUSDVersions.ETH,
+    value: types_1.CrvUSDVersions.crvUSDETH,
     collAsset: 'ETH',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDETHController', networkId),
@@ -29,9 +29,9 @@ const CRVUSD_ETH_MARKET = (networkId) => ({
 exports.CRVUSD_ETH_MARKET = CRVUSD_ETH_MARKET;
 const CRVUSD_WBTC_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'WBTC',
+    label: 'CurveUSD - WBTC',
     shortLabel: 'WBTC',
-    value: types_1.CrvUSDVersions.WBTC,
+    value: types_1.CrvUSDVersions.crvUSDWBTC,
     collAsset: 'WBTC',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDWBTCController', networkId),
@@ -41,9 +41,9 @@ const CRVUSD_WBTC_MARKET = (networkId) => ({
 exports.CRVUSD_WBTC_MARKET = CRVUSD_WBTC_MARKET;
 const CRVUSD_TBTC_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'tBTC',
+    label: 'CurveUSD - tBTC',
     shortLabel: 'tBTC',
-    value: types_1.CrvUSDVersions.tBTC,
+    value: types_1.CrvUSDVersions.crvUSDtBTC,
     collAsset: 'tBTC',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDtBTCController', networkId),
@@ -53,9 +53,9 @@ const CRVUSD_TBTC_MARKET = (networkId) => ({
 exports.CRVUSD_TBTC_MARKET = CRVUSD_TBTC_MARKET;
 const CRVUSD_SFRXETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'sfrxETH',
+    label: 'CurveUSD - sfrxETH',
     shortLabel: 'sfrxETH',
-    value: types_1.CrvUSDVersions.sfrxETH,
+    value: types_1.CrvUSDVersions.crvUSDsfrxETH,
     collAsset: 'sfrxETH',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDsfrxETHController', networkId),
@@ -64,10 +64,10 @@ const CRVUSD_SFRXETH_MARKET = (networkId) => ({
 });
 exports.CRVUSD_SFRXETH_MARKET = CRVUSD_SFRXETH_MARKET;
 const CrvUsdMarkets = (networkId) => ({
-    [types_1.CrvUSDVersions.wstETH]: (0, exports.CRVUSD_WSTETH_MARKET)(networkId),
-    [types_1.CrvUSDVersions.ETH]: (0, exports.CRVUSD_ETH_MARKET)(networkId),
-    [types_1.CrvUSDVersions.WBTC]: (0, exports.CRVUSD_WBTC_MARKET)(networkId),
-    [types_1.CrvUSDVersions.tBTC]: (0, exports.CRVUSD_TBTC_MARKET)(networkId),
-    [types_1.CrvUSDVersions.sfrxETH]: (0, exports.CRVUSD_SFRXETH_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDwstETH]: (0, exports.CRVUSD_WSTETH_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDETH]: (0, exports.CRVUSD_ETH_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDWBTC]: (0, exports.CRVUSD_WBTC_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDtBTC]: (0, exports.CRVUSD_TBTC_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDsfrxETH]: (0, exports.CRVUSD_SFRXETH_MARKET)(networkId),
 });
 exports.CrvUsdMarkets = CrvUsdMarkets;

package/cjs/types/curveUsd.d.ts

@@ -1,10 +1,10 @@
 import { NetworkNumber } from './common';
 export declare enum CrvUSDVersions {
-    'wstETH' = "wstETH",
-    'WBTC' = "WBTC",
-    'ETH' = "ETH",
-    'tBTC' = "tBTC",
-    'sfrxETH' = "sfrxETH"
+    'crvUSDwstETH' = "wstETH",
+    'crvUSDWBTC' = "WBTC",
+    'crvUSDETH' = "ETH",
+    'crvUSDtBTC' = "tBTC",
+    'crvUSDsfrxETH' = "sfrxETH"
 }
 export declare enum CrvUSDStatus {
     Nonexistant = "Nonexistant",

package/cjs/types/curveUsd.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrvUSDStatus = exports.CrvUSDVersions = void 0;
 var CrvUSDVersions;
 (function (CrvUSDVersions) {
-    CrvUSDVersions["wstETH"] = "wstETH";
-    CrvUSDVersions["WBTC"] = "WBTC";
-    CrvUSDVersions["ETH"] = "ETH";
-    CrvUSDVersions["tBTC"] = "tBTC";
-    CrvUSDVersions["sfrxETH"] = "sfrxETH";
+    CrvUSDVersions["crvUSDwstETH"] = "wstETH";
+    CrvUSDVersions["crvUSDWBTC"] = "WBTC";
+    CrvUSDVersions["crvUSDETH"] = "ETH";
+    CrvUSDVersions["crvUSDtBTC"] = "tBTC";
+    CrvUSDVersions["crvUSDsfrxETH"] = "sfrxETH";
 })(CrvUSDVersions || (exports.CrvUSDVersions = CrvUSDVersions = {}));
 var CrvUSDStatus;
 (function (CrvUSDStatus) {

package/esm/compoundV3/index.js

@@ -11,7 +11,6 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo, getAssetInfoByAddress, } from '@defisaver/tokens';
 import { CompV3ViewContract } from '../contracts';
 import { multicall } from '../multicall';
-import { CompoundVersions, } from '../types/compound';
 import { getCbETHApr, getREthApr, getStETHApr, getStETHByWstETHMultiple, getWstETHByStETH, } from '../staking';
 import { wethToEth } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
@@ -38,35 +37,33 @@ export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultW
     ];
     const data = yield multicall(calls, web3, network);
     const colls = data[1].colls.map((coll) => formatMarketData(coll, network, baseAssetPrice));
-    if (selectedMarket.value === CompoundVersions.CompoundV3ETH) {
-        for (const coll of colls) {
-            if (coll.symbol === 'wstETH') {
-                // eslint-disable-next-line no-await-in-loop
-                const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
-                    getStETHByWstETHMultiple([
-                        assetAmountInWei(coll.totalSupply, 'wstETH'),
-                        assetAmountInWei(coll.supplyCap, 'wstETH'),
-                    ], defaultWeb3),
-                    getWstETHByStETH(assetAmountInWei(1, 'stETH'), defaultWeb3),
-                ]);
-                coll.totalSupplyAlternative = assetAmountInEth(totalSupplyAlternative, 'stETH');
-                coll.supplyCapAlternative = assetAmountInEth(supplyCapAlternative, 'stETH');
-                coll.priceAlternative = assetAmountInEth(priceAlternative, 'wstETH');
-                // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield getStETHApr(defaultWeb3);
-                coll.incentiveSupplyToken = 'wstETH';
-            }
-            if (coll.symbol === 'cbETH') {
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield getCbETHApr(defaultWeb3);
-                coll.incentiveSupplyToken = 'cbETH';
-            }
-            if (coll.symbol === 'rETH') {
-                // eslint-disable-next-line no-await-in-loop
-                coll.incentiveSupplyApy = yield getREthApr(defaultWeb3);
-                coll.incentiveSupplyToken = 'rETH';
-            }
+    for (const coll of colls) {
+        if (coll.symbol === 'wstETH') {
+            // eslint-disable-next-line no-await-in-loop
+            const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
+                getStETHByWstETHMultiple([
+                    assetAmountInWei(coll.totalSupply, 'wstETH'),
+                    assetAmountInWei(coll.supplyCap, 'wstETH'),
+                ], defaultWeb3),
+                getWstETHByStETH(assetAmountInWei(1, 'stETH'), defaultWeb3),
+            ]);
+            coll.totalSupplyAlternative = assetAmountInEth(totalSupplyAlternative, 'stETH');
+            coll.supplyCapAlternative = assetAmountInEth(supplyCapAlternative, 'stETH');
+            coll.priceAlternative = assetAmountInEth(priceAlternative, 'wstETH');
+            // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield getStETHApr(defaultWeb3);
+            coll.incentiveSupplyToken = 'wstETH';
+        }
+        if (coll.symbol === 'cbETH') {
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield getCbETHApr(defaultWeb3);
+            coll.incentiveSupplyToken = 'cbETH';
+        }
+        if (coll.symbol === 'rETH') {
+            // eslint-disable-next-line no-await-in-loop
+            coll.incentiveSupplyApy = yield getREthApr(defaultWeb3);
+            coll.incentiveSupplyToken = 'rETH';
         }
     }
     const base = formatBaseData(data[0].baseToken, network, baseAssetPrice);

package/esm/markets/curveUsd/index.js

@@ -2,9 +2,9 @@ import { getConfigContractAddress } from '../../contracts';
 import { CrvUSDVersions } from '../../types';
 export const CRVUSD_WSTETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'wstETH',
+    label: 'CurveUSD - wstETH',
     shortLabel: 'wstETH',
-    value: CrvUSDVersions.wstETH,
+    value: CrvUSDVersions.crvUSDwstETH,
     collAsset: 'wstETH',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDwstETHController', networkId),
@@ -13,9 +13,9 @@ export const CRVUSD_WSTETH_MARKET = (networkId) => ({
 });
 export const CRVUSD_ETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'ETH',
+    label: 'CurveUSD - ETH',
     shortLabel: 'ETH',
-    value: CrvUSDVersions.ETH,
+    value: CrvUSDVersions.crvUSDETH,
     collAsset: 'ETH',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDETHController', networkId),
@@ -24,9 +24,9 @@ export const CRVUSD_ETH_MARKET = (networkId) => ({
 });
 export const CRVUSD_WBTC_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'WBTC',
+    label: 'CurveUSD - WBTC',
     shortLabel: 'WBTC',
-    value: CrvUSDVersions.WBTC,
+    value: CrvUSDVersions.crvUSDWBTC,
     collAsset: 'WBTC',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDWBTCController', networkId),
@@ -35,9 +35,9 @@ export const CRVUSD_WBTC_MARKET = (networkId) => ({
 });
 export const CRVUSD_TBTC_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'tBTC',
+    label: 'CurveUSD - tBTC',
     shortLabel: 'tBTC',
-    value: CrvUSDVersions.tBTC,
+    value: CrvUSDVersions.crvUSDtBTC,
     collAsset: 'tBTC',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDtBTCController', networkId),
@@ -46,9 +46,9 @@ export const CRVUSD_TBTC_MARKET = (networkId) => ({
 });
 export const CRVUSD_SFRXETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'sfrxETH',
+    label: 'CurveUSD - sfrxETH',
     shortLabel: 'sfrxETH',
-    value: CrvUSDVersions.sfrxETH,
+    value: CrvUSDVersions.crvUSDsfrxETH,
     collAsset: 'sfrxETH',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDsfrxETHController', networkId),
@@ -56,9 +56,9 @@ export const CRVUSD_SFRXETH_MARKET = (networkId) => ({
     createCollAssets: ['sfrxETH'],
 });
 export const CrvUsdMarkets = (networkId) => ({
-    [CrvUSDVersions.wstETH]: CRVUSD_WSTETH_MARKET(networkId),
-    [CrvUSDVersions.ETH]: CRVUSD_ETH_MARKET(networkId),
-    [CrvUSDVersions.WBTC]: CRVUSD_WBTC_MARKET(networkId),
-    [CrvUSDVersions.tBTC]: CRVUSD_TBTC_MARKET(networkId),
-    [CrvUSDVersions.sfrxETH]: CRVUSD_SFRXETH_MARKET(networkId),
+    [CrvUSDVersions.crvUSDwstETH]: CRVUSD_WSTETH_MARKET(networkId),
+    [CrvUSDVersions.crvUSDETH]: CRVUSD_ETH_MARKET(networkId),
+    [CrvUSDVersions.crvUSDWBTC]: CRVUSD_WBTC_MARKET(networkId),
+    [CrvUSDVersions.crvUSDtBTC]: CRVUSD_TBTC_MARKET(networkId),
+    [CrvUSDVersions.crvUSDsfrxETH]: CRVUSD_SFRXETH_MARKET(networkId),
 });

package/esm/types/curveUsd.d.ts

@@ -1,10 +1,10 @@
 import { NetworkNumber } from './common';
 export declare enum CrvUSDVersions {
-    'wstETH' = "wstETH",
-    'WBTC' = "WBTC",
-    'ETH' = "ETH",
-    'tBTC' = "tBTC",
-    'sfrxETH' = "sfrxETH"
+    'crvUSDwstETH' = "wstETH",
+    'crvUSDWBTC' = "WBTC",
+    'crvUSDETH' = "ETH",
+    'crvUSDtBTC' = "tBTC",
+    'crvUSDsfrxETH' = "sfrxETH"
 }
 export declare enum CrvUSDStatus {
     Nonexistant = "Nonexistant",

package/esm/types/curveUsd.js

@@ -1,10 +1,10 @@
 export var CrvUSDVersions;
 (function (CrvUSDVersions) {
-    CrvUSDVersions["wstETH"] = "wstETH";
-    CrvUSDVersions["WBTC"] = "WBTC";
-    CrvUSDVersions["ETH"] = "ETH";
-    CrvUSDVersions["tBTC"] = "tBTC";
-    CrvUSDVersions["sfrxETH"] = "sfrxETH";
+    CrvUSDVersions["crvUSDwstETH"] = "wstETH";
+    CrvUSDVersions["crvUSDWBTC"] = "WBTC";
+    CrvUSDVersions["crvUSDETH"] = "ETH";
+    CrvUSDVersions["crvUSDtBTC"] = "tBTC";
+    CrvUSDVersions["crvUSDsfrxETH"] = "sfrxETH";
 })(CrvUSDVersions || (CrvUSDVersions = {}));
 export var CrvUSDStatus;
 (function (CrvUSDStatus) {

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.34",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
-    "lint": "eslint src/ --fix",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "build-test": "npm run build && mocha tests/*"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.5.5",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "decimal.js": "^10.4.3"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "mocha": "^10.2.0",
-    "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.35",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
+    "lint": "eslint src/ --fix",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "build-test": "npm run build && mocha tests/*"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.5.5",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "decimal.js": "^10.4.3"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "mocha": "^10.2.0",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}