@defisaver/positions-sdk 0.0.33 → 0.0.34

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/markets/morphoBlue/index.d.ts

@@ -1,6 +1,8 @@
 import { MorphoBlueMarketData } from '../../types';
 import { NetworkNumber } from '../../types/common';
 export declare const MORPHO_BLUE_WSTETH_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_USDC: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstetheth: MorphoBlueMarketData;
+    readonly morphobluewstethusdc: MorphoBlueMarketData;
 };

package/cjs/markets/morphoBlue/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MorphoBlueMarkets = exports.MORPHO_BLUE_WSTETH_ETH = void 0;
+exports.MorphoBlueMarkets = exports.MORPHO_BLUE_WSTETH_USDC = exports.MORPHO_BLUE_WSTETH_ETH = void 0;
 const types_1 = require("../../types");
 const common_1 = require("../../types/common");
 const MORPHO_BLUE_WSTETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -18,7 +18,23 @@ const MORPHO_BLUE_WSTETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_WSTETH_ETH = MORPHO_BLUE_WSTETH_ETH;
+const MORPHO_BLUE_WSTETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/USDC',
+    value: types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC,
+    url: 'default',
+    loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    // icon: SvgAdapter(protocolIcons.spark),
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_WSTETH_USDC = MORPHO_BLUE_WSTETH_USDC;
 const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueWstEthEth]: (0, exports.MORPHO_BLUE_WSTETH_ETH)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC]: (0, exports.MORPHO_BLUE_WSTETH_USDC)(networkId),
 });
 exports.MorphoBlueMarkets = MorphoBlueMarkets;

package/cjs/morphoBlue/index.js

@@ -77,7 +77,10 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
         const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
         const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
         const utillization = new decimal_js_1.default(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
-        const oracleRate = new decimal_js_1.default(marketInfo.oracle).div(1e36).toString();
+        const oracleScaleFactor = new decimal_js_1.default(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
+        const oracleScale = new decimal_js_1.default(10).pow(oracleScaleFactor).toString();
+        const scale = new decimal_js_1.default(10).pow(loanTokenInfo.decimals).toString();
+        const oracleRate = new decimal_js_1.default(marketInfo.oracle).div(oracleScale).toString();
         const assetsData = {};
         assetsData[(0, utils_1.wethToEth)(loanTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(loanTokenInfo.symbol),
@@ -85,8 +88,8 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
             price: new decimal_js_1.default(loanTokenPrice).div(1e8).toString(),
             supplyRate: new decimal_js_1.default(supplyRate).div(constants_1.WAD).mul(100).toString(),
             borrowRate: new decimal_js_1.default(compoundedBorrowRate).div(constants_1.WAD).mul(100).toString(),
-            totalSupply: new decimal_js_1.default(marketInfo.totalSupplyAssets).div(constants_1.WAD).toString(),
-            totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets).div(constants_1.WAD).toString(),
+            totalSupply: new decimal_js_1.default(marketInfo.totalSupplyAssets).div(scale).toString(),
+            totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets).div(scale).toString(),
         };
         assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),

package/cjs/types/morphoBlue.d.ts

@@ -1,6 +1,7 @@
 import { MMUsedAssets, NetworkNumber } from './common';
 export declare enum MorphoBlueVersions {
-    MorphoBlueWstEthEth = "morphobluewstetheth"
+    MorphoBlueWstEthEth = "morphobluewstetheth",
+    MorphoBlueWstEthUSDC = "morphobluewstethusdc"
 }
 export interface MorphoBlueMarketData {
     chainIds: NetworkNumber[];

package/cjs/types/morphoBlue.js

@@ -4,4 +4,5 @@ exports.MorphoBlueVersions = void 0;
 var MorphoBlueVersions;
 (function (MorphoBlueVersions) {
     MorphoBlueVersions["MorphoBlueWstEthEth"] = "morphobluewstetheth";
+    MorphoBlueVersions["MorphoBlueWstEthUSDC"] = "morphobluewstethusdc";
 })(MorphoBlueVersions || (exports.MorphoBlueVersions = MorphoBlueVersions = {}));

package/esm/markets/morphoBlue/index.d.ts

@@ -1,6 +1,8 @@
 import { MorphoBlueMarketData } from '../../types';
 import { NetworkNumber } from '../../types/common';
 export declare const MORPHO_BLUE_WSTETH_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_USDC: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstetheth: MorphoBlueMarketData;
+    readonly morphobluewstethusdc: MorphoBlueMarketData;
 };

package/esm/markets/morphoBlue/index.js

@@ -14,6 +14,21 @@ export const MORPHO_BLUE_WSTETH_ETH = (networkId = NetworkNumber.Eth) => ({
     // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_WSTETH_USDC = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/USDC',
+    value: MorphoBlueVersions.MorphoBlueWstEthUSDC,
+    url: 'default',
+    loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    // icon: SvgAdapter(protocolIcons.spark),
+    protocolName: 'morpho-blue',
+});
 export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthEth]: MORPHO_BLUE_WSTETH_ETH(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
 });

package/esm/morphoBlue/index.js

@@ -71,7 +71,10 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
         const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
         const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
         const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
-        const oracleRate = new Dec(marketInfo.oracle).div(1e36).toString();
+        const oracleScaleFactor = new Dec(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
+        const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
+        const scale = new Dec(10).pow(loanTokenInfo.decimals).toString();
+        const oracleRate = new Dec(marketInfo.oracle).div(oracleScale).toString();
         const assetsData = {};
         assetsData[wethToEth(loanTokenInfo.symbol)] = {
             symbol: wethToEth(loanTokenInfo.symbol),
@@ -79,8 +82,8 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             price: new Dec(loanTokenPrice).div(1e8).toString(),
             supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
             borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
-            totalSupply: new Dec(marketInfo.totalSupplyAssets).div(WAD).toString(),
-            totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(WAD).toString(),
+            totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
+            totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
         };
         assetsData[wethToEth(collateralTokenInfo.symbol)] = {
             symbol: wethToEth(collateralTokenInfo.symbol),

package/esm/types/morphoBlue.d.ts

@@ -1,6 +1,7 @@
 import { MMUsedAssets, NetworkNumber } from './common';
 export declare enum MorphoBlueVersions {
-    MorphoBlueWstEthEth = "morphobluewstetheth"
+    MorphoBlueWstEthEth = "morphobluewstetheth",
+    MorphoBlueWstEthUSDC = "morphobluewstethusdc"
 }
 export interface MorphoBlueMarketData {
     chainIds: NetworkNumber[];

package/esm/types/morphoBlue.js

@@ -1,4 +1,5 @@
 export var MorphoBlueVersions;
 (function (MorphoBlueVersions) {
     MorphoBlueVersions["MorphoBlueWstEthEth"] = "morphobluewstetheth";
+    MorphoBlueVersions["MorphoBlueWstEthUSDC"] = "morphobluewstethusdc";
 })(MorphoBlueVersions || (MorphoBlueVersions = {}));

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.33",
-  "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.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"
+  }
+}