Skip to content

feat: add tag field to TaskDescription #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbern0rd merged 1 commit into from
Sep 29, 2025
Merged

feat: add tag field to TaskDescription #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions src/main/java/com/iexec/commons/poco/task/TaskDescription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ public class TaskDescription {
String datasetUri;
String datasetChecksum;

// deal
String chainDealId;
// Deal in IexecLibCore_v5.sol
String appAddress;
String appOwner;
BigInteger appPrice;
Expand All @@ -59,20 +58,24 @@ public class TaskDescription {
BigInteger workerpoolPrice;
BigInteger trust;
BigInteger category;
boolean isTeeTask;
TeeFramework teeFramework;
String tag;
String requester;
String beneficiary;
String callback;
@Builder.Default
DealParams dealParams = DealParams.builder().build();
long startTime;
int botSize;
int botFirstIndex;
int botSize;

// task
int botIndex;
long maxExecutionTime; // timeref ?
// TEE from tag
boolean isTeeTask;
TeeFramework teeFramework;

// Task in IexecLibCore_v5.sol
String chainDealId;
int botIndex; // idx
long maxExecutionTime; // timeref in PoCo
long contributionDeadline;
long finalDeadline;

Expand Down Expand Up @@ -178,7 +181,6 @@ public static TaskDescription toTaskDescription(final ChainDeal chainDeal, final
.datasetUri(datasetUri)
.datasetChecksum(datasetChecksum)
// deal
.chainDealId(chainDeal.getChainDealId())
.appAddress(chainDeal.getDappPointer())
.appOwner(chainDeal.getDappOwner())
.appPrice(chainDeal.getDappPrice())
Expand All @@ -190,16 +192,19 @@ public static TaskDescription toTaskDescription(final ChainDeal chainDeal, final
.workerpoolPrice(chainDeal.getPoolPrice())
.trust(chainDeal.getTrust())
.category(chainDeal.getCategory())
.isTeeTask(TeeUtils.isTeeTag(tag))
.teeFramework(TeeUtils.getTeeFramework(tag))
.tag(tag)
.requester(chainDeal.getRequester())
.beneficiary(chainDeal.getBeneficiary())
.callback(chainDeal.getCallback())
.dealParams(chainDeal.getParams())
.startTime(chainDeal.getStartTime().longValue())
.botSize(chainDeal.getBotSize().intValue())
.botFirstIndex(chainDeal.getBotFirst().intValue())
.botSize(chainDeal.getBotSize().intValue())
// tee
.isTeeTask(TeeUtils.isTeeTag(tag))
.teeFramework(TeeUtils.getTeeFramework(tag))
// task
.chainDealId(chainDeal.getChainDealId())
.botIndex(chainTask.getIdx())
.maxExecutionTime(chainDeal.getChainCategory().getMaxExecutionTime()) // https://github.com/iExecBlockchainComputing/PoCo/blob/v5/contracts/modules/delegates/IexecPoco2Delegate.sol#L111
.contributionDeadline(chainTask.getContributionDeadline())
Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/iexec/commons/poco/task/TaskDescriptionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ void toTaskDescription() {
.workerpoolPrice(WORKERPOOL_PRICE)
.trust(TRUST)
.category(CATEGORY)
.tag(TeeUtils.TEE_SCONE_ONLY_TAG)
.isTeeTask(IS_TEE_TASK)
.teeFramework(TEE_FRAMEWORK)
.requester(REQUESTER)
Expand Down