Release/sdk 1.1.1 (#171)

* use voucher-subgraph-deployer semver

* Update builder dashboard URLs in error messages (#170)

* Update changelog

* 1.1.1

* Only fetch user specific workerpool orders if useVoucher

* Fix unit test with isRequesterStrict

* Update changelog

---------

Co-authored-by: Pierre Jeanjacquot <[email protected]>

Author: cedric25

.drone.yml

@@ -302,7 +302,7 @@ steps:
 
   - name: voucher-subgraph-deployer
     # https://github.com/iExecBlockchainComputing/iexec-voucher-subgraph
-    image: iexechub/voucher-subgraph-deployer:c0640e8d
+    image: iexechub/voucher-subgraph-deployer:1.0.0
     pull: always
     environment:
       RPC_URL: http://bellecour-fork:8545

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.1]
+
+## Changed
+
+- Update builder dashboard URL in some error messages related to `sendEmail()` method
+- Use user specific workerpool orders if `useVoucher` is set to `true` 
+
 ## [1.1.0]
 
 ## Added

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec/web3mail",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
   "main": "./dist/index.js",
   "type": "module",

package.json

@@ -27,13 +27,13 @@ export function checkUserVoucher({
 }) {
   if (bnToNumber(userVoucher.expirationTimestamp) < Date.now() / 1000) {
     throw new Error(
-      'Oops, it seems your voucher has expired. You might want to ask for a top up. Check on https://builder-dashboard.iex.ec/'
+      'Oops, it seems your voucher has expired. You might want to ask for a top up. Check on https://builder.iex.ec/'
     );
   }
 
   if (bnToNumber(userVoucher.balance) === 0) {
     throw new Error(
-      'Oops, it seems your voucher is empty. You might want to ask for a top up. Check on https://builder-dashboard.iex.ec/'
+      'Oops, it seems your voucher is empty. You might want to ask for a top up. Check on https://builder.iex.ec/'
     );
   }
 }

src/web3mail/sendEmail.models.ts

@@ -130,7 +130,7 @@ export const sendEmail = async ({
     } catch (err) {
       if (err?.message?.startsWith('No Voucher found for address')) {
         throw new Error(
-          'Oops, it seems your wallet is not associated with any voucher. Check on https://builder-dashboard.iex.ec/'
+          'Oops, it seems your wallet is not associated with any voucher. Check on https://builder.iex.ec/'
         );
       }
       throw err;
@@ -193,6 +193,7 @@ export const sendEmail = async ({
           app: vDappAddressOrENS,
           dataset: vDatasetAddress,
           requester: requesterAddress, // public orders + user specific orders
+          isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
           minTag: ['tee', 'scone'],
           maxTag: ['tee', 'scone'],
           category: 0,
@@ -203,6 +204,7 @@ export const sendEmail = async ({
           app: vDappWhitelistAddress,
           dataset: vDatasetAddress,
           requester: requesterAddress, // public orders + user specific orders
+          isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
           minTag: ['tee', 'scone'],
           maxTag: ['tee', 'scone'],
           category: 0,

src/web3mail/sendEmail.ts

@@ -220,7 +220,7 @@ services:
   voucher-subgraph-deployer:
     restart: 'no'
     # https://github.com/iExecBlockchainComputing/iexec-voucher-subgraph
-    image: iexechub/voucher-subgraph-deployer:c0640e8d
+    image: iexechub/voucher-subgraph-deployer:1.0.0
     environment:
       RPC_URL: http://bellecour-fork:8545
       GRAPHNODE_URL: http://graphnode:8020

tests/docker-compose.yml

@@ -388,7 +388,7 @@ describe('web3mail.sendEmail()', () => {
         }
         expect(error).toBeDefined();
         expect(error.message).toBe(
-          'Oops, it seems your wallet is not associated with any voucher. Check on https://builder-dashboard.iex.ec/'
+          'Oops, it seems your wallet is not associated with any voucher. Check on https://builder.iex.ec/'
         );
       },
       2 * MAX_EXPECTED_BLOCKTIME + MAX_EXPECTED_WEB2_SERVICES_TIME

tests/e2e/sendEmail.test.ts

@@ -36,7 +36,7 @@ describe('sendEmail.models', () => {
           })
         ).toThrow(
           new Error(
-            'Oops, it seems your voucher has expired. You might want to ask for a top up. Check on https://builder-dashboard.iex.ec/'
+            'Oops, it seems your voucher has expired. You might want to ask for a top up. Check on https://builder.iex.ec/'
           )
         );
       });
@@ -56,7 +56,7 @@ describe('sendEmail.models', () => {
           })
         ).toThrow(
           new Error(
-            'Oops, it seems your voucher is empty. You might want to ask for a top up. Check on https://builder-dashboard.iex.ec/'
+            'Oops, it seems your voucher is empty. You might want to ask for a top up. Check on https://builder.iex.ec/'
           )
         );
       });

tests/unit/sendEmail.models.test.ts

@@ -196,6 +196,7 @@ describe('sendEmail', () => {
           app: WEB3_MAIL_DAPP_ADDRESS,
           dataset: protectedData,
           requester: userAddress,
+          isRequesterStrict: false,
           minTag: ['tee', 'scone'],
           maxTag: ['tee', 'scone'],
           category: 0,
@@ -208,6 +209,7 @@ describe('sendEmail', () => {
           app: WHITELIST_SMART_CONTRACT_ADDRESS.toLowerCase(),
           dataset: protectedData,
           requester: userAddress,
+          isRequesterStrict: false,
           minTag: ['tee', 'scone'],
           maxTag: ['tee', 'scone'],
           category: 0,