Predict next bound offset (#691)

* predictLowerBound with offset

* remove method predictLowerBound without offset

* bump emerald submodule

src/main/kotlin/io/emeraldpay/dshackle/upstream/DefaultUpstream.kt

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

src/main/kotlin/io/emeraldpay/dshackle/upstream/Multistream.kt

@@ -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
     }
 

src/main/kotlin/io/emeraldpay/dshackle/upstream/Selector.kt

@@ -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 {

src/main/kotlin/io/emeraldpay/dshackle/upstream/Upstream.kt

@@ -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
 

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

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

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

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

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

@@ -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
     }
 

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

@@ -67,16 +67,10 @@ class LowerBounds(
         }
     }
 
-    fun predictNextBound(type: LowerBoundType): Long {
+    fun predictNextBound(type: LowerBoundType, timeOffsetSeconds: Long): Long {
-        val offset = if (chain == Chain.BSC__MAINNET && type == LowerBoundType.STATE) {
-            30
-        } else {
-            0
-        }.toLong()
-
         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()
     }

src/test/kotlin/io/emeraldpay/dshackle/upstream/SelectorTest.kt

@@ -225,7 +225,7 @@ class SelectorTest {
         expected: MatchesResponse,
     ) {
         val up = mock<Upstream> {
-            on { predictLowerBound(LowerBoundType.STATE) } doReturn predicted
+            on { predictLowerBound(LowerBoundType.STATE, 0) } doReturn predicted
         }
         val matcher = Selector.LowerHeightMatcher(lowerHeight, LowerBoundType.STATE)
 

src/test/kotlin/io/emeraldpay/dshackle/upstream/lowerbound/LowerBoundServiceTest.kt

@@ -15,15 +15,15 @@ class LowerBoundServiceTest {
     @Test
     fun `predict lower bound`() {
         val detector = mock<LowerBoundDetector> {
-            on { predictLowerBound(LowerBoundType.STATE) } doReturn 4000
+            on { predictLowerBound(LowerBoundType.STATE, 0) } doReturn 4000
             on { types() } doReturn setOf(LowerBoundType.STATE)
         }
         val boundService = LowerBoundServiceMock(mock<Upstream>(), listOf(detector))
 
-        val bound = boundService.predictLowerBound(LowerBoundType.STATE)
+        val bound = boundService.predictLowerBound(LowerBoundType.STATE, 0)
 
         verify(detector).types()
-        verify(detector).predictLowerBound(LowerBoundType.STATE)
+        verify(detector).predictLowerBound(LowerBoundType.STATE, 0)
 
         assertThat(bound).isEqualTo(4000)
     }
@@ -35,10 +35,10 @@ class LowerBoundServiceTest {
         }
         val boundService = LowerBoundServiceMock(mock<Upstream>(), listOf(detector))
 
-        val bound = boundService.predictLowerBound(LowerBoundType.BLOCK)
+        val bound = boundService.predictLowerBound(LowerBoundType.BLOCK, 0)
 
         verify(detector).types()
-        verify(detector, never()).predictLowerBound(any())
+        verify(detector, never()).predictLowerBound(any(), any())
 
         assertThat(bound).isEqualTo(0)
     }

src/test/kotlin/io/emeraldpay/dshackle/upstream/lowerbound/LowerBoundsPredictionTest.kt

@@ -16,7 +16,7 @@ class LowerBoundsPredictionTest {
         lowerBounds.updateBound(newLowerBound)
 
         val lastBound = lowerBounds.getLastBound(LowerBoundType.STATE)
-        val predictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE)
+        val predictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE, 0)
         val allBounds = lowerBounds.getAllBounds(LowerBoundType.STATE)
 
         assertThat(lastBound).isEqualTo(newLowerBound)
@@ -29,7 +29,7 @@ class LowerBoundsPredictionTest {
         val lowerBounds = LowerBounds(Chain.ETHEREUM__MAINNET)
 
         val lastBound = lowerBounds.getLastBound(LowerBoundType.STATE)
-        val predictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE)
+        val predictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE, 0)
         val allBounds = lowerBounds.getAllBounds(LowerBoundType.STATE)
 
         assertThat(lastBound).isNull()
@@ -46,7 +46,7 @@ class LowerBoundsPredictionTest {
         lowerBounds.updateBound(newLowerBound)
 
         val lastBound = lowerBounds.getLastBound(LowerBoundType.STATE)
-        val predictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE)
+        val predictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE, 0)
         val allBounds = lowerBounds.getAllBounds(LowerBoundType.STATE)
 
         assertThat(lastBound).isEqualTo(newLowerBound)
@@ -56,7 +56,7 @@ class LowerBoundsPredictionTest {
         lowerBounds.updateBound(nextNewLowerBound)
 
         val newLastBound = lowerBounds.getLastBound(LowerBoundType.STATE)
-        val newPredictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE)
+        val newPredictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE, 0)
         val newAllBounds = lowerBounds.getAllBounds(LowerBoundType.STATE)
 
         assertThat(newLastBound).isEqualTo(nextNewLowerBound)
@@ -73,7 +73,7 @@ class LowerBoundsPredictionTest {
         lowerBounds.updateBound(LowerBoundData(100000L, 1000, LowerBoundType.STATE))
 
         val lastBound = lowerBounds.getLastBound(LowerBoundType.STATE)
-        val predictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE)
+        val predictedNextBound = lowerBounds.predictNextBound(LowerBoundType.STATE, 0)
         val allBounds = lowerBounds.getAllBounds(LowerBoundType.STATE)
 
         assertThat(lastBound).isEqualTo(newLowerBound)
@@ -162,7 +162,7 @@ class LowerBoundsPredictionTest {
         lowerBounds.updateBound(lowerBound3)
 
         assertThat(lowerBounds.getLastBound(LowerBoundType.STATE)).isEqualTo(lowerBound3)
-        assertThat(lowerBounds.predictNextBound(LowerBoundType.STATE)).isEqualTo(15060L)
+        assertThat(lowerBounds.predictNextBound(LowerBoundType.STATE, 0)).isEqualTo(15060L)
         assertThat(lowerBounds.getAllBounds(LowerBoundType.STATE)).isEqualTo(listOf(lowerBound1, lowerBound2, lowerBound3))
     }
 
@@ -178,7 +178,7 @@ class LowerBoundsPredictionTest {
         lowerBounds.updateBound(lowerBound2)
         lowerBounds.updateBound(lowerBound3)
 
-        val predicted = lowerBounds.predictNextBound(LowerBoundType.STATE)
+        val predicted = lowerBounds.predictNextBound(LowerBoundType.STATE, 0)
 
         assertThat(predicted)
             .isLessThan(37996030)
@@ -193,7 +193,7 @@ class LowerBoundsPredictionTest {
 
         lowerBounds.updateBound(lowerBound1)
 
-        val predicted = lowerBounds.predictNextBound(LowerBoundType.STATE)
+        val predicted = lowerBounds.predictNextBound(LowerBoundType.STATE, 0)
 
         assertThat(predicted)
             .isLessThan(37996030)