Merge pull request #160 from iExecBlockchainComputing/release/8.6.0

Release 8.6.0

Author: nabil-Tounarti

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.6.0]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.6.0) 2024-12-20
+
+### Bug Fixes
+
+- Allow null callback data when finalizing a task. (#158)
+
+### Quality
+
+- Use poco-chain with poco v5.5.0 and voucher v1.0.0 in tests. (#152)
+- Rename `tool` package to `chain` package. (#155)
+- Add tests on `TaskFinalizeService` to fix quality threshold regression. (#156 #157)
+
+### Dependency Upgrades
+
+- Upgrade to `eclipse-temurin:11.0.24_8-jre-focal`. (#149)
+- Upgrade to Gradle 8.10.2. (#150)
+- Upgrade to `testcontainers` 1.20.4. (#153)
+- Upgrade to `mongo:7.0.15-jammy`. (#154)
+- Upgrade to `iexec-commons-poco` 4.2.0. (#159)
+- Upgrade to `iexec-common` 8.6.0. (#159)
+
 ## [[8.5.0]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.5.0) 2024-06-18
 
 ### New Features
@@ -20,7 +41,7 @@ All notable changes to this project will be documented in this file.
 - 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)
+- Upgrade to `iexec-common` 8.5.0. (#145)
 
 ## [[8.4.0]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.4.0) 2024-02-29
 

Dockerfile

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

build.gradle

@@ -1,16 +1,16 @@
 plugins {
     id 'java'
-    id 'io.freefair.lombok' version '8.6'
+    id 'io.freefair.lombok' version '8.10.2'
     id 'org.springframework.boot' version '2.7.18'
-    id 'io.spring.dependency-management' version '1.1.4'
+    id 'io.spring.dependency-management' version '1.1.6'
     id 'jacoco'
-    id 'org.sonarqube' version '5.0.0.4638'
+    id 'org.sonarqube' version '5.1.0.4882'
     id 'maven-publish'
 }
 
 ext {
     openFeignVersion = '11.10'
-    testContainersVersion = '1.19.0'
+    testContainersVersion = '1.20.4'
 }
 
 if (!project.hasProperty('gitBranch')) {

docker-compose.yml

@@ -1,11 +1,11 @@
 services:
 
   ibaa-chain:
-    image: docker-regis.iex.ec/poco-chain:native-v5.4.2-5s
+    image: docker-regis.iex.ec/poco-chain:1.0.0-poco-v5.5.0-voucher-v1.0.0-nethermind
     expose:
       - "8545"
 
   ibaa-blockchain-adapter-mongo:
-    image: library/mongo:4.4
-    entrypoint: "/bin/bash"
-    command: -c "mongod --bind_ip_all --port 13012"
+    image: library/mongo:7.0.15-jammy
+    expose:
+      - "27017"

gradle.properties

@@ -1,6 +1,6 @@
-version=8.5.0
-iexecCommonVersion=8.5.0
-iexecCommonsPocoVersion=4.1.0
+version=8.6.0
+iexecCommonVersion=8.6.0
+iexecCommonsPocoVersion=4.2.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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -19,8 +19,8 @@
 import com.iexec.blockchain.api.BlockchainAdapterApiClient;
 import com.iexec.blockchain.api.BlockchainAdapterApiClientBuilder;
 import com.iexec.blockchain.broker.BrokerService;
-import com.iexec.blockchain.tool.ChainConfig;
-import com.iexec.blockchain.tool.IexecHubService;
+import com.iexec.blockchain.chain.ChainConfig;
+import com.iexec.blockchain.chain.IexecHubService;
 import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
 import com.iexec.common.sdk.broker.BrokerOrder;
 import com.iexec.commons.poco.chain.*;
@@ -36,8 +36,6 @@
 import feign.Logger;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -68,6 +66,7 @@
 import static com.iexec.commons.poco.chain.ChainTaskStatus.ACTIVE;
 import static com.iexec.commons.poco.chain.ChainTaskStatus.UNSET;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 @Slf4j
 @Testcontainers
@@ -78,7 +77,7 @@ class IntegrationTests {
     private static final String CHAIN_SVC_NAME = "ibaa-chain";
     private static final int CHAIN_SVC_PORT = 8545;
     private static final String MONGO_SVC_NAME = "ibaa-blockchain-adapter-mongo";
-    private static final int MONGO_SVC_PORT = 13012;
+    private static final int MONGO_SVC_PORT = 27017;
 
     public static final String USER = "admin";
     public static final String PASSWORD = "whatever";
@@ -90,14 +89,14 @@ class IntegrationTests {
 
     @Container
     static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
-            .withPull(true)
             .withExposedService(CHAIN_SVC_NAME, CHAIN_SVC_PORT, Wait.forListeningPort())
-            .withExposedService(MONGO_SVC_NAME, MONGO_SVC_PORT, Wait.forListeningPort());
+            .withExposedService(MONGO_SVC_NAME, MONGO_SVC_PORT, Wait.forListeningPort())
+            .withPull(true);
 
     @DynamicPropertySource
     static void registerProperties(DynamicPropertyRegistry registry) {
         registry.add("chain.id", () -> "65535");
-        registry.add("chain.hubAddress", () -> "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca");
+        registry.add("chain.hubAddress", () -> "0xc4b11f41746D3Ad8504da5B383E1aB9aa969AbC7");
         registry.add("chain.nodeAddress", () -> getServiceUrl(
                 environment.getServiceHost(CHAIN_SVC_NAME, CHAIN_SVC_PORT),
                 environment.getServicePort(CHAIN_SVC_NAME, CHAIN_SVC_PORT)));
@@ -138,18 +137,18 @@ private static String getServiceUrl(String serviceHost, int servicePort) {
     @Test
     void shouldBeFinalized() throws Exception {
         TransactionReceipt receipt;
-        String dealId = triggerDeal(1);
+        final String dealId = triggerDeal(1);
 
-        String chainTaskId = appClient.requestInitializeTask(dealId, 0);
-        Assertions.assertTrue(StringUtils.isNotEmpty(chainTaskId));
+        final String chainTaskId = appClient.requestInitializeTask(dealId, 0);
+        assertThat(chainTaskId).isNotEmpty();
         log.info("Requested task initialize: {}", chainTaskId);
         //should wait since returned taskID is computed, initialize is not mined yet
         waitStatus(chainTaskId, ACTIVE, MAX_POLLING_ATTEMPTS);
 
-        String someBytes32Payload = TeeUtils.TEE_SCONE_ONLY_TAG; //any would be fine
-        String enclaveChallenge = BytesUtils.EMPTY_ADDRESS;
-        String enclaveSignature = BytesUtils.bytesToString(new byte[65]);
-        WorkerpoolAuthorization workerpoolAuthorization =
+        final String someBytes32Payload = TeeUtils.TEE_SCONE_ONLY_TAG; //any would be fine
+        final String enclaveChallenge = BytesUtils.EMPTY_ADDRESS;
+        final String enclaveSignature = BytesUtils.bytesToString(new byte[65]);
+        final WorkerpoolAuthorization workerpoolAuthorization =
                 mockAuthorization(chainTaskId, enclaveChallenge);
         receipt = iexecHubService.contribute(
                 chainTaskId,
@@ -165,9 +164,9 @@ void shouldBeFinalized() throws Exception {
         log.info("reveal {}", receipt);
 
         waitBeforeFinalizing(chainTaskId);
-        TaskFinalizeArgs taskFinalizeArgs = new TaskFinalizeArgs();
-        String finalizeResponseBody = appClient.requestFinalizeTask(chainTaskId, taskFinalizeArgs);
-        Assertions.assertTrue(StringUtils.isNotEmpty(finalizeResponseBody));
+        final TaskFinalizeArgs taskFinalizeArgs = new TaskFinalizeArgs("", "");
+        final String finalizeResponseBody = appClient.requestFinalizeTask(chainTaskId, taskFinalizeArgs);
+        assertThat(finalizeResponseBody).isNotEmpty();
         log.info("Requested task finalize: {}", finalizeResponseBody);
         waitStatus(chainTaskId, ChainTaskStatus.COMPLETED,
                 MAX_POLLING_ATTEMPTS);
@@ -176,14 +175,14 @@ void shouldBeFinalized() throws Exception {
     @Test
     void shouldBurstTransactionsWithAverageOfOneTxPerBlock() {
         int taskVolume = 10;//small volume ensures reasonable execution time on CI/CD
-        String dealId = triggerDeal(taskVolume);
-        List<CompletableFuture<Void>> txCompletionWatchers = new ArrayList<>();
+        final String dealId = triggerDeal(taskVolume);
+        final List<CompletableFuture<Void>> txCompletionWatchers = new ArrayList<>();
 
         IntStream.range(0, taskVolume)
                 .forEach(taskIndex -> {
                     //burst transactions (fast sequence) (send "initialize" tx examples for simplicity)
                     String chainTaskId = appClient.requestInitializeTask(dealId, taskIndex);
-                    Assertions.assertTrue(StringUtils.isNotEmpty(chainTaskId));
+                    assertThat(chainTaskId).isNotEmpty();
                     log.info("Requested task initialize [index:{}, chainTaskId:{}]",
                             taskIndex, chainTaskId);
                     //wait tx completion outside
@@ -205,30 +204,30 @@ void shouldBurstTransactionsWithAverageOfOneTxPerBlock() {
     }
 
     private String triggerDeal(int taskVolume) {
-        int secondsPollingInterval = POLLING_INTERVAL_MS / 1000;
-        int secondsTimeout = secondsPollingInterval * MAX_POLLING_ATTEMPTS;
-        String appAddress = iexecHubService.createApp(buildRandomName("app"),
+        final int secondsPollingInterval = POLLING_INTERVAL_MS / 1000;
+        final int secondsTimeout = secondsPollingInterval * MAX_POLLING_ATTEMPTS;
+        final String appAddress = iexecHubService.createApp(buildRandomName("app"),
                 "docker.io/repo/name:1.0.0",
                 "DOCKER",
                 BytesUtils.EMPTY_HEX_STRING_32,
                 "",
                 secondsTimeout, secondsPollingInterval);
         log.info("Created app: {}", appAddress);
-        String workerpool = iexecHubService.createWorkerpool(buildRandomName("pool"),
+        final String workerpool = iexecHubService.createWorkerpool(buildRandomName("pool"),
                 secondsTimeout, secondsPollingInterval);
         log.info("Created workerpool: {}", workerpool);
-        String datasetAddress = iexecHubService.createDataset(buildRandomName("data"),
+        final String datasetAddress = iexecHubService.createDataset(buildRandomName("data"),
                 "https://abc.com/def.jpeg",
                 BytesUtils.EMPTY_HEX_STRING_32,
                 secondsTimeout, secondsPollingInterval);
         log.info("Created datasetAddress: {}", datasetAddress);
 
-        OrderSigner orderSigner = new OrderSigner(
+        final OrderSigner orderSigner = new OrderSigner(
                 chainConfig.getId(), chainConfig.getHubAddress(), signerService.getCredentials().getEcKeyPair());
-        AppOrder signedAppOrder = orderSigner.signAppOrder(buildAppOrder(appAddress, taskVolume));
-        WorkerpoolOrder signedWorkerpoolOrder = orderSigner.signWorkerpoolOrder(buildWorkerpoolOrder(workerpool, taskVolume));
-        DatasetOrder signedDatasetOrder = orderSigner.signDatasetOrder(buildDatasetOrder(datasetAddress, taskVolume));
-        RequestOrder signedRequestOrder = orderSigner.signRequestOrder(buildRequestOrder(signedAppOrder,
+        final AppOrder signedAppOrder = orderSigner.signAppOrder(buildAppOrder(appAddress, taskVolume));
+        final WorkerpoolOrder signedWorkerpoolOrder = orderSigner.signWorkerpoolOrder(buildWorkerpoolOrder(workerpool, taskVolume));
+        final DatasetOrder signedDatasetOrder = orderSigner.signDatasetOrder(buildDatasetOrder(datasetAddress, taskVolume));
+        final RequestOrder signedRequestOrder = orderSigner.signRequestOrder(buildRequestOrder(signedAppOrder,
                 signedWorkerpoolOrder,
                 signedDatasetOrder,
                 signerService.getAddress(),
@@ -237,18 +236,18 @@ private String triggerDeal(int taskVolume) {
                         .iexecResultStorageProvider("ipfs")
                         .iexecResultStorageProxy("https://v6.result.goerli.iex.ec")
                         .build()));
-        BrokerOrder brokerOrder = BrokerOrder.builder()
+        final BrokerOrder brokerOrder = BrokerOrder.builder()
                 .appOrder(signedAppOrder)
                 .workerpoolOrder(signedWorkerpoolOrder)
                 .requestOrder(signedRequestOrder)
                 .datasetOrder(signedDatasetOrder)
                 .build();
 
-        String dealId = brokerService.matchOrders(brokerOrder);
-        Assertions.assertTrue(StringUtils.isNotEmpty(dealId));
+        final String dealId = brokerService.matchOrders(brokerOrder);
+        assertThat(dealId).isNotEmpty();
         log.info("Created deal: {}", dealId);
         // no need to wait since broker is synchronous, just checking deal existence
-        Optional<ChainDeal> chainDeal = iexecHubService.getChainDeal(dealId);
+        final Optional<ChainDeal> chainDeal = iexecHubService.getChainDeal(dealId);
         assertThat(chainDeal).isPresent();
         return dealId;
     }
@@ -334,7 +333,7 @@ private RequestOrder buildRequestOrder(
 
     private void waitStatus(String chainTaskId, ChainTaskStatus statusToWait, int maxAttempts) {
         final AtomicInteger attempts = new AtomicInteger();
-        Awaitility.await()
+        await()
                 .pollInterval(POLLING_INTERVAL_MS, TimeUnit.MILLISECONDS)
                 .timeout((long) maxAttempts * POLLING_INTERVAL_MS, TimeUnit.MILLISECONDS)
                 .until(() -> {
@@ -358,7 +357,7 @@ private void waitBeforeFinalizing(String chainTaskId) {
         log.info("{} {}", POLLING_INTERVAL_MS, MAX_POLLING_ATTEMPTS);
 
         final AtomicInteger attempts = new AtomicInteger();
-        Awaitility.await()
+        await()
                 .pollInterval(POLLING_INTERVAL_MS, TimeUnit.MILLISECONDS)
                 .timeout((long) MAX_POLLING_ATTEMPTS * POLLING_INTERVAL_MS, TimeUnit.MILLISECONDS)
                 .until(() -> {