Merge branch 'main' into feat/mutation-testing

Author: prat-gpt

.github/workflows/eth-integration.yml .github/workflows/base-oracle-integration.yml

@@ -1,13 +1,13 @@
-name: Foundry eth integration tests
+name: Foundry base chainlink oracle integration tests
 
 on: [pull_request]
 
 env:
-  ETH_RPC_URL: ${{secrets.ETH_RPC_URL}}
+  BASE_RPC_URL: ${{secrets.BASE_RPC_URL}}
 
 jobs:
   run-eth-mainnet-tests:
-    name: eth-mainnet-integration-tests
+    name: base-oracle-integration-tests
     runs-on: ubuntu-latest
 
     steps:
@@ -20,4 +20,4 @@ jobs:
         uses: ./.github/actions
 
       - name: Integration Test Contracts
-        run: time forge test --match-contract IntegrationTest --fork-url $ETH_RPC_URL
+        run: time forge test --match-contract ChainlinkCompositeOracleIntegrationTestBase --fork-url $BASE_RPC_URL

.github/workflows/invariant.yml

@@ -17,4 +17,4 @@ jobs:
         uses: ./.github/actions
 
       - name: Invariant Test Contracts
-        run: time forge test -vvv --match-contract InvariantTest
+        run: time forge test -vvv --match-contract xWELLOwnerHandler

.github/workflows/lint.yml

@@ -0,0 +1,37 @@
+name: Linter
+
+on: [pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Check out the repo"
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: "Install Node.js"
+        uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+
+      - name: "Install the Node.js dependencies"
+        run: npm install
+
+      - name: Run linter and check for errors
+        id: lint
+        run: |
+          LINT_OUTCOME=$(npm run lint 2>&1 || true) # Prevent the step from failing immediately
+          echo "$LINT_OUTCOME"
+          echo "LINT_OUTCOME<<EOF" >> $GITHUB_ENV
+          echo "$LINT_OUTCOME" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+          if echo "$LINT_OUTCOME" | grep -q " error "; then
+            echo "## Lint result" >> $GITHUB_STEP_SUMMARY
+            echo "❌ Failed due to errors" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          else
+            echo "## Lint result" >> $GITHUB_STEP_SUMMARY
+            echo "✅ Passed or warnings found" >> $GITHUB_STEP_SUMMARY
+          fi

.husky/.pre-commit.sh

@@ -5,15 +5,15 @@ STAGED_SOL_FILES=$(mktemp)
 # Temporary file to hold list of all staged files for prettier
 STAGED_FILES=$(mktemp)
 
-# List staged .sol files
-git diff --cached --name-only -- '*.sol' > "$STAGED_SOL_FILES"
-# List all staged files
-git diff --cached --name-only > "$STAGED_FILES"
+# List staged .sol files ignoring deleted and renamed files
+git diff --cached --name-status -- '*.sol' | grep -v '^(D|R[0-9]+)' | cut -f2- > "$STAGED_SOL_FILES"
+# List all staged files ignoring deleted and renamed files
+git diff --cached --name-status | grep -v '^(D|R[0-9]+)' | cut -f2- > "$STAGED_FILES"
 
 # Run Solhint on staged .sol files, if any
 if [ -s "$STAGED_SOL_FILES" ]; then
     # If there are staged .sol files, run Solhint on them
-    SOLHINT_OUTPUT=$(cat "$STAGED_SOL_FILES" | xargs npx solhint --config ./.solhintrc --ignore-path .solhintignore)
+    SOLHINT_OUTPUT=$(cat "$STAGED_SOL_FILES" | xargs npm run lint)
     SOLHINT_EXIT_CODE=$?
 
     if [ $SOLHINT_EXIT_CODE -ne 0 ]; then
@@ -30,7 +30,7 @@ fi
 # Run Prettier and check for errors on staged files
 if [ -s "$STAGED_FILES" ]; then
     # Note: Using `--write` with Prettier to automatically fix formatting
-    PRETTIER_OUTPUT=$(cat "$STAGED_FILES" | xargs npx prettier --ignore-path .prettierignore --write)
+    PRETTIER_OUTPUT=$(cat "$STAGED_FILES" | xargs npm run prettier)
     PRETTIER_EXIT_CODE=$?
 
     if [ $PRETTIER_EXIT_CODE -ne 0 ]; then

.solhintrc

@@ -9,7 +9,7 @@
     "not-rely-on-time": "off",
     "one-contract-per-file": "off",
 	"no-inline-assembly": "off",
-	"custom-errors": "off",
+	"gas-custom-errors": "off",
 	"no-empty-blocks": "off",
 	"var-name-mixedcase": "off",
 	"no-global-import": "off",
@@ -22,6 +22,7 @@
     "const-name-snakecase": "off",
     "visibility-modifier-order": "off",
     "max-states-count": "off",
-    "no-complex-fallback": "off"
+    "no-complex-fallback": "off",
+    "no-unused-import": "error"
     }
 }