@defisaver/positions-sdk 0.0.3 → 0.0.4

package/cjs/aaveV3/index.js

@@ -168,7 +168,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
-            if (['wstETH', 'cbETH', 'rETH'].includes(_market.symbol)) {
+            if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
                 if (!(0, utils_1.isLayer2Network)(network) && _market.symbol === 'cbETH')
                     return;
                 _market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(_market.symbol, defaultWeb3);

package/cjs/staking/staking.d.ts

@@ -3,6 +3,7 @@ import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const getStETHApr: (web3: Web3, fromBlock?: number, blockNumber?: 'latest' | number) => Promise<any>;
 export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
+export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean) => {

package/cjs/staking/staking.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
+exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.getDsrApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
@@ -76,6 +76,16 @@ const getREthApr = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, v
     return apr;
 });
 exports.getREthApr = getREthApr;
+const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+    const potContract = (0, contracts_1.PotContract)(web3, common_1.NetworkNumber.Eth);
+    return new decimal_js_1.default(yield potContract.methods.dsr().call())
+        .div(new decimal_js_1.default(1e27))
+        .pow(constants_1.SECONDS_PER_YEAR)
+        .sub(1)
+        .mul(100)
+        .toString();
+});
+exports.getDsrApy = getDsrApy;
 const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     if (asset === 'stETH' || asset === 'wstETH')
         return (0, exports.getStETHApr)(web3, fromBlock, blockNumber);
@@ -83,6 +93,8 @@ const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefine
         return (0, exports.getCbETHApr)(web3, blockNumber);
     if (asset === 'rETH')
         return (0, exports.getREthApr)(web3, blockNumber);
+    if (asset === 'sDAI')
+        return (0, exports.getDsrApy)(web3);
 };
 exports.getStakingApy = getStakingApy;
 const calculateInterestEarned = (principal, interest, type, apy = false) => {

package/esm/aaveV3/index.js

@@ -159,7 +159,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
-            if (['wstETH', 'cbETH', 'rETH'].includes(_market.symbol)) {
+            if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
                 if (!isLayer2Network(network) && _market.symbol === 'cbETH')
                     return;
                 _market.incentiveSupplyApy = yield getStakingApy(_market.symbol, defaultWeb3);

package/esm/staking/staking.d.ts

@@ -3,6 +3,7 @@ import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const getStETHApr: (web3: Web3, fromBlock?: number, blockNumber?: 'latest' | number) => Promise<any>;
 export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
+export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean) => {

package/esm/staking/staking.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { CbEthContract, LidoContract, REthContract, wstETHContract, } from '../contracts';
+import { CbEthContract, LidoContract, PotContract, REthContract, wstETHContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { BLOCKS_IN_A_YEAR, SECONDS_PER_YEAR, AVG_BLOCK_TIME } from '../constants';
 import { multicall } from '../multicall';
@@ -67,6 +67,15 @@ export const getREthApr = (web3, blockNumber = 'latest') => __awaiter(void 0, vo
         .toString();
     return apr;
 });
+export const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+    const potContract = PotContract(web3, NetworkNumber.Eth);
+    return new Dec(yield potContract.methods.dsr().call())
+        .div(new Dec(1e27))
+        .pow(SECONDS_PER_YEAR)
+        .sub(1)
+        .mul(100)
+        .toString();
+});
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     if (asset === 'stETH' || asset === 'wstETH')
         return getStETHApr(web3, fromBlock, blockNumber);
@@ -74,6 +83,8 @@ export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = u
         return getCbETHApr(web3, blockNumber);
     if (asset === 'rETH')
         return getREthApr(web3, blockNumber);
+    if (asset === 'sDAI')
+        return getDsrApy(web3);
 };
 export const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -244,7 +244,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
   await Promise.all(assetsData.map(async (_market: AaveV3AssetData) => {
     /* eslint-disable no-param-reassign */
     const rewardForMarket: IUiIncentiveDataProviderV3.AggregatedReserveIncentiveDataStructOutput | undefined = rewardInfo?.[_market.underlyingTokenAddress as any];
-    if (['wstETH', 'cbETH', 'rETH'].includes(_market.symbol)) {
+    if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
       if (!isLayer2Network(network) && _market.symbol === 'cbETH') return;
       _market.incentiveSupplyApy = await getStakingApy(_market.symbol, defaultWeb3);
       _market.incentiveSupplyToken = _market.symbol;

package/src/staking/staking.ts

@@ -1,7 +1,7 @@
 import Dec from 'decimal.js';
 import Web3 from 'web3';
 import {
-  CbEthContract, LidoContract, REthContract, wstETHContract,
+  CbEthContract, LidoContract, PotContract, REthContract, wstETHContract,
 } from '../contracts';
 import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../types/common';
 import { ContractEventLog } from '../types/contracts/generated/types';
@@ -66,10 +66,21 @@ export const getREthApr = async (web3: Web3, blockNumber: 'latest' | number = 'l
   return apr;
 };
 
+export const getDsrApy = async (web3: Web3, blockNumber: 'latest' | number = 'latest') => {
+  const potContract = PotContract(web3, NetworkNumber.Eth);
+  return new Dec(await potContract.methods.dsr().call())
+      .div(new Dec(1e27))
+      .pow(SECONDS_PER_YEAR)
+      .sub(1)
+      .mul(100)
+      .toString();
+};
+
 export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
   if (asset === 'stETH' || asset === 'wstETH') return getStETHApr(web3, fromBlock, blockNumber);
   if (asset === 'cbETH') return getCbETHApr(web3, blockNumber);
   if (asset === 'rETH') return getREthApr(web3, blockNumber);
+  if (asset === 'sDAI') return getDsrApy(web3);
 };
 
 export const calculateInterestEarned = (principal: string, interest: string, type: string, apy = false) => {

package/yarn-error.log

@@ -0,0 +1,64 @@
+Arguments: 
+  /Users/stefan/.nvm/versions/node/v14.19.0/bin/node /usr/local/Cellar/yarn/1.22.19/libexec/bin/yarn.js
+
+PATH: 
+  /Users/stefan/.nvm/versions/node/v14.19.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Applications/VMware Fusion.app/Contents/Public:/usr/local/go/bin:/Users/stefan/WebstormProjects/defisaver-positions-sdk/node_modules/.bin:/usr/local/go
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  14.19.0
+
+Platform: 
+  darwin x64
+
+Trace: 
+  Error: incorrect data check
+      at Zlib.zlibOnError [as onerror] (zlib.js:187:17)
+
+npm manifest: 
+  {
+    "name": "defisaver-positions-sdk",
+    "version": "0.0.1",
+    "description": "",
+    "main": "./cjs/index.js",
+    "module": "./esm/src/index.js",
+    "types": "./esm/src/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 build:cjs && npm run build:esm",
+      "dev": "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.4.56",
+      "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"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile