Merge remote-tracking branch 'origin/multisig-plan' into multisig-plan

.github/workflows/certora.yml

@@ -26,11 +26,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      
+
       - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
-          java-version: '11'
+          distribution: "zulu"
+          java-version: "11"
           java-package: jre
 
       - name: Set up Python 3.8

README.md

@@ -1,4 +1,5 @@
 # Direct Deposit Module for Maker
+
 ![Build Status](https://github.com/makerdao/dss-direct-deposit/actions/workflows/.github/workflows/tests.yaml/badge.svg?branch=master)
 
 The Dai Direct Deposit Module (D3M) is a tool for directly injecting DAI into third party protocols.
@@ -11,7 +12,7 @@ The D3M is made of 3 components on the Maker side:
 
 ### D3MHub
 
-The primary manager contract responsible for collecting all information and determining which action to take (if any). Each D3M instance is regsitered on the Hub using relevant `file(ilk, ...)` admin functions.
+The primary manager contract responsible for collecting all information and determining which action to take (if any). Each D3M instance is registered on the Hub using relevant `file(ilk, ...)` admin functions.
 
 A permissionless `exec(ilk)` function exists which will perform all necessary steps to update the provided liquidity within the debt ceiling and external protocol constraints. `exec(ilk)` will need to be called on a somewhat regular basis to keep the system running properly. During each call to this function, interest will automatically be collected.
 
@@ -51,7 +52,7 @@ Below is a configurable parameter for the Compound DAI D3M:
 
 Any Comp that is accured can be permissionlessly collected into the pause proxy by calling `collect()`.
 
-### Setup and Testing
+# Setup and Testing
 
 To set up the environment and run tests, run the following commands:
 

src/tests/integration/IntegrationBase.t.sol

@@ -388,7 +388,7 @@ abstract contract IntegrationBaseTest is DssTest {
         vow.heal(_min(vat.sin(address(vow)), vat.dai(address(vow))));
         assertRoundingEq(vat.gem(ilk, address(end)), 0);
         assertEq(vat.sin(address(vow)), 0);
-        //assertGe(vat.dai(address(vow)), prevDai); // As also probably accrues interest
+        assertApproxEqAbs(vat.dai(address(vow)), prevDai, 1e27);
     }
 
     function test_unwind_mcd_caged_skimmed() public {
@@ -458,7 +458,7 @@ abstract contract IntegrationBaseTest is DssTest {
         vow.heal(_min(vat.sin(address(vow)), vat.dai(address(vow))));
         assertRoundingEq(vat.gem(ilk, address(end)), 0);
         assertEq(vat.sin(address(vow)), 0);
-        //assertGe(vat.dai(address(vow)), prevDai); // As also probably accrues interest
+        assertApproxEqAbs(vat.dai(address(vow)), prevDai, 1e27);
     }
 
     function test_unwind_mcd_caged_wait_done() public {

src/tests/integration/MetaMorpho.t.sol

@@ -77,9 +77,6 @@ contract MetaMorphoTest is IntegrationBaseTest {
 
         vm.createSelectFork(vm.envString("ETH_RPC_URL"), 19456934);
 
-        // Need to increase to 3
-        roundingTolerance = 3;
-
         // Deploy.
         d3m.oracle = D3MDeploy.deployOracle(address(this), admin, ilk, address(dss.vat));
         d3m.pool = D3MDeploy.deploy4626TypePool(address(this), admin, ilk, address(hub), address(dai), address(spDai));