Skip to content

Commit e6afbe9

Browse files
Eric-WarehimeEric-Warehime
authored
chore: Bump to v23 (#3482)
* Bump to v23 * Add proper upgrade
1 parent 26fec1c commit e6afbe9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+148
-103
lines changed

‎.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ jobs:
163163
# the old gaiad binary version is hardcoded, need to be updated each major release.
164164
- name: Install Old Gaiad
165165
run: |
166-
curl -LO https://github.com/cosmos/gaia/releases/download/v21.0.0/gaiad-v21.0.0-linux-amd64
167-
chmod a+x gaiad-v21.0.0-linux-amd64
166+
curl -LO https://github.com/cosmos/gaia/releases/download/v22.0.0/gaiad-v22.0.0-linux-amd64
167+
chmod a+x gaiad-v22.0.0-linux-amd64
168168
mkdir build
169-
mv ./gaiad-v21.0.0-linux-amd64 ./build/gaiadold
169+
mv ./gaiad-v22.0.0-linux-amd64 ./build/gaiadold
170170
if: env.GIT_DIFF
171171
- name: Install New Gaiad
172172
run: |

‎ante/ante.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
2323
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
2424

25-
gaiaerrors "github.com/cosmos/gaia/v22/types/errors"
25+
gaiaerrors "github.com/cosmos/gaia/v23/types/errors"
2626
)
2727

2828
// UseFeeMarketDecorator to make the integration testing easier: we can switch off its ante and post decorators with this flag

‎ante/gov_expedited_ante.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
sdk "github.com/cosmos/cosmos-sdk/types"
88
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
99

10-
gaiaerrors "github.com/cosmos/gaia/v22/types/errors"
10+
gaiaerrors "github.com/cosmos/gaia/v23/types/errors"
1111
)
1212

1313
var expeditedPropDecoratorEnabled = true

‎ante/gov_expedited_ante_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
1515
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
1616

17-
"github.com/cosmos/gaia/v22/ante"
18-
"github.com/cosmos/gaia/v22/app/helpers"
17+
"github.com/cosmos/gaia/v23/ante"
18+
"github.com/cosmos/gaia/v23/app/helpers"
1919
)
2020

2121
func TestGovExpeditedProposalsDecorator(t *testing.T) {

‎ante/gov_vote_ante.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
1313
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
1414

15-
gaiaerrors "github.com/cosmos/gaia/v22/types/errors"
15+
gaiaerrors "github.com/cosmos/gaia/v23/types/errors"
1616
)
1717

1818
var (

‎ante/gov_vote_ante_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
1616
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
1717

18-
"github.com/cosmos/gaia/v22/ante"
19-
"github.com/cosmos/gaia/v22/app/helpers"
18+
"github.com/cosmos/gaia/v23/ante"
19+
"github.com/cosmos/gaia/v23/app/helpers"
2020
)
2121

2222
// Test that the GovVoteDecorator rejects v1beta1 vote messages from accounts with less than 1 atom staked

‎app/app.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,17 @@ import (
6666
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
6767
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
6868

69-
gaiaante "github.com/cosmos/gaia/v22/ante"
70-
"github.com/cosmos/gaia/v22/app/keepers"
71-
"github.com/cosmos/gaia/v22/app/upgrades"
72-
v22 "github.com/cosmos/gaia/v22/app/upgrades/v22"
69+
gaiaante "github.com/cosmos/gaia/v23/ante"
70+
"github.com/cosmos/gaia/v23/app/keepers"
71+
"github.com/cosmos/gaia/v23/app/upgrades"
72+
v23 "github.com/cosmos/gaia/v23/app/upgrades/v23"
7373
)
7474

7575
var (
7676
// DefaultNodeHome default home directories for the application daemon
7777
DefaultNodeHome string
7878

79-
Upgrades = []upgrades.Upgrade{v22.Upgrade}
79+
Upgrades = []upgrades.Upgrade{v23.Upgrade}
8080
)
8181

8282
var (

‎app/app_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414

1515
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
1616

17-
gaia "github.com/cosmos/gaia/v22/app"
18-
gaiahelpers "github.com/cosmos/gaia/v22/app/helpers"
17+
gaia "github.com/cosmos/gaia/v23/app"
18+
gaiahelpers "github.com/cosmos/gaia/v23/app/helpers"
1919
)
2020

2121
type EmptyAppOptions struct{}

‎app/helpers/test_helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
3232

33-
gaiaapp "github.com/cosmos/gaia/v22/app"
33+
gaiaapp "github.com/cosmos/gaia/v23/app"
3434
)
3535

3636
// SimAppChainID hardcoded chainID for simulation

‎app/modules.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ import (
6262
wasm "github.com/CosmWasm/wasmd/x/wasm"
6363
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
6464

65-
"github.com/cosmos/gaia/v22/x/metaprotocols"
66-
metaprotocolstypes "github.com/cosmos/gaia/v22/x/metaprotocols/types"
65+
"github.com/cosmos/gaia/v23/x/metaprotocols"
66+
metaprotocolstypes "github.com/cosmos/gaia/v23/x/metaprotocols/types"
6767
)
6868

