Merge branch 'develop' into renovate/configure

Author: abbesBenayache

.github/workflows/dapp-publish.yml

@@ -0,0 +1,22 @@
+name: Publish Docker Image
+
+on:
+  push:
+    tags:
+      - 'protected-data-delivery-dapp-v*'
+
+jobs:
+  build-test:
+    uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/docker-build.yml@fix/docker/types
+    with:
+      image-name: 'docker-regis.iex.ec/product/protected-data-delivery-dapp'
+      image-tag: ${{ github.ref }} # Use the tag of the commit
+      push: true
+      dockerfile: 'packages/protected-data-delivery-dapp/Dockerfile'
+      security-scan: false
+      hadolint: false
+      registry: 'docker-regis.iex.ec'
+      context: 'packages/protected-data-delivery-dapp'
+    secrets:
+      username: ${{ secrets.REGIS_USERNAME }}
+      password: ${{ secrets.REGIS_PASSWORD }}

.github/workflows/dapp-test.yml

@@ -0,0 +1,18 @@
+name: Test Docker Image
+
+on:
+  pull_request:
+    branches:
+      - '*' # Trigger on any pull request
+    paths:
+      - 'packages/protected-data-delivery-dapp/**' # Trigger only when changes are made to the dapp
+
+jobs:
+  build-test:
+    uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/docker-build.yml@fix/docker/types
+    with:
+      image-name: 'protected-data-delivery-dapp'
+      image-tag: ${{ github.sha }}
+      push: false
+      dockerfile: 'packages/protected-data-delivery-dapp/Dockerfile'
+      context: 'packages/protected-data-delivery-dapp'

.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/protected-data-delivery-dapp/.drone.yml

@@ -2,8 +2,8 @@ FROM node:14-alpine3.11 as builder
 
 WORKDIR /app
 COPY . .
-RUN npm ci
-RUN npm run build
+RUN npm ci && \
+    npm run build
 
 FROM node:14-alpine3.11 as runner
 

packages/protected-data-delivery-dapp/Dockerfile

@@ -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));
     }