Add logging to ConnectNetwork calls and default to the first validato…

…r url
dydxprotocol · Sep 17, 2024 · d670cac · d670cac
1 parent 99b5731
commit d670cac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,7 +52,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.11.8"
+version = "1.11.9"
 
 repositories {
     google()

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/ConnectionsSupervisor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/ConnectionsSupervisor.kt
@@ -103,6 +103,7 @@ internal class ConnectionsSupervisor(
             indexerConfig = null
             validatorConnected = false
             socketConnected = false
+            validatorUrl = null
             disconnectSocket()
         }
     }
@@ -189,7 +190,9 @@ internal class ConnectionsSupervisor(
             validatorUrl = endpointUrls?.firstOrNull()
         }
         findOptimalNode { url ->
-            this.validatorUrl = url
+            if (url != this.validatorUrl) {
+                this.validatorUrl = url
+            }
         }
     }
 
@@ -271,7 +274,7 @@ internal class ConnectionsSupervisor(
                                 val error = json["error"]
                                 if (error != null) {
                                     tracking(
-                                        eventName = "ConnectionNetworkFailed",
+                                        eventName = "ConnectNetworkFailed",
                                         params = iMapOf(
                                             "errorMessage" to helper.parser.asString(error),
                                         ),
@@ -280,7 +283,7 @@ internal class ConnectionsSupervisor(
                                 callback(error == null)
                             } else {
                                 tracking(
-                                    eventName = "ConnectionNetworkFailed",
+                                    eventName = "ConnectNetworkFailed",
                                     params = iMapOf(
                                         "errorMessage" to "Invalid response: $response",
                                     ),
@@ -291,7 +294,7 @@ internal class ConnectionsSupervisor(
                     } else {
                         helper.ioImplementations.threading?.async(ThreadingType.main) {
                             tracking(
-                                eventName = "ConnectionNetworkFailed",
+                                eventName = "ConnectNetworkFailed",
                                 params = iMapOf(
                                     "errorMessage" to "null response",
                                 ),
@@ -398,6 +401,7 @@ internal class ConnectionsSupervisor(
             val timer = helper.ioImplementations.timer ?: CoroutineTimer.instance
             chainTimer = timer.schedule(serverPollingDuration, null) {
                 if (readyToConnect) {
+                    validatorUrl = null
                     bestEffortConnectChain()
                 }
                 false

diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/v2/V4HeightTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/v2/V4HeightTests.kt
@@ -140,7 +140,7 @@ class V4HeightTests {
 
         // Halting Indexer
         for (i in 0..10) {
-            // This causes 10x same height from validatorsh
+            // This causes 10x same height from validator
             stateManager.readyToConnect = false
             testRest?.setResponse(
                 "https://indexer.v4staging.dydx.exchange/v4/height",

diff --git a/v4_abacus.podspec b/v4_abacus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-    spec.version                  = '1.11.8'
+    spec.version                  = '1.11.9'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''