Making percentDiff 0..100 instead of 0..1 for TP/SL (#296)

dydxprotocol · Apr 9, 2024 · 5f0fdf8 · 5f0fdf8
1 parent 9334057
commit 5f0fdf8
Show file tree

Hide file tree

Showing 21 changed files with 273 additions and 201 deletions.
diff --git a/.github/workflows/SpotlessCheck.yml b/.github/workflows/SpotlessCheck.yml
@@ -0,0 +1,24 @@
+name: SpotlessCheck
+
+on: 
+  pull_request:
+    paths:
+      - '**/*.kt'
+
+jobs:
+  spotlessCheck:
+    runs-on: macos-latest
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'adopt'
+
+    - name: Lint Kotlin Files
+      run: |
+        ./gradlew spotlessCheck
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -48,7 +48,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.6.35"
+version = "1.6.36"
 
 repositories {
     google()

diff --git a/integration/iOS/Podfile.lock b/integration/iOS/Podfile.lock
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "~/v4-abacus"
 
 SPEC CHECKSUMS:
-  abacus: a57d55b0ca0d3514389573a87c47507f88eb6b0a
+  abacus: 46f62be6dc9b3f888093eb2c9952d0267ab40670
   CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6
 
 PODFILE CHECKSUM: 37d72c15b180e62a4c42b8fb41b4836c89aa63c9
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2
diff --git a/integration/iOS/Pods/Local Podspecs/abacus.podspec.json b/integration/iOS/Pods/Local Podspecs/abacus.podspec.json
diff --git a/integration/iOS/Pods/Manifest.lock b/integration/iOS/Pods/Manifest.lock
diff --git a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig
diff --git a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig
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/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AccountCalculator.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AccountCalculator.kt
@@ -219,11 +219,14 @@ class AccountCalculator(val parser: ParserProtocol, private val useParentSubacco
         // Just in case it has more than one market, we will create
         // two separate pending positions.
 
-        val mergedOrders = ParsingHelper.merge(parser.asNativeMap(
-            parser.value(parentSubaccount, "orders"),
-        ), parser.asNativeMap(
-            parser.value(childSubaccount, "orders"),
-        ))
+        val mergedOrders = ParsingHelper.merge(
+            parser.asNativeMap(
+                parser.value(parentSubaccount, "orders"),
+            ),
+            parser.asNativeMap(
+                parser.value(childSubaccount, "orders"),
+            ),
+        )
 
         val modifiedParentSubaccount = parentSubaccount.toMutableMap()
         modifiedParentSubaccount.safeSet(

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/TriggerOrdersInputCalculator.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/TriggerOrdersInputCalculator.kt
@@ -102,7 +102,7 @@ internal class TriggerOrdersInputCalculator(val parser: ParserProtocol) {
         if (entryPrice != null) {
             val triggerPrice = parser.asDouble(parser.value(modified, "triggerPrice"))
             val usdcDiff = parser.asDouble(parser.value(modified, "usdcDiff"))
-            val percentDiff = parser.asDouble(parser.value(modified, "percentDiff"))
+            val percentDiff = parser.asDouble(parser.value(modified, "percentDiff"))?.let { it / 100.0 }
 
             when (inputType) {
                 "stopLossOrder.price.triggerPrice" -> {
@@ -118,8 +118,8 @@ internal class TriggerOrdersInputCalculator(val parser: ParserProtocol) {
                         modified.safeSet(
                             "percentDiff",
                             when (positionSide) {
-                                "long" -> leverage.times(size.times(entryPrice.minus(triggerPrice))).div(notionalTotal)
-                                "short" -> leverage.times(size.times(triggerPrice.minus(entryPrice))).div(notionalTotal)
+                                "long" -> leverage.times(size.times(entryPrice.minus(triggerPrice))).div(notionalTotal).times(100)
+                                "short" -> leverage.times(size.times(triggerPrice.minus(entryPrice))).div(notionalTotal).times(100)
                                 else -> null
                             },
                         )
@@ -138,8 +138,8 @@ internal class TriggerOrdersInputCalculator(val parser: ParserProtocol) {
                         modified.safeSet(
                             "percentDiff",
                             when (positionSide) {
-                                "long" -> leverage.times(size.times(triggerPrice.minus(entryPrice))).div(notionalTotal)
-                                "short" -> leverage.times(size.times(entryPrice.minus(triggerPrice))).div(notionalTotal)
+                                "long" -> leverage.times(size.times(triggerPrice.minus(entryPrice))).div(notionalTotal).times(100)
+                                "short" -> leverage.times(size.times(entryPrice.minus(triggerPrice))).div(notionalTotal).times(100)
                                 else -> null
                             },
                         )
@@ -157,7 +157,7 @@ internal class TriggerOrdersInputCalculator(val parser: ParserProtocol) {
                         )
                         modified.safeSet(
                             "percentDiff",
-                            leverage.times(usdcDiff).div(notionalTotal),
+                            leverage.times(usdcDiff).div(notionalTotal).times(100),
                         )
                     }
                 }
@@ -173,7 +173,7 @@ internal class TriggerOrdersInputCalculator(val parser: ParserProtocol) {
                         )
                         modified.safeSet(
                             "percentDiff",
-                            leverage.times(usdcDiff).div(notionalTotal),
+                            leverage.times(usdcDiff).div(notionalTotal).times(100),
                         )
                     }
                 }

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/output/Account.kt b/src/commonMain/kotlin/exchange.dydx.abacus/output/Account.kt
@@ -659,7 +659,7 @@ data class SubaccountOrder(
             Logger.d { "creating Account Order\n" }
             data?.let {
                 // TODO: Remove default to 0 for subaccountNumber once new indexer response is consumed. Prevents breaking change
-                val subaccountNumber = parser.asInt(data["subaccountNumber"])?: 0
+                val subaccountNumber = parser.asInt(data["subaccountNumber"]) ?: 0
                 val id = parser.asString(data["id"])
                 val clientId = parser.asInt(data["clientId"])
                 val marketId = parser.asString(data["marketId"])

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt
@@ -1,6 +1,13 @@
 package exchange.dydx.abacus.state.manager
 
-import exchange.dydx.abacus.output.*
+import exchange.dydx.abacus.output.Compliance
+import exchange.dydx.abacus.output.ComplianceStatus
+import exchange.dydx.abacus.output.Notification
+import exchange.dydx.abacus.output.PerpetualState
+import exchange.dydx.abacus.output.Restriction
+import exchange.dydx.abacus.output.SubaccountOrder
+import exchange.dydx.abacus.output.TransferRecordType
+import exchange.dydx.abacus.output.UsageRestriction
 import exchange.dydx.abacus.output.input.OrderType
 import exchange.dydx.abacus.output.input.TradeInputGoodUntil
 import exchange.dydx.abacus.output.input.TriggerOrder
@@ -1965,9 +1972,13 @@ open class StateManagerAdaptor(
         val currentHeight = calculateCurrentHeight()
 
         val goodTilBlock =
-            if (isShortTermOrder(trade.type.rawValue, trade.timeInForce)) currentHeight?.plus(
-                SHORT_TERM_ORDER_DURATION
-            ) else null
+            if (isShortTermOrder(trade.type.rawValue, trade.timeInForce)) {
+                currentHeight?.plus(
+                    SHORT_TERM_ORDER_DURATION,
+                )
+            } else {
+                null
+            }
 
         return HumanReadablePlaceOrderPayload(
             subaccountNumber,
@@ -2034,7 +2045,7 @@ open class StateManagerAdaptor(
             timeInForce,
             execution,
             goodTilTimeInSeconds,
-            goodTilBlock
+            goodTilBlock,
         )
     }
 
@@ -2387,10 +2398,8 @@ open class StateManagerAdaptor(
     }
 
     open fun complianceCheck() {
-
     }
 
-
     open fun complianceScreen(address: String) {
         val url = complianceScreenUrl(address)
         if (url != null) {

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt
@@ -1,7 +1,6 @@
 package exchange.dydx.abacus.state.manager
 
 import exchange.dydx.abacus.output.UsageRestriction
-import exchange.dydx.abacus.output.input.OrderTimeInForce
 import exchange.dydx.abacus.output.input.TransferType
 import exchange.dydx.abacus.protocols.AnalyticsEvent
 import exchange.dydx.abacus.protocols.DataNotificationProtocol
@@ -150,9 +149,6 @@ class V4StateManagerAdaptor(
             }
         }
 
-    @Suppress("PropertyName")
-    private val MAX_NUM_BLOCK_DELAY = 15
-
     private var lastValidatorCallTime: Instant? = null
 
     override fun didSetSocketConnected(socketConnected: Boolean) {
@@ -991,7 +987,7 @@ class V4StateManagerAdaptor(
                     transactionType,
                     transactionPayloadString,
                     transactionCallback,
-                    onSubmitTransaction
+                    onSubmitTransaction,
                 ),
             )
         } else {
@@ -1022,8 +1018,8 @@ class V4StateManagerAdaptor(
                         PlaceOrderRecord(
                             subaccountNumber,
                             clientId,
-                            submitTimeMs
-                        )
+                            submitTimeMs,
+                        ),
                     )
                 }
             },
@@ -1042,10 +1038,14 @@ class V4StateManagerAdaptor(
                 send(
                     error,
                     callback,
-                    if (isTriggerOrder) HumanReadableTriggerOrdersPayload(
-                        listOf(payload),
-                        emptyList(),
-                    ) else payload
+                    if (isTriggerOrder) {
+                        HumanReadableTriggerOrdersPayload(
+                            listOf(payload),
+                            emptyList(),
+                        )
+                    } else {
+                        payload
+                    },
                 )
             },
             useTransactionQueue = !isShortTermOrder(payload.type, payload.timeInForce),
@@ -1099,10 +1099,14 @@ class V4StateManagerAdaptor(
                 send(
                     error,
                     callback,
-                    if (isTriggerOrder) HumanReadableTriggerOrdersPayload(
-                        emptyList(),
-                        listOf(payload),
-                    ) else payload
+                    if (isTriggerOrder) {
+                        HumanReadableTriggerOrdersPayload(
+                            emptyList(),
+                            listOf(payload),
+                        )
+                    } else {
+                        payload
+                    },
                 )
             },
             useTransactionQueue = !isShortTermOrder,
@@ -1116,7 +1120,7 @@ class V4StateManagerAdaptor(
         val uiClickTimeMs = Clock.System.now().toEpochMilliseconds().toDouble()
         tracking(
             if (isCancel) AnalyticsEvent.TradeCancelOrderClick.rawValue else AnalyticsEvent.TradePlaceOrderClick.rawValue,
-            analyticsPayload
+            analyticsPayload,
         )
         return uiClickTimeMs
     }
@@ -1186,7 +1190,7 @@ class V4StateManagerAdaptor(
             val analyticsPayload = analyticsUtils.formatPlaceOrderPayload(
                 it,
                 isClosePosition = false,
-                fromSlTpDialog = true
+                fromSlTpDialog = true,
             )
             submitPlaceOrder(callback, it, analyticsPayload, true)
         }
@@ -1632,4 +1636,9 @@ class V4StateManagerAdaptor(
         accountBalancesTimer?.cancel()
         accountBalancesTimer = null
     }
+
+    companion object {
+        @Suppress("PropertyName")
+        private const val MAX_NUM_BLOCK_DELAY = 15
+    }
 }
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/utils/Settings.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/utils/Settings.kt
@@ -5,9 +5,9 @@ import kotlinx.serialization.Serializable
 
 @JsExport
 class AppConfigs(
-    val subscribeToCandles: Boolean,
-    val loadRemote: Boolean = true,
-    val enableLogger: Boolean = false,
+    var subscribeToCandles: Boolean,
+    var loadRemote: Boolean = true,
+    var enableLogger: Boolean = false,
 ) {
     enum class SquidVersion {
         V1,

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/Configs.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/Configs.kt
@@ -187,9 +187,9 @@ class AppConfigsV2(
     val systemConfigs: SystemConfigs,
     val marketConfigs: MarketsConfigs,
     val accountConfigs: AccountConfigs,
-    val onboardingConfigs: OnboardingConfigs,
-    val loadRemote: Boolean = true,
-    val enableLogger: Boolean = false,
+    var onboardingConfigs: OnboardingConfigs,
+    var loadRemote: Boolean = true,
+    var enableLogger: Boolean = false,
 ) {
     companion object {
         val forApp = AppConfigsV2(