Skip to content

Commit cb2b396

Browse files
authored
feat: CUDOS Manifest balance breakdown (#405)
1 parent 39cc68d commit cb2b396

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

app/upgrade_cudos.go

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,14 @@ func writeMovedBalancesToManifest(genesisData *GenesisData, manifest *UpgradeMan
243243
if delegations, exists := genesisData.Delegations.Get(address); exists {
244244
bondedBalance := sdk.Coins{}
245245
for i := range delegations.Iterate() {
246-
_, delegatedAmount := i.Key, i.Value
246+
validatorOperatorAddr, delegatedAmount := i.Key, i.Value
247247
delegatedBalance := sdk.NewCoin(genesisData.BondDenom, delegatedAmount)
248248
bondedBalance = bondedBalance.Add(delegatedBalance)
249+
upgradeBalance.BondedStakingBalances = append(upgradeBalance.BondedStakingBalances, ValidatorBalance{Validator: validatorOperatorAddr, Balance: sdk.NewCoins(delegatedBalance)})
249250
}
251+
250252
upgradeBalance.BondedStakingBalancesAggr = bondedBalance
253+
// Bonded balance is part of the bank balance in this case, so we need to subtract it
251254
upgradeBalance.BankBalance = upgradeBalance.BankBalance.Sub(bondedBalance)
252255
}
253256

@@ -280,9 +283,12 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
280283
if delegations, exists := genesisData.Delegations.Get(address); exists {
281284
totalBalance := sdk.Coins{}
282285
for i := range delegations.Iterate() {
283-
_, delegatedAmount := i.Key, i.Value
286+
validatorOperatorAddr, delegatedAmount := i.Key, i.Value
284287
delegatedBalance := sdk.NewCoin(genesisData.BondDenom, delegatedAmount)
285288
totalBalance = totalBalance.Add(delegatedBalance)
289+
290+
upgradeBalance.BondedStakingBalances = append(upgradeBalance.BondedStakingBalances, ValidatorBalance{Validator: validatorOperatorAddr, Balance: sdk.NewCoins(delegatedBalance)})
291+
286292
}
287293
upgradeBalance.BondedStakingBalancesAggr = totalBalance
288294
}
@@ -291,9 +297,10 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
291297
if delegations, exists := genesisData.UnbondingDelegations.Get(address); exists {
292298
totalBalance := sdk.Coins{}
293299
for i := range delegations.Iterate() {
294-
_, delegatedAmount := i.Key, i.Value
300+
validatorOperatorAddr, delegatedAmount := i.Key, i.Value
295301
delegatedBalance := sdk.NewCoin(genesisData.BondDenom, delegatedAmount)
296302
totalBalance = totalBalance.Add(delegatedBalance)
303+
upgradeBalance.UnbondingStakingBalances = append(upgradeBalance.UnbondingStakingBalances, ValidatorBalance{Validator: validatorOperatorAddr, Balance: sdk.NewCoins(delegatedBalance)})
297304
}
298305
upgradeBalance.UnbondingStakingBalancesAggr = totalBalance
299306
}
@@ -302,9 +309,11 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
302309
if delegations, exists := genesisData.UnbondedDelegations.Get(address); exists {
303310
totalBalance := sdk.Coins{}
304311
for i := range delegations.Iterate() {
305-
_, delegatedAmount := i.Key, i.Value
312+
validatorOperatorAddr, delegatedAmount := i.Key, i.Value
306313
delegatedBalance := sdk.NewCoin(genesisData.BondDenom, delegatedAmount)
307314
totalBalance = totalBalance.Add(delegatedBalance)
315+
upgradeBalance.UnbondedStakingBalances = append(upgradeBalance.UnbondedStakingBalances, ValidatorBalance{Validator: validatorOperatorAddr, Balance: sdk.NewCoins(delegatedBalance)})
316+
308317
}
309318
upgradeBalance.UnbondedStakingBalancesAggr = totalBalance
310319
}
@@ -313,11 +322,13 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
313322
if DelegatorRewards, exists := genesisData.DistributionInfo.Rewards.Get(address); exists {
314323
totalBalance := sdk.Coins{}
315324
for j := range DelegatorRewards.Iterate() {
316-
_, rewardDecAmount := j.Key, j.Value
325+
validatorOperatorAddr, rewardDecAmount := j.Key, j.Value
317326
rewardAmount, _ := rewardDecAmount.TruncateDecimal()
318327
if !rewardAmount.IsZero() {
319328
totalBalance = totalBalance.Add(rewardAmount...)
329+
upgradeBalance.DelegatorRewards = append(upgradeBalance.DelegatorRewards, ValidatorBalance{Validator: validatorOperatorAddr, Balance: rewardAmount})
320330
}
331+
321332
}
322333
upgradeBalance.DelegatorRewardsAggr = totalBalance
323334
}

app/upgrade_v_11_4_manifest.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@ type UpgradeAccountCreation struct {
188188
Reason string `json:"reason"`
189189
}
190190

191+
type ValidatorBalance struct {
192+
Validator string `json:"validator"`
193+
Balance types.Coins `json:"balance"`
194+
}
195+
191196
type UpgradeBalances struct {
192197
Address string `json:"address"`
193198
BankBalance types.Coins `json:"bank_balance"`
@@ -197,6 +202,11 @@ type UpgradeBalances struct {
197202
UnbondingStakingBalancesAggr types.Coins `json:"unbonding_staking_balances_aggr,omitempty"`
198203
DelegatorRewardsAggr types.Coins `json:"delegator_rewards_aggr,omitempty"`
199204
ValidatorRewards types.Coins `json:"validator_rewards,omitempty"`
205+
206+
BondedStakingBalances []ValidatorBalance `json:"bonded_staking_balances,omitempty"`
207+
UnbondedStakingBalances []ValidatorBalance `json:"unbonded_staking_balances,omitempty"`
208+
UnbondingStakingBalances []ValidatorBalance `json:"unbonding_staking_balances,omitempty"`
209+
DelegatorRewards []ValidatorBalance `json:"delegator_rewards,omitempty"`
200210
}
201211

202212
func getManifestFilePath(app *App, prefix string) (string, error) {

0 commit comments

Comments
 (0)