OTC merge

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,6 +12,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,15 +25,17 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/dev-otc.yml

@@ -1,8 +1,8 @@
-name:  Build, Test, and Deploy otc (DEV env) services for specific partner
+name: Build, Test, and Deploy otc (DEV env) services for specific partner
 on:
-#  push:
-#    branches:
-#      - dev
+  #  push:
+  #    branches:
+  #      - dev
 
   workflow_dispatch:
     inputs:
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         java: [ 17 ]
@@ -107,7 +107,7 @@ jobs:
           echo "password=$server_pass" >> $GITHUB_OUTPUT
 
       - name: Build
-        run:  |
+        run: |
           mvn -pl common -am  -B -T 1C clean install -Potc
           mvn -pl wallet,bc-gateway -amd  -B -T 1C clean install -Potc
 

.github/workflows/dev.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         java: [ 21 ]
@@ -21,11 +21,11 @@ jobs:
           distribution: 'adopt'
           java-package: jdk
           java-version: ${{ matrix.java }}
-#          cache: maven
+      #          cache: maven
       - name: Build
-        run: mvn -B -T 1C clean install
+        run: mvn -B clean install
       - name: Run Tests
-        run: mvn -B -T 1C -Dskip.unit.tests=false surefire:test
+        run: mvn -B -Dskip.unit.tests=false surefire:test
       - name: Build Docker images
         env:
           TAG: dev

.github/workflows/main-otc.yml

@@ -1,8 +1,8 @@
-name:  Build, Test, and Deploy otc (PRD env) services for specific partner
+name: Build, Test, and Deploy otc (PRD env) services for specific partner
 on:
-#  push:
-#    branches:
-#      - main
+  #  push:
+  #    branches:
+  #      - main
 
   workflow_dispatch:
     inputs:
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         java: [ 17 ]
@@ -107,7 +107,7 @@ jobs:
           echo "password=$server_pass" >> $GITHUB_OUTPUT
 
       - name: Build
-        run:  |
+        run: |
           mvn -pl common -am  -B -T 1C clean install -Potc
           mvn -pl wallet,bc-gateway -amd  -B -T 1C clean install -Potc
 

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         java: [ 21 ]
@@ -21,7 +21,7 @@ jobs:
           distribution: 'adopt'
           java-package: jdk
           java-version: ${{ matrix.java }}
-#          cache: maven
+      #          cache: maven
       - name: Build
         run: mvn -B -T 1C clean install
       - name: Run Tests

.github/workflows/pr.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         java: [ 21 ]
@@ -20,11 +20,11 @@ jobs:
           distribution: 'adopt'
           java-package: jdk
           java-version: ${{ matrix.java }}
-#          cache: maven
+      #          cache: maven
       - name: Build
-        run: mvn -B -T 1C clean install -Potc
+        run: mvn -B clean install -Potc
       - name: Run Tests
-        run: mvn -B -T 1C -Dskip.unit.tests=false surefire:test
+        run: mvn -B -Dskip.unit.tests=false surefire:test
       - name: Build Docker images
         env:
           TAG: pr

.github/workflows/test.yml

@@ -5,10 +5,15 @@ on:
   #    branches:
   #      - dev
   workflow_dispatch:
-
+#    inputs:
+#      partner_name:
+#        type: string
+#        description: 'The name of the partner (provided during workflow execution)'
+#        required: true
+#        default: default
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         java: [ 17 ]

README.md

@@ -63,7 +63,6 @@ KEYCLOAK_FRONTEND_URL=http://localhost:8083/auth
 KEYCLOAK_ADMIN_URL=http://localhost:8083/auth
 KEYCLOAK_VERIFY_REDIRECT_URL=http://localhost:8080/verify
 KEYCLOAK_FORGOT_REDIRECT_URL=http://localhost:8080/forgot
-PREFERENCES=preferences-demo.yml
 WHITELIST_REGISTER_ENABLED=true
 WHITELIST_LOGIN_ENABLED=true
 WALLET_BACKUP_ENABLED=false
