Merge pull request #379 from iExecBlockchainComputing/release/5.0.0

Release/5.0.0

Author: james-toussaint

Dockerfile

@@ -1,10 +1,5 @@
-#openjdk:12-alpine heavy and not supporting jre-only yet, azul-zulu based on openjdk
-FROM azul/zulu-openjdk-alpine:11.0.3-jre
+FROM openjdk:11.0.7-jre-slim
 
-# Default certificate will only be valid at 'https://localhost:[...]' (and not at 'https://core:[...]' for e.g.)
-COPY build/resources/main/ssl-keystore-dev.p12 /ssl/ssl-keystore.p12
-ENV IEXEC_CORE_SSL_KEYSTORE /ssl/ssl-keystore.p12
-
-ADD build/libs/iexec-core-@[email protected] iexec-core.jar
+COPY build/libs/iexec-core-@[email protected] iexec-core.jar
 
 ENTRYPOINT ["java","-jar","/iexec-core.jar"]

README.md

@@ -40,13 +40,3 @@ Since the core will perform some transactions on the blockchain and handle some
 ## Documentation
 
 A more exhaustive documentation is available on [the official documentation of iExec](https://docs.iex.ec/)
-
-
-
-## HTTPS
-
-* Self-signed certificate (dev purpose only)
-
-`keytool -genkey -alias iexec-core -storetype PKCS12 -keyalg RSA -keysize 2048 -keystore ./src/main/resources/ssl-keystore-dev.p12 -validity 3650`
-
-* Replace it with a real certificate in production

build.gradle

@@ -84,6 +84,11 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-actuator"
     compile "org.springframework.cloud:spring-cloud-starter-openfeign"
 
+    // NoSuchMethodError: 'okhttp3.RequestBody okhttp3.RequestBody.create(java.lang.String, okhttp3.MediaType)'
+    implementation 'com.squareup.okhttp3:okhttp:4.3.1' // Web3j issue: https://github.com/web3j/web3j/issues/1180
+    // NoSuchMethodError: 'byte[] kotlin.collections.ArraysKt.copyInto(byte[], byte[], int, int, int)'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.50' // https://stackoverflow.com/a/57907899
+
     testCompile "org.springframework.boot:spring-boot-starter-test"
 
     // swagger
@@ -217,7 +222,7 @@ task buildImage(type: Exec) {
 }
 
 buildImage.dependsOn prepareDockerFile
-buildImage.enabled = isMasterBranch || project.hasProperty("forceDockerBuild")
+buildImage.enabled = (isMasterBranch || isDevelopBranch ) || project.hasProperty("forceDockerBuild")
 
 task pushImage(type: Exec) {
     if (project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")) {
@@ -232,4 +237,4 @@ task pushImage(type: Exec) {
 }
 
 pushImage.dependsOn buildImage
-pushImage.enabled = isMasterBranch && project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")
+pushImage.enabled = (isMasterBranch || isDevelopBranch ) && project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")

docker-compose.yml

@@ -13,11 +13,8 @@ services:
     - IEXEC_IPFS_HOST=ipfs
     - IEXEC_SMS_HOST=sms
     - IEXEC_SCONE_CAS_HOST=iexec-cas
-    - IEXEC_CORE_SSL_KEYSTORE=/iexec/ssl-keystore-dev.p12
-    - IEXEC_CORE_SSL_PASSWORD=whatever
     volumes:
       - ./wallet/encrypted-wallet_scheduler.json:/iexec/wallet/encrypted-wallet.json
-      - ./ssl-keystore-dev.p12:/iexec/ssl-keystore-dev.p12
     ports:
     - 18090:18090
     restart: on-failure

gradle.properties

@@ -1,4 +1,4 @@
-iexecCommonVersion=4.0.1
+iexecCommonVersion=5.0.0
 nexusUser=fake
 nexusPassword=fake
-version=4.0.1
+version=5.0.0

src/main/java/com/iexec/core/Application.java

@@ -1,6 +1,6 @@
 package com.iexec.core;
 
-import com.iexec.core.chain.IexecHubService;
+import com.iexec.core.chain.DealWatcherService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -11,16 +11,14 @@
 public class Application implements CommandLineRunner {
 
     @Autowired
-    private IexecHubService iexecHubService;
+    private DealWatcherService dealWatcherService;
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
 
     @Override
     public void run(String... args) throws Exception {
-        if (!iexecHubService.hasEnoughGas()) {
-            System.exit(0);
-        }
+        dealWatcherService.run();
     }
 }

src/main/java/com/iexec/core/HttpWebServerConfiguration.java

@@ -1,30 +1,17 @@
 package com.iexec.core.chain;
 
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.web3j.crypto.CipherException;
-import org.web3j.crypto.Credentials;
-import org.web3j.crypto.WalletUtils;
+import com.iexec.common.chain.CredentialsAbstractService;
 
-import java.io.IOException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 
-@Slf4j
 @Service
-public class CredentialsService {
-
-    private Credentials credentials;
-
-    public CredentialsService(WalletDetails walletDetails) throws IOException, CipherException {
-        try {
-            credentials = WalletUtils.loadCredentials(walletDetails.getPassword(), walletDetails.getPath());
-            log.info("Load core wallet credentials [address:{}] ", credentials.getAddress());
-        } catch (IOException | CipherException e) {
-            log.error("Credentials cannot be loaded [exception:{}] ", e);
-            throw e;
-        }
-    }
+public class CredentialsService extends CredentialsAbstractService {
 
-    public Credentials getCredentials() {
-        return credentials;
+    public CredentialsService(
+            @Value("${wallet.password}") String walletPassword,
+            @Value("${wallet.encryptedFilePath}") String walletPath
+    ) throws Exception {
+        super(walletPassword, walletPath);
     }
-}
+}

src/main/java/com/iexec/core/chain/CredentialsService.java

@@ -1,6 +1,6 @@
 package com.iexec.core.chain;
 
-import com.iexec.common.contract.generated.IexecClerkABILegacy;
+import com.iexec.common.contract.generated.IexecHubContract;
 import com.iexec.common.utils.BytesUtils;
 import lombok.Builder;
 import lombok.Data;
@@ -23,7 +23,7 @@ public DealEvent(String chainDealId, BigInteger blockNumber) {
         this.blockNumber = blockNumber;
     }
 
-    public DealEvent(IexecClerkABILegacy.SchedulerNoticeEventResponse schedulerNoticeEventResponse) {
+    public DealEvent(IexecHubContract.SchedulerNoticeEventResponse schedulerNoticeEventResponse) {
         this.chainDealId = BytesUtils.bytesToString(schedulerNoticeEventResponse.dealid);
         this.blockNumber = schedulerNoticeEventResponse.log.getBlockNumber();
     }

src/main/java/com/iexec/core/chain/DealEvent.java

@@ -13,7 +13,6 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.math.BigInteger;
 import java.util.Optional;
 
@@ -39,8 +38,7 @@ public DealWatcherService(IexecHubService iexecHubService,
         this.taskService = taskService;
     }
 
-    @PostConstruct
-    void run() {
+    public void run() {
         subscribeToDealEventFromOneBlockToLatest(configurationService.getLastSeenBlockWithDeal());
     }
 
@@ -88,7 +86,7 @@ private void handleDeal(String chainDealId) {
      * 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)
      * */
-    @Scheduled(fixedRateString = "${detector.dealwatcherreplay.period}")
+    @Scheduled(fixedRateString = "${cron.detector.dealwatcherreplay.period}")
     void replayDealEvent() {
         if (configurationService.getFromReplay().intValue() < configurationService.getLastSeenBlockWithDeal().intValue()) {
             if (dealEventSubscriptionReplay != null && !dealEventSubscriptionReplay.isDisposed()) {