@defisaver/positions-sdk 0.0.13 → 0.0.15

package/cjs/aaveV3/index.js

@@ -137,10 +137,22 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             let borrowCap = tokenMarket.borrowCap;
             let discountRateOnBorrow = '0';
             if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
-                borrowCap = (0, tokens_1.assetAmountInEth)((yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call())[0], 'GHO');
+                const facilitatorBucket = yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
+                const availableFacilitatorCap = (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
+                borrowCap = decimal_js_1.default.min(borrowCap, availableFacilitatorCap).toString();
                 discountRateOnBorrow = (0, exports.aaveV3CalculateDiscountRate)(tokenMarket.totalBorrow.toString(), '3160881469228662060510133', // stkAAVE total supply
                 discountRate, minDiscountTokenBalance, minGhoBalanceForDiscount, ghoDiscountedPerDiscountToken);
             }
+            let marketLiquidity = nativeAsset
+                ? (0, tokens_1.assetAmountInEth)(new decimal_js_1.default((0, tokens_1.assetAmountInWei)(borrowCap.toString(), 'GHO'))
+                    .sub(tokenMarket.totalBorrow.toString())
+                    .toString(), symbol)
+                : (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(tokenMarket.totalSupply.toString())
+                    .sub(tokenMarket.totalBorrow.toString())
+                    .toString(), symbol);
+            if (new decimal_js_1.default(marketLiquidity).lt(0)) {
+                marketLiquidity = '0';
+            }
             return (Object.assign(Object.assign({ nativeAsset }, (0, utils_1.addToObjectIf)(nativeAsset, {
                 discountData: {
                     ghoDiscountedPerDiscountToken,
@@ -148,13 +160,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     minDiscountTokenBalance,
                     minGhoBalanceForDiscount,
                 },
-            })), { symbol, isIsolated: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, eModeCategory: +tokenMarket.emodeCategory, isolationModeTotalDebt: new decimal_js_1.default(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: new decimal_js_1.default(tokenMarket.supplyRate.toString()).div(1e25).toString(), borrowRate: new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(), borrowRateDiscounted: nativeAsset ? new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0', borrowRateStable: new decimal_js_1.default(tokenMarket.borrowRateStable.toString()).div(1e25).toString(), collateralFactor: new decimal_js_1.default(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationRatio: new decimal_js_1.default(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity: nativeAsset
-                    ? (0, tokens_1.assetAmountInEth)(new decimal_js_1.default((0, tokens_1.assetAmountInWei)(borrowCap.toString(), 'GHO'))
-                        .sub(tokenMarket.totalBorrow.toString())
-                        .toString(), symbol)
-                    : (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(tokenMarket.totalSupply.toString())
-                        .sub(tokenMarket.totalBorrow.toString())
-                        .toString(), symbol), utilization: new decimal_js_1.default(tokenMarket.totalBorrow.toString())
+            })), { symbol, isIsolated: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, eModeCategory: +tokenMarket.emodeCategory, isolationModeTotalDebt: new decimal_js_1.default(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: new decimal_js_1.default(tokenMarket.supplyRate.toString()).div(1e25).toString(), borrowRate: new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(), borrowRateDiscounted: nativeAsset ? new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0', borrowRateStable: new decimal_js_1.default(tokenMarket.borrowRateStable.toString()).div(1e25).toString(), collateralFactor: new decimal_js_1.default(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationRatio: new decimal_js_1.default(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity, utilization: new decimal_js_1.default(tokenMarket.totalBorrow.toString())
                     .div(new decimal_js_1.default(tokenMarket.totalSupply.toString()))
                     .times(100)
                     .toString(), usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled, supplyCap: tokenMarket.supplyCap, borrowCap, totalSupply: (0, tokens_1.assetAmountInEth)(tokenMarket.totalSupply.toString(), symbol), isInactive: !tokenMarket.isActive, isFrozen: tokenMarket.isFrozen, isPaused: tokenMarket.isPaused, canBeBorrowed: tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen && tokenMarket.borrowingEnabled && isBorrowAllowed, canBeSupplied: !nativeAsset && tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen, canBeWithdrawn: tokenMarket.isActive && !tokenMarket.isPaused, canBePayBacked: tokenMarket.isActive && !tokenMarket.isPaused, disabledStableBorrowing: !tokenMarket.stableBorrowRateEnabled, totalBorrow: (0, tokens_1.assetAmountInEth)(tokenMarket.totalBorrow.toString(), symbol), totalBorrowVar: (0, tokens_1.assetAmountInEth)(tokenMarket.totalBorrowVar.toString(), symbol), price: new decimal_js_1.default(tokenMarket.price.toString()).div(1e8).toString(), isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled, isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled, eModeCategoryData: {

package/esm/aaveV3/index.js

@@ -128,10 +128,22 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             let borrowCap = tokenMarket.borrowCap;
             let discountRateOnBorrow = '0';
             if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
-                borrowCap = assetAmountInEth((yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call())[0], 'GHO');
+                const facilitatorBucket = yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
+                const availableFacilitatorCap = assetAmountInEth(new Dec(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
+                borrowCap = Dec.min(borrowCap, availableFacilitatorCap).toString();
                 discountRateOnBorrow = aaveV3CalculateDiscountRate(tokenMarket.totalBorrow.toString(), '3160881469228662060510133', // stkAAVE total supply
                 discountRate, minDiscountTokenBalance, minGhoBalanceForDiscount, ghoDiscountedPerDiscountToken);
             }
+            let marketLiquidity = nativeAsset
+                ? assetAmountInEth(new Dec(assetAmountInWei(borrowCap.toString(), 'GHO'))
+                    .sub(tokenMarket.totalBorrow.toString())
+                    .toString(), symbol)
+                : assetAmountInEth(new Dec(tokenMarket.totalSupply.toString())
+                    .sub(tokenMarket.totalBorrow.toString())
+                    .toString(), symbol);
+            if (new Dec(marketLiquidity).lt(0)) {
+                marketLiquidity = '0';
+            }
             return (Object.assign(Object.assign({ nativeAsset }, addToObjectIf(nativeAsset, {
                 discountData: {
                     ghoDiscountedPerDiscountToken,
@@ -139,13 +151,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     minDiscountTokenBalance,
                     minGhoBalanceForDiscount,
                 },
-            })), { symbol, isIsolated: new Dec(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new Dec(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, eModeCategory: +tokenMarket.emodeCategory, isolationModeTotalDebt: new Dec(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString(), borrowRate: new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(), borrowRateDiscounted: nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0', borrowRateStable: new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString(), collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity: nativeAsset
-                    ? assetAmountInEth(new Dec(assetAmountInWei(borrowCap.toString(), 'GHO'))
-                        .sub(tokenMarket.totalBorrow.toString())
-                        .toString(), symbol)
-                    : assetAmountInEth(new Dec(tokenMarket.totalSupply.toString())
-                        .sub(tokenMarket.totalBorrow.toString())
-                        .toString(), symbol), utilization: new Dec(tokenMarket.totalBorrow.toString())
+            })), { symbol, isIsolated: new Dec(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new Dec(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, eModeCategory: +tokenMarket.emodeCategory, isolationModeTotalDebt: new Dec(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString(), borrowRate: new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(), borrowRateDiscounted: nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0', borrowRateStable: new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString(), collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity, utilization: new Dec(tokenMarket.totalBorrow.toString())
                     .div(new Dec(tokenMarket.totalSupply.toString()))
                     .times(100)
                     .toString(), usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled, supplyCap: tokenMarket.supplyCap, borrowCap, totalSupply: assetAmountInEth(tokenMarket.totalSupply.toString(), symbol), isInactive: !tokenMarket.isActive, isFrozen: tokenMarket.isFrozen, isPaused: tokenMarket.isPaused, canBeBorrowed: tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen && tokenMarket.borrowingEnabled && isBorrowAllowed, canBeSupplied: !nativeAsset && tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen, canBeWithdrawn: tokenMarket.isActive && !tokenMarket.isPaused, canBePayBacked: tokenMarket.isActive && !tokenMarket.isPaused, disabledStableBorrowing: !tokenMarket.stableBorrowRateEnabled, totalBorrow: assetAmountInEth(tokenMarket.totalBorrow.toString(), symbol), totalBorrowVar: assetAmountInEth(tokenMarket.totalBorrowVar.toString(), symbol), price: new Dec(tokenMarket.price.toString()).div(1e8).toString(), isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled, isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled, eModeCategoryData: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -19,7 +19,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.4.57",
+    "@defisaver/tokens": "^1.5.3",
     "decimal.js": "^10.4.3",
     "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
     "@ethersproject/bignumber": "^5.7.0"

package/src/aaveV3/index.ts

@@ -178,7 +178,10 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
       let discountRateOnBorrow = '0';
 
       if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
-        borrowCap = assetAmountInEth((await ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call())[0], 'GHO');
+        const facilitatorBucket = await ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
+        const availableFacilitatorCap = assetAmountInEth(new Dec(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
+
+        borrowCap = Dec.min(borrowCap, availableFacilitatorCap).toString();
 
         discountRateOnBorrow = aaveV3CalculateDiscountRate(
           tokenMarket.totalBorrow.toString(),
@@ -190,6 +193,18 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         );
       }
 
+      let marketLiquidity = nativeAsset
+        ? assetAmountInEth(new Dec(assetAmountInWei(borrowCap.toString(), 'GHO'))
+          .sub(tokenMarket.totalBorrow.toString())
+          .toString(), symbol)
+        : assetAmountInEth(new Dec(tokenMarket.totalSupply.toString())
+          .sub(tokenMarket.totalBorrow.toString())
+          .toString(), symbol);
+
+      if (new Dec(marketLiquidity).lt(0)) {
+        marketLiquidity = '0';
+      }
+
       return ({
         nativeAsset,
         ...addToObjectIf(nativeAsset, {
@@ -214,13 +229,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         borrowRateStable: new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString(),
         collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(),
         liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(),
-        marketLiquidity: nativeAsset
-          ? assetAmountInEth(new Dec(assetAmountInWei(borrowCap.toString(), 'GHO'))
-            .sub(tokenMarket.totalBorrow.toString())
-            .toString(), symbol)
-          : assetAmountInEth(new Dec(tokenMarket.totalSupply.toString())
-            .sub(tokenMarket.totalBorrow.toString())
-            .toString(), symbol),
+        marketLiquidity,
         utilization: new Dec(tokenMarket.totalBorrow.toString())
           .div(new Dec(tokenMarket.totalSupply.toString()))
           .times(100)

package/yarn-error.log

@@ -1,64 +0,0 @@
-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