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

Rework tx lower bound logic (#533)

Browse Source
This commit is contained in:
KirillPamPam
2024-07-29 17:13:21 +04:00
committed by GitHub
parent ee8181ea29
commit 0095426d34
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundTxDetector.kt
View File

@@ -1,5 +1,6 @@
package io.emeraldpay.dshackle.upstream.ethereum package io.emeraldpay.dshackle.upstream.ethereum
import io.emeraldpay.dshackle.data.BlockContainer
import io.emeraldpay.dshackle.upstream.ChainRequest import io.emeraldpay.dshackle.upstream.ChainRequest
import io.emeraldpay.dshackle.upstream.Upstream import io.emeraldpay.dshackle.upstream.Upstream
import io.emeraldpay.dshackle.upstream.lowerbound.LowerBoundData import io.emeraldpay.dshackle.upstream.lowerbound.LowerBoundData
@@ -29,16 +30,32 @@ class EthereumLowerBoundTxDetector(
return recursiveLowerBound.recursiveDetectLowerBoundWithOffset(MAX_OFFSET) { block -> return recursiveLowerBound.recursiveDetectLowerBoundWithOffset(MAX_OFFSET) { block ->
upstream.getIngressReader() upstream.getIngressReader()
.read( .read(
ChainRequest( ChainRequest("eth_getBlockByNumber", ListParams(block.toHex(), false)),
"eth_getBlockTransactionCountByNumber",
ListParams(block.toHex()),
),
) )
.doOnNext { .doOnNext {
if (it.hasResult() && (it.getResult().contentEquals("null".toByteArray()) || it.getResultAsProcessedString().substring(2).toLong(16) == 0L)) { if (it.hasResult() && it.getResult().contentEquals("null".toByteArray())) {
throw IllegalStateException(NO_TX_DATA) throw IllegalStateException(NO_TX_DATA)
} }
} }
.handle { it, sink ->
val blockJson = BlockContainer.fromEthereumJson(it.getResult(), upstream.getId())
if (blockJson.transactions.isEmpty()) {
sink.error(IllegalStateException(NO_TX_DATA))
return@handle
}
sink.next(blockJson.transactions[0].toHexWithPrefix())
}
.flatMap { tx ->
upstream.getIngressReader()
.read(
ChainRequest("eth_getTransactionByHash", ListParams(tx)),
)
.doOnNext {
if (it.hasResult() && it.getResult().contentEquals("null".toByteArray())) {
throw IllegalStateException(NO_TX_DATA)
}
}
}
} }
} }

20
src/test/kotlin/io/emeraldpay/dshackle/upstream/RecursiveLowerBoundServiceTest.kt
View File

