@@ -243,11 +243,14 @@ func writeMovedBalancesToManifest(genesisData *GenesisData, manifest *UpgradeMan
243243if delegations , exists := genesisData .Delegations .Get (address ); exists {
244244bondedBalance := sdk.Coins {}
245245for i := range delegations .Iterate () {
246- _ , delegatedAmount := i .Key , i .Value
246+ validatorOperatorAddr , delegatedAmount := i .Key , i .Value
247247delegatedBalance := sdk .NewCoin (genesisData .BondDenom , delegatedAmount )
248248bondedBalance = bondedBalance .Add (delegatedBalance )
249+ upgradeBalance .BondedStakingBalances = append (upgradeBalance .BondedStakingBalances , ValidatorBalance {Validator : validatorOperatorAddr , Balance : sdk .NewCoins (delegatedBalance )})
249250}
251+
250252upgradeBalance .BondedStakingBalancesAggr = bondedBalance
253+ // Bonded balance is part of the bank balance in this case, so we need to subtract it
251254upgradeBalance .BankBalance = upgradeBalance .BankBalance .Sub (bondedBalance )
252255}
253256
@@ -280,9 +283,12 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
280283if delegations , exists := genesisData .Delegations .Get (address ); exists {
281284totalBalance := sdk.Coins {}
282285for i := range delegations .Iterate () {
283- _ , delegatedAmount := i .Key , i .Value
286+ validatorOperatorAddr , delegatedAmount := i .Key , i .Value
284287delegatedBalance := sdk .NewCoin (genesisData .BondDenom , delegatedAmount )
285288totalBalance = totalBalance .Add (delegatedBalance )
289+
290+ upgradeBalance .BondedStakingBalances = append (upgradeBalance .BondedStakingBalances , ValidatorBalance {Validator : validatorOperatorAddr , Balance : sdk .NewCoins (delegatedBalance )})
291+
286292}
287293upgradeBalance .BondedStakingBalancesAggr = totalBalance
288294}
@@ -291,9 +297,10 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
291297if delegations , exists := genesisData .UnbondingDelegations .Get (address ); exists {
292298totalBalance := sdk.Coins {}
293299for i := range delegations .Iterate () {
294- _ , delegatedAmount := i .Key , i .Value
300+ validatorOperatorAddr , delegatedAmount := i .Key , i .Value
295301delegatedBalance := sdk .NewCoin (genesisData .BondDenom , delegatedAmount )
296302totalBalance = totalBalance .Add (delegatedBalance )
303+ upgradeBalance .UnbondingStakingBalances = append (upgradeBalance .UnbondingStakingBalances , ValidatorBalance {Validator : validatorOperatorAddr , Balance : sdk .NewCoins (delegatedBalance )})
297304}
298305upgradeBalance .UnbondingStakingBalancesAggr = totalBalance
299306}
@@ -302,9 +309,11 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
302309if delegations , exists := genesisData .UnbondedDelegations .Get (address ); exists {
303310totalBalance := sdk.Coins {}
304311for i := range delegations .Iterate () {
305- _ , delegatedAmount := i .Key , i .Value
312+ validatorOperatorAddr , delegatedAmount := i .Key , i .Value
306313delegatedBalance := sdk .NewCoin (genesisData .BondDenom , delegatedAmount )
307314totalBalance = totalBalance .Add (delegatedBalance )
315+ upgradeBalance .UnbondedStakingBalances = append (upgradeBalance .UnbondedStakingBalances , ValidatorBalance {Validator : validatorOperatorAddr , Balance : sdk .NewCoins (delegatedBalance )})
316+
308317}
309318upgradeBalance .UnbondedStakingBalancesAggr = totalBalance
310319}
@@ -313,11 +322,13 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
313322if DelegatorRewards , exists := genesisData .DistributionInfo .Rewards .Get (address ); exists {
314323totalBalance := sdk.Coins {}
315324for j := range DelegatorRewards .Iterate () {
316- _ , rewardDecAmount := j .Key , j .Value
325+ validatorOperatorAddr , rewardDecAmount := j .Key , j .Value
317326rewardAmount , _ := rewardDecAmount .TruncateDecimal ()
318327if ! rewardAmount .IsZero () {
319328totalBalance = totalBalance .Add (rewardAmount ... )
329+ upgradeBalance .DelegatorRewards = append (upgradeBalance .DelegatorRewards , ValidatorBalance {Validator : validatorOperatorAddr , Balance : rewardAmount })
320330}
331+
321332}
322333upgradeBalance .DelegatorRewardsAggr = totalBalance
323334}
0 commit comments