Merge branch 'main' into renovate/configure

Author: Le-Caignec

.drone.yml

@@ -180,23 +180,18 @@ steps:
       - graphnode
 
   - name: sms
-    image: iexechub/iexec-sms:7.1.0
+    image: iexechub/iexec-sms:8.7.0
     detach: true
     environment:
-      TZ: Europe/Paris
+      JAVA_TOOL_OPTIONS: '-Xmx256M'
       IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
       IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
-      IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-pre-compute:7.1.0-sconify-5.3.15-debug
-      IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 9f0f782d6edc611baa23ca0978f555ee58ea70e092640c961e75c25e9e4b0f22
-      IEXEC_TEE_WORKER_PRE_COMPUTE_HEAP_SIZE_GB: 4
-      IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-post-compute:7.1.1-sconify-5.3.15-debug
-      IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: face1376b97131e2dc75a556381d47a2e03bed9e1bc11e462471f99d1eefae50
-      IEXEC_TEE_WORKER_POST_COMPUTE_HEAP_SIZE_GB: 4
-      IEXEC_IGNORED_SGX_ADVISORIES: INTEL-SA-00161,INTEL-SA-00289,INTEL-SA-00334,INTEL-SA-00381,INTEL-SA-00389,INTEL-SA-00220,INTEL-SA-00270,INTEL-SA-00293,INTEL-SA-00320,INTEL-SA-00329,INTEL-SA-00477
-      IEXEC_SCONE_TOLERATED_INSECURE_OPTIONS: debug-mode,hyperthreading,outdated-tcb
-      IEXEC_SMS_DISPLAY_DEBUG_SESSION: 'true'
-      IEXEC_SCONE_CAS_HOST: foo
-      IEXEC_SMS_IMAGE_LAS_IMAGE: foo
+      IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
+      IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
+      IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
+      IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 'pre-compute-fingerprint'
+      IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
+      IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
     expose:
       - 13300
     depends_on:

CHANGELOG.md

@@ -2,16 +2,30 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.1]
+
+### Changed
+
+- Migrated Bellecour subgraph URL to `https://thegraph.iex.ec/...`
+
+## [1.2.0]
+
+### Changed
+
+- Upgraded the iexec dependency to ^8.13.1, which includes:
+  - Migrated default SMS URL to https://sms.iex.ec.
+  - Migrated from the deprecated SMS apps secrets endpoint.
+
 ## [1.1.1]
 
-## Changed
+### 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
+### Added
 
 - support for iExec voucher in `sendEmail()` via `useVoucher` option
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec/web3mail",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
   "main": "./dist/index.js",
   "type": "module",
@@ -52,7 +52,7 @@
     "buffer": "^6.0.3",
     "ethers": "^6.13.2",
     "graphql-request": "^6.1.0",
-    "iexec": "^8.12.0",
+    "iexec": "^8.13.1",
     "kubo-rpc-client": "^4.1.1",
     "yup": "^1.1.1"
   },

package.json

@@ -1,7 +1,7 @@
 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-product.iex.ec/subgraphs/name/bellecour/dataprotector-v2';
+  '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;

src/config/config.ts

@@ -282,7 +282,6 @@ export const sendEmail = async ({
       tag: ['tee', 'scone'],
       workerpool: vWorkerpoolAddressOrEns,
       params: {
-        iexec_developer_logger: true,
         iexec_secrets: {
           1: requesterSecretId,
         },

src/web3mail/sendEmail.ts

@@ -9,32 +9,29 @@ services:
     ports:
       - 8545:8545
     healthcheck:
-      test: nc -z 0.0.0.0 8545
+      test: (echo >/dev/tcp/$(hostname)/8545) &>/dev/null
       interval: 10s
       timeout: 5s
       retries: 3
       start_period: 30s
 
   sms:
-    image: iexechub/iexec-sms:7.1.0
+    image: iexechub/iexec-sms:8.7.0
     restart: unless-stopped
     environment:
-      TZ: Europe/Paris
+      JAVA_TOOL_OPTIONS: '-Xmx256M'
       IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
       IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
-      IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-pre-compute:7.1.0-sconify-5.3.15-debug
-      IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 9f0f782d6edc611baa23ca0978f555ee58ea70e092640c961e75c25e9e4b0f22
-      IEXEC_TEE_WORKER_PRE_COMPUTE_HEAP_SIZE_GB: 4
-      IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: docker.io/iexechub/tee-worker-post-compute:7.1.1-sconify-5.3.15-debug
-      IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: face1376b97131e2dc75a556381d47a2e03bed9e1bc11e462471f99d1eefae50
-      IEXEC_TEE_WORKER_POST_COMPUTE_HEAP_SIZE_GB: 4
-      IEXEC_IGNORED_SGX_ADVISORIES: INTEL-SA-00161,INTEL-SA-00289,INTEL-SA-00334,INTEL-SA-00381,INTEL-SA-00389,INTEL-SA-00220,INTEL-SA-00270,INTEL-SA-00293,INTEL-SA-00320,INTEL-SA-00329,INTEL-SA-00477
-      IEXEC_SCONE_TOLERATED_INSECURE_OPTIONS: debug-mode,hyperthreading,outdated-tcb
-      IEXEC_SMS_DISPLAY_DEBUG_SESSION: 'true'
-      IEXEC_SCONE_CAS_HOST: foo
-      IEXEC_SMS_IMAGE_LAS_IMAGE: foo
+      IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
+      IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
+      IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
+      IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 'pre-compute-fingerprint'
+      IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
+      IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
     ports:
       - 13300:13300
+    healthcheck:
+      test: curl -f localhost:13300/actuator/health || exit 1
     depends_on:
       bellecour-fork:
         condition: service_healthy
@@ -244,7 +241,7 @@ services:
       graphnode:
         condition: service_healthy
       sms:
-        condition: service_started
+        condition: service_healthy
       market-watcher:
         condition: service_started
       market-api: