@iexec/web3mail 1.2.2 → 1.3.0

package/dist/config/config.d.ts

@@ -1,11 +1,21 @@
-export declare const WEB3_MAIL_DAPP_ADDRESS = "web3mail.apps.iexec.eth";
-export declare const PROD_WORKERPOOL_ADDRESS = "prod-v8-bellecour.main.pools.iexec.eth";
-export declare const DATAPROTECTOR_SUBGRAPH_ENDPOINT = "https://thegraph.iex.ec/subgraphs/name/bellecour/dataprotector-v2";
 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";
+export declare const CALLBACK_WEB3MAIL = "0x5f936db7ad6d29371808e42a87015595d90509ba";
+export declare const DEFAULT_CHAIN_ID = 134;
+interface ChainConfig {
+    name: string;
+    dappAddress?: string;
+    prodWorkerpoolAddress: string;
+    dataProtectorSubgraph: string;
+    ipfsUploadUrl: string;
+    ipfsGateway: string;
+    whitelistSmartContract: string;
+    isExperimental?: boolean;
+}
+export declare const getChainDefaultConfig: (chainId: number, options?: {
+    allowExperimentalNetworks?: boolean;
+}) => ChainConfig | null;
+export {};

package/dist/config/config.js

@@ -1,12 +1,39 @@
-export const WEB3_MAIL_DAPP_ADDRESS = 'web3mail.apps.iexec.eth';
-export const PROD_WORKERPOOL_ADDRESS = 'prod-v8-bellecour.main.pools.iexec.eth';
-export const DATAPROTECTOR_SUBGRAPH_ENDPOINT = 'https://thegraph.iex.ec/subgraphs/name/bellecour/dataprotector-v2';
 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';
+export const CALLBACK_WEB3MAIL = '0x5f936db7ad6d29371808e42a87015595d90509ba';
+export const DEFAULT_CHAIN_ID = 134;
+const CHAIN_CONFIG = {
+    134: {
+        name: 'bellecour',
+        dappAddress: 'web3mail.apps.iexec.eth',
+        prodWorkerpoolAddress: 'prod-v8-bellecour.main.pools.iexec.eth',
+        dataProtectorSubgraph: 'https://thegraph.iex.ec/subgraphs/name/bellecour/dataprotector-v2',
+        ipfsUploadUrl: '/dns4/ipfs-upload.v8-bellecour.iex.ec/https',
+        ipfsGateway: 'https://ipfs-gateway.v8-bellecour.iex.ec',
+        whitelistSmartContract: '0x781482C39CcE25546583EaC4957Fb7Bf04C277D2',
+    },
+    421614: {
+        name: 'arbitrum-sepolia-testnet',
+        dappAddress: undefined, // ENS not supported on this network, address will be resolved from Compass
+        prodWorkerpoolAddress: '0xB967057a21dc6A66A29721d96b8Aa7454B7c383F',
+        dataProtectorSubgraph: 'https://thegraph.arbitrum-sepolia-testnet.iex.ec/api/subgraphs/id/5YjRPLtjS6GH6bB4yY55Qg4HzwtRGQ8TaHtGf9UBWWd',
+        ipfsGateway: 'https://ipfs-gateway.arbitrum-sepolia-testnet.iex.ec',
+        ipfsUploadUrl: 'https://ipfs-upload.arbitrum-sepolia-testnet.iex.ec',
+        whitelistSmartContract: '0x8d46d40840f1Aa2264F96184Ffadf04e5D573B9B',
+        isExperimental: true,
+    },
+};
+export const getChainDefaultConfig = (chainId, options) => {
+    const config = CHAIN_CONFIG[chainId];
+    if (!config) {
+        return null;
+    }
+    if (config.isExperimental && !options?.allowExperimentalNetworks) {
+        return null;
+    }
+    return config;
+};
 //# 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,uBAAuB,GAAG,wCAAwC,CAAC;AAChF,MAAM,CAAC,MAAM,+BAA+B,GAC1C,mEAAmE,CAAC;AACtE,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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,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,mBAAmB,GAAG,KAAK,CAAC;AACzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,4CAA4C,CAAC;AAE9E,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAapC,MAAM,YAAY,GAAgC;IAChD,GAAG,EAAE;QACH,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,yBAAyB;QACtC,qBAAqB,EAAE,wCAAwC;QAC/D,qBAAqB,EACnB,mEAAmE;QACrE,aAAa,EAAE,6CAA6C;QAC5D,WAAW,EAAE,0CAA0C;QACvD,sBAAsB,EAAE,4CAA4C;KACrE;IACD,MAAM,EAAE;QACN,IAAI,EAAE,0BAA0B;QAChC,WAAW,EAAE,SAAS,EAAE,2EAA2E;QACnG,qBAAqB,EAAE,4CAA4C;QACnE,qBAAqB,EACnB,+GAA+G;QACjH,WAAW,EAAE,sDAAsD;QACnE,aAAa,EAAE,qDAAqD;QACpE,sBAAsB,EAAE,4CAA4C;QACpE,cAAc,EAAE,IAAI;KACrB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,OAAe,EACf,OAAiD,EAC7B,EAAE;IACtB,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAErC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,MAAM,CAAC,cAAc,IAAI,CAAC,OAAO,EAAE,yBAAyB,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/dist/utils/getChainId.d.ts

@@ -0,0 +1,4 @@
+import { AbstractProvider, AbstractSigner, Eip1193Provider } from 'ethers';
+type EthersCompatibleProvider = string | AbstractProvider | AbstractSigner | Eip1193Provider;
+export declare function getChainIdFromProvider(ethProvider: EthersCompatibleProvider): Promise<number>;
+export {};

package/dist/utils/getChainId.js

