MOB462 Expose marginUsage from isolated positions

dydxprotocol · Apr 29, 2024 · 04f53b6 · 04f53b6
1 parent 7d3a873
commit 04f53b6
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 116 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -49,7 +49,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.6.50"
+version = "1.6.51"
 
 repositories {
     google()

diff --git a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AccountCalculator.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AccountCalculator.kt
@@ -129,6 +129,10 @@ class AccountCalculator(val parser: ParserProtocol, private val useParentSubacco
                 "freeCollateral",
                 childSubaccount["freeCollateral"],
             )
+            modifiedChildOpenPosition?.safeSet(
+                "marginUsage",
+                childSubaccount["marginUsage"],
+            )
             modifiedChildOpenPosition?.safeSet("equity", childSubaccount["equity"])
             modifiedOpenPositions.safeSet(market, modifiedChildOpenPosition)
         }

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/output/Account.kt b/src/commonMain/kotlin/exchange.dydx.abacus/output/Account.kt
@@ -250,6 +250,7 @@ data class SubaccountPosition(
     val resources: SubaccountPositionResources,
     val childSubaccountNumber: Int?,
     val freeCollateral: TradeStatesWithDoubleValues?,
+    val marginUsage: TradeStatesWithDoubleValues?,
     val quoteBalance: TradeStatesWithDoubleValues?, // available for isolated market position
     val equity: TradeStatesWithDoubleValues?, // available for isolated market position
 ) {
@@ -365,6 +366,11 @@ data class SubaccountPosition(
                         parser,
                         parser.asMap(data["freeCollateral"]),
                     )
+                    val marginUsage = TradeStatesWithDoubleValues.create(
+                        null,
+                        parser,
+                        parser.asMap(data["marginUsage"]),
+                    )
                     val quoteBalance = TradeStatesWithDoubleValues.create(
                         null,
                         parser,
@@ -400,6 +406,7 @@ data class SubaccountPosition(
                         existing.resources !== resources ||
                         existing.childSubaccountNumber !== childSubaccountNumber ||
                         existing.freeCollateral !== freeCollateral ||
+                        existing.marginUsage !== marginUsage ||
                         existing.quoteBalance !== quoteBalance ||
                         existing.equity !== equity
                     ) {
@@ -430,6 +437,7 @@ data class SubaccountPosition(
                             resources,
                             childSubaccountNumber,
                             freeCollateral,
+                            marginUsage,
                             quoteBalance,
                             equity,
                         )

diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/payload/v4/V4ParentSubaccountTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/payload/v4/V4ParentSubaccountTests.kt
@@ -223,6 +223,9 @@ class V4ParentSubaccountTests : V4BaseTests(true) {
                                             },
                                             "freeCollateral": {
                                                 "current": 796.244
+                                            },
+                                            "marginUsage": {
+                                                "current": 0.0397
                                             }
                                         }
                                     },

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