@iexec/web3mail 0.5.2 → 0.6.0

package/dist/web3mail/sendEmail.js

@@ -7,14 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { DEFAULT_CONTENT_TYPE, MAX_DESIRED_APP_ORDER_PRICE, MAX_DESIRED_WORKERPOOL_ORDER_PRICE, WEB3_MAIL_DAPP_ADDRESS, WORKERPOOL_ADDRESS, } from '../config/config.js';
+import { DEFAULT_CONTENT_TYPE, MAX_DESIRED_APP_ORDER_PRICE, MAX_DESIRED_DATA_ORDER_PRICE, MAX_DESIRED_WORKERPOOL_ORDER_PRICE, PROD_WORKERPOOL_ADDRESS, } from '../config/config.js';
 import { WorkflowError } from '../utils/errors.js';
 import { generateSecureUniqueId } from '../utils/generateUniqueId.js';
+import * as ipfs from '../utils/ipfs-service.js';
 import { checkProtectedDataValidity } from '../utils/subgraphQuery.js';
-import { addressOrEnsSchema, contentTypeSchema, emailContentSchema, emailSubjectSchema, senderNameSchema, throwIfMissing, } from '../utils/validators.js';
-import * as ipfs from './../utils/ipfs-service.js';
-export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), emailSubject, emailContent, contentType = DEFAULT_CONTENT_TYPE, senderName, protectedData, }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e;
+import { addressOrEnsSchema, addressSchema, contentTypeSchema, emailContentSchema, emailSubjectSchema, labelSchema, positiveNumberSchema, senderNameSchema, throwIfMissing, } from '../utils/validators.js';
+export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), workerpoolAddressOrEns = PROD_WORKERPOOL_ADDRESS, dappAddressOrENS, dappWhitelistAddress, ipfsNode, ipfsGateway, emailSubject, emailContent, contentType = DEFAULT_CONTENT_TYPE, label, dataMaxPrice = MAX_DESIRED_DATA_ORDER_PRICE, appMaxPrice = MAX_DESIRED_APP_ORDER_PRICE, workerpoolMaxPrice = MAX_DESIRED_WORKERPOOL_ORDER_PRICE, senderName, protectedData, }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const vDatasetAddress = addressOrEnsSchema()
             .required()
@@ -35,6 +34,28 @@ export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMis
         const vSenderName = senderNameSchema()
             .label('senderName')
             .validateSync(senderName);
+        const vLabel = labelSchema().label('label').validateSync(label);
+        const vWorkerpoolAddressOrEns = addressOrEnsSchema()
+            .required()
+            .label('WorkerpoolAddressOrEns')
+            .validateSync(workerpoolAddressOrEns);
+        const vDappAddressOrENS = addressOrEnsSchema()
+            .required()
+            .label('dappAddressOrENS')
+            .validateSync(dappAddressOrENS);
+        const vDappWhitelistAddress = addressSchema()
+            .required()
+            .label('dappWhitelistAddress')
+            .validateSync(dappWhitelistAddress);
+        const vDataMaxPrice = positiveNumberSchema()
+            .label('dataMaxPrice')
+            .validateSync(dataMaxPrice);
+        const vAppMaxPrice = positiveNumberSchema()
+            .label('appMaxPrice')
+            .validateSync(appMaxPrice);
+        const vWorkerpoolMaxPrice = positiveNumberSchema()
+            .label('workerpoolMaxPrice')
+            .validateSync(workerpoolMaxPrice);
         // Check protected data validity through subgraph
         const isValidProtectedData = yield checkProtectedDataValidity(graphQLClient, vDatasetAddress);
         if (!isValidProtectedData) {
@@ -47,48 +68,69 @@ export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMis
             const token = yield iexec.storage.defaultStorageLogin();
             yield iexec.storage.pushStorageToken(token);
         }
