Skip to content

Commit be6e8cd

Browse files
mpokesainoeMSalopek
authored
chore: update main to v16 (#2947)
* gaia/v15 -> gaia/v16 * update test.yml * add v16 upgrade handler * make format * fix upgrade-test * bump go version in test.yml * gaiad genesis add-genesis-account * fix testing scripts * fix upgrade test in gh workflow * fix upgrade test in gh workflow 2 * debug store upgrade * bump version for metaprotocols --------- Co-authored-by: Simon Noetzlin <[email protected]> Co-authored-by: MSalopek <[email protected]>
1 parent ab87a22 commit be6e8cd

Some content is hidden

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

68 files changed

+153
-110
lines changed

‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ jobs:
147147
go.sum
148148
- uses: actions/setup-go@v5
149149
with:
150-
go-version: 1.20.x
150+
go-version: 1.21.x
151151
# the old gaiad binary version is hardcoded, need to be updated each major release.
152152
- name: Install Old Gaiad
153153
run: |
154-
git checkout v14.0.0
154+
git checkout v15.0.0-rc1
155155
make build
156156
cp ./build/gaiad ./build/gaiadold
157157
go clean -modcache

‎ante/ante.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
1313
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
1414

15-
gaiaerrors "github.com/cosmos/gaia/v15/types/errors"
16-
gaiafeeante "github.com/cosmos/gaia/v15/x/globalfee/ante"
15+
gaiaerrors "github.com/cosmos/gaia/v16/types/errors"
16+
gaiafeeante "github.com/cosmos/gaia/v16/x/globalfee/ante"
1717
)
1818

1919
// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC

‎ante/gov_vote_ante.go

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

14-
gaiaerrors "github.com/cosmos/gaia/v15/types/errors"
14+
gaiaerrors "github.com/cosmos/gaia/v16/types/errors"
1515
)
1616

1717
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/v15/ante"
19-
"github.com/cosmos/gaia/v15/app/helpers"
18+
"github.com/cosmos/gaia/v16/ante"
19+
"github.com/cosmos/gaia/v16/app/helpers"
2020
)
2121

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

‎app/app.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ import (
5151
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
5252
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
5353

54-
gaiaante "github.com/cosmos/gaia/v15/ante"
55-
"github.com/cosmos/gaia/v15/app/keepers"
56-
"github.com/cosmos/gaia/v15/app/params"
57-
"github.com/cosmos/gaia/v15/app/upgrades"
58-
v15 "github.com/cosmos/gaia/v15/app/upgrades/v15"
59-
"github.com/cosmos/gaia/v15/x/globalfee"
54+
gaiaante "github.com/cosmos/gaia/v16/ante"
55+
"github.com/cosmos/gaia/v16/app/keepers"
56+
"github.com/cosmos/gaia/v16/app/params"
57+
"github.com/cosmos/gaia/v16/app/upgrades"
58+
v16 "github.com/cosmos/gaia/v16/app/upgrades/v16"
59+
"github.com/cosmos/gaia/v16/x/globalfee"
6060
)
6161

6262
var (
6363
// DefaultNodeHome default home directories for the application daemon
6464
DefaultNodeHome string
6565

66-
Upgrades = []upgrades.Upgrade{v15.Upgrade}
66+
Upgrades = []upgrades.Upgrade{v16.Upgrade}
6767
)
6868

6969
var (

‎app/app_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
1212
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
1313

14-
gaia "github.com/cosmos/gaia/v15/app"
15-
gaiahelpers "github.com/cosmos/gaia/v15/app/helpers"
14+
gaia "github.com/cosmos/gaia/v16/app"
15+
gaiahelpers "github.com/cosmos/gaia/v16/app/helpers"
1616
)
1717

1818
type EmptyAppOptions struct{}

