add VoucherAddress to processProtectedData

Author: SeddikBellamine

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

@@ -25,6 +25,7 @@ import {
 import { isERC734 } from '../../utils/whitelist.js';
 import { getResultFromCompletedTask } from './getResultFromCompletedTask.js';
 import {
+  MatchOptions,
   OnStatusUpdateFn,
   ProcessProtectedDataParams,
   ProcessProtectedDataResponse,
@@ -49,6 +50,7 @@ export const processProtectedData = async ({
   secrets,
   workerpool,
   useVoucher = false,
+  voucherAddress,
   onStatusUpdate = () => {},
 }: IExecConsumer &
   ProcessProtectedDataParams): Promise<ProcessProtectedDataResponse> => {
@@ -79,7 +81,9 @@ export const processProtectedData = async ({
   const vUseVoucher = booleanSchema()
     .label('useVoucher')
     .validateSync(useVoucher);
-
+  const vVoucherAddress = addressOrEnsSchema()
+    .label('voucherAddress')
+    .validateSync(voucherAddress);
   try {
     const vOnStatusUpdate =
       validateOnStatusUpdateCallback<
@@ -216,12 +220,16 @@ export const processProtectedData = async ({
       },
     });
     const requestorder = await iexec.order.signRequestorder(requestorderToSign);
+    const matchOptions: MatchOptions = {
+      useVoucher: vUseVoucher,
+      ...(vVoucherAddress ? { voucherAddress: vVoucherAddress } : {}),
+    };
     const { dealid, txHash } = await iexec.order.matchOrders(
       {
         requestorder,
         ...underMaxPriceOrders,
       },
-      { useVoucher: vUseVoucher }
+      matchOptions
     );
     const taskId = await iexec.deal.computeTaskId(dealid, 0);
 

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

@@ -117,3 +117,8 @@ export interface SearchableDataSchema
     | SearchableSchemaEntryType
     | SearchableSchemaEntryType[]
   > {}
+
+export type MatchOptions = {
+  useVoucher: boolean;
+  voucherAddress?: string;
+};

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

@@ -339,6 +339,11 @@ export type ProcessProtectedDataParams = {
    */
   useVoucher?: boolean;
 
+  /**
+   * 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;
+
   /**
    * Callback function that will get called at each step of the process
    */