6969
var maccPerms = map[string][]string{

‎app/post.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
sdk "github.com/cosmos/cosmos-sdk/types"
99
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1010

11-
"github.com/cosmos/gaia/v22/ante"
11+
"github.com/cosmos/gaia/v23/ante"
1212
)
1313

1414
// PostHandlerOptions are the options required for constructing a FeeMarket PostHandler.

‎app/sim/sim_state.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
2424
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
2525

26-
gaia "github.com/cosmos/gaia/v22/app"
26+
gaia "github.com/cosmos/gaia/v23/app"
2727
)
2828

2929
// Simulation parameter constants

‎app/sim/sim_utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/cosmos/cosmos-sdk/types/module"
1313
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
1414

15-
gaia "github.com/cosmos/gaia/v22/app"
15+
gaia "github.com/cosmos/gaia/v23/app"
1616
)
1717

1818
// SimulationOperations retrieves the simulation params from the provided file path

‎app/sim_bench_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"github.com/cosmos/cosmos-sdk/x/simulation"
1414
simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
1515

16-
gaia "github.com/cosmos/gaia/v22/app"
17-
"github.com/cosmos/gaia/v22/app/sim"
16+
gaia "github.com/cosmos/gaia/v23/app"
17+
"github.com/cosmos/gaia/v23/app/sim"
1818
)
1919

2020
// Profile with:

‎app/sim_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
"github.com/cosmos/cosmos-sdk/x/simulation"
2424
simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
2525

26-
"github.com/cosmos/gaia/v22/ante"
27-
gaia "github.com/cosmos/gaia/v22/app"
26+
"github.com/cosmos/gaia/v23/ante"
27+
gaia "github.com/cosmos/gaia/v23/app"
2828
// "github.com/cosmos/gaia/v11/app/helpers"
2929
// "github.com/cosmos/gaia/v11/app/params"
30-
"github.com/cosmos/gaia/v22/app/sim"
30+
"github.com/cosmos/gaia/v23/app/sim"
3131
)
3232

3333
// AppChainID hardcoded chainID for simulation

‎app/upgrades/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
sdk "github.com/cosmos/cosmos-sdk/types"
88
"github.com/cosmos/cosmos-sdk/types/module"
99

10-
"github.com/cosmos/gaia/v22/app/keepers"
10+
"github.com/cosmos/gaia/v23/app/keepers"
1111
)
1212

1313
// Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal

‎app/upgrades/v19/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v19
22

33
import (
4-
"github.com/cosmos/gaia/v22/app/upgrades"
4+
"github.com/cosmos/gaia/v23/app/upgrades"
55
)
66

77
const (

‎app/upgrades/v19/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
sdk "github.com/cosmos/cosmos-sdk/types"
99
"github.com/cosmos/cosmos-sdk/types/module"
1010

11-
"github.com/cosmos/gaia/v22/app/keepers"
11+
"github.com/cosmos/gaia/v23/app/keepers"
1212
)
1313

1414
func CreateUpgradeHandler(

‎app/upgrades/v20/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v20
22

33
import (
4-
"github.com/cosmos/gaia/v22/app/upgrades"
4+
"github.com/cosmos/gaia/v23/app/upgrades"
55
)
66

77
const (

‎app/upgrades/v20/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
2424
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
2525

26-
"github.com/cosmos/gaia/v22/app/keepers"
26+
"github.com/cosmos/gaia/v23/app/keepers"
2727
)
2828

2929
// Constants for the new parameters in the v20 upgrade.

‎app/upgrades/v20/upgrades_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
2222
v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
2323

24-
"github.com/cosmos/gaia/v22/app/helpers"
25-
v20 "github.com/cosmos/gaia/v22/app/upgrades/v20"
24+
"github.com/cosmos/gaia/v23/app/helpers"
25+
v20 "github.com/cosmos/gaia/v23/app/upgrades/v20"
2626
)
2727

2828
func GetTestMsgConsumerAddition() providertypes.MsgConsumerAddition { //nolint:staticcheck

‎app/upgrades/v21/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v21
22

33
import (
4-
"github.com/cosmos/gaia/v22/app/upgrades"
4+
"github.com/cosmos/gaia/v23/app/upgrades"
55
)
66

77
const (

‎app/upgrades/v21/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
1919
govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
2020

21-
"github.com/cosmos/gaia/v22/app/keepers"
21+
"github.com/cosmos/gaia/v23/app/keepers"
2222
)
2323

2424
// Neutron and Stride denoms that were not whitelisted but the consumer rewards pool contains amounts of those denoms.

‎app/upgrades/v21/upgrades_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
1111

12-
"github.com/cosmos/gaia/v22/app/helpers"
13-
v21 "github.com/cosmos/gaia/v22/app/upgrades/v21"
12+
"github.com/cosmos/gaia/v23/app/helpers"
13+
v21 "github.com/cosmos/gaia/v23/app/upgrades/v21"
1414
)
1515

