Release 1.0.0 beta.4

.gitignore

@@ -42,4 +42,3 @@ build/
 !/.mvn/
 
 .DS_Store
-resources

accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/controller/AccountantController.kt

@@ -9,9 +9,12 @@ import co.nilin.opex.accountant.core.spi.WalletProxy
 import co.nilin.opex.accountant.ports.walletproxy.data.BooleanResponse
 import co.nilin.opex.matching.engine.core.eventh.events.SubmitOrderEvent
 import co.nilin.opex.matching.engine.core.model.OrderDirection
+import co.nilin.opex.utility.error.data.OpexError
+import co.nilin.opex.utility.error.data.OpexException
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import java.math.BigDecimal
 
@@ -59,9 +62,20 @@ class AccountantController(
         return pairConfigLoader.loadPairConfigs()
     }
 
-    @GetMapping("/config/fee/all")
-    suspend fun fetchFeeConfigs(): List<PairFeeResponse> {
+    @GetMapping("/config/fee")
+    suspend fun getFeeConfigs(): List<PairFeeResponse> {
         return pairConfigLoader.loadPairFeeConfigs()
             .map { PairFeeResponse(it.pairConfig.pair, it.direction, it.userLevel, it.makerFee, it.takerFee) }
     }
+
+    @GetMapping("/config/fee/{pair}")
+    suspend fun getFeeConfig(
+        @PathVariable pair: String,
+        @RequestParam(required = false) direction: OrderDirection?,
+        @RequestParam(required = false) userLevel: String?
+    ): PairFeeResponse {
+        val fee = pairConfigLoader.loadPairFeeConfigs(pair, direction ?: OrderDirection.BID, userLevel ?: "*")
+            ?: throw OpexException(OpexError.PairFeeNotFound)
+        return PairFeeResponse(fee.pairConfig.pair, fee.direction, fee.userLevel, fee.makerFee, fee.takerFee)
+    }
 }

accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/inout/RichTrade.kt

@@ -27,6 +27,7 @@ class RichTrade(
     val makerRemainedQuantity: BigDecimal,
     val makerCommision: BigDecimal,
     val makerCommisionAsset: String,
+    val matchedPrice: BigDecimal,
     val matchedQuantity: BigDecimal,
     val tradeDateTime: LocalDateTime
 )

accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/service/TradeManagerImpl.kt

@@ -9,6 +9,7 @@ import co.nilin.opex.accountant.core.model.FinancialAction
 import co.nilin.opex.accountant.core.model.Order
 import co.nilin.opex.accountant.core.spi.*
 import co.nilin.opex.matching.engine.core.eventh.events.TradeEvent
+import co.nilin.opex.matching.engine.core.model.OrderDirection
 import org.slf4j.LoggerFactory
 import org.springframework.transaction.annotation.Transactional
 import java.math.BigDecimal
@@ -135,6 +136,9 @@ open class TradeManagerImpl(
             financialActions.add(takerFeeAction)
         }
 
