From c823d9196a7a95d17766dc3188d45bb0459e0649 Mon Sep 17 00:00:00 2001 From: MSalopek Date: Mon, 14 Oct 2024 16:10:22 +0200 Subject: [PATCH] fix!: add missing gov v5 migration param section (#3387) * fix!: add missing gov v5 migration param section * chore: changelogs and lint (cherry picked from commit 6f410a55e13886d53a67db11e593785110559acf) --- .../bug-fixes/3387-add-gov-v5-params.md | 2 ++ app/upgrades/v21/upgrades.go | 18 ++++++++++ app/upgrades/v21/upgrades_test.go | 36 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 .changelog/unreleased/bug-fixes/3387-add-gov-v5-params.md diff --git a/.changelog/unreleased/bug-fixes/3387-add-gov-v5-params.md b/.changelog/unreleased/bug-fixes/3387-add-gov-v5-params.md new file mode 100644 index 00000000000..a7181d67c67 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/3387-add-gov-v5-params.md @@ -0,0 +1,2 @@ +- Initialize uninitialized governance params + ([\#3387](https://github.com/cosmos/gaia/pull/3387)) diff --git a/app/upgrades/v21/upgrades.go b/app/upgrades/v21/upgrades.go index b7dcb599b18..71f6c2f74a2 100644 --- a/app/upgrades/v21/upgrades.go +++ b/app/upgrades/v21/upgrades.go @@ -16,6 +16,7 @@ import ( authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" + govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/gaia/v21/app/keepers" ) @@ -63,6 +64,11 @@ func CreateUpgradeHandler( ctx.Logger().Error("Error initializing Constitution Collection:", "message", err.Error()) } + err = InitializeGovParams(ctx, *keepers.GovKeeper) + if err != nil { + ctx.Logger().Error("Error initializing Gov Params:", "message", err.Error()) + } + ctx.Logger().Info("Upgrade v21 complete") return vm, nil } @@ -133,3 +139,15 @@ func AllocateNeutronAndStrideUnaccountedDenoms(ctx sdk.Context, providerKeeper p func InitializeConstitutionCollection(ctx sdk.Context, govKeeper govkeeper.Keeper) error { return govKeeper.Constitution.Set(ctx, "This chain has no constitution.") } + +func InitializeGovParams(ctx sdk.Context, govKeeper govkeeper.Keeper) error { + params, err := govKeeper.Params.Get(ctx) + if err != nil { + return err + } + + params.ProposalCancelRatio = govparams.DefaultProposalCancelRatio.String() + params.ProposalCancelDest = govparams.DefaultProposalCancelDestAddress + + return govKeeper.Params.Set(ctx, params) +} diff --git a/app/upgrades/v21/upgrades_test.go b/app/upgrades/v21/upgrades_test.go index aaf31861a23..88bb4c5a210 100644 --- a/app/upgrades/v21/upgrades_test.go +++ b/app/upgrades/v21/upgrades_test.go @@ -7,6 +7,8 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + "github.com/cosmos/gaia/v21/app/helpers" v21 "github.com/cosmos/gaia/v21/app/upgrades/v21" ) @@ -44,3 +46,37 @@ func TestInitializeConstitutionCollection(t *testing.T) { require.NoError(t, err) require.Equal(t, "This chain has no constitution.", post) } + +func TestInitializeGovParams(t *testing.T) { + gaiaApp := helpers.Setup(t) + ctx := gaiaApp.NewUncachedContext(true, tmproto.Header{}) + + govKeeper := gaiaApp.GovKeeper + + // sets the params to "" so we can confirm that the migration + // function actually changes the parameter to 0.5 from "" + setupParams, err := govKeeper.Params.Get(ctx) + require.NoError(t, err) + setupParams.ProposalCancelRatio = "" // mainnet value + setupParams.ProposalCancelDest = "" // mainnet value + if err := govKeeper.Params.Set(ctx, setupParams); err != nil { + t.Fatalf("error setting params: %s", err) + } + + pre, err := govKeeper.Params.Get(ctx) + require.NoError(t, err) + require.Equal(t, "", pre.ProposalCancelRatio) // mainnet value + require.NotEqual(t, govparams.DefaultProposalCancelRatio.String(), pre.ProposalCancelRatio) + + err = v21.InitializeGovParams(ctx, *govKeeper) + require.NoError(t, err) + + post, err := govKeeper.Params.Get(ctx) + require.NoError(t, err) + + require.NotEqual(t, pre.ProposalCancelRatio, post.ProposalCancelRatio) + require.Equal(t, govparams.DefaultProposalCancelRatio.String(), post.ProposalCancelRatio) // confirm change to sdk default + + require.Equal(t, pre.ProposalCancelDest, post.ProposalCancelDest) // does not change (it was already default) + require.Equal(t, "", post.ProposalCancelDest) +}