@iexec/web3mail 0.5.0 → 0.5.2

package/dist/config/config.d.ts

@@ -6,3 +6,4 @@ 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";

package/dist/config/config.js

@@ -6,4 +6,5 @@ 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';
 //# 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"}
+{"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"}

package/dist/web3mail/IExecWeb3mail.d.ts

@@ -1,8 +1,8 @@
 import { providers } from 'ethers';
 import { IExecConfigOptions } from 'iexec/IExecConfig';
-import { Contact, SendEmailParams, SendEmailResponse, Web3SignerProvider } from './types.js';
+import { Contact, FetchContactsParams, SendEmailParams, SendEmailResponse, Web3SignerProvider } from './types.js';
 export declare class IExecWeb3mail {
-    fetchMyContacts: () => Promise<Contact[]>;
+    fetchMyContacts: (args?: FetchContactsParams) => Promise<Contact[]>;
     sendEmail: (args: SendEmailParams) => Promise<SendEmailResponse>;
     constructor(ethProvider: providers.ExternalProvider | Web3SignerProvider, options?: {
         iexecOptions?: IExecConfigOptions;

package/dist/web3mail/IExecWeb3mail.js

@@ -19,7 +19,7 @@ export class IExecWeb3mail {
         catch (e) {
             throw Error('Impossible to create GraphQLClient');
         }
-        this.fetchMyContacts = () => fetchMyContacts({ iexec, graphQLClient });
+        this.fetchMyContacts = (args) => fetchMyContacts(Object.assign(Object.assign({}, args), { iexec, graphQLClient }));
         this.sendEmail = (args) => sendEmail(Object.assign(Object.assign({}, args), { iexec,
             graphQLClient }));
     }

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;AAO3C,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,GAAG,EAAE,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;QACvE,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;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"}

package/dist/web3mail/fetchMyContacts.d.ts

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

package/dist/web3mail/fetchMyContacts.js

@@ -7,26 +7,40 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { WEB3_MAIL_DAPP_ADDRESS } from '../config/config.js';
+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(), }) => __awaiter(void 0, void 0, void 0, function* () {
+export const fetchMyContacts = ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), page, pageSize, }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const userAddress = yield iexec.wallet.getAddress();
-        const showDatasetOrderbookRequest = iexec.orderbook.fetchDatasetOrderbook('any', {
+        const datasetOrderbookAuthorizedBySC = yield iexec.orderbook.fetchDatasetOrderbook('any', {
+            app: WHITELIST_SMART_CONTRACT_ADDRESS,
+            requester: userAddress,
+            page,
+            pageSize,
+        });
+        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 } = yield autoPaginateRequest({
-            request: showDatasetOrderbookRequest,
+        const { orders: scOrders } = yield autoPaginateRequest({
+            request: datasetOrderbookAuthorizedBySC,
         });
-        let myContacts = [];
+        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()) {
+                web3DappResolvedAddress.toLowerCase() ||
+                order.order.apprestrict.toLowerCase() ===
+                    WHITELIST_SMART_CONTRACT_ADDRESS.toLowerCase()) {
                 const contact = {
                     address: order.order.dataset.toLowerCase(),
                     owner: order.signer.toLowerCase(),

package/dist/web3mail/fetchMyContacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchMyContacts.js","sourceRoot":"","sources":["../../src/web3mail/fetchMyContacts.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,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;AAGxD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAO,EACpC,aAAa,GAAG,cAAc,EAAE,EAChC,KAAK,GAAG,cAAc,EAAE,GACS,EAAsB,EAAE;IACzD,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,2BAA2B,GAAG,KAAK,CAAC,SAAS,CAAC,qBAAqB,CACvE,KAAK,EACL;YACE,GAAG,EAAE,sBAAsB;YAC3B,SAAS,EAAE,WAAW;SACvB,CACF,CAAC;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,mBAAmB,CAAC;YAC3C,OAAO,EAAE,2BAA2B;SACrC,CAAC,CAAC;QACH,IAAI,UAAU,GAAc,EAAE,CAAC;QAC/B,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;gBACrC,uBAAuB,CAAC,WAAW,EAAE,EACrC;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,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"}

package/dist/web3mail/sendEmail.js

@@ -104,7 +104,7 @@ export const sendEmail = ({ graphQLClient = throwIfMissing(), iexec = throwIfMis
         const multiaddr = `/ipfs/${cid}`;
         yield iexec.secrets.pushRequesterSecret(requesterSecretId, JSON.stringify({
             emailSubject: vEmailSubject,
-            emailContentOrMultiAddr: multiaddr,
+            emailContentMultiAddr: multiaddr,
             contentType: vContentType,
             senderName: vSenderName,
             emailContentEncryptionKey,

package/dist/web3mail/sendEmail.js.map

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

package/dist/web3mail/types.d.ts

@@ -18,6 +18,16 @@ export type SendEmailParams = {
     contentType?: string;
     senderName?: string;
 };
+export type FetchContactsParams = {
+    /**
+     * Index of the page to fetch
+     */
+    page?: number;
+    /**
+     * Size of the page to fetch
+     */
+    pageSize?: number;
+};
 export type SendEmailResponse = {
     taskId: Address;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec/web3mail",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
   "main": "./dist/index.js",
   "type": "module",
@@ -20,7 +20,7 @@
   "scripts": {
     "build": "rm -rf dist && tsc",
     "test": "rm -rf dist && tsc && NODE_OPTIONS=--experimental-vm-modules npx jest --coverage",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint .",
     "format": "prettier --write \"src/**/*.ts\"",
     "check-format": "prettier --check \"src/**/*.ts\""
   },
@@ -38,26 +38,30 @@
   },
   "homepage": "https://github.com/iExecBlockchainComputing/web3mail-sdk#readme",
   "devDependencies": {
-    "@iexec/dataprotector": "^0.1.2",
+    "@iexec/dataprotector": "^0.2.0",
+    "@jest/globals": "^29.7.0",
     "@types/jest": "^29.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-config-standard-with-typescript": "^34.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^15.6.1",
-    "eslint-plugin-promise": "^6.1.1",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
+    "eslint": "^8.51.0",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jest": "^27.4.2",
+    "eslint-plugin-sonarjs": "^0.21.0",
     "jest": "^29.5.0",
     "prettier": "^2.8.4",
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.2",
-    "typescript": "^4.9.5"
+    "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.2.1",
+    "iexec": "^8.4.0",
     "kubo-rpc-client": "^3.0.1",
     "yup": "^1.1.1"
   }

package/src/config/config.ts

@@ -7,3 +7,5 @@ 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';

package/src/web3mail/IExecWeb3mail.ts

@@ -5,6 +5,7 @@ import { fetchMyContacts } from './fetchMyContacts.js';
 import { sendEmail } from './sendEmail.js';
 import {
   Contact,
+  FetchContactsParams,
   SendEmailParams,
   SendEmailResponse,
   Web3SignerProvider,
@@ -13,7 +14,7 @@ import { GraphQLClient } from 'graphql-request';
 import { DATAPROTECTOR_SUBGRAPH_ENDPOINT } from '../config/config.js';
 
 export class IExecWeb3mail {
-  fetchMyContacts: () => Promise<Contact[]>;
+  fetchMyContacts: (args?: FetchContactsParams) => Promise<Contact[]>;
   sendEmail: (args: SendEmailParams) => Promise<SendEmailResponse>;
 
   constructor(
@@ -36,7 +37,8 @@ export class IExecWeb3mail {
       throw Error('Impossible to create GraphQLClient');
     }
 
-    this.fetchMyContacts = () => fetchMyContacts({ iexec, graphQLClient });
+    this.fetchMyContacts = (args?: FetchContactsParams) =>
+      fetchMyContacts({ ...args, iexec, graphQLClient });
     this.sendEmail = (args: SendEmailParams) =>
       sendEmail({
         ...args,

package/src/web3mail/fetchMyContacts.ts

@@ -1,27 +1,52 @@
-import { WEB3_MAIL_DAPP_ADDRESS } from '../config/config.js';
+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';
-import { Contact, IExecConsumer, SubgraphConsumer } from './types.js';
+import {
+  Contact,
+  FetchContactsParams,
+  IExecConsumer,
+  SubgraphConsumer,
+} from './types.js';
 
 export const fetchMyContacts = async ({
   graphQLClient = throwIfMissing(),
   iexec = throwIfMissing(),
-}: IExecConsumer & SubgraphConsumer): Promise<Contact[]> => {
+  page,
+  pageSize,
+}: IExecConsumer & SubgraphConsumer & FetchContactsParams): Promise<
+  Contact[]
+> => {
   try {
     const userAddress = await iexec.wallet.getAddress();
-    const showDatasetOrderbookRequest = iexec.orderbook.fetchDatasetOrderbook(
-      'any',
-      {
+    const datasetOrderbookAuthorizedBySC =
+      await iexec.orderbook.fetchDatasetOrderbook('any', {
+        app: WHITELIST_SMART_CONTRACT_ADDRESS,
+        requester: userAddress,
+        page,
+        pageSize,
+      });
+    const datasetOrderbookAuthorizedByENS =
+      await iexec.orderbook.fetchDatasetOrderbook('any', {
         app: WEB3_MAIL_DAPP_ADDRESS,
         requester: userAddress,
-      }
-    );
-    const { orders } = await autoPaginateRequest({
-      request: showDatasetOrderbookRequest,
+        page,
+        pageSize,
+      });
+
+    const { orders: ensOrders } = await autoPaginateRequest({
+      request: datasetOrderbookAuthorizedByENS,
     });
-    let myContacts: Contact[] = [];
+    const { orders: scOrders } = await autoPaginateRequest({
+      request: datasetOrderbookAuthorizedBySC,
+    });
+
+    const orders = ensOrders.concat(scOrders);
+    const myContacts: Contact[] = [];
     const web3DappResolvedAddress = await iexec.ens.resolveName(
       WEB3_MAIL_DAPP_ADDRESS
     );
@@ -29,7 +54,9 @@ export const fetchMyContacts = async ({
     orders.forEach((order) => {
       if (
         order.order.apprestrict.toLowerCase() ===
-        web3DappResolvedAddress.toLowerCase()
+          web3DappResolvedAddress.toLowerCase() ||
+        order.order.apprestrict.toLowerCase() ===
+          WHITELIST_SMART_CONTRACT_ADDRESS.toLowerCase()
       ) {
         const contact = {
           address: order.order.dataset.toLowerCase(),

package/src/web3mail/sendEmail.ts

@@ -155,7 +155,7 @@ export const sendEmail = async ({
       requesterSecretId,
       JSON.stringify({
         emailSubject: vEmailSubject,
-        emailContentOrMultiAddr: multiaddr,
+        emailContentMultiAddr: multiaddr,
         contentType: vContentType,
         senderName: vSenderName,
         emailContentEncryptionKey,

package/src/web3mail/types.ts

@@ -24,6 +24,16 @@ export type SendEmailParams = {
   senderName?: string;
 };
 
+export type FetchContactsParams = {
+  /**
+   * Index of the page to fetch
+   */
+  page?: number;
+  /**
+   * Size of the page to fetch
+   */
+  pageSize?: number;
+};
 export type SendEmailResponse = {
   taskId: Address;
 };