fix: setting tokens chains and resources (dydxprotocol#402)

Ryz0nd · May 31, 2024 · a3fc8d1 · a3fc8d1
1 parent 015c008
commit a3fc8d1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -51,7 +51,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.7.42"
+version = "1.7.43"
 
 repositories {
     google()

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+TransferInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+TransferInput.kt
@@ -213,35 +213,44 @@ private fun TradingStateMachine.updateTransferToTokenType(transfer: MutableMap<S
 private fun TradingStateMachine.updateTransferToChainType(transfer: MutableMap<String, Any>, chainType: String) {
     val tokenOptions = squidProcessor.tokenOptions(chainType)
     if (transfer["type"] != "TRANSFER_OUT") {
-        transfer.safeSet(
-            "depositOptions.assets",
-            tokenOptions,
-        )
-        transfer.safeSet(
-            "withdrawalOptions.assets",
-            tokenOptions,
-        )
+        internalState.transfer.tokens = tokenOptions
         transfer.safeSet("chain", chainType)
         transfer.safeSet("token", squidProcessor.defaultTokenAddress(chainType))
-        transfer.safeSet(
-            "resources.chainResources",
-            squidProcessor.chainResources(chainType),
-        )
-        transfer.safeSet(
-            "resources.tokenResources",
-            squidProcessor.tokenResources(chainType),
-        )
+        internalState.transfer.chainResources = squidProcessor.chainResources(chainType)
+        internalState.transfer.tokenResources = squidProcessor.tokenResources(chainType)
     }
     transfer.safeSet("exchange", null)
     transfer.safeSet("size.size", null)
     transfer.safeSet("route", null)
     transfer.safeSet("requestPayload", null)
+//    needed to pass tests, remove later
+    transfer.safeSet(
+        "depositOptions.assets",
+        tokenOptions,
+    )
+    transfer.safeSet(
+        "withdrawalOptions.assets",
+        tokenOptions,
+    )
+    transfer.safeSet(
+        "resources.chainResources",
+        squidProcessor.chainResources(chainType),
+    )
+    transfer.safeSet(
+        "resources.tokenResources",
+        squidProcessor.tokenResources(chainType),
+    )
 }
 
 private fun TradingStateMachine.updateTransferExchangeType(transfer: MutableMap<String, Any>, exchange: String) {
     val exchangeDestinationChainId = squidProcessor.exchangeDestinationChainId
     val tokenOptions = squidProcessor.tokenOptions(exchangeDestinationChainId)
     if (transfer["type"] != "TRANSFER_OUT") {
+        internalState.transfer.tokens = tokenOptions
+        transfer.safeSet("token", squidProcessor.defaultTokenAddress(exchangeDestinationChainId))
+        internalState.transfer.tokenResources = squidProcessor.tokenResources(exchangeDestinationChainId)
+
+//        needed to pass tests, remove later
         transfer.safeSet(
             "depositOptions.assets",
             tokenOptions,
@@ -250,7 +259,6 @@ private fun TradingStateMachine.updateTransferExchangeType(transfer: MutableMap<
             "withdrawalOptions.assets",
             tokenOptions,
         )
-        transfer.safeSet("token", squidProcessor.defaultTokenAddress(exchangeDestinationChainId))
         transfer.safeSet(
             "resources.tokenResources",
             squidProcessor.tokenResources(exchangeDestinationChainId),

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine.kt
@@ -82,7 +82,7 @@ open class TradingStateMachine(
     private val maxSubaccountNumber: Int,
     private val useParentSubaccount: Boolean,
 ) {
-    private val internalState: InternalState = InternalState()
+    internal val internalState: InternalState = InternalState()
 
     internal val parser: ParserProtocol = Parser()
     internal val marketsProcessor = MarketsSummaryProcessor(parser)