-        // Fetch dataset order
-        const datasetOrderbook = yield iexec.orderbook.fetchDatasetOrderbook(vDatasetAddress, {
-            app: WEB3_MAIL_DAPP_ADDRESS,
-            requester: requesterAddress,
-        });
-        const datasetorder = (_a = datasetOrderbook === null || datasetOrderbook === void 0 ? void 0 : datasetOrderbook.orders[0]) === null || _a === void 0 ? void 0 : _a.order;
+        const [datasetorderForApp, datasetorderForWhitelist, apporder, workerpoolorder,] = yield Promise.all([
+            // Fetch dataset order for web3mail app
+            iexec.orderbook
+                .fetchDatasetOrderbook(vDatasetAddress, {
+                app: dappAddressOrENS,
+                requester: requesterAddress,
+            })
+                .then((datasetOrderbook) => {
+                var _a;
+                const desiredPriceDataOrderbook = datasetOrderbook.orders.filter((order) => order.order.datasetprice <= vDataMaxPrice);
+                return (_a = desiredPriceDataOrderbook[0]) === null || _a === void 0 ? void 0 : _a.order; // may be undefined
+            }),
+            // Fetch dataset order for web3mail whitelist
+            iexec.orderbook
+                .fetchDatasetOrderbook(vDatasetAddress, {
+                app: vDappWhitelistAddress,
+                requester: requesterAddress,
+            })
+                .then((datasetOrderbook) => {
+                var _a;
+                const desiredPriceDataOrderbook = datasetOrderbook.orders.filter((order) => order.order.datasetprice <= vDataMaxPrice);
+                return (_a = desiredPriceDataOrderbook[0]) === null || _a === void 0 ? void 0 : _a.order; // may be undefined
+            }),
+            // Fetch app order
+            iexec.orderbook
+                .fetchAppOrderbook(dappAddressOrENS, {
+                minTag: ['tee', 'scone'],
+                maxTag: ['tee', 'scone'],
+                workerpool: workerpoolAddressOrEns,
+            })
+                .then((appOrderbook) => {
+                var _a;
+                const desiredPriceAppOrderbook = appOrderbook.orders.filter((order) => order.order.appprice <= vAppMaxPrice);
+                const desiredPriceAppOrder = (_a = desiredPriceAppOrderbook[0]) === null || _a === void 0 ? void 0 : _a.order;
+                if (!desiredPriceAppOrder) {
+                    throw new Error('No App order found for the desired price');
+                }
+                return desiredPriceAppOrder;
+            }),
+            // Fetch workerpool order
+            iexec.orderbook
+                .fetchWorkerpoolOrderbook({
+                workerpool: workerpoolAddressOrEns,
+                app: dappAddressOrENS,
+                dataset: vDatasetAddress,
+                minTag: ['tee', 'scone'],
+                maxTag: ['tee', 'scone'],
+                category: 0,
+            })
+                .then((workerpoolOrderbook) => {
+                var _a;
+                const desiredPriceWorkerpoolOrderbook = workerpoolOrderbook.orders.filter((order) => order.order.workerpoolprice <= vWorkerpoolMaxPrice);
+                const randomIndex = Math.floor(Math.random() * desiredPriceWorkerpoolOrderbook.length);
+                const desiredPriceWorkerpoolOrder = (_a = desiredPriceWorkerpoolOrderbook[randomIndex]) === null || _a === void 0 ? void 0 : _a.order;
+                if (!desiredPriceWorkerpoolOrder) {
+                    throw new Error('No Workerpool order found for the desired price');
+                }
+                return desiredPriceWorkerpoolOrder;
+            }),
+        ]);
+        const datasetorder = datasetorderForApp || datasetorderForWhitelist;
         if (!datasetorder) {
-            throw new Error('Dataset order not found');
-        }
-        // Fetch app order
-        const appOrderbook = yield iexec.orderbook.fetchAppOrderbook(WEB3_MAIL_DAPP_ADDRESS, {
-            minTag: ['tee', 'scone'],
-            maxTag: ['tee', 'scone'],
-            workerpool: WORKERPOOL_ADDRESS,
-        });
-        const appOrder = (_b = appOrderbook === null || appOrderbook === void 0 ? void 0 : appOrderbook.orders[0]) === null || _b === void 0 ? void 0 : _b.order;
-        if (!appOrder) {
-            throw new Error('App order not found');
-        }
-        const desiredPriceAppOrderbook = appOrderbook.orders.filter((order) => order.order.appprice <= MAX_DESIRED_APP_ORDER_PRICE);
-        const desiredPriceAppOrder = (_c = desiredPriceAppOrderbook[0]) === null || _c === void 0 ? void 0 : _c.order;
-        if (!desiredPriceAppOrder) {
-            throw new Error('No App order found for the desired price');
-        }
-        // Fetch workerpool order
-        const workerpoolOrderbook = yield iexec.orderbook.fetchWorkerpoolOrderbook({
-            workerpool: WORKERPOOL_ADDRESS,
-            app: WEB3_MAIL_DAPP_ADDRESS,
-            dataset: vDatasetAddress,
-            minTag: ['tee', 'scone'],
-            maxTag: ['tee', 'scone'],
-            category: 0,
-        });
-        const workerpoolorder = (_d = workerpoolOrderbook === null || workerpoolOrderbook === void 0 ? void 0 : workerpoolOrderbook.orders[0]) === null || _d === void 0 ? void 0 : _d.order;
-        if (!workerpoolorder) {
-            throw new Error('Workerpool order not found');
-        }
-        const desiredPriceWorkerpoolOrderbook = workerpoolOrderbook.orders.filter((order) => order.order.workerpoolprice <= MAX_DESIRED_WORKERPOOL_ORDER_PRICE);
-        const randomIndex = Math.floor(Math.random() * desiredPriceWorkerpoolOrderbook.length);
-        const desiredPriceWorkerpoolOrder = (_e = desiredPriceWorkerpoolOrderbook[randomIndex]) === null || _e === void 0 ? void 0 : _e.order;
-        if (!desiredPriceWorkerpoolOrder) {
-            throw new Error('No Workerpool order found for the desired price');
+            throw new Error('No Dataset order found for the desired price');
         }
         // Push requester secrets
         const requesterSecretId = generateSecureUniqueId(16);
