Merge branch 'main' into mulan-testing

dydxprotocol · Apr 22, 2024 · 58bc0e3 · 58bc0e3
2 parents 4095ce2 + 5525080
commit 58bc0e3
Show file tree

Hide file tree

Showing 15 changed files with 1,624 additions and 147 deletions.
diff --git a/.github/workflows/SpotlessCheck.yml b/.github/workflows/SpotlessCheck.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,37 @@
+name: CI
+
+on: 
+  pull_request:
+    paths:
+      - '**/*.kt'
+
+jobs:
+  spotless:
+    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: spotless
+      run: |
+        ./gradlew spotlessCheck
+
+  detekt:
+    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: detekt
+        run: |
+          ./gradlew detektMetadataMain
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,6 +17,7 @@ plugins {
     id("maven-publish")
     id("dev.petuska.npm.publish") version "3.4.2"
     id("com.diffplug.spotless") version "6.25.0"
+    id("io.gitlab.arturbosch.detekt") version("1.23.3")
 }
 
 allprojects {
@@ -48,7 +49,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.6.41"
+version = "1.6.42"
 
 repositories {
     google()
@@ -174,6 +175,13 @@ kotlin {
     }
 }
 
+detekt {
+    toolVersion = "1.23.3"
+    config.setFrom(file("detekt.yml"))
+    baseline = file("detekt-baseline.xml")
+    buildUponDefaultConfig = true
+}
+
 npmPublish {
     organization.set("dydxprotocol")
     readme.set(rootDir.resolve("README.md"))

diff --git a/detekt-baseline.xml b/detekt-baseline.xml
diff --git a/detekt.yml b/detekt.yml
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AccountTransformer.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AccountTransformer.kt
@@ -13,7 +13,8 @@ class AccountTransformer() {
         market: Map<String, Any>?,
         parser: ParserProtocol,
         period: String,
-        usePessimisticCollateralCheck: Boolean
+        usePessimisticCollateralCheck: Boolean,
+        useOptimisticCollateralCheck: Boolean
     ): Map<String, Any>? {
         val modified = account?.mutable() ?: return null
         val subaccount = if (subaccountNumber != null) {
@@ -27,7 +28,15 @@ class AccountTransformer() {
             null
         }
         val modifiedSubaccount =
-            subaccountTransformer.applyTradeToSubaccount(subaccount, trade, market, parser, period, usePessimisticCollateralCheck)
+            subaccountTransformer.applyTradeToSubaccount(
+                subaccount,
+                trade,
+                market,
+                parser,
+                period,
+                usePessimisticCollateralCheck,
+                useOptimisticCollateralCheck,
+            )
         modified.safeSet("subaccounts.$subaccountNumber", modifiedSubaccount)
         return modified
     }

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/SubaccountTransformer.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/SubaccountTransformer.kt
@@ -29,15 +29,22 @@ internal class SubaccountTransformer {
         limitPrice: Double?,
         isBuying: Boolean,
         usePessimisticPrice: Boolean,
+        useOptimisticPrice: Boolean,
     ): Double? {
-        if (usePessimisticPrice) {
-            oraclePrice?.let { oraclePrice ->
-                limitPrice?.let { limitPrice ->
+        oraclePrice?.let { oraclePrice ->
+            limitPrice?.let { limitPrice ->
+                if (usePessimisticPrice) {
                     return if (isBuying) {
                         max(oraclePrice, limitPrice)
                     } else {
                         min(oraclePrice, limitPrice)
                     }
+                } else if (useOptimisticPrice) {
+                    return if (isBuying) {
+                        min(oraclePrice, limitPrice)
+                    } else {
+                        max(oraclePrice, limitPrice)
+                    }
                 }
             }
         }
@@ -49,6 +56,7 @@ internal class SubaccountTransformer {
         trade: Map<String, Any>,
         market: Map<String, Any>?,
         usePessimisticCollateralCheck: Boolean,
+        useOptimisticCollateralCheck: Boolean,
     ): Map<String, Any>? {
         val marketId = parser.asString(trade["marketId"])
         val side = parser.asString(trade["side"])
@@ -64,6 +72,7 @@ internal class SubaccountTransformer {
                             originalPrice,
                             side == "BUY",
                             usePessimisticCollateralCheck,
+                            useOptimisticCollateralCheck,
                         )
                     } ?: originalPrice
                     val size = (
@@ -196,10 +205,17 @@ internal class SubaccountTransformer {
         market: Map<String, Any>?,
         parser: ParserProtocol,
         period: String,
-        usePessimisticCollateralCheck: Boolean
+        usePessimisticCollateralCheck: Boolean,
+        useOptimisticCollateralCheck: Boolean,
     ): Map<String, Any>? {
         if (subaccount != null) {
-            val delta = deltaFromTrade(parser, trade, market, usePessimisticCollateralCheck)
+            val delta = deltaFromTrade(
+                parser,
+                trade,
+                market,
+                usePessimisticCollateralCheck,
+                useOptimisticCollateralCheck,
+            )
             return applyDeltaToSubaccount(subaccount, delta, parser, period)
         }
         return subaccount

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/TradeInputCalculator.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/TradeInputCalculator.kt
@@ -118,6 +118,7 @@ internal class TradeInputCalculator(
                     parser,
                     "postOrder",
                     featureFlags.usePessimisticCollateralCheck,
+                    featureFlags.useOptimisticCollateralCheck,
                 ),
             )
             modified

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/Enviroment.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/Enviroment.kt
@@ -103,6 +103,7 @@ data class EnvironmentLinks(
 data class EnvironmentFeatureFlags(
     val reduceOnlySupported: Boolean,
     val usePessimisticCollateralCheck: Boolean,
+    val useOptimisticCollateralCheck: Boolean,
     val withdrawalSafetyEnabled: Boolean,
 ) {
     companion object {
@@ -112,11 +113,13 @@ data class EnvironmentFeatureFlags(
         ): EnvironmentFeatureFlags {
             val reduceOnlySupported = parser.asBool(data?.get("reduceOnlySupported")) ?: false
             val usePessimisticCollateralCheck = parser.asBool(data?.get("usePessimisticCollateralCheck")) ?: false
+            val useOptimisticCollateralCheck = parser.asBool(data?.get("useOptimisticCollateralCheck")) ?: false
             val withdrawalSafetyEnabled = parser.asBool(data?.get("withdrawalSafetyEnabled")) ?: false
 
             return EnvironmentFeatureFlags(
                 reduceOnlySupported,
                 usePessimisticCollateralCheck,
+                useOptimisticCollateralCheck,
                 withdrawalSafetyEnabled,
             )
         }