Morpho - Add missing tokens to deployment and expand unit tests (#874)

reserve-protocol · Aug 1, 2023 · 3c20f04 · 3c20f04
1 parent e92b43a
commit 3c20f04
Show file tree

Hide file tree

Showing 18 changed files with 2,239 additions and 1,778 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,7 +19,6 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
       - run: yarn install --immutable
-      - run: yarn compile
       - run: yarn devchain &
         env:
           MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }}
@@ -37,7 +36,6 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
       - run: yarn install --immutable
-      - run: yarn compile
       - run: yarn lint
 
   plugin-tests:
@@ -50,7 +48,6 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
       - run: yarn install --immutable
-      - run: yarn compile
       - run: yarn test:plugins
       - name: 'Cache hardhat network fork'
         uses: actions/cache@v3
@@ -76,7 +73,6 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
       - run: yarn install --immutable
-      - run: yarn compile
       - run: yarn test:p0
         env:
           NODE_OPTIONS: '--max-old-space-size=8192'
@@ -91,7 +87,6 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
       - run: yarn install --immutable
-      - run: yarn compile
       - run: yarn test:p1
         env:
           NODE_OPTIONS: '--max-old-space-size=8192'
@@ -106,7 +101,6 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
       - run: yarn install --immutable
-      - run: yarn compile
       - run: yarn test:scenario
         env:
           NODE_OPTIONS: '--max-old-space-size=8192'
@@ -121,7 +115,6 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
       - run: yarn install --immutable
-      - run: yarn compile
       - run: yarn test:extreme
       - name: 'Cache hardhat network fork'
         uses: actions/cache@v3
@@ -157,7 +150,6 @@ jobs:
             hardhat-network-fork-${{ runner.os }}-
             hardhat-network-fork-
       - run: yarn install --immutable
-      - run: yarn compile
       - run: yarn test:integration
         env:
           NODE_OPTIONS: '--max-old-space-size=8192'

diff --git a/common/configuration.ts b/common/configuration.ts
@@ -65,6 +65,9 @@ export interface ITokens {
   maUSDC?: string
   maUSDT?: string
   maDAI?: string
+  maWBTC?: string
+  maWETH?: string
+  maStETH?: string
 }
 
 export interface IFeeds {

diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol
@@ -348,9 +348,9 @@ contract FacadeRead is IFacadeRead {
         uint192 uoaHeldInBaskets; // {UoA}
         {
             (address[] memory basketERC20s, uint256[] memory quantities) = rToken
-                .main()
-                .basketHandler()
-                .quote(basketsNeeded, FLOOR);
+            .main()
+            .basketHandler()
+            .quote(basketsNeeded, FLOOR);
 
             IAssetRegistry reg = rToken.main().assetRegistry();
             IBackingManager bm = rToken.main().backingManager();

diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol
@@ -124,7 +124,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager {
 
         BasketRange memory basketsHeld = main.basketHandler().basketsHeldBy(address(this));
         (bool doTrade, TradeRequest memory req, TradePrices memory prices) = TradingLibP0
-            .prepareRecollateralizationTrade(this, basketsHeld);
+        .prepareRecollateralizationTrade(this, basketsHeld);
 
         if (doTrade) {
             // Seize RSR if needed

diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol
@@ -516,8 +516,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler {
 
             // {tok} = {BU} * {ref/BU} / {ref/tok}
             quantities[i] = amount
-                .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR)
-                .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR);
+            .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR)
+            .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR);
             // marginally more penalizing than its sibling calculation that uses _quantity()
             // because does not intermediately CEIL as part of the division
         }

diff --git a/contracts/p0/RToken.sol b/contracts/p0/RToken.sol
@@ -214,8 +214,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken {
         }
 
         (address[] memory erc20s, uint256[] memory amounts) = main
-            .basketHandler()
-            .quoteCustomRedemption(basketNonces, portions, basketsRedeemed);
+        .basketHandler()
+        .quoteCustomRedemption(basketNonces, portions, basketsRedeemed);
 
         // === Save initial recipient balances ===
 

diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol
@@ -376,11 +376,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler {
 
             // {qTok} = {tok/BU} * {BU} * {tok} * {qTok/tok}
             quantities[i] = _quantity(basket.erc20s[i], coll)
-                .safeMul(amount, rounding)
-                .shiftl_toUint(
-                    int8(IERC20Metadata(address(basket.erc20s[i])).decimals()),
-                    rounding
-                );
+            .safeMul(amount, rounding)
+            .shiftl_toUint(int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), rounding);
         }
     }
 
@@ -461,8 +458,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler {
 
             // {tok} = {BU} * {ref/BU} / {ref/tok}
             quantities[i] = amount
-                .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR)
-                .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR);
+            .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR)
+            .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR);
             // marginally more penalizing than its sibling calculation that uses _quantity()
             // because does not intermediately CEIL as part of the division
         }