@@ -80,7 +79,6 @@ TAG=debug
 | SMTP_PASS                                                                                                           | SMTP password used by keycloak to send emails for various operations (e.g. user verification, reset password)                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | API_KEY_CLIENT_SECRET                                                                                               | In order to access the api key feature, please follow the steps below:</br>1. Go to Keycloak admin panel located at http://localhost:8083/auth/admin/master/console/#/realms/opex/clients <br/>2. Login with the username and password you provided in the `.env` file (KEYCLOAK_ADMIN_USERNAME and KEYCLOAK_ADMIN_PASSWORD)<br/>3. Go to `clients` section on the left menu </br>4. Click on `opex-api-key` client </br>5. In the credentials section, click on `Regenerate Secret` button </br>6. Copy the generated secret and paste it into this section |
 | KEYCLOAK_FRONTEND_URL<br/>KEYCLOAK_ADMIN_URL<br/>KEYCLOAK_VERIFY_REDIRECT_URL<br/>KEYCLOAK_FORGOT_REDIRECT_URL      | Replace `localhost` with your server's IP if you're not running on local machine. Do not change the rest.                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| PREFERENCES                                                                                                         | Points to a file containing seed data used to by modules to initialize their databases. An example of this file is provided and is available inside the root directory (preferences-demo.yml). It's deprecated and will be removed soon                                                                                                                                                                                                                                                                                                                      |
 | WHITELIST_REGISTER_ENABLED                                                                                          | Allows registration only for whitelisted emails                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | WHITELIST_LOGIN_ENABLED                                                                                             | Allows login only for whitelisted emails                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | WALLET_BACKUP_ENABLED                                                                                               | Enables wallet data backup to google drive folder. In order to use this feature, you need to have `drive-key.json` file (obtained from google drive API panel) in the root directory of project                                                                                                                                                                                                                                                                                                                                                              |

accountant/accountant-app/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -64,10 +64,6 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>co.nilin.opex.utility</groupId>
-            <artifactId>preferences</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>

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

@@ -1,7 +1,6 @@
 package co.nilin.opex.accountant.app
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.ComponentScan
 

accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/config/AppConfig.kt

@@ -1,10 +1,6 @@
 package co.nilin.opex.accountant.app.config
 
 import co.nilin.opex.accountant.app.listener.*
-import co.nilin.opex.accountant.app.listener.AccountantEventListener
-import co.nilin.opex.accountant.app.listener.AccountantTempEventListener
-import co.nilin.opex.accountant.app.listener.AccountantTradeListener
-import co.nilin.opex.accountant.app.listener.OrderListener
 import co.nilin.opex.accountant.core.api.FeeCalculator
 import co.nilin.opex.accountant.core.api.FinancialActionJobManager
 import co.nilin.opex.accountant.core.api.OrderManager
@@ -14,10 +10,6 @@ import co.nilin.opex.accountant.core.service.OrderManagerImpl
 import co.nilin.opex.accountant.core.service.TradeManagerImpl
 import co.nilin.opex.accountant.core.spi.*
 import co.nilin.opex.accountant.ports.kafka.listener.consumer.*