@@ -98,7 +140,12 @@ export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMis
             .catch((e) => {
             throw new WorkflowError('Failed to encrypt email content', e);
         });
-        const cid = yield ipfs.add(encryptedFile).catch((e) => {
+        const cid = yield ipfs
+            .add(encryptedFile, {
+            ipfsNode: ipfsNode,
+            ipfsGateway: ipfsGateway,
+        })
+            .catch((e) => {
             throw new WorkflowError('Failed to upload encrypted email content', e);
         });
         const multiaddr = `/ipfs/${cid}`;
@@ -110,26 +157,28 @@ export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMis
             emailContentEncryptionKey,
         }));
         const requestorderToSign = yield iexec.order.createRequestorder({
-            app: WEB3_MAIL_DAPP_ADDRESS,
-            category: desiredPriceWorkerpoolOrder.category,
+            app: vDappAddressOrENS,
+            category: workerpoolorder.category,
             dataset: vDatasetAddress,
-            appmaxprice: desiredPriceAppOrder.appprice,
-            workerpoolmaxprice: desiredPriceWorkerpoolOrder.workerpoolprice,
+            datasetmaxprice: datasetorder.datasetprice,
+            appmaxprice: apporder.appprice,
+            workerpoolmaxprice: workerpoolorder.workerpoolprice,
             tag: ['tee', 'scone'],
-            workerpool: WORKERPOOL_ADDRESS,
+            workerpool: vWorkerpoolAddressOrEns,
             params: {
                 iexec_developer_logger: true,
                 iexec_secrets: {
                     1: requesterSecretId,
                 },
+                iexec_args: vLabel,
             },
         });
         const requestorder = yield iexec.order.signRequestorder(requestorderToSign);
         // Match orders and compute task ID
         const { dealid } = yield iexec.order.matchOrders({
-            apporder: desiredPriceAppOrder,
+            apporder: apporder,
             datasetorder: datasetorder,
-            workerpoolorder: desiredPriceWorkerpoolOrder,
+            workerpoolorder: workerpoolorder,
             requestorder: requestorder,
         });
         const taskId = yield iexec.deal.computeTaskId(dealid, 0);

