track upstream base tag for the release watcher

Reload no longer crashes on Chain.UNSPECIFIED, removes gRPC upstreams
by prefixed id with lifecycle cleanup, applies methods.disabled changes
synchronously, pushes status via existing SubscribeChainStatus streams,
and optionally closes client RPCs so edges reconnect. NativeCall returns
-32601 (CODE_METHOD_NOT_EXIST) for disabled/unknown methods.

Co-authored-by: Cursor <cursoragent@cursor.com>

.upstream-base

@@ -1 +1 @@
-v0.79.11
+v0.79.10

docs/reference-configuration.adoc

@@ -849,18 +849,6 @@ rpc:
     password: "${ETH_PASSWORD}"
 ----
 
-| `rpc.bearer-auth` + `rpc.bearer-auth.token`
-a| HTTP Bearer token authorization (`Authorization: Bearer <token>` header), if required by the remote server. +
-Cannot be used together with `basic-auth`.
-Value can also reference env variables, for example:
-[source,yaml]
-----
-rpc:
-  url: "https://ethereum.com:8545"
-  bearer-auth:
-    token: "${ETH_TOKEN}"
-----
-
 | `ws.url`
 | WebSocket URL to connect to.
 Optional, but optimizes performance if it's available.
@@ -871,9 +859,6 @@ Optional, but optimizes performance if it's available.
 | `ws.basic-auth` + ...
 | WebSocket Basic Auth configuration, if required by the remote server
 
