Merge pull request #119 from morpho-labs/build/blue

build(deps): update morpho-blue
morpho-org · Sep 27, 2023 · a158653 · a158653
2 parents 91a07be + 278f35d
commit a158653
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 60 deletions.
diff --git a/lib/morpho-blue b/lib/morpho-blue
diff --git a/src/MetaMorpho.sol b/src/MetaMorpho.sol
@@ -204,7 +204,7 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
     /* ONLY RISK MANAGER FUNCTIONS */
 
     function submitCap(MarketParams memory marketParams, uint256 newMarketCap) external onlyRiskManager {
-        require(marketParams.borrowableToken == asset(), ErrorsLib.INCONSISTENT_ASSET);
+        require(marketParams.loanToken == asset(), ErrorsLib.INCONSISTENT_ASSET);
 
         Id id = marketParams.id();
         require(MORPHO.lastUpdate(id) != 0, ErrorsLib.MARKET_NOT_CREATED);

diff --git a/test/forge/ERC4626Test.sol b/test/forge/ERC4626Test.sol
@@ -18,7 +18,7 @@ contract ERC4626Test is BaseTest {
 
         uint256 shares = vault.convertToShares(assets);
 
-        borrowableToken.setBalance(SUPPLIER, assets);
+        loanToken.setBalance(SUPPLIER, assets);
 
         vm.prank(SUPPLIER);
         uint256 deposited = vault.mint(shares, ONBEHALF);
@@ -31,7 +31,7 @@ contract ERC4626Test is BaseTest {
     function testDeposit(uint256 assets) public {
         assets = bound(assets, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, assets);
+        loanToken.setBalance(SUPPLIER, assets);
 
         vm.prank(SUPPLIER);
         uint256 shares = vault.deposit(assets, ONBEHALF);
@@ -44,7 +44,7 @@ contract ERC4626Test is BaseTest {
     function testRedeemTooMuch(uint256 deposited) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         uint256 shares = vault.deposit(deposited, ONBEHALF);
@@ -57,7 +57,7 @@ contract ERC4626Test is BaseTest {
     function testWithdrawAll(uint256 assets) public {
         assets = bound(assets, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, assets);
+        loanToken.setBalance(SUPPLIER, assets);
 
         vm.prank(SUPPLIER);
         uint256 minted = vault.deposit(assets, ONBEHALF);
@@ -69,14 +69,14 @@ contract ERC4626Test is BaseTest {
 
         assertEq(shares, minted, "shares");
         assertEq(vault.balanceOf(ONBEHALF), 0, "balanceOf(ONBEHALF)");
-        assertEq(borrowableToken.balanceOf(RECEIVER), assets, "borrowableToken.balanceOf(RECEIVER)");
+        assertEq(loanToken.balanceOf(RECEIVER), assets, "loanToken.balanceOf(RECEIVER)");
         assertEq(morpho.expectedSupplyBalance(allMarkets[0], address(vault)), 0, "expectedSupplyBalance(vault)");
     }
 
     function testRedeemAll(uint256 deposited) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         uint256 minted = vault.deposit(deposited, ONBEHALF);
@@ -88,14 +88,14 @@ contract ERC4626Test is BaseTest {
 
         assertEq(assets, deposited, "assets");
         assertEq(vault.balanceOf(ONBEHALF), 0, "balanceOf(ONBEHALF)");
-        assertEq(borrowableToken.balanceOf(RECEIVER), deposited, "borrowableToken.balanceOf(RECEIVER)");
+        assertEq(loanToken.balanceOf(RECEIVER), deposited, "loanToken.balanceOf(RECEIVER)");
         assertEq(morpho.expectedSupplyBalance(allMarkets[0], address(vault)), 0, "expectedSupplyBalance(vault)");
     }
 
     function testRedeemNotDeposited(uint256 deposited) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         uint256 shares = vault.deposit(deposited, ONBEHALF);
@@ -108,7 +108,7 @@ contract ERC4626Test is BaseTest {
     function testRedeemNotApproved(uint256 deposited) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         uint256 shares = vault.deposit(deposited, ONBEHALF);
@@ -121,7 +121,7 @@ contract ERC4626Test is BaseTest {
     function testWithdrawNotApproved(uint256 assets) public {
         assets = bound(assets, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, assets);
+        loanToken.setBalance(SUPPLIER, assets);
 
         vm.prank(SUPPLIER);
         vault.deposit(assets, ONBEHALF);
@@ -134,7 +134,7 @@ contract ERC4626Test is BaseTest {
     function testTransferFrom(uint256 deposited, uint256 toTransfer) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         uint256 shares = vault.deposit(deposited, ONBEHALF);
@@ -155,7 +155,7 @@ contract ERC4626Test is BaseTest {
     function testTransferFromNotApproved(uint256 deposited, uint256 amount) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         uint256 shares = vault.deposit(deposited, ONBEHALF);
@@ -170,15 +170,15 @@ contract ERC4626Test is BaseTest {
     function testWithdrawMoreThanBalanceButLessThanTotalAssets(uint256 deposited, uint256 assets) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
 
         assets = bound(assets, deposited + 1, type(uint256).max / (deposited + 10 ** DECIMALS_OFFSET));
 
         uint256 toAdd = assets - deposited + 1;
-        borrowableToken.setBalance(SUPPLIER, toAdd);
+        loanToken.setBalance(SUPPLIER, toAdd);
 
         vm.prank(SUPPLIER);
         vault.deposit(toAdd, SUPPLIER);
@@ -191,7 +191,7 @@ contract ERC4626Test is BaseTest {
     function testWithdrawMoreThanTotalAssets(uint256 deposited, uint256 assets) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -206,7 +206,7 @@ contract ERC4626Test is BaseTest {
     function testWithdrawMoreThanBalanceButLessThanLiquidity(uint256 deposited, uint256 assets) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -229,7 +229,7 @@ contract ERC4626Test is BaseTest {
     function testTransfer(uint256 deposited, uint256 toTransfer) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         uint256 minted = vault.deposit(deposited, ONBEHALF);

diff --git a/test/forge/FeeTest.sol b/test/forge/FeeTest.sol
@@ -27,7 +27,7 @@ contract FeeTest is BaseTest {
 
             // Create some debt on the market to accrue interest.
 
-            borrowableToken.setBalance(SUPPLIER, 1);
+            loanToken.setBalance(SUPPLIER, 1);
 
             vm.prank(SUPPLIER);
             morpho.supply(marketParams, 1, 0, ONBEHALF, hex"");
@@ -57,7 +57,7 @@ contract FeeTest is BaseTest {
     function testLastTotalAssets(uint256 deposited) public {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -69,7 +69,7 @@ contract FeeTest is BaseTest {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
         withdrawn = bound(withdrawn, MIN_TEST_ASSETS, deposited);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -85,7 +85,7 @@ contract FeeTest is BaseTest {
         newDeposit = bound(newDeposit, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
         blocks = _boundBlocks(blocks);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -96,7 +96,7 @@ contract FeeTest is BaseTest {
 
         uint256 feeShares = _feeShares(totalAssetsBefore);
 
-        borrowableToken.setBalance(SUPPLIER, newDeposit);
+        loanToken.setBalance(SUPPLIER, newDeposit);
 
         vm.prank(SUPPLIER);
         vault.deposit(newDeposit, ONBEHALF);
@@ -110,7 +110,7 @@ contract FeeTest is BaseTest {
         newDeposit = bound(newDeposit, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
         blocks = _boundBlocks(blocks);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -123,7 +123,7 @@ contract FeeTest is BaseTest {
 
         uint256 shares = vault.convertToShares(newDeposit);
 
-        borrowableToken.setBalance(SUPPLIER, newDeposit);
+        loanToken.setBalance(SUPPLIER, newDeposit);
 
         vm.prank(SUPPLIER);
         vault.mint(shares, ONBEHALF);
@@ -137,7 +137,7 @@ contract FeeTest is BaseTest {
         withdrawn = bound(withdrawn, MIN_TEST_ASSETS, deposited);
         blocks = _boundBlocks(blocks);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -162,7 +162,7 @@ contract FeeTest is BaseTest {
         withdrawn = bound(withdrawn, MIN_TEST_ASSETS, deposited);
         blocks = _boundBlocks(blocks);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -187,7 +187,7 @@ contract FeeTest is BaseTest {
 
         vm.assume(fee != FEE);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);
@@ -208,7 +208,7 @@ contract FeeTest is BaseTest {
         deposited = bound(deposited, MIN_TEST_ASSETS, MAX_TEST_ASSETS);
         blocks = _boundBlocks(blocks);
 
-        borrowableToken.setBalance(SUPPLIER, deposited);
+        loanToken.setBalance(SUPPLIER, deposited);
 
         vm.prank(SUPPLIER);
         vault.deposit(deposited, ONBEHALF);

diff --git a/test/forge/MarketTest.sol b/test/forge/MarketTest.sol
@@ -33,15 +33,15 @@ contract MarketTest is BaseTest {
     }
 
     function testSubmitCapInconsistentAsset(MarketParams memory marketParams) public {
-        vm.assume(marketParams.borrowableToken != address(borrowableToken));
+        vm.assume(marketParams.loanToken != address(loanToken));
 
         vm.prank(RISK_MANAGER);
         vm.expectRevert(bytes(ErrorsLib.INCONSISTENT_ASSET));
         vault.submitCap(marketParams, 0);
     }
 
     function testSubmitCapMarketNotCreated(MarketParams memory marketParams) public {
-        marketParams.borrowableToken = address(borrowableToken);
+        marketParams.loanToken = address(loanToken);
 
         vm.assume(morpho.lastUpdate(marketParams.id()) == 0);
 
@@ -127,7 +127,7 @@ contract MarketTest is BaseTest {
         _setCap(allMarkets[1], CAP);
         _setCap(allMarkets[2], CAP);
 
-        borrowableToken.setBalance(SUPPLIER, 1);
+        loanToken.setBalance(SUPPLIER, 1);
 
         vm.prank(SUPPLIER);
         vault.deposit(1, RECEIVER);

diff --git a/test/forge/UrdTest.sol b/test/forge/UrdTest.sol
@@ -32,7 +32,7 @@ contract UrdTest is BaseTest {
         vault.setRewardsDistributor(address(0));
     }
 
-    function testTransferRewardsNotBorrowableToken(uint256 amount) public {
+    function testTransferRewardsNotLoanToken(uint256 amount) public {
         vm.prank(OWNER);
         vault.setRewardsDistributor(address(rewardsDistributor));
 
@@ -51,31 +51,31 @@ contract UrdTest is BaseTest {
         );
     }
 
-    function testTransferRewardsBorrowableToken(uint256 rewards, uint256 idle) public {
+    function testTransferRewardsLoanToken(uint256 rewards, uint256 idle) public {
         idle = bound(idle, 0, MAX_TEST_ASSETS);
         rewards = bound(rewards, 0, MAX_TEST_ASSETS);
 
         vm.prank(OWNER);
         vault.setRewardsDistributor(address(rewardsDistributor));
 
-        borrowableToken.setBalance(address(vault), rewards);
+        loanToken.setBalance(address(vault), rewards);
 
-        borrowableToken.setBalance(address(SUPPLIER), idle);
+        loanToken.setBalance(address(SUPPLIER), idle);
         vm.prank(SUPPLIER);
         vault.deposit(idle, SUPPLIER);
 
         assertEq(vault.idle(), idle, "vault.idle()");
-        uint256 vaultBalanceBefore = borrowableToken.balanceOf(address(vault));
+        uint256 vaultBalanceBefore = loanToken.balanceOf(address(vault));
         assertEq(vaultBalanceBefore, idle + rewards, "vaultBalanceBefore");
 
-        vault.transferRewards(address(borrowableToken));
-        uint256 vaultBalanceAfter = borrowableToken.balanceOf(address(vault));
+        vault.transferRewards(address(loanToken));
+        uint256 vaultBalanceAfter = loanToken.balanceOf(address(vault));
 
         assertEq(vaultBalanceAfter, idle, "vaultBalanceAfter");
         assertEq(
-            borrowableToken.balanceOf(address(rewardsDistributor)),
+            loanToken.balanceOf(address(rewardsDistributor)),
             rewards,
-            "borrowableToken.balanceOf(address(rewardsDistributor))"
+            "loanToken.balanceOf(address(rewardsDistributor))"
         );
     }
 }