-import co.nilin.opex.accountant.ports.kafka.listener.consumer.EventKafkaListener
-import co.nilin.opex.accountant.ports.kafka.listener.consumer.OrderKafkaListener
-import co.nilin.opex.accountant.ports.kafka.listener.consumer.TempEventKafkaListener
-import co.nilin.opex.accountant.ports.kafka.listener.consumer.TradeKafkaListener
 import co.nilin.opex.accountant.ports.kafka.listener.spi.FAResponseListener
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
@@ -147,7 +139,8 @@ class AppConfig {
     @Autowired
     fun configureTempEventListener(
         tempEventKafkaListener: TempEventKafkaListener,
-        accountantTempEventListener: AccountantTempEventListener) {
+        accountantTempEventListener: AccountantTempEventListener
+    ) {
         tempEventKafkaListener.addListener(accountantTempEventListener)
     }
 

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

@@ -1,61 +1,18 @@
 package co.nilin.opex.accountant.app.config
 
-import co.nilin.opex.accountant.ports.postgres.dao.PairConfigRepository
-import co.nilin.opex.accountant.ports.postgres.dao.PairFeeConfigRepository
-import co.nilin.opex.accountant.ports.postgres.dao.UserLevelRepository
-import co.nilin.opex.accountant.ports.postgres.model.PairFeeConfigModel
-import co.nilin.opex.utility.preferences.Preferences
-import kotlinx.coroutines.reactor.awaitSingleOrNull
 import kotlinx.coroutines.runBlocking
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.DependsOn
 import org.springframework.stereotype.Component
 import javax.annotation.PostConstruct
 
 @Component
 @DependsOn("postgresConfig")
-class InitializeService(
-    private val pairConfigRepository: PairConfigRepository,
-    private val pairFeeConfigRepository: PairFeeConfigRepository,
-    private val userLevelRepository: UserLevelRepository,
-) {
-
-    @Autowired
-    private lateinit var preferences: Preferences
+class InitializeService{
 
     @PostConstruct
     fun init() = runBlocking {
-        preferences.userLevels.forEach {
-            userLevelRepository.insert(it).awaitSingleOrNull()
-        }
-
-        preferences.markets.map {
-            val pair = it.pair ?: "${it.leftSide}_${it.rightSide}"
-            val leftSideCurrency = preferences.currencies.first { c -> it.leftSide == c.symbol }
-            val rightSideCurrency = preferences.currencies.first { c -> it.rightSide == c.symbol }
-            val leftSideFraction = (it.leftSideFraction ?: leftSideCurrency.precision)
-            val rightSideFraction = (it.rightSideFraction ?: rightSideCurrency.precision)
-            pairConfigRepository.insert(
-                pair,
-                it.leftSide,
-                it.rightSide,
-                leftSideFraction,
-                rightSideFraction
-            ).awaitSingleOrNull()
-            it.feeConfigs.forEach { f ->
-                runCatching {
-                    pairFeeConfigRepository.save(
-                        PairFeeConfigModel(
-                            null,
-                            pair,
-                            f.direction,
-                            f.userLevel,
-                            f.makerFee,
-                            f.takerFee
-                        )
-                    ).awaitSingleOrNull()
-                }
-            }
-        }
+        // addUserLevels()
+        // addPairConfigs()
+        // addPairFeeConfigs
     }
 }

accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/config/SecurityConfig.kt

@@ -0,0 +1,18 @@
+package co.nilin.opex.accountant.app.config
+
+import org.springframework.context.annotation.Bean
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
+import org.springframework.security.config.web.server.ServerHttpSecurity
+import org.springframework.security.web.server.SecurityWebFilterChain
+
+@EnableWebFluxSecurity
+class SecurityConfig {
+
+    @Bean
+    fun springSecurityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
+        http.csrf().disable()
+            .authorizeExchange()
+            .anyExchange().permitAll()
+        return http.build()
+    }
+}

accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/data/PairFeeResponse.kt

@@ -3,7 +3,7 @@ package co.nilin.opex.accountant.app.data
 import java.math.BigDecimal
 
 data class PairFeeResponse(
-    val pair:String,
+    val pair: String,
     val direction: String,
     val userLevel: String,
     val makerFee: BigDecimal,

accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/listener/KycLevelUpdatedListener.kt

@@ -3,11 +3,11 @@ package co.nilin.opex.accountant.app.listener
 import co.nilin.opex.accountant.core.inout.KycLevelUpdatedEvent
 import co.nilin.opex.accountant.ports.kafka.listener.spi.KycLevelUpdatedEventListener
 import co.nilin.opex.accountant.ports.postgres.impl.UserLevelLoaderImpl
-import org.slf4j.LoggerFactory
-import org.springframework.stereotype.Component
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
 
 @Component
 class KycLevelUpdatedListener(val userLevelLoaderImpl: UserLevelLoaderImpl) : KycLevelUpdatedEventListener {
@@ -18,8 +18,10 @@ class KycLevelUpdatedListener(val userLevelLoaderImpl: UserLevelLoaderImpl) : Ky
         return "KycLevelUpdatedListener"
     }
 
-    override fun onEvent(event: KycLevelUpdatedEvent,
-                         partition: Int, offset: Long, timestamp: Long, eventId: String) {
+    override fun onEvent(
+        event: KycLevelUpdatedEvent,
+        partition: Int, offset: Long, timestamp: Long, eventId: String
+    ) {
         logger.info("==========================================================================")
         logger.info("Incoming UserLevelUpdated event: $event")
         logger.info("==========================================================================")

accountant/accountant-app/src/test/resources/application.yml

@@ -38,7 +38,7 @@ management:
     web:
       base-path: /actuator
       exposure:
-        include: ["health", "metrics"]
+        include: [ "health", "metrics" ]
   endpoint:
     health:
       show-details: always

accountant/accountant-core/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>