feat: add header and comet info service

baseapp/abci.go

@@ -202,6 +202,9 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg
 			WithHeaderHash(req.Hash)
 	}
 
+	// Set blockInfo for module use
+	app.BlockInfo = sdk.NewBlockInfo(req)
+
 	if app.beginBlocker != nil {
 		var err error
 		res, err = app.beginBlocker(app.deliverState.ctx, req)

baseapp/baseapp.go

@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strings"
 
+	"cosmossdk.io/core/blockinfo"
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/log"
 	"cosmossdk.io/store"
@@ -145,6 +146,8 @@ type BaseApp struct {
 	streamingManager storetypes.StreamingManager
 
 	chainID string
+
+	BlockInfo blockinfo.Service
 }
 
 // NewBaseApp returns a reference to an initialized BaseApp. It accepts a

core/blockinfo/service.go

@@ -0,0 +1,50 @@
+package blockinfo
+
+import "time"
+
+type Service interface {
+	GetHeight() int64           // GetHeight returns the height of the block
+	Misbehavior() []Misbehavior // Misbehavior returns the misbehavior of the block
+	GetHeaderHash() []byte      // GetHeaderHash returns the hash of the block header
+	// GetValidatorsHash returns the hash of the validators
+	// For Comet, it is the hash of the next validator set
+	GetValidatorsHash() []byte
+	GetProposerAddress() []byte       // GetProposerAddress returns the address of the block proposer
+	GetDecidedLastCommit() CommitInfo // GetDecidedLastCommit returns the last commit info
+}
+
+// MisbehaviorType is the type of misbehavior for a validator
+type MisbehaviorType int32
+
+const (
+	Unknown           MisbehaviorType = 0
+	DuplicateVote     MisbehaviorType = 1
+	LightClientAttack MisbehaviorType = 2
+)
+
+// Validator is the validator information of ABCI
+type Validator struct {
+	Address []byte
+	Power   int64
+}
+
+// Misbehavior is the misbehavior information of ABCI
+type Misbehavior struct {
+	Type             MisbehaviorType
+	Validator        Validator
+	Height           int64
+	Time             time.Time
+	TotalVotingPower int64
+}
+
+// CommitInfo is the commit information of ABCI
+type CommitInfo struct {
+	Round int32
+	Votes []*VoteInfo
+}
+
+// VoteInfo is the vote information of ABCI
+type VoteInfo struct {
+	Validator       Validator
+	SignedLastBlock bool
+}

runtime/services.go

@@ -33,7 +33,7 @@ type BlockInfoService interface {
 	Misbehavior() []abci.Misbehavior // Misbehavior returns the misbehavior of the block
 	GetHeaderHash() []byte           // GetHeaderHash returns the hash of the block header
 	// GetValidatorsHash returns the hash of the validators
-	// For Comet, it is the hash of the next validators
+	// For Comet, it is the hash of the next validator set
 	GetValidatorsHash() []byte
 	GetProposerAddress() []byte            // GetProposerAddress returns the address of the block proposer
 	GetDecidedLastCommit() abci.CommitInfo // GetDecidedLastCommit returns the last commit info

simapp/app.go

@@ -370,7 +370,7 @@ func NewSimApp(
 
 	// create evidence keeper with router
 	evidenceKeeper := evidencekeeper.NewKeeper(
-		appCodec, keys[evidencetypes.StoreKey], app.StakingKeeper, app.SlashingKeeper, app.AccountKeeper.GetAddressCodec(),
+		appCodec, keys[evidencetypes.StoreKey], app.StakingKeeper, app.SlashingKeeper, app.AccountKeeper.GetAddressCodec(), app.BlockInfo,
 	)
 	// If evidence needs to be handled for the app, set routes in router here and seal
 	app.EvidenceKeeper = *evidenceKeeper

types/block_info.go

@@ -0,0 +1,99 @@
+package types
+
+import (
+	"cosmossdk.io/core/blockinfo"
+	abci "github.com/cometbft/cometbft/abci/types"
+)
+
+// ======================================================
+//  BlockInfoService
+// ======================================================
+
+var _ blockinfo.Service = (*BlockInfo)(nil)
+
+type BlockInfo struct {
+	Height            int64
+	Evidence          []blockinfo.Misbehavior
+	HeaderHash        []byte
+	ValidatorsHash    []byte
+	ProposerAddress   []byte
+	DecidedLastCommit blockinfo.CommitInfo
+}
+
+func NewBlockInfo(bg abci.RequestBeginBlock) *BlockInfo {
+	return &BlockInfo{
+		Height:            bg.Header.Height,
+		Evidence:          FromABCIEvidence(bg.ByzantineValidators),
+		HeaderHash:        bg.Hash,
+		ValidatorsHash:    bg.Header.NextValidatorsHash,
+		ProposerAddress:   bg.Header.ProposerAddress,
+		DecidedLastCommit: FromABCICommitInfo(bg.LastCommitInfo),
+	}
+}
+
+func (bis *BlockInfo) GetHeight() int64 {
+	return bis.Height
+}
+
+func (bis *BlockInfo) Misbehavior() []blockinfo.Misbehavior {
+	return bis.Evidence
+}
+
+func (bis *BlockInfo) GetHeaderHash() []byte {
+	return bis.HeaderHash
+}
+
+func (bis *BlockInfo) GetValidatorsHash() []byte {
+	return bis.ValidatorsHash
+}
+
+func (bis *BlockInfo) GetProposerAddress() []byte {
+	return bis.ProposerAddress
+}
+
+func (bis *BlockInfo) GetDecidedLastCommit() blockinfo.CommitInfo {
+	return bis.DecidedLastCommit
+}
+
+// ======================================================
+// Utils
+
+// FromABCIEvidence converts a CometBFT concrete Evidence type to
+// SDK Evidence.
+func FromABCIEvidence(e []abci.Misbehavior) []blockinfo.Misbehavior {
+
+	var misbehavior []blockinfo.Misbehavior
+	for _, ev := range e {
+		misbehavior = append(misbehavior, blockinfo.Misbehavior{
+			Type:   blockinfo.MisbehaviorType(ev.Type),
+			Height: ev.Height,
+			Validator: blockinfo.Validator{
+				Address: ev.Validator.Address,
+				Power:   ev.Validator.Power,
+			},
+			Time:             ev.Time,
+			TotalVotingPower: ev.TotalVotingPower,
+		},
+		)
+	}
+
+	return misbehavior
+}
+
+func FromABCICommitInfo(ci abci.CommitInfo) blockinfo.CommitInfo {
+	var votes []*blockinfo.VoteInfo
+	for _, v := range ci.Votes {
+		votes = append(votes, &blockinfo.VoteInfo{
+			Validator: blockinfo.Validator{
+				Address: v.Validator.Address,
+				Power:   v.Validator.Power,
+			},
+			SignedLastBlock: v.SignedLastBlock,
+		})
+	}
+
+	return blockinfo.CommitInfo{
+		Round: ci.Round,
+		Votes: votes,
+	}
+}

x/evidence/go.mod

@@ -156,3 +156,5 @@ require (
 // Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
 // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1
+
+replace cosmossdk.io/core => ../../core

x/evidence/keeper/abci.go

@@ -1,31 +1,33 @@
 package keeper
 
 import (
+	"context"
 	"fmt"
 	"time"
 
+	"cosmossdk.io/core/blockinfo"
 	"cosmossdk.io/x/evidence/types"
-	abci "github.com/cometbft/cometbft/abci/types"
 
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // BeginBlocker iterates through and handles any newly discovered evidence of
 // misbehavior submitted by CometBFT. Currently, only equivocation is handled.
-func (k Keeper) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) {
+func (k Keeper) BeginBlocker(goctx context.Context) {
 	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyBeginBlocker)
 
-	for _, tmEvidence := range req.ByzantineValidators {
+	ctx := sdk.UnwrapSDKContext(goctx)
+	for _, tmEvidence := range k.blockInfo.Misbehavior() {
 		switch tmEvidence.Type {
 		// It's still ongoing discussion how should we treat and slash attacks with
 		// premeditation. So for now we agree to treat them in the same way.
-		case abci.MisbehaviorType_DUPLICATE_VOTE, abci.MisbehaviorType_LIGHT_CLIENT_ATTACK:
+		case blockinfo.LightClientAttack, blockinfo.DuplicateVote:
 			evidence := types.FromABCIEvidence(tmEvidence)
 			k.handleEquivocationEvidence(ctx, evidence)
 
 		default:
-			k.Logger(ctx).Error(fmt.Sprintf("ignored unknown evidence type: %s", tmEvidence.Type))
+			k.Logger(ctx).Error(fmt.Sprintf("ignored unknown evidence type: %x", tmEvidence.Type))
 		}
 	}
 }

x/evidence/keeper/keeper.go

@@ -10,6 +10,7 @@ import (
 	"cosmossdk.io/x/evidence/exported"
 	"cosmossdk.io/x/evidence/types"
 
+	"cosmossdk.io/core/blockinfo"
 	"cosmossdk.io/errors"
 	"cosmossdk.io/store/prefix"
 	storetypes "cosmossdk.io/store/types"
@@ -28,19 +29,22 @@ type Keeper struct {
 	stakingKeeper  types.StakingKeeper
 	slashingKeeper types.SlashingKeeper
 	addressCodec   address.Codec
+
+	blockInfo blockinfo.Service
 }
 
 // NewKeeper creates a new Keeper object.
 func NewKeeper(
 	cdc codec.BinaryCodec, storeKey storetypes.StoreKey, stakingKeeper types.StakingKeeper,
-	slashingKeeper types.SlashingKeeper, ac address.Codec,
+	slashingKeeper types.SlashingKeeper, ac address.Codec, bi blockinfo.Service,
 ) *Keeper {
 	return &Keeper{
 		cdc:            cdc,
 		storeKey:       storeKey,
 		stakingKeeper:  stakingKeeper,
 		slashingKeeper: slashingKeeper,
 		addressCodec:   ac,
+		blockInfo:      bi,
 	}
 }
 

x/evidence/module.go

@@ -13,6 +13,7 @@ import (
 	modulev1 "cosmossdk.io/api/cosmos/evidence/module/v1"
 	"cosmossdk.io/core/address"
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/blockinfo"
 	"cosmossdk.io/depinject"
 
 	store "cosmossdk.io/store/types"
@@ -31,7 +32,6 @@ import (
 )
 
 var (
-	_ module.BeginBlockAppModule = AppModule{}
 	_ module.AppModuleBasic      = AppModuleBasic{}
 	_ module.AppModuleSimulation = AppModule{}
 )
@@ -125,8 +125,9 @@ func NewAppModule(keeper keeper.Keeper) AppModule {
 }
 
 var (
-	_ appmodule.AppModule   = AppModule{}
-	_ appmodule.HasServices = AppModule{}
+	_ appmodule.AppModule       = AppModule{}
+	_ appmodule.HasServices     = AppModule{}
+	_ appmodule.HasBeginBlocker = AppModule{}
 )
 
 // IsOnePerModuleType implements the depinject.OnePerModuleType interface.
@@ -169,8 +170,10 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 func (AppModule) ConsensusVersion() uint64 { return 1 }
 
 // BeginBlock executes all ABCI BeginBlock logic respective to the evidence module.
-func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
-	am.keeper.BeginBlocker(ctx, req)
+func (am AppModule) BeginBlock(ctx context.Context) error {
+	am.keeper.BeginBlocker(ctx)
+
+	return nil
 }
 
 // AppModuleSimulation functions
@@ -209,6 +212,8 @@ type ModuleInputs struct {
 	StakingKeeper  types.StakingKeeper
 	SlashingKeeper types.SlashingKeeper
 	AddressCodec   address.Codec
+
+	BlockInfoService blockinfo.Service
 }
 
 type ModuleOutputs struct {
@@ -219,7 +224,7 @@ type ModuleOutputs struct {
 }
 
 func ProvideModule(in ModuleInputs) ModuleOutputs {
-	k := keeper.NewKeeper(in.Cdc, in.Key, in.StakingKeeper, in.SlashingKeeper, in.AddressCodec)
+	k := keeper.NewKeeper(in.Cdc, in.Key, in.StakingKeeper, in.SlashingKeeper, in.AddressCodec, in.BlockInfoService)
 	m := NewAppModule(*k)
 
 	return ModuleOutputs{EvidenceKeeper: *k, Module: m}

x/evidence/types/evidence.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"cosmossdk.io/core/blockinfo"
 	"cosmossdk.io/x/evidence/exported"
-	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cometbft/cometbft/crypto/tmhash"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -74,7 +74,7 @@ func (e Equivocation) GetTotalPower() int64 { return 0 }
 
 // FromABCIEvidence converts a CometBFT concrete Evidence type to
 // SDK Evidence using Equivocation as the concrete type.
-func FromABCIEvidence(e abci.Misbehavior) *Equivocation {
+func FromABCIEvidence(e blockinfo.Misbehavior) *Equivocation {
 	bech32PrefixConsAddr := sdk.GetConfig().GetBech32ConsensusAddrPrefix()
 	consAddr, err := sdk.Bech32ifyAddressBytes(bech32PrefixConsAddr, e.Validator.Address)
 	if err != nil {

x/evidence/types/evidence_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
+	"cosmossdk.io/core/blockinfo"
 	"cosmossdk.io/x/evidence/types"
-	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -72,9 +72,9 @@ func TestEquivocationValidateBasic(t *testing.T) {
 
 func TestEvidenceAddressConversion(t *testing.T) {
 	sdk.GetConfig().SetBech32PrefixForConsensusNode("testcnclcons", "testcnclconspub")
-	tmEvidence := abci.Misbehavior{
-		Type: abci.MisbehaviorType_DUPLICATE_VOTE,
-		Validator: abci.Validator{
+	tmEvidence := blockinfo.Misbehavior{
+		Type: blockinfo.DuplicateVote,
+		Validator: blockinfo.Validator{
 			Address: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 			Power:   100,
 		},