Merge branch 'develop' into ci/deserializer/npm

Author: SeddikBellamine

.dockerignore

@@ -6,5 +6,4 @@
 !/packages/subgraph/
 /packages/subgraph/generated/
 /packages/subgraph/build/
-/packages/subgraph/subgraph.yaml
-/packages/subgraph/.drone.yml
+/packages/subgraph/.drone.yml

.drone.yml

@@ -46,135 +46,7 @@ steps:
         fi
 
 ---
-# deploy DataProtector smart contract to prod, dev or staging
-kind: pipeline
-type: docker
-name: smart-contract deploy
-
-trigger:
-  event:
-    - promote
-  target:
-    # deploy and verify the DataProtector contract with the dev deployer
-    - smart-contract-deploy-dev
-    # deploy and verify the DataProtector contract with the dev deployer and commit the staging environment update
-    - smart-contract-deploy-staging
-    # deploy and verify the DataProtector contract with the prod deployer and commit the prod environment update
-    - smart-contract-deploy-prod
-  branch:
-    - develop
-    - main
-
-steps:
-  - name: install deps
-    image: node:18.19
-    pull: always
-    commands:
-      - cd packages/smart-contract
-      - node -v
-      - npm -v
-      - npm ci
-
-  - name: check format
-    image: node:18.19
-    commands:
-      - cd packages/smart-contract
-      - npm run check-format
-
-  - name: check lint
-    image: node:18.19
-    commands:
-      - cd packages/smart-contract
-      - npm run lint
-
-  - name: compile smart contracts
-    image: node:18.19
-    commands:
-      - cd packages/smart-contract
-      - npm run compile
-
-  - name: test smart contracts
-    image: node:18.19
-    commands:
-      - cd packages/smart-contract
-      - npm run test
-
-  - name: smart-contract dev/staging deployment
-    image: node:18.19
-    environment:
-      WALLET_PRIVATE_KEY:
-        from_secret: deployer-dev-privatekey
-    commands:
-      - cd packages/smart-contract
-      - npm run deploy -- --network bellecour
-    when:
-      target:
-        - smart-contract-deploy-staging
-        - smart-contract-deploy-dev
-      branch:
-        - develop
-
-  - name: smart-contract prod deployment
-    image: node:18.19
-    environment:
-      WALLET_PRIVATE_KEY:
-        from_secret: deployer-prod-privatekey
-    commands:
-      - cd packages/smart-contract
-      - npm run deploy -- --network bellecour
-    when:
-      target:
-        - smart-contract-deploy-prod
-      branch:
-        - main
 
-  - name: update prod env
-    image: node:18.19
-    environment:
-      ENV: prod
-    commands:
-      - cd environments
-      - KEY=dataprotectorContractAddress VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/address) npm run update-env
-      - KEY=dataprotectorStartBlock VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/block) npm run update-env
-      - git add environments.json
-      - git commit -m "$DRONE_DEPLOY_TO deployment $DRONE_BUILD_NUMBER $DRONE_COMMIT" --author="drone-product <[email protected]>"
-    when:
-      target:
-        - smart-contract-deploy-prod
-
-  - name: update staging env
-    image: node:18.19
-    environment:
-      ENV: staging
-    commands:
-      - cd environments
-      - KEY=dataprotectorContractAddress VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/address) npm run update-env
-      - KEY=dataprotectorStartBlock VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/block) npm run update-env
-      - git add environments.json
-      - git commit -m "$DRONE_DEPLOY_TO deployment $DRONE_BUILD_NUMBER $DRONE_COMMIT" --author="drone-product <[email protected]>"
-    when:
-      target:
-        - smart-contract-deploy-staging
-
-  - name: git-push
-    image: appleboy/drone-git-push
-    settings:
-      remote: ssh://[email protected]/iExecBlockchainComputing/dataprotector-sdk.git
-      branch: update-env-${DRONE_BUILD_NUMBER}
-      ssh_key:
-        from_secret: ssh-key-team-product-github-push
-    when:
-      target:
-        - smart-contract-deploy-prod
-        - smart-contract-deploy-staging
-
-  - name: verify contract
-    image: node:18.19
-    commands:
-      - cd packages/smart-contract
-      - npm run verify -- --network bellecour $(cat deployments/DataProtector/address) $(cat deployments/DataProtector/args)
-
----
 # deploy sharing smart contract to prod, staging or dev
 kind: pipeline
 type: docker
@@ -659,105 +531,6 @@ steps:
       password:
         from_secret: dockerhub-password
 
