Skip to content

Commit 9c6b30f

Browse files
authored
chore: remove group module (#250)
1 parent 9c5e774 commit 9c6b30f

7 files changed

Lines changed: 55 additions & 22 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ An '!' indicates a state machine breaking change.
2525

2626
### Improvements
2727

28+
- (deps) [#250](https://github.com/KYVENetwork/chain/pull/250) Remove group module.
2829
- (`x/stakers`) [#232](https://github.com/KYVENetwork/chain/pull/232) Shared Staking: Update stakers queries
2930
- (deps) [#213](https://github.com/KYVENetwork/chain/pull/213) Bump to CosmosSDK v0.50.11 and cleanup deps.
3031
- (deps) [#246](https://github.com/KYVENetwork/chain/pull/246) Bump stakers module version from v1beta1 to v1

app/app.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ import (
5353
govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
5454
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
5555
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
56-
groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper"
57-
_ "github.com/cosmos/cosmos-sdk/x/group/module" // import for side-effects
58-
_ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects
56+
_ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects
5957
mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
6058
_ "github.com/cosmos/cosmos-sdk/x/params" // import for side-effects
6159
paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
@@ -135,7 +133,6 @@ type App struct {
135133
AuthzKeeper authzkeeper.Keeper
136134
EvidenceKeeper evidencekeeper.Keeper
137135
FeeGrantKeeper feegrantkeeper.Keeper
138-
GroupKeeper groupkeeper.Keeper
139136

140137
// IBC
141138
IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
@@ -290,7 +287,6 @@ func New(
290287
&app.AuthzKeeper,
291288
&app.EvidenceKeeper,
292289
&app.FeeGrantKeeper,
293-
&app.GroupKeeper,
294290

295291
// Kyve keepers
296292
&app.BundlesKeeper,

app/app_config.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package app
22

33
import (
4-
"time"
5-
64
runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1"
75
appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1"
86
authmodulev1 "cosmossdk.io/api/cosmos/auth/module/v1"
@@ -15,7 +13,6 @@ import (
1513
feegrantmodulev1 "cosmossdk.io/api/cosmos/feegrant/module/v1"
1614
genutilmodulev1 "cosmossdk.io/api/cosmos/genutil/module/v1"
1715
govmodulev1 "cosmossdk.io/api/cosmos/gov/module/v1"
18-
groupmodulev1 "cosmossdk.io/api/cosmos/group/module/v1"
1916
mintmodulev1 "cosmossdk.io/api/cosmos/mint/module/v1"
2017
paramsmodulev1 "cosmossdk.io/api/cosmos/params/module/v1"
2118
slashingmodulev1 "cosmossdk.io/api/cosmos/slashing/module/v1"
@@ -46,15 +43,13 @@ import (
4643
distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
4744
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
4845
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
49-
"github.com/cosmos/cosmos-sdk/x/group"
5046
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
5147
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
5248
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
5349
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
5450
capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
5551
ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
5652
ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
57-
"google.golang.org/protobuf/types/known/durationpb"
5853

5954
bundlestypes "github.com/KYVENetwork/chain/x/bundles/types"
6055
delegationtypes "github.com/KYVENetwork/chain/x/delegation/types"
@@ -95,7 +90,6 @@ var (
9590
paramstypes.ModuleName,
9691
upgradetypes.ModuleName,
9792
vestingtypes.ModuleName,
98-
group.ModuleName,
9993
consensustypes.ModuleName,
10094

10195
// KYVE modules
@@ -148,7 +142,6 @@ var (
148142
govtypes.ModuleName,
149143
stakingtypes.ModuleName,
150144
feegrant.ModuleName,
151-
group.ModuleName,
152145
genutiltypes.ModuleName,
153146

154147
// ibc modules
@@ -304,13 +297,6 @@ var (
304297
Name: minttypes.ModuleName,
305298
Config: appconfig.WrapAny(&mintmodulev1.Module{}),
306299
},
307-
{
308-
Name: group.ModuleName,
309-
Config: appconfig.WrapAny(&groupmodulev1.Module{
310-
MaxExecutionPeriod: durationpb.New(time.Second * 1209600),
311-
MaxMetadataLen: 255,
312-
}),
313-
},
314300
{
315301
Name: feegrant.ModuleName,
316302
Config: appconfig.WrapAny(&feegrantmodulev1.Module{}),

app/upgrades/v2_0/store.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
1111
storeUpgrades := storetypes.StoreUpgrades{
1212
Added: []string{multicoinrewardstypes.ModuleName},
13-
Deleted: []string{},
13+
Deleted: []string{"group"},
1414
}
1515

1616
return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/cometbft/cometbft v0.38.17
2222
github.com/cosmos/cosmos-db v1.1.1
2323
github.com/cosmos/cosmos-proto v1.0.0-beta.5
24-
github.com/cosmos/cosmos-sdk v0.50.11
24+
github.com/cosmos/cosmos-sdk v0.50.12
2525
github.com/cosmos/gogoproto v1.7.0
2626
github.com/cosmos/ibc-go/modules/capability v1.0.1
2727
github.com/cosmos/ibc-go/v8 v8.5.2
@@ -373,7 +373,7 @@ replace (
373373
// use cosmos fork of keyring
374374
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
375375
// use KYVE-flavored Cosmos SDK
376-
github.com/cosmos/cosmos-sdk => github.com/KYVENetwork/cosmos-sdk v0.50.11-kyve-rc4
376+
github.com/cosmos/cosmos-sdk => github.com/KYVENetwork/cosmos-sdk v0.50.12-kyve-rc1
377377

378378
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
379379
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rW
245245
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
246246
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts=
247247
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0=
248+
github.com/KYVENetwork/cosmos-sdk v0.50.12-kyve-rc1 h1:A3BAiI4PcJNfSusYnXZ5x7TaTiPlxgS7yMaJr9AUYkQ=
249+
github.com/KYVENetwork/cosmos-sdk v0.50.12-kyve-rc1/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw=
248250
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
249251
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
250252
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=

0 commit comments

Comments
 (0)