Merge pull request #320 from d3ledger/master-release

release v0.2.0-alpha

Author: Alexey-N-Chernyshov

.gitignore

@@ -25,29 +25,46 @@ hs_err_pid*
 ### Gradle template
 .gradle
 /build/
-/notary-integration-test/build/
-/notary-integration-test/gradle/
-/notary-integration-test/gradlew
 /btc/build/
 /btc/gradle/
 /btc/gradlew
+/btc-address-generation/build/
+/btc-address-generation/gradle/
+/btc-address-generation/gradlew
 /btc-deposit/build/
 /btc-deposit/gradle/
 /btc-deposit/gradlew
 /btc-registration/build/
 /btc-registration/gradle/
 /btc-registration/gradlew
-/btc-pregeneration/build/
-/btc-pregeneration/gradle/
-/btc-pregeneration/gradlew
-/d3testreport/gradle
-/d3testreport/gradlew
-/d3testreport/gradlew.bat
-/d3testreport/build
 /btc-withdrawal/build
 /btc-withdrawal/gradle
 /btc-withdrawal/gradlew
 /btc-withdrawal/gradlew.bat
+/d3testreport/gradle
+/d3testreport/gradlew
+/d3testreport/gradlew.bat
+/d3testreport/build
+/eth/build/
+/eth-erc20-registration/build/
+/eth-registration/build/
+/eth-vacuum/build/
+/eth-withdrawal/build/
+/notary-commons/build/
+/notary-btc-integration-test/build/
+/notary-btc-integration-test/gradle/
+/notary-btc-integration-test/gradlew
+/notary-eth-integration-test/build/
+/notary-eth-integration-test/gradle/
+/notary-eth-integration-test/gradlew
+/notary-iroha-integration-test/build/
+/notary-iroha-integration-test/gradle/
+/notary-iroha-integration-test/gradlew
+/test-longevity/build/
+/btc-dw-bridge/build
+/btc-dw-bridge/gradle
+/btc-dw-bridge/gradlew
+/btc-dw-bridge/gradlew.bat
 *gradlew.bat
 
 # Ignore Gradle GUI config
@@ -124,9 +141,9 @@ deploy/ethereum/keys/test
 
 # Bitcoin wallets, blockchain and etc.
 deploy/bitcoin/testnet/d3.wallet
-deploy/bitcoin/testnet/blocks/deposit/
-deploy/bitcoin/regtest/blocks/deposit/
-deploy/bitcoin/testnet/blocks/withdrawal/
-deploy/bitcoin/regtest/blocks/withdrawal/
+deploy/bitcoin/testnet/blocks/
+deploy/bitcoin/regtest/blocks/
 deploy/bitcoin/regtest/d3.wallet
+deploy/bitcoin/testnet/d3.wallet
 deploy/bitcoin/regtest/d3-test.wallet
+deploy/bitcoin/mainnet/

Jenkinsfile

