diff --git a/contracts/strategies/StrategyMKRVaultDAIDelegate.sol b/contracts/strategies/StrategyMKRVaultDAIDelegate.sol index 8cf070df..7d9086a4 100644 --- a/contracts/strategies/StrategyMKRVaultDAIDelegate.sol +++ b/contracts/strategies/StrategyMKRVaultDAIDelegate.sol @@ -422,9 +422,8 @@ contract StrategyMKRVaultDAIDelegate { } function _withdrawDaiLeast(uint256 _amount) internal returns (uint256) { - uint256 _shares = _amount.mul(1e18).div(IVault(yVaultDAI).getPricePerFullShare()).mul(withdrawalMax).div( - withdrawalMax.sub(withdrawalFee) - ); + uint256 _shares = + _amount.mul(1e18).div(IVault(yVaultDAI).getPricePerFullShare()).mul(withdrawalMax).div(withdrawalMax.sub(withdrawalFee)); if (_shares > IERC20(yVaultDAI).balanceOf(address(this))) { _shares = IERC20(yVaultDAI).balanceOf(address(this)); diff --git a/contracts/strategies/StrategyVaultUSDC.sol b/contracts/strategies/StrategyVaultUSDC.sol index 05dd3f93..03fffb8d 100644 --- a/contracts/strategies/StrategyVaultUSDC.sol +++ b/contracts/strategies/StrategyVaultUSDC.sol @@ -49,10 +49,8 @@ contract StrategyVaultUSDC { } function debt() external view returns (uint256) { - (, uint256 currentBorrowBalance, , , , , , , , ) = Aave(getAave()).getUserReserveData( - want, - IController(controller).vaults(address(this)) - ); + (, uint256 currentBorrowBalance, , , , , , , , ) = + Aave(getAave()).getUserReserveData(want, IController(controller).vaults(address(this))); return currentBorrowBalance; } @@ -62,10 +60,8 @@ contract StrategyVaultUSDC { } function skimmable() public view returns (uint256) { - (, uint256 currentBorrowBalance, , , , , , , , ) = Aave(getAave()).getUserReserveData( - want, - IController(controller).vaults(address(this)) - ); + (, uint256 currentBorrowBalance, , , , , , , , ) = + Aave(getAave()).getUserReserveData(want, IController(controller).vaults(address(this))); uint256 _have = have(); if (_have > currentBorrowBalance) { return _have.sub(currentBorrowBalance); diff --git a/package.json b/package.json index 3e449720..e04d5334 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "ethlint": "^1.2.5", "husky": "^4.3.0", "prettier": "^2.1.2", - "prettier-plugin-solidity": "^1.0.0-alpha.57", + "prettier-plugin-solidity": "^1.0.0-beta.1", "pretty-quick": "^3.0.2" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 4918abce..66197697 100644 --- a/yarn.lock +++ b/yarn.lock @@ -166,10 +166,12 @@ resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-11.0.0.tgz#719cf05fcc1abb6533610a2e0f5dd1e61eac14fe" integrity sha512-VoNqai1vR5anRF5Tuh/+SWDFk7xi7oMwHrHrbm1BprYXjB2RJsWLhUrStMssDxEl5lW/z3EUdg8RvH/IUBccSQ== -"@solidity-parser/parser@^0.8.1": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.8.1.tgz#1b606578af86b9ad10755409804a6ba83f9ce8a4" - integrity sha512-DF7H6T8I4lo2IZOE2NZwt3631T8j1gjpQLjmvY2xBNK50c4ltslR4XPKwT6RkeSd4+xCAK0GHC/k7sbRDBE4Yw== +"@solidity-parser/parser@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.9.1.tgz#c63aaca2a07f2994d85b43afdbf90b454b62e16e" + integrity sha512-ewNo+ZEQX8mFUOlTK6+0IYvM++6+iEeRBIBg4Mh8ghgRX72bkXJh6AWLWe/SG5+3WPdDL84MSsAlrvWFsGRdFw== + dependencies: + antlr4 "^4.8.0" "@types/color-name@^1.1.1": version "1.1.1" @@ -244,6 +246,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" +antlr4@^4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.8.0.tgz#f938ec171be7fc2855cd3a533e87647185b32b6a" + integrity sha512-en/MxQ4OkPgGJQ3wD/muzj1uDnFSzdFIhc2+c6bHZokWkuBb6RRvFjpWhPxWLbgQvaEzldJZ0GSQpfSAaE3hqg== + anymatch@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" @@ -784,18 +791,6 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -esprima-extract-comments@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/esprima-extract-comments/-/esprima-extract-comments-1.1.0.tgz#0dacab567a5900240de6d344cf18c33617becbc9" - integrity sha512-sBQUnvJwpeE9QnPrxh7dpI/dp67erYG4WXEAreAMoelPRpMR7NWb4YtwRPn9b+H1uLQKl/qS8WYmyaljTpjIsw== - dependencies: - esprima "^4.0.0" - -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - ethlint@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/ethlint/-/ethlint-1.2.5.tgz#375b77d1e5971e7c574037e07ff7ddad8e17858f" @@ -906,14 +901,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-comments@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/extract-comments/-/extract-comments-1.1.0.tgz#b90bca033a056bd69b8ba1c6b6b120fc2ee95c18" - integrity sha512-dzbZV2AdSSVW/4E7Ti5hZdHWbA+Z80RJsJhr5uiL10oyjl/gy7/o+HI1HwK4/WSZhlq4SNKU3oUzXlM13Qx02Q== - dependencies: - esprima-extract-comments "^1.1.0" - parse-code-context "^1.0.0" - fast-deep-equal@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" @@ -1931,11 +1918,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-code-context@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-code-context/-/parse-code-context-1.0.0.tgz#718c295c593d0d19a37f898473268cc75e98de1e" - integrity sha512-OZQaqKaQnR21iqhlnPfVisFjBWjhnMl5J9MgbP8xC+EwoVqbXrq78lp+9Zb3ahmLzrIX5Us/qbvBnaS3hkH6OA== - parse-glob@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" @@ -2025,18 +2007,18 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= -prettier-plugin-solidity@^1.0.0-alpha.57: - version "1.0.0-alpha.58" - resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-alpha.58.tgz#87e44b21bd9bd6ad4b28b1ac62ccdce59fb82fe3" - integrity sha512-G2xj98uEtfTcSc4qZcQ+MLwibpDNhBmOJk9ezTJ7uQLtTMGP1X9PqRnRlJW/vxbStPw/TVvnYD5rXwd1KZbTsg== +prettier-plugin-solidity@^1.0.0-beta.1: + version "1.0.0-beta.1" + resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-beta.1.tgz#4efff3ea4ba449e5c88f4ada6aca889c676547a6" + integrity sha512-kfPkR+UscT/Cw+2O8RSh6gCnIY4qsJJtuE4xZpIq42EyNyTLBabDwjH1QocXHwmlgL6QffydDge76ERlyJRaAA== dependencies: - "@solidity-parser/parser" "^0.8.1" + "@solidity-parser/parser" "^0.9.1" dir-to-object "^2.0.0" emoji-regex "^9.0.0" escape-string-regexp "^4.0.0" - extract-comments "^1.1.0" prettier "^2.0.5" semver "^7.3.2" + solidity-comments-extractor "^0.0.4" string-width "^4.2.0" prettier@^2.0.5, prettier@^2.1.2: @@ -2361,6 +2343,11 @@ sol-explore@1.6.1: resolved "https://registry.yarnpkg.com/sol-explore/-/sol-explore-1.6.1.tgz#b59f073c69fe332560d5a10c32ba8ca7f2986cfb" integrity sha1-tZ8HPGn+MyVg1aEMMrqMp/KYbPs= +solidity-comments-extractor@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/solidity-comments-extractor/-/solidity-comments-extractor-0.0.4.tgz#ce420aef23641ffd0131c7d80ba85b6e1e42147e" + integrity sha512-58glBODwXIKMaQ7rfcJOrWtFQMMOK28tJ0/LcB5Xhu7WtAxk4UX2fpgKPuaL41XjMp/y0gAa1MTLqk018wuSzA== + solium-plugin-security@0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/solium-plugin-security/-/solium-plugin-security-0.1.1.tgz#2a87bcf8f8c3abf7d198e292e4ac080284e3f3f6"