Skip to content

Commit 7373998

Browse files
mergify[bot]tac0turtlejulienrbrt
authored
refactor: remove consensus messages (backport #21248) (#21260)
Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: Julien Robert <julien@rbrt.fr>
1 parent 477002f commit 7373998

63 files changed

Lines changed: 230 additions & 148 deletions

File tree

Some content is hidden

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

‎client/v2/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22.2
44

55
require (
66
cosmossdk.io/api v0.8.0
7-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac // main
7+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main
88
cosmossdk.io/depinject v1.0.0
99
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
1010
cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a

‎client/v2/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240802064046-23fac2f1b8ab h1:5S0CQY6mp6iPjgnKu2FnZJ1
88
cosmossdk.io/api v0.7.3-0.20240802064046-23fac2f1b8ab/go.mod h1:vV3VnJvvK4IWkc1deNEJ1OAL028zw1WPezwKKDAsq60=
99
cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo=
1010
cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw=
11-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac h1:OarSQAX1l6NYx67wT3C7NYefir7L79yslaGPGbC0xSQ=
12-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac/go.mod h1:B8JQN1vmGCPSVFlmRb/22n1T736P4C2qfEsrSKDX1iM=
11+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c h1:3HChWutRkc2JzI4lK/qMPy3GqdZJvIc0ipSjyZj2YVk=
12+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c/go.mod h1:B8JQN1vmGCPSVFlmRb/22n1T736P4C2qfEsrSKDX1iM=
1313
cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac h1:yYdIcQunz76r68hO8mMYFdX0OeLYjpDJkDuHHTP17eg=
1414
cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac/go.mod h1:xYAL/SdJh9dZ4pABL9OlLTCdgoEyPyOwTqsEEpLuQcE=
1515
cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect
77
cosmossdk.io/api v0.8.0 // main
88
cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main
9-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac // main
9+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main
1010
cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main
1111
cosmossdk.io/depinject v1.0.0
1212
cosmossdk.io/errors v1.0.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240812125744-810a542d6bac h1:TvvAEjryi2iSWuka3b8M+Hy
88
cosmossdk.io/api v0.7.3-0.20240812125744-810a542d6bac/go.mod h1:z29b2nbMKeQShTpFKtSSKcmcbHb4Jwgr7mxG162fu9U=
99
cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo=
1010
cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw=
11-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac h1:OarSQAX1l6NYx67wT3C7NYefir7L79yslaGPGbC0xSQ=
12-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac/go.mod h1:B8JQN1vmGCPSVFlmRb/22n1T736P4C2qfEsrSKDX1iM=
11+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c h1:3HChWutRkc2JzI4lK/qMPy3GqdZJvIc0ipSjyZj2YVk=
12+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c/go.mod h1:B8JQN1vmGCPSVFlmRb/22n1T736P4C2qfEsrSKDX1iM=
1313
cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac h1:yYdIcQunz76r68hO8mMYFdX0OeLYjpDJkDuHHTP17eg=
1414
cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac/go.mod h1:xYAL/SdJh9dZ4pABL9OlLTCdgoEyPyOwTqsEEpLuQcE=
1515
cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=

‎server/v2/cometbft/abci.go‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
coreappmgr "cosmossdk.io/core/app"
1515
"cosmossdk.io/core/comet"
16+
corecontext "cosmossdk.io/core/context"
1617
"cosmossdk.io/core/event"
1718
"cosmossdk.io/core/store"
1819
"cosmossdk.io/core/transaction"
@@ -152,10 +153,23 @@ func (c *Consensus[T]) Info(ctx context.Context, _ *abciproto.InfoRequest) (*abc
152153
return nil, err
153154
}
154155

155-
// cp, err := c.GetConsensusParams(ctx)
156-
// if err != nil {
157-
// return nil, err
158-
// }
156+
// if height is 0, we dont know the consensus params
157+
var appVersion uint64 = 0
158+
if version > 0 {
159+
cp, err := c.GetConsensusParams(ctx)
160+
// if the consensus params are not found, we set the app version to 0
161+
// in the case that the start version is > 0
162+
if cp == nil || errors.Is(err, errors.New("collections: not found")) {
163+
appVersion = 0
164+
} else if err != nil {
165+
return nil, err
166+
} else {
167+
appVersion = cp.Version.GetApp()
168+
}
169+
if err != nil {
170+
return nil, err
171+
}
172+
}
159173

160174
cid, err := c.store.LastCommitID()
161175
if err != nil {
@@ -165,7 +179,7 @@ func (c *Consensus[T]) Info(ctx context.Context, _ *abciproto.InfoRequest) (*abc
165179
return &abciproto.InfoResponse{
166180
Data: c.appName,
167181
Version: c.version,
168-
AppVersion: 0, // TODO fetch consensus params?
182+
AppVersion: appVersion,
169183
LastBlockHeight: int64(version),
170184
LastBlockAppHash: cid.Hash,
171185
}, nil
@@ -234,14 +248,15 @@ func (c *Consensus[T]) InitChain(ctx context.Context, req *abciproto.InitChainRe
234248
c.initialHeight = 1
235249
}
236250

237-
var consMessages []transaction.Msg
238251
if req.ConsensusParams != nil {
239-
consMessages = append(consMessages, &consensustypes.MsgUpdateParams{
252+
ctx = context.WithValue(ctx, corecontext.InitInfoKey, &consensustypes.MsgUpdateParams{
240253
Authority: c.consensusAuthority,
241254
Block: req.ConsensusParams.Block,
242255
Evidence: req.ConsensusParams.Evidence,
243256
Validator: req.ConsensusParams.Validator,
244257
Abci: req.ConsensusParams.Abci,
258+
Synchrony: req.ConsensusParams.Synchrony,
259+
Feature: req.ConsensusParams.Feature,
245260
})
246261
}
247262

@@ -254,13 +269,12 @@ func (c *Consensus[T]) InitChain(ctx context.Context, req *abciproto.InitChainRe
254269
bz := sha256.Sum256([]byte{})
255270

256271
br := &coreappmgr.BlockRequest[T]{
257-
Height: uint64(req.InitialHeight - 1),
258-
Time: req.Time,
259-
Hash: bz[:],
260-
AppHash: ci.Hash,
261-
ChainId: req.ChainId,
262-
ConsensusMessages: consMessages,
263-
IsGenesis: true,
272+
Height: uint64(req.InitialHeight - 1),
273+
Time: req.Time,
274+
Hash: bz[:],
275+
AppHash: ci.Hash,
276+
ChainId: req.ChainId,
277+
IsGenesis: true,
264278
}
265279

266280
blockresponse, genesisState, err := c.app.InitGenesis(

‎server/v2/cometbft/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ type CfgOption func(*Config)
4343
// OverwriteDefaultConfigTomlConfig overwrites the default comet config with the new config.
4444
func OverwriteDefaultConfigTomlConfig(newCfg *cmtcfg.Config) CfgOption {
4545
return func(cfg *Config) {
46-
cfg.ConfigTomlConfig = newCfg // nolint:ineffassign,staticcheck // We want to overwrite everything
46+
cfg.ConfigTomlConfig = newCfg
4747
}
4848
}
4949

5050
// OverwriteDefaultAppTomlConfig overwrites the default comet config with the new config.
5151
func OverwriteDefaultAppTomlConfig(newCfg *AppTomlConfig) CfgOption {
5252
return func(cfg *Config) {
53-
cfg.AppTomlConfig = newCfg // nolint:ineffassign,staticcheck // We want to overwrite everything
53+
cfg.AppTomlConfig = newCfg
5454
}
5555
}
5656

‎server/v2/cometbft/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ replace (
1717
require (
1818
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2
1919
cosmossdk.io/api v0.8.0
20-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac // main
20+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main
2121
cosmossdk.io/errors v1.0.1
2222
cosmossdk.io/log v1.4.0
2323
cosmossdk.io/server/v2 v2.0.0-20240802142126-a26970e547ab // main

‎server/v2/cometbft/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240802064046-23fac2f1b8ab h1:5S0CQY6mp6iPjgnKu2FnZJ1
88
cosmossdk.io/api v0.7.3-0.20240802064046-23fac2f1b8ab/go.mod h1:vV3VnJvvK4IWkc1deNEJ1OAL028zw1WPezwKKDAsq60=
99
cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo=
1010
cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw=
11-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac h1:OarSQAX1l6NYx67wT3C7NYefir7L79yslaGPGbC0xSQ=
12-
cosmossdk.io/core v0.12.1-0.20240812125744-810a542d6bac/go.mod h1:B8JQN1vmGCPSVFlmRb/22n1T736P4C2qfEsrSKDX1iM=
11+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c h1:3HChWutRkc2JzI4lK/qMPy3GqdZJvIc0ipSjyZj2YVk=
12+
cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c/go.mod h1:B8JQN1vmGCPSVFlmRb/22n1T736P4C2qfEsrSKDX1iM=
1313
cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac h1:yYdIcQunz76r68hO8mMYFdX0OeLYjpDJkDuHHTP17eg=
1414
cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac/go.mod h1:xYAL/SdJh9dZ4pABL9OlLTCdgoEyPyOwTqsEEpLuQcE=
1515
cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=

‎simapp/app.go‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -499,11 +499,26 @@ func NewSimApp(
499499
// properly initialized with tokens from genesis accounts.
500500
// NOTE: The genutils module must also occur after auth so that it can access the params from auth.
501501
genesisModuleOrder := []string{
502-
accounts.ModuleName, authtypes.ModuleName, banktypes.ModuleName,
503-
distrtypes.ModuleName, stakingtypes.ModuleName, slashingtypes.ModuleName, govtypes.ModuleName,
504-
minttypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName,
505-
feegrant.ModuleName, nft.ModuleName, group.ModuleName, upgradetypes.ModuleName,
506-
vestingtypes.ModuleName, consensusparamtypes.ModuleName, circuittypes.ModuleName, pooltypes.ModuleName,
502+
consensusparamtypes.ModuleName,
503+
accounts.ModuleName,
504+
authtypes.ModuleName,
505+
banktypes.ModuleName,
506+
distrtypes.ModuleName,
507+
stakingtypes.ModuleName,
508+
slashingtypes.ModuleName,
509+
govtypes.ModuleName,
510+
minttypes.ModuleName,
511+
genutiltypes.ModuleName,
512+
evidencetypes.ModuleName,
513+
authz.ModuleName,
514+
feegrant.ModuleName,
515+
nft.ModuleName,
516+
group.ModuleName,
517+
upgradetypes.ModuleName,
518+
vestingtypes.ModuleName,
519+
consensusparamtypes.ModuleName,
520+
circuittypes.ModuleName,
521+
pooltypes.ModuleName,
507522
epochstypes.ModuleName,
508523
}
509524
app.ModuleManager.SetOrderInitGenesis(genesisModuleOrder...)

‎simapp/app_config.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ var (
149149
// properly initialized with tokens from genesis accounts.
150150
// NOTE: The genutils module must also occur after auth so that it can access the params from auth.
151151
InitGenesis: []string{
152+
consensustypes.ModuleName,
152153
accounts.ModuleName,
153154
authtypes.ModuleName,
154155
banktypes.ModuleName,

0 commit comments

Comments
 (0)
⚡