@@ -0,0 +1,33 @@
+import { JsonRpcProvider, BrowserProvider, AbstractProvider, AbstractSigner, } from 'ethers';
+import { DEFAULT_CHAIN_ID } from '../config/config.js';
+export async function getChainIdFromProvider(ethProvider) {
+    try {
+        if (typeof ethProvider === 'string') {
+            const provider = new JsonRpcProvider(ethProvider);
+            const network = await provider.getNetwork();
+            return Number(network.chainId);
+        }
+        else if (ethProvider instanceof AbstractProvider) {
+            const network = await ethProvider.getNetwork();
+            return Number(network.chainId);
+        }
+        else if (ethProvider instanceof AbstractSigner) {
+            const { provider } = ethProvider;
+            if (!provider) {
+                throw Error('Signer is not connected to a provider');
+            }
+            const network = await provider.getNetwork();
+            return Number(network.chainId);
+        }
+        else if ('request' in ethProvider) {
+            const provider = new BrowserProvider(ethProvider);
+            const network = await provider.getNetwork();
+            return Number(network.chainId);
+        }
+    }
+    catch (e) {
+        console.warn('Failed to detect chainId:', e);
+    }
+    return DEFAULT_CHAIN_ID;
+}
+//# sourceMappingURL=getChainId.js.map

package/dist/utils/getChainId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getChainId.js","sourceRoot":"","sources":["../../src/utils/getChainId.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,cAAc,GAEf,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAQvD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAqC;IAErC,IAAI,CAAC;QACH,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC5C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,WAAW,YAAY,gBAAgB,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;YAC/C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,WAAW,YAAY,cAAc,EAAE,CAAC;YACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;YACjC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,KAAK,CAAC,uCAAuC,CAAC,CAAC;YACvD,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC5C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,WAA8B,CAAC,CAAC;YACrE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC5C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}

package/dist/utils/getWeb3Provider.d.ts

@@ -1,2 +1,5 @@
 import { Web3SignerProvider } from '../web3mail/types.js';
-export declare const getWeb3Provider: (privateKey: string) => Web3SignerProvider;
+export declare const getWeb3Provider: (privateKey: string, options?: {
+    allowExperimentalNetworks?: boolean;
+    host?: number | string;
+}) => Web3SignerProvider;

package/dist/utils/getWeb3Provider.js

@@ -1,3 +1,9 @@
 import { getSignerFromPrivateKey } from 'iexec/utils';
-export const getWeb3Provider = (privateKey) => getSignerFromPrivateKey('bellecour', privateKey);
+export const getWeb3Provider = (privateKey, options = {}) => {
+    const chainHost = options?.host ? `${options.host}` : 'bellecour';
+    return getSignerFromPrivateKey(chainHost, privateKey, {
+        allowExperimentalNetworks: options?.allowExperimentalNetworks,
+        providers: {},
+    });
+};
 //# sourceMappingURL=getWeb3Provider.js.map

