Merge pull request #146 from iExecBlockchainComputing/release/8.5.0

Release/8.5.0

Author: jbern0rd

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.5.0]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.5.0) 2024-06-18
+
+### New Features
+
+- Replace `CredentialsService` with `SignerService`. (#143)
+- Allow up to 4 blockchain transactions at the same time. (#144)
+
+### Quality
+
+- Use `Instant` instead of `DateTimeUtils`. (#138)
+- Configure Gradle JVM Test Suite Plugin. (#139)
+
+### Dependency Upgrades
+
+- Upgrade to Gradle 8.7. (#140)
+- Upgrade to `eclipse-temurin:11.0.22_7-jre-focal`. (#141)
+- Upgrade to Spring Boot 2.7.18. (#142)
+- Upgrade to `iexec-commons-poco` 4.1.0. (#145)
+- Upgrade to `iexce-common` 8.5.0. (#145)
+
 ## [[8.4.0]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.4.0) 2024-02-29
 
 ### New Features

Dockerfile

@@ -1,5 +1,5 @@
 # Build app container
-FROM eclipse-temurin:11.0.21_9-jre-focal
+FROM eclipse-temurin:11.0.22_7-jre-focal
 
 ARG jar
 

README.md

@@ -33,7 +33,7 @@ To run properly, the iExec Blockchain Adapter API requires:
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_HUB_ADDRESS`              | Proxy contract address to interact with the iExec on-chain protocol.                                   | Ethereum Address | `0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f` |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_GAS_PRICE_MULTIPLIER`     | Transactions will be sent with `networkGasPrice * gasPriceMultiplier`.                                 | Float            | `1.0`                                        |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_GAS_PRICE_CAP`            | In Wei, will be used for transactions if `networkGasPrice * gasPriceMultiplier > gasPriceCap`.         | Positive integer | `22000000000`                                |
-| `IEXEC_BLOCKCHAIN_ADAPTER_API_MAX_ALLOWED_TX_PER_BLOCK` | Max number of transactions per block, it can either be `1` or `2`.                                     | Positive integer | `1`                                          |
+| `IEXEC_BLOCKCHAIN_ADAPTER_API_MAX_ALLOWED_TX_PER_BLOCK` | Max number of transactions per block, between `1` and `4`.                                             | Positive integer | `1`                                          |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_WALLET_PATH`              | Path to the wallet of the server.                                                                      | String           | `src/main/resources/wallet.json`             |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_WALLET_PASSWORD`          | Password to unlock the wallet of the server.                                                           | String           | `whatever`                                   |
 

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'
 }
 
@@ -46,20 +46,6 @@ allprojects {
     }
 }
 
-sourceSets {
-    itest {
-        java {
-            compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + test.output
-        }
-    }
-}
-
-configurations {
-    itestRuntime.extendsFrom testRuntime
-    itestImplementation.extendsFrom testImplementation
-}
-
 dependencies {
     // Spring framework
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
@@ -84,12 +70,6 @@ dependencies {
 
     // integration tests
     implementation project(':iexec-blockchain-adapter-api-library')
-
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-    testImplementation 'org.awaitility:awaitility'
-
-    itestImplementation "org.testcontainers:junit-jupiter:$testContainersVersion"
 }
 
 springBoot {
@@ -103,16 +83,34 @@ tasks.named("bootJar") {
     }
 }
 
-tasks.register("itest", Test) {
-    doFirst {
-        exec {
-            commandLine 'docker', 'compose', 'pull', '-q'
+testing {
+    suites {
+        configureEach {
+            dependencies {
+                implementation 'org.springframework.boot:spring-boot-starter-test'
+                implementation 'org.awaitility:awaitility'
+            }
+        }
+        test {
+            useJUnitJupiter()
+        }
+        itest(JvmTestSuite) {
+            sources {
+                java {
+                    srcDirs = ['src/itest/java']
+                }
+            }
+            dependencies {
+                implementation project()
+                implementation project(':iexec-blockchain-adapter-api-library')
+                implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
+                implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
+                implementation 'org.apache.commons:commons-lang3'
+                implementation 'org.hibernate.validator:hibernate-validator'
+                implementation "org.testcontainers:junit-jupiter:$testContainersVersion"
+            }
         }
     }
-    group 'Verification'
-    description 'Runs the integration tests.'
-    setTestClassesDirs(sourceSets.itest.output)
-    classpath = sourceSets.itest.runtimeClasspath
 }
 
 publishing {
@@ -135,7 +133,6 @@ publishing {
 
 tasks.withType(Test).configureEach {
     finalizedBy jacocoTestReport
-    useJUnitPlatform()
 }
 
 // sonarqube code coverage requires jacoco XML report

gradle.properties

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

gradle/wrapper/gradle-wrapper.jar

@@ -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

gradle/wrapper/gradle-wrapper.properties

@@ -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

@@ -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
 

gradlew.bat

@@ -9,9 +9,6 @@ dependencies {
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
     implementation 'org.apache.commons:commons-lang3:3.12.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
-    testImplementation 'org.mockito:mockito-junit-jupiter:4.5.1'
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 java {
@@ -21,8 +18,20 @@ java {
     withSourcesJar()
 }
 
-test {
-    useJUnitPlatform()
+testing {
+    suites {
+        test {
+            useJUnitJupiter()
+            dependencies {
+                implementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+                implementation 'org.mockito:mockito-junit-jupiter:4.5.1'
+            }
+        }
+    }
+}
+
+tasks.withType(Test).configureEach {
+    finalizedBy jacocoTestReport
 }
 
 // sonarqube code coverage requires jacoco XML report
@@ -31,7 +40,6 @@ jacocoTestReport {
         xml.required = true
     }
 }
-tasks.test.finalizedBy tasks.jacocoTestReport
 
 publishing {
     publications {