From 7c1c91200dd6f8cfd1efc5660981f4bb3ae3b53c Mon Sep 17 00:00:00 2001 From: mpoke Date: Wed, 13 Nov 2024 15:38:46 +0100 Subject: [PATCH 1/4] bump version to v22 --- ante/ante.go | 2 +- ante/gov_expedited_ante.go | 2 +- ante/gov_expedited_ante_test.go | 4 ++-- ante/gov_vote_ante.go | 2 +- ante/gov_vote_ante_test.go | 4 ++-- app/app.go | 8 ++++---- app/app_test.go | 4 ++-- app/helpers/test_helpers.go | 2 +- app/modules.go | 4 ++-- app/post.go | 2 +- app/sim/sim_state.go | 2 +- app/sim/sim_utils.go | 2 +- app/sim_bench_test.go | 4 ++-- app/sim_test.go | 6 +++--- app/upgrades/types.go | 2 +- app/upgrades/v19/constants.go | 2 +- app/upgrades/v19/upgrades.go | 2 +- app/upgrades/v20/constants.go | 2 +- app/upgrades/v20/upgrades.go | 2 +- app/upgrades/v20/upgrades_test.go | 4 ++-- app/upgrades/v21/constants.go | 2 +- app/upgrades/v21/upgrades.go | 2 +- app/upgrades/v21/upgrades_test.go | 4 ++-- cmd/gaiad/cmd/bech32_convert.go | 2 +- cmd/gaiad/cmd/root.go | 2 +- cmd/gaiad/cmd/root_test.go | 4 ++-- cmd/gaiad/cmd/testnet_set_local_validator.go | 2 +- cmd/gaiad/main.go | 4 ++-- go.mod | 2 +- tests/e2e/chain.go | 6 +++--- tests/e2e/e2e_bank_test.go | 2 +- tests/e2e/e2e_setup_test.go | 2 +- tests/integration/feemarket_test.go | 4 ++-- tests/integration/ibcfee_test.go | 4 ++-- tests/integration/interchain_security_test.go | 4 ++-- tests/integration/test_utils.go | 2 +- tests/interchain/consumer_chain/changeover_test.go | 2 +- tests/interchain/consumer_chain/consumer_launch_test.go | 2 +- .../consumer_chain/consumer_modification_test.go | 2 +- tests/interchain/consumer_chain/mainnet_consumers_test.go | 2 +- tests/interchain/consumer_chain/unbonding_test.go | 2 +- tests/interchain/delegator/authz_test.go | 4 ++-- tests/interchain/delegator/bank_test.go | 4 ++-- tests/interchain/delegator/cosmwasm_test.go | 4 ++-- tests/interchain/delegator/feegrant_test.go | 4 ++-- tests/interchain/delegator/ica_test.go | 4 ++-- tests/interchain/delegator/lsm_test.go | 2 +- tests/interchain/delegator/multisig_test.go | 4 ++-- tests/interchain/delegator/pfm_test.go | 4 ++-- tests/interchain/delegator/staking_test.go | 4 ++-- tests/interchain/delegator/suite.go | 2 +- tests/interchain/feemarket_test.go | 2 +- tests/interchain/go.mod | 2 +- tests/interchain/integrator/endpoints_test.go | 2 +- tests/interchain/validator/inactive_validator_test.go | 2 +- tests/interchain/validator/unbond_test.go | 2 +- x/metaprotocols/module.go | 2 +- 57 files changed, 84 insertions(+), 84 deletions(-) diff --git a/ante/ante.go b/ante/ante.go index 536abf05356..aee2a85a179 100644 --- a/ante/ante.go +++ b/ante/ante.go @@ -22,7 +22,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - gaiaerrors "github.com/cosmos/gaia/v21/types/errors" + gaiaerrors "github.com/cosmos/gaia/v22/types/errors" ) // UseFeeMarketDecorator to make the integration testing easier: we can switch off its ante and post decorators with this flag diff --git a/ante/gov_expedited_ante.go b/ante/gov_expedited_ante.go index d9924a0e0f9..f15538fa914 100644 --- a/ante/gov_expedited_ante.go +++ b/ante/gov_expedited_ante.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - gaiaerrors "github.com/cosmos/gaia/v21/types/errors" + gaiaerrors "github.com/cosmos/gaia/v22/types/errors" ) var expeditedPropDecoratorEnabled = true diff --git a/ante/gov_expedited_ante_test.go b/ante/gov_expedited_ante_test.go index 124a5d9ccc7..d1d5928fb95 100644 --- a/ante/gov_expedited_ante_test.go +++ b/ante/gov_expedited_ante_test.go @@ -14,8 +14,8 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/cosmos/gaia/v21/ante" - "github.com/cosmos/gaia/v21/app/helpers" + "github.com/cosmos/gaia/v22/ante" + "github.com/cosmos/gaia/v22/app/helpers" ) func TestGovExpeditedProposalsDecorator(t *testing.T) { diff --git a/ante/gov_vote_ante.go b/ante/gov_vote_ante.go index c00ca8ac624..9465987c702 100644 --- a/ante/gov_vote_ante.go +++ b/ante/gov_vote_ante.go @@ -12,7 +12,7 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaerrors "github.com/cosmos/gaia/v21/types/errors" + gaiaerrors "github.com/cosmos/gaia/v22/types/errors" ) var ( diff --git a/ante/gov_vote_ante_test.go b/ante/gov_vote_ante_test.go index 66a2b1fb6b7..7ce69e723ea 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/v21/ante" - "github.com/cosmos/gaia/v21/app/helpers" + "github.com/cosmos/gaia/v22/ante" + "github.com/cosmos/gaia/v22/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 1f660e665ec..278167605bd 100644 --- a/app/app.go +++ b/app/app.go @@ -66,10 +66,10 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - gaiaante "github.com/cosmos/gaia/v21/ante" - "github.com/cosmos/gaia/v21/app/keepers" - "github.com/cosmos/gaia/v21/app/upgrades" - v21 "github.com/cosmos/gaia/v21/app/upgrades/v21" + gaiaante "github.com/cosmos/gaia/v22/ante" + "github.com/cosmos/gaia/v22/app/keepers" + "github.com/cosmos/gaia/v22/app/upgrades" + v21 "github.com/cosmos/gaia/v22/app/upgrades/v21" ) var ( diff --git a/app/app_test.go b/app/app_test.go index bd300ac0dde..55511df2b7a 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -14,8 +14,8 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - gaia "github.com/cosmos/gaia/v21/app" - gaiahelpers "github.com/cosmos/gaia/v21/app/helpers" + gaia "github.com/cosmos/gaia/v22/app" + gaiahelpers "github.com/cosmos/gaia/v22/app/helpers" ) type EmptyAppOptions struct{} diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index be59014284d..3c341b4a4b7 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -30,7 +30,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - gaiaapp "github.com/cosmos/gaia/v21/app" + gaiaapp "github.com/cosmos/gaia/v22/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/modules.go b/app/modules.go index a5aa6b7c69d..59015ba9f7a 100644 --- a/app/modules.go +++ b/app/modules.go @@ -62,8 +62,8 @@ import ( wasm "github.com/CosmWasm/wasmd/x/wasm" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/cosmos/gaia/v21/x/metaprotocols" - metaprotocolstypes "github.com/cosmos/gaia/v21/x/metaprotocols/types" + "github.com/cosmos/gaia/v22/x/metaprotocols" + metaprotocolstypes "github.com/cosmos/gaia/v22/x/metaprotocols/types" ) var maccPerms = map[string][]string{ diff --git a/app/post.go b/app/post.go index 543ec95d0f3..fc9ceaa3f36 100644 --- a/app/post.go +++ b/app/post.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/gaia/v21/ante" + "github.com/cosmos/gaia/v22/ante" ) // PostHandlerOptions are the options required for constructing a FeeMarket PostHandler. diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go index e393d733efd..1c2845eb777 100644 --- a/app/sim/sim_state.go +++ b/app/sim/sim_state.go @@ -22,7 +22,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/v21/app" + gaia "github.com/cosmos/gaia/v22/app" ) // Simulation parameter constants diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go index d57f9a96772..98c54124b27 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/v21/app" + gaia "github.com/cosmos/gaia/v22/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 96dedb81d8d..81eb604241b 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/v21/app" - "github.com/cosmos/gaia/v21/app/sim" + gaia "github.com/cosmos/gaia/v22/app" + "github.com/cosmos/gaia/v22/app/sim" ) // Profile with: diff --git a/app/sim_test.go b/app/sim_test.go index 007d53e9cd5..48c36ccc0ba 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/v21/ante" - gaia "github.com/cosmos/gaia/v21/app" + "github.com/cosmos/gaia/v22/ante" + gaia "github.com/cosmos/gaia/v22/app" // "github.com/cosmos/gaia/v11/app/helpers" // "github.com/cosmos/gaia/v11/app/params" - "github.com/cosmos/gaia/v21/app/sim" + "github.com/cosmos/gaia/v22/app/sim" ) // AppChainID hardcoded chainID for simulation diff --git a/app/upgrades/types.go b/app/upgrades/types.go index a2a1e50c93d..684aa583e61 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/gaia/v21/app/keepers" + "github.com/cosmos/gaia/v22/app/keepers" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v19/constants.go b/app/upgrades/v19/constants.go index 85c4e043390..c3563d4938a 100644 --- a/app/upgrades/v19/constants.go +++ b/app/upgrades/v19/constants.go @@ -1,7 +1,7 @@ package v19 import ( - "github.com/cosmos/gaia/v21/app/upgrades" + "github.com/cosmos/gaia/v22/app/upgrades" ) const ( diff --git a/app/upgrades/v19/upgrades.go b/app/upgrades/v19/upgrades.go index 7042b8ebd98..701888f12d3 100644 --- a/app/upgrades/v19/upgrades.go +++ b/app/upgrades/v19/upgrades.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/gaia/v21/app/keepers" + "github.com/cosmos/gaia/v22/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v20/constants.go b/app/upgrades/v20/constants.go index 3c362c6ec63..3ef7b0bff9e 100644 --- a/app/upgrades/v20/constants.go +++ b/app/upgrades/v20/constants.go @@ -1,7 +1,7 @@ package v20 import ( - "github.com/cosmos/gaia/v21/app/upgrades" + "github.com/cosmos/gaia/v22/app/upgrades" ) const ( diff --git a/app/upgrades/v20/upgrades.go b/app/upgrades/v20/upgrades.go index 70a303828d2..ea80912cd79 100644 --- a/app/upgrades/v20/upgrades.go +++ b/app/upgrades/v20/upgrades.go @@ -23,7 +23,7 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/cosmos/gaia/v21/app/keepers" + "github.com/cosmos/gaia/v22/app/keepers" ) // Constants for the new parameters in the v20 upgrade. diff --git a/app/upgrades/v20/upgrades_test.go b/app/upgrades/v20/upgrades_test.go index 489971551cf..a896cb97470 100644 --- a/app/upgrades/v20/upgrades_test.go +++ b/app/upgrades/v20/upgrades_test.go @@ -21,8 +21,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/cosmos/gaia/v21/app/helpers" - v20 "github.com/cosmos/gaia/v21/app/upgrades/v20" + "github.com/cosmos/gaia/v22/app/helpers" + v20 "github.com/cosmos/gaia/v22/app/upgrades/v20" ) func GetTestMsgConsumerAddition() providertypes.MsgConsumerAddition { //nolint:staticcheck diff --git a/app/upgrades/v21/constants.go b/app/upgrades/v21/constants.go index 022e20ff366..673f744e67e 100644 --- a/app/upgrades/v21/constants.go +++ b/app/upgrades/v21/constants.go @@ -1,7 +1,7 @@ package v21 import ( - "github.com/cosmos/gaia/v21/app/upgrades" + "github.com/cosmos/gaia/v22/app/upgrades" ) const ( diff --git a/app/upgrades/v21/upgrades.go b/app/upgrades/v21/upgrades.go index 71f6c2f74a2..983b1a6ea82 100644 --- a/app/upgrades/v21/upgrades.go +++ b/app/upgrades/v21/upgrades.go @@ -18,7 +18,7 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/cosmos/gaia/v21/app/keepers" + "github.com/cosmos/gaia/v22/app/keepers" ) // Neutron and Stride denoms that were not whitelisted but the consumer rewards pool contains amounts of those denoms. diff --git a/app/upgrades/v21/upgrades_test.go b/app/upgrades/v21/upgrades_test.go index 88bb4c5a210..5e48c3c8d8f 100644 --- a/app/upgrades/v21/upgrades_test.go +++ b/app/upgrades/v21/upgrades_test.go @@ -9,8 +9,8 @@ import ( govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/cosmos/gaia/v21/app/helpers" - v21 "github.com/cosmos/gaia/v21/app/upgrades/v21" + "github.com/cosmos/gaia/v22/app/helpers" + v21 "github.com/cosmos/gaia/v22/app/upgrades/v21" ) func TestHasExpectedChainIDSanityCheck(t *testing.T) { diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go index 63170133aff..0e51e304380 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/v21/pkg/address" + addressutil "github.com/cosmos/gaia/v22/pkg/address" ) var flagBech32Prefix = "prefix" diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go index fce0ccb2e7b..64d1b40df93 100644 --- a/cmd/gaiad/cmd/root.go +++ b/cmd/gaiad/cmd/root.go @@ -57,7 +57,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - gaia "github.com/cosmos/gaia/v21/app" + gaia "github.com/cosmos/gaia/v22/app" ) // 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 f715564ba0c..ff841d4e7a4 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/v21/app" - "github.com/cosmos/gaia/v21/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v22/app" + "github.com/cosmos/gaia/v22/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 0532c8483be..1cf041e4d0a 100644 --- a/cmd/gaiad/cmd/testnet_set_local_validator.go +++ b/cmd/gaiad/cmd/testnet_set_local_validator.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cast" "github.com/spf13/cobra" - gaia "github.com/cosmos/gaia/v21/app" + gaia "github.com/cosmos/gaia/v22/app" "cosmossdk.io/log" "github.com/cometbft/cometbft/crypto" diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go index b0dcfc74bca..7c22e003d2a 100644 --- a/cmd/gaiad/main.go +++ b/cmd/gaiad/main.go @@ -5,8 +5,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - app "github.com/cosmos/gaia/v21/app" - "github.com/cosmos/gaia/v21/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v22/app" + "github.com/cosmos/gaia/v22/cmd/gaiad/cmd" ) func main() { diff --git a/go.mod b/go.mod index a0b99e8c0a9..6e136ae18a9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v21 +module github.com/cosmos/gaia/v22 go 1.22.7 diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go index 88e9fbae469..bec958ef9c6 100644 --- a/tests/e2e/chain.go +++ b/tests/e2e/chain.go @@ -27,9 +27,9 @@ import ( paramsproptypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v21/app" - gaiaparams "github.com/cosmos/gaia/v21/app/params" - metaprotocoltypes "github.com/cosmos/gaia/v21/x/metaprotocols/types" + gaia "github.com/cosmos/gaia/v22/app" + gaiaparams "github.com/cosmos/gaia/v22/app/params" + metaprotocoltypes "github.com/cosmos/gaia/v22/x/metaprotocols/types" ) const ( diff --git a/tests/e2e/e2e_bank_test.go b/tests/e2e/e2e_bank_test.go index 6f064722c4f..697940b09be 100644 --- a/tests/e2e/e2e_bank_test.go +++ b/tests/e2e/e2e_bank_test.go @@ -12,7 +12,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/v21/x/metaprotocols/types" + extensiontypes "github.com/cosmos/gaia/v22/x/metaprotocols/types" ) func (s *IntegrationTestSuite) testBankTokenTransfer() { diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index e2dd2307fe4..fec21da34ec 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -43,7 +43,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v21/types" + "github.com/cosmos/gaia/v22/types" ) const ( diff --git a/tests/integration/feemarket_test.go b/tests/integration/feemarket_test.go index f90aa48a8b9..c855c6a1ca9 100644 --- a/tests/integration/feemarket_test.go +++ b/tests/integration/feemarket_test.go @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/gaia/v21/ante" - gaiaApp "github.com/cosmos/gaia/v21/app" + "github.com/cosmos/gaia/v22/ante" + gaiaApp "github.com/cosmos/gaia/v22/app" ) const ( diff --git a/tests/integration/ibcfee_test.go b/tests/integration/ibcfee_test.go index 61766a96ebc..c1717bc420f 100644 --- a/tests/integration/ibcfee_test.go +++ b/tests/integration/ibcfee_test.go @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v21/ante" - gaiaApp "github.com/cosmos/gaia/v21/app" + "github.com/cosmos/gaia/v22/ante" + gaiaApp "github.com/cosmos/gaia/v22/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 d4d1ae7abf6..1289c96c9a7 100644 --- a/tests/integration/interchain_security_test.go +++ b/tests/integration/interchain_security_test.go @@ -17,8 +17,8 @@ import ( crysistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v21/ante" - gaiaApp "github.com/cosmos/gaia/v21/app" + "github.com/cosmos/gaia/v22/ante" + gaiaApp "github.com/cosmos/gaia/v22/app" ) var ccvSuite *integration.CCVTestSuite diff --git a/tests/integration/test_utils.go b/tests/integration/test_utils.go index ce0573f2b64..f4e1c425ea6 100644 --- a/tests/integration/test_utils.go +++ b/tests/integration/test_utils.go @@ -23,7 +23,7 @@ import ( simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - gaiaApp "github.com/cosmos/gaia/v21/app" + gaiaApp "github.com/cosmos/gaia/v22/app" ) var app *gaiaApp.GaiaApp diff --git a/tests/interchain/consumer_chain/changeover_test.go b/tests/interchain/consumer_chain/changeover_test.go index 7f88fd23959..219af6ae655 100644 --- a/tests/interchain/consumer_chain/changeover_test.go +++ b/tests/interchain/consumer_chain/changeover_test.go @@ -11,7 +11,7 @@ import ( sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" "github.com/strangelove-ventures/interchaintest/v8" diff --git a/tests/interchain/consumer_chain/consumer_launch_test.go b/tests/interchain/consumer_chain/consumer_launch_test.go index 7ea2635300f..ca14672f49b 100644 --- a/tests/interchain/consumer_chain/consumer_launch_test.go +++ b/tests/interchain/consumer_chain/consumer_launch_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/suite" "golang.org/x/mod/semver" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" ) type ConsumerLaunchSuite struct { diff --git a/tests/interchain/consumer_chain/consumer_modification_test.go b/tests/interchain/consumer_chain/consumer_modification_test.go index d4239efa6ca..7dc63df080e 100644 --- a/tests/interchain/consumer_chain/consumer_modification_test.go +++ b/tests/interchain/consumer_chain/consumer_modification_test.go @@ -9,7 +9,7 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" "github.com/strangelove-ventures/interchaintest/v8" diff --git a/tests/interchain/consumer_chain/mainnet_consumers_test.go b/tests/interchain/consumer_chain/mainnet_consumers_test.go index 20188ad87e7..738c3fc5fbe 100644 --- a/tests/interchain/consumer_chain/mainnet_consumers_test.go +++ b/tests/interchain/consumer_chain/mainnet_consumers_test.go @@ -3,7 +3,7 @@ package consumer_chain_test import ( "testing" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/stretchr/testify/suite" "golang.org/x/mod/semver" diff --git a/tests/interchain/consumer_chain/unbonding_test.go b/tests/interchain/consumer_chain/unbonding_test.go index 9113d8f0b75..fc10adea408 100644 --- a/tests/interchain/consumer_chain/unbonding_test.go +++ b/tests/interchain/consumer_chain/unbonding_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" diff --git a/tests/interchain/delegator/authz_test.go b/tests/interchain/delegator/authz_test.go index ef8a01a0069..e493b81eff6 100644 --- a/tests/interchain/delegator/authz_test.go +++ b/tests/interchain/delegator/authz_test.go @@ -7,8 +7,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/assert" diff --git a/tests/interchain/delegator/bank_test.go b/tests/interchain/delegator/bank_test.go index b19022c63b4..9a75dbb5d07 100644 --- a/tests/interchain/delegator/bank_test.go +++ b/tests/interchain/delegator/bank_test.go @@ -4,8 +4,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/stretchr/testify/suite" ) diff --git a/tests/interchain/delegator/cosmwasm_test.go b/tests/interchain/delegator/cosmwasm_test.go index 725b29e11c3..a55fefbc160 100644 --- a/tests/interchain/delegator/cosmwasm_test.go +++ b/tests/interchain/delegator/cosmwasm_test.go @@ -6,8 +6,8 @@ import ( "path" "testing" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/stretchr/testify/suite" ) diff --git a/tests/interchain/delegator/feegrant_test.go b/tests/interchain/delegator/feegrant_test.go index e03cc784dce..211eec4e8f5 100644 --- a/tests/interchain/delegator/feegrant_test.go +++ b/tests/interchain/delegator/feegrant_test.go @@ -5,8 +5,8 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/strangelove-ventures/interchaintest/v8/testutil" "github.com/stretchr/testify/suite" ) diff --git a/tests/interchain/delegator/ica_test.go b/tests/interchain/delegator/ica_test.go index d2bf4dfc309..485ab692566 100644 --- a/tests/interchain/delegator/ica_test.go +++ b/tests/interchain/delegator/ica_test.go @@ -7,8 +7,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/tests/interchain/delegator/lsm_test.go b/tests/interchain/delegator/lsm_test.go index 50c32d19da0..4f05e8fbadf 100644 --- a/tests/interchain/delegator/lsm_test.go +++ b/tests/interchain/delegator/lsm_test.go @@ -8,7 +8,7 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/strangelove-ventures/interchaintest/v8/testutil" diff --git a/tests/interchain/delegator/multisig_test.go b/tests/interchain/delegator/multisig_test.go index 478c0b6eba4..7da1b9e04aa 100644 --- a/tests/interchain/delegator/multisig_test.go +++ b/tests/interchain/delegator/multisig_test.go @@ -6,8 +6,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/suite" diff --git a/tests/interchain/delegator/pfm_test.go b/tests/interchain/delegator/pfm_test.go index d7a71bd6575..bb861a9929b 100644 --- a/tests/interchain/delegator/pfm_test.go +++ b/tests/interchain/delegator/pfm_test.go @@ -5,8 +5,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" diff --git a/tests/interchain/delegator/staking_test.go b/tests/interchain/delegator/staking_test.go index f2c99eb5923..630da166e1a 100644 --- a/tests/interchain/delegator/staking_test.go +++ b/tests/interchain/delegator/staking_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/stretchr/testify/suite" ) diff --git a/tests/interchain/delegator/suite.go b/tests/interchain/delegator/suite.go index 972482b339d..6e6ce82c64f 100644 --- a/tests/interchain/delegator/suite.go +++ b/tests/interchain/delegator/suite.go @@ -2,7 +2,7 @@ package delegator import ( sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" ) diff --git a/tests/interchain/feemarket_test.go b/tests/interchain/feemarket_test.go index 06097cb1d6f..1b6274501d7 100644 --- a/tests/interchain/feemarket_test.go +++ b/tests/interchain/feemarket_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/testutil" diff --git a/tests/interchain/go.mod b/tests/interchain/go.mod index 6d0d0fdeb04..1171182b477 100644 --- a/tests/interchain/go.mod +++ b/tests/interchain/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v21/tests/interchain +module github.com/cosmos/gaia/v22/tests/interchain go 1.22.5 diff --git a/tests/interchain/integrator/endpoints_test.go b/tests/interchain/integrator/endpoints_test.go index 434253423b6..d5d5d6ca5e9 100644 --- a/tests/interchain/integrator/endpoints_test.go +++ b/tests/interchain/integrator/endpoints_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/stretchr/testify/suite" "golang.org/x/mod/semver" ) diff --git a/tests/interchain/validator/inactive_validator_test.go b/tests/interchain/validator/inactive_validator_test.go index 56faff11d84..4185358968e 100644 --- a/tests/interchain/validator/inactive_validator_test.go +++ b/tests/interchain/validator/inactive_validator_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/assert" diff --git a/tests/interchain/validator/unbond_test.go b/tests/interchain/validator/unbond_test.go index 19157e45c4e..6a8942244cf 100644 --- a/tests/interchain/validator/unbond_test.go +++ b/tests/interchain/validator/unbond_test.go @@ -6,7 +6,7 @@ import ( "github.com/strangelove-ventures/interchaintest/v8" "github.com/stretchr/testify/suite" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) diff --git a/x/metaprotocols/module.go b/x/metaprotocols/module.go index ebdab3b03b4..452e6b26701 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/v21/x/metaprotocols/types" + "github.com/cosmos/gaia/v22/x/metaprotocols/types" ) const consensusVersion uint64 = 1 From 2797d0b94fb47c3aaca2b0fbadc7b8ba20dd5fff Mon Sep 17 00:00:00 2001 From: mpoke Date: Wed, 13 Nov 2024 15:41:14 +0100 Subject: [PATCH 2/4] add v22 upgrade handler --- app/app.go | 4 ++-- app/upgrades/v22/constants.go | 15 +++++++++++++++ app/upgrades/v22/upgrades.go | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 app/upgrades/v22/constants.go create mode 100644 app/upgrades/v22/upgrades.go diff --git a/app/app.go b/app/app.go index 278167605bd..277970e8ead 100644 --- a/app/app.go +++ b/app/app.go @@ -69,14 +69,14 @@ import ( gaiaante "github.com/cosmos/gaia/v22/ante" "github.com/cosmos/gaia/v22/app/keepers" "github.com/cosmos/gaia/v22/app/upgrades" - v21 "github.com/cosmos/gaia/v22/app/upgrades/v21" + v22 "github.com/cosmos/gaia/v22/app/upgrades/v22" ) var ( // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string - Upgrades = []upgrades.Upgrade{v21.Upgrade} + Upgrades = []upgrades.Upgrade{v22.Upgrade} ) var ( diff --git a/app/upgrades/v22/constants.go b/app/upgrades/v22/constants.go new file mode 100644 index 00000000000..a207708c927 --- /dev/null +++ b/app/upgrades/v22/constants.go @@ -0,0 +1,15 @@ +package v22 + +import ( + "github.com/cosmos/gaia/v22/app/upgrades" +) + +const ( + // UpgradeName defines the on-chain upgrade name. + UpgradeName = "v22" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, +} diff --git a/app/upgrades/v22/upgrades.go b/app/upgrades/v22/upgrades.go new file mode 100644 index 00000000000..e9b46aea1f1 --- /dev/null +++ b/app/upgrades/v22/upgrades.go @@ -0,0 +1,33 @@ +package v22 + +import ( + "context" + + errorsmod "cosmossdk.io/errors" + upgradetypes "cosmossdk.io/x/upgrade/types" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + + "github.com/cosmos/gaia/v22/app/keepers" +) + +// CreateUpgradeHandler returns an upgrade handler for Gaia v22. +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + keepers *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(c context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + ctx := sdk.UnwrapSDKContext(c) + ctx.Logger().Info("Starting module migrations...") + + vm, err := mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, errorsmod.Wrapf(err, "running module migrations") + } + + ctx.Logger().Info("Upgrade v22 complete") + return vm, nil + } +} From bcd56f81643321ea322a80876a6aeb5a63c6ce3a Mon Sep 17 00:00:00 2001 From: mpoke Date: Wed, 13 Nov 2024 15:42:06 +0100 Subject: [PATCH 3/4] update upgrade-test --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54e2fa803c6..780e18ed384 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -163,10 +163,10 @@ jobs: # the old gaiad binary version is hardcoded, need to be updated each major release. - name: Install Old Gaiad run: | - curl -LO https://github.com/cosmos/gaia/releases/download/v20.0.0/gaiad-v20.0.0-linux-amd64 - chmod a+x gaiad-v20.0.0-linux-amd64 + curl -LO https://github.com/cosmos/gaia/releases/download/v21.0.0/gaiad-v21.0.0-linux-amd64 + chmod a+x gaiad-v21.0.0-linux-amd64 mkdir build - mv ./gaiad-v20.0.0-linux-amd64 ./build/gaiadold + mv ./gaiad-v21.0.0-linux-amd64 ./build/gaiadold if: env.GIT_DIFF - name: Install New Gaiad run: | From 61a0927c56e3bfe7ea896d02ed0f525f500e86da Mon Sep 17 00:00:00 2001 From: MSalopek Date: Thu, 28 Nov 2024 13:56:14 +0100 Subject: [PATCH 4/4] fix: v21 -> v22 in interchaintest --- tests/interchain/validator/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/interchain/validator/config_test.go b/tests/interchain/validator/config_test.go index 9b4891f3de0..25d26fcb913 100644 --- a/tests/interchain/validator/config_test.go +++ b/tests/interchain/validator/config_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/gorilla/websocket" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt"