Merge remote-tracking branch 'origin' into eric/lsm-split

.github/workflows/docker-push.yml

@@ -46,7 +46,7 @@ jobs:
           flavor: "latest=false"
 
       - name: Build and push docker image
-        uses: docker/build-push-action@v6.10.0
+        uses: docker/build-push-action@v6.12.0
         with:
           context: .
           file: Dockerfile

.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/v21.0.0/gaiad-v21.0.0-linux-amd64
-          chmod a+x gaiad-v21.0.0-linux-amd64
+          curl -LO https://github.com/cosmos/gaia/releases/download/v22.0.0/gaiad-v22.0.0-linux-amd64
+          chmod a+x gaiad-v22.0.0-linux-amd64
           mkdir build
-          mv ./gaiad-v21.0.0-linux-amd64 ./build/gaiadold
+          mv ./gaiad-v22.0.0-linux-amd64 ./build/gaiadold
         if: env.GIT_DIFF
       - name: Install New Gaiad
         run: |

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/v22/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v23/types/errors"
 )
 
 // UseFeeMarketDecorator to make the integration testing easier: we can switch off its ante and post decorators with this flag

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/v22/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v23/types/errors"
 )
 
 var expeditedPropDecoratorEnabled = true

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/v22/ante"
-	"github.com/cosmos/gaia/v22/app/helpers"
+	"github.com/cosmos/gaia/v23/ante"
+	"github.com/cosmos/gaia/v23/app/helpers"
 )
 
 func TestGovExpeditedProposalsDecorator(t *testing.T) {

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

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/v22/ante"
-	"github.com/cosmos/gaia/v22/app/keepers"
-	"github.com/cosmos/gaia/v22/app/upgrades"
-	v22 "github.com/cosmos/gaia/v22/app/upgrades/v22"
+	gaiaante "github.com/cosmos/gaia/v23/ante"
+	"github.com/cosmos/gaia/v23/app/keepers"
+	"github.com/cosmos/gaia/v23/app/upgrades"
+	v23 "github.com/cosmos/gaia/v23/app/upgrades/v23"
 )
 
 var (
 	// DefaultNodeHome default home directories for the application daemon
 	DefaultNodeHome string
 
-	Upgrades = []upgrades.Upgrade{v22.Upgrade}
+	Upgrades = []upgrades.Upgrade{v23.Upgrade}
 )
 
 var (

app/app_test.go

@@ -14,8 +14,8 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
-	gaia "github.com/cosmos/gaia/v22/app"
-	gaiahelpers "github.com/cosmos/gaia/v22/app/helpers"
+	gaia "github.com/cosmos/gaia/v23/app"
+	gaiahelpers "github.com/cosmos/gaia/v23/app/helpers"
 )
 
 type EmptyAppOptions struct{}

app/helpers/test_helpers.go

@@ -30,7 +30,7 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
-	gaiaapp "github.com/cosmos/gaia/v22/app"
+	gaiaapp "github.com/cosmos/gaia/v23/app"
 )
 
 // SimAppChainID hardcoded chainID for simulation

app/modules.go

@@ -62,10 +62,10 @@ import (
 	wasm "github.com/CosmWasm/wasmd/x/wasm"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	"github.com/cosmos/gaia/v22/x/lsm"
-	lsmtypes "github.com/cosmos/gaia/v22/x/lsm/types"
-	"github.com/cosmos/gaia/v22/x/metaprotocols"
-	metaprotocolstypes "github.com/cosmos/gaia/v22/x/metaprotocols/types"
+	"github.com/cosmos/gaia/v23/x/lsm"
+	lsmtypes "github.com/cosmos/gaia/v23/x/lsm/types"
+	"github.com/cosmos/gaia/v23/x/metaprotocols"
+	metaprotocolstypes "github.com/cosmos/gaia/v23/x/metaprotocols/types"
 )
 
 var maccPerms = map[string][]string{

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/v22/ante"
+	"github.com/cosmos/gaia/v23/ante"
 )
 
 // PostHandlerOptions are the options required for constructing a FeeMarket PostHandler.

app/sim/sim_state.go

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

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/v22/app/keepers"
+	"github.com/cosmos/gaia/v23/app/keepers"
 )
 
 // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal

