Merge pull request #89 from iExecBlockchainComputing/bugfix/immutable-chain-config

Bugfix/immutable chain config

Author: jbern0rd

CHANGELOG.md

@@ -8,11 +8,11 @@ All notable changes to this project will be documented in this file.
 - Enable Prometheus actuator. (#84)
 ### Bug Fixes
 - Fix link in changelog. (#83)
-### Quality
+- `ChainConfig` instances are immutable. (#89)
 ### Dependency Upgrades
 - Upgrade to `expiringmap` 0.5.10. (#84)
-- Upgrade to `iexec-common` 8.1.0-NEXT-SNAPSHOT. (#85 #87)
-- Upgrade to `iexec-commons-poco` 2.0.0. (#85 #87)
+- Upgrade to `iexec-common` 8.2.0. (#85 #87 #88)
+- Upgrade to `iexec-commons-poco` 3.0.2. (#85 #87 #88)
 
 ## [[8.0.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.0.0) 2023-03-03
 

README.md

@@ -20,10 +20,10 @@ You can configure the iExec Result Proxy with the following properties:
 | `IEXEC_RESULT_PROXY_PORT` | Server HTTP port of the result proxy. | Positive integer | `13200` |
 | `MONGO_HOST` | Mongo server host. Cannot be set with URI. | String | `localhost` |
 | `MONGO_PORT` | Mongo server port. Cannot be set with URI. | Positive integer | `13202` |
-| `IEXEC_CHAIN_ID` | Chain ID of the blockchain network to connect. | `Integer | `17` |
-| `IEXEC_IS_SIDECHAIN` | Define if iExec on-chain protocol is built on top of token (`false`) or native currency (`true`). | Boolean | `false` |
-| `IEXEC_PRIVATE_CHAIN_ADDRESS` | Private URL to connect to the blockchain node. | URL | `http://localhost:8545` |
-| `IEXEC_HUB_ADDRESS` | Proxy contract address to interact with the iExec on-chain protocol. | Ethereum address | `0xBF6B2B07e47326B7c8bfCb4A5460bef9f0Fd2002` |
+| `IEXEC_CHAIN_ID` | Chain ID of the blockchain network to connect. | `Integer | `134` |
+| `IEXEC_IS_SIDECHAIN` | Define whether iExec on-chain protocol is built on top of token (`false`) or native currency (`true`). | Boolean | `true` |
+| `IEXEC_PRIVATE_CHAIN_ADDRESS` | Private URL to connect to the blockchain node. | URL | `https://bellecour.iex.ec` |
+| `IEXEC_HUB_ADDRESS` | Proxy contract address to interact with the iExec on-chain protocol. | Ethereum address | `0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f` |
 | `IEXEC_BLOCK_TIME` | Duration between consecutive blocks on the blockchain network. | String | `PT5S` |
 | `IEXEC_GAS_PRICE_MULTIPLIER` | Transactions will be sent with `networkGasPrice * IEXEC_GAS_PRICE_MULTIPLIER`. | Float | `1.0` |
 | `IEXEC_GAS_PRICE_CAP` | In Wei, will be used for transactions if `networkGasPrice * IEXEC_GAS_PRICE_MULTIPLIER > gasPriceCap`. | Integer | `22000000000` |
@@ -35,3 +35,7 @@ You can configure the iExec Result Proxy with the following properties:
 A health endpoint (`/actuator/health`) is enabled by default and can be accessed on the **IEXEC_RESULT_PROXY_PORT**.
 This endpoint allows to define health checks in an orchestrator or a [compose file](https://github.com/compose-spec/compose-spec/blob/master/spec.md#healthcheck).
 No default strategy has been implemented in the [Dockerfile](Dockerfile) at the moment.
+
+## License
+
+This repository code is released under the [Apache License 2.0](LICENSE).

src/main/java/com/iexec/resultproxy/chain/ChainConfig.java

@@ -16,22 +16,22 @@
 
 package com.iexec.resultproxy.chain;
 
-import lombok.Data;
+import lombok.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConstructorBinding;
 
 import java.time.Duration;
 
-@Data
+@Value
 @ConstructorBinding
 @ConfigurationProperties(prefix = "chain")
 //TODO: validate configuration property names and use the same set of names everywhere (blockchain-adapter-api, sms)
 public class ChainConfig {
-    private final int id;
-    private final boolean sidechain;
-    private final String privateAddress;
-    private final String hubAddress;
-    private final Duration blockTime;
-    private final float gasPriceMultiplier;
-    private final long gasPriceCap;
+    int id;
+    boolean sidechain;
+    String privateAddress;
+    String hubAddress;
+    Duration blockTime;
+    float gasPriceMultiplier;
+    long gasPriceCap;
 }