Merge branch 'develop' into feature/add-optional-path-param-in-processProtectedData

Author: ErwanDecoster

.drone.yml

@@ -668,43 +668,49 @@ trigger:
   event:
     - promote
   target:
-    # deploy the dataprotector subgraph
-    - subgraph-deploy-dev
     # 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: deploy-v2-dev
+  - 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
+        from_secret: graphnode-url-staging
       IPFS_URL:
-        from_secret: ipfs-url
-      ENV: prod
+        from_secret: ipfs-url-staging
+      ENV: staging
     commands:
       - cd packages/subgraph
-      - export SUBGRAPH_NAME=bellecour/dev-dataprotector-v2
+      - export SUBGRAPH_NAME=bellecour/staging-dataprotector-v2
       - echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
-      - npm ci
       - 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
+      - npx graph deploy --node $GRAPHNODE_URL $SUBGRAPH_NAME --ipfs $IPFS_URL --version-label $(npm pkg get version)
     when:
       target:
-        - subgraph-deploy-dev
+        - subgraph-deploy-staging
       branch:
         - develop
 
-  - name: deploy-v2-prod
+  - name: deploy-v2-tmp
     image: node:18.19
     params:
       - START_BLOCK
@@ -716,20 +722,19 @@ steps:
       ENV: prod
     commands:
       - cd packages/subgraph
-      - export SUBGRAPH_NAME=bellecour/dataprotector-v2
+      - export SUBGRAPH_NAME=bellecour/tmp-dataprotector-v2
       - echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
-      - npm ci
       - 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)
+      - npx graph deploy --node $GRAPHNODE_URL $SUBGRAPH_NAME --ipfs $IPFS_URL --version-label $DRONE_COMMIT
     when:
       target:
-        - subgraph-deploy-prod
+        - subgraph-deploy-tmp
       branch:
         - main
 
-  - name: deploy-v2-staging
+  - name: deploy-v2-prod
     image: node:18.19
     params:
       - START_BLOCK
@@ -738,21 +743,20 @@ steps:
         from_secret: graphnode-url
       IPFS_URL:
         from_secret: ipfs-url
-      ENV: staging
+      ENV: prod
     commands:
       - cd packages/subgraph
-      - export SUBGRAPH_NAME=bellecour/staging-dataprotector-v2
+      - export SUBGRAPH_NAME=bellecour/dataprotector-v2
       - echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
-      - npm ci
       - 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
+        - subgraph-deploy-prod
       branch:
-        - develop
+        - main
 
 ---
 #pipeline to deploy app whitelist on iexec
@@ -937,7 +941,7 @@ steps:
         from_secret: nexus-password
       tags:
         - dev
-        - 'dev-${DRONE_COMMIT}'
+        - "dev-${DRONE_COMMIT}"
     when:
       branch:
         - develop

packages/sdk/CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - Add optional `path` param in `processProtectedData`
+- Moved `getResultFromCompletedTask` method from DataProtectorSharing module (DPS) to DataProtectorCore module (DPC).
 
 ## [2.0.0-beta.11] (2025-01-29)
 

packages/sdk/src/lib/dataProtectorCore/IExecDataProtectorCore.ts

@@ -10,6 +10,8 @@ import {
   ProcessProtectedDataResponse,
   ProtectDataParams,
   ProtectedData,
+  GetResultFromCompletedTaskParams,
+  GetResultFromCompletedTaskResponse,
   ProtectedDataWithSecretProps,
   RevokeAllAccessParams,
   RevokedAccess,
@@ -18,6 +20,7 @@ import {
 } from '../types/index.js';
 import { getGrantedAccess } from './getGrantedAccess.js';
 import { getProtectedData } from './getProtectedData.js';
+import { getResultFromCompletedTask } from './getResultFromCompletedTask.js';
 import { grantAccess } from './grantAccess.js';
 import { processProtectedData } from './processProtectedData.js';
 import { protectData } from './protectData.js';
@@ -84,6 +87,16 @@ class IExecDataProtectorCore extends IExecDataProtectorModule {
   ): Promise<GrantedAccessResponse> {
     return getGrantedAccess({ ...args, iexec: this.iexec });
   }
+
+  async getResultFromCompletedTask(
+    args: GetResultFromCompletedTaskParams
+  ): Promise<GetResultFromCompletedTaskResponse> {
+    await isValidProvider(this.iexec);
+    return getResultFromCompletedTask({
+      ...args,
+      iexec: this.iexec,
+    });
+  }
 }
 
 export { IExecDataProtectorCore };

…torSharing/getResultFromCompletedTask.ts …tectorCore/getResultFromCompletedTask.tspackages/sdk/src/lib/dataProtectorSharing/getResultFromCompletedTask.ts renamed to packages/sdk/src/lib/dataProtectorCore/getResultFromCompletedTask.ts packages/sdk/src/lib/dataProtectorSharing/getResultFromCompletedTask.ts renamed to packages/sdk/src/lib/dataProtectorCore/getResultFromCompletedTask.ts

