From ae64d50d15c7097220366aa4260e05efdf04c97e Mon Sep 17 00:00:00 2001 From: yaruwangway <69694322+yaruwangway@users.noreply.github.com> Date: Thu, 24 Aug 2023 16:24:23 +0200 Subject: [PATCH] chore: update to v13 (#2707) * update to v13 * update upgrade script * update test upgrade script * update sed command * update app.go * update upgradeFrom version --- .github/workflows/test.yml | 2 +- ante/ante.go | 4 +-- ante/gov_ante.go | 2 +- ante/gov_ante_test.go | 6 ++--- app/app.go | 14 +++++----- app/app_test.go | 4 +-- app/encoding.go | 2 +- app/helpers/test_helpers.go | 2 +- app/keepers/keepers.go | 2 +- app/modules.go | 4 +-- app/sim/sim_state.go | 2 +- app/sim/sim_utils.go | 2 +- app/sim_test.go | 8 +++--- 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 | 15 +++++++++++ app/upgrades/v13/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 +-- .../scripts/upgrade_test_scripts/run_gaia.sh | 11 ++++---- go.mod | 2 +- tests/e2e/chain.go | 4 +-- tests/e2e/e2e_vesting_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 | 10 +++---- 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 | 2 +- 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/querier_test.go | 2 +- x/globalfee/types/params.go | 2 +- 54 files changed, 128 insertions(+), 85 deletions(-) create mode 100644 app/upgrades/v13/constants.go create mode 100644 app/upgrades/v13/upgrades.go diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d1aa0038c26..e09b01b5f44 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -149,7 +149,7 @@ jobs: # the old gaiad binary version is hardcoded, need to be updated each major release. - name: Install Old Gaiad run: | - git checkout v11.0.0 + git checkout v12.0.0 make build cp ./build/gaiad ./build/gaiadold go clean -modcache diff --git a/ante/ante.go b/ante/ante.go index d27d5665468..72f2241e389 100644 --- a/ante/ante.go +++ b/ante/ante.go @@ -12,8 +12,8 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - gaiaerrors "github.com/cosmos/gaia/v12/types/errors" - gaiafeeante "github.com/cosmos/gaia/v12/x/globalfee/ante" + gaiaerrors "github.com/cosmos/gaia/v13/types/errors" + gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/ante/gov_ante.go b/ante/gov_ante.go index 11d05307bc8..e0abb9fd4b3 100644 --- a/ante/gov_ante.go +++ b/ante/gov_ante.go @@ -9,7 +9,7 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - gaiaerrors "github.com/cosmos/gaia/v12/types/errors" + gaiaerrors "github.com/cosmos/gaia/v13/types/errors" ) // initial deposit must be greater than or equal to 10% of the minimum deposit diff --git a/ante/gov_ante_test.go b/ante/gov_ante_test.go index 1e7f4f168af..9f11c51ae70 100644 --- a/ante/gov_ante_test.go +++ b/ante/gov_ante_test.go @@ -13,9 +13,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/gaia/v12/ante" - gaiaapp "github.com/cosmos/gaia/v12/app" - gaiahelpers "github.com/cosmos/gaia/v12/app/helpers" + "github.com/cosmos/gaia/v13/ante" + gaiaapp "github.com/cosmos/gaia/v13/app" + gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" ) var ( diff --git a/app/app.go b/app/app.go index 774e7c9388c..fc3d4af3e1b 100644 --- a/app/app.go +++ b/app/app.go @@ -45,19 +45,19 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gaiaante "github.com/cosmos/gaia/v12/ante" - "github.com/cosmos/gaia/v12/app/keepers" - gaiaappparams "github.com/cosmos/gaia/v12/app/params" - "github.com/cosmos/gaia/v12/app/upgrades" - v12 "github.com/cosmos/gaia/v12/app/upgrades/v12" - "github.com/cosmos/gaia/v12/x/globalfee" + gaiaante "github.com/cosmos/gaia/v13/ante" + "github.com/cosmos/gaia/v13/app/keepers" + gaiaappparams "github.com/cosmos/gaia/v13/app/params" + "github.com/cosmos/gaia/v13/app/upgrades" + v13 "github.com/cosmos/gaia/v13/app/upgrades/v13" + "github.com/cosmos/gaia/v13/x/globalfee" ) var ( // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string - Upgrades = []upgrades.Upgrade{v12.Upgrade} + Upgrades = []upgrades.Upgrade{v13.Upgrade} ) var ( diff --git a/app/app_test.go b/app/app_test.go index c342264d062..53f77176382 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -10,8 +10,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - gaia "github.com/cosmos/gaia/v12/app" - gaiahelpers "github.com/cosmos/gaia/v12/app/helpers" + gaia "github.com/cosmos/gaia/v13/app" + gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" ) type EmptyAppOptions struct{} diff --git a/app/encoding.go b/app/encoding.go index 9c00c47782d..55fe401f209 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/v12/app/params" + "github.com/cosmos/gaia/v13/app/params" ) // MakeTestEncodingConfig creates an EncodingConfig for testing. This function diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index 785257266ea..de96f07630e 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -22,7 +22,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaapp "github.com/cosmos/gaia/v12/app" + gaiaapp "github.com/cosmos/gaia/v13/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 911a80415f9..c94adad21df 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -64,7 +64,7 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v12/x/globalfee" + "github.com/cosmos/gaia/v13/x/globalfee" ) type AppKeepers struct { diff --git a/app/modules.go b/app/modules.go index 3be9a0f471c..5943420c062 100644 --- a/app/modules.go +++ b/app/modules.go @@ -55,8 +55,8 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gaiaappparams "github.com/cosmos/gaia/v12/app/params" - "github.com/cosmos/gaia/v12/x/globalfee" + gaiaappparams "github.com/cosmos/gaia/v13/app/params" + "github.com/cosmos/gaia/v13/x/globalfee" ) var maccPerms = map[string][]string{ diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go index dc035492c00..e1053aec363 100644 --- a/app/sim/sim_state.go +++ b/app/sim/sim_state.go @@ -21,7 +21,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v12/app" + gaia "github.com/cosmos/gaia/v13/app" ) // AppStateFn returns the initial application state using a genesis or the simulation parameters. diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go index 4390677e309..2e4e39d7a1c 100644 --- a/app/sim/sim_utils.go +++ b/app/sim/sim_utils.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - gaia "github.com/cosmos/gaia/v12/app" + gaia "github.com/cosmos/gaia/v13/app" ) // SetupSimulation creates the config, db (levelDB), temporary directory and logger for diff --git a/app/sim_test.go b/app/sim_test.go index b000c6a22d5..c48b68b4b5a 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -17,10 +17,10 @@ import ( simulation2 "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - gaia "github.com/cosmos/gaia/v12/app" - "github.com/cosmos/gaia/v12/app/helpers" - "github.com/cosmos/gaia/v12/app/params" - "github.com/cosmos/gaia/v12/app/sim" + gaia "github.com/cosmos/gaia/v13/app" + "github.com/cosmos/gaia/v13/app/helpers" + "github.com/cosmos/gaia/v13/app/params" + "github.com/cosmos/gaia/v13/app/sim" ) func init() { diff --git a/app/upgrades/types.go b/app/upgrades/types.go index bd24cd53c74..74bbbe1cb6b 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/v12/app/keepers" + "github.com/cosmos/gaia/v13/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 7378b2f6bba..54d90d226d4 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -1,7 +1,7 @@ package v10 import ( - "github.com/cosmos/gaia/v12/app/upgrades" + "github.com/cosmos/gaia/v13/app/upgrades" ) const ( diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index 87605de9638..9eb9b4fca07 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/v12/app/keepers" + "github.com/cosmos/gaia/v13/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index 07c0beb5aea..55b9e7670d8 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -1,7 +1,7 @@ package v11 import ( - "github.com/cosmos/gaia/v12/app/upgrades" + "github.com/cosmos/gaia/v13/app/upgrades" ) const ( diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index cd7dfd54170..3d6db458748 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/v12/app/keepers" + "github.com/cosmos/gaia/v13/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index 574f844b2f7..a32b0f09f4f 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/v12/app/upgrades" + "github.com/cosmos/gaia/v13/app/upgrades" ) const ( diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index 3aa086a1b19..33c4393b262 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/v12/app/keepers" + "github.com/cosmos/gaia/v13/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go new file mode 100644 index 00000000000..dcdd00a1420 --- /dev/null +++ b/app/upgrades/v13/constants.go @@ -0,0 +1,15 @@ +package v13 + +import ( + "github.com/cosmos/gaia/v13/app/upgrades" +) + +const ( + // UpgradeName defines the on-chain upgrade name. + UpgradeName = "v13" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, +} diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go new file mode 100644 index 00000000000..9ee328d928d --- /dev/null +++ b/app/upgrades/v13/upgrades.go @@ -0,0 +1,27 @@ +package v13 + +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/v13/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 0c4cb593cf5..d2e142a83b7 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -5,7 +5,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v12/app/upgrades" + "github.com/cosmos/gaia/v13/app/upgrades" ) const ( diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index 8db30abb0f0..3d3d2766034 100644 --- a/app/upgrades/v7/upgrades.go +++ b/app/upgrades/v7/upgrades.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v12/app/keepers" + "github.com/cosmos/gaia/v13/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go index f90506f1908..ce5e94ba666 100644 --- a/app/upgrades/v8/constants.go +++ b/app/upgrades/v8/constants.go @@ -3,8 +3,8 @@ package v8 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v12/app/upgrades" - "github.com/cosmos/gaia/v12/x/globalfee" + "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v13/x/globalfee" ) const ( diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index 820bd2c5609..6ee76679ce1 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -14,7 +14,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v12/app/keepers" + "github.com/cosmos/gaia/v13/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 dcbd9a724f7..aac62691873 100644 --- a/app/upgrades/v9/constants.go +++ b/app/upgrades/v9/constants.go @@ -5,7 +5,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v12/app/upgrades" + "github.com/cosmos/gaia/v13/app/upgrades" ) const ( diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index 188755a7317..d90b3ead3a3 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v12/app/keepers" + "github.com/cosmos/gaia/v13/app/keepers" ) func CreateUpgradeHandler( diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go index 2ed73990ef5..d1af78ec170 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/v12/pkg/address" + addressutil "github.com/cosmos/gaia/v13/pkg/address" ) var flagBech32Prefix = "prefix" diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go index adbb5e8325f..6a8cddb9f3b 100644 --- a/cmd/gaiad/cmd/root.go +++ b/cmd/gaiad/cmd/root.go @@ -31,8 +31,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - gaia "github.com/cosmos/gaia/v12/app" - "github.com/cosmos/gaia/v12/app/params" + gaia "github.com/cosmos/gaia/v13/app" + "github.com/cosmos/gaia/v13/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 5ff3e0b89c9..bc8a6cadbad 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/v12/app" - "github.com/cosmos/gaia/v12/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v13/app" + "github.com/cosmos/gaia/v13/cmd/gaiad/cmd" ) func TestRootCmdConfig(t *testing.T) { diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go index afee9ee348f..f1dcc176b15 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/v12/app" - "github.com/cosmos/gaia/v12/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v13/app" + "github.com/cosmos/gaia/v13/cmd/gaiad/cmd" ) func main() { diff --git a/contrib/scripts/upgrade_test_scripts/run_gaia.sh b/contrib/scripts/upgrade_test_scripts/run_gaia.sh index acd5712e37d..9859bb82619 100755 --- a/contrib/scripts/upgrade_test_scripts/run_gaia.sh +++ b/contrib/scripts/upgrade_test_scripts/run_gaia.sh @@ -65,15 +65,16 @@ tmp=$(mktemp) jq --argjson foo "$(jq -c '.' contrib/denom.json)" '.app_state.bank.denom_metadata = $foo' $NODE_HOME/config/genesis.json >"$tmp" && mv "$tmp" $NODE_HOME/config/genesis.json # replace default stake token with uatom -sed -i -e 's/stake/uatom/g' $NODE_HOME/config/genesis.json +sed -i -e '/total_liquid_staked_tokens/!s/stake/uatom/g' $NODE_HOME/config/genesis.json + # min deposition amount (this one isn't working) -sed -i -e 's%"amount": "10000000",%"amount": "1",%g' $NODE_HOME/config/genesis.json +sed -i -e 's/"amount": "10000000",/"amount": "1",/g' $NODE_HOME/config/genesis.json # min voting power that a proposal requires in order to be a valid proposal -sed -i -e 's%"quorum": "0.334000000000000000",%"quorum": "0.000000000000000001",%g' $NODE_HOME/config/genesis.json +sed -i -e 's/"quorum": "0.334000000000000000",/"quorum": "0.000000000000000001",/g' $NODE_HOME/config/genesis.json # the minimum proportion of "yes" votes requires for the proposal to pass -sed -i -e 's%"threshold": "0.500000000000000000",%"threshold": "0.000000000000000001",%g' $NODE_HOME/config/genesis.json +sed -i -e 's/"threshold": "0.500000000000000000",/"threshold": "0.000000000000000001",/g' $NODE_HOME/config/genesis.json # voting period to 30s -sed -i -e 's%"voting_period": "172800s"%"voting_period": "30s"%g' $NODE_HOME/config/genesis.json +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 diff --git a/go.mod b/go.mod index d87a1d0443e..004c262084b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v12 +module github.com/cosmos/gaia/v13 go 1.20 diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go index ab6f8b77988..64452b573af 100644 --- a/tests/e2e/chain.go +++ b/tests/e2e/chain.go @@ -13,8 +13,8 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v12/app" - "github.com/cosmos/gaia/v12/app/params" + gaia "github.com/cosmos/gaia/v13/app" + "github.com/cosmos/gaia/v13/app/params" ) const ( diff --git a/tests/e2e/e2e_vesting_test.go b/tests/e2e/e2e_vesting_test.go index 8d7773eeb60..3cd70ad6d28 100644 --- a/tests/e2e/e2e_vesting_test.go +++ b/tests/e2e/e2e_vesting_test.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v12/x/globalfee/ante" + "github.com/cosmos/gaia/v13/x/globalfee/ante" ) const ( diff --git a/tests/e2e/genesis.go b/tests/e2e/genesis.go index beff7e8d408..d89fe4ae9ec 100644 --- a/tests/e2e/genesis.go +++ b/tests/e2e/genesis.go @@ -19,7 +19,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - globfeetypes "github.com/cosmos/gaia/v12/x/globalfee/types" + globfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" ) func getGenDoc(path string) (*tmtypes.GenesisDoc, error) { diff --git a/tests/e2e/query.go b/tests/e2e/query.go index c9c6f5b8d13..6ba1ba81a5a 100644 --- a/tests/e2e/query.go +++ b/tests/e2e/query.go @@ -16,7 +16,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v12/x/globalfee/types" + "github.com/cosmos/gaia/v13/x/globalfee/types" ) func queryGaiaTx(endpoint, txHash string) error { diff --git a/tests/e2e/validator.go b/tests/e2e/validator.go index 0ba59485b21..d50bdc92bb0 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/v12/app" + gaia "github.com/cosmos/gaia/v13/app" ) //nolint:unused diff --git a/tests/ics/interchain_security_test.go b/tests/ics/interchain_security_test.go index d9ba9748465..141ee73a6ae 100644 --- a/tests/ics/interchain_security_test.go +++ b/tests/ics/interchain_security_test.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/interchain-security/v2/tests/integration" icstestingutils "github.com/cosmos/interchain-security/v2/testutil/ibc_testing" - gaiaApp "github.com/cosmos/gaia/v12/app" + gaiaApp "github.com/cosmos/gaia/v13/app" ) func TestCCVTestSuite(t *testing.T) { diff --git a/x/globalfee/alias.go b/x/globalfee/alias.go index 2dd290b33aa..a7e7337cd59 100644 --- a/x/globalfee/alias.go +++ b/x/globalfee/alias.go @@ -1,7 +1,7 @@ package globalfee import ( - "github.com/cosmos/gaia/v12/x/globalfee/types" + "github.com/cosmos/gaia/v13/x/globalfee/types" ) const ( diff --git a/x/globalfee/ante/antetest/fee_test.go b/x/globalfee/ante/antetest/fee_test.go index 36ec9e2f49f..66646cf2a39 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/v12/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v12/x/globalfee/types" + gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v13/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 d986a7cc0fe..28fbad3f3ab 100644 --- a/x/globalfee/ante/antetest/fee_test_setup.go +++ b/x/globalfee/ante/antetest/fee_test_setup.go @@ -17,11 +17,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaapp "github.com/cosmos/gaia/v12/app" - gaiahelpers "github.com/cosmos/gaia/v12/app/helpers" - "github.com/cosmos/gaia/v12/x/globalfee" - gaiafeeante "github.com/cosmos/gaia/v12/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v12/x/globalfee/types" + gaiaapp "github.com/cosmos/gaia/v13/app" + gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" + "github.com/cosmos/gaia/v13/x/globalfee" + gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" ) type IntegrationTestSuite struct { diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index eb3614b30ef..913db72112a 100644 --- a/x/globalfee/ante/fee.go +++ b/x/globalfee/ante/fee.go @@ -12,9 +12,9 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaerrors "github.com/cosmos/gaia/v12/types/errors" - "github.com/cosmos/gaia/v12/x/globalfee" - "github.com/cosmos/gaia/v12/x/globalfee/types" + gaiaerrors "github.com/cosmos/gaia/v13/types/errors" + "github.com/cosmos/gaia/v13/x/globalfee" + "github.com/cosmos/gaia/v13/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 39bfd94ef9e..d66929b0000 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/v12/types/errors" + gaiaerrors "github.com/cosmos/gaia/v13/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 62e1a0309f6..08751f58f4e 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/v12/x/globalfee/types" + "github.com/cosmos/gaia/v13/x/globalfee/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index 77486cb9fc3..04c13b00187 100644 --- a/x/globalfee/genesis_test.go +++ b/x/globalfee/genesis_test.go @@ -18,7 +18,7 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v12/x/globalfee/types" + "github.com/cosmos/gaia/v13/x/globalfee/types" ) func TestDefaultGenesis(t *testing.T) { diff --git a/x/globalfee/keeper/migrations.go b/x/globalfee/keeper/migrations.go index fad6d4bc8ca..5036f70f731 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/v12/x/globalfee/migrations/v2" + v2 "github.com/cosmos/gaia/v13/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 9f07f4d463e..065337ae92d 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/v12/x/globalfee/types" + "github.com/cosmos/gaia/v13/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 f8ebd0edea8..b7d36d20785 100644 --- a/x/globalfee/migrations/v2/v2_test/migration_test.go +++ b/x/globalfee/migrations/v2/v2_test/migration_test.go @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/cosmos/gaia/v12/x/globalfee/migrations/v2" - globalfeetypes "github.com/cosmos/gaia/v12/x/globalfee/types" + v2 "github.com/cosmos/gaia/v13/x/globalfee/migrations/v2" + globalfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/globalfee/module.go b/x/globalfee/module.go index e2c657669d3..0fb07acedfb 100644 --- a/x/globalfee/module.go +++ b/x/globalfee/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v12/x/globalfee/client/cli" - "github.com/cosmos/gaia/v12/x/globalfee/keeper" - "github.com/cosmos/gaia/v12/x/globalfee/types" + "github.com/cosmos/gaia/v13/x/globalfee/client/cli" + "github.com/cosmos/gaia/v13/x/globalfee/keeper" + "github.com/cosmos/gaia/v13/x/globalfee/types" ) var ( diff --git a/x/globalfee/querier.go b/x/globalfee/querier.go index 8229e44e250..4f4c7e250dd 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/v12/x/globalfee/types" + "github.com/cosmos/gaia/v13/x/globalfee/types" ) var _ types.QueryServer = &GrpcQuerier{} diff --git a/x/globalfee/querier_test.go b/x/globalfee/querier_test.go index bf8db20cbce..966bcd55571 100644 --- a/x/globalfee/querier_test.go +++ b/x/globalfee/querier_test.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v12/x/globalfee/types" + "github.com/cosmos/gaia/v13/x/globalfee/types" ) func TestQueryMinimumGasPrices(t *testing.T) { diff --git a/x/globalfee/types/params.go b/x/globalfee/types/params.go index 4c2c192bd9f..7f0d522d303 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/v12/types/errors" + gaiaerrors "github.com/cosmos/gaia/v13/types/errors" ) var (