chore: bump version to v21 (#3367)

* replace gaia/v20 with gaia/v21 * add v21 upgrade handler * update tests * appease linters --------- Co-authored-by: MSalopek <[email protected]>
cosmos · Oct 2, 2024 · c501b43 · c501b43
1 parent abbace9
commit c501b43
Show file tree

Hide file tree

Showing 45 changed files with 111 additions and 65 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -163,10 +163,10 @@ jobs:
       # the old gaiad binary version is hardcoded, need to be updated each major release.
       - name: Install Old Gaiad
         run: |
-          curl -LO https://github.com/cosmos/gaia/releases/download/v19.1.0/gaiad-v19.1.0-linux-amd64
-          chmod a+x gaiad-v19.1.0-linux-amd64
+          curl -LO https://github.com/cosmos/gaia/releases/download/v20.0.0/gaiad-v20.0.0-linux-amd64
+          chmod a+x gaiad-v20.0.0-linux-amd64
           mkdir build
-          mv ./gaiad-v19.1.0-linux-amd64 ./build/gaiadold
+          mv ./gaiad-v20.0.0-linux-amd64 ./build/gaiadold
         if: env.GIT_DIFF
       - name: Install New Gaiad
         run: |

diff --git a/ante/ante.go b/ante/ante.go
@@ -22,7 +22,7 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	gaiaerrors "github.com/cosmos/gaia/v20/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
 )
 
 // UseFeeMarketDecorator to make the integration testing easier: we can switch off its ante and post decorators with this flag

diff --git a/ante/gov_expedited_ante.go b/ante/gov_expedited_ante.go
@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 
-	gaiaerrors "github.com/cosmos/gaia/v20/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
 )
 
 var expeditedPropDecoratorEnabled = true

diff --git a/ante/gov_expedited_ante_test.go b/ante/gov_expedited_ante_test.go
@@ -14,8 +14,8 @@ import (
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
-	"github.com/cosmos/gaia/v20/ante"
-	"github.com/cosmos/gaia/v20/app/helpers"
+	"github.com/cosmos/gaia/v21/ante"
+	"github.com/cosmos/gaia/v21/app/helpers"
 )
 
 func TestGovExpeditedProposalsDecorator(t *testing.T) {

diff --git a/ante/gov_vote_ante.go b/ante/gov_vote_ante.go
@@ -12,7 +12,7 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	gaiaerrors "github.com/cosmos/gaia/v20/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
 )
 
 var (

diff --git a/ante/gov_vote_ante_test.go b/ante/gov_vote_ante_test.go
@@ -15,8 +15,8 @@ import (
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/cosmos/gaia/v20/ante"
-	"github.com/cosmos/gaia/v20/app/helpers"
+	"github.com/cosmos/gaia/v21/ante"
+	"github.com/cosmos/gaia/v21/app/helpers"
 )
 
 // Test that the GovVoteDecorator rejects v1beta1 vote messages from accounts with less than 1 atom staked

diff --git a/app/app.go b/app/app.go
@@ -66,17 +66,17 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	gaiaante "github.com/cosmos/gaia/v20/ante"
-	"github.com/cosmos/gaia/v20/app/keepers"
-	"github.com/cosmos/gaia/v20/app/upgrades"
-	v20 "github.com/cosmos/gaia/v20/app/upgrades/v20"
+	gaiaante "github.com/cosmos/gaia/v21/ante"
+	"github.com/cosmos/gaia/v21/app/keepers"
+	"github.com/cosmos/gaia/v21/app/upgrades"
+	v21 "github.com/cosmos/gaia/v21/app/upgrades/v21"
 )
 
 var (
 	// DefaultNodeHome default home directories for the application daemon
 	DefaultNodeHome string
 
-	Upgrades = []upgrades.Upgrade{v20.Upgrade}
+	Upgrades = []upgrades.Upgrade{v21.Upgrade}
 )
 
 var (

diff --git a/app/app_test.go b/app/app_test.go
@@ -14,8 +14,8 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
-	gaia "github.com/cosmos/gaia/v20/app"
-	gaiahelpers "github.com/cosmos/gaia/v20/app/helpers"
+	gaia "github.com/cosmos/gaia/v21/app"
+	gaiahelpers "github.com/cosmos/gaia/v21/app/helpers"
 )
 
 type EmptyAppOptions struct{}

diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go
@@ -30,7 +30,7 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
-	gaiaapp "github.com/cosmos/gaia/v20/app"
+	gaiaapp "github.com/cosmos/gaia/v21/app"
 )
 
 // SimAppChainID hardcoded chainID for simulation

