From 381b2d57e03cce2cd45abea896704775722cdf3f Mon Sep 17 00:00:00 2001
From: "roderik.eth" <roderik@settlemint.com>
Date: Fri, 6 May 2022 14:15:02 +0200
Subject: [PATCH] fix: WS connections do not honor disable-validation

---
 .../upstream/ethereum/EthereumWsUpstream.kt        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsUpstream.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsUpstream.kt
index 2a4a24d4..c9ddb32b 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsUpstream.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsUpstream.kt
@@ -20,6 +20,7 @@ import io.emeraldpay.dshackle.reader.Reader
 import io.emeraldpay.dshackle.startup.QuorumForLabels
 import io.emeraldpay.dshackle.upstream.Head
 import io.emeraldpay.dshackle.upstream.Upstream
+import io.emeraldpay.dshackle.upstream.UpstreamAvailability
 import io.emeraldpay.dshackle.upstream.calls.CallMethods
 import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcRequest
 import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcResponse
@@ -104,9 +105,16 @@ class EthereumWsUpstream(
         connection.connect()
         head.start()
 
-        log.debug("Start validation for upstream ${this.getId()}")
-        validatorSubscription = validator.start()
-            .subscribe(this::setStatus)
+        if (getOptions().disableValidation != null && getOptions().disableValidation!!) {
+            log.warn("Disable validation for upstream ${this.getId()}")
+            this.setLag(0)
+            this.setStatus(UpstreamAvailability.OK)
+        } else {
+            log.debug("Start validation for upstream ${this.getId()}")
+            val validator = EthereumUpstreamValidator(this, getOptions())
+            validatorSubscription = validator.start()
+                .subscribe(this::setStatus)
+        }
     }
 
     override fun stop() {