From be6e8cd3fb1760404154ef4d160577b27cb6ec79 Mon Sep 17 00:00:00 2001 From: Marius Poke Date: Thu, 14 Mar 2024 18:19:48 +0100 Subject: [PATCH] chore: update main to v16 (#2947) * gaia/v15 -> gaia/v16 * update test.yml * add v16 upgrade handler * make format * fix upgrade-test * bump go version in test.yml * gaiad genesis add-genesis-account * fix testing scripts * fix upgrade test in gh workflow * fix upgrade test in gh workflow 2 * debug store upgrade * bump version for metaprotocols --------- Co-authored-by: Simon Noetzlin Co-authored-by: MSalopek --- .github/workflows/test.yml | 4 +-- ante/ante.go | 4 +-- ante/gov_vote_ante.go | 2 +- ante/gov_vote_ante_test.go | 4 +-- app/app.go | 14 +++++----- app/app_test.go | 4 +-- app/encoding.go | 2 +- app/genesis.go | 2 +- app/helpers/test_helpers.go | 2 +- app/keepers/keepers.go | 2 +- app/modules.go | 8 +++--- app/sim/sim_state.go | 4 +-- app/sim/sim_utils.go | 2 +- app/sim_bench_test.go | 4 +-- app/sim_test.go | 6 ++--- app/upgrades/types.go | 2 +- app/upgrades/v10/constants.go | 2 +- app/upgrades/v10/upgrades.go | 2 +- app/upgrades/v11/constants.go | 2 +- app/upgrades/v11/upgrades.go | 2 +- app/upgrades/v12/constants.go | 2 +- app/upgrades/v12/upgrades.go | 2 +- app/upgrades/v13/constants.go | 2 +- app/upgrades/v13/upgrades.go | 2 +- app/upgrades/v14/constants.go | 2 +- app/upgrades/v14/upgrades.go | 2 +- app/upgrades/v15/constants.go | 2 +- app/upgrades/v15/upgrades.go | 2 +- app/upgrades/v15/upgrades_test.go | 4 +-- app/upgrades/v16/constants.go | 15 +++++++++++ app/upgrades/v16/upgrades.go | 27 +++++++++++++++++++ app/upgrades/v7/constants.go | 2 +- app/upgrades/v7/upgrades.go | 2 +- app/upgrades/v8/constants.go | 4 +-- app/upgrades/v8/upgrades.go | 2 +- app/upgrades/v9/constants.go | 2 +- app/upgrades/v9/upgrades.go | 2 +- cmd/gaiad/cmd/bech32_convert.go | 2 +- cmd/gaiad/cmd/root.go | 4 +-- cmd/gaiad/cmd/root_test.go | 4 +-- cmd/gaiad/main.go | 4 +-- contrib/scripts/local-gaia.sh | 6 ++--- .../scripts/upgrade_test_scripts/run_gaia.sh | 6 ++--- .../run_upgrade_commands.sh | 3 ++- contrib/single-node.sh | 8 +++--- contrib/testnets/using-cleveldb.sh | 6 ++--- docs/docs/resources/genesis.md | 2 +- go.mod | 2 +- tests/e2e/chain.go | 4 +-- tests/e2e/e2e_bank_test.go | 2 +- tests/e2e/genesis.go | 2 +- tests/e2e/query.go | 2 +- tests/e2e/validator.go | 2 +- tests/ics/interchain_security_test.go | 2 +- x/globalfee/alias.go | 2 +- x/globalfee/ante/antetest/fee_test.go | 4 +-- x/globalfee/ante/antetest/fee_test_setup.go | 12 ++++----- x/globalfee/ante/fee.go | 6 ++--- x/globalfee/ante/fee_utils.go | 2 +- x/globalfee/client/cli/query.go | 2 +- x/globalfee/genesis_test.go | 4 +-- x/globalfee/keeper/migrations.go | 2 +- x/globalfee/migrations/v2/migration.go | 2 +- .../migrations/v2/v2_test/migration_test.go | 4 +-- x/globalfee/module.go | 6 ++--- x/globalfee/querier.go | 2 +- x/globalfee/types/params.go | 2 +- x/metaprotocols/module.go | 2 +- 68 files changed, 153 insertions(+), 110 deletions(-) create mode 100644 app/upgrades/v16/constants.go create mode 100644 app/upgrades/v16/upgrades.go diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b23bb2e09fb..df6c30303ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -147,11 +147,11 @@ jobs: go.sum - uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.21.x # the old gaiad binary version is hardcoded, need to be updated each major release. - name: Install Old Gaiad run: | - git checkout v14.0.0 + git checkout v15.0.0-rc1 make build cp ./build/gaiad ./build/gaiadold go clean -modcache diff --git a/ante/ante.go b/ante/ante.go index b82f0604bcc..9716221412b 100644 --- a/ante/ante.go +++ b/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/v15/types/errors" - gaiafeeante "github.com/cosmos/gaia/v15/x/globalfee/ante" + gaiaerrors "github.com/cosmos/gaia/v16/types/errors" + gaiafeeante "github.com/cosmos/gaia/v16/x/globalfee/ante" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/ante/gov_vote_ante.go b/ante/gov_vote_ante.go index abf6f9300a5..f71674a6d21 100644 --- a/ante/gov_vote_ante.go +++ b/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/v15/types/errors" + gaiaerrors "github.com/cosmos/gaia/v16/types/errors" ) var ( diff --git a/ante/gov_vote_ante_test.go b/ante/gov_vote_ante_test.go index da1345a3dc5..2b0a9914ba7 100644 --- 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/v15/ante" - "github.com/cosmos/gaia/v15/app/helpers" + "github.com/cosmos/gaia/v16/ante" + "github.com/cosmos/gaia/v16/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 index 9165aaeb977..b433f83cc1c 100644 --- a/app/app.go +++ b/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/v15/ante" - "github.com/cosmos/gaia/v15/app/keepers" - "github.com/cosmos/gaia/v15/app/params" - "github.com/cosmos/gaia/v15/app/upgrades" - v15 "github.com/cosmos/gaia/v15/app/upgrades/v15" - "github.com/cosmos/gaia/v15/x/globalfee" + gaiaante "github.com/cosmos/gaia/v16/ante" + "github.com/cosmos/gaia/v16/app/keepers" + "github.com/cosmos/gaia/v16/app/params" + "github.com/cosmos/gaia/v16/app/upgrades" + v16 "github.com/cosmos/gaia/v16/app/upgrades/v16" + "github.com/cosmos/gaia/v16/x/globalfee" ) var ( // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string - Upgrades = []upgrades.Upgrade{v15.Upgrade} + Upgrades = []upgrades.Upgrade{v16.Upgrade} ) var ( diff --git a/app/app_test.go b/app/app_test.go index 846d2493500..2c47e46be59 100644 --- a/app/app_test.go +++ b/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/v15/app" - gaiahelpers "github.com/cosmos/gaia/v15/app/helpers" + gaia "github.com/cosmos/gaia/v16/app" + gaiahelpers "github.com/cosmos/gaia/v16/app/helpers" ) type EmptyAppOptions struct{} diff --git a/app/encoding.go b/app/encoding.go index a6daee49210..d4e355ff176 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/v15/app/params" + "github.com/cosmos/gaia/v16/app/params" ) func RegisterEncodingConfig() params.EncodingConfig { diff --git a/app/genesis.go b/app/genesis.go index 6c7a804a257..e9425f89f29 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -3,7 +3,7 @@ package gaia import ( "encoding/json" - "github.com/cosmos/gaia/v15/app/params" + "github.com/cosmos/gaia/v16/app/params" ) // The genesis state of the blockchain is represented here as a map of raw json diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index 9ac54fcc775..2d78f8cca5a 100644 --- a/app/helpers/test_helpers.go +++ b/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/v15/app" + gaiaapp "github.com/cosmos/gaia/v16/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 30adea4f69d..f9c868731a1 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -68,7 +68,7 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v15/x/globalfee" + "github.com/cosmos/gaia/v16/x/globalfee" ) type AppKeepers struct { diff --git a/app/modules.go b/app/modules.go index cecdf1a7505..bc0e94b117a 100644 --- a/app/modules.go +++ b/app/modules.go @@ -55,10 +55,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/v15/app/params" - "github.com/cosmos/gaia/v15/x/globalfee" - "github.com/cosmos/gaia/v15/x/metaprotocols" - metaprotocolstypes "github.com/cosmos/gaia/v15/x/metaprotocols/types" + gaiaappparams "github.com/cosmos/gaia/v16/app/params" + "github.com/cosmos/gaia/v16/x/globalfee" + "github.com/cosmos/gaia/v16/x/metaprotocols" + metaprotocolstypes "github.com/cosmos/gaia/v16/x/metaprotocols/types" ) var maccPerms = map[string][]string{ diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go index 31a52668b6e..08ff0e61ae8 100644 --- a/app/sim/sim_state.go +++ b/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/v15/app" - "github.com/cosmos/gaia/v15/app/params" + gaia "github.com/cosmos/gaia/v16/app" + "github.com/cosmos/gaia/v16/app/params" ) // Simulation parameter constants diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go index 6499ca82a2c..f22bd501e74 100644 --- 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/v15/app" + gaia "github.com/cosmos/gaia/v16/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 index eb0aad65bb5..0fef28f98fc 100644 --- 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/v15/app" - "github.com/cosmos/gaia/v15/app/sim" + gaia "github.com/cosmos/gaia/v16/app" + "github.com/cosmos/gaia/v16/app/sim" ) // Profile with: diff --git a/app/sim_test.go b/app/sim_test.go index 7c7fa8d21f6..eda6e6ecd39 100644 --- 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/v15/ante" - gaia "github.com/cosmos/gaia/v15/app" + "github.com/cosmos/gaia/v16/ante" + gaia "github.com/cosmos/gaia/v16/app" // "github.com/cosmos/gaia/v11/app/helpers" // "github.com/cosmos/gaia/v11/app/params" - "github.com/cosmos/gaia/v15/app/sim" + "github.com/cosmos/gaia/v16/app/sim" ) // AppChainID hardcoded chainID for simulation diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 06ba7265b6a..a80482dbdbf 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/v15/app/keepers" + "github.com/cosmos/gaia/v16/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 04cfab5f79a..282053e9dc9 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -1,7 +1,7 @@ package v10 import ( - "github.com/cosmos/gaia/v15/app/upgrades" + "github.com/cosmos/gaia/v16/app/upgrades" ) const ( diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index 3e362c138b0..579c06b73d4 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/v15/app/keepers" + "github.com/cosmos/gaia/v16/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index e9e3685cd00..8f0286daace 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -1,7 +1,7 @@ package v11 import ( - "github.com/cosmos/gaia/v15/app/upgrades" + "github.com/cosmos/gaia/v16/app/upgrades" ) const ( diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index ff2380114ad..9feadb72a8d 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/v15/app/keepers" + "github.com/cosmos/gaia/v16/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index 5f255c844eb..8cbd4f7376c 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/v15/app/upgrades" + "github.com/cosmos/gaia/v16/app/upgrades" ) const ( diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index f108d819217..477e850f8df 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/v15/app/keepers" + "github.com/cosmos/gaia/v16/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go index dce0714f357..1fecdda961a 100644 --- a/app/upgrades/v13/constants.go +++ b/app/upgrades/v13/constants.go @@ -1,7 +1,7 @@ package v13 import ( - "github.com/cosmos/gaia/v15/app/upgrades" + "github.com/cosmos/gaia/v16/app/upgrades" ) const ( diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index ce2cdb6cc66..3f6514b710f 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/v15/app/keepers" + "github.com/cosmos/gaia/v16/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go index 72653142932..e3133577377 100644 --- a/app/upgrades/v14/constants.go +++ b/app/upgrades/v14/constants.go @@ -1,7 +1,7 @@ package v14 import ( - "github.com/cosmos/gaia/v15/app/upgrades" + "github.com/cosmos/gaia/v16/app/upgrades" ) const ( diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go index 9dfc1b0f61c..96be6875f70 100644 --- a/app/upgrades/v14/upgrades.go +++ b/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/v15/app/keepers" + "github.com/cosmos/gaia/v16/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go index 45182937d8a..66b4b7637c8 100644 --- a/app/upgrades/v15/constants.go +++ b/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/v15/app/upgrades" + "github.com/cosmos/gaia/v16/app/upgrades" ) const ( diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go index 78380309e26..6568cef6f70 100644 --- a/app/upgrades/v15/upgrades.go +++ b/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/v15/app/keepers" + "github.com/cosmos/gaia/v16/app/keepers" ) // CreateUpgradeHandler returns a upgrade handler for Gaia v15 diff --git a/app/upgrades/v15/upgrades_test.go b/app/upgrades/v15/upgrades_test.go index a19ea2298bc..2d0e6cd2f44 100644 --- a/app/upgrades/v15/upgrades_test.go +++ b/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/v15/app/helpers" - v15 "github.com/cosmos/gaia/v15/app/upgrades/v15" + "github.com/cosmos/gaia/v16/app/helpers" + v15 "github.com/cosmos/gaia/v16/app/upgrades/v15" ) func TestUpgradeSigningInfos(t *testing.T) { diff --git a/app/upgrades/v16/constants.go b/app/upgrades/v16/constants.go new file mode 100644 index 00000000000..5e4ae499ad4 --- /dev/null +++ b/app/upgrades/v16/constants.go @@ -0,0 +1,15 @@ +package v16 + +import ( + "github.com/cosmos/gaia/v16/app/upgrades" +) + +const ( + // UpgradeName defines the on-chain upgrade name. + UpgradeName = "v16" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, +} diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go new file mode 100644 index 00000000000..230143868de --- /dev/null +++ b/app/upgrades/v16/upgrades.go @@ -0,0 +1,27 @@ +package v16 + +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/v16/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 539fb26e210..0fa385214b8 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -6,7 +6,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" - "github.com/cosmos/gaia/v15/app/upgrades" + "github.com/cosmos/gaia/v16/app/upgrades" ) const ( diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index 161c5809634..197ab4661b0 100644 --- a/app/upgrades/v7/upgrades.go +++ b/app/upgrades/v7/upgrades.go @@ -11,7 +11,7 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - "github.com/cosmos/gaia/v15/app/keepers" + "github.com/cosmos/gaia/v16/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go index a5507ed8d2e..31094bd6bcf 100644 --- a/app/upgrades/v8/constants.go +++ b/app/upgrades/v8/constants.go @@ -5,8 +5,8 @@ package v8 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v15/app/upgrades" - "github.com/cosmos/gaia/v15/x/globalfee" + "github.com/cosmos/gaia/v16/app/upgrades" + "github.com/cosmos/gaia/v16/x/globalfee" ) const ( diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index f65a97c7ef8..a485e84f42a 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -15,7 +15,7 @@ import ( icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/gaia/v15/app/keepers" + "github.com/cosmos/gaia/v16/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 d0b8c792a36..7edb6f4fb5f 100644 --- a/app/upgrades/v9/constants.go +++ b/app/upgrades/v9/constants.go @@ -8,7 +8,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v15/app/upgrades" + "github.com/cosmos/gaia/v16/app/upgrades" ) const ( diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index 0f26347fdce..e88831d6d69 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v15/app/keepers" + "github.com/cosmos/gaia/v16/app/keepers" ) func CreateUpgradeHandler( diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go index 283592a54aa..5d3923af948 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/v15/pkg/address" + addressutil "github.com/cosmos/gaia/v16/pkg/address" ) var flagBech32Prefix = "prefix" diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go index 0656cd75772..34423eef590 100644 --- a/cmd/gaiad/cmd/root.go +++ b/cmd/gaiad/cmd/root.go @@ -40,8 +40,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - gaia "github.com/cosmos/gaia/v15/app" - "github.com/cosmos/gaia/v15/app/params" + gaia "github.com/cosmos/gaia/v16/app" + "github.com/cosmos/gaia/v16/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 52a61bc988f..3631ca12ce6 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/v15/app" - "github.com/cosmos/gaia/v15/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v16/app" + "github.com/cosmos/gaia/v16/cmd/gaiad/cmd" ) func TestRootCmdConfig(t *testing.T) { diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go index 06aa0743a71..00e35713058 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/v15/app" - "github.com/cosmos/gaia/v15/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v16/app" + "github.com/cosmos/gaia/v16/cmd/gaiad/cmd" ) func main() { diff --git a/contrib/scripts/local-gaia.sh b/contrib/scripts/local-gaia.sh index c307b5c8e7d..6e21ed13ea0 100755 --- a/contrib/scripts/local-gaia.sh +++ b/contrib/scripts/local-gaia.sh @@ -39,15 +39,15 @@ sleep 1 # Add stake to user PROV_ACCOUNT_ADDR=$(jq -r '.address' ${PROV_NODE_DIR}/${PROV_KEY}.json) -gaiad add-genesis-account $PROV_ACCOUNT_ADDR $USER_COINS --home ${PROV_NODE_DIR} --keyring-backend test +gaiad genesis add-genesis-account $PROV_ACCOUNT_ADDR $USER_COINS --home ${PROV_NODE_DIR} --keyring-backend test sleep 1 # Stake 1/1000 user's coins -gaiad gentx $PROV_KEY $STAKE --chain-id provider --home ${PROV_NODE_DIR} --keyring-backend test --moniker $MONIKER +gaiad genesis gentx $PROV_KEY $STAKE --chain-id provider --home ${PROV_NODE_DIR} --keyring-backend test --moniker $MONIKER sleep 1 -gaiad collect-gentxs --home ${PROV_NODE_DIR} --gentx-dir ${PROV_NODE_DIR}/config/gentx/ +gaiad genesis collect-gentxs --home ${PROV_NODE_DIR} --gentx-dir ${PROV_NODE_DIR}/config/gentx/ sleep 1 sed -i -r "/node =/ s/= .*/= \"tcp:\/\/${NODE_IP}:26658\"/" ${PROV_NODE_DIR}/config/client.toml diff --git a/contrib/scripts/upgrade_test_scripts/run_gaia.sh b/contrib/scripts/upgrade_test_scripts/run_gaia.sh index 9859bb82619..616f71e6429 100755 --- a/contrib/scripts/upgrade_test_scripts/run_gaia.sh +++ b/contrib/scripts/upgrade_test_scripts/run_gaia.sh @@ -77,9 +77,9 @@ sed -i -e 's/"threshold": "0.500000000000000000",/"threshold": "0.00000000000000 sed -i -e 's/"voting_period": "172800s"/"voting_period": "30s"/g' $NODE_HOME/config/genesis.json echo $USER_MNEMONIC | $BINARY --home $NODE_HOME keys add val --recover --keyring-backend=test -$BINARY add-genesis-account val 10000000000000000000000000uatom --home $NODE_HOME --keyring-backend test -$BINARY gentx val 1000000000uatom --home $NODE_HOME --chain-id $CHAINID -$BINARY collect-gentxs --home $NODE_HOME +$BINARY genesis add-genesis-account val 10000000000000000000000000uatom --home $NODE_HOME --keyring-backend test +$BINARY genesis gentx val 1000000000uatom --home $NODE_HOME --chain-id $CHAINID +$BINARY genesis collect-gentxs --home $NODE_HOME sed -i.bak'' 's/minimum-gas-prices = ""/minimum-gas-prices = "0uatom"/' $NODE_HOME/config/app.toml diff --git a/contrib/scripts/upgrade_test_scripts/run_upgrade_commands.sh b/contrib/scripts/upgrade_test_scripts/run_upgrade_commands.sh index 454cf07e830..9ac4ad99d06 100755 --- a/contrib/scripts/upgrade_test_scripts/run_upgrade_commands.sh +++ b/contrib/scripts/upgrade_test_scripts/run_upgrade_commands.sh @@ -58,12 +58,13 @@ if test -f "$BINARY"; then echo "\n" echo "Submitting proposal... \n" - $BINARY tx gov submit-proposal software-upgrade $UPGRADE_VERSION \ + $BINARY tx gov submit-legacy-proposal software-upgrade $UPGRADE_VERSION \ --title $UPGRADE_VERSION \ --deposit 10000000uatom \ --upgrade-height $UPGRADE_HEIGHT \ --upgrade-info "upgrade" \ --description "upgrade" \ + --no-validate \ --fees 400uatom \ --from val \ --keyring-backend test \ diff --git a/contrib/single-node.sh b/contrib/single-node.sh index ae22fb1a012..6ba8863b913 100755 --- a/contrib/single-node.sh +++ b/contrib/single-node.sh @@ -19,10 +19,10 @@ fi coins="10000000000stake,100000000000samoleans" gaiad init --chain-id $CHAINID $CHAINID gaiad keys add validator --keyring-backend="test" -gaiad add-genesis-account $(gaiad keys show validator -a --keyring-backend="test") $coins -gaiad add-genesis-account $GENACCT $coins -gaiad gentx validator 5000000000stake --keyring-backend="test" --chain-id $CHAINID -gaiad collect-gentxs +gaiad genesis add-genesis-account $(gaiad keys show validator -a --keyring-backend="test") $coins +gaiad genesis add-genesis-account $GENACCT $coins +gaiad genesis gentx validator 5000000000stake --keyring-backend="test" --chain-id $CHAINID +gaiad genesis collect-gentxs # Set proper defaults and change ports echo "Setting rpc listen address" diff --git a/contrib/testnets/using-cleveldb.sh b/contrib/testnets/using-cleveldb.sh index 6e59433041d..6af3bccc11f 100644 --- a/contrib/testnets/using-cleveldb.sh +++ b/contrib/testnets/using-cleveldb.sh @@ -10,10 +10,10 @@ mkdir -p ./t6/data/snapshots/metadata.db gaiad keys add validator --keyring-backend test --home ./t6 -gaiad add-genesis-account $(gaiad keys show validator -a --keyring-backend test --home ./t6) 100000000stake --keyring-backend test --home ./t6 +gaiad genesis add-genesis-account $(gaiad keys show validator -a --keyring-backend test --home ./t6) 100000000stake --keyring-backend test --home ./t6 -gaiad gentx validator 100000000stake --keyring-backend test --home ./t6 --chain-id t6 +gaiad genesis gentx validator 100000000stake --keyring-backend test --home ./t6 --chain-id t6 -gaiad collect-gentxs --home ./t6 +gaiad genesis collect-gentxs --home ./t6 gaiad start --db_backend cleveldb --home ./t6 diff --git a/docs/docs/resources/genesis.md b/docs/docs/resources/genesis.md index 0b123c3bb78..d8487c3aa3e 100644 --- a/docs/docs/resources/genesis.md +++ b/docs/docs/resources/genesis.md @@ -73,7 +73,7 @@ In this section, the initial allocation of tokens is defined. It is possible to ```bash // Example: gaiad add-genesis-account cosmos1qs8tnw2t8l6amtzvdemnnsq9dzk0ag0z37gh3h 10000000uatom -gaiad add-genesis-account +gaiad genesis add-genesis-account ``` This command creates an item in the `accounts` list, under the `app_state` section. diff --git a/go.mod b/go.mod index 17740b94bb5..714946e57a8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v15 +module github.com/cosmos/gaia/v16 go 1.21 diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go index 8d897e9b111..c5d46d1f813 100644 --- a/tests/e2e/chain.go +++ b/tests/e2e/chain.go @@ -23,8 +23,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gaiaparams "github.com/cosmos/gaia/v15/app/params" - metaprotocoltypes "github.com/cosmos/gaia/v15/x/metaprotocols/types" + gaiaparams "github.com/cosmos/gaia/v16/app/params" + metaprotocoltypes "github.com/cosmos/gaia/v16/x/metaprotocols/types" ) const ( diff --git a/tests/e2e/e2e_bank_test.go b/tests/e2e/e2e_bank_test.go index c128ff5f0ea..dc17eb07243 100644 --- a/tests/e2e/e2e_bank_test.go +++ b/tests/e2e/e2e_bank_test.go @@ -10,7 +10,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/v15/x/metaprotocols/types" + extensiontypes "github.com/cosmos/gaia/v16/x/metaprotocols/types" ) func (s *IntegrationTestSuite) testBankTokenTransfer() { diff --git a/tests/e2e/genesis.go b/tests/e2e/genesis.go index acaf2127ca5..b978d01f132 100644 --- a/tests/e2e/genesis.go +++ b/tests/e2e/genesis.go @@ -23,7 +23,7 @@ import ( govlegacytypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - globfeetypes "github.com/cosmos/gaia/v15/x/globalfee/types" + globfeetypes "github.com/cosmos/gaia/v16/x/globalfee/types" ) func getGenDoc(path string) (*tmtypes.GenesisDoc, error) { diff --git a/tests/e2e/query.go b/tests/e2e/query.go index 8661776a180..c3224f8c590 100644 --- a/tests/e2e/query.go +++ b/tests/e2e/query.go @@ -16,7 +16,7 @@ import ( govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v15/x/globalfee/types" + "github.com/cosmos/gaia/v16/x/globalfee/types" ) func queryGaiaTx(endpoint, txHash string) error { diff --git a/tests/e2e/validator.go b/tests/e2e/validator.go index c4fe4af6944..2e95855ceb6 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/v15/app" + gaia "github.com/cosmos/gaia/v16/app" ) // diff --git a/tests/ics/interchain_security_test.go b/tests/ics/interchain_security_test.go index debaf008426..2e11de1dabb 100644 --- a/tests/ics/interchain_security_test.go +++ b/tests/ics/interchain_security_test.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/interchain-security/v3/tests/integration" icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing" - gaiaApp "github.com/cosmos/gaia/v15/app" + gaiaApp "github.com/cosmos/gaia/v16/app" ) func TestCCVTestSuite(t *testing.T) { diff --git a/x/globalfee/alias.go b/x/globalfee/alias.go index 505e9da1c10..9dfbd8d8fb0 100644 --- a/x/globalfee/alias.go +++ b/x/globalfee/alias.go @@ -1,7 +1,7 @@ package globalfee import ( - "github.com/cosmos/gaia/v15/x/globalfee/types" + "github.com/cosmos/gaia/v16/x/globalfee/types" ) const ( diff --git a/x/globalfee/ante/antetest/fee_test.go b/x/globalfee/ante/antetest/fee_test.go index bf754369bd3..9787142b96f 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/v15/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v15/x/globalfee/types" + gaiafeeante "github.com/cosmos/gaia/v16/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v16/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 254c555f422..f102881fd5c 100644 --- a/x/globalfee/ante/antetest/fee_test_setup.go +++ b/x/globalfee/ante/antetest/fee_test_setup.go @@ -16,12 +16,12 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx/signing" xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - gaiaapp "github.com/cosmos/gaia/v15/app" - gaiahelpers "github.com/cosmos/gaia/v15/app/helpers" - gaiaparams "github.com/cosmos/gaia/v15/app/params" - "github.com/cosmos/gaia/v15/x/globalfee" - gaiafeeante "github.com/cosmos/gaia/v15/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v15/x/globalfee/types" + gaiaapp "github.com/cosmos/gaia/v16/app" + gaiahelpers "github.com/cosmos/gaia/v16/app/helpers" + gaiaparams "github.com/cosmos/gaia/v16/app/params" + "github.com/cosmos/gaia/v16/x/globalfee" + gaiafeeante "github.com/cosmos/gaia/v16/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v16/x/globalfee/types" ) type IntegrationTestSuite struct { diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index e7ae64e7b30..8a32481c99f 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" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - gaiaerrors "github.com/cosmos/gaia/v15/types/errors" - "github.com/cosmos/gaia/v15/x/globalfee" - "github.com/cosmos/gaia/v15/x/globalfee/types" + gaiaerrors "github.com/cosmos/gaia/v16/types/errors" + "github.com/cosmos/gaia/v16/x/globalfee" + "github.com/cosmos/gaia/v16/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 c25151973dc..91369a0773e 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/v15/types/errors" + gaiaerrors "github.com/cosmos/gaia/v16/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 099eaed32c1..d7604b09876 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/v15/x/globalfee/types" + "github.com/cosmos/gaia/v16/x/globalfee/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index 6daa4411ca7..c5ca97586b0 100644 --- a/x/globalfee/genesis_test.go +++ b/x/globalfee/genesis_test.go @@ -16,8 +16,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - gaiaparams "github.com/cosmos/gaia/v15/app/params" - "github.com/cosmos/gaia/v15/x/globalfee/types" + gaiaparams "github.com/cosmos/gaia/v16/app/params" + "github.com/cosmos/gaia/v16/x/globalfee/types" ) func TestDefaultGenesis(t *testing.T) { diff --git a/x/globalfee/keeper/migrations.go b/x/globalfee/keeper/migrations.go index 25673874fa7..62dea3f4125 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/v15/x/globalfee/migrations/v2" + v2 "github.com/cosmos/gaia/v16/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 99fd8ec5248..419c8a1ecb1 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/v15/x/globalfee/types" + "github.com/cosmos/gaia/v16/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 9aa03a3fabd..e6a17b299ac 100644 --- a/x/globalfee/migrations/v2/v2_test/migration_test.go +++ b/x/globalfee/migrations/v2/v2_test/migration_test.go @@ -16,8 +16,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/cosmos/gaia/v15/x/globalfee/migrations/v2" - globalfeetypes "github.com/cosmos/gaia/v15/x/globalfee/types" + v2 "github.com/cosmos/gaia/v16/x/globalfee/migrations/v2" + globalfeetypes "github.com/cosmos/gaia/v16/x/globalfee/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/globalfee/module.go b/x/globalfee/module.go index 909cd36f158..2934734def2 100644 --- a/x/globalfee/module.go +++ b/x/globalfee/module.go @@ -20,9 +20,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v15/x/globalfee/client/cli" - "github.com/cosmos/gaia/v15/x/globalfee/keeper" - "github.com/cosmos/gaia/v15/x/globalfee/types" + "github.com/cosmos/gaia/v16/x/globalfee/client/cli" + "github.com/cosmos/gaia/v16/x/globalfee/keeper" + "github.com/cosmos/gaia/v16/x/globalfee/types" ) var ( diff --git a/x/globalfee/querier.go b/x/globalfee/querier.go index b905faa0ad8..cd89e27c90c 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/v15/x/globalfee/types" + "github.com/cosmos/gaia/v16/x/globalfee/types" ) var _ types.QueryServer = &GrpcQuerier{} diff --git a/x/globalfee/types/params.go b/x/globalfee/types/params.go index a7eaed4ab6d..160e7e2b16b 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/v15/types/errors" + gaiaerrors "github.com/cosmos/gaia/v16/types/errors" ) var ( diff --git a/x/metaprotocols/module.go b/x/metaprotocols/module.go index 62cdbd238f9..daeb540e45c 100644 --- a/x/metaprotocols/module.go +++ b/x/metaprotocols/module.go @@ -15,7 +15,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/gaia/v15/x/metaprotocols/types" + "github.com/cosmos/gaia/v16/x/metaprotocols/types" ) const consensusVersion uint64 = 1