Fix subaccount data issue with websocket reconnect (#753)

dydxprotocol · Nov 14, 2024 · b4025ff · b4025ff
1 parent 4d4e1fb
commit b4025ff
Show file tree

Hide file tree

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

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/OrderbookProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/OrderbookProcessor.kt
@@ -77,7 +77,7 @@ internal class OrderbookProcessor(
     ): InternalMarketState {
         this.groupingMultiplier = groupingMultiplier
         existing.groupedOrderbook = calculator.calculate(
-            rawOrderbook = existing.rawOrderbook,
+            rawOrderbook = existing.consolidatedOrderbook,
             tickSize = tickSize ?: defaultTickSize,
             groupingMultiplier = groupingMultiplier,
         )
@@ -105,7 +105,7 @@ internal class OrderbookProcessor(
             rawOrderbook = existing.rawOrderbook,
         )
         existing.groupedOrderbook = calculator.calculate(
-            rawOrderbook = existing.rawOrderbook,
+            rawOrderbook = existing.consolidatedOrderbook,
             tickSize = tickSize ?: defaultTickSize,
             groupingMultiplier = groupingMultiplier,
         )

diff --git a/...commonMain/kotlin/exchange.dydx.abacus/processor/wallet/account/V4SubaccountsProcessor.kt b/...commonMain/kotlin/exchange.dydx.abacus/processor/wallet/account/V4SubaccountsProcessor.kt
@@ -46,7 +46,7 @@ internal class V4SubaccountsProcessor(
         payload: List<Any>?,
     ): MutableMap<Int, InternalSubaccountState> {
         return if (payload != null) {
-            internalState.clear()
+            val modifiedSubaccountNumbers = mutableListOf<Int>()
             for (item in payload) {
                 val data = parser.asNativeMap(item)
                 if (data != null) {
@@ -62,9 +62,16 @@ internal class V4SubaccountsProcessor(
                             firstTime = true,
                         )
                         internalState[subaccountNumber] = subaccount
+                        modifiedSubaccountNumbers.add(subaccountNumber)
                     }
                 }
             }
+            val keys = internalState.keys.toSet()
+            for (key in keys) {
+                if (!modifiedSubaccountNumbers.contains(key)) {
+                    internalState.remove(key)
+                }
+            }
             internalState
         } else {
             internalState

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.13.28'
+    spec.version                  = '1.13.29'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''