x

mod/execution/pkg/client/client.go

@@ -302,10 +302,10 @@ func (s *EngineClient[ExecutionPayloadT]) jwtRefreshLoop(
 ) {
 	s.logger.Info("starting JWT refresh loop 🔄")
 	ticker := time.NewTicker(s.cfg.RPCJWTRefreshInterval)
-	defer ticker.Stop()
 	for {
 		select {
 		case <-ctx.Done():
+			ticker.Stop()
 			return
 		case <-ticker.C:
 			s.statusErrMu.Lock()

mod/node-core/pkg/app/app.go

@@ -120,7 +120,7 @@ func (app *BeaconApp) setupBeaconModule() {
 			ABCIValidatorMiddleware().
 			ProcessProposalHandler,
 	)
-	app.SetPreBlocker(beaconModule.ABCIBlockchainMiddleware().PreBlock)
+	app.SetPreBlocker(beaconModule.ABCIFinalizeBlockMiddleware().PreBlock)
 
 	// TODO: this needs to be made un-hood.
 	if err := beaconModule.StartServices(

mod/runtime/pkg/runtime/abci.go

@@ -36,7 +36,7 @@ func (r BeaconKitRuntime[
 	ctx context.Context,
 	bz json.RawMessage,
 ) ([]appmodulev2.ValidatorUpdate, error) {
-	return r.abciBlockchainMiddleware.InitGenesis(ctx, bz)
+	return r.abciFinalizeBlockMiddleware.InitGenesis(ctx, bz)
 }
 
 // EndBlock returns the validator set updates from the beacon state.
@@ -47,5 +47,5 @@ func (r BeaconKitRuntime[
 ]) EndBlock(
 	ctx context.Context,
 ) ([]appmodulev2.ValidatorUpdate, error) {
-	return r.abciBlockchainMiddleware.EndBlock(ctx)
+	return r.abciFinalizeBlockMiddleware.EndBlock(ctx)
 }

mod/runtime/pkg/runtime/middleware/finalize.go

@@ -39,10 +39,10 @@ import (
 	"github.com/sourcegraph/conc/iter"
 )
 
-// BlockchainMiddleware is a struct that encapsulates the necessary
+// FinalizeBlockMiddleware is a struct that encapsulates the necessary
 // components to handle
 // the proposal processes.
-type BlockchainMiddleware[
+type FinalizeBlockMiddleware[
 	BeaconBlockT interface {
 		ssz.Marshallable
 		NewFromSSZ([]byte, uint32) (BeaconBlockT, error)
@@ -60,8 +60,8 @@ type BlockchainMiddleware[
 	valUpdates []*transition.ValidatorUpdate
 }
 
-// NewBlockchainMiddleware creates a new instance of the Handler struct.
-func NewBlockchainMiddleware[
+// NewFinalizeBlockMiddleware creates a new instance of the Handler struct.
+func NewFinalizeBlockMiddleware[
 	BeaconBlockT interface {
 		ssz.Marshallable
 		NewFromSSZ([]byte, uint32) (BeaconBlockT, error)
@@ -71,21 +71,21 @@ func NewBlockchainMiddleware[
 	chainSpec primitives.ChainSpec,
 	chainService BlockchainService[BeaconBlockT, BlobSidecarsT],
 	telemetrySink TelemetrySink,
-) *BlockchainMiddleware[BeaconBlockT, BeaconStateT, BlobSidecarsT] {
+) *FinalizeBlockMiddleware[BeaconBlockT, BeaconStateT, BlobSidecarsT] {
 	// This is just for nilaway, TODO: remove later.
 	if chainService == nil {
 		panic("chain service is nil")
 	}
 
-	return &BlockchainMiddleware[BeaconBlockT, BeaconStateT, BlobSidecarsT]{
+	return &FinalizeBlockMiddleware[BeaconBlockT, BeaconStateT, BlobSidecarsT]{
 		chainSpec:    chainSpec,
 		chainService: chainService,
 		metrics:      newFinalizeMiddlewareMetrics(telemetrySink),
 	}
 }
 
 // InitGenesis is called by the base app to initialize the state of the.
-func (h *BlockchainMiddleware[
+func (h *FinalizeBlockMiddleware[
 	BeaconBlockT, BeaconStateT, BlobSidecarsT,
 ]) InitGenesis(
 	ctx context.Context,
@@ -112,7 +112,7 @@ func (h *BlockchainMiddleware[
 // PreBlock is called by the base app before the block is finalized. It
 // is responsible for aggregating oracle data from each validator and writing
 // the oracle data to the store.
-func (h *BlockchainMiddleware[
+func (h *FinalizeBlockMiddleware[
 	BeaconBlockT, BeaconStateT, BlobSidecarsT,
 ]) PreBlock(
 	ctx sdk.Context, req *cometabci.FinalizeBlockRequest,
@@ -142,7 +142,7 @@ func (h *BlockchainMiddleware[
 }
 
 // EndBlock returns the validator set updates from the beacon state.
-func (h BlockchainMiddleware[
+func (h FinalizeBlockMiddleware[
 	BeaconBlockT, BeaconStateT, BlobSidecarsT,
 ]) EndBlock(
 	context.Context,

mod/runtime/pkg/runtime/runtime.go

@@ -82,9 +82,9 @@ type BeaconKitRuntime[
 	storageBackend StorageBackendT
 	// chainSpec defines the chain specifications for the BeaconKitRuntime.
 	chainSpec primitives.ChainSpec
-	// abciBlockchainMiddleware handles ABCI interactions for the
+	// abciFinalizeBlockMiddleware handles ABCI interactions for the
 	// BeaconKitRuntime.
-	abciBlockchainMiddleware *middleware.BlockchainMiddleware[
+	abciFinalizeBlockMiddleware *middleware.FinalizeBlockMiddleware[
 		BeaconBlockT, BeaconStateT, BlobSidecarsT,
 	]
 	// abciValidatorMiddleware is responsible for forward ABCI requests to the
@@ -167,8 +167,8 @@ func NewBeaconKitRuntime[
 		AvailabilityStoreT, BeaconBlockT, BeaconBlockBodyT, BeaconStateT,
 		BlobSidecarsT, DepositStoreT, StorageBackendT,
 	]{
-		abciBlockchainMiddleware: middleware.
-			NewBlockchainMiddleware[
+		abciFinalizeBlockMiddleware: middleware.
+			NewFinalizeBlockMiddleware[
 			BeaconBlockT, BeaconStateT, BlobSidecarsT,
 		](
 			chainSpec,
@@ -204,10 +204,10 @@ func (r *BeaconKitRuntime[
 func (r *BeaconKitRuntime[
 	AvailabilityStoreT, BeaconBlockT, BeaconBlockBodyT, BeaconStateT,
 	BlobSidecarsT, DepositStoreT, StorageBackendT,
-]) ABCIBlockchainMiddleware() *middleware.BlockchainMiddleware[
+]) ABCIFinalizeBlockMiddleware() *middleware.FinalizeBlockMiddleware[
 	BeaconBlockT, BeaconStateT, BlobSidecarsT,
 ] {
-	return r.abciBlockchainMiddleware
+	return r.abciFinalizeBlockMiddleware
 }
 
 // ABCIValidatorMiddleware returns the ABCI validator middleware.