Fix issue of gas token not setting after validator is reconnected (#692)

dydxprotocol · Oct 1, 2024 · e13a869 · e13a869
1 parent 8c2c7a5
commit e13a869
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,7 +52,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.12.9"
+version = "1.12.10"
 
 repositories {
     google()

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/functional/vault/VaultAccount.kt b/src/commonMain/kotlin/exchange.dydx.abacus/functional/vault/VaultAccount.kt
@@ -24,7 +24,15 @@ data class VaultAccount(
     val vaultTransfers: IList<VaultTransfer>?,
     val totalVaultTransfersCount: Int?,
     val vaultShareUnlocks: IList<VaultShareUnlock>?,
-)
+) {
+    val shareValue: Double?
+        get() =
+            if (balanceShares != null && balanceUsdc != null && balanceShares > 0) {
+                balanceUsdc / balanceShares
+            } else {
+                null
+            }
+}
 
 @JsExport
 @Serializable

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/functional/vault/VaultDepositWithdrawForm.kt b/src/commonMain/kotlin/exchange.dydx.abacus/functional/vault/VaultDepositWithdrawForm.kt
@@ -216,12 +216,11 @@ object VaultDepositWithdrawFormValidator {
         vaultAccount: VaultAccount?,
         amount: Double
     ): Double {
-        if (vaultAccount?.balanceUsdc == null || vaultAccount.balanceUsdc == 0.0 ||
-            vaultAccount.balanceShares == null || vaultAccount.balanceShares == 0.0
-        ) {
+        val shareValue = vaultAccount?.shareValue ?: 0.0
+        if (shareValue == 0.0) {
             return 0.0
         }
-        return (amount / (vaultAccount.balanceUsdc / vaultAccount.balanceShares)).toLong().toDouble()
+        return (amount / shareValue).toLong().toDouble()
     }
 
     fun validateVaultForm(
@@ -236,11 +235,7 @@ object VaultDepositWithdrawFormValidator {
         // Calculate post-operation values and slippage
         val amount = formData.amount ?: 0.0
 
-        val shareValue = if (vaultAccount?.balanceUsdc != null && vaultAccount.balanceShares != null && vaultAccount.balanceShares > 0) {
-            vaultAccount.balanceUsdc / vaultAccount.balanceShares
-        } else {
-            null
-        }
+        val shareValue = vaultAccount?.shareValue
         val sharesToAttemptWithdraw = if (amount > 0 && shareValue != null && shareValue > 0) {
             // shares must be whole numbers
             floor(amount / shareValue)

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/manager/AsyncAbacusStateManagerV2.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/manager/AsyncAbacusStateManagerV2.kt
@@ -452,6 +452,7 @@ class AsyncAbacusStateManagerV2(
                 dataNotification = dataNotification,
                 presentationProtocol = presentationProtocol,
             )
+            adaptor?.gasToken = gasToken
             pushNotificationToken?.let { token ->
                 adaptor?.registerPushNotification(token, pushNotificationLanguageCode)
             }

diff --git a/v4_abacus.podspec b/v4_abacus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-    spec.version                  = '1.12.9'
+    spec.version                  = '1.12.10'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''