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

problem: gets block from cache without transaction data when it requested

Browse Source
This commit is contained in:
Igor Artamonov
2019-08-29 21:24:17 -04:00
parent 17d46aafc2
commit 26f1229f36
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/kotlin/io/emeraldpay/dshackle/upstream/CachingEthereumApi.kt
View File

@@ -44,14 +44,19 @@ open class CachingEthereumApi(
override fun execute(id: Int, method: String, params: List<Any>): Mono<ByteArray> { override fun execute(id: Int, method: String, params: List<Any>): Mono<ByteArray> {
return when (method) { return when (method) {
"eth_blockNumber" -> head.getFlux().next() "eth_blockNumber" ->
head.getFlux().next()
.map { HexQuantity.from(it.number).toHex() } .map { HexQuantity.from(it.number).toHex() }
.map(toJson(id)) .map(toJson(id))
"eth_getBlockByHash" -> Mono.just(params[0]) "eth_getBlockByHash" ->
.map { BlockHash.from(it as String) } if (params.size == 2 && (params[1] == "false" || params[1] == false))
.flatMap(cache::read) Mono.just(params[0])
.map(toJson(id)) .map { BlockHash.from(it as String) }
else -> Mono.empty() .flatMap(cache::read)
.map(toJson(id))
else Mono.empty()
else ->
Mono.empty()
} }
} }