draft/wip/do not review

build.gradle.kts

@@ -52,7 +52,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.9.6"
+version = "1.9.11"
 
 repositories {
     google()

src/commonMain/kotlin/exchange.dydx.abacus/calculator/MarginCalculator.kt

@@ -776,8 +776,7 @@ internal object MarginCalculator {
 
         // Cap targetLeverage to 98% of max leverage
         val adjustedTargetLeverage = if (maxLeverageForMarket != null) {
-            val cappedLeverage = maxLeverageForMarket * MAX_LEVERAGE_BUFFER_PERCENT
-            min(targetLeverage, cappedLeverage)
+            maxLeverageForMarket * MAX_LEVERAGE_BUFFER_PERCENT
         } else {
             null
         }

src/commonMain/kotlin/exchange.dydx.abacus/calculator/SubaccountCalculator.kt

@@ -6,6 +6,7 @@ import exchange.dydx.abacus.utils.Numeric
 import exchange.dydx.abacus.utils.mutable
 import exchange.dydx.abacus.utils.safeSet
 import kotlin.math.max
+import exchange.dydx.abacus.utils.Logger
 
 internal enum class CalculationPeriod(val rawValue: String) {
     current("current"),

src/commonMain/kotlin/exchange.dydx.abacus/calculator/V2/TradeInput/TradeInputOptionsCalculator.kt

@@ -229,7 +229,7 @@ internal class TradeInputOptionsCalculator(
             options.postOnlyTooltip = buildToolTip(postOnlyPromptFromTrade(trade.type))
         }
 
-        options.needsTargetLeverage = trade.marginMode == MarginMode.Isolated
+        options.needsTargetLeverage = false
 
         return options
     }

src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+TradeInput.kt

@@ -104,6 +104,7 @@ internal fun TradingStateMachine.tradeInMarket(
     }
 
     val input = this.input?.mutable() ?: mutableMapOf()
+
     if (parser.asString(parser.value(input, "trade.marketId")) == marketId) {
         if (parser.asString(parser.value(input, "current")) == "trade") {
             return StateResponse(state, StateChanges(iListOf()), null)

src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine.kt

@@ -91,6 +91,7 @@ import kotlinx.serialization.json.jsonObject
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.time.Duration.Companion.days
+import exchange.dydx.abacus.output.input.MarginMode
 
 @Suppress("UNCHECKED_CAST")
 @JsExport
@@ -1070,11 +1071,17 @@ open class TradingStateMachine(
                                 val marketId =
                                     parser.asString(parser.value(modified, "trade.marketId"))
                                 if (subaccountNumber != null && marketId != null) {
+                                    val marginMode = parser.asString(parser.value(modified, "marginMode"))?.let { MarginMode.invoke(it) }
+                                    val subaccount = if (marginMode == MarginMode.Cross) {
+                                        parser.asNativeMap(parser.value(this.account, "subaccounts.$subaccountNumber"))
+                                    } else {
+                                        parser.asNativeMap(parser.value(this.account, "groupedSubaccounts.$subaccountNumber"))
+                                    }
                                     val leverage =
                                         parser.asDouble(
                                             parser.value(
-                                                this.account,
-                                                "subaccounts.$subaccountNumber.openPositions.$marketId.leverage.postOrder",
+                                                subaccount,
+                                                "openPositions.$marketId.leverage.postOrder",
                                             ),
                                         )
                                     modified.safeSet("trade.size.leverage", leverage)

v4_abacus.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-    spec.version = '1.9.6'
+    spec.version = '1.9.11'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''