@defisaver/positions-sdk 0.0.21 → 0.0.23

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/aaveV2/index.js

@@ -23,7 +23,6 @@ const aaveV3_1 = require("../aaveV3");
 const aave_1 = require("../markets/aave");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
 const priceService_1 = require("../services/priceService");
-const contracts_2 = __importDefault(require("../config/contracts"));
 const getAaveV2MarketsData = (web3, network, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const ethPrice = yield (0, priceService_1.getEthPrice)(mainnetWeb3);
     const _addresses = selectedMarket.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address);
@@ -95,9 +94,8 @@ const getAaveV2AccountBalances = (web3, network, block, addressMapping, address)
     const market = aave_1.AAVE_V2;
     const loanInfoContract = (0, contracts_1.AaveLoanInfoV2Contract)(web3, network, block);
     const marketAddress = market.providerAddress;
-    const protocolDataProviderContract = new web3.eth.Contract(
     // @ts-ignore
-    contracts_2.default[market.protocolData].abi, market.protocolDataAddress);
+    const protocolDataProviderContract = (0, contracts_1.createContractWrapper)(web3, network, market.protocolData, market.protocolDataAddress);
     const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);

package/cjs/aaveV3/index.js

@@ -15,8 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports.getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.getAaveV3MarketData = exports.aaveV3EmodeCategoriesMapping = exports.aaveV3CalculateDiscountRate = exports.test = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
-const contracts_1 = __importDefault(require("../config/contracts"));
-const contracts_2 = require("../contracts");
+const contracts_1 = require("../contracts");
 const utils_1 = require("../services/utils");
 const common_1 = require("../types/common");
 const staking_1 = require("../staking");
@@ -26,7 +25,7 @@ const moneymarket_1 = require("../moneymarket");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
 const aave_1 = require("../markets/aave");
 const test = (web3, network) => {
-    const contract = (0, contracts_2.AaveV3ViewContract)(web3, 1);
+    const contract = (0, contracts_1.AaveV3ViewContract)(web3, 1);
     return contract.methods.AAVE_REFERRAL_CODE().call();
 };
 exports.test = test;
@@ -80,12 +79,12 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
         const isL2 = (0, utils_1.isLayer2Network)(network);
-        const loanInfoContract = (0, contracts_2.AaveV3ViewContract)(web3, network);
-        const aaveIncentivesContract = (0, contracts_2.AaveIncentiveDataProviderV3Contract)(web3, network);
+        const loanInfoContract = (0, contracts_1.AaveV3ViewContract)(web3, network);
+        const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3Contract)(web3, network);
         const marketAddress = market.providerAddress;
-        const GhoDiscountRateStrategyAddress = (0, contracts_2.getConfigContractAddress)('GhoDiscountRateStrategy', common_1.NetworkNumber.Eth);
-        const GhoDiscountRateStrategyAbi = (0, contracts_2.getConfigContractAbi)('GhoDiscountRateStrategy');
-        const GhoTokenAbi = (0, contracts_2.getConfigContractAbi)('GHO');
+        const GhoDiscountRateStrategyAddress = (0, contracts_1.getConfigContractAddress)('GhoDiscountRateStrategy', common_1.NetworkNumber.Eth);
+        const GhoDiscountRateStrategyAbi = (0, contracts_1.getConfigContractAbi)('GhoDiscountRateStrategy');
+        const GhoTokenAbi = (0, contracts_1.getConfigContractAbi)('GHO');
         const multicallCallsObject = [
             {
                 target: GhoDiscountRateStrategyAddress,
@@ -113,7 +112,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 params: [],
             },
         ];
-        const ghoContract = (0, contracts_2.GhoTokenContract)(web3, network);
+        const ghoContract = (0, contracts_1.GhoTokenContract)(web3, network);
         // eslint-disable-next-line prefer-const
         let [loanInfo, isBorrowAllowed, multiRes] = yield Promise.all([
             loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call(),
@@ -259,12 +258,11 @@ const getAaveV3AccountBalances = (web3, network, block, addressMapping, address)
     if (!address) {
         return balances;
     }
-    const loanInfoContract = (0, contracts_2.AaveV3ViewContract)(web3, network, block);
+    const loanInfoContract = (0, contracts_1.AaveV3ViewContract)(web3, network, block);
     const market = (0, aave_1.AAVE_V3)(network);
     const marketAddress = market.providerAddress;
-    const protocolDataProviderContract = new web3.eth.Contract(
     // @ts-ignore
-    contracts_1.default[market.protocolData].abi, market.protocolDataAddress);
+    const protocolDataProviderContract = (0, contracts_1.createContractWrapper)(web3, network, market.protocolData, market.protocolDataAddress);
     const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);
@@ -306,11 +304,11 @@ const getAaveV3AccountData = (web3, network, address, extractedState) => __await
         return payload;
     }
     const isL2 = (0, utils_1.isLayer2Network)(network);
