@defisaver/positions-sdk 0.0.32 → 0.0.33

package/src/curveUsd/index.ts

@@ -216,7 +216,7 @@ export const getCurveUsdUserData = async (web3: Web3, network: NetworkNumber, ad
     usedAssets,
     status,
     ...getCrvUsdAggregatedData({
-      loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket,
+      loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N,
     }),
     userBands,
   };

package/src/helpers/curveUsdHelpers/index.ts

@@ -1,33 +1,41 @@
 import Dec from 'decimal.js';
 import { CrvUSDAggregatedPositionData, CrvUSDMarketData, CrvUSDUsedAssets } from '../../types';
-import { NetworkNumber } from '../../types/common';
-import { getAssetsTotal } from '../../moneymarket';
+import { MMUsedAssets, NetworkNumber } from '../../types/common';
+import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+import { mapRange } from '../../services/utils';
 
 export const getCrvUsdAggregatedData = ({
-  loanExists, usedAssets, network, selectedMarket, ...rest
+  loanExists, usedAssets, network, selectedMarket, numOfBands, ...rest
 }:{
-  loanExists: boolean, usedAssets: CrvUSDUsedAssets, network: NetworkNumber, selectedMarket: CrvUSDMarketData,
+  loanExists: boolean, usedAssets: CrvUSDUsedAssets, network: NetworkNumber, selectedMarket: CrvUSDMarketData, numOfBands: number | string
 }): CrvUSDAggregatedPositionData => {
-  const _supplied = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ supplied }: { supplied: string }) => supplied); // this is wrong if we are in soft-liquidations
-  const _borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowed }: { borrowed: string }) => borrowed);
-  const _suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
-  const _borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
+  const payload = {} as CrvUSDAggregatedPositionData;
+  payload.supplied = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ supplied }: { supplied: string }) => supplied); // this is wrong if we are in soft-liquidations
+  payload.borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowed }: { borrowed: string }) => borrowed);
+  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
 
-  const ratio = loanExists
-    ? new Dec(_suppliedUsd)
-      .dividedBy(_borrowedUsd)
+  payload.ratio = loanExists
+    ? new Dec(payload.suppliedUsd)
+      .dividedBy(payload.borrowedUsd)
       .times(100)
       .toString()
     : '0';
 
-  // we don't have borrowLimitUsd here
+  // this is all approximation
+  payload.minAllowedRatio = mapRange(numOfBands, 4, 50, 115, 140); // collateral ratio
+  payload.collFactor = new Dec(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
+  // only take in consideration collAsset
+  payload.borrowLimitUsd = usedAssets?.[selectedMarket.collAsset]?.isSupplied
+    ? new Dec(usedAssets[selectedMarket.collAsset].suppliedUsd).mul(payload.collFactor).toString()
+    : '0';
+
+  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets as unknown as MMUsedAssets);
+  payload.leveragedType = leveragedType;
+  if (leveragedType !== '') {
+    payload.leveragedAsset = leveragedAsset;
+    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, usedAssets[selectedMarket.collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
+  }
 
-  return {
-    ratio,
-    supplied: _supplied,
-    suppliedUsd: _suppliedUsd,
-    borrowedUsd: _borrowedUsd,
-    borrowed: _borrowed,
-    safetyRatio: ratio,
-  };
+  return payload;
 };

package/src/moneymarket/moneymarketCommonService.ts

