Merge pull request #418 from iExecBlockchainComputing/release/8.2.0

Release/8.2.0
iExecBlockchainComputing · Jun 5, 2023 · 1c44ca9 · 1c44ca9
2 parents bc808e8 + 987697f
commit 1c44ca9
Show file tree

Hide file tree

Showing 31 changed files with 118 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.2.0]](https://github.com/iExecBlockchainComputing/iexec-common/releases/tag/v8.2.0) 2023-06-05
+
+### Bug Fixes
+- Always use DatasetAddress in `IEXEC_DATASET_FILENAME` environment variable. (#416)
+### Quality
+- Mark classes from `com.iexec.common.sdk.order`, `com.iexec.common.sdk.order.payload` and `com.iexec.common.chain.eip712` packages deprecated. (#414 #415)
+### Dependency Upgrades
+- Upgrade to `iexec-commons-poco` 3.0.0. (#417)
+
 ## [[8.1.0]](https://github.com/iExecBlockchainComputing/iexec-common/releases/tag/v8.1.0) 2023-05-11
 
 ### New Features

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-version=8.1.0
-iexecCommonsPocoVersion=2.0.0
+version=8.2.0
+iexecCommonsPocoVersion=3.0.0
 
 nexusUser
 nexusPassword
diff --git a/src/main/java/com/iexec/common/chain/CredentialsAbstractService.java b/src/main/java/com/iexec/common/chain/CredentialsAbstractService.java
@@ -16,8 +16,8 @@
 
 package com.iexec.common.chain;
 
-import com.iexec.common.chain.eip712.EIP712Entity;
 import com.iexec.common.utils.EthAddress;
+import com.iexec.commons.poco.eip712.EIP712Entity;
 import com.iexec.commons.poco.security.Signature;
 import com.iexec.commons.poco.utils.SignatureUtils;
 import lombok.extern.slf4j.Slf4j;

diff --git a/src/main/java/com/iexec/common/chain/eip712/EIP712Domain.java b/src/main/java/com/iexec/common/chain/eip712/EIP712Domain.java
@@ -36,7 +36,9 @@
  * <li> represent the domain structure as string like {@code EIP712Domain(string name,string version,unit256 chainId)}
  * <li> compute the {@code domainSeparator}, the hash of the concatenation of the domain structure hash and the hash of field values
  * </ul>
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.EIP712Domain}
  */
+@Deprecated(forRemoval = true)
 @Getter
 public class EIP712Domain {
 

diff --git a/src/main/java/com/iexec/common/chain/eip712/EIP712Entity.java b/src/main/java/com/iexec/common/chain/eip712/EIP712Entity.java
@@ -26,6 +26,10 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.EIP712Entity}
+ */
+@Deprecated(forRemoval = true)
 @NoArgsConstructor
 public abstract class EIP712Entity<M> implements EIP712<M> {
 

diff --git a/src/main/java/com/iexec/common/chain/eip712/entity/Challenge.java b/src/main/java/com/iexec/common/chain/eip712/entity/Challenge.java
@@ -23,7 +23,9 @@
 
 /**
  * Represents the Challenge type in an EIP-712 compliant challenge.
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.entity.Challenge}
  */
+@Deprecated(forRemoval = true)
 @Data
 @Builder
 @AllArgsConstructor

diff --git a/src/main/java/com/iexec/common/chain/eip712/entity/EIP712AppOrder.java b/src/main/java/com/iexec/common/chain/eip712/entity/EIP712AppOrder.java
@@ -16,16 +16,20 @@
 
 package com.iexec.common.chain.eip712.entity;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.EIP712Entity;
-import com.iexec.common.chain.eip712.TypeParam;
-import com.iexec.common.sdk.order.payload.AppOrder;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.EIP712Entity;
+import com.iexec.commons.poco.eip712.TypeParam;
+import com.iexec.commons.poco.order.AppOrder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.entity.EIP712AppOrder}
+ */
+@Deprecated(forRemoval = true)
 @Getter
 @NoArgsConstructor
 public class EIP712AppOrder extends EIP712Entity<AppOrder> {

diff --git a/src/main/java/com/iexec/common/chain/eip712/entity/EIP712Challenge.java b/src/main/java/com/iexec/common/chain/eip712/entity/EIP712Challenge.java
@@ -16,9 +16,9 @@
 
 package com.iexec.common.chain.eip712.entity;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.EIP712Entity;
-import com.iexec.common.chain.eip712.TypeParam;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.EIP712Entity;
+import com.iexec.commons.poco.eip712.TypeParam;
 import lombok.NoArgsConstructor;
 
 import java.util.Collections;
@@ -29,7 +29,9 @@
  * <p>
  * In the current implementation, {@link EIP712Domain} fields are {@code name}, {@code version} and {@code chainID}.
  * There is no {@code verifyingContract}.
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.entity.EIP712Challenge}
  */
+@Deprecated(forRemoval = true)
 @NoArgsConstructor
 public class EIP712Challenge extends EIP712Entity<Challenge> {
 

diff --git a/src/main/java/com/iexec/common/chain/eip712/entity/EIP712DatasetOrder.java b/src/main/java/com/iexec/common/chain/eip712/entity/EIP712DatasetOrder.java
@@ -16,16 +16,20 @@
 
 package com.iexec.common.chain.eip712.entity;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.EIP712Entity;
-import com.iexec.common.chain.eip712.TypeParam;
-import com.iexec.common.sdk.order.payload.DatasetOrder;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.EIP712Entity;
+import com.iexec.commons.poco.eip712.TypeParam;
+import com.iexec.commons.poco.order.DatasetOrder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.entity.EIP712DatasetOrder}
+ */
+@Deprecated(forRemoval = true)
 @Getter
 @NoArgsConstructor
 public class EIP712DatasetOrder extends EIP712Entity<DatasetOrder> {

diff --git a/src/main/java/com/iexec/common/chain/eip712/entity/EIP712RequestOrder.java b/src/main/java/com/iexec/common/chain/eip712/entity/EIP712RequestOrder.java
@@ -16,16 +16,20 @@
 
 package com.iexec.common.chain.eip712.entity;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.EIP712Entity;
-import com.iexec.common.chain.eip712.TypeParam;
-import com.iexec.common.sdk.order.payload.RequestOrder;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.EIP712Entity;
+import com.iexec.commons.poco.eip712.TypeParam;
+import com.iexec.commons.poco.order.RequestOrder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.entity.EIP712RequestOrder}
+ */
+@Deprecated(forRemoval = true)
 @Getter
 @NoArgsConstructor
 public class EIP712RequestOrder extends EIP712Entity<RequestOrder> {

diff --git a/src/main/java/com/iexec/common/chain/eip712/entity/EIP712WorkerpoolOrder.java b/src/main/java/com/iexec/common/chain/eip712/entity/EIP712WorkerpoolOrder.java
@@ -16,16 +16,20 @@
 
 package com.iexec.common.chain.eip712.entity;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.EIP712Entity;
-import com.iexec.common.chain.eip712.TypeParam;
-import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.EIP712Entity;
+import com.iexec.commons.poco.eip712.TypeParam;
+import com.iexec.commons.poco.order.WorkerpoolOrder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.entity.EIP712WorkerpoolOrder}
+ */
+@Deprecated(forRemoval = true)
 @Getter
 @NoArgsConstructor
 public class EIP712WorkerpoolOrder extends EIP712Entity<WorkerpoolOrder> {

diff --git a/src/main/java/com/iexec/common/sdk/broker/BrokerOrder.java b/src/main/java/com/iexec/common/sdk/broker/BrokerOrder.java
@@ -17,10 +17,10 @@
 package com.iexec.common.sdk.broker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.iexec.common.sdk.order.payload.AppOrder;
-import com.iexec.common.sdk.order.payload.DatasetOrder;
-import com.iexec.common.sdk.order.payload.RequestOrder;
-import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
+import com.iexec.commons.poco.order.AppOrder;
+import com.iexec.commons.poco.order.DatasetOrder;
+import com.iexec.commons.poco.order.RequestOrder;
+import com.iexec.commons.poco.order.WorkerpoolOrder;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/com/iexec/common/sdk/order/OrderSigner.java b/src/main/java/com/iexec/common/sdk/order/OrderSigner.java
@@ -16,20 +16,24 @@
 
 package com.iexec.common.sdk.order;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.entity.EIP712AppOrder;
-import com.iexec.common.chain.eip712.entity.EIP712DatasetOrder;
-import com.iexec.common.chain.eip712.entity.EIP712RequestOrder;
-import com.iexec.common.chain.eip712.entity.EIP712WorkerpoolOrder;
-import com.iexec.common.sdk.order.payload.AppOrder;
-import com.iexec.common.sdk.order.payload.DatasetOrder;
-import com.iexec.common.sdk.order.payload.RequestOrder;
-import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.entity.EIP712AppOrder;
+import com.iexec.commons.poco.eip712.entity.EIP712DatasetOrder;
+import com.iexec.commons.poco.eip712.entity.EIP712RequestOrder;
+import com.iexec.commons.poco.eip712.entity.EIP712WorkerpoolOrder;
+import com.iexec.commons.poco.order.AppOrder;
+import com.iexec.commons.poco.order.DatasetOrder;
+import com.iexec.commons.poco.order.RequestOrder;
+import com.iexec.commons.poco.order.WorkerpoolOrder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.web3j.crypto.ECKeyPair;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.eip712.OrderSigner}
+ */
 @Slf4j
+@Deprecated(forRemoval = true)
 public class OrderSigner {
 
     private final EIP712Domain eip712Domain;

diff --git a/src/main/java/com/iexec/common/sdk/order/OrderTag.java b/src/main/java/com/iexec/common/sdk/order/OrderTag.java
@@ -20,8 +20,11 @@
 import com.iexec.commons.poco.utils.BytesUtils;
 import lombok.Getter;
 
-//TODO: Eventually move from sdk package
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.order.OrderTag}
+ */
 @Getter
+@Deprecated(forRemoval = true)
 public enum OrderTag {
 
     STANDARD(BytesUtils.EMPTY_HEX_STRING_32),

diff --git a/src/main/java/com/iexec/common/sdk/order/markeplace/AppMarketOrder.java b/src/main/java/com/iexec/common/sdk/order/markeplace/AppMarketOrder.java
@@ -16,7 +16,7 @@
 
 package com.iexec.common.sdk.order.markeplace;
 
-import com.iexec.common.sdk.order.payload.AppOrder;
+import com.iexec.commons.poco.order.AppOrder;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 

diff --git a/src/main/java/com/iexec/common/sdk/order/markeplace/DatasetMarketOrder.java b/src/main/java/com/iexec/common/sdk/order/markeplace/DatasetMarketOrder.java
@@ -16,7 +16,7 @@
 
 package com.iexec.common.sdk.order.markeplace;
 
-import com.iexec.common.sdk.order.payload.DatasetOrder;
+import com.iexec.commons.poco.order.DatasetOrder;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 

diff --git a/src/main/java/com/iexec/common/sdk/order/markeplace/RequestMarketOrder.java b/src/main/java/com/iexec/common/sdk/order/markeplace/RequestMarketOrder.java
@@ -16,7 +16,7 @@
 
 package com.iexec.common.sdk.order.markeplace;
 
-import com.iexec.common.sdk.order.payload.RequestOrder;
+import com.iexec.commons.poco.order.RequestOrder;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 

diff --git a/src/main/java/com/iexec/common/sdk/order/markeplace/WorkerpoolMarketOrder.java b/src/main/java/com/iexec/common/sdk/order/markeplace/WorkerpoolMarketOrder.java
@@ -16,7 +16,7 @@
 
 package com.iexec.common.sdk.order.markeplace;
 
-import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
+import com.iexec.commons.poco.order.WorkerpoolOrder;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 

diff --git a/src/main/java/com/iexec/common/sdk/order/payload/AppOrder.java b/src/main/java/com/iexec/common/sdk/order/payload/AppOrder.java
@@ -25,6 +25,10 @@
 
 import java.math.BigInteger;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.order.AppOrder}
+ */
+@Deprecated(forRemoval = true)
 @Value
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

diff --git a/src/main/java/com/iexec/common/sdk/order/payload/DatasetOrder.java b/src/main/java/com/iexec/common/sdk/order/payload/DatasetOrder.java
@@ -25,6 +25,10 @@
 
 import java.math.BigInteger;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.order.DatasetOrder}
+ */
+@Deprecated(forRemoval = true)
 @Value
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

diff --git a/src/main/java/com/iexec/common/sdk/order/payload/RequestOrder.java b/src/main/java/com/iexec/common/sdk/order/payload/RequestOrder.java
@@ -26,6 +26,10 @@
 import java.math.BigInteger;
 import java.util.Objects;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.order.RequestOrder}
+ */
+@Deprecated(forRemoval = true)
 @Value
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

diff --git a/src/main/java/com/iexec/common/sdk/order/payload/WorkerpoolOrder.java b/src/main/java/com/iexec/common/sdk/order/payload/WorkerpoolOrder.java
@@ -25,6 +25,10 @@
 
 import java.math.BigInteger;
 
+/**
+ * @deprecated Use {@link com.iexec.commons.poco.order.WorkerpoolOrder}
+ */
+@Deprecated(forRemoval = true)
 @Value
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

diff --git a/src/main/java/com/iexec/common/utils/IexecEnvUtils.java b/src/main/java/com/iexec/common/utils/IexecEnvUtils.java
@@ -97,7 +97,7 @@ public static Map<String, String> getComputeStageEnvMap(TaskDescription taskDesc
         map.put(IEXEC_OUT, IexecFileHelper.SLASH_IEXEC_OUT);
         // dataset
         map.put(IEXEC_DATASET_ADDRESS, taskDescription.getDatasetAddress());
-        map.put(IEXEC_DATASET_FILENAME, taskDescription.getDatasetName());
+        map.put(IEXEC_DATASET_FILENAME, taskDescription.getDatasetAddress());
         // BoT
         map.put(IEXEC_BOT_SIZE, String.valueOf(taskDescription.getBotSize()));
         map.put(IEXEC_BOT_FIRST_INDEX, String.valueOf(taskDescription.getBotFirstIndex()));

diff --git a/src/test/java/com/iexec/common/chain/CredentialsAbstractServiceTests.java b/src/test/java/com/iexec/common/chain/CredentialsAbstractServiceTests.java
@@ -16,9 +16,9 @@
 
 package com.iexec.common.chain;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.entity.Challenge;
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.entity.Challenge;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.web3j.crypto.CipherException;

diff --git a/src/test/java/com/iexec/common/chain/eip712/entity/EIP712AppOrderTest.java b/src/test/java/com/iexec/common/chain/eip712/entity/EIP712AppOrderTest.java
@@ -18,8 +18,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.sdk.order.payload.AppOrder;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.order.AppOrder;
 import com.iexec.commons.poco.utils.BytesUtils;
 import org.junit.jupiter.api.Test;
 import org.web3j.crypto.CipherException;

diff --git a/src/test/java/com/iexec/common/chain/eip712/entity/EIP712ChallengeTests.java b/src/test/java/com/iexec/common/chain/eip712/entity/EIP712ChallengeTests.java
@@ -18,8 +18,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.TypeParam;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.TypeParam;
 import com.iexec.commons.poco.utils.HashUtils;
 import org.junit.jupiter.api.Test;
 import org.web3j.crypto.Hash;

diff --git a/src/test/java/com/iexec/common/chain/eip712/entity/EIP712DatasetOrderTest.java b/src/test/java/com/iexec/common/chain/eip712/entity/EIP712DatasetOrderTest.java
@@ -18,8 +18,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.sdk.order.payload.DatasetOrder;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.order.DatasetOrder;
 import com.iexec.commons.poco.utils.BytesUtils;
 import org.junit.jupiter.api.Test;
 import org.web3j.crypto.CipherException;

diff --git a/src/test/java/com/iexec/common/chain/eip712/entity/EIP712RequestOrderTest.java b/src/test/java/com/iexec/common/chain/eip712/entity/EIP712RequestOrderTest.java
@@ -18,8 +18,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.sdk.order.payload.RequestOrder;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.order.RequestOrder;
 import com.iexec.commons.poco.utils.BytesUtils;
 import org.junit.jupiter.api.Test;
 import org.web3j.crypto.CipherException;