feat: track latest 256 cosmos block hashes

app/app.go

@@ -67,6 +67,7 @@ import (
 	"github.com/initia-labs/minievm/app/posthandler"
 	evmindexer "github.com/initia-labs/minievm/indexer"
 	evmconfig "github.com/initia-labs/minievm/x/evm/config"
+	evmtypes "github.com/initia-labs/minievm/x/evm/types"
 
 	// kvindexer
 	kvindexermodule "github.com/initia-labs/kvindexer/x/kvindexer"
@@ -228,6 +229,7 @@ func NewMinitiaApp(
 	// NOTE: upgrade module is required to be prioritized
 	app.ModuleManager.SetOrderPreBlockers(
 		upgradetypes.ModuleName,
+		evmtypes.ModuleName,
 	)
 
 	// set order of module operations

indexer/abci.go

@@ -201,12 +201,13 @@ func (e *EVMIndexerImpl) ListenFinalizeBlock(ctx context.Context, req abci.Reque
 		}
 	}
 
-	// TODO - is this part of the indexer? can we move this to the evm module?
-	err = e.evmKeeper.TrackBlockHash(sdkCtx, uint64(blockHeight), blockHash)
-	if err != nil {
-		e.logger.Error("failed to track block hash", "err", err)
-		return err
-	}
+	// TODO - currently state changes are not supported in abci listener
+	// so we track cosmos block hash at x/evm endblocker.
+	// err = e.evmKeeper.TrackBlockHash(sdkCtx, uint64(blockHeight), blockHash)
+	// if err != nil {
+	// 	e.logger.Error("failed to track block hash", "err", err)
+	// 	return err
+	// }
 
 	return nil
 }

x/evm/abci.go

@@ -0,0 +1,17 @@
+package evm
+
+import (
+	"time"
+
+	"github.com/cosmos/cosmos-sdk/telemetry"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/initia-labs/minievm/x/evm/keeper"
+	"github.com/initia-labs/minievm/x/evm/types"
+)
+
+// PreBlock track latest 256 block hashes
+func PreBlock(ctx sdk.Context, k *keeper.Keeper) (sdk.ResponsePreBlock, error) {
+	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyEndBlocker)
+	return sdk.ResponsePreBlock{}, k.TrackBlockHash(ctx, uint64(ctx.BlockHeight()-1), common.BytesToHash(ctx.HeaderHash()))
+}

x/evm/module.go

@@ -29,7 +29,8 @@ var (
 	_ module.HasConsensusVersion = AppModule{}
 	_ module.HasName             = AppModule{}
 
-	_ appmodule.AppModule = AppModule{}
+	_ appmodule.AppModule     = AppModule{}
+	_ appmodule.HasPreBlocker = AppModule{}
 )
 
 // ----------------------------------------------------------------------------
@@ -157,3 +158,10 @@ func (am AppModule) IsAppModule() {}
 func (am AppModule) IsOnePerModuleType() {}
 
 // ___________________________________________________________________________
+
+// EndBlock returns the end blocker for the evm module. It returns no validator
+// updates.
+func (am AppModule) PreBlock(ctx context.Context) (appmodule.ResponsePreBlock, error) {
+	c := sdk.UnwrapSDKContext(ctx)
+	return PreBlock(c, am.keeper)
+}