Remove dependencies and move from dapp to forge (#97)

* dapp uninstall clipper-mom

* dapp uninstall ds-math

* dapp uninstall ds-proxy

* dapp uninstall dss

* dapp uninstall dss-auto-line

* dapp uninstall dss-chain-log

* dapp uninstall dss-direct-deposit

* dapp uninstall dss-lerp

* dapp uninstall flipper-mom

* dapp uninstall ilk-registry

* dapp uninstall median

* dapp uninstall MIP21-RWA-Example

* dapp uninstall mkr-authority

* dapp uninstall osm-mom

* dapp uninstall univ2-lp-oracle

* Replace dapp with forge

* All tests are passing without dependencies

* Fix test script

* dapp uninstall ds-test

* dapp install foundry-rs/forge-std

* Set latest release of forge-std

* hevm => vm

* Remove unused code

* Move mocks to a separate file

* dapp clean => forge clean

* Use vm.expectRevert() instead of testFail

* Fix some tests naming (one of them wasn't running and required minor changes)

Author: gbalabasquer

.github/workflows/tests.yaml

@@ -4,22 +4,17 @@ 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 'source "./allow-optimize.sh" && dapp test -v --rpc'
+      - name: Run tests
+        run: make test
+        env:
+          ETH_RPC_URL: ${{ secrets.ETH_RPC_URL }}

.gitignore

@@ -1,2 +1,3 @@
 /out
 /hevm.libs.*
+/cache

.gitmodules

@@ -1,52 +1,6 @@
-[submodule "lib/ds-test"]
-	path = lib/ds-test
-	url = https://github.com/dapphub/ds-test
-[submodule "lib/dss"]
-	path = lib/dss
-	url = https://github.com/makerdao/dss
 [submodule "lib/dss-interfaces"]
 	path = lib/dss-interfaces
 	url = https://github.com/makerdao/dss-interfaces
-[submodule "lib/ds-math"]
-	path = lib/ds-math
-	url = https://github.com/dapphub/ds-math
-[submodule "lib/dss-chain-log"]
-	path = lib/dss-chain-log
-	url = https://github.com/makerdao/dss-chain-log
-[submodule "lib/mkr-authority"]
-	path = lib/mkr-authority
-	url = https://github.com/makerdao/mkr-authority
-[submodule "lib/osm-mom"]
-	path = lib/osm-mom
-	url = https://github.com/makerdao/osm-mom
-[submodule "lib/ilk-registry"]
-	path = lib/ilk-registry
-	url = https://github.com/makerdao/ilk-registry
-[submodule "lib/flipper-mom"]
-	path = lib/flipper-mom
-	url = https://github.com/makerdao/flipper-mom
-[submodule "lib/median"]
-	path = lib/median
-	url = https://github.com/makerdao/median
-[submodule "lib/ds-proxy"]
-	path = lib/ds-proxy
-	url = https://github.com/makerdao/ds-proxy
-	branch = solc-0.6
-[submodule "lib/dss-auto-line"]
-	path = lib/dss-auto-line
-	url = https://github.com/makerdao/dss-auto-line
-[submodule "lib/clipper-mom"]
-	path = lib/clipper-mom
-	url = https://github.com/makerdao/clipper-mom
-[submodule "lib/univ2-lp-oracle"]
-	path = lib/univ2-lp-oracle
-	url = https://github.com/makerdao/univ2-lp-oracle
-[submodule "lib/dss-lerp"]
-	path = lib/dss-lerp
-	url = https://github.com/makerdao/dss-lerp
-[submodule "lib/dss-direct-deposit"]
-	path = lib/dss-direct-deposit
-	url = https://github.com/makerdao/dss-direct-deposit
-[submodule "lib/MIP21-RWA-Example"]
-	path = lib/MIP21-RWA-Example
-	url = https://github.com/makerdao/MIP21-RWA-Example
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

Makefile

@@ -1,5 +1,5 @@
-build        :; ./build.sh
-clean        :; dapp clean
+build        :; DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=200 dapp --use solc:0.6.12 build
+clean        :; forge clean
 test         :; ./test.sh $(match)
 deploy       :; make build && dapp create DssExecLib
 flatten      :; hevm flatten --source-file "src/DssExecLib.sol" > out/DssExecLib-flat.sol