Merge pull request #338 from morpho-org/review-cantina

Cantina review
morpho-org · Nov 8, 2023 · 345311b · 345311b
2 parents b59d8e3 + 4520213
commit 345311b
Show file tree

Hide file tree

Showing 57 changed files with 1,146 additions and 629 deletions.
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
@@ -15,16 +15,8 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Generate a token
-        id: generate-token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       - uses: actions/checkout@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
           submodules: recursive
 
       - uses: ./.github/actions/install

diff --git a/.github/workflows/foundry.yml b/.github/workflows/foundry.yml
@@ -16,17 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Generate a token
-        id: generate-token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
           submodules: recursive
 
       - uses: ./.github/actions/install
@@ -39,17 +31,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Generate a token
-        id: generate-token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
           submodules: recursive
 
       - uses: ./.github/actions/install-cache
@@ -86,17 +70,9 @@ jobs:
             max-test-rejects: 65536
 
     steps:
-      - name: Generate a token
-        id: generate-token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
           submodules: recursive
 
       - uses: ./.github/actions/install-cache
@@ -120,24 +96,16 @@ jobs:
         type: ["slow", "fast"]
         include:
           - type: "slow"
-            fuzz-runs: 128
+            fuzz-runs: 96
             max-test-rejects: 65536
           - type: "fast"
             fuzz-runs: 16
             max-test-rejects: 65536
 
     steps:
-      - name: Generate a token
-        id: generate-token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
           submodules: recursive
 
       - uses: ./.github/actions/install-cache

diff --git a/.github/workflows/hardhat.yml b/.github/workflows/hardhat.yml
@@ -16,17 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Generate a token
-        id: generate-token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
           submodules: recursive
 
       - name: Build contracts & package with hardhat

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       version_type:
-        description: 'Version to release'
+        description: "Version to release"
         required: true
         type: choice
         options:
@@ -16,23 +16,14 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
-
 jobs:
   build-and-deploy:
     name: Build and Publish
     runs-on: ubuntu-latest
     steps:
-      - name: Generate a token
-        id: generate-token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
           submodules: recursive
 
       - name: Build contracts & package with hardhat

diff --git a/.gitmodules b/.gitmodules
@@ -22,6 +22,3 @@
 [submodule "lib/murky"]
 	path = lib/murky
 	url = https://github.com/dmfxyz/murky
-[submodule "lib/morpho-blue-irm"]
-	path = lib/morpho-blue-irm
-	url = https://github.com/morpho-labs/morpho-blue-irm
diff --git a/config/ethereum.json b/config/ethereum.json
@@ -1,6 +1,6 @@
 {
     "chainId": 1,
-    "forkBlockNumber": 18227677,
+    "forkBlockNumber": 18500000,
     "markets": [
         {
             "loanToken": "WETH",

diff --git a/foundry.toml b/foundry.toml
@@ -11,7 +11,7 @@ fs_permissions = [
 libs = ["lib"]
 
 [profile.default.fuzz]
-runs = 32
+runs = 16
 
 
 [profile.default.rpc_endpoints]

diff --git a/lib/morpho-blue-irm b/lib/morpho-blue-irm