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

Fixes lower data calculation (#410)

Browse Source
This commit is contained in:
KirillPamPam
2024-02-01 14:01:35 +04:00
committed by GitHub
parent aebd15f547
commit 7fba7dfe4e
8 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
foundation/src/main/resources/chains.yaml
View File

@@ -244,7 +244,7 @@ chain-settings:
label: Arbitrum Nova
type: eth
settings:
expected-block-time: 1s
expected-block-time: 260ms
options:
disable-validation: true
lags:
@@ -737,7 +737,7 @@ chain-settings:
type: solana
settings:
currency: SOL
expected-block-time: 1s
expected-block-time: 400ms
options:
validate-peers: false
lags:

16
src/main/kotlin/io/emeraldpay/dshackle/upstream/LowerBoundBlockDetector.kt
View File

@@ -6,6 +6,7 @@ import reactor.core.publisher.Flux
import reactor.core.publisher.Mono
import java.time.Duration
import java.time.Instant
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicReference
typealias LowerBoundBlockDetectorBuilder = (Chain, Upstream) -> LowerBoundBlockDetector
@@ -21,11 +22,20 @@ abstract class LowerBoundBlockDetector(
protected val log = LoggerFactory.getLogger(this::class.java)
fun lowerBlock(): Flux<LowerBlockData> {
val notProcessing = AtomicBoolean(true)
return Flux.interval(
Duration.ofSeconds(15),
Duration.ofSeconds(60),
Duration.ofMinutes(periodRequest()),
)
.flatMap { lowerBlockDetect() }
.filter { notProcessing.get() }
.flatMap {
notProcessing.set(false)
lowerBlockDetect()
}
.doOnNext {
notProcessing.set(true)
}
.filter { it.blockNumber > currentLowerBlock.get().blockNumber }
.map {
log.info("Lower block of ${upstream.getId()} $chain: block height - {}, slot - {}", it.blockNumber, it.slot ?: "NA")
@@ -39,6 +49,8 @@ abstract class LowerBoundBlockDetector(
protected abstract fun lowerBlockDetect(): Mono<LowerBlockData>
protected abstract fun periodRequest(): Long
data class LowerBlockData(
val blockNumber: Long,
val slot: Long?,

8
src/main/kotlin/io/emeraldpay/dshackle/upstream/RecursiveLowerBoundBlockDetector.kt
View File

@@ -27,7 +27,7 @@ abstract class RecursiveLowerBoundBlockDetector(
} else {
val middle = middleBlock(data)
if (data.left > data.right) {
if (data.left > data.right || middle == 0L) {
val current = if (data.current == 0L) 1 else data.current
Mono.just(LowerBoundData(current, true))
} else {
@@ -57,7 +57,7 @@ abstract class RecursiveLowerBoundBlockDetector(
Long.MAX_VALUE,
Duration.ofSeconds(1),
)
.maxBackoff(Duration.ofSeconds(3))
.maxBackoff(Duration.ofMinutes(3))
.filter {
!nonRetryableErrors.any { err -> it.message?.contains(err, true) ?: false }
}
@@ -71,5 +71,9 @@ abstract class RecursiveLowerBoundBlockDetector(
}
}
override fun periodRequest(): Long {
return 10
}
protected abstract fun hasState(blockNumber: Long): Mono<Boolean>
}

2
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundBlockDetector.kt
View File

@@ -34,6 +34,8 @@ class EthereumLowerBoundBlockDetector(
"after last accepted block",
"Version has either been pruned, or is for a future block", // cronos
"no historical RPC is available for this historical", // optimism
"historical backend error", // optimism
"load state tree: failed to load state tree", // filecoin
)
}

6
src/main/kotlin/io/emeraldpay/dshackle/upstream/solana/SolanaLowerBoundBlockDetector.kt
View File

@@ -79,7 +79,7 @@ class SolanaLowerBoundBlockDetector(
.retryWhen(
Retry
.backoff(Long.MAX_VALUE, Duration.ofSeconds(1))
.maxBackoff(Duration.ofSeconds(3))
.maxBackoff(Duration.ofMinutes(3))
.doAfterRetry {
log.debug(
"Error in calculation of lower block of upstream {}, retry attempt - {}, message - {}",
@@ -90,4 +90,8 @@ class SolanaLowerBoundBlockDetector(
},
)
}
override fun periodRequest(): Long {
return 3
}
}

4
src/main/kotlin/io/emeraldpay/dshackle/upstream/starknet/StarknetLowerBoundBlockDetector.kt
View File

@@ -14,4 +14,8 @@ class StarknetLowerBoundBlockDetector(
override fun lowerBlockDetect(): Mono<LowerBlockData> {
return Mono.just(LowerBlockData(1))
}
override fun periodRequest(): Long {
return 120
}
}

4
src/test/kotlin/io/emeraldpay/dshackle/upstream/RecursiveLowerBoundBlockDetectorTest.kt
View File

@@ -38,7 +38,7 @@ class RecursiveLowerBoundBlockDetectorTest {
StepVerifier.withVirtualTime { detector.lowerBlock() }
.expectSubscription()
.expectNoEvent(Duration.ofSeconds(15))
.expectNext(LowerBoundBlockDetector.LowerBlockData(17964844L))
.expectNextMatches { it.blockNumber == 17964844L }
.thenCancel()
.verify(Duration.ofSeconds(3))
@@ -64,7 +64,7 @@ class RecursiveLowerBoundBlockDetectorTest {
StepVerifier.withVirtualTime { detector.lowerBlock() }
.expectSubscription()
.expectNoEvent(Duration.ofSeconds(15))
.expectNext(LowerBoundBlockDetector.LowerBlockData(1))
.expectNextMatches { it.blockNumber == 1L }
.thenCancel()
.verify(Duration.ofSeconds(3))

2
src/test/kotlin/io/emeraldpay/dshackle/upstream/solana/SolanaLowerBoundBlockDetectorTest.kt
View File

@@ -61,7 +61,7 @@ class SolanaLowerBoundBlockDetectorTest {
StepVerifier.withVirtualTime { detector.lowerBlock() }
.expectSubscription()
.expectNoEvent(Duration.ofSeconds(15))
.expectNext(LowerBoundBlockDetector.LowerBlockData(21000000, 23000010))
.expectNextMatches { it.blockNumber == 21000000L && it.slot == 23000010L }
.thenCancel()
.verify(Duration.ofSeconds(3))