@@ -22,7 +22,7 @@ import {
   validateOnStatusUpdateCallback,
 } from '../../utils/validators.js';
 import { isERC734 } from '../../utils/whitelist.js';
-import { getResultFromCompletedTask } from '../dataProtectorSharing/getResultFromCompletedTask.js';
+import { getResultFromCompletedTask } from './getResultFromCompletedTask.js';
 import {
   OnStatusUpdateFn,
   ProcessProtectedDataParams,

packages/sdk/src/lib/dataProtectorCore/processProtectedData.ts

@@ -20,8 +20,6 @@ import {
   GetProtectedDataPricingParamsResponse,
   GetRentalsParams,
   GetRentalsResponse,
-  GetResultFromCompletedTaskParams,
-  GetResultFromCompletedTaskResponse,
   GetUserAppWhitelistParams,
   GetUserAppWhitelistResponse,
   RemoveCollectionParams,
@@ -50,7 +48,6 @@ import { getCollectionSubscriptions } from './getCollectionSubscriptions.js';
 import { getProtectedDataInCollections } from './getProtectedDataInCollections.js';
 import { getProtectedDataPricingParams } from './getProtectedDataPricingParams.js';
 import { getRentals } from './getRentals.js';
-import { getResultFromCompletedTask } from './getResultFromCompletedTask.js';
 import { getUserAddOnlyAppWhitelist } from './getUserAddOnlyAppWhitelist.js';
 import { removeCollection } from './removeCollection.js';
 import { removeProtectedDataForSale } from './removeProtectedDataForSale.js';
@@ -254,16 +251,6 @@ class IExecDataProtectorSharing extends IExecDataProtectorModule {
     });
   }
 
-  async getResultFromCompletedTask(
-    args: GetResultFromCompletedTaskParams
-  ): Promise<GetResultFromCompletedTaskResponse> {
-    await isValidProvider(this.iexec);
-    return getResultFromCompletedTask({
-      ...args,
-      iexec: this.iexec,
-    });
-  }
-
   // -------------------- Apps whitelist --------------------
 
   async createAddOnlyAppWhitelist(): Promise<CreateAppWhitelistResponse> {

packages/sdk/src/lib/dataProtectorSharing/IExecDataProtectorSharing.ts

@@ -27,7 +27,7 @@ import {
   SharingContractConsumer,
 } from '../types/index.js';
 import { IExecConsumer } from '../types/internalTypes.js';
-import { getResultFromCompletedTask } from './getResultFromCompletedTask.js';
+import { getResultFromCompletedTask } from '../dataProtectorCore/getResultFromCompletedTask.js';
 import { getAppWhitelistContract } from './smartContract/getAddOnlyAppWhitelistContract.js';
 import { getSharingContract } from './smartContract/getSharingContract.js';
 import {

packages/sdk/src/lib/dataProtectorSharing/consumeProtectedData.ts

@@ -209,6 +209,23 @@ export type GrantedAccessResponse = {
   grantedAccess: GrantedAccess[];
 };
 
+// ---------------------GetResultFromCompletedTask Types------------------------------------
+
+export type GetResultFromCompletedTaskStatuses =
+  | 'CONSUME_RESULT_DOWNLOAD'
+  | 'CONSUME_RESULT_DECRYPT';
+
+export type GetResultFromCompletedTaskParams = {
+  taskId: string;
+  path?: string;
+  pemPrivateKey?: string;
+  onStatusUpdate?: OnStatusUpdateFn<GetResultFromCompletedTaskStatuses>;
+};
+
+export type GetResultFromCompletedTaskResponse = {
+  result: ArrayBuffer;
+};
+
 // ---------------------RevokeAccess Types------------------------------------
 export type RevokeAllAccessStatuses =
   | 'RETRIEVE_ALL_GRANTED_ACCESS'

packages/sdk/src/lib/types/coreTypes.ts

@@ -120,21 +120,6 @@ export type ConsumeProtectedDataResponse = {
   pemPrivateKey: string;
 };
 
-export type GetResultFromCompletedTaskStatuses =
-  | 'CONSUME_RESULT_DOWNLOAD'
-  | 'CONSUME_RESULT_DECRYPT';
-
-export type GetResultFromCompletedTaskParams = {
-  taskId: string;
-  path?: string;
-  pemPrivateKey?: string;
-  onStatusUpdate?: OnStatusUpdateFn<GetResultFromCompletedTaskStatuses>;
-};
-
-export type GetResultFromCompletedTaskResponse = {
-  result: ArrayBuffer;
-};
-
 // ---------------------Collection Types------------------------------------
 
 export type Collection = {

packages/sdk/src/lib/types/sharingTypes.ts

@@ -82,7 +82,7 @@ describe.skip('dataProtectorCore.processProtectedData()', () => {
 
       const mockArrayBuffer = new ArrayBuffer(8);
       jest.unstable_mockModule(
-        '../../../src/lib/dataProtectorSharing/getResultFromCompletedTask.js',
+        '../../../src/lib/dataProtectorCore/getResultFromCompletedTask.js',
         () => {
           return {
             getResultFromCompletedTask: jest