@defisaver/positions-sdk 1.0.3 → 1.0.5

package/esm/helpers/eulerHelpers/index.js

@@ -143,6 +143,8 @@ export const getEulerV2AggregatedData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 export const getEulerV2BorrowRate = (interestRate) => {

package/esm/helpers/fluidHelpers/index.js

@@ -30,5 +30,7 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, })
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };

package/esm/helpers/morphoBlueHelpers/index.js

@@ -51,6 +51,8 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 const compound = (ratePerSeconds) => {
@@ -105,73 +107,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, web3, netwo
     return { borrowRate, supplyRate };
 });
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/esm/helpers/sparkHelpers/index.js

@@ -87,6 +87,12 @@ export const sparkGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+    payload.healthRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
+        .toString();
+    payload.healthLiquidationRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
+        .toString();
     return payload;
 };
 export const getApyAfterValuesEstimation = (selectedMarket, actions, web3) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/staking/staking.d.ts

@@ -1,7 +1,8 @@
 import Web3 from 'web3';
+import memoize from 'memoizee';
 import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>;
+export declare const getStakingApy: ((asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>) & memoize.Memoized<(asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
     usedAssets: MMUsedAssets;

package/esm/staking/staking.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
+import memoize from 'memoizee';
 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';
@@ -104,14 +105,10 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     if (!res.ok)
         throw new Error(`Failed to fetch APY for ${asset}`);
     const data = yield res.json();
-    // if our server returns apr, transform it into apy
-    if (['weETH'].includes(asset)) {
-        return aprToApy(data.apy);
-    }
     return String(data.apy);
 });
 export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
-export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
+export const getStakingApy = memoize((asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
             return yield getStETHApy(web3, fromBlock, blockNumber);
@@ -144,7 +141,7 @@ export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = u
         console.error(`Failed to fetch APY for ${asset}`);
     }
     return '0';
-});
+}), { promise: true, maxAge: 2 * 60 * 1000 });
 export const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;
     if (+interest === 0)

package/esm/types/aave.d.ts

@@ -229,6 +229,10 @@ export interface AaveV3AggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
+    healthRatio?: string;
+    healthLiquidationRatio?: string;
 }
 export interface AaveHelperCommon {
     usedAssets: any;

package/esm/types/compound.d.ts

@@ -96,6 +96,8 @@ export interface CompoundAggregatedPositionData {
     minRatio: string;
     debtTooLow: boolean;
     minDebt: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;

package/esm/types/curveUsd.d.ts

@@ -59,6 +59,7 @@ export interface CrvUSDGlobalMarketData {
     futureBorrowRate: string;
     leftToBorrow: string;
     bands: BandData[];
+    loanDiscount: string;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;

package/esm/types/euler.d.ts

@@ -146,4 +146,6 @@ export interface EulerV2AggregatedPositionData {
     liquidationPrice?: string;
     minRatio: string;
     minDebt: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }

package/esm/types/fluid.d.ts

@@ -240,6 +240,8 @@ export interface FluidAggregatedVaultData {
     leveragedAsset?: string;
     liquidationPrice?: string;
     leveragedLsdAssetRatio?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface BaseFluidVaultData {
     owner: string;

package/esm/types/morphoBlue.d.ts

@@ -122,6 +122,8 @@ export interface MorphoBlueAggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface MorphoBluePositionData {
     usedAssets: MMUsedAssets;

package/esm/types/spark.d.ts

@@ -97,6 +97,10 @@ export interface SparkAggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
+    healthRatio: string;
+    healthLiquidationRatio: string;
 }
 export interface SparkPositionData extends MMPositionData {
     ratio: string;

package/package.json

@@ -1,52 +1,54 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "1.0.3",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
-    "lint": "eslint src/ --fix",
-    "lint-check": "eslint src/",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "test-single": "mocha ./tests/$npm_config_name.ts",
-    "test:debugger": "mocha --inspect-brk tests/*",
-    "build-test": "npm run build && npm run test",
-    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.5.57",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "@types/lodash": "^4.17.15",
-    "decimal.js": "^10.4.3",
-    "lodash": "^4.17.21"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@types/chai": "^5.0.0",
-    "@types/mocha": "^10.0.9",
-    "@types/web3": "^1.0.20",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "eslint-plugin-import": "^2.31.0",
-    "mocha": "^10.2.0",
-    "nock": "^14.0.0",
-    "ts-node": "^10.9.2",
-    "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": "1.0.5",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
+    "lint": "eslint src/ --fix",
+    "lint-check": "eslint src/",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "build-test": "npm run build && npm run test",
+    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.5.57",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "@types/lodash": "^4.17.15",
+    "@types/memoizee": "^0.4.12",
+    "decimal.js": "^10.4.3",
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.17"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "@types/chai": "^5.0.0",
+    "@types/mocha": "^10.0.9",
+    "@types/web3": "^1.0.20",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "eslint-plugin-import": "^2.31.0",
+    "mocha": "^10.2.0",
+    "nock": "^14.0.0",
+    "ts-node": "^10.9.2",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}