+        val takerPrice = trade.takerPrice.toBigDecimal().multiply(takerOrder.rightSideFraction)
+        val makerPrice = trade.makerPrice.toBigDecimal().multiply(makerOrder.rightSideFraction)
+
         richTradePublisher.publish(
             RichTrade(
                 trade.tradeId,
@@ -143,7 +147,7 @@ open class TradeManagerImpl(
                 trade.takerUuid,
                 trade.takerOrderId,
                 trade.takerDirection,
-                trade.takerPrice.toBigDecimal().multiply(takerOrder.rightSideFraction),
+                takerPrice,
                 takerOrder.origQuantity,
                 takerOrder.origPrice.multiply(takerOrder.origQuantity),
                 trade.takerRemainedQuantity.toBigDecimal().multiply(takerOrder.leftSideFraction),
@@ -153,12 +157,13 @@ open class TradeManagerImpl(
                 trade.makerUuid,
                 trade.makerOrderId,
                 trade.makerDirection,
-                trade.makerPrice.toBigDecimal().multiply(makerOrder.rightSideFraction),
+                makerPrice,
                 makerOrder.origQuantity,
                 makerOrder.origPrice.multiply(makerOrder.origQuantity),
                 trade.makerRemainedQuantity.toBigDecimal().multiply(makerOrder.leftSideFraction),
                 feeActions.makerFeeAction.amount,
                 feeActions.makerFeeAction.symbol,
+                makerPrice,
                 trade.matchedQuantity.toBigDecimal().multiply(makerOrder.leftSideFraction),
                 trade.eventDate
             )

accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/spi/PairConfigLoader.kt

@@ -10,6 +10,10 @@ interface PairConfigLoader {
 
     suspend fun loadPairFeeConfigs(): List<PairFeeConfig>
 
+    suspend fun loadPairFeeConfigs(direction: OrderDirection, userLevel: String): List<PairFeeConfig>
+
+    suspend fun loadPairFeeConfigs(pair: String, direction: OrderDirection, userLevel: String): PairFeeConfig?
+
     suspend fun load(pair: String, direction: OrderDirection, userLevel: String): PairFeeConfig
 
     suspend fun load(pair: String, direction: OrderDirection): PairConfig

accountant/accountant-ports/accountant-persister-postgres/src/main/kotlin/co/nilin/opex/accountant/ports/postgres/dao/PairFeeConfigRepository.kt

@@ -6,14 +6,20 @@ import org.springframework.data.r2dbc.repository.Query
 import org.springframework.data.repository.query.Param
 import org.springframework.data.repository.reactive.ReactiveCrudRepository
 import org.springframework.stereotype.Repository
+import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono
 
 @Repository
 interface PairFeeConfigRepository : ReactiveCrudRepository<PairFeeConfigModel, Long> {
+
     @Query("select * from pair_fee_config where pair_config_id = :pair and direction = :direction and user_level = :userLevel")
     fun findByPairAndDirectionAndUserLevel(
         @Param("pair") pair: String,
         @Param("direction") direction: OrderDirection,
         @Param("userLevel") userLevel: String
     ): Mono<PairFeeConfigModel?>
+
+    @Query("select * from pair_fee_config where direction = :direction and user_level = :userLevel")
+    fun findByDirectionAndUserLevel(direction: OrderDirection, userLevel: String): Flux<PairFeeConfigModel>
+
 }

accountant/accountant-ports/accountant-persister-postgres/src/main/kotlin/co/nilin/opex/accountant/ports/postgres/impl/PairConfigLoaderImpl.kt

@@ -13,7 +13,9 @@ import co.nilin.opex.utility.error.data.OpexException
 import kotlinx.coroutines.reactive.awaitFirstOrElse
 import kotlinx.coroutines.reactive.awaitFirstOrNull
 import kotlinx.coroutines.reactive.awaitSingle
+import kotlinx.coroutines.reactor.awaitSingleOrNull
 import org.springframework.stereotype.Component
+import java.math.BigDecimal
 
 @Component
 class PairConfigLoaderImpl(
@@ -38,6 +40,39 @@ class PairConfigLoaderImpl(
             }
     }
 
+    override suspend fun loadPairFeeConfigs(direction: OrderDirection, userLevel: String): List<PairFeeConfig> {
+        return pairFeeConfigRepository.findByDirectionAndUserLevel(direction, userLevel)
+            .collectList()
+            .awaitFirstOrElse { emptyList() }
+            .map {
+                val pairConfig = pairConfigRepository.findById(it.pairConfigId).awaitSingle().asPairConfig()
+                PairFeeConfig(
+                    pairConfig,
+                    it.direction,
+                    it.userLevel,
+                    it.makerFee,
+                    it.takerFee
+                )
+            }
+    }
+
+    override suspend fun loadPairFeeConfigs(
+        pair: String,
+        direction: OrderDirection,
+        userLevel: String
+    ): PairFeeConfig? {
+        val fee = pairFeeConfigRepository.findByPairAndDirectionAndUserLevel(pair, direction, userLevel)
+            .awaitSingleOrNull() ?: return null
+        val pairConfig = pairConfigRepository.findById(fee.pairConfigId).awaitSingle().asPairConfig()
+        return PairFeeConfig(
+            pairConfig,
+            fee.direction,
+            fee.userLevel,
+            fee.makerFee,
+            fee.takerFee
+        )
+    }
+
     override suspend fun load(pair: String, direction: OrderDirection, userLevel: String): PairFeeConfig {
         val pairConfig = pairConfigRepository.findById(pair).awaitFirstOrElse {
             val error = OpexError.InvalidPair

accountant/accountant-ports/accountant-submitter-kafka/src/test/kotlin/co/nilin/opex/accountant/ports/kafka/submitter/Valid.kt

@@ -42,6 +42,7 @@ object Valid {
         1.0.toBigDecimal(),
         "",
         1.0.toBigDecimal(),
+        1.0.toBigDecimal(),
         currentTime
     )
 

api/api-app/pom.xml

@@ -44,8 +44,8 @@
             <artifactId>api-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>co.nilin.opex.api.ports.kafka.listener</groupId>
-            <artifactId>api-eventlistener-kafka</artifactId>
+            <groupId>co.nilin.opex.api.ports.proxy</groupId>
+            <artifactId>api-proxy-rest</artifactId>
         </dependency>
         <dependency>
             <groupId>co.nilin.opex.api.ports.binance</groupId>

api/api-app/src/main/kotlin/co/nilin/opex/api/app/config/InitializeService.kt

@@ -13,6 +13,7 @@ import javax.annotation.PostConstruct
 @Component
 @DependsOn("postgresConfig")
 class InitializeService(private val symbolMapRepository: SymbolMapRepository) {
+
     @Autowired
     private lateinit var preferences: Preferences
 

wallet/wallet-app/src/main/kotlin/co/nilin/opex/util/vault/VaultUserIdMechanism.kt → api/api-app/src/main/kotlin/co/nilin/opex/api/app/utils/VaultUserIdMechanism.kt

@@ -1,8 +1,8 @@
-package co.nilin.opex.util.vault
+package co.nilin.opex.api.app.utils
 
 import org.springframework.vault.authentication.AppIdUserIdMechanism
 
-class VaultUserIdMechanism() : AppIdUserIdMechanism {
+class VaultUserIdMechanism : AppIdUserIdMechanism {
     override fun createUserId(): String {
         return System.getenv("BACKEND_USER")
     }

api/api-app/src/main/resources/application.yml

@@ -27,7 +27,7 @@ spring:
       scheme: http
       authentication: APPID
       app-id:
-        user-id: co.nilin.opex.util.vault.VaultUserIdMechanism
+        user-id: co.nilin.opex.api.app.utils.VaultUserIdMechanism
       fail-fast: true
       kv:
         enabled: true
@@ -51,8 +51,12 @@ app:
     url: lb://opex-matching-gateway
   wallet:
     url: lb://opex-wallet
+  market:
+    url: lb://opex-market
   opex-bc-gateway:
     url: lb://opex-bc-gateway
   auth:
     cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
+  binance:
+    api-url: https://api1.binance.com
 swagger.authUrl: ${SWAGGER_AUTH_URL:https://api.opex.dev/auth}/realms/opex/protocol/openid-connect/token

api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/BestPrice.kt

@@ -0,0 +1,9 @@
+package co.nilin.opex.api.core.inout
+
+import java.math.BigDecimal
+
+data class BestPrice(
+    val symbol: String,
+    val bidPrice: BigDecimal?,
+    val askPrice: BigDecimal?,
+)

api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/CountResponse.kt

@@ -0,0 +1,3 @@
+package co.nilin.opex.api.core.inout
+
+data class CountResponse(val value: Long)

api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/CurrencyRate.kt

@@ -0,0 +1,10 @@
+package co.nilin.opex.api.core.inout
+
+import java.math.BigDecimal
+
+data class CurrencyRate(
+    val base: String,
+    val quote: String,
+    val source: String,
+    val rate: BigDecimal
+)

api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/GlobalPrice.kt

@@ -0,0 +1,6 @@
+package co.nilin.opex.api.core.inout
+
+data class GlobalPrice(
+    val symbol: String,
+    val price: Float
+)

api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/MarketTradeResponse.kt → api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/MarketTrade.kt

@@ -3,12 +3,14 @@ package co.nilin.opex.api.core.inout
 import java.math.BigDecimal
 import java.util.*
 
-data class MarketTradeResponse(
+data class MarketTrade(
     val symbol: String,
+    val baseAsset: String,
+    val quoteAsset: String,
     val id: Long,
     val price: BigDecimal,
-    val qty: BigDecimal,
-    val quoteQty: BigDecimal,
+    val quantity: BigDecimal,
+    val quoteQuantity: BigDecimal,
     val time: Date,
     val isBestMatch: Boolean,
     val isMakerBuyer: Boolean