From d38d23959028905f171c8215cdfb41e17faf12ea Mon Sep 17 00:00:00 2001 From: Jiri Date: Thu, 17 Oct 2024 13:07:58 +0200 Subject: [PATCH] fix --- app/upgrade_cudos.go | 8 ++++---- app/upgrade_v_11_4_manifest.go | 4 ++-- app/upgrade_v_11_4_network_config.go | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/upgrade_cudos.go b/app/upgrade_cudos.go index 31cc6af0..ea838979 100644 --- a/app/upgrade_cudos.go +++ b/app/upgrade_cudos.go @@ -235,11 +235,11 @@ func CudosMergeUpgradeHandler(app *App, ctx sdk.Context, cudosCfg *CudosMergeCon func updateMaxValidators(app *App, ctx sdk.Context, cudosCfg *CudosMergeConfig, manifest *UpgradeManifest, allowReductionOfMaxValidators bool) error { params := app.StakingKeeper.GetParams(ctx) - if !allowReductionOfMaxValidators && cudosCfg.Config.NewMaxValidators < params.MaxValidators { - return fmt.Errorf("the NewMaxValidators config parameter (= %v) is smaller than the current value of MaxValidators in staking params (= %v)", cudosCfg.Config.NewMaxValidators, params.MaxValidators) - } - if cudosCfg.Config.NewMaxValidators != 0 && cudosCfg.Config.NewMaxValidators != params.MaxValidators { + if !allowReductionOfMaxValidators && cudosCfg.Config.NewMaxValidators < params.MaxValidators { + return fmt.Errorf("the NewMaxValidators config parameter (= %v) is smaller than the current value of MaxValidators in staking params (= %v)", cudosCfg.Config.NewMaxValidators, params.MaxValidators) + } + manifest.MaxValidatorsChange = &ParamsChange[uint32]{} manifest.MaxValidatorsChange.OriginalVal = params.MaxValidators diff --git a/app/upgrade_v_11_4_manifest.go b/app/upgrade_v_11_4_manifest.go index cc3fe141..2e0ab548 100644 --- a/app/upgrade_v_11_4_manifest.go +++ b/app/upgrade_v_11_4_manifest.go @@ -40,8 +40,8 @@ func NewUpgradeManifest() *UpgradeManifest { } type ParamsChange[T any] struct { - OriginalVal T `json:"original_val,omitempty"` - NewVal T `json:"new_val,omitempty"` + OriginalVal T `json:"original_val"` + NewVal T `json:"new_val"` } type Contracts struct { diff --git a/app/upgrade_v_11_4_network_config.go b/app/upgrade_v_11_4_network_config.go index c79b6642..3cf16f92 100644 --- a/app/upgrade_v_11_4_network_config.go +++ b/app/upgrade_v_11_4_network_config.go @@ -154,7 +154,8 @@ var NetworkInfos = map[string]NetworkConfig{ VestingCollisionDestAddr: "cudos1nj49l56x7sss5hqyvfmctxr3mq64whg273g3x5", CommunityPoolBalanceDestAddr: "cudos1dslwarknhfsw3pfjzxxf5mn28q3ewfectw0gta", - VestingPeriod: 3 * 30 * 24 * 60 * 60, // 3 months period + VestingPeriod: 3 * 30 * 24 * 60 * 60, // 3 months period + NewMaxValidators: 91, BalanceConversionConstants: []Pair[string, sdk.Dec]{ {"acudos", newDec("266.629")}},