package/dist/web3mail/sendEmail.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendEmail.js","sourceRoot":"","sources":["../../src/web3mail/sendEmail.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,kCAAkC,EAClC,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,GACf,MAAM,wBAAwB,CAAC;AAOhC,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAO,EAC9B,aAAa,GAAG,cAAc,EAAE,EAChC,KAAK,GAAG,cAAc,EAAE,EACxB,YAAY,EACZ,YAAY,EACZ,WAAW,GAAG,oBAAoB,EAClC,UAAU,EACV,aAAa,GAGE,EAA8B,EAAE;;IAC/C,IAAI;QACF,MAAM,eAAe,GAAG,kBAAkB,EAAE;aACzC,QAAQ,EAAE;aACV,KAAK,CAAC,eAAe,CAAC;aACtB,YAAY,CAAC,aAAa,CAAC,CAAC;QAC/B,MAAM,aAAa,GAAG,kBAAkB,EAAE;aACvC,QAAQ,EAAE;aACV,KAAK,CAAC,cAAc,CAAC;aACrB,YAAY,CAAC,YAAY,CAAC,CAAC;QAC9B,MAAM,aAAa,GAAG,kBAAkB,EAAE;aACvC,QAAQ,EAAE;aACV,KAAK,CAAC,cAAc,CAAC;aACrB,YAAY,CAAC,YAAY,CAAC,CAAC;QAC9B,MAAM,YAAY,GAAG,iBAAiB,EAAE;aACrC,QAAQ,EAAE;aACV,KAAK,CAAC,aAAa,CAAC;aACpB,YAAY,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,WAAW,GAAG,gBAAgB,EAAE;aACnC,KAAK,CAAC,YAAY,CAAC;aACnB,YAAY,CAAC,UAAU,CAAC,CAAC;QAE5B,iDAAiD;QACjD,MAAM,oBAAoB,GAAG,MAAM,0BAA0B,CAC3D,aAAa,EACb,eAAe,CAChB,CAAC;QACF,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SAC/C;QAED,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAEzD,qDAAqD;QACrD,MAAM,wBAAwB,GAC5B,MAAM,KAAK,CAAC,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;QAChE,IAAI,CAAC,wBAAwB,EAAE;YAC7B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;YACxD,MAAM,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;SAC7C;QAED,sBAAsB;QACtB,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,qBAAqB,CAClE,eAAe,EACf;YACE,GAAG,EAAE,sBAAsB;YAC3B,SAAS,EAAE,gBAAgB;SAC5B,CACF,CAAC;QACF,MAAM,YAAY,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC;QACxD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,kBAAkB;QAClB,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAC1D,sBAAsB,EACtB;YACE,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;YACxB,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;YACxB,UAAU,EAAE,kBAAkB;SAC/B,CACF,CAAC;QACF,MAAM,QAAQ,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC;QAChD,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SACxC;QAED,MAAM,wBAAwB,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,CACzD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,IAAI,2BAA2B,CAC/D,CAAC;QACF,MAAM,oBAAoB,GAAG,MAAA,wBAAwB,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC;QAChE,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;SAC7D;QAED,yBAAyB;QACzB,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,wBAAwB,CAAC;YACzE,UAAU,EAAE,kBAAkB;YAC9B,GAAG,EAAE,sBAAsB;YAC3B,OAAO,EAAE,eAAe;YACxB,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;YACxB,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;YACxB,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC;QAC9D,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SAC/C;QAED,MAAM,+BAA+B,GAAG,mBAAmB,CAAC,MAAM,CAAC,MAAM,CACvE,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,KAAK,CAAC,eAAe,IAAI,kCAAkC,CACpE,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,MAAM,EAAE,GAAG,+BAA+B,CAAC,MAAM,CACvD,CAAC;QACF,MAAM,2BAA2B,GAC/B,MAAA,+BAA+B,CAAC,WAAW,CAAC,0CAAE,KAAK,CAAC;QACtD,IAAI,CAAC,2BAA2B,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;SACpE;QAED,yBAAyB;QACzB,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,yBAAyB,GAAG,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACxE,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,OAAO;aACtC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,yBAAyB,CAAC;aACtE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,MAAM,IAAI,aAAa,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACL,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACpD,MAAM,IAAI,aAAa,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,SAAS,GAAG,EAAE,CAAC;QAEjC,MAAM,KAAK,CAAC,OAAO,CAAC,mBAAmB,CACrC,iBAAiB,EACjB,IAAI,CAAC,SAAS,CAAC;YACb,YAAY,EAAE,aAAa;YAC3B,qBAAqB,EAAE,SAAS;YAChC,WAAW,EAAE,YAAY;YACzB,UAAU,EAAE,WAAW;YACvB,yBAAyB;SAC1B,CAAC,CACH,CAAC;QAEF,MAAM,kBAAkB,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC;YAC9D,GAAG,EAAE,sBAAsB;YAC3B,QAAQ,EAAE,2BAA2B,CAAC,QAAQ;YAC9C,OAAO,EAAE,eAAe;YACxB,WAAW,EAAE,oBAAoB,CAAC,QAAQ;YAC1C,kBAAkB,EAAE,2BAA2B,CAAC,eAAe;YAC/D,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;YACrB,UAAU,EAAE,kBAAkB;YAC9B,MAAM,EAAE;gBACN,sBAAsB,EAAE,IAAI;gBAC5B,aAAa,EAAE;oBACb,CAAC,EAAE,iBAAiB;iBACrB;aACF;SACF,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;QAE5E,mCAAmC;QACnC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC;YAC/C,QAAQ,EAAE,oBAAoB;YAC9B,YAAY,EAAE,YAAY;YAC1B,eAAe,EAAE,2BAA2B;YAC5C,YAAY,EAAE,YAAY;SAC3B,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAEzD,OAAO;YACL,MAAM;SACP,CAAC;KACH;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,aAAa,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;KACpD;AACH,CAAC,CAAA,CAAC"}
+{"version":3,"file":"sendEmail.js","sourceRoot":"","sources":["../../src/web3mail/sendEmail.ts"],"names":[],"mappings":"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"}

