@defisaver/positions-sdk 0.0.23 → 0.0.25

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

@@ -37,7 +37,6 @@ 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: 'CurveUSD - wstETH',
+    label: 'wstETH',
     shortLabel: 'wstETH',
-    value: types_1.CrvUSDVersions.crvUSDwstETH,
+    value: types_1.CrvUSDVersions.wstETH,
     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: 'CurveUSD - ETH',
+    label: 'ETH',
     shortLabel: 'ETH',
-    value: types_1.CrvUSDVersions.crvUSDETH,
+    value: types_1.CrvUSDVersions.ETH,
     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: 'CurveUSD - WBTC',
+    label: 'WBTC',
     shortLabel: 'WBTC',
-    value: types_1.CrvUSDVersions.crvUSDWBTC,
+    value: types_1.CrvUSDVersions.WBTC,
     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: 'CurveUSD - tBTC',
+    label: 'tBTC',
     shortLabel: 'tBTC',
-    value: types_1.CrvUSDVersions.crvUSDtBTC,
+    value: types_1.CrvUSDVersions.tBTC,
     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: 'CurveUSD - sfrxETH',
+    label: 'sfrxETH',
     shortLabel: 'sfrxETH',
-    value: types_1.CrvUSDVersions.crvUSDsfrxETH,
+    value: types_1.CrvUSDVersions.sfrxETH,
     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.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),
+    [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),
 });
 exports.CrvUsdMarkets = CrvUsdMarkets;

package/cjs/spark/index.js

@@ -105,6 +105,7 @@ const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3) => __aw
         price: new decimal_js_1.default(market.price.toString()).div(1e8).toString(),
         isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
         isFlashLoanEnabled: market.isFlashLoanEnabled,
+        aTokenAddress: market.aTokenAddress,
         eModeCategoryData: {
             label: market.label,
             liquidationBonus: new decimal_js_1.default(market.liquidationBonus).div(10000).toString(),

package/cjs/types/curveUsd.d.ts

@@ -1,10 +1,10 @@
 import { NetworkNumber } from './common';
 export declare enum CrvUSDVersions {
-    'crvUSDwstETH' = "wstETH",
-    'crvUSDWBTC' = "WBTC",
-    'crvUSDETH' = "ETH",
-    'crvUSDtBTC' = "tBTC",
-    'crvUSDsfrxETH' = "sfrxETH"
+    'wstETH' = "wstETH",
+    'WBTC' = "WBTC",
+    'ETH' = "ETH",
+    'tBTC' = "tBTC",
+    'sfrxETH' = "sfrxETH"
 }
 export declare enum CrvUSDStatus {
     Nonexistant = "Nonexistant",
@@ -67,7 +67,6 @@ 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["crvUSDwstETH"] = "wstETH";
-    CrvUSDVersions["crvUSDWBTC"] = "WBTC";
-    CrvUSDVersions["crvUSDETH"] = "ETH";
-    CrvUSDVersions["crvUSDtBTC"] = "tBTC";
-    CrvUSDVersions["crvUSDsfrxETH"] = "sfrxETH";
+    CrvUSDVersions["wstETH"] = "wstETH";
+    CrvUSDVersions["WBTC"] = "WBTC";
+    CrvUSDVersions["ETH"] = "ETH";
+    CrvUSDVersions["tBTC"] = "tBTC";
+    CrvUSDVersions["sfrxETH"] = "sfrxETH";
 })(CrvUSDVersions || (exports.CrvUSDVersions = CrvUSDVersions = {}));
 var CrvUSDStatus;
 (function (CrvUSDStatus) {

package/esm/helpers/curveUsdHelpers/index.js

@@ -31,6 +31,5 @@ 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: 'CurveUSD - wstETH',
+    label: 'wstETH',
     shortLabel: 'wstETH',
-    value: CrvUSDVersions.crvUSDwstETH,
+    value: CrvUSDVersions.wstETH,
     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: 'CurveUSD - ETH',
+    label: 'ETH',
     shortLabel: 'ETH',
-    value: CrvUSDVersions.crvUSDETH,
+    value: CrvUSDVersions.ETH,
     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: 'CurveUSD - WBTC',
+    label: 'WBTC',
     shortLabel: 'WBTC',
-    value: CrvUSDVersions.crvUSDWBTC,
+    value: CrvUSDVersions.WBTC,
     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: 'CurveUSD - tBTC',
+    label: 'tBTC',
     shortLabel: 'tBTC',
-    value: CrvUSDVersions.crvUSDtBTC,
+    value: CrvUSDVersions.tBTC,
     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: 'CurveUSD - sfrxETH',
+    label: 'sfrxETH',
     shortLabel: 'sfrxETH',
-    value: CrvUSDVersions.crvUSDsfrxETH,
+    value: CrvUSDVersions.sfrxETH,
     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.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),
+    [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),
 });

package/esm/spark/index.js

@@ -98,6 +98,7 @@ export const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3)
         price: new Dec(market.price.toString()).div(1e8).toString(),
         isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
         isFlashLoanEnabled: market.isFlashLoanEnabled,
+        aTokenAddress: market.aTokenAddress,
         eModeCategoryData: {
             label: market.label,
             liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),

package/esm/types/curveUsd.d.ts

@@ -1,10 +1,10 @@
 import { NetworkNumber } from './common';
 export declare enum CrvUSDVersions {
-    'crvUSDwstETH' = "wstETH",
-    'crvUSDWBTC' = "WBTC",
-    'crvUSDETH' = "ETH",
-    'crvUSDtBTC' = "tBTC",
-    'crvUSDsfrxETH' = "sfrxETH"
+    'wstETH' = "wstETH",
+    'WBTC' = "WBTC",
+    'ETH' = "ETH",
+    'tBTC' = "tBTC",
+    'sfrxETH' = "sfrxETH"
 }
 export declare enum CrvUSDStatus {
     Nonexistant = "Nonexistant",
@@ -67,7 +67,6 @@ 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["crvUSDwstETH"] = "wstETH";
-    CrvUSDVersions["crvUSDWBTC"] = "WBTC";
-    CrvUSDVersions["crvUSDETH"] = "ETH";
-    CrvUSDVersions["crvUSDtBTC"] = "tBTC";
-    CrvUSDVersions["crvUSDsfrxETH"] = "sfrxETH";
+    CrvUSDVersions["wstETH"] = "wstETH";
+    CrvUSDVersions["WBTC"] = "WBTC";
+    CrvUSDVersions["ETH"] = "ETH";
+    CrvUSDVersions["tBTC"] = "tBTC";
+    CrvUSDVersions["sfrxETH"] = "sfrxETH";
 })(CrvUSDVersions || (CrvUSDVersions = {}));
 export var CrvUSDStatus;
 (function (CrvUSDStatus) {

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.23",
-  "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.3",
-    "decimal.js": "^10.4.3",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "@ethersproject/bignumber": "^5.7.0"
-  },
-  "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.25",
+  "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"
+  }
+}