Fix proxy newHeads sub (#446)

emeraldpay · Mar 29, 2024 · 2bedcad · 2bedcad
1 parent 7e9709b
commit 2bedcad
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/proxy/WebsocketHandler.kt b/src/main/kotlin/io/emeraldpay/dshackle/proxy/WebsocketHandler.kt
@@ -139,7 +139,12 @@ class WebsocketHandler(
                     val responses = nativeSubscribe
                         .subscribe(blockchain, methodParams.first, methodParams.second, io.emeraldpay.dshackle.upstream.Selector.empty)
                         .map { event ->
-                            WsSubscriptionResponse(params = WsSubscriptionData(event, subscriptionId))
+                            val data = if (event is ByteArray) {
+                                Global.objectMapper.readTree(event)
+                            } else {
+                                event
+                            }
+                            WsSubscriptionResponse(params = WsSubscriptionData(data, subscriptionId))
                         }
                         .takeUntilOther(currentControl.asMono())
                     Flux.concat(Mono.just(start), responses)