----
-kind: pipeline
-type: docker
-name: subgraph deploy
-
-trigger:
-  event:
-    - promote
-  target:
-    # deploy the dataprotector subgraph for the staging environment
-    - subgraph-deploy-staging
-    # deploy the dataprotector subgraph
-    - subgraph-deploy-tmp
-    # deploy the dataprotector subgraph for the prod environment
-    - subgraph-deploy-prod
-  branch:
-    - develop
-    - main
-
-steps:
-  - name: install deps
-    image: node:18.19
-    pull: always
-    commands:
-      - cd packages/subgraph
-      - npm ci
-
-  - name: deploy-v2-staging
-    image: node:18.19
-    params:
-      - START_BLOCK
-    environment:
-      GRAPHNODE_URL:
-        from_secret: graphnode-url-staging
-      IPFS_URL:
-        from_secret: ipfs-url-staging
-      ENV: staging
-    commands:
-      - cd packages/subgraph
-      - export SUBGRAPH_NAME=bellecour/staging-dataprotector-v2
-      - echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
-      - npm run codegen
-      - npm run build
-      - npx graph create --node $GRAPHNODE_URL $SUBGRAPH_NAME
-      - npx graph deploy --node $GRAPHNODE_URL $SUBGRAPH_NAME --ipfs $IPFS_URL --version-label $(npm pkg get version)
-    when:
-      target:
-        - subgraph-deploy-staging
-      branch:
-        - develop
-
-  - name: deploy-v2-tmp
-    image: node:18.19
-    params:
-      - START_BLOCK
-    environment:
-      GRAPHNODE_URL:
-        from_secret: graphnode-url
-      IPFS_URL:
-        from_secret: ipfs-url
-      ENV: prod
-    commands:
-      - cd packages/subgraph
-      - export SUBGRAPH_NAME=bellecour/tmp-dataprotector-v2
-      - echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
-      - npm run codegen
-      - npm run build
-      - npx graph create --node $GRAPHNODE_URL $SUBGRAPH_NAME
-      - npx graph deploy --node $GRAPHNODE_URL $SUBGRAPH_NAME --ipfs $IPFS_URL --version-label $DRONE_COMMIT
-    when:
-      target:
-        - subgraph-deploy-tmp
-      branch:
-        - main
-
-  - name: deploy-v2-prod
-    image: node:18.19
-    params:
-      - START_BLOCK
-    environment:
-      GRAPHNODE_URL:
-        from_secret: graphnode-url
-      IPFS_URL:
-        from_secret: ipfs-url
-      ENV: prod
-    commands:
-      - cd packages/subgraph
-      - export SUBGRAPH_NAME=bellecour/dataprotector-v2
-      - echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
-      - npm run codegen
-      - npm run build
-      - npx graph create --node $GRAPHNODE_URL $SUBGRAPH_NAME
-      - npx graph deploy --node $GRAPHNODE_URL $SUBGRAPH_NAME --ipfs $IPFS_URL --version-label $(npm pkg get version)
-    when:
-      target:
-        - subgraph-deploy-prod
-      branch:
-        - main
-
 ---
 #pipeline to deploy app whitelist on iexec
 kind: pipeline
@@ -1215,6 +988,8 @@ trigger:
   event:
     - promote
   target:
+    # publish the package @iexec/dataprotector on npm with the tag nightly
+    - sdk-publish-nightly
     # publish the package @iexec/dataprotector on npm with the tag beta (require sdk version to be [version]-beta.[b])
     - sdk-publish-beta
     # publish the package @iexec/dataprotector on npm with the tag latest
@@ -1251,6 +1026,34 @@ steps:
         - main
       target:
         - sdk-publish-beta
+  
+  - name: set-version-nightly
+    image: node:18.19
+    commands:
+      - cd packages/sdk
+      - eval npm pkg set version="$(npm pkg get version)-nightly-$DRONE_COMMIT"
+    when:
+      target:
+        - sdk-publish-nightly
+    depends_on:
+      - install
+  
+  - name: npm publish nightly
+    image: plugins/npm
+    settings:
+      username:
+        from_secret: npm_username
+      token:
+        from_secret: npm_token
+      tag: nightly
+      access: public
+      folder: packages/sdk
+    depends_on:
+      - build
+      - set-version-nightly
+    when:
+      target:
+        - sdk-publish-nightly
 
   - name: npm-publish-beta
     image: plugins/npm

.github/workflows/conventional-commits.yml

@@ -0,0 +1,12 @@
+name: Conventional Commits
+
+on: [pull_request]
+
+jobs:
+  build:
+    name: Conventional Commits
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: webiny/[email protected]

.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'