refactor: Replaced balanceOf() with scaledBalanceOf() + normalizedIncome/debt

2024-07-29 21:47:30 +00:00 · 2021-04-27 15:31:11 +02:00 · 2021-04-27 15:31:11 +02:00 · ada4994c7f
commit ada4994c7f
parent 3683ebc59f
2 changed files with 184 additions and 154 deletions
--- a/contracts/protocol/libraries/logic/GenericLogic.sol
+++ b/contracts/protocol/libraries/logic/GenericLogic.sol
@ -4,6 +4,7 @@ pragma experimental ABIEncoderV2;

 import {SafeMath} from '../../../dependencies/openzeppelin/contracts/SafeMath.sol';
 import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';
+import {IScaledBalanceToken} from '../../../interfaces/IScaledBalanceToken.sol';
 import {ReserveLogic} from './ReserveLogic.sol';
 import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';
 import {UserConfiguration} from '../configuration/UserConfiguration.sol';
@ -130,6 +131,8 @@ library GenericLogic {
    uint256 avgLtv;
    uint256 avgLiquidationThreshold;
    uint256 reservesLength;
+    uint256 normalizedIncome;
+    uint256 normalizedDebt;
    bool healthFactorBelowThreshold;
    address currentReserveAddress;
    bool usageAsCollateralEnabled;
@ -186,7 +189,11 @@ library GenericLogic {
      vars.reserveUnitPrice = IPriceOracleGetter(oracle).getAssetPrice(vars.currentReserveAddress);

      if (vars.liquidationThreshold != 0 && userConfig.isUsingAsCollateral(vars.i)) {
-        vars.compoundedLiquidityBalance = IERC20(currentReserve.aTokenAddress).balanceOf(user);
+        vars.compoundedLiquidityBalance = IScaledBalanceToken(currentReserve.aTokenAddress).scaledBalanceOf(user);
+        if(vars.compoundedLiquidityBalance > 0){
+          vars.normalizedIncome = currentReserve.getNormalizedIncome();
+          vars.compoundedLiquidityBalance = vars.compoundedLiquidityBalance.rayMul(vars.normalizedIncome);
+        }

        uint256 liquidityBalanceETH =
          vars.reserveUnitPrice.mul(vars.compoundedLiquidityBalance).div(vars.tokenUnit);
@ -200,12 +207,18 @@ library GenericLogic {
      }

      if (userConfig.isBorrowing(vars.i)) {
-        vars.compoundedBorrowBalance = IERC20(currentReserve.stableDebtTokenAddress).balanceOf(
+        vars.compoundedBorrowBalance = 
+          IScaledBalanceToken(currentReserve.variableDebtTokenAddress).scaledBalanceOf(user);
+        
+        if(vars.compoundedBorrowBalance > 0) {
+          vars.normalizedDebt = currentReserve.getNormalizedDebt();
+          vars.compoundedLiquidityBalance = vars.compoundedBorrowBalance.rayMul(vars.normalizedDebt);
+        }
+
+        vars.compoundedBorrowBalance = vars.compoundedBorrowBalance.add(IERC20(currentReserve.stableDebtTokenAddress).balanceOf(
          user
-        );
-        vars.compoundedBorrowBalance = vars.compoundedBorrowBalance.add(
-          IERC20(currentReserve.variableDebtTokenAddress).balanceOf(user)
-        );
+        ));
+       

        vars.totalDebtInETH = vars.totalDebtInETH.add(
          vars.reserveUnitPrice.mul(vars.compoundedBorrowBalance).div(vars.tokenUnit)
--- a/package-lock.json
+++ b/package-lock.json
@ -3118,7 +3118,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
      "requires": {
        "function-bind": "^1.1.1",
        "get-intrinsic": "^1.0.2"
@ -5530,8 +5529,7 @@
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
    },
    "functional-red-black-tree": {
      "version": "1.0.1",
@ -6370,36 +6368,6 @@
            "@ethersproject/strings": ">=5.0.0-beta.130"
          }
        },
-        "@ethersproject/abstract-provider": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.0.8.tgz",
-          "integrity": "sha512-fqJXkewcGdi8LogKMgRyzc/Ls2js07yor7+g9KfPs09uPOcQLg7cc34JN+lk34HH9gg2HU0DIA5797ZR8znkfw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@ethersproject/bignumber": "^5.0.13",
-            "@ethersproject/bytes": "^5.0.9",
-            "@ethersproject/logger": "^5.0.8",
-            "@ethersproject/networks": "^5.0.7",
-            "@ethersproject/properties": "^5.0.7",
-            "@ethersproject/transactions": "^5.0.9",
-            "@ethersproject/web": "^5.0.12"
-          }
-        },
-        "@ethersproject/abstract-signer": {
-          "version": "5.0.10",
-          "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.10.tgz",
-          "integrity": "sha512-irx7kH7FDAeW7QChDPW19WsxqeB1d3XLyOLSXm0bfPqL1SS07LXWltBJUBUxqC03ORpAOcM3JQj57DU8JnVY2g==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@ethersproject/abstract-provider": "^5.0.8",
-            "@ethersproject/bignumber": "^5.0.13",
-            "@ethersproject/bytes": "^5.0.9",
-            "@ethersproject/logger": "^5.0.8",
-            "@ethersproject/properties": "^5.0.7"
-          }
-        },
        "@ethersproject/address": {
          "version": "5.0.9",
          "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.0.9.tgz",
@ -6414,16 +6382,6 @@
            "@ethersproject/rlp": "^5.0.7"
          }
        },
