opexdev · ebrahimmfadae · Mar 5, 2022 · Dec 5, 2021 · Dec 5, 2021 · Dec 5, 2021
diff --git a/accountant/accountant-app/src/main/resources/application.yml b/accountant/accountant-app/src/main/resources/application.yml
@@ -13,9 +13,6 @@ spring:
     bootstrap-servers: ${KAFKA_IP_PORT:localhost:9092}
     consumer:
       group-id: accountant
-  redis:
-    hostname: ${REDIS_HOST:localhost}
-    port: 6379
   r2dbc:
     url: r2dbc:postgresql://${DB_IP_PORT:localhost}/opex_accountant
     username: ${dbusername:opex}

diff --git a/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/model/PairConfig.kt b/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/model/PairConfig.kt
@@ -5,5 +5,6 @@ class PairConfig(
     val leftSideWalletSymbol: String, //can be same as pair left side
     val rightSideWalletSymbol: String, //can be same as pair right side
     val leftSideFraction: Double,
-    val rightSideFraction: Double
+    val rightSideFraction: Double,
+    val rate: Double = 0.0
 )
diff --git a/api/api-app/src/main/kotlin/co/nilin/opex/api/app/ApiApp.kt b/api/api-app/src/main/kotlin/co/nilin/opex/api/app/ApiApp.kt
@@ -7,7 +7,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2
 
 @SpringBootApplication
 @ComponentScan("co.nilin.opex")
