StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

problem: doesn't start head subscription for a single grpc based upstream; no validation for second bitcoin upstream

Browse Source
This commit is contained in:
Igor Artamonov
2021-11-18 17:46:43 -05:00
parent f918e1b138
commit e51f4861d3
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/io/emeraldpay/dshackle/upstream/bitcoin/BitcoinMultistream.kt
View File

@@ -72,13 +72,18 @@ open class BitcoinMultistream(
val head = if (upstreams.size == 1) {
val upstream = upstreams.first()
upstream.setLag(0)
upstream.getHead()
upstream.getHead().apply {
if (this is Lifecycle) {
this.start()
}
}
} else {
val newHead = MergedHead(upstreams.map { it.getHead() }).apply {
this.start()
}
val lagObserver = BitcoinHeadLagObserver(newHead, upstreams)
this.lagObserver = lagObserver
lagObserver.start()
newHead
}
onHeadUpdated(head)

11
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumMultistream.kt
View File

@@ -95,16 +95,19 @@ open class EthereumMultistream(
val head = if (upstreams.size == 1) {
val upstream = upstreams.first()
upstream.setLag(0)
upstream.getHead()
upstream.getHead().apply {
if (this is Lifecycle) {
this.start()
}
}
} else {
val heads = upstreams.map { it.getHead() }
val newHead = MergedHead(heads).apply {
this.start()
}
val lagObserver = EthereumHeadLagObserver(newHead, upstreams as Collection<Upstream>).apply {
this.start()
}
val lagObserver = EthereumHeadLagObserver(newHead, upstreams as Collection<Upstream>)
this.lagObserver = lagObserver
lagObserver.start()
newHead
}
onHeadUpdated(head)

1
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumRpcHead.kt
View File

@@ -43,6 +43,7 @@ class EthereumRpcHead(
private var refreshSubscription: Disposable? = null
override fun start() {
refreshSubscription?.dispose()
val base = Flux.interval(interval)
.publishOn(scheduler)
.flatMap {