diff --git a/app/modules.go b/app/modules.go
@@ -62,8 +62,8 @@ import (
 	wasm "github.com/CosmWasm/wasmd/x/wasm"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	"github.com/cosmos/gaia/v20/x/metaprotocols"
-	metaprotocolstypes "github.com/cosmos/gaia/v20/x/metaprotocols/types"
+	"github.com/cosmos/gaia/v21/x/metaprotocols"
+	metaprotocolstypes "github.com/cosmos/gaia/v21/x/metaprotocols/types"
 )
 
 var maccPerms = map[string][]string{

diff --git a/app/post.go b/app/post.go
@@ -8,7 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/cosmos/gaia/v20/ante"
+	"github.com/cosmos/gaia/v21/ante"
 )
 
 // PostHandlerOptions are the options required for constructing a FeeMarket PostHandler.

diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go
@@ -22,7 +22,7 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	gaia "github.com/cosmos/gaia/v20/app"
+	gaia "github.com/cosmos/gaia/v21/app"
 )
 
 // Simulation parameter constants

diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 
-	gaia "github.com/cosmos/gaia/v20/app"
+	gaia "github.com/cosmos/gaia/v21/app"
 )
 
 // SimulationOperations retrieves the simulation params from the provided file path

diff --git a/app/sim_bench_test.go b/app/sim_bench_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
 
-	gaia "github.com/cosmos/gaia/v20/app"
-	"github.com/cosmos/gaia/v20/app/sim"
+	gaia "github.com/cosmos/gaia/v21/app"
+	"github.com/cosmos/gaia/v21/app/sim"
 )
 
 // Profile with:

diff --git a/app/sim_test.go b/app/sim_test.go
@@ -23,11 +23,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
 
-	"github.com/cosmos/gaia/v20/ante"
-	gaia "github.com/cosmos/gaia/v20/app"
+	"github.com/cosmos/gaia/v21/ante"
+	gaia "github.com/cosmos/gaia/v21/app"
 	// "github.com/cosmos/gaia/v11/app/helpers"
 	// "github.com/cosmos/gaia/v11/app/params"
-	"github.com/cosmos/gaia/v20/app/sim"
+	"github.com/cosmos/gaia/v21/app/sim"
 )
 
 // AppChainID hardcoded chainID for simulation

diff --git a/app/upgrades/types.go b/app/upgrades/types.go
@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/cosmos/gaia/v20/app/keepers"
+	"github.com/cosmos/gaia/v21/app/keepers"
 )
 
 // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal

