Merge pull request #371 from morpho-org/chore/update-blue-2

Update blue
morpho-org · Nov 15, 2023 · 5099e5f · 5099e5f
2 parents b82b1d8 + a9d3ca3
commit 5099e5f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/morpho-blue b/lib/morpho-blue
diff --git a/test/forge/ethereum/migration/helpers/EthereumMigrationTest.sol b/test/forge/ethereum/migration/helpers/EthereumMigrationTest.sol
@@ -5,6 +5,7 @@ import {SafeTransferLib, ERC20} from "../../../../../lib/solmate/src/utils/SafeT
 import {ErrorsLib} from "../../../../../src/libraries/ErrorsLib.sol";
 import {MarketParamsLib} from "../../../../../lib/morpho-blue/src/libraries/MarketParamsLib.sol";
 import {MorphoLib} from "../../../../../lib/morpho-blue/src/libraries/periphery/MorphoLib.sol";
+import {Market} from "../../../../../lib/morpho-blue/src/interfaces/IMorpho.sol";
 import {MorphoBalancesLib} from "../../../../../lib/morpho-blue/src/libraries/periphery/MorphoBalancesLib.sol";
 
 import "../../helpers/EthereumTest.sol";
@@ -31,8 +32,8 @@ contract EthereumMigrationTest is EthereumTest {
         marketParams.irm = address(irm);
         marketParams.lltv = 0.8 ether;
 
-        (,,,, uint128 lastUpdate,) = morpho.market(marketParams.id());
-        if (lastUpdate == 0) {
+        Market memory market = morpho.market(marketParams.id());
+        if (market.lastUpdate == 0) {
             morpho.createMarket(marketParams);
         }
 
@@ -49,16 +50,16 @@ contract EthereumMigrationTest is EthereumTest {
     function _assertBorrowerPosition(uint256 collateralSupplied, uint256 borrowed, address user, address bundler)
         internal
     {
-        assertEq(morpho.expectedSupplyBalance(marketParams, user), 0, "supply != 0");
+        assertEq(morpho.expectedSupplyAssets(marketParams, user), 0, "supply != 0");
         assertEq(morpho.collateral(marketParams.id(), user), collateralSupplied, "wrong collateral supply amount");
-        assertEq(morpho.expectedBorrowBalance(marketParams, user), borrowed, "wrong borrow amount");
+        assertEq(morpho.expectedBorrowAssets(marketParams, user), borrowed, "wrong borrow amount");
         assertFalse(morpho.isAuthorized(user, bundler), "authorization not revoked");
     }
 
     function _assertSupplierPosition(uint256 supplied, address user, address bundler) internal {
-        assertEq(morpho.expectedSupplyBalance(marketParams, user), supplied, "wrong supply amount");
+        assertEq(morpho.expectedSupplyAssets(marketParams, user), supplied, "wrong supply amount");
         assertEq(morpho.collateral(marketParams.id(), user), 0, "collateral supplied != 0");
-        assertEq(morpho.expectedBorrowBalance(marketParams, user), 0, "borrow != 0");
+        assertEq(morpho.expectedBorrowAssets(marketParams, user), 0, "borrow != 0");
         assertFalse(morpho.isAuthorized(user, bundler), "authorization not revoked");
     }
+4 −3		.github/workflows/foundry.yml
+20 −0		.github/workflows/npm-release.yml
+ −		audits/2023-11-13-cantina-managed-review-draft.pdf
+1 −1		foundry.toml
+8 −3		package.json
+74 −56		src/Morpho.sol
+2 −4		src/interfaces/IIrm.sol
+90 −40		src/interfaces/IMorpho.sol
+1 −0		src/interfaces/IOracle.sol
+7 −7		src/libraries/MathLib.sol
+12 −11		src/libraries/periphery/MorphoBalancesLib.sol
+1 −0		src/libraries/periphery/MorphoLib.sol
+2 −0		src/mocks/IrmMock.sol
+8 −13		test/forge/BaseTest.sol
+11 −10		test/forge/integration/AccrueInterestIntegrationTest.sol
+5 −5		test/forge/integration/AuthorizationIntegrationTest.sol
+7 −8		test/forge/integration/CreateMarketIntegrationTest.sol
+20 −0		test/forge/integration/LiquidateIntegrationTest.sol
+6 −0		test/forge/integration/OnlyOwnerIntegrationTest.sol
+14 −14		test/forge/libraries/periphery/MorphoBalancesLibTest.sol
+9 −11		test/forge/libraries/periphery/MorphoLibTest.sol
+7 −12		test/forge/libraries/periphery/MorphoStorageLibTest.sol
+2 −2		test/morpho_tests.tree
+13 −13		tsconfig.json