Using V5 smart-contracts

Author: Jérémy James Toussaint

src/main/java/com/iexec/worker/chain/ContributionService.java

@@ -1,7 +1,7 @@
 package com.iexec.worker.chain;
 
 import com.iexec.common.chain.*;
-import com.iexec.common.contract.generated.IexecHubABILegacy;
+import com.iexec.common.contract.generated.IexecHubContract;
 import com.iexec.common.replicate.ReplicateStatusCause;
 import com.iexec.common.security.Signature;
 import com.iexec.common.utils.BytesUtils;
@@ -127,7 +127,7 @@ public boolean isContributionDeadlineReached(String chainTaskId) {
     public Optional<ChainReceipt> contribute(ContributionAuthorization contribAuth, String deterministHash, Signature enclaveSignature) {
         String resultSeal = computeResultSeal(contribAuth.getWorkerWallet(), contribAuth.getChainTaskId(), deterministHash);
         String resultHash = computeResultHash(contribAuth.getChainTaskId(), deterministHash);
-        IexecHubABILegacy.TaskContributeEventResponse contributeResponse = iexecHubService.contribute(contribAuth, resultHash, resultSeal, enclaveSignature);
+        IexecHubContract.TaskContributeEventResponse contributeResponse = iexecHubService.contribute(contribAuth, resultHash, resultSeal, enclaveSignature);
 
         if (contributeResponse == null) {
             log.error("ContributeTransactionReceipt received but was null [chainTaskId:{}]", contribAuth.getChainTaskId());

src/main/java/com/iexec/worker/chain/IexecHubService.java

@@ -2,7 +2,7 @@
 
 
 import com.iexec.common.chain.*;
-import com.iexec.common.contract.generated.IexecHubABILegacy;
+import com.iexec.common.contract.generated.IexecHubContract;
 import com.iexec.common.security.Signature;
 import com.iexec.common.task.TaskDescription;
 import com.iexec.common.utils.BytesUtils;
@@ -49,7 +49,7 @@ public IexecHubService(CredentialsService credentialsService,
         this.executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(1);
     }
 
-    IexecHubABILegacy.TaskContributeEventResponse contribute(ContributionAuthorization contribAuth,
+    IexecHubContract.TaskContributeEventResponse contribute(ContributionAuthorization contribAuth,
                                                              String resultHash,
                                                              String resultSeal,
                                                              Signature enclaveSignature) {
@@ -65,7 +65,7 @@ IexecHubABILegacy.TaskContributeEventResponse contribute(ContributionAuthorizati
         return null;
     }
 
-    private IexecHubABILegacy.TaskContributeEventResponse sendContributeTransaction(ContributionAuthorization contribAuth,
+    private IexecHubContract.TaskContributeEventResponse sendContributeTransaction(ContributionAuthorization contribAuth,
                                                                                     String resultHash,
                                                                                     String resultSeal,
                                                                                     Signature enclaveSignature) {
@@ -92,9 +92,9 @@ private IexecHubABILegacy.TaskContributeEventResponse sendContributeTransaction(
             return null;
         }
 
-        List<IexecHubABILegacy.TaskContributeEventResponse> contributeEvents = getHubContract().getTaskContributeEvents(contributeReceipt);
+        List<IexecHubContract.TaskContributeEventResponse> contributeEvents = getHubContract().getTaskContributeEvents(contributeReceipt);
 
-        IexecHubABILegacy.TaskContributeEventResponse contributeEvent = null;
+        IexecHubContract.TaskContributeEventResponse contributeEvent = null;
         if (contributeEvents != null && !contributeEvents.isEmpty()) {
             contributeEvent = contributeEvents.get(0);
         }
@@ -121,7 +121,7 @@ private boolean isSuccessTx(String chainTaskId, BaseEventResponse txEvent, Chain
         return true;
     }
 
-    IexecHubABILegacy.TaskRevealEventResponse reveal(String chainTaskId, String resultDigest) {
+    IexecHubContract.TaskRevealEventResponse reveal(String chainTaskId, String resultDigest) {
         try {
             return CompletableFuture.supplyAsync(() -> {
                 log.info("Requested  reveal [chainTaskId:{}, waitingTxCount:{}]", chainTaskId, getWaitingTransactionCount());
@@ -133,7 +133,7 @@ IexecHubABILegacy.TaskRevealEventResponse reveal(String chainTaskId, String resu
         return null;
     }
 
-    private IexecHubABILegacy.TaskRevealEventResponse sendRevealTransaction(String chainTaskId, String resultDigest) {
+    private IexecHubContract.TaskRevealEventResponse sendRevealTransaction(String chainTaskId, String resultDigest) {
         TransactionReceipt revealReceipt;
         RemoteCall<TransactionReceipt> revealCall = getHubContract(web3jService.getWritingContractGasProvider()).reveal(
                 stringToBytes(chainTaskId),
@@ -148,9 +148,9 @@ private IexecHubABILegacy.TaskRevealEventResponse sendRevealTransaction(String c
             return null;
         }
 
-        List<IexecHubABILegacy.TaskRevealEventResponse> revealEvents = getHubContract().getTaskRevealEvents(revealReceipt);
+        List<IexecHubContract.TaskRevealEventResponse> revealEvents = getHubContract().getTaskRevealEvents(revealReceipt);
 
-        IexecHubABILegacy.TaskRevealEventResponse revealEvent = null;
+        IexecHubContract.TaskRevealEventResponse revealEvent = null;
         if (revealEvents != null && !revealEvents.isEmpty()) {
             revealEvent = revealEvents.get(0);
         }

src/main/java/com/iexec/worker/chain/RevealService.java

@@ -1,7 +1,7 @@
 package com.iexec.worker.chain;
 
 import com.iexec.common.chain.*;
-import com.iexec.common.contract.generated.IexecHubABILegacy;
+import com.iexec.common.contract.generated.IexecHubContract;
 import com.iexec.common.utils.HashUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -102,7 +102,7 @@ public Optional<ChainReceipt> reveal(String chainTaskId, String determinismHash)
             return Optional.empty();
         }
 
-        IexecHubABILegacy.TaskRevealEventResponse revealResponse = iexecHubService.reveal(chainTaskId, determinismHash);
+        IexecHubContract.TaskRevealEventResponse revealResponse = iexecHubService.reveal(chainTaskId, determinismHash);
         if (revealResponse == null) {
             log.error("RevealTransactionReceipt received but was null [chainTaskId:{}]", chainTaskId);
             return Optional.empty();

src/test/java/com/iexec/worker/chain/RevealServiceTests.java

@@ -3,7 +3,7 @@
 import com.iexec.common.chain.ChainContribution;
 import com.iexec.common.chain.ChainContributionStatus;
 import com.iexec.common.chain.ChainTask;
-import com.iexec.common.contract.generated.IexecHubABILegacy;
+import com.iexec.common.contract.generated.IexecHubContract;
 import com.iexec.common.utils.HashUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.junit.Before;
@@ -326,7 +326,7 @@ public void shouldRevealIfTransactionSucceeds() throws Exception {
         String deterministHash = Hash.sha3("Hello");
         String chainTaskId = "0xd94b63fc2d3ec4b96daf84b403bbafdc8c8517e8e2addd51fec0fa4e67801be8";
 
-        IexecHubABILegacy.TaskRevealEventResponse response = new IexecHubABILegacy.TaskRevealEventResponse();
+        IexecHubContract.TaskRevealEventResponse response = new IexecHubContract.TaskRevealEventResponse();
 
         // 0x200 in hexa = 512 in decimal
         response.log =