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 config new validator set #398

Merged
merged 6 commits into from
Oct 17, 2024
Merged

feat: CUDOS config new validator set #398

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c77396
Change validator set config
MissingNO57 Oct 16, 2024
4566df4
Moved manifest record
MissingNO57 Oct 16, 2024
8716f6f
Changes
MissingNO57 Oct 17, 2024
a4691c9
Updatge
MissingNO57 Oct 17, 2024
d38d239
fix
MissingNO57 Oct 17, 2024
0b0fa6c
Removed unwanted config change
MissingNO57 Oct 17, 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
25 changes: 25 additions & 0 deletions app/upgrade_cudos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,13 @@ func CudosMergeUpgradeHandler(app *App, ctx sdk.Context, cudosCfg *CudosMergeCon
return fmt.Errorf("cudos merge: failed process accounts: %w", err)
}

err = updateMaxValidators(app, ctx, cudosCfg, manifest, false)
{
if err != nil {
return fmt.Errorf("cudos merge: failed to update active validators set: %w", err)
}
}

err = createGenesisDelegations(ctx, app, genesisData, cudosCfg, manifest)
if err != nil {
return fmt.Errorf("cudos merge: failed process delegations: %w", err)
Expand All @@ -225,6 +232,24 @@ func CudosMergeUpgradeHandler(app *App, ctx sdk.Context, cudosCfg *CudosMergeCon
return nil
}

func updateMaxValidators(app *App, ctx sdk.Context, cudosCfg *CudosMergeConfig, manifest *UpgradeManifest, allowReductionOfMaxValidators bool) error {
params := app.StakingKeeper.GetParams(ctx)
manifest.OriginalMaxValidators = 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)
}

if cudosCfg.Config.NewMaxValidators != 0 {
params.MaxValidators = cudosCfg.Config.NewMaxValidators
// Set the new params
app.StakingKeeper.SetParams(ctx, params)
manifest.NewMaxValidators = params.MaxValidators
}

return nil
}
MissingNO57 marked this conversation as resolved.
Show resolved Hide resolved

func GetAccPrefix(jsonData map[string]interface{}) (string, error) {
// Map to verify that account exists in auth module
auth := jsonData[authtypes.ModuleName].(map[string]interface{})
Expand Down
2 changes: 2 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 @@ -21,6 +21,8 @@ type UpgradeManifest struct {
SourceChainBlockHeight int64 `json:"source_chain_block_height"`
DestinationChainBlockHeight int64 `json:"destination_chain_block_height"`
GovProposalUpgradePlanName string `json:"gov_proposal_upgrade_plan_name"`
OriginalMaxValidators uint32 `json:"original_max_validators"`
MissingNO57 marked this conversation as resolved.
Show resolved Hide resolved
NewMaxValidators uint32 `json:"new_max_validators,omitempty"`
MissingNO57 marked this conversation as resolved.
Show resolved Hide resolved

Reconciliation *UpgradeReconciliation `json:"reconciliation,omitempty"`
Contracts *Contracts `json:"contracts,omitempty"`
Expand Down
6 changes: 4 additions & 2 deletions app/upgrade_v_11_4_network_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ var NetworkInfos = map[string]NetworkConfig{
VestingCollisionDestAddr: "fetch122j02czdt5ca8cf576wy2hassyxyx67wg5xmgc", // Replace!!
CommunityPoolBalanceDestAddr: "cudos1nj49l56x7sss5hqyvfmctxr3mq64whg273g3x5",

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("118.344")},
Expand Down Expand Up @@ -330,7 +331,8 @@ type CudosMergeConfigJSON struct {
ExtraSupplyFetchAddr string `json:"extra_supply_fetch_addr"` // Fetch address for extra supply
VestingCollisionDestAddr string `json:"vesting_collision_dest_addr"` // This gets converted to raw address, so it can be fetch or cudos address

VestingPeriod int64 `json:"vesting_period"` // Vesting period
VestingPeriod int64 `json:"vesting_period"` // Vesting period
NewMaxValidators uint32 `json:"new_max_validators,omitempty"` // Set new value for staking params max validators

BalanceConversionConstants []Pair[string, sdk.Dec] `json:"balance_conversion_constants,omitempty"`

Expand Down
Loading