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

Predict next bound offset (#691)

Browse Source 
* predictLowerBound with offset

* remove method predictLowerBound without offset

* bump emerald submodule
This commit is contained in:
Andrey Bronin
2025-08-14 17:46:40 +03:00
committed by GitHub
parent 5ef7f8d414
commit 77b1d1fa28
12 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,7 +168,7 @@ abstract class DefaultUpstream(
// NOOP
}
override fun predictLowerBound(type: LowerBoundType): Long {
override fun predictLowerBound(type: LowerBoundType, timeOffsetSeconds: Long): Long {
return 0
}

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

@@ -257,7 +257,7 @@ abstract class Multistream(
return getAll().any { it.isAvailable() }
}
override fun predictLowerBound(type: LowerBoundType): Long {
override fun predictLowerBound(type: LowerBoundType, timeOffsetSeconds: Long): Long {
return 0
}

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

@@ -108,6 +108,7 @@ class Selector {
LowerHeightMatcher(
it.lowerHeightSelector.height,
it.lowerHeightSelector.lowerBoundType.fromProtoType(),
it.lowerHeightSelector.timeOffset,
)
} else {
empty
@@ -569,9 +570,10 @@ class Selector {
data class LowerHeightMatcher(
private val lowerHeight: Long,
private val boundType: LowerBoundType,
private val timeOffsetSeconds: Long = 0,
) : Matcher() {
override fun matchesWithCause(up: Upstream): MatchesResponse {
val predictedLowerBound = up.predictLowerBound(boundType)
val predictedLowerBound = up.predictLowerBound(boundType, timeOffsetSeconds)
return if (lowerHeight >= predictedLowerBound && predictedLowerBound != 0L) {
Success
} else {

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

@@ -55,7 +55,7 @@ interface Upstream : Lifecycle {
fun addFinalization(finalization: FinalizationData, upstreamId: String)
fun getUpstreamSettingsData(): UpstreamSettingsData?
fun updateLowerBound(lowerBound: Long, type: LowerBoundType)
fun predictLowerBound(type: LowerBoundType): Long
fun predictLowerBound(type: LowerBoundType, timeOffsetSeconds: Long): Long
fun getChain(): Chain

4
src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericUpstream.kt
View File

@@ -437,8 +437,8 @@ open class GenericUpstream(
lowerBoundService.updateLowerBound(lowerBound, type)
}
override fun predictLowerBound(type: LowerBoundType): Long {
return lowerBoundService.predictLowerBound(type)
override fun predictLowerBound(type: LowerBoundType, timeOffsetSeconds: Long): Long {
return lowerBoundService.predictLowerBound(type, timeOffsetSeconds)
}
fun isValid(): Boolean = isUpstreamValid.get()

4
src/main/kotlin/io/emeraldpay/dshackle/upstream/lowerbound/LowerBoundDetector.kt
View File

@@ -64,7 +64,7 @@ abstract class LowerBoundDetector(
lowerBoundSink.emitNext(LowerBoundData(lowerBound, type)) { _, res -> res == Sinks.EmitResult.FAIL_NON_SERIALIZED }
}
fun predictLowerBound(type: LowerBoundType): Long {
return lowerBounds.predictNextBound(type)
fun predictLowerBound(type: LowerBoundType, timeOffsetSeconds: Long): Long {
return lowerBounds.predictNextBound(type, timeOffsetSeconds)
}
}

4
src/main/kotlin/io/emeraldpay/dshackle/upstream/lowerbound/LowerBoundService.kt
View File

@@ -33,10 +33,10 @@ abstract class LowerBoundService(
.forEach { it.updateLowerBound(lowerBound, type) }
}
fun predictLowerBound(type: LowerBoundType): Long {
fun predictLowerBound(type: LowerBoundType, timeOffsetSeconds: Long): Long {
return detectors
.firstOrNull { it.types().contains(type) }
?.predictLowerBound(type)
?.predictLowerBound(type, timeOffsetSeconds)
?: 0
}

10
src/main/kotlin/io/emeraldpay/dshackle/upstream/lowerbound/LowerBounds.kt
View File

@@ -67,16 +67,10 @@ class LowerBounds(
}
}
fun predictNextBound(type: LowerBoundType): Long {
val offset = if (chain == Chain.BSC__MAINNET && type == LowerBoundType.STATE) {
30
} else {
0
}.toLong()
fun predictNextBound(type: LowerBoundType, timeOffsetSeconds: Long): Long {
val lowerBoundCoeffs = lowerBounds[type] ?: return 0
val xTime = Instant.now().plus(offset, ChronoUnit.SECONDS).epochSecond
val xTime = Instant.now().plus(timeOffsetSeconds, ChronoUnit.SECONDS).epochSecond
return (lowerBoundCoeffs.k.get() * xTime + lowerBoundCoeffs.b.get()).roundToLong()
}