merge

dydxprotocol · Jun 1, 2024 · 6d3550a · 6d3550a
2 parents ead2243 + 19de38d
commit 6d3550a
Show file tree

Hide file tree

Showing 26 changed files with 307 additions and 218 deletions.
diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -51,7 +51,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.7.45"
+version = "1.7.47"
 
 repositories {
     google()

diff --git a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...get Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-input-files.xcfilelist b/...get Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-input-files.xcfilelist
diff --git a/...et Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-output-files.xcfilelist b/...et Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-output-files.xcfilelist
diff --git a/...t Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-input-files.xcfilelist b/...t Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-input-files.xcfilelist
diff --git a/... Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-output-files.xcfilelist b/... Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-output-files.xcfilelist
diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh
diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig
diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.release.xcconfig b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.release.xcconfig
diff --git a/...on/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.debug.xcconfig b/...on/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.debug.xcconfig
diff --git a/.../iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.release.xcconfig b/.../iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.release.xcconfig
diff --git a/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig b/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig
diff --git a/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig b/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt
@@ -98,7 +98,7 @@ internal class AdjustIsolatedMarginInputCalculator(val parser: ParserProtocol) {
         val crossMarginUsage = parentSubaccount?.get("marginUsage")
         val openPositions = parser.asNativeMap(childSubaccount?.get("openPositions"))
         val marketId = openPositions?.keys?.firstOrNull()
-        val positionMargin = childSubaccount?.get("freeCollateral")
+        val positionMargin = childSubaccount?.get("equity")
         val positionLeverage = parser.value(childSubaccount, "openPositions.$marketId.leverage")
         val liquidationPrice = parser.value(childSubaccount, "openPositions.$marketId.liquidationPrice")
 

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/AsyncAbacusStateManager.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/AsyncAbacusStateManager.kt
@@ -114,6 +114,7 @@ class AsyncAbacusStateManager(
                 value?.historicalPnlPeriod = historicalPnlPeriod
                 value?.candlesResolution = candlesResolution
                 value?.readyToConnect = readyToConnect
+                value?.cosmosWalletConnected = cosmosWalletConnected
                 field = value
             }
         }
@@ -144,6 +145,14 @@ class AsyncAbacusStateManager(
             }
         }
 
