diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ddd66eede0..eea5cb3fbaf 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/ante/ante.go b/ante/ante.go index a98e2a00c9d..2ee03cb2869 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/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 diff --git a/ante/gov_vote_ante.go b/ante/gov_vote_ante.go index 160272ec2fc..677b2df1f53 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/v17/types/errors" + gaiaerrors "github.com/cosmos/gaia/v18/types/errors" ) var ( diff --git a/ante/gov_vote_ante_test.go b/ante/gov_vote_ante_test.go index 2410b91a296..a5ed2f2ccd5 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/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 diff --git a/app/app.go b/app/app.go index 6a1f1925838..10801944c45 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/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 ( diff --git a/app/app_test.go b/app/app_test.go index d53757b4b9e..267462d81ad 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/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{} diff --git a/app/encoding.go b/app/encoding.go index ae28bf03460..ecaf34b28b0 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/v17/app/params" + "github.com/cosmos/gaia/v18/app/params" ) func RegisterEncodingConfig() params.EncodingConfig { diff --git a/app/genesis.go b/app/genesis.go index 0bb639dbd89..bd47afd8f20 100644 --- a/app/genesis.go +++ b/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 diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index b24b3093b1d..3092214150a 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/v17/app" + gaiaapp "github.com/cosmos/gaia/v18/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 0565c08ed4e..c70f904fa0b 100644 --- a/app/keepers/keepers.go +++ b/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 { diff --git a/app/modules.go b/app/modules.go index c4376d11329..ed97cba82ea 100644 --- a/app/modules.go +++ b/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{ diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go index 896e6519496..892abd9dca2 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/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 diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go index bb68664ae16..dd9604f3401 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/v17/app" + gaia "github.com/cosmos/gaia/v18/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 a3a3ad1611b..5ccec2dcdf7 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/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: diff --git a/app/sim_test.go b/app/sim_test.go index 6d4d12e3fac..fb72ce7bf61 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/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 diff --git a/app/upgrades/types.go b/app/upgrades/types.go index bd497c51201..af19fdc4a75 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/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 f66b00f3373..2338fbfc269 100644 --- a/app/upgrades/v10/constants.go +++ b/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 ( diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index 0c1d7867668..59ea62cd9db 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index bb055f7b063..f3aca664bcf 100644 --- a/app/upgrades/v11/constants.go +++ b/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 ( diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index 3623da71984..e2688789d50 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index c53880bd978..51efe7f219d 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/v17/app/upgrades" + "github.com/cosmos/gaia/v18/app/upgrades" ) const ( diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index dcc6c374ab4..1f7686f9130 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go index bee33a0f9f9..e9658732221 100644 --- a/app/upgrades/v13/constants.go +++ b/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 ( diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index 11a96b26213..16d2bc30a72 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go index dd78074c601..d621947066a 100644 --- a/app/upgrades/v14/constants.go +++ b/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 ( diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go index c4b54482bfc..32c1459933b 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go index ddf31dd947d..10827a52dc8 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/v17/app/upgrades" + "github.com/cosmos/gaia/v18/app/upgrades" ) const ( diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go index 9f7b966a380..af613fc00cd 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/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 7a1186fc90c..1789672873f 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/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) { diff --git a/app/upgrades/v16/constants.go b/app/upgrades/v16/constants.go index 93431734242..015139d0889 100644 --- a/app/upgrades/v16/constants.go +++ b/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 ( diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go index 8797d2ec8df..5c11657da72 100644 --- a/app/upgrades/v16/upgrades.go +++ b/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{ diff --git a/app/upgrades/v16/upgrades_test.go b/app/upgrades/v16/upgrades_test.go index abb993114d1..1675af70dd7 100644 --- a/app/upgrades/v16/upgrades_test.go +++ b/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) diff --git a/app/upgrades/v17/constants.go b/app/upgrades/v17/constants.go index bc967fce41b..abc9825f0f0 100644 --- a/app/upgrades/v17/constants.go +++ b/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 ( diff --git a/app/upgrades/v17/upgrades.go b/app/upgrades/v17/upgrades.go index 7d10121efdf..0f5b4902fbb 100644 --- a/app/upgrades/v17/upgrades.go +++ b/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( diff --git a/app/upgrades/v18/constants.go b/app/upgrades/v18/constants.go new file mode 100644 index 00000000000..e69abb9be8f --- /dev/null +++ b/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, +} diff --git a/app/upgrades/v18/upgrades.go b/app/upgrades/v18/upgrades.go new file mode 100644 index 00000000000..4a841a115d9 --- /dev/null +++ b/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 + } +} diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go index 354768452b5..ccbcaa433e7 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/v17/app/upgrades" + "github.com/cosmos/gaia/v18/app/upgrades" ) const ( diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index c1a6b9c9a69..b0f3c155890 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go index 39108ab0e85..d65dd4a90c5 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/v17/app/upgrades" - "github.com/cosmos/gaia/v17/x/globalfee" + "github.com/cosmos/gaia/v18/app/upgrades" + "github.com/cosmos/gaia/v18/x/globalfee" ) const ( diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index d0c8b53daa2..b99de7b2d52 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/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 ba1dbda56dd..69663525104 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/v17/app/upgrades" + "github.com/cosmos/gaia/v18/app/upgrades" ) const ( diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index 2dfe4c9d477..9551b604c2f 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/v17/app/keepers" + "github.com/cosmos/gaia/v18/app/keepers" ) func CreateUpgradeHandler( diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go index 4f2e21a9aa6..2896baa17c9 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/v17/pkg/address" + addressutil "github.com/cosmos/gaia/v18/pkg/address" ) var flagBech32Prefix = "prefix" diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go index 975ddeb4194..de02103bf66 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/v17/app" - "github.com/cosmos/gaia/v17/app/params" + gaia "github.com/cosmos/gaia/v18/app" + "github.com/cosmos/gaia/v18/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 2c18f01631b..68c6bc70bc8 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/v17/app" - "github.com/cosmos/gaia/v17/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v18/app" + "github.com/cosmos/gaia/v18/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 index 0d7506a255a..49fa5527043 100644 --- a/cmd/gaiad/cmd/testnet_set_local_validator.go +++ b/cmd/gaiad/cmd/testnet_set_local_validator.go @@ -17,7 +17,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/v17/app" + gaia "github.com/cosmos/gaia/v18/app" "github.com/spf13/cast" "github.com/spf13/cobra" diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go index e8606f1ebaf..9b90d13a13d 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/v17/app" - "github.com/cosmos/gaia/v17/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v18/app" + "github.com/cosmos/gaia/v18/cmd/gaiad/cmd" ) func main() { diff --git a/go.mod b/go.mod index 73be7c2039d..fee4b4161a7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v17 +module github.com/cosmos/gaia/v18 go 1.21.1 diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go index a321b04b4ca..c9763f519b0 100644 --- a/tests/e2e/chain.go +++ b/tests/e2e/chain.go @@ -25,8 +25,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/v17/app/params" - metaprotocoltypes "github.com/cosmos/gaia/v17/x/metaprotocols/types" + gaiaparams "github.com/cosmos/gaia/v18/app/params" + metaprotocoltypes "github.com/cosmos/gaia/v18/x/metaprotocols/types" ) const ( diff --git a/tests/e2e/e2e_bank_test.go b/tests/e2e/e2e_bank_test.go index d4760899653..d119e2dc0f0 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/v17/x/metaprotocols/types" + extensiontypes "github.com/cosmos/gaia/v18/x/metaprotocols/types" ) func (s *IntegrationTestSuite) testBankTokenTransfer() { diff --git a/tests/e2e/genesis.go b/tests/e2e/genesis.go index 2b3da172f96..02d8f05df9f 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/v17/x/globalfee/types" + globfeetypes "github.com/cosmos/gaia/v18/x/globalfee/types" ) func getGenDoc(path string) (*tmtypes.GenesisDoc, error) { diff --git a/tests/e2e/query.go b/tests/e2e/query.go index 92603a7f40e..d45f7598025 100644 --- a/tests/e2e/query.go +++ b/tests/e2e/query.go @@ -21,7 +21,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/v17/x/globalfee/types" + "github.com/cosmos/gaia/v18/x/globalfee/types" ) func queryGaiaTx(endpoint, txHash string) error { diff --git a/tests/e2e/validator.go b/tests/e2e/validator.go index 4561cbeb19c..03ff5a1e2fc 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/v17/app" + gaia "github.com/cosmos/gaia/v18/app" ) // diff --git a/tests/integration/ibcfee_test.go b/tests/integration/ibcfee_test.go index 1037e25b855..a56dc2b2c69 100644 --- a/tests/integration/ibcfee_test.go +++ b/tests/integration/ibcfee_test.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gaiaApp "github.com/cosmos/gaia/v17/app" + gaiaApp "github.com/cosmos/gaia/v18/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 index fe6b57fa89a..5fdfe84d701 100644 --- a/tests/integration/interchain_security_test.go +++ b/tests/integration/interchain_security_test.go @@ -20,7 +20,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaApp "github.com/cosmos/gaia/v17/app" + gaiaApp "github.com/cosmos/gaia/v18/app" ) var ( diff --git a/x/globalfee/alias.go b/x/globalfee/alias.go index a861bf30db8..86e84340ab2 100644 --- a/x/globalfee/alias.go +++ b/x/globalfee/alias.go @@ -1,7 +1,7 @@ package globalfee import ( - "github.com/cosmos/gaia/v17/x/globalfee/types" + "github.com/cosmos/gaia/v18/x/globalfee/types" ) const ( diff --git a/x/globalfee/ante/antetest/fee_test.go b/x/globalfee/ante/antetest/fee_test.go index c69cd079dfc..e509f07a146 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/v17/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v17/x/globalfee/types" + gaiafeeante "github.com/cosmos/gaia/v18/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v18/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 96f59241ae2..2c297957e3e 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/v17/app" - gaiahelpers "github.com/cosmos/gaia/v17/app/helpers" - gaiaparams "github.com/cosmos/gaia/v17/app/params" - "github.com/cosmos/gaia/v17/x/globalfee" - gaiafeeante "github.com/cosmos/gaia/v17/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v17/x/globalfee/types" + gaiaapp "github.com/cosmos/gaia/v18/app" + gaiahelpers "github.com/cosmos/gaia/v18/app/helpers" + gaiaparams "github.com/cosmos/gaia/v18/app/params" + "github.com/cosmos/gaia/v18/x/globalfee" + gaiafeeante "github.com/cosmos/gaia/v18/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v18/x/globalfee/types" ) type IntegrationTestSuite struct { diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index df3169f29f6..eb99e280cdb 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/v17/types/errors" - "github.com/cosmos/gaia/v17/x/globalfee" - "github.com/cosmos/gaia/v17/x/globalfee/types" + gaiaerrors "github.com/cosmos/gaia/v18/types/errors" + "github.com/cosmos/gaia/v18/x/globalfee" + "github.com/cosmos/gaia/v18/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 588079064af..2691652706e 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/v17/types/errors" + gaiaerrors "github.com/cosmos/gaia/v18/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 ca5c7da02bc..8cbbd15d300 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/v17/x/globalfee/types" + "github.com/cosmos/gaia/v18/x/globalfee/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index 8d0f6adfdb6..304134ffe64 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/v17/app/params" - "github.com/cosmos/gaia/v17/x/globalfee/types" + gaiaparams "github.com/cosmos/gaia/v18/app/params" + "github.com/cosmos/gaia/v18/x/globalfee/types" ) func TestDefaultGenesis(t *testing.T) { diff --git a/x/globalfee/keeper/migrations.go b/x/globalfee/keeper/migrations.go index 2561e8f6610..ecb912b1ac0 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/v17/x/globalfee/migrations/v2" + v2 "github.com/cosmos/gaia/v18/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 befc0bf9b18..91897162ae2 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/v17/x/globalfee/types" + "github.com/cosmos/gaia/v18/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 bf363b191af..6dff03f1953 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/v17/x/globalfee/migrations/v2" - globalfeetypes "github.com/cosmos/gaia/v17/x/globalfee/types" + v2 "github.com/cosmos/gaia/v18/x/globalfee/migrations/v2" + globalfeetypes "github.com/cosmos/gaia/v18/x/globalfee/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/globalfee/module.go b/x/globalfee/module.go index c8ec4e8c240..cac11f313b4 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/v17/x/globalfee/client/cli" - "github.com/cosmos/gaia/v17/x/globalfee/keeper" - "github.com/cosmos/gaia/v17/x/globalfee/types" + "github.com/cosmos/gaia/v18/x/globalfee/client/cli" + "github.com/cosmos/gaia/v18/x/globalfee/keeper" + "github.com/cosmos/gaia/v18/x/globalfee/types" ) var ( diff --git a/x/globalfee/querier.go b/x/globalfee/querier.go index ab4afa321e2..cadc3938312 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/v17/x/globalfee/types" + "github.com/cosmos/gaia/v18/x/globalfee/types" ) var _ types.QueryServer = &GrpcQuerier{} diff --git a/x/globalfee/types/params.go b/x/globalfee/types/params.go index e53ea6d03f3..4770fe66b43 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/v17/types/errors" + gaiaerrors "github.com/cosmos/gaia/v18/types/errors" ) var ( diff --git a/x/metaprotocols/module.go b/x/metaprotocols/module.go index bd100e7ca07..ce1bd71734d 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/v17/x/metaprotocols/types" + "github.com/cosmos/gaia/v18/x/metaprotocols/types" ) const consensusVersion uint64 = 1