fix: staking delegations static typed correctly (#750)

dydxprotocol · Nov 13, 2024 · 137d3ee · 137d3ee
1 parent 22b670d
commit 137d3ee
Show file tree

Hide file tree

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

diff --git a/...tlin/exchange.dydx.abacus/processor/wallet/account/staking/AccountDelegationsProcessor.kt b/...tlin/exchange.dydx.abacus/processor/wallet/account/staking/AccountDelegationsProcessor.kt
@@ -58,9 +58,9 @@ internal class AccountDelegationsProcessor(
         return if (payload != null) {
             val modified = mutableListOf<InternalStakingDelegationState>()
             for (item in payload.delegationResponses ?: emptyList()) {
-                val validator = parser.asString(item.validatorAddress)
-                val delegator = parser.asString(item.delegatorAddress)
-                val shares = parser.asDecimal(item.shares)
+                val validator = parser.asString(item.delegation?.validatorAddress)
+                val delegator = parser.asString(item.delegation?.delegatorAddress)
+                val shares = parser.asDecimal(item.delegation?.shares)
                 val amount = parser.asDecimal(item.balance?.amount)
                 val denom = parser.asString(item.balance?.denom)
                 if (amount != null && denom != null) {

diff --git a/src/commonMain/kotlin/indexer/models/chain/OnChainDelegationResponse.kt b/src/commonMain/kotlin/indexer/models/chain/OnChainDelegationResponse.kt
@@ -10,10 +10,15 @@ data class OnChainDelegationResponse(
 
 @Serializable
 data class OnChainDelegationObject(
+    val delegation: OnChainDelegationInfo? = null,
+    val balance: OnChainAccountBalanceObject? = null,
+)
+
+@Serializable
+data class OnChainDelegationInfo(
     val delegatorAddress: String? = null,
     val validatorAddress: String? = null,
     val shares: String? = null,
-    val balance: OnChainAccountBalanceObject? = null,
 )
 
 @Serializable

diff --git a/...exchange.dydx.abacus/processor/wallet/account/staking/AccountDelegationsProcessorTests.kt b/...exchange.dydx.abacus/processor/wallet/account/staking/AccountDelegationsProcessorTests.kt
@@ -4,6 +4,7 @@ import com.ionspin.kotlin.bignum.decimal.toBigDecimal
 import exchange.dydx.abacus.state.internalstate.InternalAccountBalanceState
 import exchange.dydx.abacus.utils.Parser
 import indexer.models.chain.OnChainAccountBalanceObject
+import indexer.models.chain.OnChainDelegationInfo
 import indexer.models.chain.OnChainDelegationObject
 import indexer.models.chain.OnChainDelegationResponse
 import kotlin.test.Test
@@ -14,27 +15,33 @@ class AccountDelegationsProcessorTests {
         internal val payloadMock: OnChainDelegationResponse = OnChainDelegationResponse(
             delegationResponses = listOf(
                 OnChainDelegationObject(
-                    delegatorAddress = "delegatorAddress",
-                    validatorAddress = "validatorAddress",
-                    shares = null,
+                    delegation = OnChainDelegationInfo(
+                        delegatorAddress = "delegatorAddress",
+                        validatorAddress = "validatorAddress",
+                        shares = null,
+                    ),
                     balance = OnChainAccountBalanceObject(
                         denom = "denom",
                         amount = "100.0",
                     ),
                 ),
                 OnChainDelegationObject(
-                    delegatorAddress = "delegatorAddress",
-                    validatorAddress = "validatorAddress",
-                    shares = null,
+                    delegation = OnChainDelegationInfo(
+                        delegatorAddress = "delegatorAddress",
+                        validatorAddress = "validatorAddress",
+                        shares = null,
+                    ),
                     balance = OnChainAccountBalanceObject(
                         denom = "denom",
                         amount = "300.0",
                     ),
                 ),
                 OnChainDelegationObject(
-                    delegatorAddress = "delegatorAddress",
-                    validatorAddress = "validatorAddress",
-                    shares = null,
+                    delegation = OnChainDelegationInfo(
+                        delegatorAddress = "delegatorAddress",
+                        validatorAddress = "validatorAddress",
+                        shares = null,
+                    ),
                     balance = OnChainAccountBalanceObject(
                         denom = "denom1",
                         amount = "200.0",

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.13.25'
+    spec.version                  = '1.13.26'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''