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 = NewBlockInfo(req)
+
 	if app.beginBlocker != nil {
 		var err error
 		res, err = app.beginBlocker(app.deliverState.ctx, req)

baseapp/baseapp.go

@@ -145,6 +145,8 @@ type BaseApp struct {
 	streamingManager storetypes.StreamingManager
 
 	chainID string
+
+	BlockInfo BlockInfoService
 }
 
 // NewBaseApp returns a reference to an initialized BaseApp. It accepts a

baseapp/block_info.go

@@ -0,0 +1,65 @@
+package baseapp
+
+import abci "github.com/cometbft/cometbft/abci/types"
+
+// ======================================================
+//  BlockInfoService
+// ======================================================
+
+// BlockInfoService is the service that runtime will provide to modules which need Comet block information.
+type BlockInfoService interface {
+	GetHeight() int64                // GetHeight returns the height of the block
+	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 validator set
+	GetValidatorsHash() []byte
+	GetProposerAddress() []byte            // GetProposerAddress returns the address of the block proposer
+	GetDecidedLastCommit() abci.CommitInfo // GetDecidedLastCommit returns the last commit info
+}
+
+var _ BlockInfoService = (*BlockInfo)(nil)
+
+type BlockInfo struct {
+	Height            int64
+	Evidence          []abci.Misbehavior
+	HeaderHash        []byte
+	ValidatorsHash    []byte
+	ProposerAddress   []byte
+	DecidedLastCommit abci.CommitInfo
+}
+
+func NewBlockInfo(bg abci.RequestBeginBlock) *BlockInfo {
+	return &BlockInfo{
+		Height:            bg.Header.Height,
+		Evidence:          bg.ByzantineValidators,
+		HeaderHash:        bg.Hash,
+		ValidatorsHash:    bg.Header.NextValidatorsHash,
+		ProposerAddress:   bg.Header.ProposerAddress,
+		DecidedLastCommit: bg.LastCommitInfo,
+	}
+}
+
+func (bis *BlockInfo) GetHeight() int64 {
+	return bis.Height
+}
+
+func (bis *BlockInfo) Misbehavior() []abci.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() abci.CommitInfo {
+	return bis.DecidedLastCommit
+}

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

x/evidence/keeper/abci.go

@@ -1,6 +1,7 @@
 package keeper
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -13,10 +14,11 @@ import (
 
 // 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.

x/evidence/keeper/keeper.go

@@ -14,6 +14,7 @@ import (
 	"cosmossdk.io/store/prefix"
 	storetypes "cosmossdk.io/store/types"
 
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -28,19 +29,22 @@ type Keeper struct {
 	stakingKeeper  types.StakingKeeper
 	slashingKeeper types.SlashingKeeper
 	addressCodec   address.Codec
+
+	blockInfo baseapp.BlockInfoService
 }
 
 // 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 baseapp.BlockInfoService,
 ) *Keeper {
 	return &Keeper{
 		cdc:            cdc,
 		storeKey:       storeKey,
 		stakingKeeper:  stakingKeeper,
 		slashingKeeper: slashingKeeper,
 		addressCodec:   ac,
+		blockInfo:      bi,
 	}
 }
 

x/evidence/module.go

@@ -22,6 +22,7 @@ import (
 	"cosmossdk.io/x/evidence/simulation"
 	"cosmossdk.io/x/evidence/types"
 
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/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 baseapp.BlockInfoService
 }
 
 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}