endpoint accepts ethereum credentials as JSON strings

Signed-off-by: Alexey Chernyshov <alexey.n.chernyshov@gmail.com>

Author: Alexey-N-Chernyshov

build.gradle

@@ -5,8 +5,8 @@ buildscript {
     ext.springfoxSwagger2Version = '2.9.2'
     ext.springBootVersion = '2.1.3.RELEASE'
     ext.kotlinVersion = '1.3.10'
-    ext.notary_version='428c4ae8c6ad99d35efc9b8099fa994fa4613c36'
-    ext.d3EthVersion = '9b302a5fcb211878b9754a426195bba012b630f2'
+    ext.notary_version='7dc5f678ea0e2450ffc9078ec33fa8f0af6f9016'
+    ext.d3EthVersion = '0b6cf3625db33ccd8e779b3212aca784e884adcf'
 
     repositories {
         mavenCentral()

src/main/kotlin/jp/co/soramitsu/bootstrap/controller/EthController.kt

@@ -8,6 +8,7 @@ package jp.co.soramitsu.bootstrap.controller
 import com.d3.eth.sidechain.util.DeployHelper
 import com.d3.eth.sidechain.util.DeployHelperBuilder
 import com.d3.eth.sidechain.util.hashToAddAndRemovePeer
+import com.fasterxml.jackson.databind.ObjectMapper
 import jp.co.soramitsu.bootstrap.dto.*
 import jp.co.soramitsu.bootstrap.utils.defaultByteHash
 import jp.co.soramitsu.bootstrap.utils.defaultIrohaHash
@@ -17,9 +18,26 @@ import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import org.web3j.crypto.*
-import java.lang.IllegalArgumentException
+import org.web3j.crypto.CipherException
+import java.io.IOException
 import javax.validation.constraints.NotNull
 
+/**
+ * TODO remove after merge of https://github.com/web3j/web3j/pull/1010
+ * Load credentials from JSON wallet string.
+ * @param password - password to decrypt JSON wallet string
+ * @param content - JSON wallet content string
+ * @return Ethereum credentials
+ * @throws CipherException if the underlying cipher is not available
+ * @throws IOException if a low-level I/O problem (unexpected end-of-input,
+ * network error) occurs
+ */
+@Throws(IOException::class, CipherException::class)
+fun loadJsonCredentials(password: String, content: String): Credentials {
+    val walletFile = ObjectMapper().readValue(content, WalletFile::class.java)
+    return Credentials.create(Wallet.decrypt(password, walletFile))
+}
+
 @RestController
 @RequestMapping("/eth")
 class EthController {
@@ -28,9 +46,15 @@ class EthController {
     @PostMapping("/deploy/D3/masterContract/update")
     fun addPeerToMasterContract(@NotNull @RequestBody request: UpdateMasterContractRequest): ResponseEntity<UpdateMasterContractResponse> {
         try {
+            val credentials = loadJsonCredentials(
+                request.network.ethereumCredentials.credentialsPassword,
+                request.network.ethereumCredentials.credentials
+            )
             val deployHelper = DeployHelperBuilder(
                 request.network.ethereumConfig,
-                request.network.ethPasswords
+                request.network.ethereumCredentials.nodeLogin,
+                request.network.ethereumCredentials.nodePassword,
+                credentials
             ).setFastTransactionManager()
                 .build()
             if (request.masterContract.address != null) {
@@ -43,9 +67,11 @@ class EthController {
                     )
                 }.map { it.ecKeyPair }
 
-                if(ecKeyPairs.isEmpty()){
-                    throw IllegalArgumentException("Provide paths to wallets of notaries, " +
-                            "registered in smart contract for signature creation")
+                if (ecKeyPairs.isEmpty()) {
+                    throw IllegalArgumentException(
+                        "Provide paths to wallets of notaries, " +
+                                "registered in smart contract for signature creation"
+                    )
                 }
 
                 var addResult = true
@@ -205,10 +231,17 @@ class EthController {
     }
 
     private fun createSmartContractDeployHelper(network: EthereumNetworkProperties): DeployHelper {
+        val credentials = loadJsonCredentials(
+            network.ethereumCredentials.credentialsPassword,
+            network.ethereumCredentials.credentials
+        )
         return DeployHelperBuilder(
             network.ethereumConfig,
-            network.ethPasswords
-        ).setFastTransactionManager()
+            network.ethereumCredentials.nodeLogin,
+            network.ethereumCredentials.nodePassword,
+            credentials
+        )
+            .setFastTransactionManager()
             .build()
     }
 

src/main/kotlin/jp/co/soramitsu/bootstrap/dto/EthereumModel.kt

@@ -5,27 +5,33 @@
 
 package jp.co.soramitsu.bootstrap.dto
 
-import com.d3.commons.config.EthereumConfig
-import com.d3.commons.config.EthereumPasswords
+import integration.eth.config.EthereumConfig
 import org.web3j.crypto.WalletFile
 
 data class EthereumNetworkProperties(
-    val ethPasswords: EthereumPasswordsImpl = EthereumPasswordsImpl(),
+    val ethereumCredentials: EthereumCredentials = EthereumCredentials(),
     val ethereumConfig: EthereumConfigImpl = EthereumConfigImpl()
 )
 
-data class EthereumPasswordsImpl(
-    override val credentialsPassword: String = "user",
-    override val nodeLogin: String? = null,
-    override val nodePassword: String? = null
-) : EthereumPasswords
+/**
+ * Credentials for Ethereum network
+ * @param credentials - encrypted ethereum credentials in JSON
+ * @param credentialsPassword - password to decrypt credentials
+ * @param nodeLogin - login to Ethereum node
+ * @param nodePassword - password to Ethereum node
+ */
+data class EthereumCredentials(
+    val credentials: String = "",
+    val credentialsPassword: String = "user",
+    val nodeLogin: String? = null,
+    val nodePassword: String? = null
+)
 
 /**
  * Default parameters are Ropsten testnet parameters
  */
 data class EthereumConfigImpl(
     override val url: String = "http://parity-d3.test.iroha.tech:8545",
-    override val credentialsPath: String = "some\\path\\to\\genesis.key",
     override val gasPrice: Long = 100000000000,
     override val gasLimit: Long = 4500000,
     override val confirmationPeriod: Long = 0