HSM integration

Author: dolgopolovwork

btc-address-generation/src/main/kotlin/com/d3/btc/generation/config/BtcAddressGenerationAppConfiguration.kt

@@ -7,8 +7,6 @@ package com.d3.btc.generation.config
 
 import com.d3.btc.generation.BTC_ADDRESS_GENERATION_SERVICE_NAME
 import com.d3.btc.provider.BtcChangeAddressProvider
-import com.d3.btc.provider.network.BtcNetworkConfigProvider
-import com.d3.btc.wallet.createWalletIfAbsent
 import com.d3.commons.config.loadLocalConfigs
 import com.d3.commons.expansion.ServiceExpansion
 import com.d3.commons.model.IrohaCredential
@@ -22,10 +20,8 @@ import com.d3.commons.util.createPrettySingleThreadPool
 import io.grpc.ManagedChannelBuilder
 import jp.co.soramitsu.iroha.java.IrohaAPI
 import jp.co.soramitsu.iroha.java.Utils
-import org.bitcoinj.wallet.Wallet
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import java.io.File
 
 val btcAddressGenerationConfig =
     loadLocalConfigs(
@@ -101,13 +97,6 @@ class BtcAddressGenerationAppConfiguration {
     @Bean
     fun btcAddressGenerationConfig() = btcAddressGenerationConfig
 
-    @Bean
-    fun keysWallet(networkProvider: BtcNetworkConfigProvider): Wallet {
-        val walletPath = btcAddressGenerationConfig.btcKeysWalletPath
-        createWalletIfAbsent(walletPath, networkProvider)
-        return Wallet.loadFromFile(File(walletPath))!!
-    }
-
     @Bean
     fun notaryPeerListProvider(): NotaryPeerListProvider {
         return NotaryPeerListProviderImpl(

btc-address-generation/src/main/kotlin/com/d3/btc/generation/config/BtcAddressGenerationConfig.kt

@@ -20,9 +20,6 @@ interface BtcAddressGenerationConfig {
     //Iroha config
     val iroha: IrohaConfig
 
-    //Path to BTC wallet file
-    val btcKeysWalletPath: String
-
     //TODO the only purpose of this account is creating PeerListProvider. This account must be removed from config.
     //Account that is used to register BTC addresses
     val registrationAccount: IrohaCredentialRawConfig

btc-address-generation/src/main/kotlin/com/d3/btc/generation/init/BtcAddressGenerationInitialization.kt

@@ -17,8 +17,6 @@ import com.d3.btc.provider.generation.ADDRESS_GENERATION_NODE_ID_KEY
 import com.d3.btc.provider.generation.ADDRESS_GENERATION_TIME_KEY
 import com.d3.btc.provider.generation.BtcPublicKeyProvider
 import com.d3.btc.provider.network.BtcNetworkConfigProvider
-import com.d3.btc.wallet.checkWalletNetwork
-import com.d3.btc.wallet.safeSave
 import com.d3.commons.sidechain.iroha.CLIENT_DOMAIN
 import com.d3.commons.sidechain.iroha.IrohaChainListener
 import com.d3.commons.sidechain.iroha.util.IrohaQueryHelper
@@ -34,7 +32,6 @@ import io.reactivex.schedulers.Schedulers
 import iroha.protocol.BlockOuterClass
 import iroha.protocol.Commands
 import mu.KLogging
-import org.bitcoinj.wallet.Wallet
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.stereotype.Component
 
@@ -43,7 +40,6 @@ import org.springframework.stereotype.Component
  */
 @Component
 class BtcAddressGenerationInitialization(
-    private val keysWallet: Wallet,
     @Qualifier("registrationQueryHelper")
     private val registrationQueryHelper: IrohaQueryHelper,
     private val btcAddressGenerationConfig: BtcAddressGenerationConfig,
@@ -59,10 +55,7 @@ class BtcAddressGenerationInitialization(
      * @param onIrohaFail - function that will be called on Iroha failure
      */
     fun init(onIrohaFail: () -> Unit): Result<Unit, Exception> {
-        //Check wallet network
-        return keysWallet.checkWalletNetwork(btcNetworkConfigProvider.getConfig()).flatMap {
-            irohaChainListener.getBlockObservable()
-        }.map { irohaObservable ->
+        return irohaChainListener.getBlockObservable().map { irohaObservable ->
             initIrohaObservable(irohaObservable, onIrohaFail)
         }.flatMap {
             // Start free address generation at initial phase
@@ -174,7 +167,7 @@ class BtcAddressGenerationInitialization(
 
     // Generates new key
     private fun onGenerateKey(sessionAccountName: String): Result<String, Exception> {
-        return btcPublicKeyProvider.createKey(sessionAccountName) { saveWallet() }
+        return btcPublicKeyProvider.createKey(sessionAccountName)
     }
 
     /**
@@ -203,18 +196,13 @@ class BtcAddressGenerationInitialization(
                         addressType,
                         time,
                         nodeId
-                    ) { saveWallet() }
+                    )
                 } else {
                     Result.of { Unit }
                 }
             }
     }
 
-    // Safes wallet full of keys
-    private fun saveWallet() {
-        keysWallet.safeSave(btcAddressGenerationConfig.btcKeysWalletPath)
-    }
-
     /**
      * Logger
      */

btc-address-generation/src/main/kotlin/com/d3/btc/generation/main.kt

@@ -8,6 +8,7 @@
 package com.d3.btc.generation
 
 import com.d3.btc.generation.init.BtcAddressGenerationInitialization
+import com.d3.btc.keypair.getKeyProviderProfile
 import com.d3.commons.config.getProfile
 import com.github.kittinunf.result.Result
 import com.github.kittinunf.result.failure
@@ -24,7 +25,9 @@ const val BTC_ADDRESS_GENERATION_SERVICE_NAME = "btc-add-gen"
         "com.d3.btc.healthcheck",
         "com.d3.btc.provider.generation",
         "com.d3.btc.provider.network",
-        "com.d3.btc.generation.trigger"]
+        "com.d3.btc.generation.trigger",
+        "com.d3.btc.keypair"
+    ]
 )
 class BtcAddressGenerationApplication
 
@@ -33,7 +36,7 @@ private val logger = KLogging().logger
 fun main(args: Array<String>) {
     Result.of {
         val context = AnnotationConfigApplicationContext()
-        context.environment.setActiveProfiles(getProfile())
+        context.environment.setActiveProfiles(getProfile(), getKeyProviderProfile())
         context.register(BtcAddressGenerationApplication::class.java)
         context.refresh()
         context

btc-address-generation/src/main/resources/address_generation_local.properties

@@ -23,5 +23,3 @@ btc-address-generation.mstRegistrationAccount.privkey=e457ce0afc8059e7a2e4d14339
 btc-address-generation.iroha.hostname=d3-iroha
 # Iroha peer port
 btc-address-generation.iroha.port=50051
-# --------- Bitcoin ---------
-btc-address-generation.btcKeysWalletPath=deploy/bitcoin/regtest/keys.d3.wallet

btc-address-generation/src/main/resources/address_generation_mainnet.properties

@@ -22,5 +22,3 @@ btc-address-generation.mstRegistrationAccount.privkey=e457ce0afc8059e7a2e4d14339
 btc-address-generation.iroha.hostname=d3-iroha
 # Iroha peer port
 btc-address-generation.iroha.port=50051
-# --------- Bitcoin ---------
-btc-address-generation.btcKeysWalletPath=deploy/bitcoin/mainnet/keys.d3.wallet

btc-address-generation/src/main/resources/address_generation_testnet.properties

@@ -23,5 +23,3 @@ btc-address-generation.mstRegistrationAccount.privkey=e457ce0afc8059e7a2e4d14339
 btc-address-generation.iroha.hostname=d3-iroha
 # Iroha peer port
 btc-address-generation.iroha.port=50051
-# --------- Bitcoin ---------
-btc-address-generation.btcKeysWalletPath=deploy/bitcoin/testnet/keys.d3.wallet

btc-dw-bridge/src/main/kotlin/com/d3/btc/dwbridge/main.kt

@@ -9,6 +9,7 @@ package com.d3.btc.dwbridge
 
 import com.d3.btc.deposit.init.BtcNotaryInitialization
 import com.d3.btc.dwbridge.config.dwBridgeConfig
+import com.d3.btc.keypair.getKeyProviderProfile
 import com.d3.btc.withdrawal.init.BtcWithdrawalInitialization
 import com.d3.commons.config.getProfile
 import com.d3.commons.util.createFolderIfDoesntExist
@@ -43,7 +44,8 @@ const val BTC_DW_BRIDGE_SERVICE_NAME = "btc-dw-bridge"
         "com.d3.btc.deposit.expansion",
         "com.d3.btc.peer",
         "com.d3.btc.dwbridge",
-        "com.d3.btc.healthcheck"]
+        "com.d3.btc.healthcheck",
+        "com.d3.btc.keypair"]
 )
 class BtcDWBridgeApplication
 
@@ -58,7 +60,7 @@ fun main(args: Array<String>) {
         createFolderIfDoesntExist(dwBridgeConfig.bitcoin.blockStoragePath)
     }.map {
         val context = AnnotationConfigApplicationContext()
-        context.environment.setActiveProfiles(getProfile())
+        context.environment.setActiveProfiles(getProfile(), getKeyProviderProfile())
         context.register(BtcDWBridgeApplication::class.java)
         context.refresh()
         context

btc-withdrawal/src/main/kotlin/com/d3/btc/withdrawal/config/BtcWithdrawalConfig.kt

@@ -33,8 +33,6 @@ interface BtcWithdrawalConfig {
     val irohaBlockQueue: String
     // Path to wallet that stores transfers(UTXO)
     val btcTransfersWalletPath: String
-    // Path to wallet that stores keys
-    val btcKeysWalletPath: String
     // Account that is used to store created Bitcoin transactions
     val txStorageAccount: String
     // Account that is used to store used UTXO

btc-withdrawal/src/main/kotlin/com/d3/btc/withdrawal/handler/NewTransactionCreatedHandler.kt

@@ -1,6 +1,5 @@
 package com.d3.btc.withdrawal.handler
 
-import com.d3.btc.withdrawal.config.BtcWithdrawalConfig
 import com.d3.btc.withdrawal.service.BtcRollbackService
 import com.d3.btc.withdrawal.transaction.SignCollector
 import com.d3.btc.withdrawal.transaction.TransactionsStorage
@@ -14,7 +13,6 @@ import org.springframework.stereotype.Component
 class NewTransactionCreatedHandler(
     private val signCollector: SignCollector,
     private val transactionsStorage: TransactionsStorage,
-    private val btcWithdrawalConfig: BtcWithdrawalConfig,
     private val btcRollbackService: BtcRollbackService
 ) {
 
@@ -28,7 +26,7 @@ class NewTransactionCreatedHandler(
         val txHash = createNewTxCommand.key
         transactionsStorage.get(createNewTxCommand.key).map { (withdrawalDetails, transaction) ->
             logger.info { "Tx to sign\n$transaction" }
-            signCollector.signAndSave(transaction, btcWithdrawalConfig.btcKeysWalletPath).fold({
+            signCollector.signAndSave(transaction).fold({
                 logger.info { "Signatures for ${transaction.hashAsString} were successfully processed" }
             }, { ex ->
                 logger.error("Cannot sign transaction $transaction", ex)