chore: update main to v18 (#3111)

* replace gaia/v17 with gaia/v18

* update upgrade-test

* add v18 upgrade handler

* fix linter

---------

Co-authored-by: MSalopek <matija.salopek994@gmail.com>

.github/workflows/test.yml

@@ -145,7 +145,7 @@ jobs:
       # the old gaiad binary version is hardcoded, need to be updated each major release.
       - name: Install Old Gaiad
         run: |
-          git checkout v16.0.0
+          git checkout v17.0.0
           make build
           cp ./build/gaiad ./build/gaiadold
           go clean -modcache

ante/ante.go

@@ -12,8 +12,8 @@ import (
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
-	gaiaerrors "github.com/cosmos/gaia/v17/types/errors"
-	gaiafeeante "github.com/cosmos/gaia/v17/x/globalfee/ante"
+	gaiaerrors "github.com/cosmos/gaia/v18/types/errors"
+	gaiafeeante "github.com/cosmos/gaia/v18/x/globalfee/ante"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC

ante/gov_vote_ante.go

@@ -11,7 +11,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/v17/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v18/types/errors"
 )
 
 var (

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/v17/ante"
-	"github.com/cosmos/gaia/v17/app/helpers"
+	"github.com/cosmos/gaia/v18/ante"
+	"github.com/cosmos/gaia/v18/app/helpers"
 )
 
 // Test that the GovVoteDecorator rejects v1beta1 vote messages from accounts with less than 1 atom staked

app/app.go

@@ -51,19 +51,19 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	gaiaante "github.com/cosmos/gaia/v17/ante"
-	"github.com/cosmos/gaia/v17/app/keepers"
-	"github.com/cosmos/gaia/v17/app/params"
-	"github.com/cosmos/gaia/v17/app/upgrades"
-	v17 "github.com/cosmos/gaia/v17/app/upgrades/v17"
-	"github.com/cosmos/gaia/v17/x/globalfee"
+	gaiaante "github.com/cosmos/gaia/v18/ante"
+	"github.com/cosmos/gaia/v18/app/keepers"
+	"github.com/cosmos/gaia/v18/app/params"
+	"github.com/cosmos/gaia/v18/app/upgrades"
+	v18 "github.com/cosmos/gaia/v18/app/upgrades/v18"
+	"github.com/cosmos/gaia/v18/x/globalfee"
 )
 
 var (
 	// DefaultNodeHome default home directories for the application daemon
 	DefaultNodeHome string
 
-	Upgrades = []upgrades.Upgrade{v17.Upgrade}
+	Upgrades = []upgrades.Upgrade{v18.Upgrade}
 )
 
 var (

app/app_test.go

@@ -11,8 +11,8 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	gaia "github.com/cosmos/gaia/v17/app"
-	gaiahelpers "github.com/cosmos/gaia/v17/app/helpers"
+	gaia "github.com/cosmos/gaia/v18/app"
+	gaiahelpers "github.com/cosmos/gaia/v18/app/helpers"
 )
 
 type EmptyAppOptions struct{}

app/encoding.go

@@ -3,7 +3,7 @@ package gaia
 import (
 	"github.com/cosmos/cosmos-sdk/std"
 
-	"github.com/cosmos/gaia/v17/app/params"
+	"github.com/cosmos/gaia/v18/app/params"
 )
 
 func RegisterEncodingConfig() params.EncodingConfig {

app/genesis.go

@@ -3,7 +3,7 @@ package gaia
 import (
 	"encoding/json"
 
-	"github.com/cosmos/gaia/v17/app/params"
+	"github.com/cosmos/gaia/v18/app/params"
 )
 
 // The genesis state of the blockchain is represented here as a map of raw json

app/helpers/test_helpers.go

@@ -24,7 +24,7 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	gaiaapp "github.com/cosmos/gaia/v17/app"
+	gaiaapp "github.com/cosmos/gaia/v18/app"
 )
 
 // SimAppChainID hardcoded chainID for simulation

app/keepers/keepers.go

@@ -78,7 +78,7 @@ import (
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/x/globalfee"
+	"github.com/cosmos/gaia/v18/x/globalfee"
 )
 
 type AppKeepers struct {

app/modules.go

@@ -60,10 +60,10 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	gaiaappparams "github.com/cosmos/gaia/v17/app/params"
-	"github.com/cosmos/gaia/v17/x/globalfee"
-	"github.com/cosmos/gaia/v17/x/metaprotocols"
-	metaprotocolstypes "github.com/cosmos/gaia/v17/x/metaprotocols/types"
+	gaiaappparams "github.com/cosmos/gaia/v18/app/params"
+	"github.com/cosmos/gaia/v18/x/globalfee"
+	"github.com/cosmos/gaia/v18/x/metaprotocols"
+	metaprotocolstypes "github.com/cosmos/gaia/v18/x/metaprotocols/types"
 )
 
 var maccPerms = map[string][]string{

app/sim/sim_state.go

@@ -22,8 +22,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	gaia "github.com/cosmos/gaia/v17/app"
-	"github.com/cosmos/gaia/v17/app/params"
+	gaia "github.com/cosmos/gaia/v18/app"
+	"github.com/cosmos/gaia/v18/app/params"
 )
 
 // Simulation parameter constants

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/v17/app"
+	gaia "github.com/cosmos/gaia/v18/app"
 )
 
 // SimulationOperations retrieves the simulation params from the provided file path

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/v17/app"
-	"github.com/cosmos/gaia/v17/app/sim"
+	gaia "github.com/cosmos/gaia/v18/app"
+	"github.com/cosmos/gaia/v18/app/sim"
 )
 
 // Profile with:

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/v17/ante"
-	gaia "github.com/cosmos/gaia/v17/app"
+	"github.com/cosmos/gaia/v18/ante"
+	gaia "github.com/cosmos/gaia/v18/app"
 	// "github.com/cosmos/gaia/v11/app/helpers"
 	// "github.com/cosmos/gaia/v11/app/params"
-	"github.com/cosmos/gaia/v17/app/sim"
+	"github.com/cosmos/gaia/v18/app/sim"
 )
 
 // AppChainID hardcoded chainID for simulation

app/upgrades/types.go

@@ -6,7 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal

app/upgrades/v10/constants.go

@@ -1,7 +1,7 @@
 package v10
 
 import (
-	"github.com/cosmos/gaia/v17/app/upgrades"
+	"github.com/cosmos/gaia/v18/app/upgrades"
 )
 
 const (

app/upgrades/v10/upgrades.go

@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v11/constants.go

@@ -1,7 +1,7 @@
 package v11
 
 import (
-	"github.com/cosmos/gaia/v17/app/upgrades"
+	"github.com/cosmos/gaia/v18/app/upgrades"
 )
 
 const (

app/upgrades/v11/upgrades.go

@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v12/constants.go

@@ -3,7 +3,7 @@ package v12
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/cosmos/gaia/v17/app/upgrades"
+	"github.com/cosmos/gaia/v18/app/upgrades"
 )
 
 const (

app/upgrades/v12/upgrades.go

@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v13/constants.go

@@ -1,7 +1,7 @@
 package v13
 
 import (
-	"github.com/cosmos/gaia/v17/app/upgrades"
+	"github.com/cosmos/gaia/v18/app/upgrades"
 )
 
 const (

app/upgrades/v13/upgrades.go

@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v14/constants.go

@@ -1,7 +1,7 @@
 package v14
 
 import (
-	"github.com/cosmos/gaia/v17/app/upgrades"
+	"github.com/cosmos/gaia/v18/app/upgrades"
 )
 
 const (

app/upgrades/v14/upgrades.go

@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v15/constants.go

@@ -5,7 +5,7 @@ import (
 	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 
-	"github.com/cosmos/gaia/v17/app/upgrades"
+	"github.com/cosmos/gaia/v18/app/upgrades"
 )
 
 const (

app/upgrades/v15/upgrades.go

@@ -27,7 +27,7 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 // CreateUpgradeHandler returns a upgrade handler for Gaia v15

app/upgrades/v15/upgrades_test.go

@@ -22,8 +22,8 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/cosmos/gaia/v17/app/helpers"
-	v15 "github.com/cosmos/gaia/v17/app/upgrades/v15"
+	"github.com/cosmos/gaia/v18/app/helpers"
+	v15 "github.com/cosmos/gaia/v18/app/upgrades/v15"
 )
 
 func TestUpgradeSigningInfos(t *testing.T) {

app/upgrades/v16/constants.go

@@ -8,7 +8,7 @@ import (
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/cosmos/gaia/v17/app/upgrades"
+	"github.com/cosmos/gaia/v18/app/upgrades"
 )
 
 const (

app/upgrades/v16/upgrades.go

@@ -18,7 +18,7 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 var RateLimits = map[string]ratelimittypes.MsgAddRateLimit{

app/upgrades/v16/upgrades_test.go

@@ -17,8 +17,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 
-	"github.com/cosmos/gaia/v17/app/helpers"
-	v16 "github.com/cosmos/gaia/v17/app/upgrades/v16"
+	"github.com/cosmos/gaia/v18/app/helpers"
+	v16 "github.com/cosmos/gaia/v18/app/upgrades/v16"
 )
 
 var AtomSupply = sdkmath.NewInt(1000)

app/upgrades/v17/constants.go

@@ -1,7 +1,7 @@
 package v17
 
 import (
-	"github.com/cosmos/gaia/v17/app/upgrades"
+	"github.com/cosmos/gaia/v18/app/upgrades"
 )
 
 const (

app/upgrades/v17/upgrades.go

@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/cosmos/gaia/v17/app/keepers"
+	"github.com/cosmos/gaia/v18/app/keepers"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v18/constants.go

@@ -0,0 +1,15 @@
+package v18
+
+import (
+	"github.com/cosmos/gaia/v18/app/upgrades"
+)
+
+const (
+	// UpgradeName defines the on-chain upgrade name.
+	UpgradeName = "v18"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+}

app/upgrades/v18/upgrades.go

@@ -0,0 +1,27 @@
+package v18
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
+	"github.com/cosmos/gaia/v18/app/keepers"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	keepers *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx.Logger().Info("Starting module migrations...")
+
+		vm, err := mm.RunMigrations(ctx, configurator, vm)
+		if err != nil {
+			return vm, err
+		}
+
+		ctx.Logger().Info("Upgrade v18 complete")
+		return vm, nil
+	}
+}