+    override var cosmosWalletConnected: Boolean? = false
+        set(value) {
+            field = value
+            ioImplementations.threading?.async(ThreadingType.abacus) {
+                adaptor?.cosmosWalletConnected = field
+            }
+        }
+
     override var sourceAddress: String? = null
         set(value) {
             field = value
@@ -251,27 +260,37 @@ class AsyncAbacusStateManager(
     }
 
     private fun load(configFile: ConfigFile) {
-        val path = configFile.path
-        if (appConfigs.loadRemote) {
-            loadFromRemoteConfigFile(configFile)
-            val configFileUrl = "$deploymentUri$path"
-            ioImplementations.rest?.get(configFileUrl, null, callback = { response, httpCode, _ ->
-                if (success(httpCode) && response != null) {
-                    if (parse(response, configFile)) {
-                        writeToLocalFile(response, path)
-                    }
-                }
-            })
-        } else {
-            loadFromBundledLocalConfigFile(configFile)
+        ioImplementations.threading?.async(ThreadingType.network) {
+            val path = configFile.path
+            if (appConfigs.loadRemote) {
+                loadFromRemoteConfigFile(configFile)
+                val configFileUrl = "$deploymentUri$path"
+                ioImplementations.rest?.get(
+                    configFileUrl,
+                    null,
+                    callback = { response, httpCode, _ ->
+                        ioImplementations.threading?.async(ThreadingType.abacus) {
+                            if (success(httpCode) && response != null) {
+                                if (parse(response, configFile)) {
+                                    writeToLocalFile(response, path)
+                                }
+                            }
+                        }
+                    },
+                )
+            } else {
+                loadFromBundledLocalConfigFile(configFile)
+            }
         }
     }
 
     private fun loadFromRemoteConfigFile(configFile: ConfigFile) {
         ioImplementations.fileSystem?.readCachedTextFile(
             configFile.path,
         )?.let {
-            parse(it, configFile)
+            ioImplementations.threading?.async(ThreadingType.abacus) {
+                parse(it, configFile)
+            }
         }
     }
 
@@ -280,7 +299,9 @@ class AsyncAbacusStateManager(
             FileLocation.AppBundle,
             configFile.path,
         )?.let {
-            parse(it, configFile)
+            ioImplementations.threading?.async(ThreadingType.abacus) {
+                parse(it, configFile)
+            }
         }
     }
 
@@ -300,10 +321,12 @@ class AsyncAbacusStateManager(
     }
 
     private fun writeToLocalFile(response: String, file: String) {
-        ioImplementations.fileSystem?.writeTextFile(
-            file,
-            response,
-        )
+        ioImplementations.threading?.async(ThreadingType.network) {
+            ioImplementations.fileSystem?.writeTextFile(
+                file,
+                response,
+            )
+        }
     }
 
     private fun parseDocumentation(response: String) {

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/AsyncAbacusStateManagerProtocol.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/AsyncAbacusStateManagerProtocol.kt
@@ -96,6 +96,7 @@ interface AsyncAbacusStateManagerSingletonProtocol {
     var sourceAddress: String?
     var subaccountNumber: Int
     var market: String?
+    var cosmosWalletConnected: Boolean?
 }
 
 @JsExport

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt
@@ -196,6 +196,8 @@ open class StateManagerAdaptor(
             }
         }
 
+    var cosmosWalletConnected: Boolean? = false
+
     private var accountAddressTimer: LocalTimerProtocol? = null
         set(value) {
             if (field !== value) {

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt
@@ -508,6 +508,9 @@ class V4StateManagerAdaptor(
     }
 
     private fun pollNobleBalance() {
+        if (cosmosWalletConnected == true) {
+            return
+        }
         val timer = ioImplementations.timer ?: CoroutineTimer.instance
         nobleBalancesTimer = timer.schedule(0.0, nobleBalancePollingDuration) {
             if (validatorConnected && accountAddress != null) {

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine.kt
@@ -920,24 +920,46 @@ open class TradingStateMachine(
             "trade" -> {
                 val trade = parser.asNativeMap(input["trade"]) ?: return null
                 val type = parser.asString(trade["type"]) ?: return null
+                val isolatedMargin = parser.asString(trade["marginMode"]) == "ISOLATED"
                 return when (type) {
                     "MARKET", "STOP_MARKET", "TAKE_PROFIT_MARKET", "TRAILING_STOP" -> {
-                        listOf(
-                            ReceiptLine.BuyingPower.rawValue,
-                            ReceiptLine.MarginUsage.rawValue,
-                            ReceiptLine.ExpectedPrice.rawValue,
-                            ReceiptLine.Fee.rawValue,
-                            ReceiptLine.Reward.rawValue,
-                        )
+                        if (isolatedMargin) {
+                            listOf(
+                                ReceiptLine.ExpectedPrice.rawValue,
+                                ReceiptLine.LiquidationPrice.rawValue,
+                                ReceiptLine.PositionMargin.rawValue,
+                                ReceiptLine.PositionLeverage.rawValue,
+                                ReceiptLine.Fee.rawValue,
+                                ReceiptLine.Reward.rawValue,
+                            )
+                        } else {
+                            listOf(
+                                ReceiptLine.BuyingPower.rawValue,
+                                ReceiptLine.MarginUsage.rawValue,
+                                ReceiptLine.ExpectedPrice.rawValue,
+                                ReceiptLine.Fee.rawValue,
+                                ReceiptLine.Reward.rawValue,
+                            )
+                        }
                     }
 
                     else -> {
-                        listOf(
-                            ReceiptLine.BuyingPower.rawValue,
-                            ReceiptLine.MarginUsage.rawValue,
-                            ReceiptLine.Fee.rawValue,
-                            ReceiptLine.Reward.rawValue,
-                        )
+                        if (isolatedMargin) {
+                            listOf(
+                                ReceiptLine.LiquidationPrice.rawValue,
+                                ReceiptLine.PositionMargin.rawValue,
+                                ReceiptLine.PositionLeverage.rawValue,
+                                ReceiptLine.Fee.rawValue,
+                                ReceiptLine.Reward.rawValue,
+                            )
+                        } else {
+                            listOf(
+                                ReceiptLine.BuyingPower.rawValue,
+                                ReceiptLine.MarginUsage.rawValue,
+                                ReceiptLine.Fee.rawValue,
+                                ReceiptLine.Reward.rawValue,
+                            )
+                        }
                     }
                 }
             }