Merge branch 'main' into sdk-arbitrum-mainnet

Author: abbesBenayache

.drone-consider

@@ -3,6 +3,5 @@ packages/sdk/.drone.yml
 packages/dataprotector-deserializer/.drone.yml
 packages/sharing-smart-contract/.drone.yml
 packages/smart-contract/.drone.yml
-packages/subgraph/.drone.yml
 packages/protected-data-delivery-dapp/.drone.yml
 packages/protected-data-delivery-dapp/deployment/.drone.yml

.github/workflows/core-smart-contract-deploy.yml

@@ -79,7 +79,7 @@ jobs:
           RPC_URL: ${{ secrets.RPC_URL }}
           DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
           DATASET_REGISTRY_ADDRESS: ${{ vars.DATASET_REGISTRY_ADDRESS }}
-          HARDHAT_IGNITION_CONFIRM_DEPLOYMENT: ${{ vars.HARDHAT_IGNITION_CONFIRM_DEPLOYMENT }}
+          HARDHAT_IGNITION_CONFIRM_DEPLOYMENT: false
         run: |
           if [ "${{ inputs.network }}" = "hardhat" ]; then
             npm run deploy -- --network ${{ inputs.network }}
@@ -93,6 +93,16 @@ jobs:
             npm run deploy -- --network ${{ inputs.network }} --deployment-id "$DEPLOYMENT_ID"
           fi
 
+      - name: Save deployment artifacts
+        if: inputs.network != 'hardhat'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'chore: save deployment artifacts for ${{ inputs.network }} ${{ inputs.environment }} (${{ github.run_id }})'
+          file_pattern: 'packages/smart-contract/ignition/deployments/*'
+          commit_user_name: 'GitHub Actions Bot'
+          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_author: 'GitHub Actions Bot <github-actions[bot]@users.noreply.github.com>'
+      
       - name: Verify contract
         if: inputs.network != 'hardhat'
         continue-on-error: true
@@ -109,13 +119,3 @@ jobs:
             DEPLOYMENT_ID="${{ inputs.network }}"
           fi
           npm run verify -- "$DEPLOYMENT_ID"
-
-      - name: Save deployment artifacts
-        if: inputs.network != 'hardhat'
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: 'chore: save deployment artifacts for ${{ inputs.network }} ${{ inputs.environment }} (${{ github.run_id }})'
-          file_pattern: 'packages/smart-contract/ignition/deployments/*'
-          commit_user_name: 'GitHub Actions Bot'
-          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
-          commit_author: 'GitHub Actions Bot <github-actions[bot]@users.noreply.github.com>'

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

@@ -84,7 +84,7 @@ jobs:
           # For Deployment
           RPC_URL: ${{ secrets.RPC_URL }}
           DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
-          ADMIN_PRIVATE_KEY: ${{ secrets.ADMIN_PRIVATE_KEY }}
+          ADMIN_PRIVATE_KEY: ${{ secrets.DATAPROTECTOR_OWNER_PRIVATEKEY }} # Fix secret name
           POCO_ADDRESS: ${{ vars.POCO_ADDRESS }}
           DATASET_REGISTRY_ADDRESS: ${{ vars.DATASET_REGISTRY_ADDRESS }}
         run: |
@@ -101,6 +101,16 @@ jobs:
             DEPLOYMENT_ID="$DEPLOYMENT_ID" \
               npm run deploy -- --network ${{ inputs.network }}
           fi
+          
+      - name: Save deployment artifacts
+        if: inputs.network != 'hardhat'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'chore: save deployment artifacts for ${{ inputs.network }} ${{ inputs.environment }} (${{ github.run_id }})'
+          file_pattern: 'packages/sharing-smart-contract/ignition/deployments/* packages/sharing-smart-contract/.openzeppelin/*'
+          commit_user_name: 'GitHub Actions Bot'
+          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_author: 'GitHub Actions Bot <github-actions[bot]@users.noreply.github.com>'
 
       - name: Verify contracts
         if: inputs.network != 'hardhat'
@@ -119,13 +129,3 @@ jobs:
           fi
           npm run verify -- "$DEPLOYMENT_ID"
 
-      - name: Save deployment artifacts
-        if: inputs.network != 'hardhat'
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: 'chore: save deployment artifacts for ${{ inputs.network }} ${{ inputs.environment }} (${{ github.run_id }})'
-          file_pattern: 'packages/sharing-smart-contract/ignition/deployments/* packages/sharing-smart-contract/.openzeppelin/*'
-          commit_user_name: 'GitHub Actions Bot'
-          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
-          commit_author: 'GitHub Actions Bot <github-actions[bot]@users.noreply.github.com>'
-

.github/workflows/subgraph-ci.yml

@@ -1,4 +1,4 @@
-name: Core Smart Contract - Default
+name: Subgraph - Default
 
 on:
   pull_request:

.release-please-manifest.json

@@ -1,3 +1,6 @@
 {
-  "packages/sdk": "2.0.0-beta.18"
+  "packages/sdk": "2.0.0-beta.18",
+  "packages/subgraph": "3.1.0-beta",
+  "packages/smart-contract": "0.2.0-beta",
+  "packages/sharing-smart-contract": "3.0.0-beta"
 }