diff --git a/app/upgrades/v19/constants.go b/app/upgrades/v19/constants.go
@@ -1,7 +1,7 @@
 package v19
 
 import (
-	"github.com/cosmos/gaia/v20/app/upgrades"
+	"github.com/cosmos/gaia/v21/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v19/upgrades.go b/app/upgrades/v19/upgrades.go
@@ -8,7 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/cosmos/gaia/v20/app/keepers"
+	"github.com/cosmos/gaia/v21/app/keepers"
 )
 
 func CreateUpgradeHandler(

diff --git a/app/upgrades/v20/constants.go b/app/upgrades/v20/constants.go
@@ -1,7 +1,7 @@
 package v20
 
 import (
-	"github.com/cosmos/gaia/v20/app/upgrades"
+	"github.com/cosmos/gaia/v21/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v20/upgrades.go b/app/upgrades/v20/upgrades.go
@@ -23,7 +23,7 @@ import (
 	govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
-	"github.com/cosmos/gaia/v20/app/keepers"
+	"github.com/cosmos/gaia/v21/app/keepers"
 )
 
 // Constants for the new parameters in the v20 upgrade.

diff --git a/app/upgrades/v20/upgrades_test.go b/app/upgrades/v20/upgrades_test.go
@@ -21,8 +21,8 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 
-	"github.com/cosmos/gaia/v20/app/helpers"
-	v20 "github.com/cosmos/gaia/v20/app/upgrades/v20"
+	"github.com/cosmos/gaia/v21/app/helpers"
+	v20 "github.com/cosmos/gaia/v21/app/upgrades/v20"
 )
 
 func GetTestMsgConsumerAddition() providertypes.MsgConsumerAddition { //nolint:staticcheck

diff --git a/app/upgrades/v21/constants.go b/app/upgrades/v21/constants.go
@@ -0,0 +1,15 @@
+package v21
+
+import (
+	"github.com/cosmos/gaia/v21/app/upgrades"
+)
+
+const (
+	// UpgradeName defines the on-chain upgrade name.
+	UpgradeName = "v21"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+}
diff --git a/app/upgrades/v21/upgrades.go b/app/upgrades/v21/upgrades.go
@@ -0,0 +1,31 @@
+package v21
+
+import (
+	"context"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+
+	"github.com/cosmos/gaia/v21/app/keepers"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	keepers *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(c context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx := sdk.UnwrapSDKContext(c)
+		ctx.Logger().Info("Starting module migrations...")
+
+		vm, err := mm.RunMigrations(ctx, configurator, vm)
+		if err != nil {
+			return vm, err
+		}
+
+		ctx.Logger().Info("Upgrade v21 complete")
+		return vm, nil
+	}
+}
diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	addressutil "github.com/cosmos/gaia/v20/pkg/address"
+	addressutil "github.com/cosmos/gaia/v21/pkg/address"
 )
 
 var flagBech32Prefix = "prefix"

diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go
@@ -57,7 +57,7 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	gaia "github.com/cosmos/gaia/v20/app"
+	gaia "github.com/cosmos/gaia/v21/app"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

diff --git a/cmd/gaiad/cmd/root_test.go b/cmd/gaiad/cmd/root_test.go
@@ -7,8 +7,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	app "github.com/cosmos/gaia/v20/app"
-	"github.com/cosmos/gaia/v20/cmd/gaiad/cmd"
+	app "github.com/cosmos/gaia/v21/app"
+	"github.com/cosmos/gaia/v21/cmd/gaiad/cmd"
 )
 
 func TestRootCmdConfig(t *testing.T) {

diff --git a/cmd/gaiad/cmd/testnet_set_local_validator.go b/cmd/gaiad/cmd/testnet_set_local_validator.go
@@ -19,7 +19,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	gaia "github.com/cosmos/gaia/v20/app"
+	gaia "github.com/cosmos/gaia/v21/app"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 

diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go
@@ -5,8 +5,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	app "github.com/cosmos/gaia/v20/app"
-	"github.com/cosmos/gaia/v20/cmd/gaiad/cmd"
+	app "github.com/cosmos/gaia/v21/app"
+	"github.com/cosmos/gaia/v21/cmd/gaiad/cmd"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/cosmos/gaia/v20
+module github.com/cosmos/gaia/v21
 
 go 1.22.6
 

diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go
@@ -27,9 +27,9 @@ import (
 	paramsproptypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	gaia "github.com/cosmos/gaia/v20/app"
-	gaiaparams "github.com/cosmos/gaia/v20/app/params"
-	metaprotocoltypes "github.com/cosmos/gaia/v20/x/metaprotocols/types"
+	gaia "github.com/cosmos/gaia/v21/app"
+	gaiaparams "github.com/cosmos/gaia/v21/app/params"
+	metaprotocoltypes "github.com/cosmos/gaia/v21/x/metaprotocols/types"
 )
 
 const (

diff --git a/tests/e2e/e2e_bank_test.go b/tests/e2e/e2e_bank_test.go
@@ -12,7 +12,7 @@ import (
 	authTx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	extensiontypes "github.com/cosmos/gaia/v20/x/metaprotocols/types"
+	extensiontypes "github.com/cosmos/gaia/v21/x/metaprotocols/types"
 )
 
 func (s *IntegrationTestSuite) testBankTokenTransfer() {

diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go
@@ -43,7 +43,7 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/cosmos/gaia/v20/types"
+	"github.com/cosmos/gaia/v21/types"
 )
 
 const (

diff --git a/tests/integration/feemarket_test.go b/tests/integration/feemarket_test.go
@@ -14,8 +14,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	"github.com/cosmos/gaia/v20/ante"
-	gaiaApp "github.com/cosmos/gaia/v20/app"
+	"github.com/cosmos/gaia/v21/ante"
+	gaiaApp "github.com/cosmos/gaia/v21/app"
 )
 
 const (

diff --git a/tests/integration/ibcfee_test.go b/tests/integration/ibcfee_test.go
@@ -14,8 +14,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/cosmos/gaia/v20/ante"
-	gaiaApp "github.com/cosmos/gaia/v20/app"
+	"github.com/cosmos/gaia/v21/ante"
+	gaiaApp "github.com/cosmos/gaia/v21/app"
 )
 
 // These integration tests were modified to work with the GaiaApp

diff --git a/tests/integration/interchain_security_test.go b/tests/integration/interchain_security_test.go
@@ -17,8 +17,8 @@ import (
 	crysistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/cosmos/gaia/v20/ante"
-	gaiaApp "github.com/cosmos/gaia/v20/app"
+	"github.com/cosmos/gaia/v21/ante"
+	gaiaApp "github.com/cosmos/gaia/v21/app"
 )
 
 var ccvSuite *integration.CCVTestSuite