Merge pull request #88 from iExecBlockchainComputing/feature/[email protected]@8.2.0

Use [email protected] and [email protected]

Author: jbern0rd

README.md

@@ -24,6 +24,7 @@ You can configure the iExec Result Proxy with the following properties:
 | `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_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` |
 | `IEXEC_IPFS_HOST` | Host to connect to the IPFS node. | String | `127.0.0.1` |

gradle.properties

@@ -1,6 +1,6 @@
 version=8.0.0
-iexecCommonVersion=8.1.0-NEXT-SNAPSHOT
-iexecCommonsPocoVersion=2.0.0
+iexecCommonVersion=8.2.0
+iexecCommonsPocoVersion=3.0.2
 
 nexusUser
 nexusPassword

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

@@ -1,9 +1,27 @@
+/*
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.iexec.resultproxy.chain;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConstructorBinding;
 
+import java.time.Duration;
+
 @Data
 @ConstructorBinding
 @ConfigurationProperties(prefix = "chain")
@@ -13,6 +31,7 @@ public class ChainConfig {
     private final boolean sidechain;
     private final String privateAddress;
     private final String hubAddress;
+    private final Duration blockTime;
     private final float gasPriceMultiplier;
     private final long gasPriceCap;
 }

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

@@ -17,15 +17,20 @@
 package com.iexec.resultproxy.chain;
 
 import com.iexec.commons.poco.chain.Web3jAbstractService;
-
 import org.springframework.stereotype.Service;
 
 @Service
 public class Web3jService extends Web3jAbstractService {
 
     public Web3jService(ChainConfig chainConfig) {
-        super(chainConfig.getPrivateAddress(), chainConfig.getGasPriceMultiplier(), chainConfig.getGasPriceCap(),
-                chainConfig.isSidechain());
+        super(
+                chainConfig.getId(),
+                chainConfig.getPrivateAddress(),
+                chainConfig.getBlockTime(),
+                chainConfig.getGasPriceMultiplier(),
+                chainConfig.getGasPriceCap(),
+                chainConfig.isSidechain()
+        );
     }
 
-}
+}

src/main/resources/application.yml

@@ -10,12 +10,11 @@ spring:
       auto-index-creation: true # Auto-index creation is disabled by default starting with Spring Data MongoDB 3.x.
 
 chain:
-    id: ${IEXEC_CHAIN_ID:17}
-    sidechain: ${IEXEC_IS_SIDECHAIN:false}
-    privateAddress: ${IEXEC_PRIVATE_CHAIN_ADDRESS:http://localhost:8545}
-    publicAddress: ${IEXEC_PUBLIC_CHAIN_ADDRESS:http://localhost:8545}
-    hubAddress: ${IEXEC_HUB_ADDRESS:0xBF6B2B07e47326B7c8bfCb4A5460bef9f0Fd2002}
-    startBlockNumber: ${IEXEC_START_BLOCK_NUMBER:0}
+    id: ${IEXEC_CHAIN_ID:134}
+    sidechain: ${IEXEC_IS_SIDECHAIN:true}
+    privateAddress: ${IEXEC_PRIVATE_CHAIN_ADDRESS:https://bellecour.iex.ec}
+    hubAddress: ${IEXEC_HUB_ADDRESS:0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f}
+    blockTime: ${IEXEC_BLOCK_TIME:PT5S}
     gasPriceMultiplier: ${IEXEC_GAS_PRICE_MULTIPLIER:1.0} # txs will be sent with networkGasPrice*gasPriceMultiplier, 4.0 means super fast
     gasPriceCap: ${IEXEC_GAS_PRICE_CAP:22000000000} #in Wei, will be used for txs if networkGasPrice*gasPriceMultiplier > gasPriceCap
 

src/test/java/com/iexec/resultproxy/chain/Web3jServiceTests.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2023-2023 IEXEC BLOCKCHAIN TECH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.iexec.resultproxy.chain;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ExtendWith(SpringExtension.class)
+@EnableConfigurationProperties(value = ChainConfig.class)
+@TestPropertySource(properties = {
+        "chain.id=134",
+        "chain.sidechain=true",
+        "chain.privateAddress=https://bellecour.iex.ec",
+        "chain.hubAddress=0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
+        "chain.blockTime=PT5S",
+        "chain.gasPriceMultiplier=1.0",
+        "chain.gasPriceCap=22000000000" })
+class Web3jServiceTests {
+    @Autowired
+    private ChainConfig chainConfig;
+
+    @Test
+    void checkChainConfig() {
+        ChainConfig expextedConfig = new ChainConfig(
+                134, true, "https://bellecour.iex.ec",
+                "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f", Duration.ofSeconds(5),
+                1.0f, 22000000000L
+        );
+        assertThat(chainConfig).isEqualTo(expextedConfig);
+    }
+
+    @Test
+    void shouldCreateInstance() {
+        assertThat(new Web3jService(chainConfig)).isNotNull();
+    }
+}