Merge remote-tracking branch 'origin/main' into develop

Author: Le-Caignec

.drone.yml

@@ -1215,6 +1215,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 +1253,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

packages/sdk/CHANGELOG.md

@@ -2,12 +2,26 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.0.0-beta.15] (2025-04-04)
+
+### Changed
+
+- Rename `voucherAddress` to `voucherOwner`
+- Fix internal bug
+
+## [2.0.0-beta.14] (2025-04-01)
+
+### Added
+
+- support for iExec voucher in `processProtectedData()` via `useVoucher` option
+- added `voucherAddress` option for using a non-owned voucher contract in `processProtectedData()`
+
 ## [2.0.0-beta.13] (2025-03-13)
 
 ### Changed
 
 - Upgraded the iexec dependency to ^8.13.1, which includes:
-  - Migrated default SMS URL to https://sms.iex.ec.
+  - Migrated default SMS URL to <https://sms.iex.ec>.
   - Migrated from the deprecated SMS apps secrets endpoint.
 
 ## [2.0.0-beta.12] (2025-02-04)

packages/sdk/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec/dataprotector",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
   "type": "module",
   "types": "dist/src/index.d.ts",

packages/sdk/package.json

@@ -33,7 +33,7 @@ import {
   ProcessProtectedDataResponse,
   ProcessProtectedDataStatuses,
 } from '../types/index.js';
-import { IExecConsumer } from '../types/internalTypes.js';
+import { IExecConsumer, VoucherInfo } from '../types/internalTypes.js';
 import { getResultFromCompletedTask } from './getResultFromCompletedTask.js';
 import { getWhitelistContract } from './smartContract/getWhitelistContract.js';
 import { isAddressInWhitelist } from './smartContract/whitelistContract.read.js';
@@ -52,7 +52,7 @@ export const processProtectedData = async ({
   secrets,
   workerpool,
   useVoucher = false,
-  voucherAddress,
+  voucherOwner,
   onStatusUpdate = () => {},
 }: IExecConsumer &
   ProcessProtectedDataParams): Promise<ProcessProtectedDataResponse> => {
@@ -83,9 +83,9 @@ export const processProtectedData = async ({
   const vUseVoucher = booleanSchema()
     .label('useVoucher')
     .validateSync(useVoucher);
-  const vVoucherAddress = addressOrEnsSchema()
-    .label('voucherAddress')
-    .validateSync(voucherAddress);
+  const vVoucherOwner = addressOrEnsSchema()
+    .label('voucherOwner')
+    .validateSync(voucherOwner);
   try {
     const vOnStatusUpdate =
       validateOnStatusUpdateCallback<
@@ -118,10 +118,12 @@ export const processProtectedData = async ({
         requester = vUserWhitelist;
       }
     }
-    let userVoucher;
+    let userVoucher: VoucherInfo | undefined;
     if (vUseVoucher) {
       try {
-        userVoucher = await iexec.voucher.showUserVoucher(requester);
+        userVoucher = await iexec.voucher.showUserVoucher(
+          vVoucherOwner || requester
+        );
         checkUserVoucher({ userVoucher });
       } catch (err) {
         if (err?.message?.startsWith('No Voucher found for address')) {
@@ -182,8 +184,11 @@ export const processProtectedData = async ({
       workerpool: vWorkerpool === ethers.ZeroAddress ? 'any' : vWorkerpool, // if address zero was chosen use any workerpool
       app: vApp,
       dataset: vProtectedData,
-      requester: requester, // public orders + user specific orders
-      isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
+      requester: requester,
+      isRequesterStrict:
+        vVoucherOwner && vVoucherOwner.toLowerCase() !== requester.toLowerCase()
+          ? false
+          : useVoucher,
       minTag: SCONE_TAG,
       maxTag: SCONE_TAG,
       category: 0,
@@ -240,7 +245,7 @@ export const processProtectedData = async ({
     };
     const matchOptions: MatchOptions = {
       useVoucher: vUseVoucher,
-      ...(vVoucherAddress ? { voucherAddress: vVoucherAddress } : {}),
+      ...(vVoucherOwner ? { voucherAddress: userVoucher?.address } : {}),
     };
 
     const estimatedMatchOrderPrice = await iexec.order.estimateMatchOrders(

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

@@ -342,7 +342,7 @@ export type ProcessProtectedDataParams = {
   /**
    * Override the voucher contract to use, must be combined with useVoucher: true the user must be authorized by the voucher's owner to use it.
    */
-  voucherAddress?: AddressOrENS;
+  voucherOwner?: AddressOrENS;
 
   /**
    * Callback function that will get called at each step of the process

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

@@ -1,5 +1,5 @@
 import { GraphQLClient } from 'graphql-request';
-import { IExec } from 'iexec';
+import { Address, BN, IExec } from 'iexec';
 import { AddressOrENS } from './commonTypes.js';
 
 export type IExecConsumer = {
@@ -20,3 +20,16 @@ export type DataProtectorContractConsumer = {
 export type SubgraphConsumer = {
   graphQLClient: GraphQLClient;
 };
+
+export type VoucherInfo = {
+  owner: Address;
+  address: Address;
+  type: BN;
+  balance: BN;
+  expirationTimestamp: BN;
+  sponsoredApps: Address[];
+  sponsoredDatasets: Address[];
+  sponsoredWorkerpools: Address[];
+  allowanceAmount: BN;
+  authorizedAccounts: Address[];
+};

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

@@ -1,18 +1,6 @@
-import { Address, BN } from 'iexec';
+import { BN } from 'iexec';
 import { PublishedWorkerpoolorder } from 'iexec/IExecOrderbookModule';
-
-type VoucherInfo = {
-  owner: Address;
-  address: Address;
-  type: BN;
-  balance: BN;
-  expirationTimestamp: BN;
-  sponsoredApps: Address[];
-  sponsoredDatasets: Address[];
-  sponsoredWorkerpools: Address[];
-  allowanceAmount: BN;
-  authorizedAccounts: Address[];
-};
+import { VoucherInfo } from '../lib/types/internalTypes.js';
 
 function bnToNumber(bn: BN) {
   return Number(bn.toString());