feat: create WorkerpoolAuthorization instances with on-chain deal ID and task index (#761)

jbern0rd · web-flow · commit 2358967763a4 · 2025-09-22T15:35:54.000+02:00
diff --git a/src/main/java/com/iexec/core/chain/DealWatcherService.java b/src/main/java/com/iexec/core/chain/DealWatcherService.java
@@ -198,19 +198,19 @@ private void handleDeal(DealEvent dealEvent) {
         int startBag = chainDeal.getBotFirst().intValue();
         int endBag = chainDeal.getBotFirst().intValue() + chainDeal.getBotSize().intValue();
         for (int taskIndex = startBag; taskIndex < endBag; taskIndex++) {
-            Optional<Task> optional = taskService.addTask(
-                    chainDealId,
-                    taskIndex,
-                    dealEvent.getBlockNumber().longValue(),
-                    chainDeal.getChainApp().getMultiaddr(),
-                    chainDeal.getParams().getIexecArgs(),
-                    chainDeal.getTrust().intValue(),
-                    chainDeal.getChainCategory().getMaxExecutionTime(),
-                    chainDeal.getTag(),
-                    iexecHubService.getChainDealContributionDeadline(chainDeal),
-                    iexecHubService.getChainDealFinalDeadline(chainDeal));
-            optional.ifPresent(task -> applicationEventPublisher
-                    .publishEvent(new TaskCreatedEvent(task.getChainTaskId())));
+            taskService
+                    .addTask(
+                            chainDealId,
+                            taskIndex,
+                            dealEvent.getBlockNumber().longValue(),
+                            chainDeal.getChainApp().getMultiaddr(),
+                            chainDeal.getParams().getIexecArgs(),
+                            chainDeal.getTrust().intValue(),
+                            chainDeal.getChainCategory().getMaxExecutionTime(),
+                            chainDeal.getTag(),
+                            iexecHubService.getChainDealContributionDeadline(chainDeal),
+                            iexecHubService.getChainDealFinalDeadline(chainDeal))
+                    .ifPresent(this::publishTaskCreatedEvent);
         }
     }
 
@@ -248,6 +248,17 @@ boolean shouldProcessDeal(ChainDeal chainDeal) {
         return true;
     }
 
+    /**
+     * Publishes a {@code TaskCreatedEvent} for a newly created task.
+     *
+     * @param task Newly created task for which the event will be published
+     */
+    private void publishTaskCreatedEvent(final Task task) {
+        final TaskCreatedEvent event = new TaskCreatedEvent(
+                this, task.getChainTaskId(), task.getChainDealId(), task.getTaskIndex());
+        applicationEventPublisher.publishEvent(event);
+    }
+
     /*
      * Some deal events are sometimes missed by #schedulerNoticeEventObservable method
      * so we decide to replay events from times to times (already saved events will be ignored)
diff --git a/src/main/java/com/iexec/core/chain/SignatureService.java b/src/main/java/com/iexec/core/chain/SignatureService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 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.
@@ -27,23 +27,29 @@ public class SignatureService {
 
     private final SignerService signerService;
 
-    public SignatureService(SignerService signerService) {
+    public SignatureService(final SignerService signerService) {
         this.signerService = signerService;
     }
 
     public String getAddress() {
         return signerService.getAddress();
     }
 
-    public Signature sign(String hash) {
+    public Signature sign(final String hash) {
         return signerService.signMessageHash(hash);
     }
 
-    public WorkerpoolAuthorization createAuthorization(String workerWallet, String chainTaskId, String enclaveChallenge) {
+    public WorkerpoolAuthorization createAuthorization(final String workerWallet,
+                                                       final String chainTaskId,
+                                                       final String dealId,
+                                                       final int taskIndex,
+                                                       final String enclaveChallenge) {
         final String hash = HashUtils.concatenateAndHash(workerWallet, chainTaskId, enclaveChallenge);
         return WorkerpoolAuthorization.builder()
                 .workerWallet(workerWallet)
                 .chainTaskId(chainTaskId)
+                .dealId(dealId)
+                .taskIndex(taskIndex)
                 .enclaveChallenge(enclaveChallenge)
                 .signature(sign(hash))
                 .build();
diff --git a/src/main/java/com/iexec/core/replicate/ReplicateSupplyService.java b/src/main/java/com/iexec/core/replicate/ReplicateSupplyService.java
@@ -158,6 +158,8 @@ private Optional<ReplicateTaskSummary> getReplicateTaskSummary(Task task, String
         final WorkerpoolAuthorization authorization = signatureService.createAuthorization(
                 walletAddress,
                 chainTaskId,
+                task.getChainDealId(),
+                task.getTaskIndex(),
                 task.getEnclaveChallenge());
         ReplicateTaskSummaryBuilder replicateTaskSummary = ReplicateTaskSummary.builder()
                 .workerpoolAuthorization(authorization);
@@ -290,7 +292,7 @@ public List<TaskNotification> getMissedTaskNotifications(long blockNumber, Strin
 
     private TaskNotificationExtra getTaskNotificationExtra(Task task, TaskNotificationType taskNotificationType, String walletAddress) {
         final WorkerpoolAuthorization authorization = signatureService.createAuthorization(
-                walletAddress, task.getChainTaskId(), task.getEnclaveChallenge());
+                walletAddress, task.getChainTaskId(), task.getChainDealId(), task.getTaskIndex(), task.getEnclaveChallenge());
         final TaskNotificationExtra.TaskNotificationExtraBuilder taskNotificationExtra =
                 TaskNotificationExtra.builder().workerpoolAuthorization(authorization);
 
diff --git a/src/main/java/com/iexec/core/result/ResultService.java b/src/main/java/com/iexec/core/result/ResultService.java
@@ -39,7 +39,9 @@ public class ResultService {
     private final SignatureService signatureService;
     private final TaskService taskService;
 
-    public ResultService(final ResultRepositoryConfiguration resultRepositoryConfiguration, final SignatureService signatureService, final TaskService taskService) {
+    public ResultService(final ResultRepositoryConfiguration resultRepositoryConfiguration,
+                         final SignatureService signatureService,
+                         final TaskService taskService) {
         this.resultRepositoryConfiguration = resultRepositoryConfiguration;
         this.signatureService = signatureService;
         this.taskService = taskService;
@@ -50,7 +52,8 @@ public boolean isResultUploaded(final TaskDescription taskDescription) {
         final String chainTaskId = taskDescription.getChainTaskId();
         final ResultProxyClient resultProxyClient = resultRepositoryConfiguration.createResultProxyClientFromURL(taskDescription.getDealParams().getIexecResultStorageProxy());
         final String enclaveChallenge = taskService.getTaskByChainTaskId(chainTaskId).map(Task::getEnclaveChallenge).orElse(EMPTY_ADDRESS);
-        final WorkerpoolAuthorization workerpoolAuthorization = signatureService.createAuthorization(signatureService.getAddress(), chainTaskId, enclaveChallenge);
+        final WorkerpoolAuthorization workerpoolAuthorization = signatureService.createAuthorization(
+                signatureService.getAddress(), chainTaskId, taskDescription.getChainDealId(), taskDescription.getBotIndex(), enclaveChallenge);
         final String resultProxyToken = resultProxyClient.getJwt(workerpoolAuthorization.getSignature().getValue(), workerpoolAuthorization);
         if (resultProxyToken.isEmpty()) {
             log.error("isResultUploaded failed (getResultProxyToken) [chainTaskId:{}]", chainTaskId);
diff --git a/src/main/java/com/iexec/core/sms/SmsService.java b/src/main/java/com/iexec/core/sms/SmsService.java
@@ -138,21 +138,27 @@ private boolean checkSmsTeeFramework(SmsClient smsClient,
         return true;
     }
 
-    public Optional<String> getEnclaveChallenge(String chainTaskId, String smsUrl) {
+    public Optional<String> getEnclaveChallenge(final String chainTaskId,
+                                                final String dealId,
+                                                final int taskIndex,
+                                                final String smsUrl) {
         return StringUtils.isEmpty(smsUrl)
                 ? Optional.of(BytesUtils.EMPTY_ADDRESS)
-                : generateEnclaveChallenge(chainTaskId, smsUrl);
+                : generateEnclaveChallenge(chainTaskId, dealId, taskIndex, smsUrl);
     }
 
-    Optional<String> generateEnclaveChallenge(String chainTaskId, String smsUrl) {
+    Optional<String> generateEnclaveChallenge(final String chainTaskId,
+                                              final String dealId,
+                                              final int taskIndex,
+                                              final String smsUrl) {
         // SMS client should already have been created once before.
         // If it couldn't be created, then the task would have been aborted.
         // So the following won't throw an exception.
         final SmsClient smsClient = smsClientProvider.getSmsClient(smsUrl);
 
         try {
             final String teeChallengePublicKey = smsClient.generateTeeChallenge(
-                    signatureService.createAuthorization("", chainTaskId, "").getSignature().getValue(),
+                    signatureService.createAuthorization("", chainTaskId, dealId, taskIndex, "").getSignature().getValue(),
                     chainTaskId);
 
             if (StringUtils.isEmpty(teeChallengePublicKey)) {
diff --git a/src/main/java/com/iexec/core/task/event/TaskCreatedEvent.java b/src/main/java/com/iexec/core/task/event/TaskCreatedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 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,21 @@
 
 package com.iexec.core.task.event;
 
+import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.springframework.context.ApplicationEvent;
 
 @Value
-public class TaskCreatedEvent {
+@EqualsAndHashCode(callSuper = true)
+public class TaskCreatedEvent extends ApplicationEvent {
     String chainTaskId;
+    String chainDealId;
+    int taskIndex;
+
+    public TaskCreatedEvent(final Object source, final String chainTaskId, final String chainDealId, final int taskIndex) {
+        super(source);
+        this.chainTaskId = chainTaskId;
+        this.chainDealId = chainDealId;
+        this.taskIndex = taskIndex;
+    }
 }
diff --git a/src/main/java/com/iexec/core/task/update/TaskUpdateManager.java b/src/main/java/com/iexec/core/task/update/TaskUpdateManager.java
@@ -246,7 +246,8 @@ void initializing2Initialized(final Task task) {
             update.set("initializationBlockNumber", task.getDealBlockNumber());
 
             // Create enclave challenge after task has been initialized on-chain
-            final Optional<String> enclaveChallenge = smsService.getEnclaveChallenge(task.getChainTaskId(), task.getSmsUrl());
+            final Optional<String> enclaveChallenge = smsService.getEnclaveChallenge(
+                    task.getChainTaskId(), task.getChainDealId(), task.getTaskIndex(), task.getSmsUrl());
             if (enclaveChallenge.isEmpty()) {
                 log.error("Can't initialize task, enclave challenge is empty [chainTaskId:{}]", task.getChainTaskId());
                 toFailed(task, INITIALIZE_FAILED);
diff --git a/src/test/java/com/iexec/core/TestUtils.java b/src/test/java/com/iexec/core/TestUtils.java
@@ -29,6 +29,7 @@
 public class TestUtils {
     public static final String CHAIN_DEAL_ID = "0xd82223e5feff6720792ffed1665e980da95e5d32b177332013eaba8edc07f31c";
     public static final String CHAIN_TASK_ID = "0x65bc5e94ed1486b940bd6cc0013c418efad58a0a52a3d08cee89faaa21970426";
+    public static final int TASK_INDEX = 0;
 
     public static final String WORKER_ADDRESS = "0x87ae2b87b5db23830572988fb1f51242fbc471ce";
     public static final String WALLET_WORKER_1 = "0x1a69b2eb604db8eba185df03ea4f5288dcbbd248";
diff --git a/src/test/java/com/iexec/core/chain/DealWatcherServiceTests.java b/src/test/java/com/iexec/core/chain/DealWatcherServiceTests.java
@@ -198,7 +198,10 @@ void shouldUpdateLastSeenBlockWhenOneDealAndCreateTask() {
         verify(configurationService).setLastSeenBlockWithDeal(blockOfDeal);
         verify(applicationEventPublisher).publishEvent(any(TaskCreatedEvent.class));
         verify(applicationEventPublisher).publishEvent(argumentCaptor.capture());
-        assertThat(argumentCaptor.getValue()).isEqualTo(new TaskCreatedEvent(task.getChainTaskId()));
+        assertThat(argumentCaptor.getValue())
+                .usingRecursiveComparison()
+                .ignoringFields("timestamp")
+                .isEqualTo(new TaskCreatedEvent(dealWatcherService, task.getChainTaskId(), task.getChainDealId(), task.getTaskIndex()));
     }
 
     @Test
diff --git a/src/test/java/com/iexec/core/chain/SignatureServiceTests.java b/src/test/java/com/iexec/core/chain/SignatureServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 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.
@@ -42,36 +42,34 @@ class SignatureServiceTests {
     @InjectMocks
     private SignatureService signatureService;
 
+    private final String workerWallet = "0x748e091bf16048cb5103E0E10F9D5a8b7fBDd860";
+    private final String chainTaskId = "0xd94b63fc2d3ec4b96daf84b403bbafdc8c8517e8e2addd51fec0fa4e67801be8";
+    private final String enclaveChallenge = "0x9a43BB008b7A657e1936ebf5d8e28e5c5E021596";
+
     @Test
     void shouldAuthorizationHashBeValid() {
-        String workerWallet = "0x748e091bf16048cb5103E0E10F9D5a8b7fBDd860";
-        String chainTaskid = "0xd94b63fc2d3ec4b96daf84b403bbafdc8c8517e8e2addd51fec0fa4e67801be8";
-        String enclaveWallet = "0x9a43BB008b7A657e1936ebf5d8e28e5c5E021596";
-
-        String expected = "0x54a76d209e8167e1ffa3bde8e3e7b30068423ca9554e1d605d8ee8fd0f165562";
-
-        assertThat(HashUtils.concatenateAndHash(workerWallet, chainTaskid, enclaveWallet)).isEqualTo(expected);
+        final String expectedHash = "0x54a76d209e8167e1ffa3bde8e3e7b30068423ca9554e1d605d8ee8fd0f165562";
+        assertThat(HashUtils.concatenateAndHash(workerWallet, chainTaskId, enclaveChallenge)).isEqualTo(expectedHash);
     }
 
     @Test
     void shouldCreateCorrectAuthorization() {
-        // input
-        String workerWallet = "0x748e091bf16048cb5103E0E10F9D5a8b7fBDd860";
-        String chainTaskId = "0xd94b63fc2d3ec4b96daf84b403bbafdc8c8517e8e2addd51fec0fa4e67801be8";
-        String enclaveChallenge = "0x9a43BB008b7A657e1936ebf5d8e28e5c5E021596";
-        String privateKey = "0x2a46e8c1535792f6689b10d5c882c9363910c30751ec193ae71ec71630077909";
-        String hash = HashUtils.concatenateAndHash(workerWallet, chainTaskId, enclaveChallenge);
+        final String privateKey = "0x2a46e8c1535792f6689b10d5c882c9363910c30751ec193ae71ec71630077909";
+        final String hash = HashUtils.concatenateAndHash(workerWallet, chainTaskId, enclaveChallenge);
 
         ReflectionTestUtils.setField(signerService, "credentials", Credentials.create(privateKey));
         when(signerService.signMessageHash(hash)).thenCallRealMethod();
 
         // creation
-        WorkerpoolAuthorization authorization = signatureService.createAuthorization(workerWallet, chainTaskId, enclaveChallenge);
+        final WorkerpoolAuthorization authorization =
+                signatureService.createAuthorization(workerWallet, chainTaskId, "", 0, enclaveChallenge);
 
         // check
-        WorkerpoolAuthorization expected = WorkerpoolAuthorization.builder()
+        final WorkerpoolAuthorization expected = WorkerpoolAuthorization.builder()
                 .workerWallet(workerWallet)
                 .chainTaskId(chainTaskId)
+                .dealId("")
+                .taskIndex(0)
                 .enclaveChallenge(enclaveChallenge)
                 .signature(new Signature(
                         BytesUtils.stringToBytes("0x63f2c959ed7dfc11619e1e0b5ba8a4bf56f81ce81d0b6e6e9cdeca538cb85d97"),
diff --git a/src/test/java/com/iexec/core/replicate/ReplicateSupplyServiceTests.java b/src/test/java/com/iexec/core/replicate/ReplicateSupplyServiceTests.java
diff --git a/src/test/java/com/iexec/core/result/ResultServiceTests.java b/src/test/java/com/iexec/core/result/ResultServiceTests.java
diff --git a/src/test/java/com/iexec/core/sms/SmsServiceTests.java b/src/test/java/com/iexec/core/sms/SmsServiceTests.java
diff --git a/src/test/java/com/iexec/core/task/listener/TaskListenerTest.java b/src/test/java/com/iexec/core/task/listener/TaskListenerTest.java
diff --git a/src/test/java/com/iexec/core/task/update/TaskUpdateManagerTests.java b/src/test/java/com/iexec/core/task/update/TaskUpdateManagerTests.java
