Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: CUDOS Manifest balance breakdown #405

Merged
merged 6 commits into from
Oct 21, 2024
Merged

feat: CUDOS Manifest balance breakdown #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1c0e78
Manifest rework
MissingNO57 Oct 21, 2024
f65b208
Refactor
MissingNO57 Oct 21, 2024
5fe7fc0
fix
MissingNO57 Oct 21, 2024
b1a191d
Additional lists
MissingNO57 Oct 21, 2024
fef2eff
Moved balance list
MissingNO57 Oct 21, 2024
b0d7f52
Merge branch 'release/v0.14.x' of github.com:fetchai/fetchd into feat…
MissingNO57 Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions app/upgrade_cudos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,14 @@ func writeMovedBalancesToManifest(genesisData *GenesisData, manifest *UpgradeMan
if delegations, exists := genesisData.Delegations.Get(address); exists {
bondedBalance := sdk.Coins{}
for i := range delegations.Iterate() {
_, delegatedAmount := i.Key, i.Value
validatorOperatorAddr, delegatedAmount := i.Key, i.Value
delegatedBalance := sdk.NewCoin(genesisData.BondDenom, delegatedAmount)
bondedBalance = bondedBalance.Add(delegatedBalance)
upgradeBalance.BondedStakingBalances = append(upgradeBalance.BondedStakingBalances, ValidatorBalance{Validator: validatorOperatorAddr, Balance: sdk.NewCoins(delegatedBalance)})
}

upgradeBalance.BondedStakingBalancesAggr = bondedBalance
// Bonded balance is part of the bank balance in this case, so we need to subtract it
upgradeBalance.BankBalance = upgradeBalance.BankBalance.Sub(bondedBalance)
}

Expand Down Expand Up @@ -280,9 +283,12 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
if delegations, exists := genesisData.Delegations.Get(address); exists {
totalBalance := sdk.Coins{}
for i := range delegations.Iterate() {
_, delegatedAmount := i.Key, i.Value
validatorOperatorAddr, delegatedAmount := i.Key, i.Value
delegatedBalance := sdk.NewCoin(genesisData.BondDenom, delegatedAmount)
totalBalance = totalBalance.Add(delegatedBalance)

upgradeBalance.BondedStakingBalances = append(upgradeBalance.BondedStakingBalances, ValidatorBalance{Validator: validatorOperatorAddr, Balance: sdk.NewCoins(delegatedBalance)})

}
upgradeBalance.BondedStakingBalancesAggr = totalBalance
}
Expand All @@ -291,9 +297,10 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
if delegations, exists := genesisData.UnbondingDelegations.Get(address); exists {
totalBalance := sdk.Coins{}
for i := range delegations.Iterate() {
_, delegatedAmount := i.Key, i.Value
validatorOperatorAddr, delegatedAmount := i.Key, i.Value
delegatedBalance := sdk.NewCoin(genesisData.BondDenom, delegatedAmount)
totalBalance = totalBalance.Add(delegatedBalance)
upgradeBalance.UnbondingStakingBalances = append(upgradeBalance.UnbondingStakingBalances, ValidatorBalance{Validator: validatorOperatorAddr, Balance: sdk.NewCoins(delegatedBalance)})
}
upgradeBalance.UnbondingStakingBalancesAggr = totalBalance
}
Expand All @@ -302,9 +309,11 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
if delegations, exists := genesisData.UnbondedDelegations.Get(address); exists {
totalBalance := sdk.Coins{}
for i := range delegations.Iterate() {
_, delegatedAmount := i.Key, i.Value
validatorOperatorAddr, delegatedAmount := i.Key, i.Value
delegatedBalance := sdk.NewCoin(genesisData.BondDenom, delegatedAmount)
totalBalance = totalBalance.Add(delegatedBalance)
upgradeBalance.UnbondedStakingBalances = append(upgradeBalance.UnbondedStakingBalances, ValidatorBalance{Validator: validatorOperatorAddr, Balance: sdk.NewCoins(delegatedBalance)})

}
upgradeBalance.UnbondedStakingBalancesAggr = totalBalance
}
Expand All @@ -313,11 +322,13 @@ func writeInitialBalancesToManifest(genesisData *GenesisData, manifest *UpgradeM
if DelegatorRewards, exists := genesisData.DistributionInfo.Rewards.Get(address); exists {
totalBalance := sdk.Coins{}
for j := range DelegatorRewards.Iterate() {
_, rewardDecAmount := j.Key, j.Value
validatorOperatorAddr, rewardDecAmount := j.Key, j.Value
rewardAmount, _ := rewardDecAmount.TruncateDecimal()
if !rewardAmount.IsZero() {
totalBalance = totalBalance.Add(rewardAmount...)
upgradeBalance.DelegatorRewards = append(upgradeBalance.DelegatorRewards, ValidatorBalance{Validator: validatorOperatorAddr, Balance: rewardAmount})
}

}
upgradeBalance.DelegatorRewardsAggr = totalBalance
}
Expand Down
10 changes: 10 additions & 0 deletions app/upgrade_v_11_4_manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@ type UpgradeAccountCreation struct {
Reason string `json:"reason"`
}

type ValidatorBalance struct {
Validator string `json:"validator"`
Balance types.Coins `json:"balance"`
}

type UpgradeBalances struct {
Address string `json:"address"`
BankBalance types.Coins `json:"bank_balance"`
Expand All @@ -197,6 +202,11 @@ type UpgradeBalances struct {
UnbondingStakingBalancesAggr types.Coins `json:"unbonding_staking_balances_aggr,omitempty"`
DelegatorRewardsAggr types.Coins `json:"delegator_rewards_aggr,omitempty"`
ValidatorRewards types.Coins `json:"validator_rewards,omitempty"`

BondedStakingBalances []ValidatorBalance `json:"bonded_staking_balances,omitempty"`
UnbondedStakingBalances []ValidatorBalance `json:"unbonded_staking_balances,omitempty"`
UnbondingStakingBalances []ValidatorBalance `json:"unbonding_staking_balances,omitempty"`
DelegatorRewards []ValidatorBalance `json:"delegator_rewards,omitempty"`
}

func getManifestFilePath(app *App, prefix string) (string, error) {
Expand Down
Loading