solution: revise for the latest etherjar
This commit is contained in:
@@ -132,13 +132,14 @@ open class ConfiguredUpstreams(
|
|||||||
}
|
}
|
||||||
conn.rpc?.let { endpoint ->
|
conn.rpc?.let { endpoint ->
|
||||||
val rpcClient = ReactorHttpRpcClient.newBuilder()
|
val rpcClient = ReactorHttpRpcClient.newBuilder()
|
||||||
.setTarget(endpoint.url)
|
.connectTo(endpoint.url)
|
||||||
|
.alwaysSeparate()
|
||||||
conn.rpc?.basicAuth?.let { auth ->
|
conn.rpc?.basicAuth?.let { auth ->
|
||||||
rpcClient.setBasicAuth(auth.username, auth.password)
|
rpcClient.basicAuth(auth.username, auth.password)
|
||||||
}
|
}
|
||||||
conn.rpc?.tls?.let { tls ->
|
conn.rpc?.tls?.let { tls ->
|
||||||
tls.ca?.let { ca ->
|
tls.ca?.let { ca ->
|
||||||
fileResolver.resolve(ca).inputStream().use { cert -> rpcClient.setTrustedCertificate(cert) }
|
fileResolver.resolve(ca).inputStream().use { cert -> rpcClient.trustedCertificate(cert) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rpcApi = DirectEthereumApi(
|
rpcApi = DirectEthereumApi(
|
||||||
|
|||||||
@@ -45,10 +45,13 @@ class EthereumWs(
|
|||||||
|
|
||||||
fun connect() {
|
fun connect() {
|
||||||
log.info("Connecting to WebSocket: $uri")
|
log.info("Connecting to WebSocket: $uri")
|
||||||
val client = WebsocketClient(uri, origin)
|
val clientBuilder = WebsocketClient.newBuilder()
|
||||||
|
.connectTo(uri)
|
||||||
|
.origin(origin)
|
||||||
basicAuth?.let { auth ->
|
basicAuth?.let { auth ->
|
||||||
client.setBasicAuth(auth.username, auth.password)
|
clientBuilder.basicAuth(auth.username, auth.password)
|
||||||
}
|
}
|
||||||
|
val client = clientBuilder.build()
|
||||||
try {
|
try {
|
||||||
client.connect()
|
client.connect()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
|
|||||||
@@ -74,8 +74,8 @@ class GrpcUpstreams(
|
|||||||
val client = ReactorBlockchainGrpc.newReactorStub(channel.build())
|
val client = ReactorBlockchainGrpc.newReactorStub(channel.build())
|
||||||
this.client = client
|
this.client = client
|
||||||
this.grpcTransport = ReactorEmeraldClient.newBuilder()
|
this.grpcTransport = ReactorEmeraldClient.newBuilder()
|
||||||
.forChannel(client.channel)
|
.connectUsing(client.channel)
|
||||||
.setObjectMapper(objectMapper)
|
.objectMapper(objectMapper)
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
val statusSubscription = AtomicReference<Disposable>()
|
val statusSubscription = AtomicReference<Disposable>()
|
||||||
|
|||||||
Reference in New Issue
Block a user