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

Update libs
morpho-org · Nov 15, 2023 · f4e2574 · f4e2574
2 parents 8be59f1 + e5bd255
commit f4e2574
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/lib/morpho-blue b/lib/morpho-blue
diff --git a/lib/universal-rewards-distributor b/lib/universal-rewards-distributor
diff --git a/test/forge/ReentrancyTest.sol b/test/forge/ReentrancyTest.sol
@@ -34,7 +34,7 @@ contract ReentrancyTest is IntegrationTest, IERC1820Implementer {
             loanToken: address(reentrantToken),
             collateralToken: address(0),
             oracle: address(0),
-            irm: address(0),
+            irm: address(irm),
             lltv: 0
         });
 

diff --git a/test/forge/helpers/BaseTest.sol b/test/forge/helpers/BaseTest.sol
@@ -77,12 +77,11 @@ contract BaseTest is Test {
             loanToken: address(loanToken),
             collateralToken: address(0),
             oracle: address(0),
-            irm: address(0),
+            irm: address(irm),
             lltv: 0
         });
 
         vm.startPrank(MORPHO_OWNER);
-        morpho.enableIrm(address(0));
         morpho.enableIrm(address(irm));
         morpho.setFeeRecipient(MORPHO_FEE_RECIPIENT);
 

diff --git a/test/hardhat/MetaMorpho.spec.ts b/test/hardhat/MetaMorpho.spec.ts
@@ -163,7 +163,7 @@ describe("MetaMorpho", () => {
       loanToken: loanAddress,
       collateralToken: ZeroAddress,
       oracle: ZeroAddress,
-      irm: ZeroAddress,
+      irm: irmAddress,
       lltv: 0n,
     };
 
@@ -182,7 +182,6 @@ describe("MetaMorpho", () => {
       await morpho.createMarket(marketParams);
     }
 
-    await morpho.enableIrm(idleParams.irm);
     await morpho.enableLltv(idleParams.lltv);
     await morpho.createMarket(idleParams);
+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
+22 −22		src/Morpho.sol
+19 −8		src/interfaces/IMorpho.sol
+1 −0		src/libraries/periphery/MorphoBalancesLib.sol
+2 −0		src/mocks/IrmMock.sol
+7 −8		test/forge/integration/CreateMarketIntegrationTest.sol
+20 −0		test/forge/integration/LiquidateIntegrationTest.sol
+2 −2		test/forge/libraries/periphery/MorphoBalancesLibTest.sol
+7 −12		test/forge/libraries/periphery/MorphoStorageLibTest.sol
+13 −13		tsconfig.json
+5 −1		README.md
+ −		audits/2023-11-14-universal-rewards-distributor-cantina-managed-draft.pdf