@iexec/web3mail 0.5.2 → 0.6.0

package/dist/config/config.d.ts

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

package/dist/config/config.js

@@ -1,10 +1,12 @@
 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';
 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';
 //# sourceMappingURL=config.js.map

package/dist/config/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sBAAsB,GAAG,yBAAyB,CAAC;AAChE,MAAM,CAAC,MAAM,kBAAkB,GAAG,wCAAwC,CAAC;AAC3E,MAAM,CAAC,MAAM,+BAA+B,GAC1C,wEAAwE,CAAC;AAC3E,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAC7C,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AACjD,MAAM,CAAC,MAAM,eAAe,GAAG,6CAA6C,CAAC;AAC7E,MAAM,CAAC,MAAM,oBAAoB,GAAG,0CAA0C,CAAC;AAC/E,MAAM,CAAC,MAAM,gCAAgC,GAC3C,4CAA4C,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sBAAsB,GAAG,yBAAyB,CAAC;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAAG,wCAAwC,CAAC;AAChF,MAAM,CAAC,MAAM,+BAA+B,GAC1C,wEAAwE,CAAC;AAC3E,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAC7C,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AACjD,MAAM,CAAC,MAAM,eAAe,GAAG,6CAA6C,CAAC;AAC7E,MAAM,CAAC,MAAM,oBAAoB,GAAG,0CAA0C,CAAC;AAC/E,MAAM,CAAC,MAAM,gCAAgC,GAC3C,4CAA4C,CAAC;AAC/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC"}

package/dist/utils/errors.d.ts

@@ -1,6 +1,5 @@
-import { ValidationError } from 'yup';
 declare class WorkflowError extends Error {
     originalError: Error;
     constructor(message: string, originalError: Error);
 }
-export { WorkflowError, ValidationError };
+export { WorkflowError };

package/dist/utils/errors.js

