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

Refactor: CUDOS checks #411

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Refactor: CUDOS checks #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions app/upgrade_cudos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,11 @@ func withdrawGenesisStakingDelegations(logger log.Logger, genesisData *GenesisDa
// Handle remaining bonded pool balance
bondedPool := genesisData.Accounts.MustGet(genesisData.BondedPoolAddress)

// TODO: Write to manifest?
maxToleratedRemainingStakingBalance := unwrapOrDefault(
cudosCfg.Config.MaxToleratedRemainingStakingBalance,
DefaultMaxToleratedRemainingStakingBalance,
)

err := checkTolerance(bondedPool.Balance, maxToleratedRemainingStakingBalance)
if err != nil {
return fmt.Errorf("remaining bonded pool balance %s is too high", bondedPool.Balance.String())
Expand All @@ -1078,7 +1082,6 @@ func withdrawGenesisStakingDelegations(logger log.Logger, genesisData *GenesisDa
// Handle remaining not-bonded pool balance
notBondedPool := genesisData.Accounts.MustGet(genesisData.NotBondedPoolAddress)

// TODO: Write to manifest?
err = checkTolerance(notBondedPool.Balance, maxToleratedRemainingStakingBalance)
if err != nil {
return fmt.Errorf("remaining not-bonded pool balance %s is too high", notBondedPool.Balance.String())
Expand Down Expand Up @@ -2262,6 +2265,11 @@ func MigrateGenesisAccounts(genesisData *GenesisData, ctx sdk.Context, app *App,
remainingMintBalance := app.BankKeeper.GetAllBalances(ctx, mintModuleAddr)
remainingMintBalance = remainingMintBalance.Sub(initialMintBalance)

maxToleratedRemainingMintBalance := unwrapOrDefault(
cudosCfg.Config.MaxToleratedRemainingMintBalance,
DefaultMaxToleratedRemainingMintBalance,
)

err = checkTolerance(remainingMintBalance, maxToleratedRemainingMintBalance)
if err != nil {
return err
Expand Down
16 changes: 13 additions & 3 deletions app/upgrade_cudos_distribution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,13 @@ func checkTolerance(coins sdk.Coins, maxToleratedDiff sdk.Int) error {
return nil
}

func verifyOutstandingBalances(genesisData *GenesisData) error {
func verifyOutstandingBalances(genesisData *GenesisData, cudosCfg *CudosMergeConfig) error {

maxToleratedRemainingDistributionBalance := unwrapOrDefault(
cudosCfg.Config.MaxToleratedRemainingDistributionBalance,
DefaultMaxToleratedRemainingDistributionBalance,
)

for i := range genesisData.DistributionInfo.OutstandingRewards.Iterate() {
validatorAddr, validatorOutstandingReward := i.Key, i.Value

Expand Down Expand Up @@ -393,7 +399,7 @@ func withdrawGenesisDistributionRewards(logger log.Logger, genesisData *GenesisD
}

// Check that remaining balance is equal to AccumulatedCommissions
err := verifyOutstandingBalances(genesisData)
err := verifyOutstandingBalances(genesisData, cudosCfg)
if err != nil {
return err
}
Expand All @@ -416,7 +422,11 @@ func withdrawGenesisDistributionRewards(logger log.Logger, genesisData *GenesisD
logger.Info("cudos merge: remaining dist balance", "amount", remainingBalance.String())
}

// TODO: Write to manifest?
maxToleratedRemainingDistributionBalance := unwrapOrDefault(
cudosCfg.Config.MaxToleratedRemainingDistributionBalance,
DefaultMaxToleratedRemainingDistributionBalance,
)

err = checkTolerance(remainingBalance, maxToleratedRemainingDistributionBalance)
if err != nil {
return fmt.Errorf("remaining distribution balance %s is too high", remainingBalance.String())
Expand Down
17 changes: 14 additions & 3 deletions app/upgrade_network_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,18 @@ import (
)

var (
maxToleratedRemainingDistributionBalance, _ = sdk.NewIntFromString("1000000000000000000")
maxToleratedRemainingStakingBalance, _ = sdk.NewIntFromString("100000000")
maxToleratedRemainingMintBalance, _ = sdk.NewIntFromString("100000000")
DefaultMaxToleratedRemainingDistributionBalance, _ = sdk.NewIntFromString("1000000000000000000")
DefaultMaxToleratedRemainingStakingBalance, _ = sdk.NewIntFromString("100000000")
DefaultMaxToleratedRemainingMintBalance, _ = sdk.NewIntFromString("100000000")
)

func unwrapOrDefault[T any](ptr *T, defaultValue T) T {
if ptr != nil {
return *ptr
}
return defaultValue
}

func newInt(val string) sdk.Int {
res, ok := sdk.NewIntFromString(val)
if !ok {
Expand Down Expand Up @@ -361,6 +368,10 @@ type CudosMergeConfigJSON struct {
ValidatorsMap []Pair[string, string] `json:"validators_map,omitempty"`

BackupValidators []string `json:"backup_validators,omitempty"`

MaxToleratedRemainingDistributionBalance *sdk.Int `json:"max_remaining_distribution_module_balance,omitempty"`
MaxToleratedRemainingStakingBalance *sdk.Int `json:"max_remaining_staking_module_balance,omitempty"`
MaxToleratedRemainingMintBalance *sdk.Int `json:"max_remaining_mint_module_balance,omitempty"`
}

type CudosMergeConfig struct {
Expand Down
Loading