package/dist/utils/getWeb3Provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"getWeb3Provider.js","sourceRoot":"","sources":["../../src/utils/getWeb3Provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAGtD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAsB,EAAE,CACxE,uBAAuB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC"}
+{"version":3,"file":"getWeb3Provider.js","sourceRoot":"","sources":["../../src/utils/getWeb3Provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAGtD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,UAAkB,EAClB,UAA2E,EAAE,EACzD,EAAE;IACtB,MAAM,SAAS,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAClE,OAAO,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE;QACpD,yBAAyB,EAAE,OAAO,EAAE,yBAAyB;QAC7D,SAAS,EAAE,EAAE;KACd,CAAC,CAAC;AACL,CAAC,CAAC"}

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

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

package/dist/utils/ipfs-service.js

@@ -1,6 +1,5 @@
 import { create } from 'kubo-rpc-client';
-import { IPFS_UPLOAD_URL, DEFAULT_IPFS_GATEWAY } from '../config/config.js';
-const get = async (cid, { ipfsGateway = DEFAULT_IPFS_GATEWAY } = {}) => {
+const get = async (cid, { ipfsGateway } = {}) => {
     const multiaddr = `/ipfs/${cid.toString()}`;
     const publicUrl = `${ipfsGateway}${multiaddr}`;
     const res = await fetch(publicUrl);
@@ -10,7 +9,7 @@ const get = async (cid, { ipfsGateway = DEFAULT_IPFS_GATEWAY } = {}) => {
     const arrayBuffer = await res.arrayBuffer();
     return new Uint8Array(arrayBuffer);
 };
-const add = async (content, { ipfsNode = IPFS_UPLOAD_URL, ipfsGateway = DEFAULT_IPFS_GATEWAY, } = {}) => {
+const add = async (content, { ipfsNode, ipfsGateway } = {}) => {
     const ipfsClient = create(ipfsNode);
     const { cid } = await ipfsClient.add(content);
     await get(cid.toString(), { ipfsGateway });

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,eAAe,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAS5E,MAAM,GAAG,GAAG,KAAK,EACf,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,CAAC;QACZ,MAAM,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,KAAK,EACf,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,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;AASzC,MAAM,GAAG,GAAG,KAAK,EAAE,GAAG,EAAE,EAAE,WAAW,KAAiB,EAAE,EAAE,EAAE;IAC1D,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,CAAC;QACZ,MAAM,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,KAAK,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,WAAW,KAAiB,EAAE,EAAE,EAAE;IACxE,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,CAAC;AAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC"}

package/dist/utils/resolveDappAddressFromCompass.d.ts

@@ -0,0 +1,2 @@
+import { AddressOrENS } from '../web3mail/types.js';
+export declare function resolveDappAddressFromCompass(compassUrl: string, chainId: number): Promise<AddressOrENS | undefined>;

package/dist/utils/resolveDappAddressFromCompass.js

@@ -0,0 +1,37 @@
+import { CompassCallError } from 'iexec/errors';
+export async function resolveDappAddressFromCompass(compassUrl, chainId) {
+    if (!compassUrl) {
+        return undefined;
+    }
+    const address = await fetch(`${compassUrl}/${chainId}/iapps/web3mail`)
+        // Handle network errors
+        .catch((error) => {
+        throw new CompassCallError(`Connection to ${compassUrl} failed with a network error`, error);
+    })
+        // Handle server errors
+        .then((response) => {
+        if (response.status >= 500 && response.status <= 599) {
+            throw new CompassCallError(`Server at ${compassUrl} encountered an internal error`, Error(`Server internal error: ${response.status} ${response.statusText}`));
+        }
+        return response;
+    })
+        // Handle unexpected response formats
+        .then((response) => {
+        if (response.status !== 200) {
+            throw new Error(`Failed to fetch dapp address from compass: ${response.statusText}`);
+        }
+        const contentType = response.headers.get('Content-Type');
+        if (!contentType || contentType.indexOf('application/json') === -1) {
+            throw new Error('Failed to fetch dapp address from compass: response is not JSON');
+        }
+        return response.json();
+    })
+        .then((data) => {
+        if (!data || !data.address) {
+            throw new Error(`No dapp address found in compass response`);
+        }
+        return data.address;
+    });
+    return address;
+}
+//# sourceMappingURL=resolveDappAddressFromCompass.js.map

package/dist/utils/resolveDappAddressFromCompass.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveDappAddressFromCompass.js","sourceRoot":"","sources":["../../src/utils/resolveDappAddressFromCompass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,UAAkB,EAClB,OAAe;IAEf,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,UAAU,IAAI,OAAO,iBAAiB,CAAC;QACpE,wBAAwB;SACvB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,IAAI,gBAAgB,CACxB,iBAAiB,UAAU,8BAA8B,EACzD,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;QACF,uBAAuB;SACtB,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACjB,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACrD,MAAM,IAAI,gBAAgB,CACxB,aAAa,UAAU,gCAAgC,EACvD,KAAK,CACH,0BAA0B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CACnE,CACF,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;QACF,qCAAqC;SACpC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACjB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,8CAA8C,QAAQ,CAAC,UAAU,EAAE,CACpE,CAAC;QACJ,CAAC;QACD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACnE,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACb,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/web3mail/IExecWeb3mail.d.ts

@@ -1,15 +1,22 @@
 import { AbstractProvider, AbstractSigner, Eip1193Provider } from 'ethers';
 import { Contact, FetchUserContactsParams, SendEmailParams, Web3MailConfigOptions, SendEmailResponse, Web3SignerProvider, FetchMyContactsParams } from './types.js';
+type EthersCompatibleProvider = AbstractProvider | AbstractSigner | Eip1193Provider | Web3SignerProvider | string;
 export declare class IExecWeb3mail {
-    private iexec;
-    private ipfsNode;
-    private ipfsGateway;
-    private dataProtectorSubgraph;
     private dappAddressOrENS;
     private dappWhitelistAddress;
     private graphQLClient;
-    constructor(ethProvider?: Eip1193Provider | AbstractProvider | AbstractSigner | Web3SignerProvider | string, options?: Web3MailConfigOptions);
+    private ipfsNode;
+    private ipfsGateway;
+    private defaultWorkerpool;
+    private iexec;
+    private initPromise;
+    private ethProvider;
+    private options;
+    constructor(ethProvider?: EthersCompatibleProvider, options?: Web3MailConfigOptions);
+    init(): Promise<void>;
     fetchMyContacts(args?: FetchMyContactsParams): Promise<Contact[]>;
     fetchUserContacts(args: FetchUserContactsParams): Promise<Contact[]>;
     sendEmail(args: SendEmailParams): Promise<SendEmailResponse>;
+    private resolveConfig;
 }
+export {};

package/dist/web3mail/IExecWeb3mail.js

@@ -1,40 +1,43 @@
 import { IExec } from 'iexec';
+import { GraphQLClient } from 'graphql-request';
 import { fetchUserContacts } from './fetchUserContacts.js';
 import { fetchMyContacts } from './fetchMyContacts.js';
 import { sendEmail } from './sendEmail.js';
-import { GraphQLClient } from 'graphql-request';
-import { WEB3_MAIL_DAPP_ADDRESS, IPFS_UPLOAD_URL, DEFAULT_IPFS_GATEWAY, DATAPROTECTOR_SUBGRAPH_ENDPOINT, WHITELIST_SMART_CONTRACT_ADDRESS, } from '../config/config.js';
 import { isValidProvider } from '../utils/validators.js';
+import { getChainIdFromProvider } from '../utils/getChainId.js';
+import { getChainDefaultConfig } from '../config/config.js';
+import { resolveDappAddressFromCompass } from '../utils/resolveDappAddressFromCompass.js';
 export class IExecWeb3mail {
-    iexec;
-    ipfsNode;
-    ipfsGateway;
-    dataProtectorSubgraph;
     dappAddressOrENS;
     dappWhitelistAddress;
     graphQLClient;
+    ipfsNode;
+    ipfsGateway;
+    defaultWorkerpool;
+    iexec;
+    initPromise = null;
+    ethProvider;
+    options;
     constructor(ethProvider, options) {
-        try {
-            this.iexec = new IExec({ ethProvider: ethProvider || 'bellecour' }, options?.iexecOptions);
-        }
-        catch (e) {
-            throw Error('Unsupported ethProvider');
-        }
-        try {
-            this.dataProtectorSubgraph =
-                options?.dataProtectorSubgraph || DATAPROTECTOR_SUBGRAPH_ENDPOINT;
-            this.graphQLClient = new GraphQLClient(this.dataProtectorSubgraph);
-        }
-        catch (e) {
-            throw Error('Impossible to create GraphQLClient');
+        this.ethProvider = ethProvider || 'bellecour';
+        this.options = options || {};
+    }
+    async init() {
+        if (!this.initPromise) {
+            this.initPromise = this.resolveConfig().then((config) => {
+                this.dappAddressOrENS = config.dappAddressOrENS;
+                this.dappWhitelistAddress = config.dappWhitelistAddress;
+                this.graphQLClient = config.graphQLClient;
+                this.ipfsNode = config.ipfsNode;
+                this.ipfsGateway = config.ipfsGateway;
+                this.defaultWorkerpool = config.defaultWorkerpool;
+                this.iexec = config.iexec;
+            });
         }
-        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;
+        return this.initPromise;
     }
     async fetchMyContacts(args) {
+        await this.init();
         await isValidProvider(this.iexec);
         return fetchMyContacts({
             ...args,
@@ -44,7 +47,8 @@ export class IExecWeb3mail {
             dappWhitelistAddress: this.dappWhitelistAddress,
         });
     }
-    fetchUserContacts(args) {
+    async fetchUserContacts(args) {
+        await this.init();
         return fetchUserContacts({
             ...args,
             iexec: this.iexec,
@@ -54,17 +58,76 @@ export class IExecWeb3mail {
         });
     }
     async sendEmail(args) {
+        await this.init();
         await isValidProvider(this.iexec);
         return sendEmail({
             ...args,
+            workerpoolAddressOrEns: args.workerpoolAddressOrEns || this.defaultWorkerpool,
             iexec: this.iexec,
             ipfsNode: this.ipfsNode,
             ipfsGateway: this.ipfsGateway,
             dappAddressOrENS: this.dappAddressOrENS,
             dappWhitelistAddress: this.dappWhitelistAddress,
             graphQLClient: this.graphQLClient,
-            useVoucher: args?.useVoucher,
         });
     }
+    async resolveConfig() {
+        const chainId = await getChainIdFromProvider(this.ethProvider);
+        const chainDefaultConfig = getChainDefaultConfig(chainId, {
+            allowExperimentalNetworks: this.options.allowExperimentalNetworks,
+        });
+        const ipfsGateway = this.options?.ipfsGateway || chainDefaultConfig?.ipfsGateway;
+        let iexec, graphQLClient;
+        try {
+            iexec = new IExec({ ethProvider: this.ethProvider }, {
+                ipfsGatewayURL: ipfsGateway,
+                ...this.options?.iexecOptions,
+                allowExperimentalNetworks: this.options.allowExperimentalNetworks,
+            });
+        }
+        catch (e) {
+            throw new Error(`Unsupported ethProvider: ${e.message}`);
+        }
+        const subgraphUrl = this.options?.dataProtectorSubgraph ||
+            chainDefaultConfig?.dataProtectorSubgraph;
+        const dappAddressOrENS = this.options?.dappAddressOrENS ||
+            chainDefaultConfig?.dappAddress ||
+            (await resolveDappAddressFromCompass(await iexec.config.resolveCompassURL(), chainId));
+        const dappWhitelistAddress = this.options?.dappWhitelistAddress ||
+            chainDefaultConfig?.whitelistSmartContract;
+        const defaultWorkerpool = chainDefaultConfig?.prodWorkerpoolAddress;
+        const ipfsNode = this.options?.ipfsNode || chainDefaultConfig?.ipfsUploadUrl;
+        const missing = [];
+        if (!subgraphUrl)
+            missing.push('dataProtectorSubgraph');
+        if (!dappAddressOrENS)
+            missing.push('dappAddress');
+        if (!dappWhitelistAddress)
+            missing.push('whitelistSmartContract');
+        if (!ipfsGateway)
+            missing.push('ipfsGateway');
+        if (!defaultWorkerpool)
+            missing.push('prodWorkerpoolAddress');
+        if (!ipfsNode)
+            missing.push('ipfsUploadUrl');
+        if (missing.length > 0) {
+            throw new Error(`Missing required configuration for chainId ${chainId}: ${missing.join(', ')}`);
+        }
+        try {
+            graphQLClient = new GraphQLClient(subgraphUrl);
+        }
+        catch (error) {
+            throw new Error(`Failed to create GraphQLClient: ${error.message}`);
+        }
+        return {
+            dappAddressOrENS,
+            dappWhitelistAddress: dappWhitelistAddress.toLowerCase(),
+            defaultWorkerpool,
+            graphQLClient,
+            ipfsNode,
+            ipfsGateway,
+            iexec,
+        };
+    }
 }
 //# 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":"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"}
+{"version":3,"file":"IExecWeb3mail.js","sourceRoot":"","sources":["../../src/web3mail/IExecWeb3mail.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAW3C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC;AAmB1F,MAAM,OAAO,aAAa;IAChB,gBAAgB,CAAgB;IAEhC,oBAAoB,CAAgB;IAEpC,aAAa,CAAiB;IAE9B,QAAQ,CAAU;IAElB,WAAW,CAAU;IAErB,iBAAiB,CAAU;IAE3B,KAAK,CAAS;IAEd,WAAW,GAAyB,IAAI,CAAC;IAEzC,WAAW,CAA2B;IAEtC,OAAO,CAAwB;IAEvC,YACE,WAAsC,EACtC,OAA+B;QAE/B,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,WAAW,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACtD,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;gBAChD,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;gBACxD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;gBAC1C,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;gBAChC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;gBACtC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;gBAClD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAA4B;QAChD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAElC,OAAO,eAAe,CAAC;YACrB,GAAG,IAAI;YACP,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;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAA6B;QACnD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAElB,OAAO,iBAAiB,CAAC;YACvB,GAAG,IAAI;YACP,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;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAqB;QACnC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,SAAS,CAAC;YACf,GAAG,IAAI;YACP,sBAAsB,EACpB,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,iBAAiB;YACvD,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,OAAO,EAAE;YACxD,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;SAClE,CAAC,CAAC;QAEH,MAAM,WAAW,GACf,IAAI,CAAC,OAAO,EAAE,WAAW,IAAI,kBAAkB,EAAE,WAAW,CAAC;QAE/D,IAAI,KAAY,EAAE,aAA4B,CAAC;QAE/C,IAAI,CAAC;YACH,KAAK,GAAG,IAAI,KAAK,CACf,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EACjC;gBACE,cAAc,EAAE,WAAW;gBAC3B,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY;gBAC7B,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;aAClE,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,WAAW,GACf,IAAI,CAAC,OAAO,EAAE,qBAAqB;YACnC,kBAAkB,EAAE,qBAAqB,CAAC;QAC5C,MAAM,gBAAgB,GACpB,IAAI,CAAC,OAAO,EAAE,gBAAgB;YAC9B,kBAAkB,EAAE,WAAW;YAC/B,CAAC,MAAM,6BAA6B,CAClC,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,EACtC,OAAO,CACR,CAAC,CAAC;QACL,MAAM,oBAAoB,GACxB,IAAI,CAAC,OAAO,EAAE,oBAAoB;YAClC,kBAAkB,EAAE,sBAAsB,CAAC;QAC7C,MAAM,iBAAiB,GAAG,kBAAkB,EAAE,qBAAqB,CAAC;QACpE,MAAM,QAAQ,GACZ,IAAI,CAAC,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,aAAa,CAAC;QAE9D,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW;YAAE,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB;YAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACnD,IAAI,CAAC,oBAAoB;YAAE,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAClE,IAAI,CAAC,WAAW;YAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC9C,IAAI,CAAC,iBAAiB;YAAE,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ;YAAE,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE7C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,8CAA8C,OAAO,KAAK,OAAO,CAAC,IAAI,CACpE,IAAI,CACL,EAAE,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,aAAa,GAAG,IAAI,aAAa,CAAC,WAAW,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,OAAO;YACL,gBAAgB;YAChB,oBAAoB,EAAE,oBAAoB,CAAC,WAAW,EAAE;YACxD,iBAAiB;YACjB,aAAa;YACb,QAAQ;YACR,WAAW;YACX,KAAK;SACN,CAAC;IACJ,CAAC;CACF"}

package/dist/web3mail/sendEmail.js

@@ -1,12 +1,12 @@
 import { Buffer } from 'buffer';
-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 { CALLBACK_WEB3MAIL, DEFAULT_CONTENT_TYPE, MAX_DESIRED_APP_ORDER_PRICE, MAX_DESIRED_DATA_ORDER_PRICE, MAX_DESIRED_WORKERPOOL_ORDER_PRICE, } from '../config/config.js';
 import { handleIfProtocolError, 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, addressSchema, booleanSchema, contentTypeSchema, emailContentSchema, emailSubjectSchema, labelSchema, positiveNumberSchema, senderNameSchema, throwIfMissing, } from '../utils/validators.js';
 import { checkUserVoucher, filterWorkerpoolOrders, } from './sendEmail.models.js';
-export const sendEmail = async ({ 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, useVoucher = false, }) => {
+export const sendEmail = async ({ graphQLClient = throwIfMissing(), iexec = throwIfMissing(), workerpoolAddressOrEns, 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, useVoucher = false, }) => {
     const vDatasetAddress = addressOrEnsSchema()
         .required()
         .label('protectedData')
@@ -183,6 +183,7 @@ export const sendEmail = async ({ graphQLClient = throwIfMissing(), iexec = thro
             contentType: vContentType,
             senderName: vSenderName,
             emailContentEncryptionKey,
+            useCallback: true,
         }));
         const requestorderToSign = await iexec.order.createRequestorder({
             app: vDappAddressOrENS,
@@ -193,6 +194,7 @@ export const sendEmail = async ({ graphQLClient = throwIfMissing(), iexec = thro
             workerpoolmaxprice: workerpoolorder.workerpoolprice,
             tag: ['tee', 'scone'],
             workerpool: vWorkerpoolAddressOrEns,
+            callback: CALLBACK_WEB3MAIL,
             params: {
                 iexec_secrets: {
                     1: requesterSecretId,

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

@@ -88,6 +88,12 @@ export type Web3MailConfigOptions = {
      * If not provided, the default IPFS gateway URL will be used.
      */
     ipfsGateway?: string;
+    /**
+     * if true allows using a provider connected to an experimental networks (default false)
+     *
+     * ⚠️ experimental networks are networks on which the iExec's stack is partially deployed, experimental networks can be subject to instabilities or discontinuity. Access is provided without warranties.
+     */
+    allowExperimentalNetworks?: boolean;
 };
 export type DappAddressConsumer = {
     dappAddressOrENS: AddressOrENS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec/web3mail",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
   "main": "./dist/index.js",
   "type": "module",
@@ -28,8 +28,8 @@
     "test:e2e": "NODE_OPTIONS=--experimental-vm-modules jest --testMatch \"**/tests/**/*.test.ts\" --forceExit -b",
     "test:e2e:coverage": "NODE_OPTIONS=--experimental-vm-modules jest --testMatch \"**/tests/**/*.test.ts\" --coverage",
     "lint": "eslint .",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "check-format": "prettier --check \"src/**/*.ts\"",
+    "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"
   },
@@ -52,12 +52,12 @@
     "buffer": "^6.0.3",
     "ethers": "^6.13.2",
     "graphql-request": "^6.1.0",
-    "iexec": "^8.13.1",
+    "iexec": "^8.17.1",
     "kubo-rpc-client": "^4.1.1",
     "yup": "^1.1.1"
   },
   "devDependencies": {
-    "@iexec/dataprotector": "^2.0.0-beta.8",
+    "@iexec/dataprotector": "^2.0.0-beta.18",
     "@jest/globals": "^29.7.0",
     "@swc/core": "^1.3.96",
     "@swc/jest": "^0.2.29",
@@ -73,6 +73,6 @@
     "jest": "^29.7.0",
     "prettier": "^2.8.4",
     "typescript": "^5.5.2",
-    "whitelist-smart-contract": "github:iExecBlockchainComputing/whitelist-smart-contract#0.2.0"
+    "whitelist-smart-contract": "github:iExecBlockchainComputing/whitelist-smart-contract#v1.1.0"
   }
-}
+}

package/src/config/config.ts

@@ -1,13 +1,60 @@
-export const WEB3_MAIL_DAPP_ADDRESS = 'web3mail.apps.iexec.eth';
-export const PROD_WORKERPOOL_ADDRESS = 'prod-v8-bellecour.main.pools.iexec.eth';
-export const DATAPROTECTOR_SUBGRAPH_ENDPOINT =
-  'https://thegraph.iex.ec/subgraphs/name/bellecour/dataprotector-v2';
 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';
+export const CALLBACK_WEB3MAIL = '0x5f936db7ad6d29371808e42a87015595d90509ba';
+
+export const DEFAULT_CHAIN_ID = 134;
+
+interface ChainConfig {
+  name: string;
+  dappAddress?: string;
+  prodWorkerpoolAddress: string;
+  dataProtectorSubgraph: string;
+  ipfsUploadUrl: string;
+  ipfsGateway: string;
+  whitelistSmartContract: string;
+  isExperimental?: boolean;
+}
+
+const CHAIN_CONFIG: Record<number, ChainConfig> = {
+  134: {
+    name: 'bellecour',
+    dappAddress: 'web3mail.apps.iexec.eth',
+    prodWorkerpoolAddress: 'prod-v8-bellecour.main.pools.iexec.eth',
+    dataProtectorSubgraph:
+      'https://thegraph.iex.ec/subgraphs/name/bellecour/dataprotector-v2',
+    ipfsUploadUrl: '/dns4/ipfs-upload.v8-bellecour.iex.ec/https',
+    ipfsGateway: 'https://ipfs-gateway.v8-bellecour.iex.ec',
+    whitelistSmartContract: '0x781482C39CcE25546583EaC4957Fb7Bf04C277D2',
+  },
+  421614: {
+    name: 'arbitrum-sepolia-testnet',
+    dappAddress: undefined, // ENS not supported on this network, address will be resolved from Compass
+    prodWorkerpoolAddress: '0xB967057a21dc6A66A29721d96b8Aa7454B7c383F',
+    dataProtectorSubgraph:
+      'https://thegraph.arbitrum-sepolia-testnet.iex.ec/api/subgraphs/id/5YjRPLtjS6GH6bB4yY55Qg4HzwtRGQ8TaHtGf9UBWWd',
+    ipfsGateway: 'https://ipfs-gateway.arbitrum-sepolia-testnet.iex.ec',
+    ipfsUploadUrl: 'https://ipfs-upload.arbitrum-sepolia-testnet.iex.ec',
+    whitelistSmartContract: '0x8d46d40840f1Aa2264F96184Ffadf04e5D573B9B',
+    isExperimental: true,
+  },
+};
+
+export const getChainDefaultConfig = (
+  chainId: number,
+  options?: { allowExperimentalNetworks?: boolean }
+): ChainConfig | null => {
+  const config = CHAIN_CONFIG[chainId];
+
+  if (!config) {
+    return null;
+  }
+
+  if (config.isExperimental && !options?.allowExperimentalNetworks) {
+    return null;
+  }
+
+  return config;
+};

package/src/utils/getChainId.ts

@@ -0,0 +1,43 @@
+import {
+  JsonRpcProvider,
+  BrowserProvider,
+  AbstractProvider,
+  AbstractSigner,
+  Eip1193Provider,
+} from 'ethers';
+import { DEFAULT_CHAIN_ID } from '../config/config.js';
+
+type EthersCompatibleProvider =
+  | string
+  | AbstractProvider
+  | AbstractSigner
+  | Eip1193Provider;
+
+export async function getChainIdFromProvider(
+  ethProvider: EthersCompatibleProvider
+): Promise<number> {
+  try {
+    if (typeof ethProvider === 'string') {
+      const provider = new JsonRpcProvider(ethProvider);
+      const network = await provider.getNetwork();
+      return Number(network.chainId);
+    } else if (ethProvider instanceof AbstractProvider) {
+      const network = await ethProvider.getNetwork();
+      return Number(network.chainId);
+    } else if (ethProvider instanceof AbstractSigner) {
+      const { provider } = ethProvider;
+      if (!provider) {
+        throw Error('Signer is not connected to a provider');
+      }
+      const network = await provider.getNetwork();
+      return Number(network.chainId);
+    } else if ('request' in ethProvider) {
+      const provider = new BrowserProvider(ethProvider as Eip1193Provider);
+      const network = await provider.getNetwork();
+      return Number(network.chainId);
+    }
+  } catch (e) {
+    console.warn('Failed to detect chainId:', e);
+  }
+  return DEFAULT_CHAIN_ID;
+}

package/src/utils/getWeb3Provider.ts

@@ -1,5 +1,13 @@
 import { getSignerFromPrivateKey } from 'iexec/utils';
 import { Web3SignerProvider } from '../web3mail/types.js';
 
-export const getWeb3Provider = (privateKey: string): Web3SignerProvider =>
-  getSignerFromPrivateKey('bellecour', privateKey);
+export const getWeb3Provider = (
+  privateKey: string,
+  options: { allowExperimentalNetworks?: boolean; host?: number | string } = {}
+): Web3SignerProvider => {
+  const chainHost = options?.host ? `${options.host}` : 'bellecour';
+  return getSignerFromPrivateKey(chainHost, privateKey, {
+    allowExperimentalNetworks: options?.allowExperimentalNetworks,
+    providers: {},
+  });
+};

package/src/utils/ipfs-service.ts

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

package/src/utils/resolveDappAddressFromCompass.ts

@@ -0,0 +1,55 @@
+import { CompassCallError } from 'iexec/errors';
+import { AddressOrENS } from '../web3mail/types.js';
+
+export async function resolveDappAddressFromCompass(
+  compassUrl: string,
+  chainId: number
+): Promise<AddressOrENS | undefined> {
+  if (!compassUrl) {
+    return undefined;
+  }
+
+  const address = await fetch(`${compassUrl}/${chainId}/iapps/web3mail`)
+    // Handle network errors
+    .catch((error) => {
+      throw new CompassCallError(
+        `Connection to ${compassUrl} failed with a network error`,
+        error
+      );
+    })
+    // Handle server errors
+    .then((response) => {
+      if (response.status >= 500 && response.status <= 599) {
+        throw new CompassCallError(
+          `Server at ${compassUrl} encountered an internal error`,
+          Error(
+            `Server internal error: ${response.status} ${response.statusText}`
+          )
+        );
+      }
+      return response;
+    })
+    // Handle unexpected response formats
+    .then((response) => {
+      if (response.status !== 200) {
+        throw new Error(
+          `Failed to fetch dapp address from compass: ${response.statusText}`
+        );
+      }
+      const contentType = response.headers.get('Content-Type');
+      if (!contentType || contentType.indexOf('application/json') === -1) {
+        throw new Error(
+          'Failed to fetch dapp address from compass: response is not JSON'
+        );
+      }
+      return response.json();
+    })
+    .then((data) => {
+      if (!data || !data.address) {
+        throw new Error(`No dapp address found in compass response`);
+      }
+      return data.address;
+    });
+
+  return address;
+}

package/src/web3mail/IExecWeb3mail.ts

@@ -1,5 +1,6 @@
 import { AbstractProvider, AbstractSigner, Eip1193Provider } from 'ethers';
 import { IExec } from 'iexec';
+import { GraphQLClient } from 'graphql-request';
 import { fetchUserContacts } from './fetchUserContacts.js';
 import { fetchMyContacts } from './fetchMyContacts.js';
 import { sendEmail } from './sendEmail.js';
@@ -13,66 +14,76 @@ import {
   Web3SignerProvider,
   FetchMyContactsParams,
 } from './types.js';
-import { GraphQLClient } from 'graphql-request';
-import {
-  WEB3_MAIL_DAPP_ADDRESS,
-  IPFS_UPLOAD_URL,
-  DEFAULT_IPFS_GATEWAY,
-  DATAPROTECTOR_SUBGRAPH_ENDPOINT,
-  WHITELIST_SMART_CONTRACT_ADDRESS,
-} from '../config/config.js';
 import { isValidProvider } from '../utils/validators.js';
+import { getChainIdFromProvider } from '../utils/getChainId.js';
+import { getChainDefaultConfig } from '../config/config.js';
+import { resolveDappAddressFromCompass } from '../utils/resolveDappAddressFromCompass.js';
+
+type EthersCompatibleProvider =
+  | AbstractProvider
+  | AbstractSigner
+  | Eip1193Provider
+  | Web3SignerProvider
+  | string;
+
+interface Web3mailResolvedConfig {
+  dappAddressOrENS: AddressOrENS;
+  dappWhitelistAddress: AddressOrENS;
+  graphQLClient: GraphQLClient;
+  ipfsNode: string;
+  ipfsGateway: string;
+  defaultWorkerpool: string;
+  iexec: IExec;
+}
 
 export class IExecWeb3mail {
-  private iexec: IExec;
+  private dappAddressOrENS!: AddressOrENS;
+
+  private dappWhitelistAddress!: AddressOrENS;
+
+  private graphQLClient!: GraphQLClient;
+
+  private ipfsNode!: string;
 
-  private ipfsNode: string;
+  private ipfsGateway!: string;
 
-  private ipfsGateway: string;
+  private defaultWorkerpool!: string;
 
-  private dataProtectorSubgraph: string;
+  private iexec!: IExec;
 
-  private dappAddressOrENS: AddressOrENS;
+  private initPromise: Promise<void> | null = null;
 
-  private dappWhitelistAddress: AddressOrENS;
+  private ethProvider: EthersCompatibleProvider;
 
-  private graphQLClient: GraphQLClient;
+  private options: Web3MailConfigOptions;
 
   constructor(
-    ethProvider?:
-      | Eip1193Provider
-      | AbstractProvider
-      | AbstractSigner
-      | Web3SignerProvider
-      | string,
+    ethProvider?: EthersCompatibleProvider,
     options?: Web3MailConfigOptions
   ) {
-    try {
-      this.iexec = new IExec(
-        { ethProvider: ethProvider || 'bellecour' },
-        options?.iexecOptions
-      );
-    } catch (e) {
-      throw Error('Unsupported ethProvider');
-    }
+    this.ethProvider = ethProvider || 'bellecour';
+    this.options = options || {};
+  }
 
-    try {
-      this.dataProtectorSubgraph =
-        options?.dataProtectorSubgraph || DATAPROTECTOR_SUBGRAPH_ENDPOINT;
-      this.graphQLClient = new GraphQLClient(this.dataProtectorSubgraph);
-    } catch (e) {
-      throw Error('Impossible to create GraphQLClient');
+  async init(): Promise<void> {
+    if (!this.initPromise) {
+      this.initPromise = this.resolveConfig().then((config) => {
+        this.dappAddressOrENS = config.dappAddressOrENS;
+        this.dappWhitelistAddress = config.dappWhitelistAddress;
+        this.graphQLClient = config.graphQLClient;
+        this.ipfsNode = config.ipfsNode;
+        this.ipfsGateway = config.ipfsGateway;
+        this.defaultWorkerpool = config.defaultWorkerpool;
+        this.iexec = config.iexec;
+      });
     }
-
-    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;
+    return this.initPromise;
   }
 
   async fetchMyContacts(args?: FetchMyContactsParams): Promise<Contact[]> {
+    await this.init();
     await isValidProvider(this.iexec);
+
     return fetchMyContacts({
       ...args,
       iexec: this.iexec,
@@ -82,7 +93,9 @@ export class IExecWeb3mail {
     });
   }
 
-  fetchUserContacts(args: FetchUserContactsParams): Promise<Contact[]> {
+  async fetchUserContacts(args: FetchUserContactsParams): Promise<Contact[]> {
+    await this.init();
+
     return fetchUserContacts({
       ...args,
       iexec: this.iexec,
@@ -93,16 +106,92 @@ export class IExecWeb3mail {
   }
 
   async sendEmail(args: SendEmailParams): Promise<SendEmailResponse> {
+    await this.init();
     await isValidProvider(this.iexec);
     return sendEmail({
       ...args,
+      workerpoolAddressOrEns:
+        args.workerpoolAddressOrEns || this.defaultWorkerpool,
       iexec: this.iexec,
       ipfsNode: this.ipfsNode,
       ipfsGateway: this.ipfsGateway,
       dappAddressOrENS: this.dappAddressOrENS,
       dappWhitelistAddress: this.dappWhitelistAddress,
       graphQLClient: this.graphQLClient,
-      useVoucher: args?.useVoucher,
     });
   }
+
+  private async resolveConfig(): Promise<Web3mailResolvedConfig> {
+    const chainId = await getChainIdFromProvider(this.ethProvider);
+    const chainDefaultConfig = getChainDefaultConfig(chainId, {
+      allowExperimentalNetworks: this.options.allowExperimentalNetworks,
+    });
+
+    const ipfsGateway =
+      this.options?.ipfsGateway || chainDefaultConfig?.ipfsGateway;
+
+    let iexec: IExec, graphQLClient: GraphQLClient;
+
+    try {
+      iexec = new IExec(
+        { ethProvider: this.ethProvider },
+        {
+          ipfsGatewayURL: ipfsGateway,
+          ...this.options?.iexecOptions,
+          allowExperimentalNetworks: this.options.allowExperimentalNetworks,
+        }
+      );
+    } catch (e: any) {
+      throw new Error(`Unsupported ethProvider: ${e.message}`);
+    }
+
+    const subgraphUrl =
+      this.options?.dataProtectorSubgraph ||
+      chainDefaultConfig?.dataProtectorSubgraph;
+    const dappAddressOrENS =
+      this.options?.dappAddressOrENS ||
+      chainDefaultConfig?.dappAddress ||
+      (await resolveDappAddressFromCompass(
+        await iexec.config.resolveCompassURL(),
+        chainId
+      ));
+    const dappWhitelistAddress =
+      this.options?.dappWhitelistAddress ||
+      chainDefaultConfig?.whitelistSmartContract;
+    const defaultWorkerpool = chainDefaultConfig?.prodWorkerpoolAddress;
+    const ipfsNode =
+      this.options?.ipfsNode || chainDefaultConfig?.ipfsUploadUrl;
+
+    const missing = [];
+    if (!subgraphUrl) missing.push('dataProtectorSubgraph');
+    if (!dappAddressOrENS) missing.push('dappAddress');
+    if (!dappWhitelistAddress) missing.push('whitelistSmartContract');
+    if (!ipfsGateway) missing.push('ipfsGateway');
+    if (!defaultWorkerpool) missing.push('prodWorkerpoolAddress');
+    if (!ipfsNode) missing.push('ipfsUploadUrl');
+
+    if (missing.length > 0) {
+      throw new Error(
+        `Missing required configuration for chainId ${chainId}: ${missing.join(
+          ', '
+        )}`
+      );
+    }
+
+    try {
+      graphQLClient = new GraphQLClient(subgraphUrl);
+    } catch (error: any) {
+      throw new Error(`Failed to create GraphQLClient: ${error.message}`);
+    }
+
+    return {
+      dappAddressOrENS,
+      dappWhitelistAddress: dappWhitelistAddress.toLowerCase(),
+      defaultWorkerpool,
+      graphQLClient,
+      ipfsNode,
+      ipfsGateway,
+      iexec,
+    };
+  }
 }

package/src/web3mail/sendEmail.ts

@@ -1,10 +1,10 @@
 import { Buffer } from 'buffer';
 import {
+  CALLBACK_WEB3MAIL,
   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 { handleIfProtocolError, WorkflowError } from '../utils/errors.js';
 import { generateSecureUniqueId } from '../utils/generateUniqueId.js';
@@ -42,7 +42,7 @@ export type SendEmail = typeof sendEmail;
 export const sendEmail = async ({
   graphQLClient = throwIfMissing(),
   iexec = throwIfMissing(),
-  workerpoolAddressOrEns = PROD_WORKERPOOL_ADDRESS,
+  workerpoolAddressOrEns,
   dappAddressOrENS,
   dappWhitelistAddress,
   ipfsNode,
@@ -269,6 +269,7 @@ export const sendEmail = async ({
         contentType: vContentType,
         senderName: vSenderName,
         emailContentEncryptionKey,
+        useCallback: true,
       })
     );
 
@@ -281,6 +282,7 @@ export const sendEmail = async ({
       workerpoolmaxprice: workerpoolorder.workerpoolprice,
       tag: ['tee', 'scone'],
       workerpool: vWorkerpoolAddressOrEns,
+      callback: CALLBACK_WEB3MAIL,
       params: {
         iexec_secrets: {
           1: requesterSecretId,

package/src/web3mail/types.ts

@@ -108,6 +108,13 @@ export type Web3MailConfigOptions = {
    * If not provided, the default IPFS gateway URL will be used.
    */
   ipfsGateway?: string;
+
+  /**
+   * if true allows using a provider connected to an experimental networks (default false)
+   *
+   * ⚠️ experimental networks are networks on which the iExec's stack is partially deployed, experimental networks can be subject to instabilities or discontinuity. Access is provided without warranties.
+   */
+  allowExperimentalNetworks?: boolean;
 };
 
 export type DappAddressConsumer = {