Merge pull request #267 from iExecBlockchainComputing/release/8.6.0

Release/8.6.0

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.6.0]](https://github.com/iExecBlockchainComputing/iexec-sms/releases/tag/v8.6.0) 2024-06-18
+
+### New Features
+
+- Replace `CredentialsService` with `SignerService`. (#264)
+
+### Quality
+
+- Configure Gradle JVM Test Suite Plugin. (#259)
+- Replace `SECURE_SESSION_NO_TEE_PROVIDER` with `SECURE_SESSION_NO_TEE_FRAMEWORK`
+  in `TeeSessionGenerationError`. (#265)
+- Add `final` keyword in `EncryptionService`. (#268)
+
+### Dependency Upgrades
+
+- Upgrade to Gradle 8.7. (#260)
+- Upgrade to `eclipse-temurin:11.0.22_7-jre-focal`. (#261)
+- Upgrade to Spring Boot 2.7.18. (#262)
+- Upgrade to sconify tools and Scone runtime 5.8.8 for SGX enclaves. (#263)
+- Upgrade to `iexec-commons-poco` 4.1.0. (#266)
+- Upgrade to `iexce-common` 8.5.0. (#266)
+
 ## [[8.5.1]](https://github.com/iExecBlockchainComputing/iexec-sms/releases/tag/v8.5.1) 2024-04-02
 
 ### New Features

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.21_9-jre-focal
+FROM eclipse-temurin:11.0.22_7-jre-focal
 
 ARG jar
 

Jenkinsfile

@@ -29,5 +29,5 @@ sconeBuildUnlocked(
         imageTag:        buildInfo.imageTag,
         sconifyArgsPath: './docker/sconify.args',
         sconifyImage:    'scone-debug/iexec-sconify-image-unlocked',
-        sconifyVersion:  '5.7.2-wal'
+        sconifyVersion:  '5.8.8'
 )

build.gradle

@@ -1,10 +1,10 @@
 plugins {
     id 'java'
-    id 'io.freefair.lombok' version '8.2.2'
-    id 'org.springframework.boot' version '2.7.17'
+    id 'io.freefair.lombok' version '8.6'
+    id 'org.springframework.boot' version '2.7.18'
     id 'io.spring.dependency-management' version '1.1.4'
     id 'jacoco'
-    id 'org.sonarqube' version '4.2.1.3168'
+    id 'org.sonarqube' version '5.0.0.4638'
     id 'maven-publish'
 }
 
@@ -44,22 +44,6 @@ allprojects {
     }
 }
 
-sourceSets {
-    integrationTest {
-        java {
-            compileClasspath += sourceSets.main.output
-            runtimeClasspath += sourceSets.main.output
-            srcDir 'src/itest/java'
-        }
-        resources.srcDir 'src/itest/resources'
-    }
-}
-
-configurations {
-    integrationTestImplementation.extendsFrom testImplementation
-    integrationTestRuntimeOnly.extendsFrom runtimeOnly
-}
-
 dependencies {
     // iexec
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
@@ -90,13 +74,6 @@ dependencies {
 
     // expiring map
     implementation "net.jodah:expiringmap:0.5.11"
-
-    // test
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-
-    // awaitility
-    testImplementation 'org.awaitility:awaitility'
 }
 
 springBoot {
@@ -110,17 +87,41 @@ tasks.named("bootJar") {
     }
 }
 
-test {
-    useJUnitPlatform()
+testing {
+    suites {
+        configureEach {
+            dependencies {
+                implementation 'org.springframework.boot:spring-boot-starter-test'
+                runtimeOnly 'com.h2database:h2:2.2.222'
+            }
+        }
+        test {
+            useJUnitJupiter()
+            dependencies {
+                implementation 'org.awaitility:awaitility'
+            }
+        }
+        itest(JvmTestSuite) {
+            sources {
+                java {
+                    srcDirs = ['src/itest/java']
+                }
+            }
+            dependencies {
+                implementation project()
+                implementation project(':iexec-sms-library')
+                implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
+                implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
+                implementation 'org.apache.commons:commons-lang3'
+                implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+                implementation 'org.springframework.boot:spring-boot-starter-web'
+            }
+        }
+    }
 }
 
-tasks.register('itest', Test) {
-    group 'Verification'
-    description 'Runs the integration tests.'
-    testClassesDirs = sourceSets.integrationTest.output.classesDirs
-    classpath = sourceSets.integrationTest.runtimeClasspath
-    outputs.upToDateWhen { false } // run always
-    useJUnitPlatform()
+tasks.withType(Test).configureEach {
+    finalizedBy tasks.jacocoTestReport
 }
 
 // sonarqube code coverage requires jacoco XML report
@@ -129,7 +130,6 @@ jacocoTestReport {
         xml.required = true
     }
 }
-tasks.test.finalizedBy tasks.jacocoTestReport
 tasks.sonarqube.dependsOn tasks.jacocoTestReport
 
 publishing {

docker/sconify.args

@@ -8,5 +8,6 @@
 --stack="8M" \
 --binary-fs \
 --fs-dir=/app \
+--mprotect=1 \
 --host-path=/etc/hosts \
 --host-path=/etc/resolv.conf \

docker/sconify.sh

@@ -3,7 +3,7 @@
 cd $(dirname $0)
 
 SCONE_IMG_NAME=scone-debug/iexec-sconify-image-unlocked
-SCONE_IMG_VERSION=5.7.2-wal
+SCONE_IMG_VERSION=5.8.8
 
 IMG_TO=${IMG_FROM}-sconify-${SCONE_IMG_VERSION}-debug
 

gradle.properties

@@ -1,6 +1,6 @@
-version=8.5.1
-iexecCommonVersion=8.4.0
-iexecCommonsPocoVersion=3.2.0
+version=8.6.0
+iexecCommonVersion=8.5.0
+iexecCommonsPocoVersion=4.1.0
 
 nexusUser
 nexusPassword

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

iexec-sms-library/build.gradle

@@ -8,10 +8,6 @@ plugins {
 dependencies {
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
-    testImplementation "org.assertj:assertj-core:3.22.0"
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-    testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0'
 }
 
 java {
@@ -21,8 +17,21 @@ java {
     withSourcesJar()
 }
 
-test {
-    useJUnitPlatform()
+testing {
+    suites {
+        test {
+            useJUnitJupiter()
+            dependencies {
+                implementation "org.assertj:assertj-core:3.22.0"
+                implementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+                implementation 'org.mockito:mockito-junit-jupiter:4.7.0'
+            }
+        }
+    }
+}
+
+tasks.withType(Test).configureEach {
+    finalizedBy tasks.jacocoTestReport
 }
 
 // sonarqube code coverage requires jacoco XML report
@@ -31,7 +40,6 @@ jacocoTestReport {
         xml.required = true
     }
 }
-tasks.test.finalizedBy    tasks.jacocoTestReport
 
 publishing {
     publications {
@@ -45,7 +53,7 @@ publishing {
                 username nexusUser
                 password nexusPassword
             }
-            url = project.hasProperty("nexusUrl")? project.nexusUrl: ''
+            url = project.hasProperty("nexusUrl") ? project.nexusUrl : ''
         }
     }
 }

iexec-sms-library/src/main/java/com/iexec/sms/api/TeeSessionGenerationError.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 IEXEC BLOCKCHAIN TECH
+ * Copyright 2022-2024 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,16 +49,16 @@ public enum TeeSessionGenerationError {
     // region Secure session generation
     SECURE_SESSION_STORAGE_CALL_FAILED,
     SECURE_SESSION_GENERATION_FAILED,
+    SECURE_SESSION_NO_TEE_FRAMEWORK,
+    @Deprecated(forRemoval = true)
     SECURE_SESSION_NO_TEE_PROVIDER,
-    SECURE_SESSION_UNKNOWN_TEE_PROVIDER,
     // endregion
 
     // region Miscellaneous
     GET_TASK_DESCRIPTION_FAILED,
     NO_SESSION_REQUEST,
     NO_TASK_DESCRIPTION,
-    GET_SESSION_FAILED,
-
+    // worker side
     UNKNOWN_ISSUE
     // endregion
 }

src/main/java/com/iexec/sms/blockchain/IexecHubService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,19 @@
 
 package com.iexec.sms.blockchain;
 
-
 import com.iexec.commons.poco.chain.IexecHubAbstractService;
+import com.iexec.commons.poco.chain.SignerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 @Service
 public class IexecHubService extends IexecHubAbstractService {
 
     @Autowired
-    public IexecHubService(CredentialsService credentialsService,
+    public IexecHubService(SignerService signerService,
                            Web3jService web3jService,
                            BlockchainConfig blockchainConfig) {
-        super(credentialsService.getCredentials(), web3jService, blockchainConfig.getHubAddress());
+        super(signerService.getCredentials(), web3jService, blockchainConfig.getHubAddress());
     }
 
 }