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

problem: doesn't request Bitcoin balancer from a remote Grpc node

Browse Source
This commit is contained in:
Igor Artamonov
2022-07-21 22:07:12 -04:00
parent afebfd7363
commit 7f67171ad6
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/io/emeraldpay/dshackle/rpc/TrackBitcoinAddress.kt
View File

@@ -57,7 +57,7 @@ class TrackBitcoinAddress(
/** /**
* Keep tracking of the current state of local upstreams. True for a chain that has an upstream with balance data. * Keep tracking of the current state of local upstreams. True for a chain that has an upstream with balance data.
*/ */
private val balanceAvailable: MutableMap<Chain, Boolean> = ConcurrentHashMap() private val localBalanceAvailable: MutableMap<Chain, Boolean> = ConcurrentHashMap()
/** /**
* Criteria for a remote grpc upstream that can provide a balance * Criteria for a remote grpc upstream that can provide a balance
@@ -72,7 +72,7 @@ class TrackBitcoinAddress(
multistreamHolder.observeChains().subscribe { chain -> multistreamHolder.observeChains().subscribe { chain ->
multistreamHolder.getUpstream(chain)?.let { mup -> multistreamHolder.getUpstream(chain)?.let { mup ->
val available = mup.getAll().any { up -> val available = mup.getAll().any { up ->
!up.isGrpc() && (up.getOptions().providesBalance ?: false) !up.isGrpc() && up.getCapabilities().contains(Capability.BALANCE)
} }
setBalanceAvailability(chain, available) setBalanceAvailability(chain, available)
} }
@@ -80,14 +80,14 @@ class TrackBitcoinAddress(
} }
fun setBalanceAvailability(chain: Chain, enabled: Boolean) { fun setBalanceAvailability(chain: Chain, enabled: Boolean) {
balanceAvailable[chain] = enabled localBalanceAvailable[chain] = enabled
} }
/** /**
* @return true if the current instance has data sources to provide the balance * @return true if the current instance has data sources to provide the balance
*/ */
fun isBalanceAvailable(chain: Chain): Boolean { fun isBalanceAvailable(chain: Chain): Boolean {
return balanceAvailable[chain] ?: false return localBalanceAvailable[chain] ?: false
} }
fun allAddresses(api: BitcoinMultistream, request: BlockchainOuterClass.BalanceRequest): Flux<String> { fun allAddresses(api: BitcoinMultistream, request: BlockchainOuterClass.BalanceRequest): Flux<String> {
@@ -179,8 +179,7 @@ class TrackBitcoinAddress(
} }
.timeout(Defaults.timeoutInternal, Mono.empty()) .timeout(Defaults.timeoutInternal, Mono.empty())
.switchIfEmpty( .switchIfEmpty(
Mono.just(0) Mono.fromCallable {
.doOnNext {
log.warn("No upstream providing balance for ${api.chain}") log.warn("No upstream providing balance for ${api.chain}")
} }
.then(Mono.error(SilentException.DataUnavailable("BALANCE"))) .then(Mono.error(SilentException.DataUnavailable("BALANCE")))

2
src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt
View File

@@ -257,7 +257,7 @@ open class ConfiguredUpstreams(
log.info("Using ALL CHAINS (gRPC) upstream, at ${endpoint.host}:${endpoint.port}") log.info("Using ALL CHAINS (gRPC) upstream, at ${endpoint.host}:${endpoint.port}")
ds.start() ds.start()
.doOnNext { .doOnNext {
log.info("Chain ${it.chain} has ${it.type} through gRPC at ${endpoint.host}:${endpoint.port}") log.info("Chain ${it.chain} ${it.type} through gRPC at ${endpoint.host}:${endpoint.port}. With caps: ${it.upstream.getCapabilities()}")
} }
.subscribe(currentUpstreams::update) .subscribe(currentUpstreams::update)
} }