‎app/encoding.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gaia
33
import (
44
"github.com/cosmos/cosmos-sdk/std"
55

6-
"github.com/cosmos/gaia/v15/app/params"
6+
"github.com/cosmos/gaia/v16/app/params"
77
)
88

99
func RegisterEncodingConfig() params.EncodingConfig {

‎app/genesis.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gaia
33
import (
44
"encoding/json"
55

6-
"github.com/cosmos/gaia/v15/app/params"
6+
"github.com/cosmos/gaia/v16/app/params"
77
)
88

99
// The genesis state of the blockchain is represented here as a map of raw json

‎app/helpers/test_helpers.go

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

27-
gaiaapp "github.com/cosmos/gaia/v15/app"
27+
gaiaapp "github.com/cosmos/gaia/v16/app"
2828
)
2929

3030
// SimAppChainID hardcoded chainID for simulation

‎app/keepers/keepers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import (
6868
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
6969
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
7070

71-
"github.com/cosmos/gaia/v15/x/globalfee"
71+
"github.com/cosmos/gaia/v16/x/globalfee"
7272
)
7373

7474
type AppKeepers struct {

‎app/modules.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ import (
5555
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
5656
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
5757

58-
gaiaappparams "github.com/cosmos/gaia/v15/app/params"
59-
"github.com/cosmos/gaia/v15/x/globalfee"
60-
"github.com/cosmos/gaia/v15/x/metaprotocols"
61-
metaprotocolstypes "github.com/cosmos/gaia/v15/x/metaprotocols/types"
58+
gaiaappparams "github.com/cosmos/gaia/v16/app/params"
59+
"github.com/cosmos/gaia/v16/x/globalfee"
60+
"github.com/cosmos/gaia/v16/x/metaprotocols"
61+
metaprotocolstypes "github.com/cosmos/gaia/v16/x/metaprotocols/types"
6262
)
6363

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

‎app/sim/sim_state.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
2323
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
2424

25-
gaia "github.com/cosmos/gaia/v15/app"
26-
"github.com/cosmos/gaia/v15/app/params"
25+
gaia "github.com/cosmos/gaia/v16/app"
26+
"github.com/cosmos/gaia/v16/app/params"
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/v15/app"
15+
gaia "github.com/cosmos/gaia/v16/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/v15/app"
17-
"github.com/cosmos/gaia/v15/app/sim"
16+
gaia "github.com/cosmos/gaia/v16/app"
17+
"github.com/cosmos/gaia/v16/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/v15/ante"
27-
gaia "github.com/cosmos/gaia/v15/app"
26+
"github.com/cosmos/gaia/v16/ante"
27+
gaia "github.com/cosmos/gaia/v16/app"
2828
// "github.com/cosmos/gaia/v11/app/helpers"
2929
// "github.com/cosmos/gaia/v11/app/params"
30-
"github.com/cosmos/gaia/v15/app/sim"
30+
"github.com/cosmos/gaia/v16/app/sim"
3131
)
3232

3333
// AppChainID hardcoded chainID for simulation

‎app/upgrades/types.go

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

9-
"github.com/cosmos/gaia/v15/app/keepers"
9+
"github.com/cosmos/gaia/v16/app/keepers"
1010
)
1111

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

‎app/upgrades/v10/constants.go

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

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

77
const (

‎app/upgrades/v10/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/cosmos/cosmos-sdk/types/module"
66
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
77

8-
"github.com/cosmos/gaia/v15/app/keepers"
8+
"github.com/cosmos/gaia/v16/app/keepers"
99
)
1010