-@EnableSwagger2
 class ApiApp
 
 fun main(args: Array<String>) {

diff --git a/api/api-app/src/main/resources/application.yml b/api/api-app/src/main/resources/application.yml
@@ -13,9 +13,6 @@ spring:
     bootstrap-servers: ${KAFKA_IP_PORT:localhost:9092}
     consumer:
       group-id: api
-  redis:
-    host: ${REDIS_HOST:localhost}
-    port: 6379
   r2dbc:
     url: r2dbc:postgresql://${DB_IP_PORT:localhost}/opex_api
     username: ${dbusername:opex}
@@ -51,12 +48,12 @@ app:
   accountant:
     url: lb://opex-accountant
   matching-gateway:
-    url: lb://opex-gateway
+    url: lb://opex-matching-gateway
   wallet:
     url: lb://opex-wallet
   opex-bc-gateway:
     url: lb://opex-bc-gateway
   auth:
     cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
 
-swagger.authUrl: https://api.opex.dev
+swagger.authUrl: https://api.opex.dev
diff --git a/...api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/config/SecurityConfig.kt b/...api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/config/SecurityConfig.kt
@@ -19,7 +19,6 @@ class SecurityConfig(private val webClient: WebClient) {
     fun springSecurityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain? {
         http.csrf().disable()
             .authorizeExchange()
-            .pathMatchers("/hello").permitAll()
             .pathMatchers("/actuator/**").permitAll()
             .pathMatchers("/swagger-ui/**").permitAll()
             .pathMatchers("/swagger-resources/**").permitAll()

diff --git a/bc-gateway/bc-gateway-app/pom.xml b/bc-gateway/bc-gateway-app/pom.xml
@@ -27,10 +27,6 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.projectreactor.kotlin</groupId>
             <artifactId>reactor-kotlin-extensions</artifactId>

diff --git a/...teway/bc-gateway-app/src/main/kotlin/co/nilin/opex/bcgateway/app/config/SecurityConfig.kt b/...teway/bc-gateway-app/src/main/kotlin/co/nilin/opex/bcgateway/app/config/SecurityConfig.kt
@@ -21,6 +21,9 @@ class SecurityConfig(@Qualifier("loadBalanced") private val webClient: WebClient
     fun springSecurityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain? {
         http.csrf().disable()
             .authorizeExchange()
+            .pathMatchers("/actuator/**").permitAll()
+            .pathMatchers("/swagger-ui/**").permitAll()
+            .pathMatchers("/swagger-resources/**").permitAll()
             .pathMatchers("/filter/**").hasAuthority("SCOPE_trust")
             .pathMatchers("/admin/**").hasRole("SCOPE_trust", "system-admin")
             .pathMatchers("/address/**").permitAll()

diff --git a/...eway/bc-gateway-app/src/main/kotlin/co/nilin/opex/bcgateway/app/config/WebClientConfig.kt b/...eway/bc-gateway-app/src/main/kotlin/co/nilin/opex/bcgateway/app/config/WebClientConfig.kt
@@ -12,7 +12,6 @@ import org.springframework.web.reactive.function.client.WebClient
 
 @Configuration
 class WebClientConfig {
-
     @Bean
     @Qualifier("loadBalanced")
     fun loadBalancedWebClient(loadBalancerFactory: ReactiveLoadBalancer.Factory<ServiceInstance>): WebClient {
@@ -26,7 +25,6 @@ class WebClientConfig {
     }
 
     @Bean
-
     fun webClient(): WebClient {
         return WebClient.builder()
             .exchangeStrategies(
@@ -36,5 +34,4 @@ class WebClientConfig {
             )
             .build()
     }
-
 }
diff --git a/bc-gateway/bc-gateway-app/src/main/resources/application.yml b/bc-gateway/bc-gateway-app/src/main/resources/application.yml
@@ -9,9 +9,6 @@ spring:
     bootstrap-servers: ${KAFKA_IP_PORT:localhost:9092}
     consumer:
       group-id: bc-gateway
-  redis:
-    host: ${REDIS_HOST:localhost}
-    port: 6379
   r2dbc:
     url: r2dbc:postgresql://${DB_IP_PORT:localhost}/opex_bc_gateway
     username: ${dbusername:opex}
@@ -47,10 +44,9 @@ logging:
   level:
     org.apache.kafka: ERROR
     co.nilin: DEBUG
-
 swagger.authUrl: https://api.opex.dev
 app:
   auth:
     cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
   wallet:
-    url: lb://opex-wallet
+    url: lb://opex-wallet
diff --git a/...s/src/main/kotlin/co/nilin/opex/bcgateway/ports/postgres/impl/ChainEndpointHandlerImpl.kt b/...s/src/main/kotlin/co/nilin/opex/bcgateway/ports/postgres/impl/ChainEndpointHandlerImpl.kt
@@ -10,12 +10,13 @@ import co.nilin.opex.bcgateway.ports.postgres.model.ChainEndpointModel
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.reactive.awaitFirstOrNull
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.stereotype.Component
 import org.springframework.web.reactive.function.client.WebClient
 
 @Component
 class ChainEndpointHandlerImpl(
-    private val webClient: WebClient,
+    @Qualifier("loadBalanced") private val webClient: WebClient,
     private val chainRepository: ChainRepository,
     private val endpointRepository: ChainEndpointRepository
 ) : ChainEndpointHandler {

diff --git a/bc-gateway/bc-gateway-ports/bc-gateway-persister-postgres/src/main/resources/data.sql b/bc-gateway/bc-gateway-ports/bc-gateway-persister-postgres/src/main/resources/data.sql
@@ -19,7 +19,8 @@ SELECT setval(pg_get_serial_sequence('address_types', 'id'), (SELECT MAX(id) FRO
 
 INSERT INTO chain_address_types(chain_name, addr_type_id)
 VALUES ('bitcoin', 1),
-       ('ethereum', 2)
+       ('ethereum', 2),
+       ('bsc', 2)
 ON CONFLICT DO NOTHING;
 
 INSERT INTO currency_implementations(id,
@@ -40,13 +41,17 @@ ON CONFLICT DO NOTHING;
 SELECT setval(pg_get_serial_sequence('currency_implementations', 'id'), (SELECT MAX(id) FROM currency_implementations));
 
 INSERT INTO chain_endpoints(id, chain_name, endpoint_url)
-VALUES (1, 'bitcoin', 'lb://gateway/bitcoin/transfers'),
-       (2, 'ethereum', 'lb://gateway/eth/transfers')
+VALUES (1, 'bitcoin', 'lb://chain-scan-gateway/bitcoin/transfers'),
+       (2, 'ethereum', 'lb://chain-scan-gateway/eth/transfers'),
+       (3, 'bsc', 'lb://chain-scan-gateway/bsc/transfers')
 ON CONFLICT DO NOTHING;
 
+SELECT setval(pg_get_serial_sequence('chain_endpoints', 'id'), (SELECT MAX(id) FROM chain_endpoints));
+
 INSERT INTO chain_sync_schedules
 VALUES ('bitcoin', CURRENT_DATE, 600, 60),
-       ('ethereum', CURRENT_DATE, 90, 60)
+       ('ethereum', CURRENT_DATE, 90, 60),
+       ('bsc', CURRENT_DATE, 90, 60)
 ON CONFLICT DO NOTHING;
 
 INSERT INTO wallet_sync_schedules

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -25,4 +25,7 @@ services:
       - "5446:5432"
   postgres-bc-gateway:
     ports:
-      - "5447:5432"
+      - "5447:5432"
+  postgres-referral:
+    ports:
+      - "5448:5432"
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -25,4 +25,7 @@ services:
       - "5436:5432"
   postgres-bc-gateway:
     ports:
-      - "5437:5432"
+      - "5437:5432"
+  postgres-referral:
+    ports:
+      - "5438:5432"