-    const loanInfoContract = (0, contracts_2.AaveV3ViewContract)(web3, network);
+    const loanInfoContract = (0, contracts_1.AaveV3ViewContract)(web3, network);
     const marketAddress = market.providerAddress;
     const _addresses = market.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
     const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
-    const LendingPoolAbi = (0, contracts_2.getConfigContractAbi)(market.lendingPool);
+    const LendingPoolAbi = (0, contracts_1.getConfigContractAbi)(market.lendingPool);
     const multicallData = [
         {
             target: market.lendingPoolAddress,

package/cjs/helpers/curveUsdHelpers/index.js

@@ -37,6 +37,7 @@ const getCrvUsdAggregatedData = (_a) => {
         borrowedUsd: _borrowedUsd,
         borrowed: _borrowed,
         safetyRatio: ratio,
+        borrowLimitUsd: '0',
     };
 };
 exports.getCrvUsdAggregatedData = getCrvUsdAggregatedData;

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/morphoAaveV3/index.js

@@ -28,7 +28,6 @@ const moneymarket_1 = require("../moneymarket");
 const aaveV3_1 = require("../aaveV3");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
 const aave_1 = require("../markets/aave");
-const contracts_2 = __importDefault(require("../config/contracts"));
 const morphoAaveMath = new AaveV3_maths_1.MorphoAaveMath();
 const poolInterestRates = new PoolInterestRates_1.default();
 const p2pInterestRates = new P2PInterestRates_1.default();
@@ -260,9 +259,8 @@ const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapping, ad
     const selectedMarket = (0, aave_1.MORPHO_AAVE_V3_ETH)(network);
     // @ts-ignore
     const lendingPoolContract = (0, contracts_1.createContractWrapper)(web3, network, selectedMarket.lendingPool, selectedMarket.lendingPoolAddress);
-    const protocolDataProviderContract = new web3.eth.Contract(
     // @ts-ignore
-    contracts_2.default[selectedMarket.protocolData].abi, selectedMarket.protocolDataAddress);
+    const protocolDataProviderContract = (0, contracts_1.createContractWrapper)(web3, network, selectedMarket.protocolData, selectedMarket.protocolDataAddress);
     const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);

package/cjs/spark/index.js

@@ -23,7 +23,6 @@ const multicall_1 = require("../multicall");
 const sparkHelpers_1 = require("../helpers/sparkHelpers");
 const moneymarket_1 = require("../moneymarket");
 const spark_1 = require("../markets/spark");
-const contracts_2 = __importDefault(require("../config/contracts"));
 const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { assetsData } = extractedState;
     const usedAssetsValues = Object.values(usedAssets);
@@ -213,9 +212,8 @@ const getSparkAccountBalances = (web3, network, block, addressMapping, address)
     const loanInfoContract = (0, contracts_1.SparkViewContract)(web3, network, block);
     const market = (0, spark_1.SPARK_V1)(network);
     const marketAddress = market.providerAddress;
