Reload config

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/Config.kt

@@ -24,6 +24,7 @@ import io.emeraldpay.dshackle.config.HealthConfig
 import io.emeraldpay.dshackle.config.MainConfig
 import io.emeraldpay.dshackle.config.MainConfigReader
 import io.emeraldpay.dshackle.config.MonitoringConfig
+import io.emeraldpay.dshackle.config.ReloadConfiguration
 import io.emeraldpay.dshackle.config.SignatureConfig
 import io.emeraldpay.dshackle.config.TokensConfig
 import io.emeraldpay.dshackle.config.UpstreamsConfig
@@ -159,4 +160,9 @@ open class Config(
     open fun authorizationConfig(mainConfig: MainConfig): AuthorizationConfig {
         return mainConfig.authorization
     }
+
+    @Bean
+    open fun reloadConfiguration(mainConfig: MainConfig): ReloadConfiguration {
+        return mainConfig.reloadConfiguration
+    }
 }

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/MainConfig.kt

@@ -31,4 +31,5 @@ class MainConfig {
     var compression: CompressionConfig = CompressionConfig.default()
     var chains: ChainsConfig = ChainsConfig.default()
     var authorization: AuthorizationConfig = AuthorizationConfig.default()
+    var reloadConfiguration: ReloadConfiguration = ReloadConfiguration.default()
 }

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

@@ -37,6 +37,7 @@ class MainConfigReader(
     private val compressionConfigReader = CompressionConfigReader()
     private val chainsConfigReader = ChainsConfigReader(optionsReader)
     private val authorizationConfigReader = AuthorizationConfigReader()
+    private val reloadConfigurationReader = ReloadConfigurationReader()
 
     override fun read(input: MappingNode?): MainConfig {
         val config = MainConfig()
@@ -87,6 +88,9 @@ class MainConfigReader(
         authorizationConfigReader.read(input).let {
             config.authorization = it
         }
+        reloadConfigurationReader.read(input).let {
+            config.reloadConfiguration = it
+        }
         return config
     }
 }

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

@@ -0,0 +1,23 @@
+package io.emeraldpay.dshackle.config
+
+import io.emeraldpay.dshackle.foundation.YamlConfigReader
+import org.yaml.snakeyaml.nodes.MappingNode
+
+data class ReloadConfiguration(
+    val port: Int,
+) {
+    companion object {
+        fun default() = ReloadConfiguration(8093)
+    }
+}
+
+class ReloadConfigurationReader : YamlConfigReader<ReloadConfiguration>() {
+
+    override fun read(input: MappingNode?): ReloadConfiguration {
+        val reload = getMapping(input, "reload") ?: return ReloadConfiguration.default()
+
+        val port = getValueAsInt(reload, "port") ?: return ReloadConfiguration.default()
+
+        return ReloadConfiguration(port)
+    }
+}

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> {
@@ -58,6 +60,19 @@ open class UpstreamsConfig {
 
     open class RpcConnection : UpstreamConnection() {
         var rpc: HttpEndpoint? = null
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is RpcConnection) return false
+
+            if (rpc != other.rpc) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            return rpc?.hashCode() ?: 0
+        }
     }
 
     class GrpcConnection : UpstreamConnection() {
@@ -85,6 +100,24 @@ open class UpstreamsConfig {
                 ConnectorMode.parse(connectorMode!!)
             }
         }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is EthereumConnection) return false
+            if (!super.equals(other)) return false
+
+            if (ws != other.ws) return false
+            if (connectorMode != other.connectorMode) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = super.hashCode()
+            result = 31 * result + (ws?.hashCode() ?: 0)
+            result = 31 * result + (connectorMode?.hashCode() ?: 0)
+            return result
+        }
     }
 
     class BitcoinConnection : RpcConnection() {
@@ -95,19 +128,35 @@ open class UpstreamsConfig {
     class EthereumPosConnection : UpstreamConnection() {
         var execution: EthereumConnection? = null
         var upstreamRating: Int = 0
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is EthereumPosConnection) return false
+
+            if (execution != other.execution) return false
+            if (upstreamRating != other.upstreamRating) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = execution?.hashCode() ?: 0
+            result = 31 * result + upstreamRating
+            return result
+        }
     }
 
     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 +208,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
+    }
+}