From 6744e2241c25d30c3ce9a070f27253d0e2e70d09 Mon Sep 17 00:00:00 2001
From: Andrey Bronin <AndreyBronin@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:53:17 +0300
Subject: [PATCH] eth_simulateV1 detector fix (#648)

* eth_simulateV1 detector fix

* remove reth node from detect, fix test
---
 .../dshackle/upstream/UpstreamRpcMethodsDetector.kt         | 2 +-
 .../upstream/ethereum/BasicEthUpstreamRpcMethodsDetector.kt | 2 +-
 .../ethereum/BasicEthUpstreamRpcMethodsDetectorTest.kt      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/UpstreamRpcMethodsDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/UpstreamRpcMethodsDetector.kt
index 215f3faf..f4f36f33 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/UpstreamRpcMethodsDetector.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/UpstreamRpcMethodsDetector.kt
@@ -25,7 +25,7 @@ abstract class UpstreamRpcMethodsDetector(
     private val availableRegexps =
         listOf(
             "missing value for required argument ([0-9]+)",
-            "Invalid params",
+//            "Invalid params", // todo: uncomment when reth node issue will be fixed
         ).map { s -> s.toRegex() }
 
     open fun detectRpcMethods(): Mono<Map<String, Boolean>> = detectByMagicMethod().switchIfEmpty(detectByMethod())
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/BasicEthUpstreamRpcMethodsDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/BasicEthUpstreamRpcMethodsDetector.kt
index bf81b4ed..cb6f1ceb 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/BasicEthUpstreamRpcMethodsDetector.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/BasicEthUpstreamRpcMethodsDetector.kt
@@ -34,7 +34,7 @@ class BasicEthUpstreamRpcMethodsDetector(
         setOf(
             "eth_getBlockReceipts" to ListParams("latest"),
             "trace_callMany" to ListParams(listOf(listOf<Any>())),
-            "eth_simulateV1" to ListParams(listOf(listOf<Any>())),
+            "eth_simulateV1" to ListParams(listOf()),
         )
 
     private fun parseRpcModules(data: ByteArray): Map<String, Boolean> {
diff --git a/src/test/kotlin/io/emeraldpay/dshackle/upstream/ethereum/BasicEthUpstreamRpcMethodsDetectorTest.kt b/src/test/kotlin/io/emeraldpay/dshackle/upstream/ethereum/BasicEthUpstreamRpcMethodsDetectorTest.kt
index f183b22e..ed2ca409 100644
--- a/src/test/kotlin/io/emeraldpay/dshackle/upstream/ethereum/BasicEthUpstreamRpcMethodsDetectorTest.kt
+++ b/src/test/kotlin/io/emeraldpay/dshackle/upstream/ethereum/BasicEthUpstreamRpcMethodsDetectorTest.kt
@@ -49,7 +49,7 @@ class BasicEthUpstreamRpcMethodsDetectorTest {
                         ),
                     )
                 on {
-                    read(ChainRequest("eth_simulateV1", ListParams(listOf(listOf<Any>()))))
+                    read(ChainRequest("eth_simulateV1", ListParams(listOf())))
                 } doReturn
                     Mono.just(
                         ChainResponse(
@@ -107,7 +107,7 @@ class BasicEthUpstreamRpcMethodsDetectorTest {
                         ),
                     )
                 on {
-                    read(ChainRequest("eth_simulateV1", ListParams(listOf(listOf<Any>()))))
+                    read(ChainRequest("eth_simulateV1", ListParams(listOf())))
                 } doReturn
                     Mono.just(
                         ChainResponse(
@@ -166,7 +166,7 @@ class BasicEthUpstreamRpcMethodsDetectorTest {
                         ),
                     )
                 on {
-                    read(ChainRequest("eth_simulateV1", ListParams(listOf(listOf<Any>()))))
+                    read(ChainRequest("eth_simulateV1", ListParams(listOf())))
                 } doReturn
                     Mono.just(
                         ChainResponse(