refactor: deprecate Voteinfo in favour of Cometinfo on Context

CHANGELOG.md

@@ -54,6 +54,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (rpc) [#17470](https://github.com/cosmos/cosmos-sdk/pull/17470) Avoid open 0.0.0.0 to public by default and add `listen-ip-address` argument for `testnet init-files` cmd.
 * (types/module) [#17554](https://github.com/cosmos/cosmos-sdk/pull/17554) Introduce `HasABCIGenesis` which is implemented by a module only when a validatorset update needs to be returned 
 * (baseapp) [#17667](https://github.com/cosmos/cosmos-sdk/pull/17667) Close databases opened by cosmos-sdk during BaseApp shutdown 
+* (types) [#17670](https://github.com/cosmos/cosmos-sdk/pull/17670) Use `ctx.CometInfo` in place of `ctx.VoteInfos`
 
 ### Bug Fixes
 
@@ -140,6 +141,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (types) [#17426](https://github.com/cosmos/cosmos-sdk/pull/17426) `NewContext` does not take a `cmtproto.Header{}` any longer. 
     * `WithChainID` / `WithBlockHeight` / `WithBlockHeader` must be used to set values on the context
 * (x/bank) [#17569](https://github.com/cosmos/cosmos-sdk/pull/17569) `BurnCoins` takes an address instead of a module name
+* (x/distribution) [#17670](https://github.com/cosmos/cosmos-sdk/pull/17670) `AllocateTokens` takes `comet.VoteInfos` instead of `[]abci.VoteInfo`
 
 ### CLI Breaking Changes
 

baseapp/abci.go

@@ -514,7 +514,7 @@ func (app *BaseApp) ProcessProposal(req *abci.RequestProcessProposal) (resp *abc
 		WithBlockTime(req.Time).
 		WithHeaderHash(req.Hash).
 		WithProposer(req.ProposerAddress).
-		WithCometInfo(cometInfo{ProposerAddress: req.ProposerAddress, ValidatorsHash: req.NextValidatorsHash, Misbehavior: req.Misbehavior, LastCommit: req.ProposedLastCommit}).
+		WithCometInfo(sdk.CometInfo{ProposerAddress: req.ProposerAddress, ValidatorsHash: req.NextValidatorsHash, Misbehavior: req.Misbehavior, LastCommit: req.ProposedLastCommit}).
 		WithExecMode(sdk.ExecModeProcessProposal).
 		WithHeaderInfo(coreheader.Info{
 			ChainID: app.chainID,
@@ -713,7 +713,7 @@ func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (*abci.Respons
 		WithConsensusParams(app.GetConsensusParams(app.finalizeBlockState.ctx)).
 		WithVoteInfos(req.DecidedLastCommit.Votes).
 		WithExecMode(sdk.ExecModeFinalize).
-		WithCometInfo(cometInfo{
+		WithCometInfo(sdk.CometInfo{
 			Misbehavior:     req.Misbehavior,
 			ValidatorsHash:  req.NextValidatorsHash,
 			ProposerAddress: req.ProposerAddress,

baseapp/info.go

@@ -1,134 +1,12 @@
 package baseapp
 
 import (
-	"time"
-
 	abci "github.com/cometbft/cometbft/abci/types"
 
 	"cosmossdk.io/core/comet"
-)
-
-var _ comet.BlockInfo = (*cometInfo)(nil)
-
-// CometInfo defines the properties provided by comet to the application
-type cometInfo struct {
-	Misbehavior     []abci.Misbehavior
-	ValidatorsHash  []byte
-	ProposerAddress []byte
-	LastCommit      abci.CommitInfo
-}
-
-func (r cometInfo) GetEvidence() comet.EvidenceList {
-	return evidenceWrapper{evidence: r.Misbehavior}
-}
-
-func (r cometInfo) GetValidatorsHash() []byte {
-	return r.ValidatorsHash
-}
-
-func (r cometInfo) GetProposerAddress() []byte {
-	return r.ProposerAddress
-}
-
-func (r cometInfo) GetLastCommit() comet.CommitInfo {
-	return commitInfoWrapper{r.LastCommit}
-}
-
-type evidenceWrapper struct {
-	evidence []abci.Misbehavior
-}
-
-func (e evidenceWrapper) Len() int {
-	return len(e.evidence)
-}
-
-func (e evidenceWrapper) Get(i int) comet.Evidence {
-	return misbehaviorWrapper{e.evidence[i]}
-}
-
-// commitInfoWrapper is a wrapper around abci.CommitInfo that implements CommitInfo interface
-type commitInfoWrapper struct {
-	abci.CommitInfo
-}
-
-var _ comet.CommitInfo = (*commitInfoWrapper)(nil)
-
-func (c commitInfoWrapper) Round() int32 {
-	return c.CommitInfo.Round
-}
-
-func (c commitInfoWrapper) Votes() comet.VoteInfos {
-	return abciVoteInfoWrapper{c.CommitInfo.Votes}
-}
-
-// abciVoteInfoWrapper is a wrapper around abci.VoteInfo that implements VoteInfos interface
-type abciVoteInfoWrapper struct {
-	votes []abci.VoteInfo
-}
-
-var _ comet.VoteInfos = (*abciVoteInfoWrapper)(nil)
-
-func (e abciVoteInfoWrapper) Len() int {
-	return len(e.votes)
-}
-
-func (e abciVoteInfoWrapper) Get(i int) comet.VoteInfo {
-	return voteInfoWrapper{e.votes[i]}
-}
-
-// voteInfoWrapper is a wrapper around abci.VoteInfo that implements VoteInfo interface
-type voteInfoWrapper struct {
-	abci.VoteInfo
-}
-
-var _ comet.VoteInfo = (*voteInfoWrapper)(nil)
-
-func (v voteInfoWrapper) GetBlockIDFlag() comet.BlockIDFlag {
-	return comet.BlockIDFlag(v.VoteInfo.BlockIdFlag)
-}
-
-func (v voteInfoWrapper) Validator() comet.Validator {
-	return validatorWrapper{v.VoteInfo.Validator}
-}
-
-// validatorWrapper is a wrapper around abci.Validator that implements Validator interface
-type validatorWrapper struct {
-	abci.Validator
-}
-
-var _ comet.Validator = (*validatorWrapper)(nil)
-
-func (v validatorWrapper) Address() []byte {
-	return v.Validator.Address
-}
-
-func (v validatorWrapper) Power() int64 {
-	return v.Validator.Power
-}
-
-type misbehaviorWrapper struct {
-	abci.Misbehavior
-}
-
-func (m misbehaviorWrapper) Type() comet.MisbehaviorType {
-	return comet.MisbehaviorType(m.Misbehavior.Type)
-}
 
-func (m misbehaviorWrapper) Height() int64 {
-	return m.Misbehavior.Height
-}
-
-func (m misbehaviorWrapper) Validator() comet.Validator {
-	return validatorWrapper{m.Misbehavior.Validator}
-}
-
-func (m misbehaviorWrapper) Time() time.Time {
-	return m.Misbehavior.Time
-}
-
-func (m misbehaviorWrapper) TotalVotingPower() int64 {
-	return m.Misbehavior.TotalVotingPower
-}
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
 
 type prepareProposalInfo struct {
 	*abci.RequestPrepareProposal
@@ -137,7 +15,7 @@ type prepareProposalInfo struct {
 var _ comet.BlockInfo = (*prepareProposalInfo)(nil)
 
 func (r prepareProposalInfo) GetEvidence() comet.EvidenceList {
-	return evidenceWrapper{r.Misbehavior}
+	return sdk.EvidenceWrapper{Evidence: r.Misbehavior}
 }
 
 func (r prepareProposalInfo) GetValidatorsHash() []byte {
@@ -193,5 +71,5 @@ func (e extendedVoteInfoWrapper) GetBlockIDFlag() comet.BlockIDFlag {
 }
 
 func (e extendedVoteInfoWrapper) Validator() comet.Validator {
-	return validatorWrapper{e.ExtendedVoteInfo.Validator}
+	return sdk.ValidatorWrapper{Validator: e.ExtendedVoteInfo.Validator}
 }

tests/integration/distribution/keeper/msg_server_test.go

@@ -116,13 +116,17 @@ func initFixture(tb testing.TB) *fixture {
 	valConsAddr := sdk.ConsAddress(valConsPk0.Address())
 
 	// set proposer and vote infos
-	ctx := newCtx.WithProposer(valConsAddr).WithVoteInfos([]cmtabcitypes.VoteInfo{
-		{
-			Validator: cmtabcitypes.Validator{
-				Address: valAddr,
-				Power:   100,
+	ctx := newCtx.WithProposer(valConsAddr).WithCometInfo(sdk.CometInfo{
+		LastCommit: cmtabcitypes.CommitInfo{
+			Votes: []cmtabcitypes.VoteInfo{
+				{
+					Validator: cmtabcitypes.Validator{
+						Address: valAddr,
+						Power:   100,
+					},
+					BlockIdFlag: types.BlockIDFlagCommit,
+				},
 			},
-			BlockIdFlag: types.BlockIDFlagCommit,
 		},
 	})
 
@@ -322,8 +326,9 @@ func TestMsgWithdrawDelegatorReward(t *testing.T) {
 			assert.Assert(t, prevProposerConsAddr.Empty() == false)
 			assert.DeepEqual(t, prevProposerConsAddr, valConsAddr)
 			var previousTotalPower int64
-			for _, voteInfo := range f.sdkCtx.VoteInfos() {
-				previousTotalPower += voteInfo.Validator.Power
+			for i := 0; i < f.sdkCtx.CometInfo().GetLastCommit().Votes().Len(); i++ {
+				vote := f.sdkCtx.CometInfo().GetLastCommit().Votes().Get(i)
+				previousTotalPower += vote.Validator().Power()
 			}
 			assert.Equal(t, previousTotalPower, int64(100))
 		})

testutil/integration/router.go

@@ -140,13 +140,17 @@ func (app *App) RunMsg(msg sdk.Msg, option ...Option) (*codectypes.Any, error) {
 		}()
 	}
 
+	app.ctx = app.ctx.WithCometInfo(sdk.CometInfo{})
+
 	if cfg.AutomaticFinalizeBlock {
 		height := app.LastBlockHeight() + 1
-		if _, err := app.FinalizeBlock(&cmtabcitypes.RequestFinalizeBlock{Height: height}); err != nil {
+		if _, err := app.FinalizeBlock(&cmtabcitypes.RequestFinalizeBlock{Height: height, DecidedLastCommit: cmtabcitypes.CommitInfo{Votes: []cmtabcitypes.VoteInfo{{}}}}); err != nil {
 			return nil, fmt.Errorf("failed to run finalize block: %w", err)
 		}
 	}
 
+	fmt.Println(app.ctx.CometInfo(), "runmsg")
+
 	app.logger.Info("Running msg", "msg", msg.String())
 
 	handler := app.MsgServiceRouter().Handler(msg)