Merge branch 'sprint' into 'master'

Sprint into Master

See merge request open-platform/state!33

Author: Isabek Tashiev

.gitlab-ci.yml

@@ -24,6 +24,8 @@ tests-unit:
     POSTGRES_USER: "user"
     POSTGRES_PASSWORD: "password"
     OPEN_API_URL: "open_api_url"
+    OPEN_CHAIN_URL: "open_chain_url"
+    EVENT_SUBSCRIPTION: "false"
   services:
     - name: postgres:10
       alias: $POSTGRES_HOST
@@ -35,6 +37,11 @@ tests-unit:
     paths:
       - .gradle/wrapper
       - .gradle/caches
+  artifacts:
+    when: always
+    paths:
+      - build/reports
+    expire_in: 1 week
 
 ###########################
 # Building
@@ -106,6 +113,9 @@ deploy-sprint:
     - SERVER=$SPRINT_SERVER
     - DEPLOY_KEY=$SPRINT_DEPLOY_KEY
     - export OPEN_API_URL=http://api.open-platform.zensoft.io
+    - export OPEN_CHAIN_URL=$OPEN_CHAIN_URL
+    - export NETWORK_URL=$NETWORK_URL_DEV
+    - export EVENT_SUBSCRIPTION=true
     - export POSTGRES_PASSWORD=$SPRINT_POSTGRES_PASSWORD
   script: *deploy_to_host
   dependencies:
@@ -120,6 +130,9 @@ deploy-master:
     - SERVER=$MASTER_SERVER
     - DEPLOY_KEY=$MASTER_DEPLOY_KEY
     - export OPEN_API_URL=https://api.openfuture.io
+    - export OPEN_CHAIN_URL=$OPEN_CHAIN_URL
+    - export NETWORK_URL=$NETWORK_URL_PROD
+    - export EVENT_SUBSCRIPTION=true
     - export POSTGRES_PASSWORD=$MASTER_POSTGRES_PASSWORD
   script: *deploy_to_host
   dependencies:

build.gradle

@@ -21,13 +21,17 @@ ext {
     kotlinVersion = '1.3.31'
     springBootVersion = '2.1.5.RELEASE'
     swaggerVersion = '2.9.2'
+    feignVersion = '2.1.3.RELEASE'
 }
 
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
     implementation "org.springframework.boot:spring-boot-starter-security"
 
+    // Feign
+    implementation "org.springframework.cloud:spring-cloud-starter-openfeign:$feignVersion"
+
     // Kotlin
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin"
     implementation "org.jetbrains.kotlin:kotlin-reflect"