app/upgrades/v19/constants.go

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

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/v22/app/keepers"
+	"github.com/cosmos/gaia/v23/app/keepers"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v20/constants.go

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

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/v22/app/keepers"
+	"github.com/cosmos/gaia/v23/app/keepers"
 )
 
 // Constants for the new parameters in the v20 upgrade.

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/v22/app/helpers"
-	v20 "github.com/cosmos/gaia/v22/app/upgrades/v20"
+	"github.com/cosmos/gaia/v23/app/helpers"
+	v20 "github.com/cosmos/gaia/v23/app/upgrades/v20"
 )
 
 func GetTestMsgConsumerAddition() providertypes.MsgConsumerAddition { //nolint:staticcheck

app/upgrades/v21/constants.go

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

app/upgrades/v21/upgrades.go

@@ -18,7 +18,7 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 
-	"github.com/cosmos/gaia/v22/app/keepers"
+	"github.com/cosmos/gaia/v23/app/keepers"
 )
 
 // Neutron and Stride denoms that were not whitelisted but the consumer rewards pool contains amounts of those denoms.

app/upgrades/v21/upgrades_test.go

@@ -9,8 +9,8 @@ import (
 
 	govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 
-	"github.com/cosmos/gaia/v22/app/helpers"
-	v21 "github.com/cosmos/gaia/v22/app/upgrades/v21"
+	"github.com/cosmos/gaia/v23/app/helpers"
+	v21 "github.com/cosmos/gaia/v23/app/upgrades/v21"
 )
 
 func TestHasExpectedChainIDSanityCheck(t *testing.T) {

app/upgrades/v22/constants.go

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

app/upgrades/v22/upgrades.go

@@ -12,7 +12,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/cosmos/gaia/v22/app/keepers"
+	"github.com/cosmos/gaia/v23/app/keepers"
 )
 
 // CreateUpgradeHandler returns an upgrade handler for Gaia v22.

app/upgrades/v22/upgrades_test.go

@@ -11,7 +11,7 @@ import (
 
 	"cosmossdk.io/math"
 
-	v22 "github.com/cosmos/gaia/v22/app/upgrades/v22"
+	v22 "github.com/cosmos/gaia/v23/app/upgrades/v22"
 )
 
 func TestSetDefaultConsumerInfractionParams(t *testing.T) {

app/upgrades/v23/constants.go

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

app/upgrades/v23/upgrades.go

@@ -0,0 +1,33 @@
+package v23
+
+import (
+	"context"
+
+	errorsmod "cosmossdk.io/errors"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+
+	"github.com/cosmos/gaia/v23/app/keepers"
+)
+
+// CreateUpgradeHandler returns an upgrade handler for Gaia v23.
+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, errorsmod.Wrapf(err, "running module migrations")
+		}
+
+		ctx.Logger().Info("Upgrade v23 complete")
+		return vm, nil
+	}
+}

cmd/gaiad/cmd/bech32_convert.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	addressutil "github.com/cosmos/gaia/v22/pkg/address"
+	addressutil "github.com/cosmos/gaia/v23/pkg/address"
 )
 
 var flagBech32Prefix = "prefix"

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/v22/app"
+	gaia "github.com/cosmos/gaia/v23/app"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

cmd/gaiad/cmd/root_test.go

@@ -7,8 +7,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	app "github.com/cosmos/gaia/v22/app"
-	"github.com/cosmos/gaia/v22/cmd/gaiad/cmd"
+	app "github.com/cosmos/gaia/v23/app"
+	"github.com/cosmos/gaia/v23/cmd/gaiad/cmd"
 )
 
 func TestRootCmdConfig(t *testing.T) {

cmd/gaiad/cmd/testnet_set_local_validator.go

@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 
-	gaia "github.com/cosmos/gaia/v22/app"
+	gaia "github.com/cosmos/gaia/v23/app"
 
 	"cosmossdk.io/log"
 	"github.com/cometbft/cometbft/crypto"

cmd/gaiad/main.go

@@ -5,8 +5,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	app "github.com/cosmos/gaia/v22/app"
-	"github.com/cosmos/gaia/v22/cmd/gaiad/cmd"
+	app "github.com/cosmos/gaia/v23/app"
+	"github.com/cosmos/gaia/v23/cmd/gaiad/cmd"
 )
 
 func main() {