In case empty selector in SubscribeNative we should use default dynam…

…ic merged head. (emeraldpay#172)
jit-strategies · Mar 19, 2023 · a47607d · a47607d
1 parent 064a3e4
commit a47607d
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum_pos/EthereumPosMultiStream.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum_pos/EthereumPosMultiStream.kt
@@ -158,21 +158,29 @@ open class EthereumPosMultiStream(
     }
 
     override fun getHead(mather: Selector.Matcher): Head =
-        filteredHeads.computeIfAbsent(mather.describeInternal().intern()) { _ ->
-            upstreams.filter { mather.matches(it) }
-                .apply {
-                    log.debug("Found $size upstreams matching [${mather.describeInternal()}]")
-                }
-                .let {
-                    val selected = it.map { it.getHead() }
-                    when (it.size) {
-                        0 -> EmptyHead()
-                        1 -> selected.first()
-                        else -> MergedHead(selected, PriorityForkChoice(), "ETH head for ${it.map { it.getId() }}").apply {
-                            start()
+        if (mather == Selector.empty) {
+            head
+        } else {
+            filteredHeads.computeIfAbsent(mather.describeInternal().intern()) { _ ->
+                upstreams.filter { mather.matches(it) }
+                    .apply {
+                        log.debug("Found $size upstreams matching [${mather.describeInternal()}]")
+                    }
+                    .let {
+                        val selected = it.map { it.getHead() }
+                        when (it.size) {
+                            0 -> EmptyHead()
+                            1 -> selected.first()
+                            else -> MergedHead(
+                                selected,
+                                PriorityForkChoice(),
+                                "ETH head for ${it.map { it.getId() }}"
+                            ).apply {
+                                start()
+                            }
                         }
                     }
-                }
+            }
         }
 
     override fun getFeeEstimation(): ChainFees {