1616
func TestHasExpectedChainIDSanityCheck(t *testing.T) {

‎app/upgrades/v22/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v22
22

33
import (
4-
"github.com/cosmos/gaia/v22/app/upgrades"
4+
"github.com/cosmos/gaia/v23/app/upgrades"
55
)
66

77
const (

‎app/upgrades/v22/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
sdk "github.com/cosmos/cosmos-sdk/types"
1313
"github.com/cosmos/cosmos-sdk/types/module"
1414

15-
"github.com/cosmos/gaia/v22/app/keepers"
15+
"github.com/cosmos/gaia/v23/app/keepers"
1616
)
1717

1818
// CreateUpgradeHandler returns an upgrade handler for Gaia v22.

‎app/upgrades/v22/upgrades_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"cosmossdk.io/math"
1313

14-
v22 "github.com/cosmos/gaia/v22/app/upgrades/v22"
14+
v22 "github.com/cosmos/gaia/v23/app/upgrades/v22"
1515
)
1616

1717
func TestSetDefaultConsumerInfractionParams(t *testing.T) {

‎app/upgrades/v23/constants.go

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package v23
2+
3+
import (
4+
"github.com/cosmos/gaia/v23/app/upgrades"
5+
)
6+
7+
const (
8+
// UpgradeName defines the on-chain upgrade name.
9+
UpgradeName = "v23"
10+
)
11+
12+
var Upgrade = upgrades.Upgrade{
13+
UpgradeName: UpgradeName,
14+
CreateUpgradeHandler: CreateUpgradeHandler,
15+
}

‎app/upgrades/v23/upgrades.go

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package v23
2+
3+
import (
4+
"context"
5+
6+
errorsmod "cosmossdk.io/errors"
7+
upgradetypes "cosmossdk.io/x/upgrade/types"
8+
9+
sdk "github.com/cosmos/cosmos-sdk/types"
10+
"github.com/cosmos/cosmos-sdk/types/module"
11+
12+
"github.com/cosmos/gaia/v23/app/keepers"
13+
)
14+
15+
// CreateUpgradeHandler returns an upgrade handler for Gaia v23.
16+
func CreateUpgradeHandler(
17+
mm *module.Manager,
18+
configurator module.Configurator,
19+
keepers *keepers.AppKeepers,
20+
) upgradetypes.UpgradeHandler {
21+
return func(c context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
22+
ctx := sdk.UnwrapSDKContext(c)
23+
ctx.Logger().Info("Starting module migrations...")
24+
25+
vm, err := mm.RunMigrations(ctx, configurator, vm)
26+
if err != nil {
27+
return vm, errorsmod.Wrapf(err, "running module migrations")
28+
}
29+
30+
ctx.Logger().Info("Upgrade v23 complete")
31+
return vm, nil
32+
}
33+
}

‎cmd/gaiad/cmd/bech32_convert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/spf13/cobra"
77

8-
addressutil "github.com/cosmos/gaia/v22/pkg/address"
8+
addressutil "github.com/cosmos/gaia/v23/pkg/address"
99
)
1010

1111
var flagBech32Prefix = "prefix"

‎cmd/gaiad/cmd/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import (
5757
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
5858
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
5959

60-
gaia "github.com/cosmos/gaia/v22/app"
60+
gaia "github.com/cosmos/gaia/v23/app"
6161
)
6262

6363
// NewRootCmd creates a new root command for simd. It is called once in the

‎cmd/gaiad/cmd/root_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
99

10-
app "github.com/cosmos/gaia/v22/app"
11-
"github.com/cosmos/gaia/v22/cmd/gaiad/cmd"
10+
app "github.com/cosmos/gaia/v23/app"
11+
"github.com/cosmos/gaia/v23/cmd/gaiad/cmd"
1212
)
1313

1414
func TestRootCmdConfig(t *testing.T) {

‎cmd/gaiad/cmd/testnet_set_local_validator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/spf13/cast"
2323
"github.com/spf13/cobra"
2424

25-
gaia "github.com/cosmos/gaia/v22/app"
25+
gaia "github.com/cosmos/gaia/v23/app"
2626

2727
"cosmossdk.io/log"
2828
"github.com/cometbft/cometbft/crypto"

‎cmd/gaiad/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
77

8-
app "github.com/cosmos/gaia/v22/app"
9-
"github.com/cosmos/gaia/v22/cmd/gaiad/cmd"
8+
app "github.com/cosmos/gaia/v23/app"
9+
"github.com/cosmos/gaia/v23/cmd/gaiad/cmd"
1010
)
1111

1212
func main() {

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/cosmos/gaia/v22
1+
module github.com/cosmos/gaia/v23
22

33
go 1.22.7
44

‎tests/e2e/chain.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
paramsproptypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
2828
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
2929

30-
gaia "github.com/cosmos/gaia/v22/app"
31-
gaiaparams "github.com/cosmos/gaia/v22/app/params"
32-
metaprotocoltypes "github.com/cosmos/gaia/v22/x/metaprotocols/types"
30+
gaia "github.com/cosmos/gaia/v23/app"
31+
gaiaparams "github.com/cosmos/gaia/v23/app/params"
32+
metaprotocoltypes "github.com/cosmos/gaia/v23/x/metaprotocols/types"
3333
)
3434

3535
const (

0 commit comments

Comments
 (0)