@@ -1,6 +1,7 @@
package io.emeraldpay.dshackle.upstream package io.emeraldpay.dshackle.upstream
import io.emeraldpay.dshackle.Chain import io.emeraldpay.dshackle.Chain
import io.emeraldpay.dshackle.Global
import io.emeraldpay.dshackle.reader.ChainReader import io.emeraldpay.dshackle.reader.ChainReader
import io.emeraldpay.dshackle.upstream.ethereum.EthereumLowerBoundService import io.emeraldpay.dshackle.upstream.ethereum.EthereumLowerBoundService
import io.emeraldpay.dshackle.upstream.ethereum.EthereumLowerBoundTxDetector.Companion.MAX_OFFSET import io.emeraldpay.dshackle.upstream.ethereum.EthereumLowerBoundTxDetector.Companion.MAX_OFFSET
@@ -21,6 +22,8 @@ import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock import org.mockito.kotlin.mock
import reactor.core.publisher.Mono import reactor.core.publisher.Mono
import reactor.test.StepVerifier import reactor.test.StepVerifier
import java.io.File
import java.nio.file.Files
import java.time.Duration import java.time.Duration
class RecursiveLowerBoundServiceTest { class RecursiveLowerBoundServiceTest {
@@ -37,6 +40,9 @@ class RecursiveLowerBoundServiceTest {
val head = mock<Head> { val head = mock<Head> {
on { getCurrentHeight() } doReturn 18000000 on { getCurrentHeight() } doReturn 18000000
} }
val blockBytes = Files.readAllBytes(
File(this::class.java.getResource("/responses/get-by-number-response.json")!!.toURI()).toPath(),
)
val reader = mock<ChainReader> { val reader = mock<ChainReader> {
blocks.forEach { blocks.forEach {
if (it == 17964844L) { if (it == 17964844L) {
@@ -45,10 +51,10 @@ class RecursiveLowerBoundServiceTest {
} doReturn Mono.just(ChainResponse(ByteArray(0), null)) } doReturn Mono.just(ChainResponse(ByteArray(0), null))
on { on {
read(ChainRequest("eth_getBlockByNumber", ListParams(it.toHex(), false))) read(ChainRequest("eth_getBlockByNumber", ListParams(it.toHex(), false)))
} doReturn Mono.just(ChainResponse(ByteArray(0), null)) } doReturn Mono.just(ChainResponse(blockBytes, null))
on { on {
read(ChainRequest("eth_getBlockTransactionCountByNumber", ListParams(it.toHex()))) read(ChainRequest("eth_getTransactionByHash", ListParams("0x99e52a94cfdf83a5bdadcd2e25c71574a5a24fa4df56a33f9f8b5cb6fa0ac657")))
} doReturn Mono.just(ChainResponse("\"0x12\"".toByteArray(), null)) } doReturn Mono.just(ChainResponse(ByteArray(0), null))
on { on {
read(ChainRequest("eth_getLogs", ListParams(mapOf("fromBlock" to it.toHex(), "toBlock" to it.toHex())))) read(ChainRequest("eth_getLogs", ListParams(mapOf("fromBlock" to it.toHex(), "toBlock" to it.toHex()))))
} doReturn Mono.just(ChainResponse("[\"0x12\"]".toByteArray(), null)) } doReturn Mono.just(ChainResponse("[\"0x12\"]".toByteArray(), null))
@@ -56,13 +62,10 @@ class RecursiveLowerBoundServiceTest {
on { on {
read(ChainRequest("eth_getBalance", ListParams(ZERO_ADDRESS, it.toHex()))) read(ChainRequest("eth_getBalance", ListParams(ZERO_ADDRESS, it.toHex())))
} doReturn Mono.error(RuntimeException("missing trie node")) } doReturn Mono.error(RuntimeException("missing trie node"))
on {
read(ChainRequest("eth_getBlockByNumber", ListParams(it.toHex(), false)))
} doReturn Mono.error(RuntimeException("No block data"))
for (block in it downTo it - MAX_OFFSET - 1) { for (block in it downTo it - MAX_OFFSET - 1) {
on { on {
read(ChainRequest("eth_getBlockTransactionCountByNumber", ListParams(block.toHex()))) read(ChainRequest("eth_getBlockByNumber", ListParams(block.toHex(), false)))
} doReturn Mono.error(RuntimeException("No tx data")) } doReturn Mono.just(ChainResponse(Global.nullValue, null))
on { on {
read(ChainRequest("eth_getLogs", ListParams(mapOf("fromBlock" to block.toHex(), "toBlock" to block.toHex())))) read(ChainRequest("eth_getLogs", ListParams(mapOf("fromBlock" to block.toHex(), "toBlock" to block.toHex()))))
} doReturn Mono.error(RuntimeException("No logs data")) } doReturn Mono.error(RuntimeException("No logs data"))
@@ -71,6 +74,7 @@ class RecursiveLowerBoundServiceTest {
} }
} }
val upstream = mock<Upstream> { val upstream = mock<Upstream> {
on { getId() } doReturn "id"
on { getHead() } doReturn head on { getHead() } doReturn head
on { getIngressReader() } doReturn reader on { getIngressReader() } doReturn reader
} }