package/dist/web3mail/types.d.ts

@@ -1,9 +1,12 @@
 import { GraphQLClient } from 'graphql-request';
 import { EnhancedWallet, IExec } from 'iexec';
+import { IExecConfigOptions } from 'iexec/IExecConfig';
 export type Web3SignerProvider = EnhancedWallet;
 export type IExecConsumer = {
     iexec: IExec;
 };
+export type ENS = string;
+export type AddressOrENS = Address | ENS;
 export type Address = string;
 export type TimeStamp = string;
 export type Contact = {
@@ -17,16 +20,17 @@ export type SendEmailParams = {
     protectedData: Address;
     contentType?: string;
     senderName?: string;
+    label?: string;
+    workerpoolAddressOrEns?: AddressOrENS;
+    dataMaxPrice?: number;
+    appMaxPrice?: number;
+    workerpoolMaxPrice?: number;
 };
-export type FetchContactsParams = {
+export type FetchUserContactsParams = {
     /**
-     * Index of the page to fetch
+     * Address of the user
      */
-    page?: number;
-    /**
-     * Size of the page to fetch
-     */
-    pageSize?: number;
+    userAddress: Address;
 };
 export type SendEmailResponse = {
     taskId: Address;
@@ -43,3 +47,50 @@ export type GraphQLResponse = {
 export type SubgraphConsumer = {
     graphQLClient: GraphQLClient;
 };
+/**
+ * Configuration options for Web3Mail.
+ */
+export type Web3MailConfigOptions = {
+    /**
+     * The Ethereum contract address or ENS (Ethereum Name Service) for the email sender dapp.
+     * If not provided, the default web3mail address will be used.
+     */
+    dappAddressOrENS?: AddressOrENS;
+    /**
+     * The Ethereum contract address for the whitelist.
+     * If not provided, the default whitelist smart contract address will be used.
+     */
+    dappWhitelistAddress?: Address;
+    /**
+     * The subgraph URL for querying data.
+     * If not provided, the default data protector subgraph URL will be used.
+     */
+    dataProtectorSubgraph?: string;
+    /**
+     * Options specific to iExec integration.
+     * If not provided, default iexec options will be used.
+     */
+    iexecOptions?: IExecConfigOptions;
+    /**
+     * The IPFS node URL.
+     * If not provided, the default IPFS node URL will be used.
+     */
+    ipfsNode?: string;
+    /**
+     * The IPFS gateway URL.
+     * If not provided, the default IPFS gateway URL will be used.
+     */
+    ipfsGateway?: string;
+};
+export type DappAddressConsumer = {
+    dappAddressOrENS: AddressOrENS;
+};
+export type IpfsNodeConfigConsumer = {
+    ipfsNode: string;
+};
+export type IpfsGatewayConfigConsumer = {
+    ipfsGateway: string;
+};
+export type DappWhitelistAddressConsumer = {
+    dappWhitelistAddress: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec/web3mail",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
   "main": "./dist/index.js",
   "type": "module",
@@ -18,8 +18,9 @@
     "dist"
   ],
   "scripts": {
-    "build": "rm -rf dist && tsc",
-    "test": "rm -rf dist && tsc && NODE_OPTIONS=--experimental-vm-modules npx jest --coverage",
+    "build": "rm -rf dist && tsc --project tsconfig.build.json",
+    "check-types": "tsc --noEmit",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --coverage",
     "lint": "eslint .",
     "format": "prettier --write \"src/**/*.ts\"",
     "check-format": "prettier --check \"src/**/*.ts\""
@@ -37,9 +38,20 @@
     "url": "https://github.com/iExecBlockchainComputing/web3mail-sdk/issues"
   },
   "homepage": "https://github.com/iExecBlockchainComputing/web3mail-sdk#readme",
+  "dependencies": {
+    "@ethersproject/bytes": "^5.7.0",
+    "@ethersproject/random": "^5.7.0",
+    "ethers": "^6.8.1",
+    "graphql-request": "^6.1.0",
+    "iexec": "^8.5.0",
+    "kubo-rpc-client": "^3.0.1",
+    "yup": "^1.1.1"
+  },
   "devDependencies": {
-    "@iexec/dataprotector": "^0.2.0",
+    "@iexec/dataprotector": "^0.4.1",
     "@jest/globals": "^29.7.0",
+    "@swc/core": "^1.3.96",
+    "@swc/jest": "^0.2.29",
     "@types/jest": "^29.5.4",
     "@typescript-eslint/eslint-plugin": "^6.7.5",
     "@typescript-eslint/parser": "^6.7.5",
@@ -49,20 +61,9 @@
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jest": "^27.4.2",
     "eslint-plugin-sonarjs": "^0.21.0",
-    "jest": "^29.5.0",
+    "jest": "^29.7.0",
     "prettier": "^2.8.4",
-    "ts-jest": "^29.1.0",
-    "ts-loader": "^9.4.2",
     "typescript": "^4.9.5",
     "whitelist-smart-contract": "github:iExecBlockchainComputing/whitelist-smart-contract#0.2.0"
-  },
-  "dependencies": {
-    "@ethersproject/bytes": "^5.7.0",
-    "@ethersproject/random": "^5.7.0",
-    "ethers": "^5.7.2",
-    "graphql-request": "^6.1.0",
-    "iexec": "^8.4.0",
-    "kubo-rpc-client": "^3.0.1",
-    "yup": "^1.1.1"
   }
 }

package/src/config/config.ts

@@ -1,7 +1,8 @@
 export const WEB3_MAIL_DAPP_ADDRESS = 'web3mail.apps.iexec.eth';
-export const WORKERPOOL_ADDRESS = 'prod-v8-bellecour.main.pools.iexec.eth';
+export const PROD_WORKERPOOL_ADDRESS = 'prod-v8-bellecour.main.pools.iexec.eth';
 export const DATAPROTECTOR_SUBGRAPH_ENDPOINT =
   'https://thegraph-product.iex.ec/subgraphs/name/bellecour/dataprotector';
+export const MAX_DESIRED_DATA_ORDER_PRICE = 0;
 export const MAX_DESIRED_APP_ORDER_PRICE = 0;
 export const MAX_DESIRED_WORKERPOOL_ORDER_PRICE = 0;
 export const DEFAULT_CONTENT_TYPE = 'text/plain';
@@ -9,3 +10,4 @@ export const IPFS_UPLOAD_URL = '/dns4/ipfs-upload.v8-bellecour.iex.ec/https';
 export const DEFAULT_IPFS_GATEWAY = 'https://ipfs-gateway.v8-bellecour.iex.ec';
 export const WHITELIST_SMART_CONTRACT_ADDRESS =
   '0x781482C39CcE25546583EaC4957Fb7Bf04C277D2';
+export const ANY_DATASET_ADDRESS = 'any';

package/src/utils/errors.ts

@@ -1,5 +1,3 @@
-import { ValidationError } from 'yup';
-
 class WorkflowError extends Error {
   originalError: Error;
 
@@ -9,4 +7,5 @@ class WorkflowError extends Error {
     this.originalError = originalError;
   }
 }
-export { WorkflowError, ValidationError };
+
+export { WorkflowError };

package/src/utils/ipfs-service.ts

@@ -1,7 +1,17 @@
 import { create } from 'kubo-rpc-client';
-import { DEFAULT_IPFS_GATEWAY, IPFS_UPLOAD_URL } from './../config/config.js';
+import { IPFS_UPLOAD_URL, DEFAULT_IPFS_GATEWAY } from '../config/config.js';
 
-const get = async (cid, { ipfsGateway = DEFAULT_IPFS_GATEWAY } = {}) => {
+interface GetOptions {
+  ipfsGateway?: string;
+}
+interface AddOptions extends GetOptions {
+  ipfsNode?: string;
+}
+
+const get = async (
+  cid,
+  { ipfsGateway = DEFAULT_IPFS_GATEWAY }: GetOptions = {}
+) => {
   const multiaddr = `/ipfs/${cid.toString()}`;
   const publicUrl = `${ipfsGateway}${multiaddr}`;
   const res = await fetch(publicUrl);
@@ -12,8 +22,14 @@ const get = async (cid, { ipfsGateway = DEFAULT_IPFS_GATEWAY } = {}) => {
   return new Uint8Array(arrayBuffer);
 };
 
-const add = async (content, { ipfsGateway = DEFAULT_IPFS_GATEWAY } = {}) => {
-  const ipfsClient = create(IPFS_UPLOAD_URL);
+const add = async (
+  content,
+  {
+    ipfsNode = IPFS_UPLOAD_URL,
+    ipfsGateway = DEFAULT_IPFS_GATEWAY,
+  }: AddOptions = {}
+) => {
+  const ipfsClient = create(ipfsNode);
   const { cid } = await ipfsClient.add(content);
   await get(cid.toString(), { ipfsGateway });
   return cid.toString();

package/src/utils/subgraphQuery.ts

@@ -34,7 +34,7 @@ export const getValidContact = async (
     const contactsAddresses = contacts.map((contact) => contact.address);
 
     // Pagination
-    let protectedDataList: ProtectedDataQuery[] = [];
+    const protectedDataList: ProtectedDataQuery[] = [];
     let start = 0;
     const range = 1000;
     let continuePagination = true;
@@ -63,7 +63,7 @@ export const getValidContact = async (
     );
 
     // Convert protectedData[] into Contact[] using the map for constant time lookups
-    const validContacts = protectedDataList.map(({ id }) => {
+    return protectedDataList.map(({ id }) => {
       const contact = contactsMap.get(id);
       if (contact) {
         return {
@@ -73,8 +73,6 @@ export const getValidContact = async (
         };
       }
     });
-
-    return validContacts;
   } catch (error) {
     throw new WorkflowError(
       `Failed to fetch subgraph: ${error.message}`,

package/src/utils/validators.ts

@@ -1,15 +1,14 @@
-import { utils } from 'ethers';
-import { ValidationError, string } from 'yup';
-
-const { isAddress } = utils;
+import { isAddress } from 'ethers';
+import { ValidationError, number, string } from 'yup';
 
 export const throwIfMissing = (): never => {
   throw new ValidationError('Missing parameter');
 };
 
-const isUndefined = (value: any) => value === undefined;
+const isUndefined = (value: unknown) => value === undefined;
 const isAddressTest = (value: string) => isAddress(value);
-const isEnsTest = (value: string) => value.endsWith('.eth') && value.length > 6;
+export const isEnsTest = (value: string) =>
+  value.endsWith('.eth') && value.length > 6;
 
 export const addressOrEnsSchema = () =>
   string()
@@ -20,6 +19,15 @@ export const addressOrEnsSchema = () =>
       (value) => isUndefined(value) || isAddressTest(value) || isEnsTest(value)
     );
 
+export const addressSchema = () =>
+  string()
+    .transform((value: string) => value?.toLowerCase() || value)
+    .test(
+      'is-address',
+      '${path} should be an ethereum address',
+      (value) => isUndefined(value) || isAddressTest(value)
+    );
+
 // 78 char length for email subject (rfc2822)
 export const emailSubjectSchema = () => string().max(78).strict();
 
@@ -34,3 +42,9 @@ export const contentTypeSchema = () =>
 
 // Minimum of 3 characters and max of 20 to avoid sender being flagged as spam
 export const senderNameSchema = () => string().trim().min(3).max(20).optional();
+
+// Used to identify the email campaign, minimum of 3 characters and max of 10
+export const labelSchema = () => string().trim().min(3).max(10).optional();
+
+export const positiveNumberSchema = () =>
+  number().integer().min(0).typeError('${path} must be a non-negative number');

package/src/web3mail/IExecWeb3mail.ts

@@ -1,49 +1,91 @@
-import { providers } from 'ethers';
+import { Eip1193Provider } from 'ethers';
 import { IExec } from 'iexec';
-import { IExecConfigOptions } from 'iexec/IExecConfig';
+import { fetchUserContacts } from './fetchUserContacts.js';
 import { fetchMyContacts } from './fetchMyContacts.js';
 import { sendEmail } from './sendEmail.js';
 import {
   Contact,
-  FetchContactsParams,
+  FetchUserContactsParams,
   SendEmailParams,
-  SendEmailResponse,
   Web3SignerProvider,
+  AddressOrENS,
+  Web3MailConfigOptions,
 } from './types.js';
 import { GraphQLClient } from 'graphql-request';
-import { DATAPROTECTOR_SUBGRAPH_ENDPOINT } from '../config/config.js';
+import {
+  WEB3_MAIL_DAPP_ADDRESS,
+  IPFS_UPLOAD_URL,
+  DEFAULT_IPFS_GATEWAY,
+  DATAPROTECTOR_SUBGRAPH_ENDPOINT,
+  WHITELIST_SMART_CONTRACT_ADDRESS,
+} from '../config/config.js';
 
 export class IExecWeb3mail {
-  fetchMyContacts: (args?: FetchContactsParams) => Promise<Contact[]>;
-  sendEmail: (args: SendEmailParams) => Promise<SendEmailResponse>;
+  private iexec: IExec;
+
+  private ipfsNode: string;
+
+  private ipfsGateway: string;
+
+  private dataProtectorSubgraph: string;
+
+  private dappAddressOrENS: AddressOrENS;
+
+  private dappWhitelistAddress: AddressOrENS;
+
+  private graphQLClient: GraphQLClient;
 
   constructor(
-    ethProvider: providers.ExternalProvider | Web3SignerProvider,
-    options?: {
-      iexecOptions?: IExecConfigOptions;
-    }
+    ethProvider: Eip1193Provider | Web3SignerProvider,
+    options?: Web3MailConfigOptions
   ) {
-    let iexec: IExec;
-    let graphQLClient: GraphQLClient;
     try {
-      iexec = new IExec({ ethProvider }, options?.iexecOptions);
+      this.iexec = new IExec({ ethProvider }, options?.iexecOptions);
     } catch (e) {
       throw Error('Unsupported ethProvider');
     }
 
     try {
-      graphQLClient = new GraphQLClient(DATAPROTECTOR_SUBGRAPH_ENDPOINT);
+      this.dataProtectorSubgraph =
+        options?.dataProtectorSubgraph || DATAPROTECTOR_SUBGRAPH_ENDPOINT;
+      this.graphQLClient = new GraphQLClient(this.dataProtectorSubgraph);
     } catch (e) {
       throw Error('Impossible to create GraphQLClient');
     }
 
-    this.fetchMyContacts = (args?: FetchContactsParams) =>
-      fetchMyContacts({ ...args, iexec, graphQLClient });
-    this.sendEmail = (args: SendEmailParams) =>
-      sendEmail({
-        ...args,
-        iexec,
-        graphQLClient,
-      });
+    this.dappAddressOrENS = options?.dappAddressOrENS || WEB3_MAIL_DAPP_ADDRESS;
+    this.ipfsNode = options?.ipfsNode || IPFS_UPLOAD_URL;
+    this.ipfsGateway = options?.ipfsGateway || DEFAULT_IPFS_GATEWAY;
+    this.dappWhitelistAddress =
+      options?.dappWhitelistAddress || WHITELIST_SMART_CONTRACT_ADDRESS;
+  }
+
+  fetchMyContacts = () =>
+    fetchMyContacts({
+      iexec: this.iexec,
+      graphQLClient: this.graphQLClient,
+      dappAddressOrENS: this.dappAddressOrENS,
+      dappWhitelistAddress: this.dappWhitelistAddress,
+    });
+
+  fetchUserContacts(args?: FetchUserContactsParams): Promise<Contact[]> {
+    return fetchUserContacts({
+      ...args,
+      iexec: this.iexec,
+      graphQLClient: this.graphQLClient,
+      dappAddressOrENS: this.dappAddressOrENS,
+      dappWhitelistAddress: this.dappWhitelistAddress,
+    });
   }
+
+  sendEmail = (args: SendEmailParams) =>
+    sendEmail({
+      ...args,
+      iexec: this.iexec,
+      ipfsNode: this.ipfsNode,
+      ipfsGateway: this.ipfsGateway,
+      dappAddressOrENS: this.dappAddressOrENS,
+      dappWhitelistAddress: this.dappWhitelistAddress,
+      graphQLClient: this.graphQLClient,
+    });
 }