-| `ws.bearer-auth` + `ws.bearer-auth.token`
-| WebSocket Bearer token authorization, if required by the remote server
-
 | `ws.frameSize`
 | WebSocket frame size limit.
 Ex `1kb`, `1024` (same as `1kb), `2mb`, etc.

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

@@ -33,10 +33,6 @@ class AuthConfig {
         val password: String,
     ) : ClientAuth()
 
-    class ClientBearerAuth(
-        val token: String,
-    ) : ClientAuth()
-
     class ClientTlsAuth(
         var ca: String? = null,
         var certificate: String? = null,

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

@@ -40,18 +40,6 @@ class AuthConfigReader : YamlConfigReader<AuthConfig>() {
         }
     }
 
-    fun readClientBearerAuth(node: MappingNode?): AuthConfig.ClientBearerAuth? {
-        return getMapping(node, "bearer-auth")?.let { authNode ->
-            val token = getValueAsString(authNode, "token")
-            if (token != null) {
-                AuthConfig.ClientBearerAuth(token)
-            } else {
-                log.warn("Bearer auth is not fully configured, token is required")
-                null
-            }
-        }
-    }
-
     fun readClientTls(node: MappingNode?): AuthConfig.ClientTlsAuth? {
         return getMapping(node, "tls")?.let { authNode ->
             val auth = AuthConfig.ClientTlsAuth()

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

@@ -136,14 +136,12 @@ data class UpstreamsConfig(
         constructor(url: URI) : this(url, DEFAULT_MAX_CONNECTIONS, DEFAULT_QUEUE_SIZE)
 
         var basicAuth: AuthConfig.ClientBasicAuth? = null
-        var bearerAuth: AuthConfig.ClientBearerAuth? = null
         var tls: AuthConfig.ClientTlsAuth? = null
     }
 
     data class WsEndpoint(val url: URI) {
         var origin: URI? = null
         var basicAuth: AuthConfig.ClientBasicAuth? = null
-        var bearerAuth: AuthConfig.ClientBearerAuth? = null
         var frameSize: Int? = null
         var msgSize: Int? = null
         var connections: Int = 1

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

@@ -147,7 +147,6 @@ class UpstreamsConfigReader(
             getValueAsString(node, "url")?.let { url ->
                 val http = UpstreamsConfig.HttpEndpoint(URI(url), DEFAULT_MAX_CONNECTIONS, DEFAULT_QUEUE_SIZE)
                 http.basicAuth = authConfigReader.readClientBasicAuth(node)
-                http.bearerAuth = readBearerAuth(node, http.basicAuth, url)
                 http.tls = authConfigReader.readClientTls(node)
                 connection.esplora = http
             }
@@ -174,19 +173,6 @@ class UpstreamsConfigReader(
         return connection
     }
 
-    private fun readBearerAuth(
-        node: MappingNode?,
-        basicAuth: AuthConfig.ClientBasicAuth?,
-        url: String,
-    ): AuthConfig.ClientBearerAuth? {
-        val bearerAuth = authConfigReader.readClientBearerAuth(node)
-        if (bearerAuth != null && basicAuth != null) {
-            log.warn("Both basic-auth and bearer-auth are configured for $url, basic-auth is used")
-            return null
-        }
-        return bearerAuth
-    }
-
     private fun readRpcConfig(connConfigNode: MappingNode): UpstreamsConfig.HttpEndpoint? {
         return getMapping(connConfigNode, "rpc")?.let { node ->
             val maxConnections = getValueAsInt(node, "max-connections") ?: DEFAULT_MAX_CONNECTIONS
@@ -195,7 +181,6 @@ class UpstreamsConfigReader(
             getValueAsString(node, "url")?.let { url ->
                 val http = UpstreamsConfig.HttpEndpoint(URI(url), maxConnections, queueSize)
                 http.basicAuth = authConfigReader.readClientBasicAuth(node)
-                http.bearerAuth = readBearerAuth(node, http.basicAuth, url)
                 http.tls = authConfigReader.readClientTls(node)
                 http
             }
@@ -239,7 +224,6 @@ class UpstreamsConfigReader(
                     ws.origin = URI(origin)
                 }
                 ws.basicAuth = authConfigReader.readClientBasicAuth(node)
-                ws.bearerAuth = readBearerAuth(node, ws.basicAuth, url)
 
                 getValueAsBytes(node, "frameSize")?.let {
                     if (it < 65_535) {

src/main/kotlin/io/emeraldpay/dshackle/startup/configure/BitcoinUpstreamCreator.kt

@@ -52,7 +52,7 @@ class BitcoinUpstreamCreator(
                     fileResolver.resolve(ca).readBytes()
                 }
             }
-            EsploraClient(endpoint.url, endpoint.basicAuth, tls, endpoint.bearerAuth)
+            EsploraClient(endpoint.url, endpoint.basicAuth, tls)
         }
 
         val extractBlock = ExtractBlock()

src/main/kotlin/io/emeraldpay/dshackle/startup/configure/GenericConnectorFactoryCreator.kt

@@ -84,7 +84,6 @@ open class GenericConnectorFactoryCreator(
                 monitoringCfg.nettyMetricsConfig.enabled,
                 httpScheduler,
                 customHeaders,
-                conn.bearerAuth,
             )
         }
     }
@@ -107,7 +106,6 @@ open class GenericConnectorFactoryCreator(
             ).apply {
                 config = endpoint
                 basicAuth = endpoint.basicAuth
-                bearerAuth = endpoint.bearerAuth
                 this.customHeaders = customHeaders
             }
             val wsApi = WsConnectionPoolFactory(

src/main/kotlin/io/emeraldpay/dshackle/upstream/BasicHttpFactory.kt

@@ -21,7 +21,6 @@ class BasicHttpFactory(
     private val nettyMetricsEnabled: Boolean,
     private val httpScheduler: Scheduler,
     private val customHeaders: Map<String, String> = emptyMap(),
-    private val bearerAuth: AuthConfig.ClientBearerAuth? = null,
 ) : HttpFactory {
     private val log = LoggerFactory.getLogger(this::class.java)
 
@@ -51,8 +50,8 @@ class BasicHttpFactory(
         )
 
         if (chain.type.apiType == ApiType.REST) {
-            return RestHttpReader(url, maxConnections, queueSize, metrics, httpScheduler, chain, basicAuth, tls, customHeaders, bearerAuth)
+            return RestHttpReader(url, maxConnections, queueSize, metrics, httpScheduler, chain, basicAuth, tls, customHeaders)
         }
-        return JsonRpcHttpReader(url, maxConnections, queueSize, metrics, httpScheduler, basicAuth, tls, customHeaders, bearerAuth)
+        return JsonRpcHttpReader(url, maxConnections, queueSize, metrics, httpScheduler, basicAuth, tls, customHeaders)
     }
 }

src/main/kotlin/io/emeraldpay/dshackle/upstream/HttpReader.kt

@@ -28,7 +28,6 @@ abstract class HttpReader(
     basicAuth: AuthConfig.ClientBasicAuth? = null,
     tlsCAAuth: ByteArray? = null,
     customHeaders: Map<String, String> = emptyMap(),
-    bearerAuth: AuthConfig.ClientBearerAuth? = null,
 ) : ChainReader {
 
     constructor() : this("", 1500, 1000, null)
@@ -67,13 +66,6 @@ abstract class HttpReader(
             build = build.headers(headers)
         }
 
-        if (basicAuth == null) {
-            bearerAuth?.let { auth ->
-                val headers = Consumer { h: HttpHeaders -> h.add(HttpHeaderNames.AUTHORIZATION, "Bearer ${auth.token}") }
-                build = build.headers(headers)
-            }
-        }
-
         if (customHeaders.isNotEmpty()) {
             val headers = Consumer { h: HttpHeaders ->
                 customHeaders.forEach { (key, value) ->

src/main/kotlin/io/emeraldpay/dshackle/upstream/bitcoin/EsploraClient.kt

@@ -34,11 +34,10 @@ import java.security.cert.X509Certificate
 import java.util.Base64
 import java.util.function.Consumer
 
-class EsploraClient @JvmOverloads constructor(
+class EsploraClient(
     private val url: URI,
     basicAuth: AuthConfig.ClientBasicAuth? = null,
     tlsCAAuth: ByteArray? = null,
-    bearerAuth: AuthConfig.ClientBearerAuth? = null,
 ) {
 
     companion object {
@@ -63,13 +62,6 @@ class EsploraClient @JvmOverloads constructor(
             build = build.headers(headers)
         }
 
-        if (basicAuth == null) {
-            bearerAuth?.let { auth ->
-                val headers = Consumer { h: HttpHeaders -> h.add(HttpHeaderNames.AUTHORIZATION, "Bearer ${auth.token}") }
-                build = build.headers(headers)
-            }
-        }
-
         tlsCAAuth?.let { auth ->
             val cf = CertificateFactory.getInstance("X.509")
             val cert = cf.generateCertificate(ByteArrayInputStream(auth)) as X509Certificate

src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/WsConnectionFactory.kt

@@ -21,7 +21,6 @@ open class WsConnectionFactory(
 ) {
 
     var basicAuth: AuthConfig.ClientBasicAuth? = null
-    var bearerAuth: AuthConfig.ClientBearerAuth? = null
     var config: UpstreamsConfig.WsEndpoint? = null
     var customHeaders: Map<String, String> = emptyMap()
 
@@ -48,7 +47,7 @@ open class WsConnectionFactory(
     }
 
     open fun createWsConnection(connIndex: Int = 0): WsConnection =
-        WsConnectionImpl(uri, origin, basicAuth, metrics(connIndex), scheduler, eventsScheduler, customHeaders, bearerAuth).also { ws ->
+        WsConnectionImpl(uri, origin, basicAuth, metrics(connIndex), scheduler, eventsScheduler, customHeaders).also { ws ->
             config?.frameSize?.let {
                 ws.frameSize = it
             }

src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/WsConnectionImpl.kt

@@ -67,7 +67,6 @@ open class WsConnectionImpl(
     private val scheduler: Scheduler,
     private val eventsScheduler: Scheduler,
     private val customHeaders: Map<String, String> = emptyMap(),
-    private val bearerAuth: AuthConfig.ClientBearerAuth? = null,
 ) : AutoCloseable, WsConnection, Cloneable {
 
     companion object {
@@ -228,11 +227,6 @@ open class WsConnectionImpl(
                     val base64password = Base64.getEncoder().encodeToString(tmp.toByteArray())
                     headers.add(HttpHeaderNames.AUTHORIZATION, "Basic $base64password")
                 }
-                if (basicAuth == null) {
-                    bearerAuth?.let { auth ->
-                        headers.add(HttpHeaderNames.AUTHORIZATION, "Bearer ${auth.token}")
-                    }
-                }
                 customHeaders.forEach { (key, value) ->
                     headers.add(key, value)
                 }

src/main/kotlin/io/emeraldpay/dshackle/upstream/restclient/RestHttpReader.kt

@@ -36,8 +36,7 @@ class RestHttpReader(
     basicAuth: AuthConfig.ClientBasicAuth? = null,
     tlsCAAuth: ByteArray? = null,
     customHeaders: Map<String, String> = emptyMap(),
-    bearerAuth: AuthConfig.ClientBearerAuth? = null,
-) : HttpReader(target, maxConnections, queueSize, metrics, basicAuth, tlsCAAuth, customHeaders, bearerAuth) {
+) : HttpReader(target, maxConnections, queueSize, metrics, basicAuth, tlsCAAuth, customHeaders) {
 
     private val parser = ResponseRpcParser()
     private val requestParser = RestRequestParser

src/main/kotlin/io/emeraldpay/dshackle/upstream/rpcclient/JsonRpcHttpReader.kt

@@ -36,7 +36,7 @@ import java.util.function.Function
 /**
  * JSON RPC client
  */
-class JsonRpcHttpReader @JvmOverloads constructor(
+class JsonRpcHttpReader(
     target: String,
     maxConnections: Int,
     queueSize: Int,
@@ -45,8 +45,7 @@ class JsonRpcHttpReader @JvmOverloads constructor(
     basicAuth: AuthConfig.ClientBasicAuth? = null,
     tlsCAAuth: ByteArray? = null,
     customHeaders: Map<String, String> = emptyMap(),
-    bearerAuth: AuthConfig.ClientBearerAuth? = null,
-) : HttpReader(target, maxConnections, queueSize, metrics, basicAuth, tlsCAAuth, customHeaders, bearerAuth) {
+) : HttpReader(target, maxConnections, queueSize, metrics, basicAuth, tlsCAAuth, customHeaders) {
 
     private val parser = ResponseRpcParser()
     private val streamParser = JsonRpcStreamParser()

src/test/groovy/io/emeraldpay/dshackle/config/AuthConfigReaderSpec.groovy

@@ -35,29 +35,6 @@ class AuthConfigReaderSpec extends Specification {
         act.password == "258fe4149c199ad8f2811a68f20154fc"
     }
 
-    def "Read bearer-auth for client"() {
-        setup:
-        def yaml =
-                "bearer-auth:\n" +
-                        "  token: 9c199ad8f281f20154fc258fe41a6814"
-        when:
-        def act = reader.readClientBearerAuth(reader.readNode(yaml))
-        then:
-        act != null
-        act.token == "9c199ad8f281f20154fc258fe41a6814"
-    }
-
-    def "Read bearer-auth without token as null"() {
-        setup:
-        def yaml =
-                "bearer-auth:\n" +
-                        "  something: else"
-        when:
-        def act = reader.readClientBearerAuth(reader.readNode(yaml))
-        then:
-        act == null
-    }
-
     def "Read tls for client"() {
         setup:
         def yaml =

src/test/groovy/io/emeraldpay/dshackle/config/UpstreamsConfigReaderSpec.groovy

@@ -75,38 +75,6 @@ class UpstreamsConfigReaderSpec extends Specification {
         }
     }
 
-    def "Parse config with bearer auth"() {
-        setup:
-        def config = this.class.getClassLoader().getResourceAsStream("configs/upstreams-bearer-auth.yaml")
-        when:
-        def act = reader.readInternal(config)
-        then:
-        act != null
-        act.upstreams.size() == 2
-        with(act.upstreams.get(0)) {
-            id == "local"
-            connection instanceof UpstreamsConfig.RpcConnection
-            with((UpstreamsConfig.RpcConnection) connection) {
-                rpc.basicAuth == null
-                rpc.bearerAuth != null
-                rpc.bearerAuth.token == "9c199ad8f281f20154fc258fe41a6814"
-                ws != null
-                ws.basicAuth == null
-                ws.bearerAuth != null
-                ws.bearerAuth.token == "258fe4149c199ad8f2811a68f20154fc"
-            }
-        }
-        with(act.upstreams.get(1)) {
-            id == "both-auth"
-            connection instanceof UpstreamsConfig.RpcConnection
-            with((UpstreamsConfig.RpcConnection) connection) {
-                // when both are configured basic-auth wins and bearer-auth is dropped
-                rpc.basicAuth != null
-                rpc.bearerAuth == null
-            }
-        }
-    }
-
     def "Parse websocket-only config"() {
         setup:
         def config = this.class.getClassLoader().getResourceAsStream("configs/upstreams-ws-only.yaml")

src/test/groovy/io/emeraldpay/dshackle/upstream/rpcclient/JsonRpcHttpReaderSpec.groovy

@@ -16,7 +16,6 @@
 package io.emeraldpay.dshackle.upstream.rpcclient
 
 
-import io.emeraldpay.dshackle.config.AuthConfig
 import io.emeraldpay.dshackle.test.TestingCommons
 import io.emeraldpay.dshackle.upstream.ChainException
 import io.emeraldpay.dshackle.upstream.ChainRequest
@@ -70,28 +69,6 @@ class JsonRpcHttpReaderSpec extends Specification {
         new String(act.result) == '"0x98de45"'
     }
 
-    def "Make a request with bearer auth"() {
-        setup:
-        def bearerAuth = new AuthConfig.ClientBearerAuth("test-token-123")
-        JsonRpcHttpReader client = new JsonRpcHttpReader("localhost:${mockServer.port}", 50, 50, metrics, Schedulers.boundedElastic(), null, null, [:], bearerAuth)
-        def resp = '{' +
-                '  "jsonrpc": "2.0",' +
-                '  "result": "0x98de45",' +
-                '  "error": null,' +
-                '  "id": 15' +
-                '}'
-        mockServer.when(
-                HttpRequest.request().withHeader("authorization", "Bearer test-token-123")
-        ).respond(
-                HttpResponse.response(resp)
-        )
-        when:
-        def act = client.read(new ChainRequest("test", new ListParams())).block(Duration.ofSeconds(5))
-        then:
-        act.error == null
-        new String(act.result) == '"0x98de45"'
-    }
-
     def "Produces RPC Exception on error status code"() {
         setup:
         def client = new JsonRpcHttpReader("localhost:${mockServer.port}", 50, 50, metrics, Schedulers.boundedElastic(), null, null, [:])

src/test/resources/configs/upstreams-bearer-auth.yaml

@@ -1,27 +0,0 @@
-version: v1
-
-upstreams:
-  - id: local
-    chain: ethereum
-    connection:
-      ethereum:
-        rpc:
-          url: "http://localhost:8545"
-          bearer-auth:
-            token: 9c199ad8f281f20154fc258fe41a6814
-        ws:
-          url: "ws://localhost:8546"
-          origin: "http://localhost"
-          bearer-auth:
-            token: 258fe4149c199ad8f2811a68f20154fc
-  - id: both-auth
-    chain: ethereum
-    connection:
-      ethereum:
-        rpc:
-          url: "http://localhost:8545"
-          basic-auth:
-            username: 4fc258fe41a68149c199ad8f281f2015
-            password: 1a68f20154fc258fe4149c199ad8f281
-          bearer-auth:
-            token: 9c199ad8f281f20154fc258fe41a6814