Merge pull request #525 from iExecBlockchainComputing/release/8.1.0

Release/8.1.0

Author: jbern0rd

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.1.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.1.0) 2023-06-12
+
+### New Features
+- Enable Prometheus actuator. (#512)
+- Add `contributeAndFinalize` support for TEE tasks when required `trust` is `1`. (#516 #517 #518)
+- Add purge cached task descriptions ability. (#521)
+- Add `chainReceipt` to ContributeAndFinalize replicate status details. (#522)
+- Use DatasetAddress as dataset filename. (#523) 
+### Bug Fixes
+- Filter `contribute` and `reveal` event logs  on `chainTaskId` and `workerAddress`. (#516)
+### Quality
+- Refactor STOMP client service to simplify its implementation. (#492)
+- Add `error` log events. (#514)
+- Improve `IexecHubService` coverage. (#526)
+### Dependency Upgrades
+- Add new `iexec-commons-containers` 1.0.2 dependency. (#513 #515)
+- Upgrade to `iexec-common` 8.2.0. (#515 #518 #520 #524)
+- Add new `iexec-commons-poco` 3.0.2 dependency. (#515 #518 #520 #521 #524)
+- Upgrade to `iexec-blockchain-adapter-api-library` 8.1.0. (#524)
+- Upgrade to `iexec-result-proxy-library` 8.1.0. (#524)
+- Upgrade to `iexec-sms-library` 8.1.0. (#524)
+
 ## [[8.0.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.0.0) 2023-03-08
 
 ### New Features

README.md

@@ -64,3 +64,7 @@ No default strategy has been implemented in the [Dockerfile](Dockerfile) at the
 ```
 ./gradlew build --refresh-dependencies
 ```
+
+## License
+
+This repository code is released under the [Apache License 2.0](LICENSE).

build.gradle

@@ -58,7 +58,9 @@ dependencyManagement {
 
 dependencies {
     // iexec
+    implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
+    implementation "com.iexec.commons:iexec-commons-containers:$iexecCommonsContainersVersion"
     implementation "com.iexec.blockchain:iexec-blockchain-adapter-api-library:$iexecBlockchainAdapterVersion"
     implementation "com.iexec.result-proxy:iexec-result-proxy-library:$iexecResultVersion"
     implementation "com.iexec.sms:iexec-sms-library:$iexecSmsVersion"
@@ -71,9 +73,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-websocket"
-    implementation  "org.springframework.cloud:spring-cloud-starter"
-    implementation  "org.springframework.cloud:spring-cloud-starter-openfeign"
-    implementation  "org.springframework.retry:spring-retry"
+    implementation "org.springframework.cloud:spring-cloud-starter"
+    implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
+    implementation "org.springframework.retry:spring-retry"
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.mockito:mockito-inline:4.8.0" // activates mocking final classes/methods
 
@@ -99,14 +101,17 @@ dependencies {
     //graylog
     implementation 'biz.paluch.logging:logstash-gelf:1.5.1'
 
+    // observability
+    runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
+
     // docker
     implementation "com.github.docker-java:docker-java:${dockerJavaVersion}"
 
     // expiring map
     implementation 'net.jodah:expiringmap:0.5.10'
 
     // awaitility
-    testImplementation "org.awaitility:awaitility:4.2.0"
+    testImplementation "org.awaitility:awaitility"
 }
 
 java {

gradle.properties

@@ -1,8 +1,10 @@
-version=8.0.0
-iexecCommonVersion=7.0.0
-iexecBlockchainAdapterVersion=8.0.0
-iexecResultVersion=8.0.0
-iexecSmsVersion=8.0.0
+version=8.1.0
+iexecCommonVersion=8.2.0
+iexecCommonsContainersVersion=1.0.2
+iexecCommonsPocoVersion=3.0.2
+iexecBlockchainAdapterVersion=8.1.0
+iexecResultVersion=8.1.0
+iexecSmsVersion=8.1.0
 
 nexusUser
 nexusPassword

src/main/java/com/iexec/worker/chain/ContributionService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 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,16 +16,17 @@
 
 package com.iexec.worker.chain;
 
-import com.iexec.common.chain.*;
-import com.iexec.common.contract.generated.IexecHubContract;
 import com.iexec.common.contribution.Contribution;
 import com.iexec.common.replicate.ReplicateStatusCause;
 import com.iexec.common.result.ComputedFile;
-import com.iexec.common.utils.BytesUtils;
 import com.iexec.common.worker.result.ResultUtils;
+import com.iexec.commons.poco.chain.*;
+import com.iexec.commons.poco.contract.generated.IexecHubContract;
+import com.iexec.commons.poco.utils.BytesUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.math.BigInteger;
 import java.util.Date;
 import java.util.Optional;
 
@@ -86,6 +87,28 @@ public Optional<ReplicateStatusCause> getCannotContributeStatusCause(String chai
         return Optional.empty();
     }
 
+    // TODO: trust could become part of TaskDescription to avoid fetching deal on-chain
+    public Optional<ReplicateStatusCause> getCannotContributeAndFinalizeStatusCause(String chainTaskId) {
+        Optional<ChainTask> optionalChainTask = iexecHubService.getChainTask(chainTaskId);
+        if (optionalChainTask.isEmpty()) {
+            return Optional.of(CHAIN_UNREACHABLE);
+        }
+        ChainTask chainTask = optionalChainTask.get();
+
+        // check TRUST is 1
+        Optional<ChainDeal> oChainDeal = iexecHubService.getChainDeal(chainTask.getDealid());
+        if (oChainDeal.isEmpty() || !BigInteger.ONE.equals(oChainDeal.get().getTrust())) {
+            return Optional.of(TRUST_NOT_1);
+        }
+
+        // check TASK_ALREADY_CONTRIBUTED
+        if (!chainTask.getContributors().isEmpty()) {
+            return Optional.of(TASK_ALREADY_CONTRIBUTED);
+        }
+
+        return Optional.empty();
+    }
+
     private boolean isWorkerpoolAuthorizationPresent(String chainTaskId) {
         WorkerpoolAuthorization workerpoolAuthorization =
                 workerpoolAuthorizationService.getWorkerpoolAuthorization(chainTaskId);
@@ -118,7 +141,7 @@ private boolean isContributionUnsetToContribute(ChainTask chainTask) {
         if (optionalContribution.isEmpty()) return false;
 
         ChainContribution chainContribution = optionalContribution.get();
-        return chainContribution.getStatus().equals(ChainContributionStatus.UNSET);
+        return chainContribution.getStatus() == ChainContributionStatus.UNSET;
     }
 
     public boolean isContributionDeadlineReached(String chainTaskId) {

src/main/java/com/iexec/worker/chain/EnclaveAuthorizationService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 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,15 +16,15 @@
 
 package com.iexec.worker.chain;
 
-import com.iexec.common.security.Signature;
-import com.iexec.common.tee.TeeEnclaveChallengeSignature;
-import com.iexec.common.utils.BytesUtils;
 import com.iexec.common.utils.EthAddress;
-import com.iexec.common.utils.SignatureUtils;
+import com.iexec.commons.poco.security.Signature;
+import com.iexec.commons.poco.tee.TeeEnclaveChallengeSignature;
+import com.iexec.commons.poco.utils.BytesUtils;
+import com.iexec.commons.poco.utils.SignatureUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import static com.iexec.common.utils.SignatureUtils.isExpectedSignerOnSignedMessageHash;
+import static com.iexec.commons.poco.utils.SignatureUtils.isExpectedSignerOnSignedMessageHash;
 
 
 @Slf4j