@@ -37,12 +41,17 @@ dependencies {
     runtime "org.postgresql:postgresql"
     implementation "org.flywaydb:flyway-core"
 
+    // Ethereum
+    implementation "org.web3j:web3j-spring-boot-starter:1.6.0"
+    implementation 'org.web3j:core:4.5.0'
+
     // Swagger
     compile "io.springfox:springfox-swagger2:$swaggerVersion"
     compile "io.springfox:springfox-swagger-ui:$swaggerVersion"
 
     //Utils
     compile "commons-validator:commons-validator:1.6"
+    implementation "org.apache.httpcomponents:httpclient:4.5.7"
 
     // Tests
     testImplementation "org.springframework.boot:spring-boot-starter-test"

docker-compose-server.yml

@@ -10,6 +10,9 @@ services:
       - POSTGRES_USER=openstate
       - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
       - OPEN_API_URL=$OPEN_API_URL
+      - OPEN_CHAIN_URL=$OPEN_CHAIN_URL
+      - NETWORK_URL=$NETWORK_URL
+      - EVENT_SUBSCRIPTION=$EVENT_SUBSCRIPTION
     ports:
       - 80:8080
   postgres:

src/main/kotlin/io/openfuture/state/Application.kt

@@ -2,7 +2,9 @@ package io.openfuture.state
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.cloud.openfeign.EnableFeignClients
 
+@EnableFeignClients
 @SpringBootApplication
 class Application
 

src/main/kotlin/io/openfuture/state/component/Web3Wrapper.kt

@@ -0,0 +1,85 @@
+package io.openfuture.state.component
+
+import io.openfuture.state.config.property.EthereumProperties
+import io.openfuture.state.controller.domain.dto.TransactionDto
+import io.openfuture.state.controller.domain.dto.pow
+import io.openfuture.state.service.StateTrackingService
+import io.reactivex.disposables.Disposable
+import io.reactivex.functions.Consumer
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+import org.web3j.protocol.Web3j
+import org.web3j.protocol.core.DefaultBlockParameterName
+import org.web3j.protocol.core.methods.response.EthBlock
+import java.math.BigInteger
+import javax.annotation.PostConstruct
+import javax.annotation.PreDestroy
+
+
+@Component
+class Web3Wrapper(
+        private val web3j: Web3j,
+        private val properties: EthereumProperties,
+        private val stateService: StateTrackingService
+) {
+
+    private var blockSubscriber: Disposable? = null
+
+
+    @PostConstruct
+    fun subscribe() {
+        if (!properties.eventSubscription) return
+
+        blockSubscriber = web3j.blockFlowable(true).subscribe(
+                Consumer { processBlock(it.block) },
+                onErrorSubscription()
+        )
+    }
+
+    @PreDestroy
+    fun destroy() {
+        unsubscribe()
+    }
+
+    fun getEthBalance(address: String): Long = web3j.ethGetBalance(address, DefaultBlockParameterName.LATEST)
+            .sendAsync()
+            .get()
+            .balance
+            .toLong()
+
+    private fun unsubscribe() {
+        blockSubscriber?.dispose()
+    }
+
+    private fun processBlock(block: EthBlock.Block?) {
+        if (block == null) return
+
+        val transactions = block.transactions
+
+        transactions.forEach { txObject ->
+            val tx = txObject.get() as EthBlock.TransactionObject
+
+            if ((tx.from != null && stateService.isTrackedAddress(tx.from, 1)) ||
+                    (tx.to != null && stateService.isTrackedAddress(tx.to, 1))) {
+                stateService.processTransaction(getTransaction(tx, block.timestamp))
+            }
+        }
+    }
+
+    private fun onErrorSubscription(): Consumer<Throwable> = Consumer {
+        log.warn("Error subscription: $it")
+        subscribe()
+    }
+
+    private fun getTransaction(tx: EthBlock.TransactionObject, timestamp: BigInteger): TransactionDto {
+        return TransactionDto(1, tx.hash, tx.from, tx.to, tx.value.toLong(),
+                tx.gas.toLong() * 10.pow(10).toLong(),
+                timestamp.toLong(), tx.blockNumber.toLong(), tx.blockHash)
+    }
+
+
+    companion object {
+        private val log = LoggerFactory.getLogger(Web3Wrapper::class.java)
+    }
+
+}

src/main/kotlin/io/openfuture/state/config/AppConfig.kt

@@ -0,0 +1,8 @@
+package io.openfuture.state.config
+
+import org.springframework.context.annotation.Configuration
+import org.springframework.scheduling.annotation.EnableScheduling
+
+@Configuration
+@EnableScheduling
+class AppConfig

src/main/kotlin/io/openfuture/state/config/property/EthereumProperties.kt

@@ -0,0 +1,13 @@
+package io.openfuture.state.config.property
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.stereotype.Component
+import org.springframework.validation.annotation.Validated
+import javax.validation.constraints.NotNull
+
+@ConfigurationProperties(prefix = "ethereum")
+@Validated
+@Component
+class EthereumProperties(
+        @field:NotNull var eventSubscription: Boolean = true
+)

src/main/kotlin/io/openfuture/state/controller/ExceptionHandler.kt

@@ -2,6 +2,7 @@ package io.openfuture.state.controller
 
 import io.openfuture.state.controller.domain.dto.ErrorDto
 import io.openfuture.state.controller.domain.dto.FieldErrorDto
+import io.openfuture.state.exception.ApiException
 import io.openfuture.state.exception.NotFoundException
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.MethodArgumentNotValidException
@@ -18,6 +19,12 @@ class ExceptionHandler {
         return ErrorDto(HttpStatus.NOT_FOUND.value(), ex.message)
     }
 
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(ApiException::class)
+    fun handleApiException(ex: ApiException): ErrorDto {
+        return ErrorDto(HttpStatus.BAD_REQUEST.value(), ex.message)
+    }
+
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(MethodArgumentNotValidException::class)
     fun handleException(ex: MethodArgumentNotValidException): ErrorDto {

src/main/kotlin/io/openfuture/state/controller/WalletController.kt

@@ -3,6 +3,7 @@ package io.openfuture.state.controller
 import io.openfuture.state.controller.domain.dto.AccountDto
 import io.openfuture.state.controller.domain.dto.WalletDto
 import io.openfuture.state.controller.domain.request.AddWalletsRequest
+import io.openfuture.state.controller.domain.request.DeleteWalletRequest
 import io.openfuture.state.service.AccountService
 import io.openfuture.state.service.WalletService
 import org.springframework.web.bind.annotation.*
@@ -41,4 +42,10 @@ class WalletController(
         return AccountDto(account)
     }
 
+    @PostMapping("/delete")
+    fun deleteByAddress(@PathVariable accountId: Long, @RequestBody @Valid request: DeleteWalletRequest): AccountDto {
+        val account = accountService.deleteWalletByAddress(accountId, request.address, request.blockchainId)
+        return AccountDto(account)
+    }
+
 }

src/main/kotlin/io/openfuture/state/controller/domain/dto/TrackingTransactionDto.kt

@@ -6,6 +6,7 @@ data class TrackingTransactionDto(
         val id: Long,
         val hash: String,
         val amount: Long,
+        val fee: Long,
         val address: String,
         val type: String,
         val participant: String,
@@ -20,6 +21,7 @@ data class TrackingTransactionDto(
             tx.id,
             tx.hash,
             tx.amount,
+            tx.fee,
             tx.wallet.address,
             tx.getType().name,
             tx.participant,