Merge pull request #575 from iExecBlockchainComputing/release/8.3.0

Release/8.3.0

Author: jbern0rd

CHANGELOG.md

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.20_8-jre-focal
+FROM eclipse-temurin:11.0.21_9-jre-focal
 
 ARG jar
 

Dockerfile

@@ -1,7 +1,4 @@
-@Library('[email protected].3') _
+@Library('[email protected].4') _
 buildJavaProject(
-        buildInfo: getBuildInfo(),
-        integrationTestsEnvVars: [],
         shouldPublishJars: true,
-        shouldPublishDockerImages: true,
-        dockerfileDir: '.')
+        shouldPublishDockerImages: true)

Jenkinsfile

@@ -1,8 +1,8 @@
 plugins {
     id 'java'
     id 'io.freefair.lombok' version '8.2.2'
-    id 'org.springframework.boot' version '2.7.14'
-    id 'io.spring.dependency-management' version '1.1.3'
+    id 'org.springframework.boot' version '2.7.17'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'jacoco'
     id 'org.sonarqube' version '4.2.1.3168'
     id 'maven-publish'
@@ -12,15 +12,14 @@ group = 'com.iexec.worker'
 
 ext {
     springCloudVersion = '2021.0.8'
-    dockerJavaVersion = '3.2.12'
-    lombokVersion = '1.18.2'
+    commonsMathsVersion = '3.6.1'
 }
 
 if (!project.hasProperty('gitBranch')) {
     ext.gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
 }
 
-if (gitBranch != 'main' && gitBranch != 'master' && ! (gitBranch ==~ '(release|hotfix|support)/.*')) {
+if (gitBranch != 'main' && gitBranch != 'master' && !(gitBranch ==~ '(release|hotfix|support)/.*')) {
     version += '-NEXT-SNAPSHOT'
 }
 
@@ -64,9 +63,12 @@ dependencies {
     implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
     implementation "org.springframework.retry:spring-retry"
 
-    // apache commons.lang3
+    // apache commons-lang3
     implementation 'org.apache.commons:commons-lang3'
 
+    // Apache commons-math3
+    implementation "org.apache.commons:commons-math3:${commonsMathsVersion}"
+
     // Required for com.iexec.worker.feign.config.RestTemplateConfig
     implementation 'org.apache.httpcomponents:httpclient'
 
@@ -80,9 +82,6 @@ dependencies {
     // observability
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
 
-    // docker
-    implementation "com.github.docker-java:docker-java:${dockerJavaVersion}"
-
     // expiring map
     implementation 'net.jodah:expiringmap:0.5.10'
 
@@ -97,8 +96,10 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
+    sourceCompatibility = "11"
+    targetCompatibility = "11"
 }
 
 springBoot {
@@ -108,7 +109,7 @@ springBoot {
 tasks.named("bootJar") {
     manifest {
         attributes("Implementation-Title": "iExec Worker",
-                   "Implementation-Version": project.version)
+                "Implementation-Version": project.version)
     }
 }
 
@@ -127,7 +128,7 @@ jacocoTestReport {
         xml.required = true
     }
 }
-tasks.test.finalizedBy    tasks.jacocoTestReport
+tasks.test.finalizedBy tasks.jacocoTestReport
 tasks.sonarqube.dependsOn tasks.jacocoTestReport
 
 publishing {
@@ -148,16 +149,15 @@ publishing {
     }
 }
 
-ext.jarPathForOCI  = relativePath(tasks.bootJar.outputs.files.singleFile)
+ext.jarPathForOCI = relativePath(tasks.bootJar.outputs.files.singleFile)
 ext.gitShortCommit = 'git rev-parse --short=8 HEAD'.execute().text.trim()
-ext.ociImageName   = 'local/' + ['bash', '-c', 'basename $(git config --get remote.origin.url) .git'].execute().text.trim()
+ext.ociImageName = 'local/' + ['bash', '-c', 'basename $(git config --get remote.origin.url) .git'].execute().text.trim()
 
 tasks.register('buildImage', Exec) {
-    group       'Build'
+    group 'Build'
     description 'Builds an OCI image from a Dockerfile.'
-    dependsOn    bootJar
-    commandLine ("sh", "-c", "docker build --build-arg jar=$jarPathForOCI -t $ociImageName:$gitShortCommit ."
-            + " && docker tag $ociImageName:$gitShortCommit $ociImageName:dev")
+    dependsOn bootJar
+    commandLine 'docker', 'build', '--build-arg', 'jar=' + jarPathForOCI, '-t', ociImageName + ':dev', '.'
 }
 
 // ##################
@@ -167,9 +167,9 @@ tasks.register('buildImage', Exec) {
 //gradle bootRun -PproxyHost=192.168.XX.XXX -PproxyPort=3128
 project.ext.getJvmArgs = {
     if (project.hasProperty("proxyHost") && project.hasProperty("proxyPort")) {
-        return ["-Dhttp.proxyHost="+project.proxyHost, "-Dhttp.proxyPort="+project.proxyPort]
+        return ["-Dhttp.proxyHost=" + project.proxyHost, "-Dhttp.proxyPort=" + project.proxyPort]
     } else {
-        return  []
+        return []
     }
 }
 

README.md

@@ -1,10 +1,10 @@
-version=8.2.0
-iexecCommonVersion=8.3.0
-iexecCommonsContainersVersion=1.1.2
-iexecCommonsPocoVersion=3.1.0
-iexecBlockchainAdapterVersion=8.2.0
-iexecResultVersion=8.2.0
-iexecSmsVersion=8.3.0
+version=8.3.0
+iexecCommonVersion=8.3.1
+iexecCommonsContainersVersion=1.2.1
+iexecCommonsPocoVersion=3.2.0
+iexecBlockchainAdapterVersion=8.3.0
+iexecResultVersion=8.3.0
+iexecSmsVersion=8.4.0
 
 nexusUser
 nexusPassword

build.gradle

@@ -17,7 +17,6 @@
 package com.iexec.worker;
 
 
-import com.iexec.worker.chain.CredentialsService;
 import com.iexec.worker.chain.IexecHubService;
 import com.iexec.worker.feign.LoginService;
 import com.iexec.worker.replicate.ReplicateRecoveryService;
@@ -45,7 +44,7 @@
 public class Application implements CommandLineRunner {
 
     @Autowired
-    private CredentialsService credentialsService;
+    private String workerWalletAddress;
 
     @Autowired
     private IexecHubService iexecHubService;
@@ -68,11 +67,9 @@ public static void main(String[] args) {
 
     @Override
     public void run(String... args) {
-        String workerAddress = credentialsService.getCredentials().getAddress();
-
         if (!iexecHubService.hasEnoughGas()) {
             String noEnoughGas = "No enough gas! please refill your wallet [walletAddress:%s]";
-            String formatted = String.format(noEnoughGas, workerAddress);
+            String formatted = String.format(noEnoughGas, workerWalletAddress);
             LoggingUtils.printHighlightedMessage(formatted);
             System.exit(0);
         }

gradle.properties

@@ -40,16 +40,16 @@ public class ContributionService {
     private final IexecHubService iexecHubService;
     private final WorkerpoolAuthorizationService workerpoolAuthorizationService;
     private final EnclaveAuthorizationService enclaveAuthorizationService;
-    private final CredentialsService credentialsService;
+    private final String workerWalletAddress;
 
     public ContributionService(IexecHubService iexecHubService,
                                WorkerpoolAuthorizationService workerpoolAuthorizationService,
                                EnclaveAuthorizationService enclaveAuthorizationService,
-                               CredentialsService credentialsService) {
+                               String workerWalletAddress) {
         this.iexecHubService = iexecHubService;
         this.workerpoolAuthorizationService = workerpoolAuthorizationService;
         this.enclaveAuthorizationService = enclaveAuthorizationService;
-        this.credentialsService = credentialsService;
+        this.workerWalletAddress = workerWalletAddress;
     }
 
     public boolean isChainTaskInitialized(String chainTaskId) {
@@ -180,7 +180,7 @@ public Contribution getContribution(ComputedFile computedFile) {
 
         String resultDigest = computedFile.getResultDigest();
         String resultHash = ResultUtils.computeResultHash(chainTaskId, resultDigest);
-        String resultSeal = ResultUtils.computeResultSeal(credentialsService.getCredentials().getAddress(), chainTaskId, resultDigest);
+        String resultSeal = ResultUtils.computeResultSeal(workerWalletAddress, chainTaskId, resultDigest);
         String workerpoolSignature = workerpoolAuthorization.getSignature().getValue();
         String enclaveChallenge = workerpoolAuthorization.getEnclaveChallenge();
         String enclaveSignature = computedFile.getEnclaveSignature();

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

@@ -17,8 +17,8 @@
 package com.iexec.worker.chain;
 
 import com.iexec.common.chain.CredentialsAbstractService;
-
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -30,4 +30,9 @@ public CredentialsService(
     ) throws Exception {
         super(walletPassword, walletPath);
     }
+
+    @Bean
+    public String workerWalletAddress() {
+        return getCredentials().getAddress();
+    }
 }