-    const protocolDataProviderContract = new web3.eth.Contract(
     // @ts-ignore
-    contracts_2.default[market.protocolData].abi, market.protocolDataAddress);
+    const protocolDataProviderContract = (0, contracts_1.createContractWrapper)(web3, network, market.protocolData, market.protocolDataAddress);
     const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);

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",
@@ -67,6 +67,7 @@ export interface CrvUSDAggregatedPositionData {
     borrowedUsd: string;
     borrowed: string;
     safetyRatio: string;
+    borrowLimitUsd: string;
 }
 export interface CrvUSDUsedAsset {
     isSupplied: boolean;

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/aaveV2/index.js

@@ -11,13 +11,12 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { calculateNetApy, getStETHApr } from '../staking';
 import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
-import { AaveLoanInfoV2Contract } from '../contracts';
+import { AaveLoanInfoV2Contract, createContractWrapper } from '../contracts';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { AAVE_V2 } from '../markets/aave';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
 import { getEthPrice } from '../services/priceService';
-import configRaw from '../config/contracts';
 export const getAaveV2MarketsData = (web3, network, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const ethPrice = yield getEthPrice(mainnetWeb3);
     const _addresses = selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address);
@@ -88,9 +87,8 @@ export const getAaveV2AccountBalances = (web3, network, block, addressMapping, a
     const market = AAVE_V2;
     const loanInfoContract = AaveLoanInfoV2Contract(web3, network, block);
     const marketAddress = market.providerAddress;
-    const protocolDataProviderContract = new web3.eth.Contract(
     // @ts-ignore
-    configRaw[market.protocolData].abi, market.protocolDataAddress);
+    const protocolDataProviderContract = createContractWrapper(web3, network, market.protocolData, market.protocolDataAddress);
     const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);

package/esm/aaveV3/index.js

@@ -9,8 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
-import configRaw from '../config/contracts';
-import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
+import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
 import { addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { NetworkNumber, } from '../types/common';
 import { getStakingApy } from '../staking';
@@ -252,9 +251,8 @@ export const getAaveV3AccountBalances = (web3, network, block, addressMapping, a
     const loanInfoContract = AaveV3ViewContract(web3, network, block);
     const market = AAVE_V3(network);
     const marketAddress = market.providerAddress;
-    const protocolDataProviderContract = new web3.eth.Contract(
     // @ts-ignore
-    configRaw[market.protocolData].abi, market.protocolDataAddress);
+    const protocolDataProviderContract = createContractWrapper(web3, network, market.protocolData, market.protocolDataAddress);
     const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);

package/esm/helpers/curveUsdHelpers/index.js

@@ -31,5 +31,6 @@ export const getCrvUsdAggregatedData = (_a) => {
         borrowedUsd: _borrowedUsd,
         borrowed: _borrowed,
         safetyRatio: ratio,
+        borrowLimitUsd: '0',
     };
 };

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/morphoAaveV3/index.js

@@ -22,7 +22,6 @@ import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
 import { MORPHO_AAVE_V3_ETH } from '../markets/aave';
-import configRaw from '../config/contracts';
 const morphoAaveMath = new MorphoAaveMath();
 const poolInterestRates = new PoolInterestRates();
 const p2pInterestRates = new P2PInterestRates();
@@ -253,9 +252,8 @@ export const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapp
     const selectedMarket = MORPHO_AAVE_V3_ETH(network);
     // @ts-ignore
     const lendingPoolContract = createContractWrapper(web3, network, selectedMarket.lendingPool, selectedMarket.lendingPoolAddress);
-    const protocolDataProviderContract = new web3.eth.Contract(
     // @ts-ignore
-    configRaw[selectedMarket.protocolData].abi, selectedMarket.protocolDataAddress);
+    const protocolDataProviderContract = createContractWrapper(web3, network, selectedMarket.protocolData, selectedMarket.protocolDataAddress);
     const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);

package/esm/spark/index.js

@@ -12,12 +12,11 @@ import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { calculateNetApy, getCbETHApr, getREthApr, getStETHApr, } from '../staking';
 import { getDsrApy } from '../services/dsrService';
-import { SparkIncentiveDataProviderContract, SparkViewContract, getConfigContractAbi, } from '../contracts';
+import { SparkIncentiveDataProviderContract, SparkViewContract, getConfigContractAbi, createContractWrapper, } from '../contracts';
 import { multicall } from '../multicall';
 import { sparkGetAggregatedPositionData, sparkIsInIsolationMode } from '../helpers/sparkHelpers';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { SPARK_V1 } from '../markets/spark';
-import configRaw from '../config/contracts';
 export const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { assetsData } = extractedState;
     const usedAssetsValues = Object.values(usedAssets);
@@ -205,9 +204,8 @@ export const getSparkAccountBalances = (web3, network, block, addressMapping, ad
     const loanInfoContract = SparkViewContract(web3, network, block);
     const market = SPARK_V1(network);
     const marketAddress = market.providerAddress;
-    const protocolDataProviderContract = new web3.eth.Contract(
     // @ts-ignore
-    configRaw[market.protocolData].abi, market.protocolDataAddress);
+    const protocolDataProviderContract = createContractWrapper(web3, network, market.protocolData, market.protocolDataAddress);
     const reserveTokens = yield protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
     const symbols = reserveTokens.map(({ symbol }) => symbol);
     const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);

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",
@@ -67,6 +67,7 @@ export interface CrvUSDAggregatedPositionData {
     borrowedUsd: string;
     borrowed: string;
     safetyRatio: string;
+    borrowLimitUsd: string;
 }
 export interface CrvUSDUsedAsset {
     isSupplied: boolean;

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) {