@@ -1,4 +1,3 @@
-import { ValidationError } from 'yup';
 class WorkflowError extends Error {
     constructor(message, originalError) {
         super(message);
@@ -6,5 +5,5 @@ class WorkflowError extends Error {
         this.originalError = originalError;
     }
 }
-export { WorkflowError, ValidationError };
+export { WorkflowError };
 //# sourceMappingURL=errors.js.map

package/dist/utils/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAEtC,MAAM,aAAc,SAAQ,KAAK;IAG/B,YAAY,OAAe,EAAE,aAAoB;QAC/C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;CACF;AACD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"AAAA,MAAM,aAAc,SAAQ,KAAK;IAG/B,YAAY,OAAe,EAAE,aAAoB;QAC/C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;CACF;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/utils/ipfs-service.d.ts

@@ -1,7 +1,9 @@
-declare const get: (cid: any, { ipfsGateway }?: {
+interface GetOptions {
     ipfsGateway?: string;
-}) => Promise<Uint8Array>;
-declare const add: (content: any, { ipfsGateway }?: {
-    ipfsGateway?: string;
-}) => Promise<any>;
+}
+interface AddOptions extends GetOptions {
+    ipfsNode?: string;
+}
+declare const get: (cid: any, { ipfsGateway }?: GetOptions) => Promise<Uint8Array>;
+declare const add: (content: any, { ipfsNode, ipfsGateway, }?: AddOptions) => Promise<any>;
 export { add, get };

package/dist/utils/ipfs-service.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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 = (cid, { ipfsGateway = DEFAULT_IPFS_GATEWAY } = {}) => __awaiter(void 0, void 0, void 0, function* () {
     const multiaddr = `/ipfs/${cid.toString()}`;
     const publicUrl = `${ipfsGateway}${multiaddr}`;
@@ -19,8 +19,8 @@ const get = (cid, { ipfsGateway = DEFAULT_IPFS_GATEWAY } = {}) => __awaiter(void
     const arrayBuffer = yield res.arrayBuffer();
     return new Uint8Array(arrayBuffer);
 });
-const add = (content, { ipfsGateway = DEFAULT_IPFS_GATEWAY } = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const ipfsClient = create(IPFS_UPLOAD_URL);
+const add = (content, { ipfsNode = IPFS_UPLOAD_URL, ipfsGateway = DEFAULT_IPFS_GATEWAY, } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+    const ipfsClient = create(ipfsNode);
     const { cid } = yield ipfsClient.add(content);
     yield get(cid.toString(), { ipfsGateway });
     return cid.toString();

package/dist/utils/ipfs-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs-service.js","sourceRoot":"","sources":["../../src/utils/ipfs-service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE9E,MAAM,GAAG,GAAG,CAAO,GAAG,EAAE,EAAE,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,EAAE,EAAE;IACrE,MAAM,SAAS,GAAG,SAAS,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC5C,MAAM,SAAS,GAAG,GAAG,WAAW,GAAG,SAAS,EAAE,CAAC;IAC/C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACX,MAAM,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;KACzD;IACD,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAG,CAAO,OAAO,EAAE,EAAE,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,EAAE,EAAE;IACzE,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;IAC3C,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAC3C,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC,CAAA,CAAC;AAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC"}
+{"version":3,"file":"ipfs-service.js","sourceRoot":"","sources":["../../src/utils/ipfs-service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAS5E,MAAM,GAAG,GAAG,CACV,GAAG,EACH,EAAE,WAAW,GAAG,oBAAoB,KAAiB,EAAE,EACvD,EAAE;IACF,MAAM,SAAS,GAAG,SAAS,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC5C,MAAM,SAAS,GAAG,GAAG,WAAW,GAAG,SAAS,EAAE,CAAC;IAC/C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACX,MAAM,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;KACzD;IACD,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAG,CACV,OAAO,EACP,EACE,QAAQ,GAAG,eAAe,EAC1B,WAAW,GAAG,oBAAoB,MACpB,EAAE,EAClB,EAAE;IACF,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAC3C,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC,CAAA,CAAC;AAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC"}

package/dist/utils/subgraphQuery.js

@@ -36,7 +36,7 @@ export const getValidContact = (graphQLClient, contacts) => __awaiter(void 0, vo
         // Contacts addresses
         const contactsAddresses = contacts.map((contact) => contact.address);
         // Pagination
-        let protectedDataList = [];
+        const protectedDataList = [];
         let start = 0;
         const range = 1000;
         let continuePagination = true;
@@ -56,7 +56,7 @@ export const getValidContact = (graphQLClient, contacts) => __awaiter(void 0, vo
         // Convert contacts array into a map where the key is the contact's address
         const contactsMap = new Map(contacts.map((contact) => [contact.address, contact]));
         // 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 {
@@ -66,7 +66,6 @@ export const getValidContact = (graphQLClient, contacts) => __awaiter(void 0, vo
                 };
             }
         });
-        return validContacts;
     }
     catch (error) {
         throw new WorkflowError(`Failed to fetch subgraph: ${error.message}`, error);

package/dist/utils/subgraphQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"subgraphQuery.js","sourceRoot":"","sources":["../../src/utils/subgraphQuery.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAiB,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,uBAAuB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;CAqBlC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,aAA4B,EAC5B,QAAmB,EACC,EAAE;IACtB,IAAI;QACF,qBAAqB;QACrB,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAErE,aAAa;QACb,IAAI,iBAAiB,GAAyB,EAAE,CAAC;QACjD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,KAAK,GAAG,IAAI,CAAC;QACnB,IAAI,kBAAkB,GAAG,IAAI,CAAC;QAE9B,GAAG;YACD,MAAM,SAAS,GAAG;gBAChB,cAAc,EAAE,CAAC,cAAc,CAAC;gBAChC,EAAE,EAAE,iBAAiB;gBACrB,KAAK;gBACL,KAAK;aACN,CAAC;YAEF,MAAM,wBAAwB,GAC5B,MAAM,aAAa,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;YAElE,MAAM,EAAE,cAAc,EAAE,GAAG,wBAAwB,CAAC;YACpD,iBAAiB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;YAE1C,kBAAkB,GAAG,cAAc,CAAC,MAAM,KAAK,KAAK,CAAC;YACrD,KAAK,IAAI,KAAK,CAAC;SAChB,QAAQ,kBAAkB,EAAE;QAE7B,2EAA2E;QAC3E,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CACtD,CAAC;QAEF,iFAAiF;QACjF,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YACrD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpC,IAAI,OAAO,EAAE;gBACX,OAAO;oBACL,OAAO,EAAE,EAAE;oBACX,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;iBACnD,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;KACtB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,aAAa,CACrB,6BAA6B,KAAK,CAAC,OAAO,EAAE,EAC5C,KAAK,CACN,CAAC;KACH;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,aAA4B,EAC5B,aAAqB,EACH,EAAE;IACpB,IAAI;QACF,MAAM,SAAS,GAAG;YAChB,cAAc,EAAE,CAAC,cAAc,CAAC;YAChC,EAAE,EAAE,CAAC,aAAa,CAAC;YACnB,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;SACT,CAAC;QAEF,MAAM,wBAAwB,GAC5B,MAAM,aAAa,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;QAElE,MAAM,EAAE,cAAc,EAAE,GAAG,wBAAwB,CAAC;QAEpD,OAAO,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC;KACpC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,aAAa,CACrB,6BAA6B,KAAK,CAAC,OAAO,EAAE,EAC5C,KAAK,CACN,CAAC;KACH;AACH,CAAC,CAAA,CAAC"}
+{"version":3,"file":"subgraphQuery.js","sourceRoot":"","sources":["../../src/utils/subgraphQuery.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAiB,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,uBAAuB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;CAqBlC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,aAA4B,EAC5B,QAAmB,EACC,EAAE;IACtB,IAAI;QACF,qBAAqB;QACrB,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAErE,aAAa;QACb,MAAM,iBAAiB,GAAyB,EAAE,CAAC;QACnD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,KAAK,GAAG,IAAI,CAAC;QACnB,IAAI,kBAAkB,GAAG,IAAI,CAAC;QAE9B,GAAG;YACD,MAAM,SAAS,GAAG;gBAChB,cAAc,EAAE,CAAC,cAAc,CAAC;gBAChC,EAAE,EAAE,iBAAiB;gBACrB,KAAK;gBACL,KAAK;aACN,CAAC;YAEF,MAAM,wBAAwB,GAC5B,MAAM,aAAa,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;YAElE,MAAM,EAAE,cAAc,EAAE,GAAG,wBAAwB,CAAC;YACpD,iBAAiB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;YAE1C,kBAAkB,GAAG,cAAc,CAAC,MAAM,KAAK,KAAK,CAAC;YACrD,KAAK,IAAI,KAAK,CAAC;SAChB,QAAQ,kBAAkB,EAAE;QAE7B,2EAA2E;QAC3E,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CACtD,CAAC;QAEF,iFAAiF;QACjF,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YACtC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpC,IAAI,OAAO,EAAE;gBACX,OAAO;oBACL,OAAO,EAAE,EAAE;oBACX,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;iBACnD,CAAC;aACH;QACH,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,aAAa,CACrB,6BAA6B,KAAK,CAAC,OAAO,EAAE,EAC5C,KAAK,CACN,CAAC;KACH;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,aAA4B,EAC5B,aAAqB,EACH,EAAE;IACpB,IAAI;QACF,MAAM,SAAS,GAAG;YAChB,cAAc,EAAE,CAAC,cAAc,CAAC;YAChC,EAAE,EAAE,CAAC,aAAa,CAAC;YACnB,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;SACT,CAAC;QAEF,MAAM,wBAAwB,GAC5B,MAAM,aAAa,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;QAElE,MAAM,EAAE,cAAc,EAAE,GAAG,wBAAwB,CAAC;QAEpD,OAAO,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC;KACpC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,aAAa,CACrB,6BAA6B,KAAK,CAAC,OAAO,EAAE,EAC5C,KAAK,CACN,CAAC;KACH;AACH,CAAC,CAAA,CAAC"}

package/dist/utils/validators.d.ts

@@ -1,6 +1,10 @@
 export declare const throwIfMissing: () => never;
+export declare const isEnsTest: (value: string) => boolean;
 export declare const addressOrEnsSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
+export declare const addressSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
 export declare const emailSubjectSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
 export declare const emailContentSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
 export declare const contentTypeSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
 export declare const senderNameSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
+export declare const labelSchema: () => import("yup").StringSchema<string, import("yup").AnyObject, undefined, "">;
+export declare const positiveNumberSchema: () => import("yup").NumberSchema<number, import("yup").AnyObject, undefined, "">;

package/dist/utils/validators.js

@@ -1,15 +1,17 @@
-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 = () => {
     throw new ValidationError('Missing parameter');
 };
 const isUndefined = (value) => value === undefined;
 const isAddressTest = (value) => isAddress(value);
-const isEnsTest = (value) => value.endsWith('.eth') && value.length > 6;
+export const isEnsTest = (value) => value.endsWith('.eth') && value.length > 6;
 export const addressOrEnsSchema = () => string()
     .transform((value) => (value === null || value === void 0 ? void 0 : value.toLowerCase()) || value)
     .test('is-address-or-ens', '${path} should be an ethereum address or a ENS name', (value) => isUndefined(value) || isAddressTest(value) || isEnsTest(value));
+export const addressSchema = () => string()
+    .transform((value) => (value === null || value === void 0 ? void 0 : 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();
 // Limit of 512,000 bytes (512 kilo-bytes)
@@ -19,4 +21,7 @@ const validContentTypes = ['text/plain', 'text/html'];
 export const contentTypeSchema = () => string().oneOf(validContentTypes, 'Invalid contentType').optional();
 // 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');
 //# sourceMappingURL=validators.js.map

package/dist/utils/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAE9C,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;AAE5B,MAAM,CAAC,MAAM,cAAc,GAAG,GAAU,EAAE;IACxC,MAAM,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;AACxD,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC1D,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CACrC,MAAM,EAAE;KACL,SAAS,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,EAAE,KAAI,KAAK,CAAC;KAC3D,IAAI,CACH,mBAAmB,EACnB,qDAAqD,EACrD,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAC1E,CAAC;AAEN,6CAA6C;AAC7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;AAElE,0CAA0C;AAC1C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAE7D,qDAAqD;AACrD,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CACpC,MAAM,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEtE,8EAA8E;AAC9E,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/utils/validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAEtD,MAAM,CAAC,MAAM,cAAc,GAAG,GAAU,EAAE;IACxC,MAAM,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;AAC5D,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,EAAE,CACzC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CACrC,MAAM,EAAE;KACL,SAAS,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,EAAE,KAAI,KAAK,CAAC;KAC3D,IAAI,CACH,mBAAmB,EACnB,qDAAqD,EACrD,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAC1E,CAAC;AAEN,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE,CAChC,MAAM,EAAE;KACL,SAAS,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,EAAE,KAAI,KAAK,CAAC;KAC3D,IAAI,CACH,YAAY,EACZ,uCAAuC,EACvC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CACtD,CAAC;AAEN,6CAA6C;AAC7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;AAElE,0CAA0C;AAC1C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAE7D,qDAAqD;AACrD,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CACpC,MAAM,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEtE,8EAA8E;AAC9E,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEhF,6EAA6E;AAC7E,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAE3E,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CACvC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAC"}

package/dist/web3mail/IExecWeb3mail.d.ts

@@ -1,10 +1,15 @@
-import { providers } from 'ethers';
-import { IExecConfigOptions } from 'iexec/IExecConfig';
-import { Contact, FetchContactsParams, SendEmailParams, SendEmailResponse, Web3SignerProvider } from './types.js';
+import { Eip1193Provider } from 'ethers';
+import { Contact, FetchUserContactsParams, SendEmailParams, Web3SignerProvider, Web3MailConfigOptions } from './types.js';
 export declare class IExecWeb3mail {
-    fetchMyContacts: (args?: FetchContactsParams) => Promise<Contact[]>;
-    sendEmail: (args: SendEmailParams) => Promise<SendEmailResponse>;
-    constructor(ethProvider: providers.ExternalProvider | Web3SignerProvider, options?: {
-        iexecOptions?: IExecConfigOptions;
-    });
+    private iexec;
+    private ipfsNode;
+    private ipfsGateway;
+    private dataProtectorSubgraph;
+    private dappAddressOrENS;
+    private dappWhitelistAddress;
+    private graphQLClient;
+    constructor(ethProvider: Eip1193Provider | Web3SignerProvider, options?: Web3MailConfigOptions);
+    fetchMyContacts: () => Promise<Contact[]>;
+    fetchUserContacts(args?: FetchUserContactsParams): Promise<Contact[]>;
+    sendEmail: (args: SendEmailParams) => Promise<import("./types.js").SendEmailResponse>;
 }

package/dist/web3mail/IExecWeb3mail.js

@@ -1,27 +1,40 @@
 import { IExec } from 'iexec';
+import { fetchUserContacts } from './fetchUserContacts.js';
 import { fetchMyContacts } from './fetchMyContacts.js';
 import { sendEmail } from './sendEmail.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 {
     constructor(ethProvider, options) {
-        let iexec;
-        let graphQLClient;
+        this.fetchMyContacts = () => fetchMyContacts({
+            iexec: this.iexec,
+            graphQLClient: this.graphQLClient,
+            dappAddressOrENS: this.dappAddressOrENS,
+            dappWhitelistAddress: this.dappWhitelistAddress,
+        });
+        this.sendEmail = (args) => sendEmail(Object.assign(Object.assign({}, args), { iexec: this.iexec, ipfsNode: this.ipfsNode, ipfsGateway: this.ipfsGateway, dappAddressOrENS: this.dappAddressOrENS, dappWhitelistAddress: this.dappWhitelistAddress, graphQLClient: this.graphQLClient }));
         try {
-            iexec = new IExec({ ethProvider }, options === null || options === void 0 ? void 0 : options.iexecOptions);
+            this.iexec = new IExec({ ethProvider }, options === null || options === void 0 ? void 0 : options.iexecOptions);
         }
         catch (e) {
             throw Error('Unsupported ethProvider');
         }
         try {
-            graphQLClient = new GraphQLClient(DATAPROTECTOR_SUBGRAPH_ENDPOINT);
+            this.dataProtectorSubgraph =
+                (options === null || options === void 0 ? void 0 : options.dataProtectorSubgraph) || DATAPROTECTOR_SUBGRAPH_ENDPOINT;
+            this.graphQLClient = new GraphQLClient(this.dataProtectorSubgraph);
         }
         catch (e) {
             throw Error('Impossible to create GraphQLClient');
         }
-        this.fetchMyContacts = (args) => fetchMyContacts(Object.assign(Object.assign({}, args), { iexec, graphQLClient }));
-        this.sendEmail = (args) => sendEmail(Object.assign(Object.assign({}, args), { iexec,
-            graphQLClient }));
+        this.dappAddressOrENS = (options === null || options === void 0 ? void 0 : options.dappAddressOrENS) || WEB3_MAIL_DAPP_ADDRESS;
+        this.ipfsNode = (options === null || options === void 0 ? void 0 : options.ipfsNode) || IPFS_UPLOAD_URL;
+        this.ipfsGateway = (options === null || options === void 0 ? void 0 : options.ipfsGateway) || DEFAULT_IPFS_GATEWAY;
+        this.dappWhitelistAddress =
+            (options === null || options === void 0 ? void 0 : options.dappWhitelistAddress) || WHITELIST_SMART_CONTRACT_ADDRESS;
+    }
+    fetchUserContacts(args) {
+        return fetchUserContacts(Object.assign(Object.assign({}, args), { iexec: this.iexec, graphQLClient: this.graphQLClient, dappAddressOrENS: this.dappAddressOrENS, dappWhitelistAddress: this.dappWhitelistAddress }));
     }
 }
 //# sourceMappingURL=IExecWeb3mail.js.map

package/dist/web3mail/IExecWeb3mail.js.map

@@ -1 +1 @@
-{"version":3,"file":"IExecWeb3mail.js","sourceRoot":"","sources":["../../src/web3mail/IExecWeb3mail.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAQ3C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAEtE,MAAM,OAAO,aAAa;IAIxB,YACE,WAA4D,EAC5D,OAEC;QAED,IAAI,KAAY,CAAC;QACjB,IAAI,aAA4B,CAAC;QACjC,IAAI;YACF,KAAK,GAAG,IAAI,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC;SAC3D;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,KAAK,CAAC,yBAAyB,CAAC,CAAC;SACxC;QAED,IAAI;YACF,aAAa,GAAG,IAAI,aAAa,CAAC,+BAA+B,CAAC,CAAC;SACpE;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACnD;QAED,IAAI,CAAC,eAAe,GAAG,CAAC,IAA0B,EAAE,EAAE,CACpD,eAAe,iCAAM,IAAI,KAAE,KAAK,EAAE,aAAa,IAAG,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,CAAC,IAAqB,EAAE,EAAE,CACzC,SAAS,iCACJ,IAAI,KACP,KAAK;YACL,aAAa,IACb,CAAC;IACP,CAAC;CACF"}
+{"version":3,"file":"IExecWeb3mail.js","sourceRoot":"","sources":["../../src/web3mail/IExecWeb3mail.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAS3C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,oBAAoB,EACpB,+BAA+B,EAC/B,gCAAgC,GACjC,MAAM,qBAAqB,CAAC;AAE7B,MAAM,OAAO,aAAa;IAexB,YACE,WAAiD,EACjD,OAA+B;QAuBjC,oBAAe,GAAG,GAAG,EAAE,CACrB,eAAe,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;SAChD,CAAC,CAAC;QAYL,cAAS,GAAG,CAAC,IAAqB,EAAE,EAAE,CACpC,SAAS,iCACJ,IAAI,KACP,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EACvC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB,EAC/C,aAAa,EAAE,IAAI,CAAC,aAAa,IACjC,CAAC;QAhDH,IAAI;YACF,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC;SAChE;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,KAAK,CAAC,yBAAyB,CAAC,CAAC;SACxC;QAED,IAAI;YACF,IAAI,CAAC,qBAAqB;gBACxB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,qBAAqB,KAAI,+BAA+B,CAAC;YACpE,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACpE;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACnD;QAED,IAAI,CAAC,gBAAgB,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,KAAI,sBAAsB,CAAC;QAC5E,IAAI,CAAC,QAAQ,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,KAAI,eAAe,CAAC;QACrD,IAAI,CAAC,WAAW,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,oBAAoB,CAAC;QAChE,IAAI,CAAC,oBAAoB;YACvB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,oBAAoB,KAAI,gCAAgC,CAAC;IACtE,CAAC;IAUD,iBAAiB,CAAC,IAA8B;QAC9C,OAAO,iBAAiB,iCACnB,IAAI,KACP,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,aAAa,EAAE,IAAI,CAAC,aAAa,EACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EACvC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB,IAC/C,CAAC;IACL,CAAC;CAYF"}

package/dist/web3mail/fetchMyContacts.d.ts

@@ -1,2 +1,2 @@
-import { Contact, FetchContactsParams, IExecConsumer, SubgraphConsumer } from './types.js';
-export declare const fetchMyContacts: ({ graphQLClient, iexec, page, pageSize, }: IExecConsumer & SubgraphConsumer & FetchContactsParams) => Promise<Contact[]>;
+import { Contact, DappAddressConsumer, DappWhitelistAddressConsumer, IExecConsumer, SubgraphConsumer } from './types.js';
+export declare const fetchMyContacts: ({ graphQLClient, iexec, dappAddressOrENS, dappWhitelistAddress, }: IExecConsumer & SubgraphConsumer & DappAddressConsumer & DappWhitelistAddressConsumer) => Promise<Contact[]>;

package/dist/web3mail/fetchMyContacts.js

@@ -7,50 +7,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { WEB3_MAIL_DAPP_ADDRESS, WHITELIST_SMART_CONTRACT_ADDRESS, } from '../config/config.js';
 import { WorkflowError } from '../utils/errors.js';
-import { autoPaginateRequest } from '../utils/paginate.js';
-import { getValidContact } from '../utils/subgraphQuery.js';
 import { throwIfMissing } from '../utils/validators.js';
-export const fetchMyContacts = ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), page, pageSize, }) => __awaiter(void 0, void 0, void 0, function* () {
+import { fetchUserContacts } from './fetchUserContacts.js';
+export const fetchMyContacts = ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), dappAddressOrENS = throwIfMissing(), dappWhitelistAddress = throwIfMissing(), }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const userAddress = yield iexec.wallet.getAddress();
-        const datasetOrderbookAuthorizedBySC = yield iexec.orderbook.fetchDatasetOrderbook('any', {
-            app: WHITELIST_SMART_CONTRACT_ADDRESS,
-            requester: userAddress,
-            page,
-            pageSize,
+        return yield fetchUserContacts({
+            iexec,
+            graphQLClient,
+            dappAddressOrENS,
+            dappWhitelistAddress,
+            userAddress,
         });
-        const datasetOrderbookAuthorizedByENS = yield iexec.orderbook.fetchDatasetOrderbook('any', {
-            app: WEB3_MAIL_DAPP_ADDRESS,
-            requester: userAddress,
-            page,
-            pageSize,
-        });
-        const { orders: ensOrders } = yield autoPaginateRequest({
-            request: datasetOrderbookAuthorizedByENS,
-        });
-        const { orders: scOrders } = yield autoPaginateRequest({
-            request: datasetOrderbookAuthorizedBySC,
-        });
-        const orders = ensOrders.concat(scOrders);
-        const myContacts = [];
-        const web3DappResolvedAddress = yield iexec.ens.resolveName(WEB3_MAIL_DAPP_ADDRESS);
-        orders.forEach((order) => {
-            if (order.order.apprestrict.toLowerCase() ===
-                web3DappResolvedAddress.toLowerCase() ||
-                order.order.apprestrict.toLowerCase() ===
-                    WHITELIST_SMART_CONTRACT_ADDRESS.toLowerCase()) {
-                const contact = {
-                    address: order.order.dataset.toLowerCase(),
-                    owner: order.signer.toLowerCase(),
-                    accessGrantTimestamp: order.publicationTimestamp,
-                };
-                myContacts.push(contact);
-            }
-        });
-        const validContacts = yield getValidContact(graphQLClient, myContacts);
-        return validContacts;
     }
     catch (error) {
         throw new WorkflowError(`Failed to fetch my contacts: ${error.message}`, error);

package/dist/web3mail/fetchMyContacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchMyContacts.js","sourceRoot":"","sources":["../../src/web3mail/fetchMyContacts.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,sBAAsB,EACtB,gCAAgC,GACjC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAQxD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAO,EACpC,aAAa,GAAG,cAAc,EAAE,EAChC,KAAK,GAAG,cAAc,EAAE,EACxB,IAAI,EACJ,QAAQ,GAC+C,EAEvD,EAAE;IACF,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,8BAA8B,GAClC,MAAM,KAAK,CAAC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE;YACjD,GAAG,EAAE,gCAAgC;YACrC,SAAS,EAAE,WAAW;YACtB,IAAI;YACJ,QAAQ;SACT,CAAC,CAAC;QACL,MAAM,+BAA+B,GACnC,MAAM,KAAK,CAAC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE;YACjD,GAAG,EAAE,sBAAsB;YAC3B,SAAS,EAAE,WAAW;YACtB,IAAI;YACJ,QAAQ;SACT,CAAC,CAAC;QAEL,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,mBAAmB,CAAC;YACtD,OAAO,EAAE,+BAA+B;SACzC,CAAC,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,mBAAmB,CAAC;YACrD,OAAO,EAAE,8BAA8B;SACxC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAc,EAAE,CAAC;QACjC,MAAM,uBAAuB,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,WAAW,CACzD,sBAAsB,CACvB,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,IACE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE;gBACnC,uBAAuB,CAAC,WAAW,EAAE;gBACvC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE;oBACnC,gCAAgC,CAAC,WAAW,EAAE,EAChD;gBACA,MAAM,OAAO,GAAG;oBACd,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC1C,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE;oBACjC,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;iBACjD,CAAC;gBACF,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAEvE,OAAO,aAAa,CAAC;KACtB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,aAAa,CACrB,gCAAgC,KAAK,CAAC,OAAO,EAAE,EAC/C,KAAK,CACN,CAAC;KACH;AACH,CAAC,CAAA,CAAC"}
+{"version":3,"file":"fetchMyContacts.js","sourceRoot":"","sources":["../../src/web3mail/fetchMyContacts.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAS3D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAO,EACpC,aAAa,GAAG,cAAc,EAAE,EAChC,KAAK,GAAG,cAAc,EAAE,EACxB,gBAAgB,GAAG,cAAc,EAAE,EACnC,oBAAoB,GAAG,cAAc,EAAE,GAIX,EAAsB,EAAE;IACpD,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACpD,OAAO,MAAM,iBAAiB,CAAC;YAC7B,KAAK;YACL,aAAa;YACb,gBAAgB;YAChB,oBAAoB;YACpB,WAAW;SACZ,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,aAAa,CACrB,gCAAgC,KAAK,CAAC,OAAO,EAAE,EAC/C,KAAK,CACN,CAAC;KACH;AACH,CAAC,CAAA,CAAC"}

package/dist/web3mail/fetchUserContacts.d.ts

@@ -0,0 +1,2 @@
+import { Contact, DappAddressConsumer, DappWhitelistAddressConsumer, FetchUserContactsParams, IExecConsumer, SubgraphConsumer } from './types.js';
+export declare const fetchUserContacts: ({ graphQLClient, iexec, dappAddressOrENS, dappWhitelistAddress, userAddress, }: IExecConsumer & SubgraphConsumer & DappAddressConsumer & DappWhitelistAddressConsumer & FetchUserContactsParams) => Promise<Contact[]>;

package/dist/web3mail/fetchUserContacts.js

@@ -0,0 +1,82 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { ANY_DATASET_ADDRESS } from '../config/config.js';
+import { WorkflowError } from '../utils/errors.js';
+import { autoPaginateRequest } from '../utils/paginate.js';
+import { getValidContact } from '../utils/subgraphQuery.js';
+import { addressOrEnsSchema, addressSchema, isEnsTest, throwIfMissing, } from '../utils/validators.js';
+export const fetchUserContacts = ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), dappAddressOrENS = throwIfMissing(), dappWhitelistAddress = throwIfMissing(), userAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const vDappAddressOrENS = addressOrEnsSchema()
+            .required()
+            .label('dappAddressOrENS')
+            .validateSync(dappAddressOrENS);
+        const vDappWhitelistAddress = addressSchema()
+            .required()
+            .label('dappWhitelistAddress')
+            .validateSync(dappWhitelistAddress);
+        const vUserAddress = addressOrEnsSchema()
+            .required()
+            .label('userAddress')
+            .validateSync(userAddress);
+        const [dappOrders, whitelistOrders] = yield Promise.all([
+            fetchAllOrdersByApp({
+                iexec,
+                userAddress: vUserAddress,
+                appAddress: vDappAddressOrENS,
+            }),
+            fetchAllOrdersByApp({
+                iexec,
+                userAddress: vUserAddress,
+                appAddress: vDappWhitelistAddress,
+            }),
+        ]);
+        const orders = dappOrders.concat(whitelistOrders);
+        const myContacts = [];
+        let web3DappResolvedAddress = vDappAddressOrENS;
+        if (isEnsTest(vDappAddressOrENS)) {
+            web3DappResolvedAddress = yield iexec.ens.resolveName(vDappAddressOrENS);
+        }
+        orders.forEach((order) => {
+            if (order.order.apprestrict.toLowerCase() ===
+                web3DappResolvedAddress.toLowerCase() ||
+                order.order.apprestrict.toLowerCase() ===
+                    vDappWhitelistAddress.toLowerCase()) {
+                const contact = {
+                    address: order.order.dataset.toLowerCase(),
+                    owner: order.signer.toLowerCase(),
+                    accessGrantTimestamp: order.publicationTimestamp,
+                };
+                myContacts.push(contact);
+            }
+        });
+        //getValidContact function remove duplicated contacts for the same protectedData address,
+        //keeping the most recent one
+        return yield getValidContact(graphQLClient, myContacts);
+    }
+    catch (error) {
+        throw new WorkflowError(`Failed to fetch my contacts: ${error.message}`, error);
+    }
+});
+function fetchAllOrdersByApp({ iexec, userAddress, appAddress }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ordersFirstPage = iexec.orderbook.fetchDatasetOrderbook(ANY_DATASET_ADDRESS, {
+            app: appAddress,
+            requester: userAddress,
+            // Use maxPageSize here to avoid too many round-trips (we want everything anyway)
+            pageSize: 1000,
+        });
+        const { orders: allOrders } = yield autoPaginateRequest({
+            request: ordersFirstPage,
+        });
+        return allOrders;
+    });
+}
+//# sourceMappingURL=fetchUserContacts.js.map

package/dist/web3mail/fetchUserContacts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetchUserContacts.js","sourceRoot":"","sources":["../../src/web3mail/fetchUserContacts.ts"],"names":[],"mappings":"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"}

package/dist/web3mail/sendEmail.d.ts

@@ -1,2 +1,2 @@
-import { IExecConsumer, SendEmailParams, SendEmailResponse, SubgraphConsumer } from './types.js';
-export declare const sendEmail: ({ graphQLClient, iexec, emailSubject, emailContent, contentType, senderName, protectedData, }: IExecConsumer & SubgraphConsumer & SendEmailParams) => Promise<SendEmailResponse>;
+import { DappAddressConsumer, DappWhitelistAddressConsumer, IExecConsumer, IpfsGatewayConfigConsumer, IpfsNodeConfigConsumer, SendEmailParams, SendEmailResponse, SubgraphConsumer } from './types.js';
+export declare const sendEmail: ({ graphQLClient, iexec, workerpoolAddressOrEns, dappAddressOrENS, dappWhitelistAddress, ipfsNode, ipfsGateway, emailSubject, emailContent, contentType, label, dataMaxPrice, appMaxPrice, workerpoolMaxPrice, senderName, protectedData, }: IExecConsumer & SubgraphConsumer & DappAddressConsumer & DappWhitelistAddressConsumer & IpfsNodeConfigConsumer & IpfsGatewayConfigConsumer & SendEmailParams) => Promise<SendEmailResponse>;