D3M version 2.0

.github/workflows/tests.yaml

@@ -1,25 +1,18 @@
-on: [push, pull_request]
+on: [push]
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repository and submodules
-      uses: actions/checkout@v2
-      with:
-        submodules: recursive
+      - uses: actions/checkout@v3
 
-    - name: Install nix 2.3.6
-      uses: cachix/install-nix-action@v13
-      with:
-        install_url: https://releases.nixos.org/nix/nix-2.3.6/install
-        nix_path: nixpkgs=channel:nixos-unstable
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
 
-    - name: Use maker and dapp cachix
-      uses: cachix/cachix-action@v10
-      with:
-        name: maker
-        extraPullNames: dapp
+      - name: Install Dependencies
+        run: forge install
 
-    - name: Run tests
-      run: nix-shell --pure --argstr url ${{ secrets.ETH_RPC_URL }} --run 'dapp test -v --rpc'
+      - name: Run tests
+        run: forge test -v --force --fork-url ${{ secrets.ETH_RPC_URL }} --use 0.8.14

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "lib/ds-test"]
 	path = lib/ds-test
 	url = https://github.com/dapphub/ds-test
-[submodule "lib/ds-value"]
-	path = lib/ds-value
-	url = https://github.com/dapphub/ds-value

Makefile

@@ -1,6 +1,5 @@
-all    		 :; DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=200 dapp --use solc:0.6.12 build
+all    		 :; DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=200 dapp --use solc:0.8.14 build
 clean  		 :; dapp clean
-test   		 :; ./test.sh match=$(match) optimizer=1
-test-dev   	 :; ./test.sh match=$(match) optimizer=0
-test-forge 	 :; ./test-forge.sh match=$(match) block=$(block)
-deploy 		 :; make && dapp create DssDirectDepositAaveDai 0xdA0Ab1e0017DEbCd72Be8599041a2aa3bA7e740F 0x4449524543542d4141564556322d444149000000000000000000000000000000 0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9 0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5
+test   		 :; ./test.sh match="$(match)" optimizer=1
+test-dev   	 :; ./test.sh match="$(match)" optimizer=0
+test-forge 	 :; ./test-forge.sh match="$(match)" block="$(block)" match-test="$(match-test)" match-contract="$(match-contract)"

src/DirectDepositMom.sol → src/D3MMom.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-// Copyright (C) 2021 Dai Foundation
+// Copyright (C) 2021-2022 Dai Foundation
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -14,23 +14,23 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-pragma solidity 0.6.12;
+pragma solidity ^0.8.14;
 
-interface FileLike {
-    function file(bytes32 what, uint256 data) external;
+interface DisableLike {
+    function disable() external;
 }
 
 interface AuthorityLike {
     function canCall(address src, address dst, bytes4 sig) external view returns (bool);
 }
 
 // Bypass governance delay to disable a direct deposit module
-contract DirectDepositMom {
+contract D3MMom {
     address public owner;
     address public authority;
 
-    event SetOwner(address indexed oldOwner, address indexed newOwner);
-    event SetAuthority(address indexed oldAuthority, address indexed newAuthority);
+    event SetOwner(address indexed newOwner);
+    event SetAuthority(address indexed newAuthority);
     event Disable(address indexed who);
 
     modifier onlyOwner {
@@ -43,9 +43,9 @@ contract DirectDepositMom {
         _;
     }
 
-    constructor() public {
+    constructor() {
         owner = msg.sender;
-        emit SetOwner(address(0), msg.sender);
+        emit SetOwner(msg.sender);
     }
 
     function isAuthorized(address src, bytes4 sig) internal view returns (bool) {
@@ -62,18 +62,18 @@ contract DirectDepositMom {
 
     // Governance actions with delay
     function setOwner(address owner_) external onlyOwner {
-        emit SetOwner(owner, owner_);
         owner = owner_;
+        emit SetOwner(owner_);
     }
 
     function setAuthority(address authority_) external onlyOwner {
-        emit SetAuthority(authority, authority_);
         authority = authority_;
+        emit SetAuthority(authority_);
     }
 
     // Governance action without delay
     function disable(address who) external auth {
-        FileLike(who).file("bar", 0);
+        DisableLike(who).disable();
         emit Disable(who);
     }
 }

src/D3MMom.t.sol

@@ -0,0 +1,71 @@
+// // SPDX-License-Identifier: AGPL-3.0-or-later
+// // Copyright (C) 2021-2022 Dai Foundation
+// //
+// // This program is free software: you can redistribute it and/or modify
+// // it under the terms of the GNU Affero General Public License as published by
+// // the Free Software Foundation, either version 3 of the License, or
+// // (at your option) any later version.
+// //
+// // This program is distributed in the hope that it will be useful,
+// // but WITHOUT ANY WARRANTY; without even the implied warranty of
+// // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// // GNU Affero General Public License for more details.
+// //
+// // You should have received a copy of the GNU Affero General Public License
+// // along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+pragma solidity ^0.8.14;
+
+import "ds-test/test.sol";
+import "./tests/interfaces/interfaces.sol";
+
+import {D3MMom} from "./D3MMom.sol";
+
+import {D3MTestPlan} from "./tests/stubs/D3MTestPlan.sol";
+interface Hevm {
+    function warp(uint256) external;
+
+    function store(
+        address,
+        bytes32,
+        bytes32
+    ) external;
+
+    function load(address, bytes32) external view returns (bytes32);
+}
+
+contract D3MMomTest is DSTest {
+    Hevm hevm;
+
+    D3MTestPlan d3mTestPlan;
+    D3MMom d3mMom;
+
+    function setUp() public {
+        hevm = Hevm(
+            address(bytes20(uint160(uint256(keccak256("hevm cheat code")))))
+        );
+
+        d3mTestPlan = new D3MTestPlan(address(123));
+
+        d3mTestPlan.file("maxBar_", type(uint256).max);
+        d3mTestPlan.file("bar", type(uint256).max);
+        d3mMom = new D3MMom();
+        d3mTestPlan.rely(address(d3mMom));
+    }
+
+    function test_can_disable_plan_owner() public {
+        assertEq(d3mTestPlan.bar(), type(uint256).max);
+
+        d3mMom.disable(address(d3mTestPlan));
+
+        assertEq(d3mTestPlan.bar(), 0);
+    }
+
+    function testFail_disable_no_auth() public {
+        d3mMom.setOwner(address(0));
+        assertEq(d3mMom.authority(), address(0));
+        assertEq(d3mMom.owner(), address(0));
+
+        d3mMom.disable(address(d3mTestPlan));
+    }
+}