Reload config (#315)

build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
@@ -124,14 +126,10 @@ dependencies {
 }
 
 compileKotlin {
-    kotlinOptions {
-        jvmTarget = "20"
-    }
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_20)
 }
 compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "20"
-    }
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_20)
 }
 
 test {

foundation/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

foundation/src/main/kotlin/io/emeraldpay/dshackle/foundation/ChainOptions.kt

@@ -16,12 +16,23 @@ class ChainOptions {
         val validateChain: Boolean,
     )
 
-    open class DefaultOptions : PartialOptions() {
-        var chains: List<String>? = null
+    data class DefaultOptions(
+        var chains: List<String>? = null,
         var options: PartialOptions? = null
-    }
+    )
 
-    open class PartialOptions {
+    data class PartialOptions(
+        var disableValidation: Boolean? = null,
+        var disableUpstreamValidation: Boolean? = null,
+        var validationInterval: Int? = null,
+        var timeout: Duration? = null,
+        var providesBalance: Boolean? = null,
+        var validatePeers: Boolean? = null,
+        var validateCalllimit: Boolean? = null,
+        var minPeers: Int? = null,
+        var validateSyncing: Boolean? = null,
+        var validateChain: Boolean? = null
+    ) {
         companion object {
             @JvmStatic
             fun getDefaults(): PartialOptions {
@@ -31,29 +42,6 @@ class ChainOptions {
             }
         }
 
-        var disableValidation: Boolean? = null
-        var disableUpstreamValidation: Boolean? = null
-        var validationInterval: Int? = null
-            set(value) {
-                require(value == null || value > 0) {
-                    "validation-interval must be a positive number: $value"
-                }
-                field = value
-            }
-        var timeout: Duration? = null
-        var providesBalance: Boolean? = null
-        var validatePeers: Boolean? = null
-        var validateCalllimit: Boolean? = null
-        var minPeers: Int? = null
-            set(value) {
-                require(value == null || value >= 0) {
-                    "min-peers must be a positive number: $value"
-                }
-                field = value
-            }
-        var validateSyncing: Boolean? = null
-        var validateChain: Boolean? = null
-
         fun merge(overwrites: PartialOptions?): PartialOptions {
             if (overwrites == null) {
                 return this

src/main/kotlin/io/emeraldpay/dshackle/FileResolver.kt

@@ -35,4 +35,6 @@ open class FileResolver(
         }
         return File(baseDir, path)
     }
+
+    fun file() = baseDir
 }

src/main/kotlin/io/emeraldpay/dshackle/commons/DynamicMergeFlux.kt

@@ -28,6 +28,7 @@ class DynamicMergeFlux<K : Any, T>(private val scheduler: Scheduler) {
 
     fun stop() {
         sources.forEach { (_, d) -> d.dispose() }
+        sources.clear()
         merge.emitComplete { _, res -> res == Sinks.EmitResult.FAIL_NON_SERIALIZED }
     }
 

src/main/kotlin/io/emeraldpay/dshackle/config/UpstreamsConfig.kt

@@ -23,21 +23,23 @@ import java.util.Arrays
 import java.util.Locale
 import java.util.concurrent.ConcurrentHashMap
 
-open class UpstreamsConfig {
-    var defaultOptions: MutableList<ChainOptions.DefaultOptions> = ArrayList()
-    var upstreams: MutableList<Upstream<*>> = ArrayList<Upstream<*>>()
-
-    class Upstream<T : UpstreamConnection> {
-        var id: String? = null
-        var nodeId: Int? = null
-        var chain: String? = null
-        var options: ChainOptions.PartialOptions? = null
-        var isEnabled = true
-        var connection: T? = null
-        val labels = Labels()
-        var methods: Methods? = null
-        var methodGroups: MethodGroups? = null
-        var role: UpstreamRole = UpstreamRole.PRIMARY
+data class UpstreamsConfig(
+    var defaultOptions: MutableList<ChainOptions.DefaultOptions> = ArrayList(),
+    var upstreams: MutableList<Upstream<*>> = ArrayList(),
+) {
+
+    data class Upstream<T : UpstreamConnection>(
+        var id: String? = null,
+        var nodeId: Int? = null,
+        var chain: String? = null,
+        var options: ChainOptions.PartialOptions? = null,
+        var isEnabled: Boolean = true,
+        var connection: T? = null,
+        val labels: Labels = Labels(),
+        var methods: Methods? = null,
+        var methodGroups: MethodGroups? = null,
+        var role: UpstreamRole = UpstreamRole.PRIMARY,
+    ) {
 
         @Suppress("UNCHECKED_CAST")
         fun <Z : UpstreamConnection> cast(type: Class<Z>): Upstream<Z> {
@@ -56,9 +58,9 @@ open class UpstreamsConfig {
 
     open class UpstreamConnection
 
-    open class RpcConnection : UpstreamConnection() {
-        var rpc: HttpEndpoint? = null
-    }
+    open class RpcConnection(
+        open var rpc: HttpEndpoint? = null,
+    ) : UpstreamConnection()
 
     class GrpcConnection : UpstreamConnection() {
         var host: String? = null
@@ -68,9 +70,11 @@ open class UpstreamsConfig {
         var upstreamRating: Int = 0
     }
 
-    class EthereumConnection : RpcConnection() {
-        var ws: WsEndpoint? = null
-        var connectorMode: String? = null
+    data class EthereumConnection(
+        override var rpc: HttpEndpoint? = null,
+        var ws: WsEndpoint? = null,
+        var connectorMode: String? = null,
+    ) : RpcConnection(rpc) {
 
         fun resolveMode(): ConnectorMode {
             return if (connectorMode == null) {
@@ -87,27 +91,28 @@ open class UpstreamsConfig {
         }
     }
 
-    class BitcoinConnection : RpcConnection() {
-        var esplora: HttpEndpoint? = null
-        var zeroMq: BitcoinZeroMq? = null
-    }
+    data class BitcoinConnection(
+        override var rpc: HttpEndpoint? = null,
+        var esplora: HttpEndpoint? = null,
+        var zeroMq: BitcoinZeroMq? = null,
+    ) : RpcConnection()
 
-    class EthereumPosConnection : UpstreamConnection() {
-        var execution: EthereumConnection? = null
-        var upstreamRating: Int = 0
-    }
+    data class EthereumPosConnection(
+        var execution: EthereumConnection? = null,
+        var upstreamRating: Int = 0,
+    ) : UpstreamConnection()
 
     data class BitcoinZeroMq(
         val host: String = "127.0.0.1",
         val port: Int,
     )
 
-    class HttpEndpoint(val url: URI) {
+    data class HttpEndpoint(val url: URI) {
         var basicAuth: AuthConfig.ClientBasicAuth? = null
         var tls: AuthConfig.ClientTlsAuth? = null
     }
 
-    class WsEndpoint(val url: URI) {
+    data class WsEndpoint(val url: URI) {
         var origin: URI? = null
         var basicAuth: AuthConfig.ClientBasicAuth? = null
         var frameSize: Int? = null
@@ -159,17 +164,17 @@ open class UpstreamsConfig {
         }
     }
 
-    class Methods(
+    data class Methods(
         val enabled: Set<Method>,
         val disabled: Set<Method>,
     )
 
-    class MethodGroups(
+    data class MethodGroups(
         val enabled: Set<String>,
         val disabled: Set<String>,
     )
 
-    class Method(
+    data class Method(
         val name: String,
         val quorum: String? = null,
         val static: String? = null,

src/main/kotlin/io/emeraldpay/dshackle/config/reload/ReloadConfigService.kt

@@ -0,0 +1,28 @@
+package io.emeraldpay.dshackle.config.reload
+
+import io.emeraldpay.dshackle.Config
+import io.emeraldpay.dshackle.FileResolver
+import io.emeraldpay.dshackle.config.MainConfig
+import io.emeraldpay.dshackle.config.UpstreamsConfig
+import io.emeraldpay.dshackle.config.UpstreamsConfigReader
+import io.emeraldpay.dshackle.foundation.ChainOptionsReader
+import org.springframework.stereotype.Component
+
+@Component
+class ReloadConfigService(
+    private val config: Config,
+    fileResolver: FileResolver,
+    private val mainConfig: MainConfig,
+
+) {
+    private val optionsReader = ChainOptionsReader()
+    private val upstreamsConfigReader = UpstreamsConfigReader(fileResolver, optionsReader)
+
+    fun readUpstreamsConfig() = upstreamsConfigReader.read(config.getConfigPath().inputStream())!!
+
+    fun currentUpstreamsConfig() = mainConfig.upstreams!!
+
+    fun updateUpstreamsConfig(newConfig: UpstreamsConfig) {
+        mainConfig.upstreams = newConfig
+    }
+}