Merge branch 'develop' into ci/deapp

Author: abbesBenayache

.drone.yml

@@ -1,51 +1,3 @@
-kind: pipeline
-type: docker
-name: root checks
-
-trigger:
-  event:
-    - pull_request
-
-steps:
-  - name: cat-drone-consider
-    image: node:18.19
-    commands:
-      - cat .drone-consider
-
-  - name: check-sdk-abi
-    image: node:18.19
-    commands:
-      - cd packages/sdk
-      - npm run refresh-abis
-      - |
-        if [ -n "$(git diff --name-only)" ]; then
-          echo "ABIs not up-to-date in packages/sdk, need to run 'npm run refresh-abis'"
-          exit 1
-        fi
-
-  - name: check-subgraph-abi
-    image: node:18.19
-    commands:
-      - cd packages/subgraph
-      - npm run refresh-abis
-      - |
-        if [ -n "$(git diff --name-only)" ]; then
-          echo "ABIs not up-to-date in packages/subgraph, need to run 'npm run refresh-abis'"
-          exit 1
-        fi
-
-  - name: check-dapp-abi
-    image: node:18.19
-    commands:
-      - cd packages/protected-data-delivery-dapp/deployment
-      - npm run refresh-abis
-      - |
-        if [ -n "$(git diff --name-only)" ]; then
-          echo "ABIs not up-to-date in protected-data-delivery-dapp/abis, need to run 'npm run refresh-abis'"
-          exit 1
-        fi
-
----
 # deploy DataProtector smart contract to prod, dev or staging
 kind: pipeline
 type: docker

.github/workflows/root-checks.yaml

@@ -0,0 +1,46 @@
+name: Root checks
+
+on: [pull_request]
+
+jobs:
+  changed-files:
+    name: Detect Changes
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.changed.outputs.all_changed_and_modified_files }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Detect changed files
+        id: changed
+        uses: tj-actions/changed-files@v45
+        with:
+          matrix: 'true'
+          dir_names: 'true'
+          dir_names_max_depth: 3
+          files: |
+            packages/sdk/**
+            packages/subgraph/**
+            packages/protected-data-delivery-dapp/deployment/**
+
+  build-and-test:
+    name: Build & Test Modified Packages
+    needs: [changed-files]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        package: ${{ fromJSON(needs.changed-files.outputs.matrix) }}
+      max-parallel: 4
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Install dependencies and run tests for ${{ matrix.package }}
+        working-directory: ${{ matrix.package }}
+        run: |
+          npm run refresh-abis

.github/workflows/sharing-smart-contract-test.yml

@@ -0,0 +1,105 @@
+name: CI Sharing Smart Contract
+
+on:
+  pull_request:
+    branches:
+      - '*'
+    paths:
+      - 'packages/sharing-smart-contract/**'
+
+concurrency:
+  group: ${{ github.ref }}-sharing-smart-contract-tests
+  cancel-in-progress: true
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Install Dependencies
+        working-directory: packages/sharing-smart-contract
+        run: |
+          node -v
+          npm -v
+          npm ci
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: stable
+          cache: true
+
+      - name: Compile
+        working-directory: packages/sharing-smart-contract
+        run: npm run compile
+
+      - name: Check Format
+        working-directory: packages/sharing-smart-contract
+        run: npm run check-format
+
+      - name: Lint
+        working-directory: packages/sharing-smart-contract
+        run: npm run lint
+
+      - name: UML Diagrams
+        working-directory: packages/sharing-smart-contract
+        run: npm run uml
+
+      - name: Static Analyzer
+        uses: crytic/[email protected]
+        id: slither
+        with:
+          sarif: result.sarif
+          fail-on: none
+          target: 'packages/sharing-smart-contract/'
+
+      - name: Start Anvil
+        run: |
+          anvil --host 0.0.0.0 --port 8545 --hardfork berlin --fork-url https://bellecour.iex.ec --chain-id 134 --gas-limit 6700000 --gas-price 0 &
+
+      - name: Wait for Anvil to start
+        run: |
+          timeout=30
+          interval=1
+          echo "Waiting for Anvil to start..."
+          for ((i=0; i<timeout; i++)); do
+            if nc -z localhost 8545; then
+               echo "Anvil is operational."
+               exit 0
+            fi
+            echo "Attempt $((i+1)) of $timeout: Anvil is not ready, waiting ${interval}s..."
+            sleep $interval
+          done
+          echo "Error: Anvil did not start within the timeout period."
+          exit 1
+
+      - name: Hardhat Tests
+        working-directory: packages/sharing-smart-contract
+        run: npm run test -- --network ci-bellecour-fork
+
+      - name: Upgrade Test
+        working-directory: packages/sharing-smart-contract
+        run: npm run upgrade-local-fork -- --network local-bellecour-fork
+
+      - name: Set Directory Permissions
+        working-directory: packages/sharing-smart-contract
+        run: sudo chmod -R 777 .
+
+      - name: Forge Tests
+        working-directory: packages/sharing-smart-contract
+        run: forge test --no-match-test "invariant" -vvvv
+
+      - name: Upload SARIF file
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: ${{ steps.slither.outputs.sarif }}

packages/sharing-smart-contract/.drone.yml

@@ -20,11 +20,11 @@ contract SupportsInterface is Test {
         );
     }
 
-    function testSupports721Interface() external view {
+    function testSupports721Interface() external {
         assertTrue(_dataProtectorSharing.supportsInterface(type(IAccessControl).interfaceId));
     }
 
-    function testSupportsAccessControlInterface() external view {
+    function testSupportsAccessControlInterface() external {
         assertTrue(_dataProtectorSharing.supportsInterface(type(IERC721).interfaceId));
         assertTrue(_dataProtectorSharing.supportsInterface(type(IERC721Metadata).interfaceId));
     }