chore(node-core): depinject validator service & cleanup

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

@@ -29,14 +29,9 @@ import (
 	"github.com/berachain/beacon-kit/mod/beacon/blockchain"
 	cmdlib "github.com/berachain/beacon-kit/mod/cli/pkg/commands"
 	consensustypes "github.com/berachain/beacon-kit/mod/consensus-types/pkg/types"
-	"github.com/berachain/beacon-kit/mod/da/pkg/kzg/noop"
 	dastore "github.com/berachain/beacon-kit/mod/da/pkg/store"
 	datypes "github.com/berachain/beacon-kit/mod/da/pkg/types"
-	engineclient "github.com/berachain/beacon-kit/mod/execution/pkg/client"
-	"github.com/berachain/beacon-kit/mod/execution/pkg/deposit"
 	"github.com/berachain/beacon-kit/mod/node-core/pkg/components"
-	"github.com/berachain/beacon-kit/mod/node-core/pkg/components/metrics"
-	"github.com/berachain/beacon-kit/mod/node-core/pkg/components/signer"
 	"github.com/berachain/beacon-kit/mod/node-core/pkg/node"
 	"github.com/berachain/beacon-kit/mod/node-core/pkg/types"
 	"github.com/berachain/beacon-kit/mod/primitives"
@@ -46,7 +41,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/config"
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	gokzg4844 "github.com/crate-crypto/go-kzg-4844"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -108,17 +102,6 @@ func (nb *NodeBuilder[NodeT]) buildRootCmd() (*cobra.Command, error) {
 				log.NewLogger(os.Stdout),
 				viper.GetViper(),
 				nb.chainSpec,
-				&depositdb.KVStore[*consensustypes.Deposit]{},
-				&engineclient.EngineClient[*consensustypes.ExecutionPayload]{},
-				&gokzg4844.JSONTrustedSetup{},
-				&noop.Verifier{},
-				&dastore.Store[*consensustypes.BeaconBlockBody]{},
-				&signer.BLSSigner{},
-				&metrics.TelemetrySink{},
-				&deposit.WrappedBeaconDepositContract[
-					*consensustypes.Deposit,
-					consensustypes.WithdrawalCredentials,
-				]{},
 				&runtime.BeaconKitRuntime[
 					*dastore.Store[*consensustypes.BeaconBlockBody],
 					*consensustypes.BeaconBlock,
@@ -141,15 +124,6 @@ func (nb *NodeBuilder[NodeT]) buildRootCmd() (*cobra.Command, error) {
 				components.ProvideClientContext,
 				components.ProvideKeyring,
 				components.ProvideConfig,
-				components.ProvideLocalBuilder,
-				components.ProvideStateProcessor,
-				components.ProvideExecutionEngine[*consensustypes.ExecutionPayload],
-				components.ProvideBlockFeed[*consensustypes.BeaconBlock],
-				components.ProvideDepositPruner,
-				components.ProvideAvailabilityPruner,
-				components.ProvideBlobProcessor[*consensustypes.BeaconBlockBody],
-				components.ProvideDBManager,
-				components.ProvideDepositService,
 			),
 		),
 		&autoCliOpts,

mod/node-core/pkg/components/availability_store.go

@@ -75,10 +75,10 @@ func ProvideAvailibilityStore[
 // function for the depinject framework.
 type AvailabilityPrunerInput struct {
 	depinject.In
-	Logger            log.Logger
-	ChainSpec         primitives.ChainSpec
-	BlockFeed         *event.FeedOf[*feed.Event[*types.BeaconBlock]]
 	AvailabilityStore *dastore.Store[*types.BeaconBlockBody]
+	BlockFeed         *event.FeedOf[*feed.Event[*types.BeaconBlock]]
+	ChainSpec         primitives.ChainSpec
+	Logger            log.Logger
 }
 
 // ProvideAvailabilityPruner provides a availability pruner for the depinject

mod/node-core/pkg/components/blobs.go

@@ -58,9 +58,9 @@ func ProvideBlobProofVerifier(
 type BlobProcessorIn struct {
 	depinject.In
 
-	Logger            log.Logger
 	BlobProofVerifier kzg.BlobProofVerifier
 	ChainSpec         primitives.ChainSpec
+	Logger            log.Logger
 	TelemetrySink     *metrics.TelemetrySink
 }
 

mod/node-core/pkg/components/db_manager.go

@@ -35,9 +35,9 @@ import (
 // DBManagerInput is the input for the dep inject framework.
 type DBManagerInput struct {
 	depinject.In
-	Logger             log.Logger
-	DepositPruner      pruner.Pruner[*dastore.KVStore[*types.Deposit]]
 	AvailabilityPruner pruner.Pruner[*filedb.RangeDB]
+	DepositPruner      pruner.Pruner[*dastore.KVStore[*types.Deposit]]
+	Logger             log.Logger
 }
 
 // ProvideDBManager provides a DBManager for the depinject framework.

mod/node-core/pkg/components/defaults.go

@@ -27,30 +27,31 @@ import (
 
 func DefaultComponentsWithStandardTypes() []any {
 	return []any{
+		ProvideAvailabilityPruner,
 		ProvideAvailibilityStore[*types.BeaconBlockBody],
 		ProvideBlsSigner,
-		ProvideTrustedSetup,
-		ProvideDepositStore[*types.Deposit],
-		ProvideConfig,
-		ProvideEngineClient[*types.ExecutionPayload],
-		ProvideJWTSecret,
-		ProvideBlobProofVerifier,
+		ProvideBlockFeed[*types.BeaconBlock],
 		ProvideBlobProcessor[*types.BeaconBlockBody],
-		ProvideTelemetrySink,
-		ProvideExecutionEngine[*types.ExecutionPayload],
+		ProvideBlobProofVerifier,
+		ProvideConfig,
+		ProvideDBManager,
+		ProvideDepositPruner,
+		ProvideDepositService,
+		ProvideDepositStore[*types.Deposit],
 		ProvideBeaconDepositContract[
 			*types.Deposit,
 			*types.ExecutionPayload,
 			*engineprimitives.Withdrawal,
 			types.WithdrawalCredentials,
 		],
+		ProvideEngineClient[*types.ExecutionPayload],
+		ProvideExecutionEngine[*types.ExecutionPayload],
+		ProvideJWTSecret,
 		ProvideLocalBuilder,
-		ProvideStateProcessor,
-		ProvideBlockFeed[*types.BeaconBlock],
-		ProvideDepositPruner,
-		ProvideAvailabilityPruner,
-		ProvideDBManager,
-		ProvideDepositService,
 		ProvideRuntime,
+		ProvideStateProcessor,
+		ProvideTelemetrySink,
+		ProvideTrustedSetup,
+		ProvideValidatorService,
 	}
 }

mod/node-core/pkg/components/deposit_service.go

@@ -37,16 +37,15 @@ import (
 // DepositServiceIn is the input for the deposit service.
 type DepositServiceIn struct {
 	depinject.In
-
-	Logger                log.Logger
-	ChainSpec             primitives.ChainSpec
-	EngineClient          *engineclient.EngineClient[*types.ExecutionPayload]
-	TelemetrySink         *metrics.TelemetrySink
-	DepositStore          *depositdb.KVStore[*types.Deposit]
 	BeaconDepositContract *deposit.WrappedBeaconDepositContract[
 		*types.Deposit, types.WithdrawalCredentials,
 	]
-	BlockFeed *event.FeedOf[*feed.Event[*types.BeaconBlock]]
+	BlockFeed     *event.FeedOf[*feed.Event[*types.BeaconBlock]]
+	ChainSpec     primitives.ChainSpec
+	DepositStore  *depositdb.KVStore[*types.Deposit]
+	EngineClient  *engineclient.EngineClient[*types.ExecutionPayload]
+	Logger        log.Logger
+	TelemetrySink *metrics.TelemetrySink
 }
 
 // ProvideDepositService provides the deposit service to the depinject

mod/node-core/pkg/components/deposit_store.go

@@ -70,10 +70,10 @@ func ProvideDepositStore[
 // DepositPrunerInput is the input for the deposit pruner.
 type DepositPrunerInput struct {
 	depinject.In
-	Logger       log.Logger
-	ChainSpec    primitives.ChainSpec
 	BlockFeed    *event.FeedOf[*feed.Event[*types.BeaconBlock]]
+	ChainSpec    primitives.ChainSpec
 	DepositStore *depositstore.KVStore[*types.Deposit]
+	Logger       log.Logger
 }
 
 // ProvideDepositPruner provides a deposit pruner for the depinject framework.

mod/node-core/pkg/components/engine.go

@@ -40,18 +40,11 @@ import (
 // EngineClientInputs is the input for the EngineClient.
 type EngineClientInputs struct {
 	depinject.In
-	// ChainSpec is the chain spec.
-	ChainSpec primitives.ChainSpec
-	// Config is the BeaconKit configuration.
-	Config *config.Config
-	// Logger is the logger.
-	Logger log.Logger
-	// TelemetrySink is the telemetry sink.
+	ChainSpec     primitives.ChainSpec
+	Config        *config.Config
+	JWTSecret     *jwt.Secret `optional:"true"`
+	Logger        log.Logger
 	TelemetrySink *metrics.TelemetrySink
-	// JWTSecret is the jwt secret. It is optional, since
-	// it is not required when connecting to the execution client
-	// over IPC.
-	JWTSecret *jwt.Secret `optional:"true"`
 }
 
 // ProvideEngineClient creates a new EngineClient.

mod/node-core/pkg/components/module/depinject.go

@@ -24,99 +24,37 @@ import (
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/depinject/appconfig"
-	"github.com/berachain/beacon-kit/mod/consensus-types/pkg/types"
-	dastore "github.com/berachain/beacon-kit/mod/da/pkg/store"
-	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 	"github.com/berachain/beacon-kit/mod/node-core/pkg/components"
 	modulev1alpha1 "github.com/berachain/beacon-kit/mod/node-core/pkg/components/module/api/module/v1alpha1"
-	"github.com/berachain/beacon-kit/mod/node-core/pkg/components/storage"
-	"github.com/berachain/beacon-kit/mod/node-core/pkg/config"
-	"github.com/berachain/beacon-kit/mod/primitives"
-	"github.com/berachain/beacon-kit/mod/state-transition/pkg/core"
-	"github.com/berachain/beacon-kit/mod/storage/pkg/beacondb"
-	"github.com/berachain/beacon-kit/mod/storage/pkg/beacondb/encoding"
-	depositdb "github.com/berachain/beacon-kit/mod/storage/pkg/deposit"
 )
 
 // TODO: we don't allow generics here? Why? Is it fixable?
 //
 //nolint:gochecknoinits // required by sdk.
 func init() {
 	appconfig.RegisterModule(&modulev1alpha1.Module{},
-		// TODO: make storage backend its own module and remove the
-		// coupling between construction of runtime and module
 		appconfig.Provide(
-			ProvideStorageBackend,
+			components.ProvideStorageBackend,
 			ProvideModule,
 		),
 	)
 }
 
-// DepInjectInput is the input for the dep inject framework.
-type DepInjectInput struct {
+// ModuleInput is the input for the dep inject framework.
+type ModuleInput struct {
 	depinject.In
-	BeaconConfig *config.Config
-	Runtime      *components.BeaconKitRuntime
+	Runtime *components.BeaconKitRuntime
 }
 
-// DepInjectOutput is the output for the dep inject framework.
-type DepInjectOutput struct {
+// ModuleOutput is the output for the dep inject framework.
+type ModuleOutput struct {
 	depinject.Out
 	Module appmodule.AppModule
 }
 
 // ProvideModule is a function that provides the module to the application.
-func ProvideModule(in DepInjectInput) (DepInjectOutput, error) {
-	return DepInjectOutput{
+func ProvideModule(in ModuleInput) (ModuleOutput, error) {
+	return ModuleOutput{
 		Module: NewAppModule(in.Runtime),
 	}, nil
 }
-
-// StorageBackendInput is the input for the ProvideStorageBackend function.
-type StorageBackendInput struct {
-	depinject.In
-	ChainSpec         primitives.ChainSpec
-	AvailabilityStore *dastore.Store[*types.BeaconBlockBody]
-	Environment       appmodule.Environment
-	DepositStore      *depositdb.KVStore[*types.Deposit]
-}
-
-// ProvideStorageBackend is the depinject provider that returns a beacon storage
-// backend.
-func ProvideStorageBackend(
-	in StorageBackendInput,
-) *storage.Backend[
-	*dastore.Store[*types.BeaconBlockBody],
-	*types.BeaconBlock,
-	*types.BeaconBlockBody,
-	core.BeaconState[
-		*types.BeaconBlockHeader, *types.Eth1Data,
-		*types.ExecutionPayloadHeader, *types.Fork,
-		*types.Validator, *engineprimitives.Withdrawal,
-	],
-	*depositdb.KVStore[*types.Deposit],
-] {
-	payloadCodec := &encoding.
-		SSZInterfaceCodec[*types.ExecutionPayloadHeader]{}
-	return storage.NewBackend[
-		*dastore.Store[*types.BeaconBlockBody],
-		*types.BeaconBlock,
-		*types.BeaconBlockBody,
-		core.BeaconState[
-			*types.BeaconBlockHeader, *types.Eth1Data,
-			*types.ExecutionPayloadHeader, *types.Fork,
-			*types.Validator, *engineprimitives.Withdrawal,
-		],
-	](
-		in.ChainSpec,
-		in.AvailabilityStore,
-		beacondb.New[
-			*types.Fork,
-			*types.BeaconBlockHeader,
-			*types.ExecutionPayloadHeader,
-			*types.Eth1Data,
-			*types.Validator,
-		](in.Environment.KVStoreService, payloadCodec),
-		in.DepositStore,
-	)
-}

mod/node-core/pkg/components/payload_builder.go

@@ -37,8 +37,8 @@ type LocalBuilderInput struct {
 	depinject.In
 	Cfg             *config.Config
 	ChainSpec       primitives.ChainSpec
-	Logger          log.Logger
 	ExecutionEngine *execution.Engine[*types.ExecutionPayload]
+	Logger          log.Logger
 }
 
 func ProvideLocalBuilder(