THE BIG ONE 🐘 💣 🚝

.github/workflows/echidna.yaml

@@ -36,15 +36,32 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
+
+      - name: "Install Node.js"
+        uses: "actions/setup-node@v3"
+        with:
+          cache: "yarn"
+          node-version: "20"
+
+      - name: "Install the Node.js dependencies"
+        run: "yarn install --immutable"
+
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+
       - name: "Build for echidna"
-        run: forge build --build-info --skip */test/**/*.t.sol */script/**
+        run: |
+          forge build --build-info --skip \
+                "test/fork/**/*" \
+                "test/integration/**/*" \
+                "test/unit/**/*" \
+                "test/utils/**/*" \
+                "script/**/"
+
       - name: "Run Echidna"
         uses: crytic/echidna-action@v2
         with:
           files: .
-          solc-version: 0.5.17
           contract: ${{ matrix.contract }}
           config: echidna.yaml
           test-mode: assertion

.github/workflows/lint_test.yaml

@@ -34,7 +34,7 @@ jobs:
         run: "yarn install --immutable"
 
       - name: "Lint the contracts"
-        run: "yarn lint:check"
+        run: "yarn lint"
 
       - name: "Add lint summary"
         run: |
@@ -50,7 +50,7 @@ jobs:
       - name: "Build the contracts"
         run: |
           forge --version
-          forge build --sizes
+          forge build --sizes --skip test/**/*
 
       - name: "Add test summary"
         run: |

.github/workflows/slither.yaml

@@ -20,11 +20,20 @@ jobs:
         uses: "actions/checkout@v3"
         with:
           submodules: "recursive"
+      - name: "Install Node.js"
+        uses: "actions/setup-node@v3"
+        with:
+          cache: "yarn"
+          node-version: "20"
+
+      - name: "Install the Node.js dependencies"
+        run: "yarn install --immutable"
       - name: Run Slither
-        uses: crytic/slither-action@v0.3.1
+        uses: crytic/slither-action@v0.4.0
         id: slither
         with:
           sarif: results.sarif
+          fail-on: "low"
         # continue-on-error: true
         # -----------------------
         # Ideally, we'd like to continue on error to allow uploading the SARIF file here.
@@ -36,6 +45,6 @@ jobs:
         # know it failed.
         # -----------------------
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: ${{ steps.slither.outputs.sarif }}

.github/workflows/storage-layout.yaml

@@ -1,4 +1,8 @@
 name: "Storage Layout"
+
+env:
+  FOUNDRY_PROFILE: "ci"
+
 on:
   workflow_dispatch:
   push:
@@ -32,6 +36,14 @@ jobs:
         uses: onbjerg/foundry-toolchain@v1
         with:
           version: "nightly"
+      - name: "Install Node.js"
+        uses: "actions/setup-node@v3"
+        with:
+          cache: "yarn"
+          node-version: "20"
+
+      - name: "Install the Node.js dependencies"
+        run: "yarn install --immutable"
       - name: Check storage layout
         uses: Rubilmax/[email protected]
         with:

.gitmodules

@@ -1,18 +1,12 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/celo-foundry"]
-	path = lib/celo-foundry
-	url = https://github.com/bowd/celo-foundry
 [submodule "lib/openzeppelin-contracts-next"]
 	path = lib/openzeppelin-contracts-next
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
 [submodule "lib/openzeppelin-contracts-upgradeable"]
 	path = lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "lib/forge-std-next"]
-	path = lib/forge-std-next
-	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/safe-contracts"]
 	path = lib/safe-contracts
 	url = https://github.com/safe-global/safe-contracts
@@ -23,3 +17,9 @@
 	branch = "release-v4"
 	path = lib/prb-math
 	url = https://github.com/PaulRBerg/prb-math
+[submodule "lib/mento-std"]
+	path = lib/mento-std
+	url = https://github.com/mento-protocol/mento-std
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

.husky/pre-push

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint:check
+yarn lint

.prettierrc.yml

@@ -6,12 +6,12 @@ singleQuote: false
 tabWidth: 2
 trailingComma: all
 
+plugins: ["prettier-plugin-solidity"]
+
 overrides:
   - files: ["*.sol"]
     options:
       compiler: 0.5.17
-      tabWidth: 2
-      printWidth: 120
   - files: [contracts/tokens/patched/*.sol]
     options:
       compiler: 0.8.18

.solhint.json

@@ -2,10 +2,17 @@
   "extends": "solhint:recommended",
   "plugins": ["prettier"],
   "rules": {
+    "no-global-import": "off",
+    "no-console": "off",
     "code-complexity": ["error", 8],
     "compiler-version": ["error", ">=0.5.13"],
-    "func-visibility": ["error", { "ignoreConstructors": true }],
-    "max-line-length": ["error", 120],
+    "func-visibility": [
+      "error",
+      {
+        "ignoreConstructors": true
+      }
+    ],
+    "max-line-length": ["error", 121],
     "not-rely-on-time": "off",
     "function-max-lines": ["error", 120],
     "no-empty-blocks": "off",
@@ -15,6 +22,11 @@
         "endOfLine": "auto"
       }
     ],
-    "reason-string": ["warn", { "maxLength": 64 }]
+    "reason-string": [
+      "warn",
+      {
+        "maxLength": 64
+      }
+    ]
   }
 }

.solhint.test.json

@@ -2,12 +2,21 @@
   "extends": "solhint:recommended",
   "plugins": ["prettier"],
   "rules": {
+    "one-contract-per-file": "off",
+    "no-global-import": "off",
+    "no-console": "off",
     "code-complexity": ["error", 8],
     "compiler-version": ["error", ">=0.5.13"],
-    "func-visibility": ["error", { "ignoreConstructors": true }],
-    "max-line-length": ["error", 120],
+    "func-visibility": [
+      "error",
+      {
+        "ignoreConstructors": true
+      }
+    ],
+    "max-line-length": ["error", 121],
     "not-rely-on-time": "off",
-    "function-max-lines": ["error", 120],
+    "function-max-lines": ["error", 121],
+    "gas-custom-errors": "off",
     "max-states-count": "off",
     "var-name-mixedcase": "off",
     "func-name-mixedcase": "off",
@@ -21,6 +30,11 @@
         "endOfLine": "auto"
       }
     ],
-    "reason-string": ["warn", { "maxLength": 64 }]
+    "reason-string": [
+      "warn",
+      {
+        "maxLength": 64
+      }
+    ]
   }
 }