Skip to content

Commit 38e3c00

Browse files
vladjdkmergify[bot]
vladjdk
authored and
mergify[bot]
committed
v25_1_0 upgrade (#3827)
(cherry picked from commit e2f5b13) # Conflicts: # app/app.go # go.mod # go.sum
1 parent ebb24fa commit 38e3c00

File tree

6 files changed

+84
-2
lines changed

6 files changed

+84
-2
lines changed

‎CHANGELOG.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,26 @@
33
## UNRELEASED
44

55
### DEPENDENCIES
6-
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to [v0.53.0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.53.0) (#3773)
6+
- Bump [go.opentelemetry.io/otel/sdk/metric](https://github.com/open-telemetry/opentelemetry-go) from 1.36.0 to 1.37.0 ([#3820](https://github.com/cosmos/gaia/pull/3820))
7+
- Bump [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.2.1 to 2.3.0 ([#3813](https://github.com/cosmos/gaia/pull/3813))
8+
9+
## v25.1.0
10+
11+
*July 8, 2025*
12+
13+
### DEPENDENCIES
14+
- Bump [github.com/cosmos/cosmos-sdk](https://github.com/cosmos/cosmos-sdk) from 0.53.2 to 0.53.3 ([#3827](https://github.com/cosmos/gaia/pull/3827))
15+
16+
## v25.0.0
17+
18+
*June 20, 2025*
19+
20+
### DEPENDENCIES
21+
- Bump [github.com/cosmos/cosmos-sdk](https://github.com/cosmos/cosmos-sdk) from 0.53.0 to 0.53.2 ([#3789](https://github.com/cosmos/gaia/pull/3789))
22+
- Bump [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.72.2 to 1.73.0 ([#3791](https://github.com/cosmos/gaia/pull/3791))
23+
- Bump [github.com/spf13/cast](https://github.com/spf13/cast) from 1.8.0 to 1.9.2 ([#3793](https://github.com/cosmos/gaia/pull/3793))
24+
- Bump [docker/build-push-action](https://github.com/docker/build-push-action) from 6.16.0 to 6.18.0 ([#3796](https://github.com/cosmos/gaia/pull/3796))
25+
- Bump [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.53.3 to 2.53.4 ([#3794](https://github.com/cosmos/gaia/pull/3794))
726
- Bump [wasmvm](https://github.com/CosmWasm/wasmvm) to [v2.2.4](https://github.com/CosmWasm/wasmvm/releases/tag/v2.2.4) (#3787)
827
- Bump [wasmd](https://github.com/CosmWasm/wasmd) to [v0.60.1](https://github.com/CosmWasm/wasmd/releases/tag/v0.60.1) (#3787)
928

‎app/app.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,20 @@ import (
7171
gaiaante "github.com/cosmos/gaia/v25/ante"
7272
"github.com/cosmos/gaia/v25/app/keepers"
7373
"github.com/cosmos/gaia/v25/app/upgrades"
74+
<<<<<<< HEAD
7475
v25 "github.com/cosmos/gaia/v25/app/upgrades/v25_0_0"
76+
=======
77+
v251 "github.com/cosmos/gaia/v25/app/upgrades/v25_1_0"
78+
gaiatelemetry "github.com/cosmos/gaia/v25/telemetry"
79+
"github.com/cosmos/gaia/v25/x/telemetry"
80+
>>>>>>> e2f5b13 (v25_1_0 upgrade (#3827))
7581
)
7682

7783
var (
7884
// DefaultNodeHome default home directories for the application daemon
7985
DefaultNodeHome string
8086

81-
Upgrades = []upgrades.Upgrade{v25.Upgrade}
87+
Upgrades = []upgrades.Upgrade{v251.Upgrade}
8288
)
8389

8490
var (

‎app/upgrades/v25_1_0/constants.go

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

‎app/upgrades/v25_1_0/upgrades.go

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package v25_1_0 //nolint:revive
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/v25/app/keepers"
13+
)
14+
15+
// CreateUpgradeHandler returns an upgrade handler for Gaia v25.
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 v25.1.0 complete")
31+
return vm, nil
32+
}
33+
}

‎go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ require (
2424
github.com/cometbft/cometbft-db v1.0.4
2525
github.com/cosmos/cosmos-db v1.1.1
2626
github.com/cosmos/cosmos-proto v1.0.0-beta.5
27+
<<<<<<< HEAD
2728
github.com/cosmos/cosmos-sdk v0.53.0
29+
=======
30+
github.com/cosmos/cosmos-sdk v0.53.3
31+
>>>>>>> e2f5b13 (v25_1_0 upgrade (#3827))
2832
github.com/cosmos/go-bip39 v1.0.0
2933
github.com/cosmos/gogoproto v1.7.0
3034
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10 v10.1.0

‎go.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,8 +898,13 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC
898898
github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw=
899899
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
900900
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
901+
<<<<<<< HEAD
901902
github.com/cosmos/cosmos-sdk v0.53.0 h1:ZsB2tnBVudumV059oPuElcr0K1lLOutaI6WJ+osNTbI=
902903
github.com/cosmos/cosmos-sdk v0.53.0/go.mod h1:UPcRyFwOUy2PfSFBWxBceO/HTjZOuBVqY583WyazIGs=
904+
=======
905+
github.com/cosmos/cosmos-sdk v0.53.3 h1:GbDJNUP9OD0gGDVnjecZVZr0ZReD1BtIIxmtgrAsWiw=
906+
github.com/cosmos/cosmos-sdk v0.53.3/go.mod h1:90S054hIbadFB1MlXVZVC5w0QbKfd1P4b79zT+vvJxw=
907+
>>>>>>> e2f5b13 (v25_1_0 upgrade (#3827))
903908
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
904909
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
905910
github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=

0 commit comments

Comments
 (0)