@@ -85,7 +85,9 @@ pipeline {
             done < <(docker ps --filter "network=d3-${DOCKER_NETWORK}" --format "{{.ID}} {{.Names}}")
           """
 
-          sh "tar -zcvf build-logs/notaryIntegrationTest.gz -C notary-integration-test/build/reports/tests integrationTest || true"
+          sh "tar -zcvf build-logs/notaryIrohaIntegrationTest.gz -C notary-iroha-integration-test/build/reports/tests integrationTest || true"
+          sh "tar -zcvf build-logs/notaryEthIntegrationTest.gz -C notary-eth-integration-test/build/reports/tests integrationTest || true"
+          sh "tar -zcvf build-logs/notaryBtcIntegrationTest.gz -C notary-btc-integration-test/build/reports/tests integrationTest || true"
           sh "tar -zcvf build-logs/jacoco.gz -C build/reports jacoco || true"
           sh "tar -zcvf build-logs/dokka.gz -C build/reports dokka || true"
           archiveArtifacts artifacts: 'build-logs/*.gz'

btc-pregeneration/build.gradle renamed to btc-address-generation/build.gradle

@@ -12,22 +12,30 @@ buildscript {
 apply plugin: 'application'
 apply plugin: "kotlin-spring" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#kotlin-spring-compiler-plugin
 apply plugin: 'org.springframework.boot'
-mainClassName = "pregeneration.btc.BtcPreGenerationMain"
+mainClassName = "generation.btc.BtcAddressGenerationMain"
 
 dependencies {
     compile project(":btc")
 }
 
-task runBtcPreGen(type: JavaExec) {
-    main = 'pregeneration.btc.BtcPreGenerationMain'
+task runBtcAddressGeneration(type: JavaExec) {
+    main = 'generation.btc.BtcAddressGenerationMain'
     classpath = sourceSets.main.runtimeClasspath
     setWorkingDir("$rootDir/")
     systemProperty 'java.library.path', getIrohaLibPath()
     environment "LD_LIBRARY_PATH", getIrohaLibPath()
 }
 
-task runBtcPreGenTrigger(type: JavaExec) {
-    main = 'pregeneration.btc.trigger.BtcPreGenerationTriggerMain'
+task generateBtcChangeAddress(type: JavaExec) {
+    main = 'generation.btc.trigger.BtcChangeAddressGeneration'
+    classpath = sourceSets.main.runtimeClasspath
+    setWorkingDir("$rootDir/")
+    systemProperty 'java.library.path', getIrohaLibPath()
+    environment "LD_LIBRARY_PATH", getIrohaLibPath()
+}
+
+task generateBtcFreeAddress(type: JavaExec) {
+    main = 'generation.btc.trigger.BtcFreeAddressGeneration'
     classpath = sourceSets.main.runtimeClasspath
     setWorkingDir("$rootDir/")
     systemProperty 'java.library.path', getIrohaLibPath()
@@ -36,6 +44,6 @@ task runBtcPreGenTrigger(type: JavaExec) {
 
 sonarqube {
     properties {
-        property "sonar.projectKey", "notary:btc-pregeneration"
+        property "sonar.projectKey", "notary:btc-addres-generation"
     }
-}
+}

btc-pregeneration/src/main/kotlin/pregeneration/btc/config/BtcPreGenerationAppConfiguration.kt renamed to btc-address-generation/src/main/kotlin/generation/btc/config/BtcAddressGenerationAppConfiguration.kt

@@ -1,4 +1,4 @@
-package pregeneration.btc.config
+package generation.btc.config
 
 import config.loadConfigs
 import model.IrohaCredential
@@ -16,46 +16,50 @@ import sidechain.iroha.util.ModelUtil
 import wallet.WalletFile
 import java.io.File
 
-val btcPreGenConfig =
-    loadConfigs("btc-pregen", BtcPreGenConfig::class.java, "/btc/pregeneration.properties")
+val btcAddressGenerationConfig =
+    loadConfigs(
+        "btc-address-generation",
+        BtcAddressGenerationConfig::class.java,
+        "/btc/address_generation.properties"
+    ).get()
 
 @Configuration
-class BtcPreGenerationAppConfiguration {
+class BtcAddressGenerationAppConfiguration {
 
     private val registrationKeyPair =
         ModelUtil.loadKeypair(
-            btcPreGenConfig.registrationAccount.pubkeyPath,
-            btcPreGenConfig.registrationAccount.privkeyPath
+            btcAddressGenerationConfig.registrationAccount.pubkeyPath,
+            btcAddressGenerationConfig.registrationAccount.privkeyPath
         ).fold({ keypair ->
             keypair
         }, { ex -> throw ex })
 
     private val registrationCredential =
-        IrohaCredential(btcPreGenConfig.registrationAccount.accountId, registrationKeyPair)
+        IrohaCredential(btcAddressGenerationConfig.registrationAccount.accountId, registrationKeyPair)
 
     private val mstRegistrationKeyPair =
         ModelUtil.loadKeypair(
-            btcPreGenConfig.mstRegistrationAccount.pubkeyPath,
-            btcPreGenConfig.mstRegistrationAccount.privkeyPath
+            btcAddressGenerationConfig.mstRegistrationAccount.pubkeyPath,
+            btcAddressGenerationConfig.mstRegistrationAccount.privkeyPath
         ).fold({ keypair ->
             keypair
         }, { ex -> throw ex })
 
     private val mstRegistrationCredential =
-        IrohaCredential(btcPreGenConfig.mstRegistrationAccount.accountId, mstRegistrationKeyPair)
+        IrohaCredential(btcAddressGenerationConfig.mstRegistrationAccount.accountId, mstRegistrationKeyPair)
 
     @Bean
     fun irohaNetwork() = IrohaNetworkImpl(
-        btcPreGenConfig.iroha.hostname,
-        btcPreGenConfig.iroha.port
+        btcAddressGenerationConfig.iroha.hostname,
+        btcAddressGenerationConfig.iroha.port
     )
 
     @Bean
-    fun preGenConfig() = btcPreGenConfig
+    fun btcAddressGenerationConfig() = btcAddressGenerationConfig
 
     @Bean
     fun walletFile(): WalletFile {
-        val walletFile = File(btcPreGenConfig.btcWalletFilePath)
+        val walletFile = File(btcAddressGenerationConfig.btcWalletFilePath)
         val wallet = Wallet.loadFromFile(walletFile)
         return WalletFile(wallet, walletFile)
     }
@@ -66,8 +70,8 @@ class BtcPreGenerationAppConfiguration {
         return NotaryPeerListProviderImpl(
             registrationCredential,
             irohaNetwork,
-            btcPreGenConfig.notaryListStorageAccount,
-            btcPreGenConfig.notaryListSetterAccount
+            btcAddressGenerationConfig.notaryListStorageAccount,
+            btcAddressGenerationConfig.notaryListSetterAccount
         )
     }
 
@@ -80,12 +84,15 @@ class BtcPreGenerationAppConfiguration {
     fun multiSigConsumer(irohaNetwork: IrohaNetwork) = IrohaConsumerImpl(mstRegistrationCredential, irohaNetwork)
 
     @Bean
-    fun notaryAccount() = btcPreGenConfig.notaryAccount
+    fun notaryAccount() = btcAddressGenerationConfig.notaryAccount
+
+    @Bean
+    fun changeAddressStorageAccount() = btcAddressGenerationConfig.changeAddressesStorageAccount
 
     @Bean
     fun irohaChainListener() = IrohaChainListener(
-        btcPreGenConfig.iroha.hostname,
-        btcPreGenConfig.iroha.port,
+        btcAddressGenerationConfig.iroha.hostname,
+        btcAddressGenerationConfig.iroha.port,
         registrationCredential
     )
 

btc-pregeneration/src/main/kotlin/pregeneration/btc/config/BtcPreGenConfig.kt renamed to btc-address-generation/src/main/kotlin/generation/btc/config/BtcAddressGenerationConfig.kt

@@ -1,12 +1,12 @@
-package pregeneration.btc.config
+package generation.btc.config
 
 import config.IrohaConfig
 import config.IrohaCredentialConfig
 
-interface BtcPreGenConfig {
+interface BtcAddressGenerationConfig {
     /*
     Account for triggering.
-    Triggering this account means starting BTC addresses pregeneration
+    Triggering this account means starting BTC addresses generation
     */
     val pubKeyTriggerAccount: String
 
@@ -27,6 +27,9 @@ interface BtcPreGenConfig {
     //Account that stores all registered notaries
     val notaryListStorageAccount: String
 
+    //Account that stores change addresses
+    val changeAddressesStorageAccount: String
+
     //Account that sets registered notaries
     val notaryListSetterAccount: String
 

btc-pregeneration/src/main/kotlin/pregeneration/btc/BtcPreGenInitialization.kt renamed to btc-address-generation/src/main/kotlin/generation/btc/init/BtcAddressGenerationInitialization.kt

@@ -1,33 +1,36 @@
-package pregeneration.btc
+package generation.btc.init
 
 import com.github.kittinunf.result.Result
 import com.github.kittinunf.result.failure
 import com.github.kittinunf.result.flatMap
 import com.github.kittinunf.result.map
+import generation.btc.config.BtcAddressGenerationConfig
 import healthcheck.HealthyService
 import io.reactivex.Observable
 import iroha.protocol.BlockOuterClass
+import iroha.protocol.Commands
 import model.IrohaCredential
 import mu.KLogging
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.stereotype.Component
-import pregeneration.btc.config.BtcPreGenConfig
-import provider.btc.BtcPublicKeyProvider
+import provider.btc.generation.BtcPublicKeyProvider
+import provider.btc.address.BtcAddressType
+import provider.btc.address.getAddressTypeByAccountId
 import sidechain.iroha.IrohaChainListener
 import sidechain.iroha.consumer.IrohaNetwork
 import sidechain.iroha.util.getAccountDetails
 import sidechain.iroha.util.getSetDetailCommands
 
 /*
-   This class listens to special account to be triggered and starts pregeneration process
+   This class listens to special account to be triggered and starts generation process
  */
 @Component
-class BtcPreGenInitialization(
+class BtcAddressGenerationInitialization(
     @Qualifier("registrationCredential")
     @Autowired private val registrationCredential: IrohaCredential,
     @Autowired private val irohaNetwork: IrohaNetwork,
-    @Autowired private val btcPreGenConfig: BtcPreGenConfig,
+    @Autowired private val btcAddressGenerationConfig: BtcAddressGenerationConfig,
     @Autowired private val btcPublicKeyProvider: BtcPublicKeyProvider,
     @Autowired private val irohaChainListener: IrohaChainListener
 ) : HealthyService() {
@@ -45,15 +48,16 @@ class BtcPreGenInitialization(
     private fun initIrohaObservable(irohaObservable: Observable<BlockOuterClass.Block>) {
         irohaObservable.subscribe({ block ->
             getSetDetailCommands(block).forEach { command ->
-                if (command.setAccountDetail.accountId == btcPreGenConfig.pubKeyTriggerAccount) {
+                if (isAddressGenerationTriggered(command)) {
                     //add new public key to session account, if trigger account was changed
                     val sessionAccountName = command.setAccountDetail.key
                     onGenerateKey(sessionAccountName).fold(
                         { pubKey -> logger.info { "New public key $pubKey for BTC multisignature address was created" } },
                         { ex -> logger.error("Cannot generate public key for BTC multisignature address", ex) })
-                } else if (command.setAccountDetail.accountId.endsWith("btcSession")) {
+                } else if (isNewKey(command)) {
+                    val accountId = command.setAccountDetail.accountId
                     //create multisignature address, if we have enough keys in session account
-                    onGenerateMultiSigAddress(command.setAccountDetail.accountId).failure { ex ->
+                    onGenerateMultiSigAddress(accountId, getAddressTypeByAccountId(accountId)).failure { ex ->
                         logger.error(
                             "Cannot generate multi signature address", ex
                         )
@@ -66,26 +70,34 @@ class BtcPreGenInitialization(
         })
     }
 
+    // Checks if address generation account was triggered
+    private fun isAddressGenerationTriggered(command: Commands.Command) =
+        command.setAccountDetail.accountId == btcAddressGenerationConfig.pubKeyTriggerAccount
+
+    // Check if new key was added
+    private fun isNewKey(command: Commands.Command) = command.setAccountDetail.accountId.endsWith("btcSession")
 
     private fun onGenerateKey(sessionAccountName: String): Result<String, Exception> {
         return btcPublicKeyProvider.createKey(sessionAccountName)
     }
 
-    private fun onGenerateMultiSigAddress(sessionAccount: String): Result<Unit, Exception> {
+    private fun onGenerateMultiSigAddress(
+        sessionAccount: String,
+        addressType: BtcAddressType
+    ): Result<Unit, Exception> {
         return getAccountDetails(
             registrationCredential,
             irohaNetwork,
             sessionAccount,
-            btcPreGenConfig.registrationAccount.accountId
+            btcAddressGenerationConfig.registrationAccount.accountId
         ).flatMap { details ->
             val notaryKeys = details.values
-            btcPublicKeyProvider.checkAndCreateMultiSigAddress(notaryKeys)
+            btcPublicKeyProvider.checkAndCreateMultiSigAddress(notaryKeys, addressType)
         }
     }
 
     /**
      * Logger
      */
     companion object : KLogging()
-
 }