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

Merge pull request #140 from p2p-org/support-null-values-in-subscription

Browse Source 
Support for wider scope of providers
This commit is contained in:
a10zn8
2023-02-14 23:12:37 +04:00
committed by GitHub
parent cbb436f3f0 268537f727
commit 671903f65c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt
View File

@@ -81,6 +81,9 @@ open class EthereumUpstreamValidator(
} }
} }
} }
.doOnError {
log.warn("Error validating ${upstream.getId()}", it)
}
.onErrorReturn(UpstreamAvailability.UNAVAILABLE) .onErrorReturn(UpstreamAvailability.UNAVAILABLE)
} }

7
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsHead.kt
View File

@@ -71,8 +71,11 @@ class EthereumWsHead(
.flatMap { block -> .flatMap { block ->
// newHeads returns incomplete blocks, i.e. without some fields and without transaction hashes, // newHeads returns incomplete blocks, i.e. without some fields and without transaction hashes,
// so we need to fetch the full block data // so we need to fetch the full block data
if (block.difficulty == null || block.transactions == null) { if (block.difficulty == null ||
// TODO do we really need this ? block.transactions == null ||
block.transactions.isEmpty() ||
block.totalDifficulty == null
) {
enhanceRealBlock(block) enhanceRealBlock(block)
} else { } else {
Mono.just(BlockContainer.from(block)) Mono.just(BlockContainer.from(block))