fix: use assertDatasetDealCompatibility new PoCo method (#313)

Author: jbern0rd

gradle.properties

@@ -1,7 +1,7 @@
 # x-release-please-start-version
 version=9.2.0
 # x-release-please-end
-iexecCommonsPocoVersion=5.2.0
+iexecCommonsPocoVersion=5.3.0
 iexecCommonVersion=9.2.0
 
 nexusUser

src/main/java/com/iexec/sms/tee/session/base/SecretSessionBaseService.java

@@ -21,10 +21,8 @@
 import com.iexec.commons.poco.chain.ChainDataset;
 import com.iexec.commons.poco.chain.DealParams;
 import com.iexec.commons.poco.order.DatasetOrder;
-import com.iexec.commons.poco.security.Signature;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.commons.poco.tee.TeeEnclaveConfiguration;
-import com.iexec.commons.poco.utils.SignatureUtils;
 import com.iexec.sms.chain.IexecHubService;
 import com.iexec.sms.secret.compute.*;
 import com.iexec.sms.secret.web2.Web2Secret;
@@ -178,7 +176,7 @@ Map<String, String> getSignTokens(final TeeSessionRequest request) throws TeeSes
     private List<DatasetOrder> fetchDatasetOrders(final TaskDescription taskDescription) {
         try {
             final String bulkCid = taskDescription.getDealParams().getBulkCid();
-            final int bulkSliceIndex = taskDescription.getBotIndex() - taskDescription.getBotFirstIndex();
+            final int bulkSliceIndex = taskDescription.getBotIndex();
             log.info("Fetching dataset orders for a bulk slice [chainTaskId:{}, bulkCid:{}, bulkSliceIndex:{}]",
                     taskDescription.getChainTaskId(), bulkCid, bulkSliceIndex);
             final List<String> bulkSlices = ipfsClient.readBulkCid(bulkCid);
@@ -195,7 +193,7 @@ private Map<String, Object> getBulkDatasetTokens(final int index,
                                                      final DatasetOrder datasetOrder) {
         final String prefix = IEXEC_DATASET_PREFIX + (index + 1);
         final ChainDataset dataset = iexecHubService.getChainDataset(datasetOrder.getDataset()).orElse(null);
-        if (isBulkDatasetOrderValid(taskDescription, datasetOrder) && dataset != null) {
+        if (dataset != null && isBulkDatasetOrderCompatibleWithDeal(datasetOrder, taskDescription)) {
             final String datasetKey = web3SecretService.getDecryptedValue(datasetOrder.getDataset()).orElse("");
             return Map.of(
                     prefix + IEXEC_DATASET_URL_SUFFIX, dataset.getMultiaddr(),
@@ -213,23 +211,15 @@ private Map<String, Object> getBulkDatasetTokens(final int index,
         }
     }
 
-    boolean isBulkDatasetOrderValid(final TaskDescription taskDescription, final DatasetOrder datasetOrder) {
+    boolean isBulkDatasetOrderCompatibleWithDeal(final DatasetOrder datasetOrder, final TaskDescription taskDescription) {
         try {
-            final Signature signature = new Signature(datasetOrder.getSign());
-            final String orderHash = datasetOrder.computeHash(iexecHubService.getOrdersDomain());
-            final String owner = iexecHubService.getOwner(datasetOrder.getDataset());
-            final boolean isSignedByOwner = SignatureUtils.doesSignatureMatchesAddress(
-                    signature.getR(), signature.getS(), orderHash, owner);
-            final BigInteger consumedVolume = iexecHubService.viewConsumed(orderHash);
-            final boolean isVolumeValid = BULK_DATASET_VOLUME.equals(datasetOrder.getVolume());
-            final boolean isOrderNotFullyConsumed = !BULK_DATASET_VOLUME.equals(consumedVolume);
-            final boolean isTagValid = taskDescription.getTag().equals(datasetOrder.getTag());
-            log.info("Check bulk dataset order [chainTaskId:{}, dataset:{}, owner:{}, isSignedByOwner:{}, isVolumeValid:{}, isOrderNotFullyConsumed:{}, isTagValid:{}]",
-                    taskDescription.getChainTaskId(), datasetOrder.getDataset(), owner, isSignedByOwner, isVolumeValid, isOrderNotFullyConsumed, isTagValid);
-            return isSignedByOwner && isVolumeValid && isOrderNotFullyConsumed && isTagValid;
+            log.debug("Check dataset order against deal [chainTaskId:{}, deal:{}, dataset:{}",
+                    taskDescription.getChainTaskId(), taskDescription.getChainDealId(), datasetOrder.getDataset());
+            iexecHubService.assertDatasetDealCompatibility(datasetOrder, taskDescription.getChainDealId());
+            return true;
         } catch (Exception e) {
-            log.error("Failed to perform all checks on dataset [chainTaskId:{}, dataset:{}]",
-                    taskDescription.getChainTaskId(), datasetOrder.getDataset());
+            log.error("Failed to perform all checks on dataset [chainTaskId:{}, dataset:{}, error:{}]",
+                    taskDescription.getChainTaskId(), datasetOrder.getDataset(), e.getMessage());
             return false;
         }
     }

src/test/java/com/iexec/sms/tee/session/base/SecretSessionBaseServiceTests.java

@@ -57,6 +57,7 @@
 import org.web3j.crypto.Credentials;
 import org.web3j.crypto.Hash;
 import org.web3j.crypto.Keys;
+import org.web3j.protocol.exceptions.JsonRpcError;
 
 import java.math.BigInteger;
 import java.security.GeneralSecurityException;
@@ -280,9 +281,7 @@ void shouldGetPreComputeBulkProcessingTokensForInvalidOrder() throws Exception {
         when(ipfsClient.readBulkCid("bulkCid")).thenReturn(List.of("ordersCid"));
         when(ipfsClient.readOrders("ordersCid")).thenReturn(List.of(signedDatasetOrder));
         when(iexecHubService.getChainDataset(datasetAddress)).thenReturn(Optional.of(ChainDataset.builder().chainDatasetId(datasetAddress).build()));
-        when(iexecHubService.getOrdersDomain()).thenReturn(pocoDomain);
-        when(iexecHubService.getOwner(datasetAddress)).thenReturn(createEthereumAddress());
-        when(iexecHubService.viewConsumed(signedDatasetOrder.computeHash(pocoDomain))).thenReturn(BigInteger.ONE);
+        doThrow(JsonRpcError.class).when(iexecHubService).assertDatasetDealCompatibility(signedDatasetOrder, DEAL_ID);
 
         final SecretEnclaveBase enclaveBase = teeSecretsService.getPreComputeTokens(
                 request,
@@ -322,9 +321,7 @@ void shouldGetPreComputeBulkProcessingTokensForValidOrder() throws Exception {
         when(ipfsClient.readBulkCid("bulkCid")).thenReturn(List.of("ordersCid"));
         when(ipfsClient.readOrders("ordersCid")).thenReturn(List.of(signedDatasetOrder));
         when(iexecHubService.getChainDataset(datasetAddress)).thenReturn(Optional.of(chainDataset));
-        when(iexecHubService.getOrdersDomain()).thenReturn(pocoDomain);
-        when(iexecHubService.getOwner(datasetAddress)).thenReturn(credentials.getAddress());
-        when(iexecHubService.viewConsumed(signedDatasetOrder.computeHash(pocoDomain))).thenReturn(BigInteger.ZERO);
+        doNothing().when(iexecHubService).assertDatasetDealCompatibility(signedDatasetOrder, DEAL_ID);
         when(web3SecretService.getDecryptedValue(datasetAddress)).thenReturn(Optional.of(DATASET_KEY));
 
         final SecretEnclaveBase enclaveBase = teeSecretsService.getPreComputeTokens(