iExecBlockchainComputing
diff --git a/‎package-lock.json‎
Lines changed: 283 additions & 64 deletions b/‎package-lock.json‎
Lines changed: 283 additions & 64 deletions
diff --git a/‎package.json‎
Lines changed: 4 additions & 5 deletions b/‎package.json‎
Lines changed: 4 additions & 5 deletions
diff --git a/‎src/utils/subgraphQuery.ts‎
Lines changed: 17 additions & 14 deletions b/‎src/utils/subgraphQuery.ts‎
Lines changed: 17 additions & 14 deletions
diff --git a/‎src/utils/validators.ts‎
Lines changed: 68 additions & 1 deletion b/‎src/utils/validators.ts‎
Lines changed: 68 additions & 1 deletion
diff --git a/‎src/web3mail/IExecWeb3mail.ts‎
Lines changed: 53 additions & 0 deletions b/‎src/web3mail/IExecWeb3mail.ts‎
Lines changed: 53 additions & 0 deletions
diff --git a/‎src/web3mail/fetchMyContacts.ts‎
Lines changed: 3 additions & 0 deletions b/‎src/web3mail/fetchMyContacts.ts‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/web3mail/fetchUserContacts.ts‎
Lines changed: 28 additions & 11 deletions b/‎src/web3mail/fetchUserContacts.ts‎
Lines changed: 28 additions & 11 deletions
diff --git a/‎src/web3mail/internalTypes.ts‎
Lines changed: 5 additions & 0 deletions b/‎src/web3mail/internalTypes.ts‎
Lines changed: 5 additions & 0 deletions
@@ -20,8 +20,7 @@
   "scripts": {
     "build": "rm -rf dist && tsc --project tsconfig.build.json",
     "check-types": "tsc --noEmit",
-    "test:prepare": "node tests/scripts/prepare-bellecour-fork-for-tests.js",
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest --testMatch \"**/tests/**/*.test.ts\" --forceExit -b",
+    "test:prepare": "node tests/scripts/prepare-bellecour-fork-for-tests.js && node tests/scripts/prepare-iexec.js",
     "test:coverage": "NODE_OPTIONS=--experimental-vm-modules jest --testMatch \"**/tests/**/*.test.ts\" --forceExit --coverage",
     "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --testMatch \"**/tests/unit/**/*.test.ts\" -b",
     "test:unit:coverage": "NODE_OPTIONS=--experimental-vm-modules jest --testMatch \"**/tests/unit/**/*.unit.ts\" --coverage",
@@ -31,7 +30,7 @@
     "format": "prettier --write \"(src|tests)/**/*.ts\"",
     "check-format": "prettier --check \"(src|tests)/**/*.ts\"",
     "stop-test-stack": "cd tests && docker compose down --volumes --remove-orphans",
-    "start-test-stack": "cd tests && npm run stop-test-stack && node scripts/prepare-test-env.js && docker compose build  &&  docker compose up -d && node scripts/prepare-bellecour-fork-for-tests.js"
+    "start-test-stack": "cd tests && npm run stop-test-stack && node scripts/prepare-test-env.js && docker compose build  &&  docker compose up -d && npm run test:prepare"
   },
   "repository": {
     "type": "git",
@@ -49,15 +48,15 @@
   "dependencies": {
     "@ethersproject/bytes": "^5.7.0",
     "@ethersproject/random": "^5.7.0",
+    "@iexec/dataprotector": "^2.0.0-beta.21",
     "buffer": "^6.0.3",
     "ethers": "^6.13.2",
     "graphql-request": "^6.1.0",
-    "iexec": "^8.20.0",
+    "iexec": "^8.22.0",
     "kubo-rpc-client": "^4.1.1",
     "yup": "^1.1.1"
   },
   "devDependencies": {
-    "@iexec/dataprotector": "^2.0.0-beta.19",
     "@jest/globals": "^29.7.0",
     "@swc/core": "^1.3.96",
     "@swc/jest": "^0.2.29",
 
@@ -71,20 +71,23 @@ export const getValidContact = async (
     );
 
     // Convert protectedData[] into Contact[] using the map for constant time lookups
-    return protectedDataList.map(({ id, name }) => {
-      const contact = contactsMap.get(id);
-      if (contact) {
-        return {
-          address: id,
-          name: name,
-          remainingAccess: contact.remainingAccess,
-          accessPrice: contact.accessPrice,
-          owner: contact.owner,
-          accessGrantTimestamp: contact.accessGrantTimestamp,
-          isUserStrict: contact.isUserStrict,
-        };
-      }
-    });
+    return protectedDataList
+      .map(({ id, name }) => {
+        const contact = contactsMap.get(id);
+        if (contact) {
+          return {
+            address: id,
+            name: name,
+            remainingAccess: contact.remainingAccess,
+            accessPrice: contact.accessPrice,
+            owner: contact.owner,
+            accessGrantTimestamp: contact.accessGrantTimestamp,
+            isUserStrict: contact.isUserStrict,
+            grantedAccess: contact.grantedAccess,
+          };
+        }
+      })
+      .filter((contact) => !!contact);
   } catch (error) {
     throw new WorkflowError({
       message: 'Failed to fetch subgraph',
 
@@ -1,6 +1,7 @@
 import { isAddress } from 'ethers';
 import { IExec } from 'iexec';
-import { ValidationError, boolean, number, string } from 'yup';
+import { NULL_ADDRESS } from 'iexec/utils';
+import { ValidationError, boolean, number, object, string } from 'yup';
 
 export const isValidProvider = async (iexec: IExec) => {
   const client = await iexec.config.resolveContractsClient();
@@ -61,3 +62,69 @@ export const positiveNumberSchema = () =>
 
 export const booleanSchema = () =>
   boolean().strict().typeError('${path} should be a boolean');
+
+const isPositiveIntegerStringTest = (value: string) => /^\d+$/.test(value);
+
+const stringSchema = () =>
+  string().strict().typeError('${path} should be a string');
+
+const positiveIntegerStringSchema = () =>
+  string().test(
+    'is-positive-int',
+    '${path} should be a positive integer',
+    (value) => isUndefined(value) || isPositiveIntegerStringTest(value)
+  );
+
+const positiveStrictIntegerStringSchema = () =>
+  string().test(
+    'is-positive-strict-int',
+    '${path} should be a strictly positive integer',
+    (value) =>
+      isUndefined(value) ||
+      (value !== '0' && isPositiveIntegerStringTest(value))
+  );
+
+export const campaignRequestSchema = () =>
+  object({
+    app: addressSchema().required(),
+    appmaxprice: positiveIntegerStringSchema().required(),
+    workerpool: addressSchema().required(),
+    workerpoolmaxprice: positiveIntegerStringSchema().required(),
+    dataset: addressSchema().oneOf([NULL_ADDRESS]).required(),
+    datasetmaxprice: positiveIntegerStringSchema().oneOf(['0']).required(),
+    params: stringSchema()
+      .test(
+        'is-valid-bulk-params',
+        '${path} should be a valid JSON string with bulk_cid field',
+        (value) => {
+          try {
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            const { bulk_cid } = JSON.parse(value);
+            if (typeof bulk_cid === 'string') {
+              return true;
+            }
+          } catch {}
+          return false;
+        }
+      )
+      .required(),
+    requester: addressSchema().required(),
+    beneficiary: addressSchema().required(),
+    callback: addressSchema().required(),
+    category: positiveIntegerStringSchema().required(),
+    volume: positiveStrictIntegerStringSchema().required(),
+    tag: stringSchema().required(),
+    trust: positiveIntegerStringSchema().required(),
+    salt: stringSchema().required(),
+    sign: stringSchema().required(),
+  })
+    .strict()
+    .typeError('${path} should be a BulkRequest object')
+    .test('is-defined', '${path} is required', (value) => {
+      // Check if value is undefined, null, or an empty object (which would be coerced from undefined)
+      return (
+        value !== undefined &&
+        value !== null &&
+        !(typeof value === 'object' && Object.keys(value).length === 0)
+      );
+    });
@@ -1,9 +1,12 @@
 import { AbstractProvider, AbstractSigner, Eip1193Provider } from 'ethers';
 import { IExec } from 'iexec';
+import { IExecDataProtectorCore } from '@iexec/dataprotector';
 import { GraphQLClient } from 'graphql-request';
 import { fetchUserContacts } from './fetchUserContacts.js';
 import { fetchMyContacts } from './fetchMyContacts.js';
 import { sendEmail } from './sendEmail.js';
+import { prepareEmailCampaign } from './prepareEmailCampaign.js';
+import { sendEmailCampaign } from './sendEmailCampaign.js';
 import {
   Contact,
   FetchUserContactsParams,
@@ -13,6 +16,10 @@ import {
   SendEmailResponse,
   Web3SignerProvider,
   FetchMyContactsParams,
+  PrepareEmailCampaignParams,
+  PrepareEmailCampaignResponse,
+  SendEmailCampaignParams,
+  SendEmailCampaignResponse,
 } from './types.js';
 import { isValidProvider } from '../utils/validators.js';
 import { getChainIdFromProvider } from '../utils/getChainId.js';
@@ -34,6 +41,7 @@ interface Web3mailResolvedConfig {
   ipfsGateway: string;
   defaultWorkerpool: string;
   iexec: IExec;
+  dataProtector: IExecDataProtectorCore;
 }
 
 export class IExecWeb3mail {
@@ -51,6 +59,8 @@ export class IExecWeb3mail {
 
   private iexec!: IExec;
 
+  private dataProtector!: IExecDataProtectorCore;
+
   private initPromise: Promise<void> | null = null;
 
   private ethProvider: EthersCompatibleProvider;
@@ -75,6 +85,7 @@ export class IExecWeb3mail {
         this.ipfsGateway = config.ipfsGateway;
         this.defaultWorkerpool = config.defaultWorkerpool;
         this.iexec = config.iexec;
+        this.dataProtector = config.dataProtector;
       });
     }
     return this.initPromise;
@@ -121,6 +132,36 @@ export class IExecWeb3mail {
     });
   }
 
+  async prepareEmailCampaign(
+    args: PrepareEmailCampaignParams
+  ): Promise<PrepareEmailCampaignResponse> {
+    await this.init();
+    await isValidProvider(this.iexec);
+    return prepareEmailCampaign({
+      ...args,
+      workerpoolAddressOrEns:
+        args.workerpoolAddressOrEns || this.defaultWorkerpool,
+      iexec: this.iexec,
+      dataProtector: this.dataProtector,
+      ipfsNode: this.ipfsNode,
+      ipfsGateway: this.ipfsGateway,
+      dappAddressOrENS: this.dappAddressOrENS,
+    });
+  }
+
+  async sendEmailCampaign(
+    args: SendEmailCampaignParams
+  ): Promise<SendEmailCampaignResponse> {
+    await this.init();
+    await isValidProvider(this.iexec);
+    return sendEmailCampaign({
+      ...args,
+      workerpoolAddressOrEns:
+        args.workerpoolAddressOrEns || this.defaultWorkerpool,
+      dataProtector: this.dataProtector,
+    });
+  }
+
   private async resolveConfig(): Promise<Web3mailResolvedConfig> {
     const chainId = await getChainIdFromProvider(this.ethProvider);
     const chainDefaultConfig = getChainDefaultConfig(chainId, {
@@ -184,6 +225,17 @@ export class IExecWeb3mail {
       throw new Error(`Failed to create GraphQLClient: ${error.message}`);
     }
 
+    const dataProtector = new IExecDataProtectorCore(this.ethProvider, {
+      iexecOptions: {
+        ipfsGatewayURL: ipfsGateway,
+        ...this.options?.iexecOptions,
+        allowExperimentalNetworks: this.options.allowExperimentalNetworks,
+      },
+      ipfsGateway,
+      ipfsNode,
+      subgraphUrl,
+    });
+
     return {
       dappAddressOrENS,
       dappWhitelistAddress: dappWhitelistAddress.toLowerCase(),
@@ -192,6 +244,7 @@ export class IExecWeb3mail {
       ipfsNode,
       ipfsGateway,
       iexec,
+      dataProtector,
     };
   }
 }
@@ -16,6 +16,7 @@ export const fetchMyContacts = async ({
   dappAddressOrENS = throwIfMissing(),
   dappWhitelistAddress = throwIfMissing(),
   isUserStrict = false,
+  bulkOnly = false,
 }: IExecConsumer &
   SubgraphConsumer &
   DappAddressConsumer &
@@ -24,6 +25,7 @@ export const fetchMyContacts = async ({
   const vIsUserStrict = booleanSchema()
     .label('isUserStrict')
     .validateSync(isUserStrict);
+  const vBulkOnly = booleanSchema().label('bulkOnly').validateSync(bulkOnly);
 
   const userAddress = await iexec.wallet.getAddress();
   return fetchUserContacts({
@@ -33,5 +35,6 @@ export const fetchMyContacts = async ({
     dappWhitelistAddress,
     userAddress,
     isUserStrict: vIsUserStrict,
+    bulkOnly: vBulkOnly,
   });
 };
@@ -27,6 +27,7 @@ export const fetchUserContacts = async ({
   dappWhitelistAddress = throwIfMissing(),
   userAddress,
   isUserStrict = false,
+  bulkOnly = false,
 }: IExecConsumer &
   SubgraphConsumer &
   DappAddressConsumer &
@@ -47,6 +48,7 @@ export const fetchUserContacts = async ({
   const vIsUserStrict = booleanSchema()
     .label('isUserStrict')
     .validateSync(isUserStrict);
+  const vBulkOnly = booleanSchema().label('bulkOnly').validateSync(bulkOnly);
 
   try {
     const [dappOrders, whitelistOrders] = await Promise.all([
@@ -55,12 +57,14 @@ export const fetchUserContacts = async ({
         userAddress: vUserAddress,
         appAddress: vDappAddressOrENS,
         isUserStrict: vIsUserStrict,
+        bulkOnly: vBulkOnly,
       }),
       fetchAllOrdersByApp({
         iexec,
         userAddress: vUserAddress,
         appAddress: vDappWhitelistAddress,
         isUserStrict: vIsUserStrict,
+        bulkOnly: vBulkOnly,
       }),
     ]);
 
@@ -84,6 +88,18 @@ export const fetchUserContacts = async ({
           accessPrice: order.order.datasetprice,
           accessGrantTimestamp: order.publicationTimestamp,
           isUserStrict: order.order.requesterrestrict !== ZeroAddress,
+          grantedAccess: {
+            dataset: order.order.dataset,
+            datasetprice: order.order.datasetprice.toString(),
+            volume: order.order.volume.toString(),
+            tag: order.order.tag.toString(),
+            apprestrict: order.order.apprestrict,
+            workerpoolrestrict: order.order.workerpoolrestrict,
+            requesterrestrict: order.order.requesterrestrict,
+            salt: order.order.salt,
+            sign: order.order.sign,
+            remainingAccess: order.remaining,
+          },
         };
         myContacts.push(contact);
       }
@@ -107,23 +123,24 @@ async function fetchAllOrdersByApp({
   userAddress,
   appAddress,
   isUserStrict,
+  bulkOnly,
 }: {
   iexec: IExec;
   userAddress: string;
   appAddress: string;
   isUserStrict: boolean;
+  bulkOnly: boolean;
 }): Promise<PublishedDatasetorder[]> {
-  const ordersFirstPage = iexec.orderbook.fetchDatasetOrderbook(
-    ANY_DATASET_ADDRESS,
-    {
-      app: appAddress,
-      requester: userAddress,
-      isAppStrict: true,
-      isRequesterStrict: isUserStrict,
-      // Use maxPageSize here to avoid too many round-trips (we want everything anyway)
-      pageSize: 1000,
-    }
-  );
+  const ordersFirstPage = iexec.orderbook.fetchDatasetOrderbook({
+    dataset: ANY_DATASET_ADDRESS,
+    app: appAddress,
+    requester: userAddress,
+    isAppStrict: true,
+    isRequesterStrict: isUserStrict,
+    bulkOnly,
+    // Use maxPageSize here to avoid too many round-trips (we want everything anyway)
+    pageSize: 1000,
+  });
   const { orders: allOrders } = await autoPaginateRequest({
     request: ordersFirstPage,
   });
 
@@ -1,4 +1,5 @@
 import { IExec } from 'iexec';
+import { IExecDataProtectorCore } from '@iexec/dataprotector';
 import { AddressOrENS } from './types.js';
 import { GraphQLClient } from 'graphql-request';
 
@@ -34,3 +35,7 @@ export type IExecConsumer = {
 export type SubgraphConsumer = {
   graphQLClient: GraphQLClient;
 };
+
+export type DataProtectorConsumer = {
+  dataProtector: IExecDataProtectorCore;
+};