@@ -20,7 +20,7 @@ export const calcLeverageLiqPrice = (leverageType: string, assetPrice: string, b
 
 export const calculateBorrowingAssetLimit = (assetBorrowedUsd: string, borrowLimitUsd: string) => new Dec(assetBorrowedUsd).div(borrowLimitUsd).times(100).toString();
 
-export const STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI'];
+export const STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD'];
 
 export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   let borrowUnstable = 0;

package/src/services/utils.ts

@@ -32,4 +32,17 @@ export const ethToWethByAddress = (maybeEthAddr: string, chainId = NetworkNumber
 export const bytesToString = (hex: string) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
   .toString()
   // eslint-disable-next-line no-control-regex
-  .replace(/\x00/g, '');
+  .replace(/\x00/g, '');
+
+/**
+ * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
+ */
+export const mapRange = (input: number | string, minInput: number | string, maxInput: number | string, minOutput:number | string, maxOutput: number | string) => {
+  // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
+  const inputDiff = new Dec(maxInput).minus(minInput);
+  const outputDiff = new Dec(maxOutput).minus(minOutput);
+  const slope = new Dec(outputDiff).div(inputDiff);
+
+  // output = output_start + slope * (input - input_start)
+  return new Dec(minOutput).plus(new Dec(slope).mul(new Dec(input).minus(minInput))).toDP(2).toNumber();
+};

package/src/types/contracts/generated/CrvUSDView.ts

@@ -159,7 +159,9 @@ export declare namespace CurveUsdView {
         number | string | BN,
         number | string | BN,
         [number | string | BN, number | string | BN],
-        [number | string | BN[], number | string | BN[]]
+        [number | string | BN[], number | string | BN[]],
+        number | string | BN,
+        boolean
       ]
     | {
         loanExists: boolean;
@@ -174,6 +176,8 @@ export declare namespace CurveUsdView {
         health: number | string | BN;
         bandRange: [number | string | BN, number | string | BN];
         usersBands: [number | string | BN[], number | string | BN[]];
+        collRatio: number | string | BN;
+        isInSoftLiquidation: boolean;
       };
 
   export type UserDataStructOutputArray = [
@@ -188,7 +192,9 @@ export declare namespace CurveUsdView {
     string,
     string,
     [string, string],
-    [string[], string[]]
+    [string[], string[]],
+    string,
+    boolean
   ];
   export type UserDataStructOutputStruct = {
     loanExists: boolean;
@@ -203,6 +209,8 @@ export declare namespace CurveUsdView {
     health: string;
     bandRange: [string, string];
     usersBands: [string[], string[]];
+    collRatio: string;
+    isInSoftLiquidation: boolean;
   };
   export type UserDataStructOutput = UserDataStructOutputArray &
     UserDataStructOutputStruct;
@@ -216,6 +224,10 @@ export interface CrvUSDView extends BaseContract {
   ): CrvUSDView;
   clone(): CrvUSDView;
   methods: {
+    WBTC_HEALTH_ZAP(): NonPayableTransactionObject<string>;
+
+    WBTC_MARKET(): NonPayableTransactionObject<string>;
+
     createLoanData(
       market: string,
       collateral: number | string | BN,
@@ -228,18 +240,32 @@ export interface CrvUSDView extends BaseContract {
       n: number | string | BN
     ): NonPayableTransactionObject<CurveUsdView.BandStructOutput>;
 
-    "getBandsData(address,uint256,uint256,uint256)"(
+    getBandsData(
+      market: string,
+      from: number | string | BN,
+      to: number | string | BN
+    ): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
+
+    getBandsDataForPosition(
       market: string,
       collateral: number | string | BN,
       debt: number | string | BN,
       N: number | string | BN
     ): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
 
-    "getBandsData(address,int256,int256)"(
-      market: string,
-      from: number | string | BN,
-      to: number | string | BN
-    ): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
+    getCollAmountsFromAMM(
+      _controllerAddress: string,
+      _user: string
+    ): NonPayableTransactionObject<
+      [string, string] & { crvUsdAmount: string; collAmount: string }
+    >;
+
+    getCollateralRatio(
+      _user: string,
+      _controllerAddr: string
+    ): NonPayableTransactionObject<
+      [string, boolean] & { collRatio: string; isInSoftLiquidation: boolean }
+    >;
 
     globalData(
       market: string
@@ -254,6 +280,10 @@ export interface CrvUSDView extends BaseContract {
       numBands: number | string | BN
     ): NonPayableTransactionObject<string>;
 
+    isControllerValid(
+      _controllerAddr: string
+    ): NonPayableTransactionObject<boolean>;
+
     maxBorrow(
       market: string,
       collateral: number | string | BN,
@@ -270,6 +300,11 @@ export interface CrvUSDView extends BaseContract {
       market: string,
       user: string
     ): NonPayableTransactionObject<CurveUsdView.UserDataStructOutput>;
+
+    userMaxWithdraw(
+      _controllerAddress: string,
+      _user: string
+    ): NonPayableTransactionObject<string>;
   };
   events: {
     allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/src/types/curveUsd.ts

@@ -74,6 +74,12 @@ export interface CrvUSDAggregatedPositionData {
   borrowedUsd: string,
   borrowed: string,
   safetyRatio: string,
+  borrowLimitUsd: string,
+  minAllowedRatio: number,
+  collFactor: string,
+  leveragedType: string,
+  leveragedAsset?: string,
+  liquidationPrice?: string,
 }
 
 export interface CrvUSDUsedAsset {

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