Merge pull request #752 from iExecBlockchainComputing/release/9.0.0

Author: jbern0rd

CHANGELOG.md

@@ -2,6 +2,54 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[9.0.0]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v9.0.0) 2025-04-01
+
+### New Features
+
+- Add WebSocketBlockchainListener to fetch latest block without polling the blockchain network. (#747)
+- Update last seen block in configuration collection when no deal has been detected in the last hour. (#750)
+- Update configuration collection depending on chain.start-block-number at startup. (#750)
+
+### Bug Fixes
+
+- Remove TaskResultUploadTimeout detector, covered by FinalDeadlineTaskDetector. (#732)
+
+### Quality
+
+- Configuration server is now optional by default. (#728)
+- Improve switch statements after Java 17 migration. (#729)
+- Remove redundant blockchain calls to diminish pressure on Ethereum JSON-RPC API. (#734)
+- Compute alive workers metrics in `WorkerService#updateMetrics` scheduled job. (#739 #745)
+- Fix Spring Security deprecations after Spring Boot 3.3.8 upgrade. (#740)
+- Remove code related to reopen PoCo feature in `IexecHubService` and `TaskUpdateManager`. (#743)
+- Fix several issues raised by SonarQube Cloud. (#749)
+
+### Breaking API changes
+
+- Remove deprecated blockhainAdapterUrl field from PublicConfiguration. (#730)
+- Remove deprecated REST endpoints in TaskController. (#731)
+- Move `WorkerModel` from `iexec-common` to `iexec-core-library`. (#735)
+- Move `TaskAbortCause` from `iexec-commons-poco` to `iexec-core-library`. (#736)
+- Remove deprecated methods in `iexec-core-library`. (#737)
+- Remove unused `ContributionUtils` class. (#738)
+- Rework metrics to expose count of computing CPUs or GPUs instead of available ones. (#739)
+- Harmonize YML internal variables to proper case. (#744)
+- Merge split URL configuration properties (protocol, host, port) to a single URL field to offer URL validation at startup. (#748)
+
+### Dependency Upgrades
+
+- Upgrade to `eclipse-temurin:17.0.13_11-jre-focal`. (#728)
+- Upgrade to Spring Cloud 2022.0.5. (#728)
+- Upgrade to Mongock 5.4.0. (#728)
+- Upgrade to Spring Doc OpenAPI 2.6.0. (#728)
+- Upgrade to Spring Boot 3.3.8. (#733)
+- Upgrade to `java-ipfs-http-client` 1.4.4. (#741)
+- Upgrade to `iexec-commons-poco` 5.0.0. (#751)
+- Upgrade to `iexec-common` 9.0.0. (#751)
+- Upgrade to `iexec-blockchain-adapter-api-library` 9.0.0. (#751)
+- Upgrade to `iexec-result-proxy-library` 9.0.0. (#751)
+- Upgrade to `iexec-sms-library` 9.0.0. (#751)
+
 ## [[8.6.0]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.6.0) 2024-12-23
 
 ### New Features

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.24_8-jre-focal
+FROM eclipse-temurin:17.0.13_11-jre-focal
 
 ARG jar
 

README.md

@@ -34,31 +34,26 @@ You can configure the _iExec Core Scheduler_ with the following properties:
 | `IEXEC_WORKERS_WHITELIST` | List of worker addresses allowed to connect to the _iExec Core Scheduler_. | String | |
 | `IEXEC_CORE_WALLET_PATH` | Path to the wallet of the server. | String | `./src/main/resources/wallet/encrypted-wallet_scheduler.json` |
 | `IEXEC_CORE_WALLET_PASSWORD` | Password to unlock the wallet of the server. | String | `whatever` |
-| `IEXEC_PRIVATE_CHAIN_ADDRESS` | Private URL to connect to the blockchain node. | URL | `http://localhost:8545` |
+| `IEXEC_BLOCKCHAIN_NODE_ADDRESS` | Private URL to connect to the blockchain node. | URL | `http://localhost:8545` |
 | `POOL_ADDRESS` | On-chain address of the workerpool managed by the current _iExec Core Scheduler_. | String | `0x365E7BABAa85eC61Dffe5b520763062e6C29dA27` |
 | `IEXEC_START_BLOCK_NUMBER` | Subscribe to new deal events from a specific block number. | Positive integer | `0` |
 | `IEXEC_GAS_PRICE_MULTIPLIER` | Transactions will be sent with `networkGasPrice * gasPriceMultiplier`. | Float | `1.0` |
 | `IEXEC_GAS_PRICE_CAP` | In Wei, will be used for transactions if `networkGasPrice * gasPriceMultiplier > gasPriceCap` | Integer | `22000000000` |
-| `IEXEC_CORE_CHAIN_ADAPTER_PROTOCOL` | _iExec Blockchain Adapter_ communication protocol. | String | `http` |
-| `IEXEC_CORE_CHAIN_ADAPTER_HOST` | _iExec Blockchain Adapter_ server host. | String | `localhost` |
-| `IEXEC_CORE_CHAIN_ADAPTER_PORT` | _iExec Blockchain Adapter_ server port. | Positive integer | `13010` |
+| `IEXEC_CORE_CHAIN_ADAPTER_URL` | _iExec Blockchain Adapter_ communication url. | String | `http://localhost:13010`|
 | `IEXEC_CORE_CHAIN_ADAPTER_USERNAME` | Username to connect to the _iExec Blockchain Adapter_ server. | String | `admin` |
 | `IEXEC_CORE_CHAIN_ADAPTER_PASSWORD` | Password to connect to the _iExec Blockchain Adapter_ server. | String | `whatever` |
-| `IEXEC_CONFIG_SERVER_PROTOCOL` | _iExec Config Server_ communication protocol. | String | `http` |
-| `IEXEC_CONFIG_SERVER_HOST` | _iExec Config Server_ host. | String | `localhost` |
-| `IEXEC_CONFIG_SERVER_PORT` | _iExec Config Server_ port. | Positive integer | `8888` |
-| `IEXEC_RESULT_REPOSITORY_PROTOCOL` | _iExec Result Proxy_ server communication protocol. | String | `http` |
-| `IEXEC_RESULT_REPOSITORY_HOST` | _iExec Result Proxy_ server host. | String | `localhost` |
-| `IEXEC_RESULT_REPOSITORY_PORT` | _iExec Result Proxy_ server port. | Positive integer | `13200` |
+| `IEXEC_CONFIG_SERVER_URL` | _iExec Config Server_ communication url. | String | `http://localhost:8888`|
+| `IEXEC_RESULT_REPOSITORY_URL` | _iExec Result Proxy_ server communication url. | String | `http://localhost:13200`|
 | `IEXEC_CORE_MANAGEMENT_ACTUATORS` | Endpoint IDs that should be included or `*` for all. | String | `health, info` |
 | `IEXEC_LOGS_PURGE_RATE_IN_DAYS` | Interval in days between 2 executions of the purge mechanism. | Positive integer | `1` |
 | `IEXEC_LOGS_AVAILABILITY_PERIOD_IN_DAYS` | Number of days to keep logs of past tasks. | Positive integer | `3` |
 
 If it is not the first startup of the _iExec Core Scheduler_ and if it received deals previously,
-the _MongoDB_ instance will contain a __configuration Collection__ in the __iexec Database__.
-The value stored in this document takes the precedence over the `IEXEC_START_BLOCK_NUMBER` configuration parameter.
-To enforce deal observation starting from the `IEXEC_START_BLOCK_NUMBER` value, the aforementioned document has to be deleted in the _MongoDB_.
-All deals prior to the `IEXEC_START_BLOCK_NUMBER` will then be ignored.
+the _MongoDB_ instance will contain both __configuration__ and __replayConfiguration__ collections in the __iexec Database__.
+The highest value between the value stored in this document and the `IEXEC_START_BLOCK_NUMBER` configuration parameter takes precedence.
+If the stored value takes precedence, the `IEXEC_START_BLOCK_NUMBER` is ignored.
+Otherwise, the __configuration__ and __replayConfiguration__ collections will be updated with `IEXEC_START_BLOCK_NUMBER` during startup.
+All deals between the previous configured value and the `IEXEC_START_BLOCK_NUMBER` will then be ignored.
 
 A more exhaustive documentation is available on [the official documentation of iExec](https://docs.iex.ec/).
 

build.gradle

@@ -1,17 +1,17 @@
 plugins {
     id 'java'
     id 'io.freefair.lombok' version '8.10.2'
-    id 'org.springframework.boot' version '2.7.18'
+    id 'org.springframework.boot' version '3.3.8'
     id 'io.spring.dependency-management' version '1.1.6'
     id 'jacoco'
     id 'org.sonarqube' version '5.1.0.4882'
     id 'maven-publish'
 }
 
 ext {
-    springCloudVersion = '2021.0.8'
+    springCloudVersion = '2023.0.5'
     jjwtVersion = '0.11.5'
-    mongockVersion = '4.2.7.BETA'
+    mongockVersion = '5.4.0'
     testContainersVersion = '1.20.4'
 }
 
@@ -40,8 +40,12 @@ allprojects {
         toolchain {
             languageVersion.set(JavaLanguageVersion.of(17))
         }
-        sourceCompatibility = "11"
-        targetCompatibility = "11"
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        options.compilerArgs.add('-parameters')
     }
 }
 
@@ -75,7 +79,7 @@ dependencies {
     implementation "org.springframework.retry:spring-retry"
 
     // Spring Doc
-    implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
 
     // apache commons.lang3
     implementation 'org.apache.commons:commons-lang3'
@@ -89,14 +93,14 @@ dependencies {
     implementation "net.jodah:expiringmap:0.5.10"
 
     // ipfs
-    implementation "com.github.ipfs:java-ipfs-http-client:1.2.3"
+    implementation "com.github.ipfs:java-ipfs-http-client:1.4.4"
 
     // observability
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
 
     // mongock
-    implementation "com.github.cloudyrock.mongock:mongock-spring-v5:${mongockVersion}"
-    implementation "com.github.cloudyrock.mongock:mongodb-springdata-v2-driver:${mongockVersion}"
+    implementation "io.mongock:mongock-springboot-v3:${mongockVersion}"
+    implementation "io.mongock:mongodb-springdata-v4-driver:${mongockVersion}"
 
     // vavr
     implementation 'io.vavr:vavr:0.10.4'
@@ -118,11 +122,11 @@ testing {
         test {
             useJUnitJupiter()
             dependencies {
-                implementation 'org.springframework.boot:spring-boot-starter-test'
-
                 // awaitility
                 implementation 'org.awaitility:awaitility'
 
+                implementation 'org.springframework.boot:spring-boot-starter-test'
+
                 // mongo
                 implementation "org.testcontainers:junit-jupiter:$testContainersVersion"
                 implementation "org.testcontainers:mongodb:$testContainersVersion"

docker-compose.yml

@@ -0,0 +1,18 @@
+services:
+
+  chain:
+    image: docker-regis.iex.ec/poco-chain:1.0.0-poco-v5.5.0-voucher-v1.0.0-nethermind
+    expose:
+      - "8545"
+
+  config-server:
+    image: wiremock/wiremock:3.3.1
+    expose:
+      - "8080"
+    volumes:
+      - "./src/test/resources/wiremock/mappings:/home/wiremock/mappings"
+
+  mongo:
+    image: library/mongo:7.0.15-jammy
+    expose:
+      - "27017"

gradle.properties

@@ -1,8 +1,8 @@
-version=8.6.0
-iexecCommonsPocoVersion=4.2.0
-iexecCommonVersion=8.6.0
-iexecBlockchainAdapterVersion=8.6.0
-iexecResultVersion=8.6.0
-iexecSmsVersion=8.7.0
+version=9.0.0
+iexecCommonsPocoVersion=5.0.0
+iexecCommonVersion=9.0.0
+iexecBlockchainAdapterVersion=9.0.0
+iexecResultVersion=9.0.0
+iexecSmsVersion=9.0.0
 nexusUser
 nexusPassword

iexec-core-library/build.gradle

@@ -6,26 +6,29 @@ plugins {
 }
 
 dependencies {
+    implementation platform("org.springframework.boot:spring-boot-dependencies:3.3.8")
+
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
-    // TODO remove this later when migration has been done
-    implementation project(':iexec-task-api')
 }
 
 java {
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     withJavadocJar()
     withSourcesJar()
 }
 
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs.add('-parameters')
+}
+
 testing {
     suites {
         test {
             useJUnitJupiter()
             dependencies {
-                implementation 'org.junit.jupiter:junit-jupiter:5.8.2'
-                implementation 'org.assertj:assertj-core:3.22.0'
+                implementation 'org.assertj:assertj-core'
             }
         }
     }

iexec-core-library/src/main/java/com/iexec/core/api/SchedulerClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2023-2025 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,32 +16,20 @@
 
 package com.iexec.core.api;
 
-import com.iexec.common.config.WorkerModel;
-import com.iexec.common.replicate.ComputeLogs;
 import com.iexec.common.replicate.ReplicateStatusUpdate;
-import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import com.iexec.commons.poco.security.Signature;
 import com.iexec.core.config.PublicConfiguration;
-import com.iexec.core.logs.TaskLogsModel;
-import com.iexec.core.metric.PlatformMetric;
+import com.iexec.core.config.WorkerModel;
 import com.iexec.core.notification.TaskNotification;
 import com.iexec.core.notification.TaskNotificationType;
 import com.iexec.core.replicate.ReplicateTaskSummary;
-import com.iexec.core.task.TaskModel;
 import feign.Headers;
 import feign.Param;
 import feign.RequestLine;
 
 import java.util.List;
 
 public interface SchedulerClient {
-    /**
-     * @deprecated Use iexec-task-feedback-api
-     */
-    @Deprecated(forRemoval = true)
-    @RequestLine("GET /metrics")
-    PlatformMetric getMetrics();
-
     @RequestLine("GET /version")
     String getCoreVersion();
 
@@ -87,42 +75,4 @@ TaskNotificationType updateReplicateStatus(
             ReplicateStatusUpdate replicateStatusUpdate
     );
     // endregion
-
-    // region /tasks
-
-    /**
-     * @deprecated Use iexec-task-feedback-api
-     */
-    @Deprecated(forRemoval = true)
-    @RequestLine("GET /tasks/{chainTaskId}")
-    TaskModel getTask(@Param("chainTaskId") String chainTaskId);
-
-    /**
-     * @deprecated Use iexec-task-feedback-api
-     */
-    @Deprecated(forRemoval = true)
-    @RequestLine("GET /tasks/logs/challenge?address={address}")
-    EIP712Challenge getTaskLogsChallenge(@Param("address") String address);
-
-    /**
-     * @deprecated Use iexec-task-feedback-api
-     */
-    @Deprecated(forRemoval = true)
-    @Headers("Authorization: {authorization}")
-    @RequestLine("GET /tasks/{chainTaskId}/logs")
-    TaskLogsModel getTaskLogs(
-            @Param("chainTaskId") String chainTaskId,
-            @Param("authorization") String authorization);
-
-    /**
-     * @deprecated Use iexec-task-feedback-api
-     */
-    @Deprecated(forRemoval = true)
-    @Headers("Authorization: {authorization}")
-    @RequestLine("GET /tasks/{chainTaskId}/replicates/{walletAddress}/logs")
-    ComputeLogs getComputeLogs(
-            @Param("chainTaskId") String chainTaskId,
-            @Param("walletAddress") String walletAddress,
-            @Param("authorization") String authorization);
-    // endregion
 }

iexec-core-library/src/main/java/com/iexec/core/config/PublicConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 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.
@@ -22,22 +22,14 @@
 import lombok.Value;
 
 /**
- * The {@link #blockchainAdapterUrl} and {@link #configServerUrl} fields are repetitive,
- * so if both are populated, they must contain the same value.
- * Duplicating these fields ensures worker/scheduler compatibility on different v8 versions.
- * In v9, the {@link #blockchainAdapterUrl} field will be removed.
+ * Configuration exposed by the scheduler and available publicly to all workers.
  */
 @Value
 @Builder
 @JsonDeserialize(builder = PublicConfiguration.PublicConfigurationBuilder.class)
 public class PublicConfiguration {
     String workerPoolAddress;
     String schedulerPublicAddress;
-    /**
-     * @deprecated Use {@link #configServerUrl} instead.
-     */
-    @Deprecated(forRemoval = true)
-    String blockchainAdapterUrl;
     String configServerUrl;
     String resultRepositoryURL;
     long askForReplicatePeriod;