refactor(x/evidence): accept address codec in constructor

collections/naming_test.go

@@ -33,20 +33,23 @@ func TestNaming(t *testing.T) {
 }
 
 func expectKeyCodecName[T any](t *testing.T, name string, cdc codec.KeyCodec[T]) {
+	t.Helper()
 	schema, err := codec.KeySchemaCodec(cdc)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(schema.Fields))
 	require.Equal(t, name, schema.Fields[0].Name)
 }
 
 func expectValueCodecName[T any](t *testing.T, name string, cdc codec.ValueCodec[T]) {
+	t.Helper()
 	schema, err := codec.ValueSchemaCodec(cdc)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(schema.Fields))
 	require.Equal(t, name, schema.Fields[0].Name)
 }
 
 func expectKeyCodecNames[T any](t *testing.T, cdc codec.KeyCodec[T], names ...string) {
+	t.Helper()
 	schema, err := codec.KeySchemaCodec(cdc)
 	require.NoError(t, err)
 	require.Equal(t, len(names), len(schema.Fields))

schema/indexer/start.go

@@ -196,7 +196,7 @@ func unmarshalIndexingConfig(cfg interface{}) (*IndexingConfig, error) {
 	return &res, err
 }
 
-func unmarshalIndexerCustomConfig(cfg interface{}, expectedType interface{}) (interface{}, error) {
+func unmarshalIndexerCustomConfig(cfg, expectedType interface{}) (interface{}, error) {
 	typ := reflect.TypeOf(expectedType)
 	if reflect.TypeOf(cfg).AssignableTo(typ) {
 		return cfg, nil

schema/indexer/start_test.go

@@ -80,6 +80,7 @@ func TestStart(t *testing.T) {
 }
 
 func callCommit(t *testing.T, listener appdata.Listener) {
+	t.Helper()
 	cb, err := listener.Commit(appdata.CommitData{})
 	if err != nil {
 		t.Fatal(err)

simapp/app.go

@@ -442,7 +442,13 @@ func NewSimApp(
 
 	// create evidence keeper with router
 	evidenceKeeper := evidencekeeper.NewKeeper(
-		appCodec, runtime.NewEnvironment(runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), logger.With(log.ModuleKey, "x/evidence"), runtime.EnvWithMsgRouterService(app.MsgServiceRouter()), runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())), app.StakingKeeper, app.SlashingKeeper, app.ConsensusParamsKeeper, app.AuthKeeper.AddressCodec(),
+		appCodec,
+		runtime.NewEnvironment(runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), logger.With(log.ModuleKey, "x/evidence"), runtime.EnvWithMsgRouterService(app.MsgServiceRouter()), runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())),
+		app.StakingKeeper,
+		app.SlashingKeeper,
+		app.ConsensusParamsKeeper,
+		app.AuthKeeper.AddressCodec(),
+		app.StakingKeeper.ConsensusAddressCodec(),
 	)
 	// If evidence needs to be handled for the app, set routes in router here and seal
 	app.EvidenceKeeper = *evidenceKeeper

tests/integration/evidence/keeper/infraction_test.go

@@ -154,7 +154,7 @@ func initFixture(tb testing.TB) *fixture {
 
 	stakingKeeper.SetHooks(stakingtypes.NewMultiStakingHooks(slashingKeeper.Hooks()))
 
-	evidenceKeeper := keeper.NewKeeper(cdc, runtime.NewEnvironment(runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), log.NewNopLogger(), runtime.EnvWithQueryRouterService(grpcQueryRouter), runtime.EnvWithMsgRouterService(msgRouter)), stakingKeeper, slashingKeeper, consensusParamsKeeper, addresscodec.NewBech32Codec(sdk.Bech32PrefixAccAddr))
+	evidenceKeeper := keeper.NewKeeper(cdc, runtime.NewEnvironment(runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), log.NewNopLogger(), runtime.EnvWithQueryRouterService(grpcQueryRouter), runtime.EnvWithMsgRouterService(msgRouter)), stakingKeeper, slashingKeeper, consensusParamsKeeper, addresscodec.NewBech32Codec(sdk.Bech32PrefixAccAddr), stakingKeeper.ConsensusAddressCodec())
 	router := evidencetypes.NewRouter()
 	router = router.AddRoute(evidencetypes.RouteEquivocation, testEquivocationHandler(evidenceKeeper))
 	evidenceKeeper.SetRouter(router)

tools/hubl/internal/remote.go

@@ -45,7 +45,6 @@ func RemoteCommand(config *config.Config, configDir string) ([]*cobra.Command, e
 	commands := []*cobra.Command{}
 
 	for chain, chainConfig := range config.Chains {
-		chain, chainConfig := chain, chainConfig
 
 		// load chain info
 		chainInfo := NewChainInfo(configDir, chain, chainConfig)

x/evidence/CHANGELOG.md

@@ -32,6 +32,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [#19482](https://github.com/cosmos/cosmos-sdk/pull/19482) `appmodule.Environment` is passed to `NewKeeper` instead of individual services
 * [#19627](https://github.com/cosmos/cosmos-sdk/pull/19627) `NewAppModule` now takes in a `codec.Codec` as its first argument
 * [#21480](https://github.com/cosmos/cosmos-sdk/pull/21480) ConsensusKeeper is required to be passed to the keeper. 
+* [#21859](https://github.com/cosmos/cosmos-sdk/pull/21859) `NewKeeper` now takes in a consensus codec to avoid reliance on staking for decoding addresses.
 
 
 ## [v0.1.1](https://github.com/cosmos/cosmos-sdk/releases/tag/x/evidence/v0.1.1) - 2024-04-22

x/evidence/depinject.go

@@ -33,10 +33,11 @@ type ModuleInputs struct {
 	EvidenceHandlers []eviclient.EvidenceHandler `optional:"true"`
 	CometService     comet.Service
 
-	StakingKeeper   types.StakingKeeper
-	SlashingKeeper  types.SlashingKeeper
-	ConsensusKeeper types.ConsensusKeeper
-	AddressCodec    address.Codec
+	StakingKeeper         types.StakingKeeper
+	SlashingKeeper        types.SlashingKeeper
+	ConsensusKeeper       types.ConsensusKeeper
+	AddressCodec          address.Codec
+	ConsensusAddressCodec address.Codec
 }
 
 type ModuleOutputs struct {
@@ -47,7 +48,7 @@ type ModuleOutputs struct {
 }
 
 func ProvideModule(in ModuleInputs) ModuleOutputs {
-	k := keeper.NewKeeper(in.Cdc, in.Environment, in.StakingKeeper, in.SlashingKeeper, in.ConsensusKeeper, in.AddressCodec)
+	k := keeper.NewKeeper(in.Cdc, in.Environment, in.StakingKeeper, in.SlashingKeeper, in.ConsensusKeeper, in.AddressCodec, in.ConsensusAddressCodec)
 	m := NewAppModule(in.Cdc, *k, in.CometService, in.EvidenceHandlers...)
 
 	return ModuleOutputs{EvidenceKeeper: *k, Module: m}

x/evidence/keeper/abci.go

@@ -23,7 +23,7 @@
 		// 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 comet.LightClientAttack, comet.DuplicateVote:
-			evidence := types.FromABCIEvidence(evidence, k.stakingKeeper.ConsensusAddressCodec())
+			evidence := types.FromABCIEvidence(evidence, k.consensusAddressCodec)
 			err := k.handleEquivocationEvidence(ctx, evidence)
 			if err != nil {
 				return err

x/evidence/keeper/infraction.go

@@ -25,7 +25,7 @@ import (
 // TODO: Some of the invalid constraints listed above may need to be reconsidered
 // in the case of a lunatic attack.
 func (k Keeper) handleEquivocationEvidence(ctx context.Context, evidence *types.Equivocation) error {
-	consAddr := evidence.GetConsensusAddress(k.stakingKeeper.ConsensusAddressCodec())
+	consAddr := evidence.GetConsensusAddress(k.consensusAddressCodec)
 
 	validator, err := k.stakingKeeper.ValidatorByConsAddr(ctx, consAddr)
 	if err != nil {

x/evidence/keeper/keeper.go

@@ -23,12 +23,13 @@ import (
 type Keeper struct {
 	appmodule.Environment
 
-	cdc             codec.BinaryCodec
-	router          types.Router
-	stakingKeeper   types.StakingKeeper
-	slashingKeeper  types.SlashingKeeper
-	consensusKeeper types.ConsensusKeeper
-	addressCodec    address.Codec
+	cdc                   codec.BinaryCodec
+	router                types.Router
+	stakingKeeper         types.StakingKeeper
+	slashingKeeper        types.SlashingKeeper
+	consensusKeeper       types.ConsensusKeeper
+	addressCodec          address.Codec
+	consensusAddressCodec address.Codec
 
 	Schema collections.Schema
 	// Evidences key: evidence hash bytes | value: Evidence
@@ -38,17 +39,18 @@ type Keeper struct {
 // NewKeeper creates a new Keeper object.
 func NewKeeper(
 	cdc codec.BinaryCodec, env appmodule.Environment, stakingKeeper types.StakingKeeper,
-	slashingKeeper types.SlashingKeeper, ck types.ConsensusKeeper, ac address.Codec,
+	slashingKeeper types.SlashingKeeper, ck types.ConsensusKeeper, ac, consensusAddressCodec address.Codec,
 ) *Keeper {
 	sb := collections.NewSchemaBuilder(env.KVStoreService)
 	k := &Keeper{
-		Environment:     env,
-		cdc:             cdc,
-		stakingKeeper:   stakingKeeper,
-		slashingKeeper:  slashingKeeper,
-		consensusKeeper: ck,
-		addressCodec:    ac,
-		Evidences:       collections.NewMap(sb, types.KeyPrefixEvidence, "evidences", collections.BytesKey, codec.CollInterfaceValue[exported.Evidence](cdc)),
+		Environment:           env,
+		cdc:                   cdc,
+		stakingKeeper:         stakingKeeper,
+		slashingKeeper:        slashingKeeper,
+		consensusKeeper:       ck,
+		addressCodec:          ac,
+		consensusAddressCodec: consensusAddressCodec,
+		Evidences:             collections.NewMap(sb, types.KeyPrefixEvidence, "evidences", collections.BytesKey, codec.CollInterfaceValue[exported.Evidence](cdc)),
 	}
 	schema, err := sb.Build()
 	if err != nil {

x/evidence/keeper/keeper_test.go

@@ -111,6 +111,7 @@ func (suite *KeeperTestSuite) SetupTest() {
 		slashingKeeper,
 		ck,
 		address.NewBech32Codec("cosmos"),
+		address.NewBech32Codec("cosmosvalcons"),
 	)
 
 	suite.stakingKeeper = stakingKeeper

x/evidence/types/expected_keepers.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	st "cosmossdk.io/api/cosmos/staking/v1beta1"
-	"cosmossdk.io/core/address"
 	"cosmossdk.io/math"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -15,7 +14,6 @@ import (
 // StakingKeeper defines the staking module interface contract needed by the
 // evidence module.
 type StakingKeeper interface {
-	ConsensusAddressCodec() address.Codec
 	ValidatorByConsAddr(context.Context, sdk.ConsAddress) (sdk.ValidatorI, error)
 }