-        "@ethersproject/base64": {
-          "version": "5.0.7",
-          "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.0.7.tgz",
-          "integrity": "sha512-S5oh5DVfCo06xwJXT8fQC68mvJfgScTl2AXvbYMsHNfIBTDb084Wx4iA9MNlEReOv6HulkS+gyrUM/j3514rSw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@ethersproject/bytes": "^5.0.9"
-          }
-        },
        "@ethersproject/bignumber": {
          "version": "5.0.13",
          "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.0.13.tgz",
@ -6491,16 +6449,6 @@
          "dev": true,
          "optional": true
        },
-        "@ethersproject/networks": {
-          "version": "5.0.7",
-          "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.0.7.tgz",
-          "integrity": "sha512-dI14QATndIcUgcCBL1c5vUr/YsI5cCHLN81rF7PU+yS7Xgp2/Rzbr9+YqpC6NBXHFUASjh6GpKqsVMpufAL0BQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@ethersproject/logger": "^5.0.8"
-          }
-        },
        "@ethersproject/properties": {
          "version": "5.0.7",
          "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.7.tgz",
@ -6565,20 +6513,6 @@
            "@ethersproject/signing-key": "^5.0.8"
          }
        },
-        "@ethersproject/web": {
-          "version": "5.0.12",
-          "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.12.tgz",
-          "integrity": "sha512-gVxS5iW0bgidZ76kr7LsTxj4uzN5XpCLzvZrLp8TP+4YgxHfCeetFyQkRPgBEAJdNrexdSBayvyJvzGvOq0O8g==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@ethersproject/base64": "^5.0.7",
-            "@ethersproject/bytes": "^5.0.9",
-            "@ethersproject/logger": "^5.0.8",
-            "@ethersproject/properties": "^5.0.7",
-            "@ethersproject/strings": "^5.0.8"
-          }
-        },
        "@sindresorhus/is": {
          "version": "0.14.0",
          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@ -7775,15 +7709,6 @@
          "requires": {
            "bn.js": "^5.0.0",
            "randombytes": "^2.0.1"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "5.1.3",
-              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
-              "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
-              "dev": true,
-              "optional": true
-            }
          }
        },
        "browserify-sign": {
@ -7891,6 +7816,14 @@
          "dev": true,
          "requires": {
            "node-gyp-build": "^4.2.0"
+          },
+          "dependencies": {
+            "node-gyp-build": {
+              "version": "3.7.0",
+              "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz",
+              "integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==",
+              "dev": true
+            }
          }
        },
        "bytes": {
@ -7991,16 +7924,6 @@
            }
          }
        },