@@ -608,9 +605,9 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler {
 
                 // {tok} = {BU} * {ref/BU} / {ref/tok}
                 quantities[i] = b
-                    .refAmts[erc20s[i]]
-                    .safeDiv(ICollateral(address(asset)).refPerTok(), FLOOR)
-                    .shiftl_toUint(int8(asset.erc20Decimals()), FLOOR);
+                .refAmts[erc20s[i]]
+                .safeDiv(ICollateral(address(asset)).refPerTok(), FLOOR)
+                .shiftl_toUint(int8(asset.erc20Decimals()), FLOOR);
             } catch (bytes memory errData) {
                 // untested:
                 //     OOG pattern tested in other contracts, cost to test here is high

diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol
@@ -17,7 +17,7 @@ library OracleLib {
         returns (uint192)
     {
         (uint80 roundId, int256 p, , uint256 updateTime, uint80 answeredInRound) = chainlinkFeed
-            .latestRoundData();
+        .latestRoundData();
 
         if (updateTime == 0 || answeredInRound < roundId) {
             revert StalePrice();

diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol
@@ -18,7 +18,6 @@ import { shiftl_toFix, FIX_ONE } from "../../../libraries/Fixed.sol";
 contract MorphoFiatCollateral is AppreciatingFiatCollateral {
     using OracleLib for AggregatorV3Interface;
 
-    MorphoTokenisedDeposit public immutable vault;
     uint256 private immutable oneShare;
     int8 private immutable refDecimals;
 
@@ -29,13 +28,17 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral {
         AppreciatingFiatCollateral(config, revenueHiding)
     {
         require(address(config.erc20) != address(0), "missing erc20");
-        vault = MorphoTokenisedDeposit(address(config.erc20));
+        MorphoTokenisedDeposit vault = MorphoTokenisedDeposit(address(config.erc20));
         oneShare = 10**vault.decimals();
         refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals()));
     }
 
     /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens
     function _underlyingRefPerTok() internal view override returns (uint192) {
-        return shiftl_toFix(vault.convertToAssets(oneShare), -refDecimals);
+        return
+            shiftl_toFix(
+                MorphoTokenisedDeposit(address(erc20)).convertToAssets(oneShare),
+                -refDecimals
+            );
     }
 }
diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol
@@ -48,7 +48,7 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral {
             uint192 pegPrice
         )
     {
-        // {tar/ref} Get current market peg ({btc/wbtc})
+        // {tar/ref} Get current market peg
         pegPrice = targetUnitChainlinkFeed.price(targetUnitOracleTimeout);
 
         // {UoA/tok} = {UoA/ref} * {ref/tok}

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -117,6 +117,7 @@ const config: HardhatUserConfig = {
   mocha: {
     timeout: TIMEOUT,
     slow: 1000,
+    retries: 3
   },
   contractSizer: {
     alphaSort: false,

diff --git a/package.json b/package.json
@@ -19,12 +19,12 @@
     "test:extreme:integration": "FORK=1 EXTREME=1 PROTO_IMPL=1 npx hardhat test test/integration/**/*.test.ts",
     "test:unit": "yarn test:plugins && yarn test:p0 && yarn test:p1",
     "test:fast": "bash tools/fast-test.sh",
-    "test:p0": "PROTO_IMPL=0 hardhat test test/*.test.ts",
-    "test:p1": "PROTO_IMPL=1 hardhat test test/*.test.ts",
-    "test:plugins": "hardhat test test/{libraries,plugins}/*.test.ts",
+    "test:p0": "PROTO_IMPL=0 hardhat test test/*.test.ts --parallel",
+    "test:p1": "PROTO_IMPL=1 hardhat test test/*.test.ts  --parallel",
+    "test:plugins": "hardhat test test/{libraries,plugins}/*.test.ts --parallel",
     "test:plugins:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/plugins/individual-collateral/**/*.test.ts",
-    "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts",
-    "test:scenario": "PROTO_IMPL=1 hardhat test test/scenario/*.test.ts",
+    "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts --parallel",
+    "test:scenario": "PROTO_IMPL=1 hardhat test test/scenario/*.test.ts --parallel",
     "test:gas": "yarn test:gas:protocol && yarn test:gas:integration",
     "test:gas:protocol": "REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts",
     "test:gas:integration": "FORK=1 REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/integration/**/*.test.ts",
@@ -68,21 +68,21 @@
     "@types/lodash": "^4.14.177",
     "@types/mocha": "^9.0.0",
     "@types/node": "^12.20.37",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0",
+    "@typescript-eslint/eslint-plugin": "5.17.0",
+    "@typescript-eslint/parser": "5.17.0",
     "axios": "^0.24.0",
     "bignumber.js": "^9.1.1",
     "caip": "^1.1.0",
     "chai": "^4.3.4",
     "decimal.js": "^10.4.3",
     "dotenv": "^16.0.0",
-    "eslint": "^8.14.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint": "8.14.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-config-standard": "16.0.3",
+    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-promise": "6.0.0",
     "eth-permit": "^0.2.1",
     "ethers": "^5.7.2",
     "fast-check": "^2.24.0",
@@ -96,9 +96,9 @@
     "lodash.get": "^4.4.2",
     "mocha-chai-jest-snapshot": "^1.1.3",
     "prettier": "2.5.1",
-    "prettier-plugin-solidity": "^1.0.0-beta.13",
-    "solhint": "^3.3.6",
-    "solhint-plugin-prettier": "^0.0.5",
+    "prettier-plugin-solidity": "1.0.0-beta.13",
+    "solhint": "3.3.6",
+    "solhint-plugin-prettier": "0.0.5",
     "solidity-coverage": "^0.8.2",
     "ts-node": "^10.4.0",
     "tsconfig-paths": "^4.1.0",