Rewrite eth_syncing handling for ethereum networks

drpcorg · Jun 17, 2024 · 46e48f4 · 46e48f4
1 parent 96f7969
commit 46e48f4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 150 deletions.
diff --git a/foundation/src/main/resources/chains.yaml b/foundation/src/main/resources/chains.yaml
@@ -213,8 +213,6 @@ chain-settings:
       settings:
         expected-block-time: 2.7s
         allow-pruning-requirement: true
-        options:
-          disable-validation: true
         lags:
           syncing: 40
           lagging: 20
@@ -240,8 +238,6 @@ chain-settings:
       settings:
         expected-block-time: 260ms
         allow-pruning-requirement: true
-        options:
-          disable-validation: true
         lags:
           syncing: 40
           lagging: 20
@@ -358,7 +354,6 @@ chain-settings:
         allow-pruning-requirement: true
         options:
           validate-peers: false
-          validate-syncing: false
         lags:
           syncing: 10
           lagging: 5
@@ -1271,7 +1266,6 @@ chain-settings:
       settings:
         options:
           validate-peers: false
-          validate-syncing: false
         fork-choice: quorum
         expected-block-time: 300ms
         lags:

diff --git a/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/SyncingJson.java b/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/SyncingJson.java
diff --git a/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/SyncingJsonDeserializer.java b/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/SyncingJsonDeserializer.java
diff --git a/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/SyncingJsonSerializer.java b/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/SyncingJsonSerializer.java
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt
@@ -30,7 +30,6 @@ import io.emeraldpay.dshackle.upstream.UpstreamAvailability
 import io.emeraldpay.dshackle.upstream.ValidateUpstreamSettingsResult
 import io.emeraldpay.dshackle.upstream.ethereum.domain.Address
 import io.emeraldpay.dshackle.upstream.ethereum.hex.HexData
-import io.emeraldpay.dshackle.upstream.ethereum.json.SyncingJson
 import io.emeraldpay.dshackle.upstream.ethereum.json.TransactionCallJson
 import io.emeraldpay.dshackle.upstream.rpcclient.ListParams
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory
@@ -58,7 +57,15 @@ open class EthereumUpstreamValidator @JvmOverloads constructor(
     override fun validateSyncingRequest(): ValidateSyncingRequest {
         return ValidateSyncingRequest(
             ChainRequest("eth_syncing", ListParams()),
-        ) { bytes -> objectMapper.readValue(bytes, SyncingJson::class.java).isSyncing }
+        ) { bytes ->
+            val raw = Global.objectMapper.readTree(bytes)
+            if (raw.isBoolean) {
+                raw.asBoolean()
+            } else {
+                log.warn("Received syncing object ${raw.toPrettyString()} for upstream ${upstream.getId()}")
+                true
+            }
+        }
     }
 
     override fun validatePeersRequest(): ValidatePeersRequest {