Merge branch 'next' into feature/services-domains-migration

Author: PierreJeanjacquot

.drone.yml

@@ -154,23 +154,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:
@@ -184,23 +179,18 @@ steps:
       - sms
 
   - name: sms-gramine
-    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

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - migrated SMS default URL (<https://sms.iex.ec>)
+- migrated from SMS deprecated apps secrets endpoint
 
 ## [8.13.0] 2025-01-21
 

src/common/sms/check.js

@@ -1,10 +1,6 @@
 import Debug from 'debug';
 import { httpRequest } from '../utils/api-utils.js';
-import {
-  addressSchema,
-  throwIfMissing,
-  positiveIntSchema,
-} from '../utils/validator.js';
+import { addressSchema, throwIfMissing } from '../utils/validator.js';
 import { SmsCallError } from '../utils/errors.js';
 
 const debug = Debug('iexec:sms:check');
@@ -147,22 +143,20 @@ export const checkAppSecretExists = async (
   contracts = throwIfMissing(),
   smsURL = throwIfMissing(),
   appAddress = throwIfMissing(),
-  secretIndex = 1,
 ) => {
   try {
     const vAppAddress = await addressSchema({
       ethProvider: contracts.provider,
     }).validate(appAddress);
-    const vSecretIndex = await positiveIntSchema().validate(secretIndex);
     const kindOfSecret = 'app';
-    const secretId = `${vAppAddress}|${vSecretIndex}`;
+    const secretId = vAppAddress;
     const cached = checkCache({ smsURL, kindOfSecret, secretId });
     if (cached !== undefined) {
       return cached;
     }
     const res = await httpRequest('HEAD')({
       api: smsURL,
-      endpoint: `/apps/${vAppAddress}/secrets/${vSecretIndex}`,
+      endpoint: `/apps/${vAppAddress}/secrets`,
       ApiCallErrorClass: SmsCallError,
     });
     if (res.ok) {

src/common/sms/push.js

@@ -7,7 +7,6 @@ import {
   addressSchema,
   stringSchema,
   throwIfMissing,
-  positiveIntSchema,
 } from '../utils/validator.js';
 import { wrapPersonalSign } from '../utils/errorWrappers.js';
 import { checkSigner } from '../utils/utils.js';
@@ -225,19 +224,17 @@ export const pushAppSecret = async (
   smsURL = throwIfMissing(),
   appAddress = throwIfMissing(),
   secretValue = throwIfMissing(),
-  secretIndex = 1,
 ) => {
   try {
     checkSigner(contracts);
     const vSignerAddress = await getAddress(contracts);
     const vAppAddress = await addressSchema({
       ethProvider: contracts.provider,
     }).validate(appAddress);
-    const vSecretIndex = await positiveIntSchema().validate(secretIndex);
     await stringSchema().validate(secretValue, { strict: true });
     const challenge = getChallengeForSetWeb2Secret(
       vAppAddress,
-      vSecretIndex.toString(),
+      '1', // used to be secret index (hardcoded to "1")
       secretValue,
     );
     const binaryChallenge = getBytes(challenge);
@@ -246,7 +243,7 @@ export const pushAppSecret = async (
     );
     const res = await httpRequest('POST')({
       api: smsURL,
-      endpoint: `/apps/${vAppAddress}/secrets/${vSecretIndex}`,
+      endpoint: `/apps/${vAppAddress}/secrets`,
       body: secretValue,
       headers: {
         Authorization: auth,

test/docker-compose.yml

@@ -115,49 +115,43 @@ services:
       - 5500:80
 
   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
 
   sms-gramine:
-    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:
       - 13309:13300
+    healthcheck:
+      test: curl -f localhost:13300/actuator/health || exit 1
     depends_on:
       bellecour-fork:
         condition: service_healthy
@@ -287,9 +281,9 @@ services:
       graphnode:
         condition: service_healthy
       sms:
-        condition: service_started
+        condition: service_healthy
       sms-gramine:
-        condition: service_started
+        condition: service_healthy
       market-watcher:
         condition: service_started
       market-api: