Merge pull request #594 from iExecBlockchainComputing/feature/update-dependencies-for-8.1.0

Feature/update dependencies for 8.1.0

Author: jbern0rd

CHANGELOG.md

@@ -24,8 +24,11 @@ All notable changes to this project will be documented in this file.
 - 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.1.0-NEXT-SNAPSHOT. (#571 #575 #586)
-- Add new `iexec-commons-poco` 2.0.1-NEXT-SNAPSHOT dependency. (#571 #574 #586 #587 #588 #592)
+- 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
 

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).

gradle.properties

@@ -1,9 +1,9 @@
 version=8.0.1
-iexecCommonVersion=8.1.0-NEXT-SNAPSHOT
-iexecCommonsPocoVersion=2.0.1-NEXT-SNAPSHOT
-iexecBlockchainAdapterVersion=8.0.1-NEXT-SNAPSHOT
-iexecResultVersion=8.0.0-NEXT-SNAPSHOT
-iexecSmsVersion=8.0.0-NEXT-SNAPSHOT
+iexecCommonVersion=8.2.0
+iexecCommonsPocoVersion=3.0.2
+iexecBlockchainAdapterVersion=8.1.0
+iexecResultVersion=8.1.0
+iexecSmsVersion=8.1.0
 
 nexusUser
 nexusPassword

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;
 

src/main/java/com/iexec/core/chain/Web3jService.java

@@ -19,13 +19,16 @@
 import com.iexec.commons.poco.chain.Web3jAbstractService;
 import org.springframework.stereotype.Service;
 
+import java.time.Duration;
+
 @Service
 public class Web3jService extends Web3jAbstractService {
 
     public Web3jService(ChainConfig chainConfig) {
         super(
                 chainConfig.getChainId(),
                 chainConfig.getPrivateChainAddress(),
+                chainConfig.getBlockTime(),
                 chainConfig.getGasPriceMultiplier(),
                 chainConfig.getGasPriceCap(),
                 chainConfig.isSidechain()

src/test/java/com/iexec/core/replicate/ReplicateServiceTests.java

@@ -1030,7 +1030,7 @@ void shouldAuthorizeUpdateOnResultUploadFailed() {
                 .build();
         UpdateReplicateStatusArgs updateReplicateStatusArgs = UpdateReplicateStatusArgs
                 .builder()
-                .taskDescription(new TaskDescription())
+                .taskDescription(TaskDescription.builder().build())
                 .build();
 
         assertThat(replicatesService.canUpdateReplicateStatus(CHAIN_TASK_ID, WALLET_WORKER_1, statusUpdate, updateReplicateStatusArgs))