Skip to content

Commit 3050567

Browse files
james-toussaintjames-toussaint
authored
Hotfix/7.1.1
Hotfix/7.1.1
2 parents d393a60 + 3e995fd commit 3050567

File tree

7 files changed

+97
-10
lines changed

7 files changed

+97
-10
lines changed

‎CHANGELOG.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
## [[7.1.1]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v7.1.1) 2022-11-29
6+
7+
* Update build workflow to 2.1.4, update documentation in README and add CHANGELOG.
8+
9+
## [[7.1.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v7.1.0) 2022-07-01
10+
11+
* Try to establish connection against IPFS node several times before shutting down the service.
12+
* Add OpenFeign client library in dedicated iexec-result-proxy-library jar.
13+
* Use new EIP-712 implementation from iexec-common.
14+
* Use Java 11.0.15.
15+
16+
## [[7.0.2]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v7.0.2) 2022-01-03
17+
18+
* Fixed wallet address duplicate key on JWT.
19+
* Fix ConcurrentModificationException on authentication challenge map.
20+
* Upgrade automated build system.
21+
* Upgrade Jacoco/Sonarqube reporting and plugins.
22+
* Upgrade to Spring Boot 2.6.2.
23+
* Upgrade to Gradle 6.8.3.
24+
25+
## [[7.0.1]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v7.0.1) 2021-12-15
26+
27+
* Use iexec-common 5.9.1.
28+
29+
## [[7.0.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v7.0.0) 2021-12-14
30+
31+
* Highly improved throughput of the iExec protocol.
32+
33+
## [[6.1.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v6.1.0) 2021-10-27
34+
35+
* Compatibility with [email protected]+.
36+
* Ensure JWT uniqueness per user (and IpfsName per task).
37+
38+
## [[6.0.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v6.0.0) 2021-06-17
39+
40+
* Updated default port.
41+
42+
## [[1.0.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/1.0.0) 2020-07-15
43+
44+
* First version.

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('global-jenkins-library@2.0.1') _
1+
@Library('global-jenkins-library@2.1.4') _
22
buildJavaProject(
33
buildInfo: getBuildInfo(),
44
integrationTestsEnvVars: [],

‎README.md‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,32 @@
1-
# iexec-result-proxy
2-
iExec Result Proxy (IPFS, ...)
1+
# iExec Result Proxy
2+
3+
## Overview
4+
5+
The iExec Result Proxy stores results of iExec tasks on IPFS.
6+
7+
The iExec Result Proxy is available as an OCI image on [Docker Hub](https://hub.docker.com/r/iexechub/iexec-result-proxy/tags).
8+
9+
To run properly, the iExec Result Proxy requires:
10+
* A blockchain node. iExec smart contracts must be deployed on the blockchain network.
11+
* A MongoDB instance to persist its data.
12+
* An IPFS node where iExec tasks results will be pushed and retrieved.
13+
14+
## Configuration
15+
16+
You can configure the iExec Result Proxy with the following properties:
17+
18+
| Environment variable | Description | Type | Default value |
19+
| --- | --- | --- | --- |
20+
| IEXEC_RESULT_PROXY_PORT | Server HTTP port of the result proxy. | Positive integer | `13200` |
21+
| MONGO_HOST | Mongo server host. Cannot be set with URI. | String | `localhost` |
22+
| MONGO_PORT | Mongo server port. Cannot be set with URI. | Positive integer | `13202` |
23+
| IEXEC_CHAIN_ID | Chain ID of the blockchain network to connect. | Integer | `17` |
24+
| IEXEC_IS_SIDECHAIN | Define if iExec on-chain protocol is built on top of token (`false`) or native currency (`true`). | Boolean | `false` |
25+
| IEXEC_PRIVATE_CHAIN_ADDRESS | Private URL to connect to the blockchain node. | URL | `http://localhost:8545` |
26+
| IEXEC_PUBLIC_CHAIN_ADDRESS | [unused] Public URL to connect to the blockchain node. | URL | `http://localhost:8545` |
27+
| IEXEC_HUB_ADDRESS | Proxy contract address to interact with the iExec on-chain protocol. | Ethereum address | `0xBF6B2B07e47326B7c8bfCb4A5460bef9f0Fd2002` |
28+
| IEXEC_START_BLOCK_NUMBER | [Unused] | Positive integer | `0` |
29+
| IEXEC_GAS_PRICE_MULTIPLIER | Transactions will be sent with `networkGasPrice * IEXEC_GAS_PRICE_MULTIPLIER`. | Float | `1.0` |
30+
| IEXEC_GAS_PRICE_CAP | In Wei, will be used for transactions if `networkGasPrice * IEXEC_GAS_PRICE_MULTIPLIER > gasPriceCap`. | Integer | `22000000000` |
31+
| IEXEC_IPFS_HOST | Host to connect to the IPFS node. | String | `127.0.0.1` |
32+
| IEXEC_IPFS_PORT | Server port of the IPFS node. | Positive integer | `5001` |

‎build.gradle‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ plugins {
1010

1111
ext {
1212
springCloudVersion = '2021.0.0'
13-
gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
13+
}
14+
15+
if (!project.hasProperty('gitBranch')) {
16+
ext.gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
1417
}
1518

1619
allprojects {
@@ -25,6 +28,13 @@ allprojects {
2528
repositories {
2629
mavenLocal()
2730
mavenCentral()
31+
maven {
32+
url "https://docker-regis-adm.iex.ec/repository/maven-public/"
33+
credentials {
34+
username nexusUser
35+
password nexusPassword
36+
}
37+
}
2838
maven {
2939
url 'https://nexus.intra.iex.ec/repository/maven-public/'
3040
}
@@ -121,8 +131,8 @@ publishing {
121131
repositories {
122132
maven {
123133
credentials {
124-
username project.hasProperty('nexusUser') ? nexusUser : ''
125-
password project.hasProperty('nexusPassword') ? nexusPassword : ''
134+
username nexusUser
135+
password nexusPassword
126136
}
127137
url project.hasProperty('nexusUrl') ? nexusUrl : ''
128138
}

‎gradle.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
version=7.1.0
1+
version=7.1.1
22
iexecCommonVersion=6.0.0
3+
4+
nexusUser
5+
nexusPassword

‎iexec-result-proxy-library/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ publishing {
3838
repositories {
3939
maven {
4040
credentials {
41-
username project.hasProperty("nexusUser")? project.nexusUser: ''
42-
password project.hasProperty("nexusPassword")? project.nexusPassword: ''
41+
username nexusUser
42+
password nexusPassword
4343
}
4444
url = project.hasProperty("nexusUrl")? project.nexusUrl: ''
4545
}

‎src/main/resources/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ chain:
1616
publicAddress: ${IEXEC_PUBLIC_CHAIN_ADDRESS:http://localhost:8545}
1717
hubAddress: ${IEXEC_HUB_ADDRESS:0xBF6B2B07e47326B7c8bfCb4A5460bef9f0Fd2002}
1818
startBlockNumber: ${IEXEC_START_BLOCK_NUMBER:0}
19-
gasPriceMultiplier: ${IEXEC_GAS_PRICE_MULTIPLIER:1.0} # txs will be send with networkGasPrice*gasPriceMultiplier, 4.0 means super fast
19+
gasPriceMultiplier: ${IEXEC_GAS_PRICE_MULTIPLIER:1.0} # txs will be sent with networkGasPrice*gasPriceMultiplier, 4.0 means super fast
2020
gasPriceCap: ${IEXEC_GAS_PRICE_CAP:22000000000} #in Wei, will be used for txs if networkGasPrice*gasPriceMultiplier > gasPriceCap
2121

2222
ipfs:

0 commit comments

Comments
 (0)