-        "call-bind": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-          "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.0.2"
-          }
-        },
        "caniuse-lite": {
          "version": "1.0.30001174",
          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001174.tgz",
@ -8519,7 +8442,6 @@
          "version": "1.1.3",
          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
          "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-          "dev": true,
          "requires": {
            "object-keys": "^1.0.12"
          }
@ -8745,7 +8667,6 @@
          "version": "1.2.1",
          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-          "dev": true,
          "requires": {
            "is-callable": "^1.1.4",
            "is-date-object": "^1.0.1",
@ -10915,8 +10836,7 @@
        "function-bind": {
          "version": "1.1.1",
          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-          "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-          "dev": true
+          "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
        },
        "functional-red-black-tree": {
          "version": "1.0.1",
@ -10924,17 +10844,6 @@
          "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
          "dev": true
        },
-        "get-intrinsic": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz",
-          "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1"
-          }
-        },
        "get-stream": {
          "version": "5.2.0",
          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@ -10982,6 +10891,14 @@
          "requires": {
            "min-document": "^2.19.0",
            "process": "^0.11.10"
+          },
+          "dependencies": {
+            "process": {
+              "version": "0.5.2",
+              "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
+              "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
+              "dev": true
+            }
          }
        },
        "got": {
@ -11042,7 +10959,6 @@
          "version": "1.0.3",
          "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
          "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-          "dev": true,
          "requires": {
            "function-bind": "^1.1.1"
          }
@ -11080,8 +10996,7 @@
        "has-symbols": {
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-          "dev": true
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
        },
        "has-to-string-tag-x": {
          "version": "1.4.1",
@ -11354,8 +11269,7 @@
        "is-callable": {
          "version": "1.2.2",
          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-          "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
-          "dev": true
+          "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
        },
        "is-ci": {
          "version": "2.0.0",
@ -11378,8 +11292,7 @@
        "is-date-object": {
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-          "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-          "dev": true
+          "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
        },
        "is-descriptor": {
          "version": "1.0.2",
@ -11428,8 +11341,7 @@
        "is-negative-zero": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-          "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-          "dev": true
+          "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
        },
        "is-object": {
          "version": "1.0.2",
@ -11458,7 +11370,6 @@
          "version": "1.1.1",
          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
          "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
-          "dev": true,
          "requires": {
            "has-symbols": "^1.0.1"
          }
@ -11474,7 +11385,6 @@
          "version": "1.0.3",
          "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
          "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-          "dev": true,
          "requires": {
            "has-symbols": "^1.0.1"
          }
@ -12317,8 +12227,7 @@
        "object-inspect": {
          "version": "1.9.0",
          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
-          "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
-          "dev": true
+          "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="
        },
        "object-is": {
          "version": "1.1.4",
@ -12328,13 +12237,33 @@
          "requires": {
            "call-bind": "^1.0.0",
            "define-properties": "^1.1.3"
+          },
+          "dependencies": {
+            "es-abstract": {
+              "version": "1.18.0-next.1",
+              "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+              "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+              "requires": {
+                "es-to-primitive": "^1.2.1",
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1",
+                "is-callable": "^1.2.2",
+                "is-negative-zero": "^2.0.0",
+                "is-regex": "^1.1.1",
+                "object-inspect": "^1.8.0",
+                "object-keys": "^1.1.1",
+                "object.assign": "^4.1.1",
+                "string.prototype.trimend": "^1.0.1",
+                "string.prototype.trimstart": "^1.0.1"
+              }
+            }
          }
        },
        "object-keys": {
          "version": "1.1.1",
          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-          "dev": true
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        },
        "object-visit": {
          "version": "1.0.1",
@ -12349,12 +12278,32 @@
          "version": "4.1.2",
          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-          "dev": true,
          "requires": {
            "call-bind": "^1.0.0",
            "define-properties": "^1.1.3",
            "has-symbols": "^1.0.1",
            "object-keys": "^1.1.1"
+          },
+          "dependencies": {
+            "es-abstract": {
+              "version": "1.18.0-next.1",
+              "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+              "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+              "requires": {
+                "es-to-primitive": "^1.2.1",
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1",
+                "is-callable": "^1.2.2",
+                "is-negative-zero": "^2.0.0",
+                "is-regex": "^1.1.1",
+                "object-inspect": "^1.8.0",
+                "object-keys": "^1.1.1",
+                "object.assign": "^4.1.1",
+                "string.prototype.trimend": "^1.0.1",
+                "string.prototype.trimstart": "^1.0.1"
+              }
+            }
          }
        },
        "object.getownpropertydescriptors": {
@ -12626,12 +12575,6 @@
          "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
          "dev": true
        },
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-          "dev": true
-        },
        "process-nextick-args": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@ -12892,22 +12835,71 @@
          },
          "dependencies": {
            "es-abstract": {
-              "version": "1.17.7",
-              "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-              "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+              "version": "1.18.0",
+              "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+              "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
              "dev": true,
              "requires": {
+                "call-bind": "^1.0.2",
                "es-to-primitive": "^1.2.1",
                "function-bind": "^1.1.1",
+                "get-intrinsic": "^1.1.1",
                "has": "^1.0.3",
-                "has-symbols": "^1.0.1",
-                "is-callable": "^1.2.2",
-                "is-regex": "^1.1.1",
-                "object-inspect": "^1.8.0",
+                "has-symbols": "^1.0.2",
+                "is-callable": "^1.2.3",
+                "is-negative-zero": "^2.0.1",
+                "is-regex": "^1.1.2",
+                "is-string": "^1.0.5",
+                "object-inspect": "^1.9.0",
                "object-keys": "^1.1.1",
-                "object.assign": "^4.1.1",
-                "string.prototype.trimend": "^1.0.1",
-                "string.prototype.trimstart": "^1.0.1"
+                "object.assign": "^4.1.2",
+                "string.prototype.trimend": "^1.0.4",
+                "string.prototype.trimstart": "^1.0.4",
+                "unbox-primitive": "^1.0.0"
+              },
+              "dependencies": {
+                "has-symbols": {
+                  "version": "1.0.2",
+                  "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+                  "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+                  "dev": true
+                },
+                "is-callable": {
+                  "version": "1.2.3",
+                  "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+                  "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+                  "dev": true
+                },
+                "is-regex": {
+                  "version": "1.1.2",
+                  "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+                  "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+                  "dev": true,
+                  "requires": {
+                    "call-bind": "^1.0.2",
+                    "has-symbols": "^1.0.1"
+                  }
+                },
+                "string.prototype.trimend": {
+                  "version": "1.0.4",
+                  "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+                  "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+                  "dev": true,
+                  "requires": {
+                    "call-bind": "^1.0.2",
+                    "define-properties": "^1.1.3"
+                  }
+                },
+                "string.prototype.trimstart": {
+                  "version": "1.0.4",
+                  "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+                  "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+                  "dev": true,
+                  "requires": {
+                    "call-bind": "^1.0.2",
+                    "define-properties": "^1.1.3"
+                  }
+                }
              }
            }
          }
@ -12995,6 +12987,15 @@
            "uuid": "^3.3.2"
          }
        },
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        },
        "resolve-url": {
          "version": "0.2.1",
          "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@ -13653,13 +13654,34 @@
            "call-bind": "^1.0.0",
            "define-properties": "^1.1.3",
            "es-abstract": "^1.18.0-next.1"
+          },
+          "dependencies": {
+            "es-abstract": {
+              "version": "1.18.0-next.1",
+              "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+              "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+              "dev": true,
+              "requires": {
+                "es-to-primitive": "^1.2.1",
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1",
+                "is-callable": "^1.2.2",
+                "is-negative-zero": "^2.0.0",
+                "is-regex": "^1.1.1",
+                "object-inspect": "^1.8.0",
+                "object-keys": "^1.1.1",
+                "object.assign": "^4.1.1",
+                "string.prototype.trimend": "^1.0.1",
+                "string.prototype.trimstart": "^1.0.1"
+              }
+            }
          }
        },
        "string.prototype.trimend": {
          "version": "1.0.3",
          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
          "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
-          "dev": true,
          "requires": {
            "call-bind": "^1.0.0",
            "define-properties": "^1.1.3"
@ -13669,7 +13691,6 @@
          "version": "1.0.3",
          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
          "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
-          "dev": true,
          "requires": {
            "call-bind": "^1.0.0",
            "define-properties": "^1.1.3"
@ -13856,15 +13877,6 @@
              "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
              "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
              "dev": true
-            },
-            "resolve": {
-              "version": "1.17.0",
-              "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-              "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-              "dev": true,
-              "requires": {
-                "path-parse": "^1.0.6"
-              }
            }
          }
        },
@ -14226,6 +14238,14 @@
          "dev": true,
          "requires": {
            "node-gyp-build": "^4.2.0"
+          },
+          "dependencies": {
+            "node-gyp-build": {
+              "version": "3.7.0",
+              "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz",
+              "integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==",
+              "dev": true
+            }
          }
        },
        "utf8": {
@ -15204,7 +15224,6 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
      "requires": {
        "function-bind": "^1.1.1",
        "has": "^1.0.3",
@ -15761,7 +15780,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
      "requires": {
        "function-bind": "^1.1.1"
      }
@ -15787,8 +15805,7 @@
    "has-symbols": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
    },
    "has-to-string-tag-x": {
      "version": "1.4.1",