diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 83d02e08424..76430a3bce4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -149,7 +149,7 @@ jobs: # the old gaiad binary version is hardcoded, need to be updated each major release. - name: Install Old Gaiad run: | - git checkout v12.0.0 + git checkout v13.0.0 make build cp ./build/gaiad ./build/gaiadold go clean -modcache diff --git a/ante/ante.go b/ante/ante.go index 72f2241e389..4f3215ba2a6 100644 --- a/ante/ante.go +++ b/ante/ante.go @@ -12,8 +12,8 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" - gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" + gaiafeeante "github.com/cosmos/gaia/v14/x/globalfee/ante" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/ante/gov_ante.go b/ante/gov_ante.go index e0abb9fd4b3..7d8b6b3fd1d 100644 --- a/ante/gov_ante.go +++ b/ante/gov_ante.go @@ -9,7 +9,7 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" ) // initial deposit must be greater than or equal to 10% of the minimum deposit diff --git a/ante/gov_ante_test.go b/ante/gov_ante_test.go index 9f11c51ae70..d965b2d76eb 100644 --- a/ante/gov_ante_test.go +++ b/ante/gov_ante_test.go @@ -13,9 +13,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/gaia/v13/ante" - gaiaapp "github.com/cosmos/gaia/v13/app" - gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" + "github.com/cosmos/gaia/v14/ante" + gaiaapp "github.com/cosmos/gaia/v14/app" + gaiahelpers "github.com/cosmos/gaia/v14/app/helpers" ) var ( diff --git a/app/app.go b/app/app.go index 9a6312423c4..382ac83b74c 100644 --- a/app/app.go +++ b/app/app.go @@ -45,19 +45,19 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gaiaante "github.com/cosmos/gaia/v13/ante" - "github.com/cosmos/gaia/v13/app/keepers" - gaiaappparams "github.com/cosmos/gaia/v13/app/params" - "github.com/cosmos/gaia/v13/app/upgrades" - v13 "github.com/cosmos/gaia/v13/app/upgrades/v13" - "github.com/cosmos/gaia/v13/x/globalfee" + gaiaante "github.com/cosmos/gaia/v14/ante" + "github.com/cosmos/gaia/v14/app/keepers" + gaiaappparams "github.com/cosmos/gaia/v14/app/params" + "github.com/cosmos/gaia/v14/app/upgrades" + v14 "github.com/cosmos/gaia/v14/app/upgrades/v14" + "github.com/cosmos/gaia/v14/x/globalfee" ) var ( // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string - Upgrades = []upgrades.Upgrade{v13.Upgrade} + Upgrades = []upgrades.Upgrade{v14.Upgrade} ) var ( diff --git a/app/app_test.go b/app/app_test.go index 53f77176382..e3dc4521e3e 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -10,8 +10,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/v13/app" - gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" + gaia "github.com/cosmos/gaia/v14/app" + gaiahelpers "github.com/cosmos/gaia/v14/app/helpers" ) type EmptyAppOptions struct{} diff --git a/app/encoding.go b/app/encoding.go index 55fe401f209..6cec0ad1f56 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -3,7 +3,7 @@ package gaia import ( "github.com/cosmos/cosmos-sdk/std" - "github.com/cosmos/gaia/v13/app/params" + "github.com/cosmos/gaia/v14/app/params" ) // MakeTestEncodingConfig creates an EncodingConfig for testing. This function diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index de96f07630e..2544de72548 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -22,7 +22,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/v13/app" + gaiaapp "github.com/cosmos/gaia/v14/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index d5159f4f357..2fa95d0a8fb 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -62,7 +62,7 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/x/globalfee" + "github.com/cosmos/gaia/v14/x/globalfee" ) type AppKeepers struct { diff --git a/app/modules.go b/app/modules.go index f774e104bab..8aaed6a11a5 100644 --- a/app/modules.go +++ b/app/modules.go @@ -52,8 +52,8 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gaiaappparams "github.com/cosmos/gaia/v13/app/params" - "github.com/cosmos/gaia/v13/x/globalfee" + gaiaappparams "github.com/cosmos/gaia/v14/app/params" + "github.com/cosmos/gaia/v14/x/globalfee" ) var maccPerms = map[string][]string{ diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go index e1053aec363..57df6151bd2 100644 --- a/app/sim/sim_state.go +++ b/app/sim/sim_state.go @@ -21,7 +21,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/v13/app" + gaia "github.com/cosmos/gaia/v14/app" ) // AppStateFn returns the initial application state using a genesis or the simulation parameters. diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go index 2e4e39d7a1c..9d061980fcf 100644 --- a/app/sim/sim_utils.go +++ b/app/sim/sim_utils.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - gaia "github.com/cosmos/gaia/v13/app" + gaia "github.com/cosmos/gaia/v14/app" ) // SetupSimulation creates the config, db (levelDB), temporary directory and logger for diff --git a/app/sim_test.go b/app/sim_test.go index c48b68b4b5a..c2ddc173377 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -17,10 +17,10 @@ import ( simulation2 "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - gaia "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/app/helpers" - "github.com/cosmos/gaia/v13/app/params" - "github.com/cosmos/gaia/v13/app/sim" + gaia "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/app/helpers" + "github.com/cosmos/gaia/v14/app/params" + "github.com/cosmos/gaia/v14/app/sim" ) func init() { diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 74bbbe1cb6b..21c6d3e7964 100644 --- a/app/upgrades/types.go +++ b/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/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go index 54d90d226d4..f7ef82b2df3 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -1,7 +1,7 @@ package v10 import ( - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index 9eb9b4fca07..a9e5f23b86f 100644 --- a/app/upgrades/v10/upgrades.go +++ b/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/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index 55b9e7670d8..a6fb322fa23 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -1,7 +1,7 @@ package v11 import ( - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index 3d6db458748..094bec209ac 100644 --- a/app/upgrades/v11/upgrades.go +++ b/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/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index a32b0f09f4f..edd47608af1 100644 --- a/app/upgrades/v12/constants.go +++ b/app/upgrades/v12/constants.go @@ -3,7 +3,7 @@ package v12 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index 33c4393b262..d2e27316f2d 100644 --- a/app/upgrades/v12/upgrades.go +++ b/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/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go index dcdd00a1420..9517bd26971 100644 --- a/app/upgrades/v13/constants.go +++ b/app/upgrades/v13/constants.go @@ -1,7 +1,7 @@ package v13 import ( - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index 9ee328d928d..06cb10f3dde 100644 --- a/app/upgrades/v13/upgrades.go +++ b/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/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go new file mode 100644 index 00000000000..7172d6a04fa --- /dev/null +++ b/app/upgrades/v14/constants.go @@ -0,0 +1,15 @@ +package v14 + +import ( + "github.com/cosmos/gaia/v14/app/upgrades" +) + +const ( + // UpgradeName defines the on-chain upgrade name. + UpgradeName = "v14" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, +} diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go new file mode 100644 index 00000000000..c3d81130440 --- /dev/null +++ b/app/upgrades/v14/upgrades.go @@ -0,0 +1,27 @@ +package v14 + +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/v14/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 complete") + return vm, err + } +} diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go index d2e142a83b7..3d965a0f0c0 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -5,7 +5,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index 3d3d2766034..470511c8f97 100644 --- a/app/upgrades/v7/upgrades.go +++ b/app/upgrades/v7/upgrades.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go index ce5e94ba666..12de1908a86 100644 --- a/app/upgrades/v8/constants.go +++ b/app/upgrades/v8/constants.go @@ -3,8 +3,8 @@ package v8 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v13/app/upgrades" - "github.com/cosmos/gaia/v13/x/globalfee" + "github.com/cosmos/gaia/v14/app/upgrades" + "github.com/cosmos/gaia/v14/x/globalfee" ) const ( diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index 6ee76679ce1..190d354e122 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -14,7 +14,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func FixBankMetadata(ctx sdk.Context, keepers *keepers.AppKeepers) error { diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go index aac62691873..99abaa30fb5 100644 --- a/app/upgrades/v9/constants.go +++ b/app/upgrades/v9/constants.go @@ -5,7 +5,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index d90b3ead3a3..0c49d0bc3fa 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/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/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go index d1af78ec170..1dfcac71e03 100644 --- 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/v13/pkg/address" + addressutil "github.com/cosmos/gaia/v14/pkg/address" ) var flagBech32Prefix = "prefix" diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go index 6a8cddb9f3b..3e85d35d7d2 100644 --- a/cmd/gaiad/cmd/root.go +++ b/cmd/gaiad/cmd/root.go @@ -31,8 +31,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - gaia "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/app/params" + gaia "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/app/params" ) // 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 index bc8a6cadbad..206ef93e7a8 100644 --- 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/v13/app" - "github.com/cosmos/gaia/v13/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/cmd/gaiad/cmd" ) func TestRootCmdConfig(t *testing.T) { diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go index f1dcc176b15..897dce4444a 100644 --- a/cmd/gaiad/main.go +++ b/cmd/gaiad/main.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - app "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/cmd/gaiad/cmd" ) func main() { diff --git a/go.mod b/go.mod index 2d6cebf00a0..dfd12779087 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v13 +module github.com/cosmos/gaia/v14 go 1.20 diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go index 64452b573af..b345ed6f68e 100644 --- a/tests/e2e/chain.go +++ b/tests/e2e/chain.go @@ -13,8 +13,8 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/app/params" + gaia "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/app/params" ) const ( diff --git a/tests/e2e/e2e_vesting_test.go b/tests/e2e/e2e_vesting_test.go index 3cd70ad6d28..43838037fd9 100644 --- a/tests/e2e/e2e_vesting_test.go +++ b/tests/e2e/e2e_vesting_test.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v13/x/globalfee/ante" + "github.com/cosmos/gaia/v14/x/globalfee/ante" ) const ( diff --git a/tests/e2e/genesis.go b/tests/e2e/genesis.go index d89fe4ae9ec..6f7059f965f 100644 --- a/tests/e2e/genesis.go +++ b/tests/e2e/genesis.go @@ -19,7 +19,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - globfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" + globfeetypes "github.com/cosmos/gaia/v14/x/globalfee/types" ) func getGenDoc(path string) (*tmtypes.GenesisDoc, error) { diff --git a/tests/e2e/query.go b/tests/e2e/query.go index 6ba1ba81a5a..b93ed9a0312 100644 --- a/tests/e2e/query.go +++ b/tests/e2e/query.go @@ -16,7 +16,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) func queryGaiaTx(endpoint, txHash string) error { diff --git a/tests/e2e/validator.go b/tests/e2e/validator.go index d50bdc92bb0..48e0b39cc46 100644 --- a/tests/e2e/validator.go +++ b/tests/e2e/validator.go @@ -25,7 +25,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v13/app" + gaia "github.com/cosmos/gaia/v14/app" ) //nolint:unused diff --git a/tests/ics/interchain_security_test.go b/tests/ics/interchain_security_test.go index 141ee73a6ae..3b1e844ad27 100644 --- a/tests/ics/interchain_security_test.go +++ b/tests/ics/interchain_security_test.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/interchain-security/v2/tests/integration" icstestingutils "github.com/cosmos/interchain-security/v2/testutil/ibc_testing" - gaiaApp "github.com/cosmos/gaia/v13/app" + gaiaApp "github.com/cosmos/gaia/v14/app" ) func TestCCVTestSuite(t *testing.T) { diff --git a/x/globalfee/alias.go b/x/globalfee/alias.go index a7e7337cd59..8de706b955b 100644 --- a/x/globalfee/alias.go +++ b/x/globalfee/alias.go @@ -1,7 +1,7 @@ package globalfee import ( - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) const ( diff --git a/x/globalfee/ante/antetest/fee_test.go b/x/globalfee/ante/antetest/fee_test.go index 66646cf2a39..603ab27f587 100644 --- a/x/globalfee/ante/antetest/fee_test.go +++ b/x/globalfee/ante/antetest/fee_test.go @@ -13,8 +13,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" + gaiafeeante "github.com/cosmos/gaia/v14/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v14/x/globalfee/types" ) var testGasLimit uint64 = 200_000 diff --git a/x/globalfee/ante/antetest/fee_test_setup.go b/x/globalfee/ante/antetest/fee_test_setup.go index 28fbad3f3ab..f3a1ff5a450 100644 --- a/x/globalfee/ante/antetest/fee_test_setup.go +++ b/x/globalfee/ante/antetest/fee_test_setup.go @@ -17,11 +17,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaapp "github.com/cosmos/gaia/v13/app" - gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" - "github.com/cosmos/gaia/v13/x/globalfee" - gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" + gaiaapp "github.com/cosmos/gaia/v14/app" + gaiahelpers "github.com/cosmos/gaia/v14/app/helpers" + "github.com/cosmos/gaia/v14/x/globalfee" + gaiafeeante "github.com/cosmos/gaia/v14/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v14/x/globalfee/types" ) type IntegrationTestSuite struct { diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index 913db72112a..92cfb6718e1 100644 --- a/x/globalfee/ante/fee.go +++ b/x/globalfee/ante/fee.go @@ -12,9 +12,9 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" - "github.com/cosmos/gaia/v13/x/globalfee" - "github.com/cosmos/gaia/v13/x/globalfee/types" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" + "github.com/cosmos/gaia/v14/x/globalfee" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) // FeeWithBypassDecorator checks if the transaction's fee is at least as large diff --git a/x/globalfee/ante/fee_utils.go b/x/globalfee/ante/fee_utils.go index d66929b0000..94eac3b5582 100644 --- a/x/globalfee/ante/fee_utils.go +++ b/x/globalfee/ante/fee_utils.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" ) // ContainZeroCoins returns true if the given coins are empty or contain zero coins, diff --git a/x/globalfee/client/cli/query.go b/x/globalfee/client/cli/query.go index 08751f58f4e..ed48a97a38c 100644 --- a/x/globalfee/client/cli/query.go +++ b/x/globalfee/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index 04c13b00187..7fe2739c4e5 100644 --- a/x/globalfee/genesis_test.go +++ b/x/globalfee/genesis_test.go @@ -18,7 +18,7 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) func TestDefaultGenesis(t *testing.T) { diff --git a/x/globalfee/keeper/migrations.go b/x/globalfee/keeper/migrations.go index 5036f70f731..6c6ffa878eb 100644 --- a/x/globalfee/keeper/migrations.go +++ b/x/globalfee/keeper/migrations.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/cosmos/gaia/v13/x/globalfee/migrations/v2" + v2 "github.com/cosmos/gaia/v14/x/globalfee/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/globalfee/migrations/v2/migration.go b/x/globalfee/migrations/v2/migration.go index 065337ae92d..b07624273f1 100644 --- a/x/globalfee/migrations/v2/migration.go +++ b/x/globalfee/migrations/v2/migration.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) // MigrateStore performs in-place params migrations of diff --git a/x/globalfee/migrations/v2/v2_test/migration_test.go b/x/globalfee/migrations/v2/v2_test/migration_test.go index b7d36d20785..ba513628f1d 100644 --- a/x/globalfee/migrations/v2/v2_test/migration_test.go +++ b/x/globalfee/migrations/v2/v2_test/migration_test.go @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/cosmos/gaia/v13/x/globalfee/migrations/v2" - globalfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" + v2 "github.com/cosmos/gaia/v14/x/globalfee/migrations/v2" + globalfeetypes "github.com/cosmos/gaia/v14/x/globalfee/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/globalfee/module.go b/x/globalfee/module.go index 0fb07acedfb..238df44a1b5 100644 --- a/x/globalfee/module.go +++ b/x/globalfee/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v13/x/globalfee/client/cli" - "github.com/cosmos/gaia/v13/x/globalfee/keeper" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/client/cli" + "github.com/cosmos/gaia/v14/x/globalfee/keeper" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) var ( diff --git a/x/globalfee/querier.go b/x/globalfee/querier.go index 4f4c7e250dd..4d2d15b90ac 100644 --- a/x/globalfee/querier.go +++ b/x/globalfee/querier.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) var _ types.QueryServer = &GrpcQuerier{} diff --git a/x/globalfee/querier_test.go b/x/globalfee/querier_test.go index 966bcd55571..1a29bd627ab 100644 --- a/x/globalfee/querier_test.go +++ b/x/globalfee/querier_test.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) func TestQueryMinimumGasPrices(t *testing.T) { diff --git a/x/globalfee/types/params.go b/x/globalfee/types/params.go index 7f0d522d303..b83a693100b 100644 --- a/x/globalfee/types/params.go +++ b/x/globalfee/types/params.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" ) var (