Merge pull request #595 from iExecBlockchainComputing/release/8.1.0

Release/8.1.0
iExecBlockchainComputing · Jun 9, 2023 · 1b715f2 · 1b715f2
2 parents 1e6d93d + b02a0c4
commit 1b715f2
Show file tree

Hide file tree

Showing 66 changed files with 2,086 additions and 752 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,34 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.1.0]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.1.0) 2023-06-09
+
+### New Features
+- Add ContributeAndFinalize to `ReplicateWorkflow`. (#574)
+- Add check for ContributeAndFinalize in `ReplicatesService`. (#576 #582)
+- Add `running2Finalized2Completed` in `TaskUpdateManager`. (#577 #578)
+- Disable `contributeAndFinalize` with CallBack. (#579 #581)
+- Add purge cached task descriptions ability. (#587)
+- Add detectors for `ContributeAndFinalize` flow. (#590 #593)
+### Bug Fixes
+- Prevent race condition on replicate update. (#568)
+- Use builders in test classes. (#589)
+### Quality
+- Remove unused methods in `IexecHubService`. (#572)
+- Clean unused Replicate methods and update tests. (#573)
+- Clean unused `ReplicateStatus#RESULT_UPLOAD_REQUEST_FAILED`. (#575)
+- Refactor unnotified detectors to avoid code duplication. (#580)
+- Use `==` or `!=` operators to test the equality of enums. (#584)
+- Rearrange checks order to avoid call to database. (#585)
+- Move methods to get event blocks from `iexec-commons-poco`. (#588)
+- Rename detectors' methods and fields to match Ongoing/Done standard. (#591)
+### Dependency Upgrades
+- Upgrade to `iexec-common` 8.2.0. (#571 #575 #586 #594)
+- Add new `iexec-commons-poco` 3.0.2 dependency. (#571 #574 #586 #587 #588 #592 #594)
+- Upgrade to `iexec-blockchain-adapter-api-library` 8.1.0. (#594)
+- Upgrade to `iexec-result-proxy-library` 8.1.0. (#594)
+- Upgrade to `iexec-sms-library` 8.1.0. (#594)
+
 ## [[8.0.1]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.0.1) 2023-03-20
 
 ### Bug Fixes

diff --git a/README.md b/README.md
@@ -71,3 +71,7 @@ No default strategy has been implemented in the [Dockerfile](Dockerfile) at the
 ```
 ./gradlew build
 ```
+
+## License
+
+This repository code is released under the [Apache License 2.0](LICENSE).
diff --git a/build.gradle b/build.gradle
@@ -48,6 +48,7 @@ dependencyManagement {
 
 dependencies {
     // iexec
+    implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
     implementation "com.iexec.blockchain:iexec-blockchain-adapter-api-library:$iexecBlockchainAdapterVersion"
     implementation "com.iexec.result-proxy:iexec-result-proxy-library:$iexecResultVersion"
@@ -100,6 +101,9 @@ dependencies {
     implementation "com.github.cloudyrock.mongock:mongock-spring-v5:${mongockVersion}"
     implementation "com.github.cloudyrock.mongock:mongodb-springdata-v2-driver:${mongockVersion}"
 
+    // vavr
+    implementation 'io.vavr:vavr:0.10.4'
+
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
     // awaitility

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,9 @@
-version=8.0.1
-iexecCommonVersion=7.0.0
-iexecBlockchainAdapterVersion=8.0.0
-iexecResultVersion=8.0.0
-iexecSmsVersion=8.0.0
+version=8.1.0
+iexecCommonVersion=8.2.0
+iexecCommonsPocoVersion=3.0.2
+iexecBlockchainAdapterVersion=8.1.0
+iexecResultVersion=8.1.0
+iexecSmsVersion=8.1.0
 
 nexusUser
 nexusPassword
diff --git a/src/main/java/com/iexec/core/chain/ChainConfig.java b/src/main/java/com/iexec/core/chain/ChainConfig.java
@@ -22,6 +22,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
+
 @Component
 @Getter
 @AllArgsConstructor
@@ -37,6 +39,9 @@ public class ChainConfig {
     @Value("#{blockchainAdapterService.publicChainConfig.iexecHubContractAddress}")
     private String hubAddress;
 
+    @Value("#{blockchainAdapterService.publicChainConfig.blockTime}")
+    private Duration blockTime;
+
     @Value("${chain.privateAddress}")
     private String privateChainAddress;
 

diff --git a/src/main/java/com/iexec/core/chain/DealEvent.java b/src/main/java/com/iexec/core/chain/DealEvent.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,8 +16,8 @@
 
 package com.iexec.core.chain;
 
-import com.iexec.common.contract.generated.IexecHubContract;
-import com.iexec.common.utils.BytesUtils;
+import com.iexec.commons.poco.contract.generated.IexecHubContract;
+import com.iexec.commons.poco.utils.BytesUtils;
 import lombok.Getter;
 
 import java.math.BigInteger;

diff --git a/src/main/java/com/iexec/core/chain/DealWatcherService.java b/src/main/java/com/iexec/core/chain/DealWatcherService.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,9 +16,9 @@
 
 package com.iexec.core.chain;
 
-import com.iexec.common.chain.ChainDeal;
-import com.iexec.common.contract.generated.IexecHubContract;
-import com.iexec.common.utils.BytesUtils;
+import com.iexec.commons.poco.chain.ChainDeal;
+import com.iexec.commons.poco.contract.generated.IexecHubContract;
+import com.iexec.commons.poco.utils.BytesUtils;
 import com.iexec.core.configuration.ConfigurationService;
 import com.iexec.core.task.Task;
 import com.iexec.core.task.TaskService;
@@ -41,7 +41,7 @@
 import java.math.BigInteger;
 import java.util.Optional;
 
-import static com.iexec.common.contract.generated.IexecHubContract.SCHEDULERNOTICE_EVENT;
+import static com.iexec.commons.poco.contract.generated.IexecHubContract.SCHEDULERNOTICE_EVENT;
 
 @Slf4j
 @Service