TRCL-3706 Static Typing: Fixing isolated margin position update

dydxprotocol · Nov 8, 2024 · c61c083 · c61c083
1 parent 338b6e6
commit c61c083
Show file tree

Hide file tree

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

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/V2/SubaccountCalculatorV2.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/V2/SubaccountCalculatorV2.kt
@@ -419,7 +419,7 @@ internal class SubaccountCalculatorV2(
                             val marginMode = position.marginMode
                             when (marginMode) {
                                 MarginMode.Isolated -> {
-                                    val equity = subaccount.equity
+                                    val equity = subaccount.calculated[period]?.equity
                                     calculated.marginValue = equity
                                 }
 

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/functional/vault/Vault.kt b/src/commonMain/kotlin/exchange.dydx.abacus/functional/vault/Vault.kt
@@ -259,13 +259,13 @@ object VaultCalculator {
         val assetPositionsMap = assetPosition?.let { mapOf((it.symbol ?: "") to it) }
         val subaccount = subaccountCalculator.calculate(
             subaccount = InternalSubaccountState(
-                equity = equity ?: 0.0,
                 assetPositions = assetPositionsMap,
                 openPositions = perpetualPosition?.let { mapOf((it.market ?: "") to it) },
                 subaccountNumber = 0,
                 calculated = mutableMapOf(
                     CalculationPeriod.current to
                         InternalSubaccountCalculated(
+                            equity = equity,
                             quoteBalance = subaccountCalculator.calculateQuoteBalance(
                                 assetPositionsMap,
                             ),

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/input/TradeInputProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/input/TradeInputProcessor.kt
@@ -317,7 +317,7 @@ internal class TradeInputProcessor(
 
         if (existingPosition != null) {
             trade.marginMode =
-                if (subaccount?.equity != null) MarginMode.Isolated else MarginMode.Cross
+                if (subaccount?.calculated?.get(CalculationPeriod.current)?.equity != null) MarginMode.Isolated else MarginMode.Cross
             val currentPositionLeverage =
                 existingPosition.calculated[CalculationPeriod.current]?.leverage?.abs()
             val positionLeverage =

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessor.kt
@@ -184,9 +184,9 @@ internal class MarketProcessor(
         payload: List<String>,
         period: IndexerSparklineTimePeriod,
     ): PerpetualMarket? {
+        cachedIndexerSparklines[marketId] = payload.mapNotNull { parser.asDouble(it) }.reversed()
         when (period) {
             IndexerSparklineTimePeriod.ONEDAY -> {
-                cachedIndexerSparklines[marketId] = payload.mapNotNull { parser.asDouble(it) }.reversed()
                 return createPerpetualMarket(marketId)
             }
             IndexerSparklineTimePeriod.SEVENDAYS -> {

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/wallet/account/SubaccountProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/wallet/account/SubaccountProcessor.kt
@@ -120,8 +120,8 @@ internal open class SubaccountProcessor(
         )
 
         val subaccountCalculated = state.calculated[CalculationPeriod.current] ?: InternalSubaccountCalculated()
-        state.calculated[CalculationPeriod.current] = subaccountCalculated
         subaccountCalculated.quoteBalance = subaccountCalculator.calculateQuoteBalance(state.assetPositions)
+        state.calculated[CalculationPeriod.current] = subaccountCalculated
 
         val fills = parser.asTypedList<IndexerFillResponseObject>(content["fills"])
         state = processFills(
@@ -231,8 +231,11 @@ internal open class SubaccountProcessor(
         existing.subaccountNumber = subaccountNumber
         existing.address = payload.address
 
-        existing.equity = parser.asDouble(payload.equity)
-        existing.freeCollateral = parser.asDouble(payload.freeCollateral)
+        val calculated = existing.calculated[CalculationPeriod.current] ?: InternalSubaccountCalculated()
+        calculated.equity = parser.asDouble(payload.equity)
+        calculated.freeCollateral = parser.asDouble(payload.freeCollateral)
+        existing.calculated[CalculationPeriod.current] = calculated
+
         existing.marginEnabled = payload.marginEnabled
         existing.updatedAtHeight = payload.updatedAtHeight
         existing.latestProcessedBlockHeight = payload.latestProcessedBlockHeight
@@ -251,8 +254,8 @@ internal open class SubaccountProcessor(
         }
 
         val subaccountCalculated = existing.calculated[CalculationPeriod.current] ?: InternalSubaccountCalculated()
-        existing.calculated[CalculationPeriod.current] = subaccountCalculated
         subaccountCalculated.quoteBalance = subaccountCalculator.calculateQuoteBalance(existing.assetPositions)
+        existing.calculated[CalculationPeriod.current] = subaccountCalculated
 
         return existing
     }

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/internalstate/InternalState.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/internalstate/InternalState.kt
@@ -305,8 +305,6 @@ internal data class InternalSubaccountState(
     var assetPositions: Map<String, InternalAssetPositionState>? = null,
     var subaccountNumber: Int,
     var address: String? = null,
-    var equity: Double? = null,
-    var freeCollateral: Double? = null,
     var marginEnabled: Boolean? = null,
     var updatedAtHeight: String? = null,
     var latestProcessedBlockHeight: String? = null,
@@ -332,8 +330,6 @@ internal data class InternalSubaccountState(
             assetPositions = assetPositions?.map { it.key to it.value.copy() }?.toMap(),
             subaccountNumber = subaccountNumber,
             address = address,
-            equity = equity,
-            freeCollateral = freeCollateral,
             marginEnabled = marginEnabled,
             updatedAtHeight = updatedAtHeight,
             latestProcessedBlockHeight = latestProcessedBlockHeight,

diff --git a/...hange.dydx.abacus/state/manager/notification/providers/BlockRewardNotificationProvider.kt b/...hange.dydx.abacus/state/manager/notification/providers/BlockRewardNotificationProvider.kt
@@ -1,5 +1,6 @@
 package exchange.dydx.abacus.state.manager.notification.providers
 
+import com.ionspin.kotlin.bignum.decimal.toBigDecimal
 import exchange.dydx.abacus.output.Notification
 import exchange.dydx.abacus.output.NotificationPriority
 import exchange.dydx.abacus.output.NotificationType
@@ -52,7 +53,7 @@ class BlockRewardNotificationProvider(
         token: String,
     ): Notification? {
         val blockHeight = blockReward.createdAtHeight
-        val blockRewardAmount = blockReward.tradingReward
+        val blockRewardAmount = blockReward.tradingReward.toBigDecimal().toPlainString()
         val params = iMapOf(
             "BLOCK_REWARD_HEIGHT" to blockHeight,
             "TOKEN_NAME" to token,

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