1111
func CreateUpgradeHandler(

‎app/upgrades/v11/constants.go

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

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

77
const (

‎app/upgrades/v11/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/cosmos/cosmos-sdk/types/module"
66
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
77

8-
"github.com/cosmos/gaia/v15/app/keepers"
8+
"github.com/cosmos/gaia/v16/app/keepers"
99
)
1010

1111
func CreateUpgradeHandler(

‎app/upgrades/v12/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package v12
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

6-
"github.com/cosmos/gaia/v15/app/upgrades"
6+
"github.com/cosmos/gaia/v16/app/upgrades"
77
)
88

99
const (

‎app/upgrades/v12/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/cosmos/cosmos-sdk/types/module"
66
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
77

8-
"github.com/cosmos/gaia/v15/app/keepers"
8+
"github.com/cosmos/gaia/v16/app/keepers"
99
)
1010

1111
func CreateUpgradeHandler(

‎app/upgrades/v13/constants.go

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

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

77
const (

‎app/upgrades/v13/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/cosmos/cosmos-sdk/types/module"
66
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
77

8-
"github.com/cosmos/gaia/v15/app/keepers"
8+
"github.com/cosmos/gaia/v16/app/keepers"
99
)
1010

1111
func CreateUpgradeHandler(

‎app/upgrades/v14/constants.go

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

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

77
const (

‎app/upgrades/v14/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/cosmos/cosmos-sdk/types/module"
66
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
77

8-
"github.com/cosmos/gaia/v15/app/keepers"
8+
"github.com/cosmos/gaia/v16/app/keepers"
99
)
1010

1111
func CreateUpgradeHandler(

‎app/upgrades/v15/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
66
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
77

8-
"github.com/cosmos/gaia/v15/app/upgrades"
8+
"github.com/cosmos/gaia/v16/app/upgrades"
99
)
1010

1111
const (

‎app/upgrades/v15/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
2828
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
2929

30-
"github.com/cosmos/gaia/v15/app/keepers"
30+
"github.com/cosmos/gaia/v16/app/keepers"
3131
)
3232

3333
// CreateUpgradeHandler returns a upgrade handler for Gaia v15

‎app/upgrades/v15/upgrades_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
2323
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
2424

25-
"github.com/cosmos/gaia/v15/app/helpers"
26-
v15 "github.com/cosmos/gaia/v15/app/upgrades/v15"
25+
"github.com/cosmos/gaia/v16/app/helpers"
26+
v15 "github.com/cosmos/gaia/v16/app/upgrades/v15"
2727
)
2828

2929
func TestUpgradeSigningInfos(t *testing.T) {

‎app/upgrades/v16/constants.go

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

‎app/upgrades/v16/upgrades.go

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

‎app/upgrades/v7/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
store "github.com/cosmos/cosmos-sdk/store/types"
77
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
88

9-
"github.com/cosmos/gaia/v15/app/upgrades"
9+
"github.com/cosmos/gaia/v16/app/upgrades"
1010
)
1111

1212
const (

‎app/upgrades/v7/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
1212
icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
1313

14-
"github.com/cosmos/gaia/v15/app/keepers"
14+
"github.com/cosmos/gaia/v16/app/keepers"
1515
)
1616

1717
func CreateUpgradeHandler(

‎app/upgrades/v8/constants.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package v8
55
import (
66
store "github.com/cosmos/cosmos-sdk/store/types"
77

8-
"github.com/cosmos/gaia/v15/app/upgrades"
9-
"github.com/cosmos/gaia/v15/x/globalfee"
8+
"github.com/cosmos/gaia/v16/app/upgrades"
9+
"github.com/cosmos/gaia/v16/x/globalfee"
1010
)
1111

1212
const (

‎app/upgrades/v8/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
1616
ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
1717

18-
"github.com/cosmos/gaia/v15/app/keepers"
18+
"github.com/cosmos/gaia/v16/app/keepers"
1919
)
2020

2121
func FixBankMetadata(ctx sdk.Context, keepers *keepers.AppKeepers) error {

‎app/upgrades/v9/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
store "github.com/cosmos/cosmos-sdk/store/types"
1010

11-
"github.com/cosmos/gaia/v15/app/upgrades"
11+
"github.com/cosmos/gaia/v16/app/upgrades"
1212
)
1313

1414
const (

0 commit comments

Comments
 (0)