From 9d4ed7000ccc90da4c643a1c4addfc58279eeaf6 Mon Sep 17 00:00:00 2001 From: ocnc-two Date: Fri, 2 Aug 2024 15:58:06 -0400 Subject: [PATCH 1/2] cleanup --- .../mocks/blobs_bundle.mock.go | 2 +- .../mocks/built_execution_payload_env.mock.go | 2 +- .../mocks/payload_attributer.mock.go | 2 +- .../backend/mocks/availability_store.mock.go | 2 +- .../backend/mocks/beacon_block_header.mock.go | 2 +- .../backend/mocks/beacon_state.mock.go | 2 +- .../backend/mocks/block_store.mock.go | 2 +- .../backend/mocks/deposit_store.mock.go | 2 +- mod/node-api/backend/mocks/node.mock.go | 2 +- .../backend/mocks/state_processor.mock.go | 2 +- .../backend/mocks/storage_backend.mock.go | 2 +- mod/node-api/backend/mocks/validator.mock.go | 2 +- mod/node-api/backend/mocks/withdrawal.mock.go | 2 +- .../mocks/withdrawal_credentials.mock.go | 2 +- mod/node-core/pkg/components/api.go | 12 ++++- mod/node-core/pkg/components/api_handlers.go | 13 ++++++ .../pkg/components/attributes_factory.go | 23 ++++++---- mod/node-core/pkg/components/backend.go | 2 +- mod/node-core/pkg/components/block_store.go | 2 +- .../pkg/components/block_store_service.go | 4 +- mod/node-core/pkg/components/brokers.go | 20 +++++++-- mod/node-core/pkg/components/chain_service.go | 1 + mod/node-core/pkg/components/db_manager.go | 2 +- mod/node-core/pkg/components/defaults.go | 32 +++++--------- mod/node-core/pkg/components/middleware.go | 2 - .../pkg/components/reporting_service.go | 44 +++++++++++++++++++ .../pkg/components/service_registry.go | 11 ++--- mod/node-core/pkg/components/types.go | 4 ++ .../pkg/crypto/mocks/bls_signer.mock.go | 2 +- mod/runtime/pkg/middleware/middleware.go | 10 +---- mod/runtime/pkg/service/mocks/basic.mock.go | 2 +- .../pkg/service/mocks/registry_option.mock.go | 2 +- mod/storage/pkg/interfaces/mocks/db.mock.go | 2 +- .../pkg/pruner/mocks/beacon_block.mock.go | 2 +- .../pkg/pruner/mocks/block_event.mock.go | 2 +- mod/storage/pkg/pruner/mocks/prunable.mock.go | 2 +- mod/storage/pkg/pruner/mocks/pruner.mock.go | 2 +- 37 files changed, 144 insertions(+), 82 deletions(-) create mode 100644 mod/node-core/pkg/components/reporting_service.go diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go index 4ecc928f91..5c48437385 100644 --- a/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go +++ b/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go index 21983dbdd8..ddc576a370 100644 --- a/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go +++ b/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go index 7e7eac96d8..7d9d510f60 100644 --- a/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go +++ b/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/availability_store.mock.go b/mod/node-api/backend/mocks/availability_store.mock.go index d845edcde4..f3dbec242d 100644 --- a/mod/node-api/backend/mocks/availability_store.mock.go +++ b/mod/node-api/backend/mocks/availability_store.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/beacon_block_header.mock.go b/mod/node-api/backend/mocks/beacon_block_header.mock.go index d563d803d6..e224788016 100644 --- a/mod/node-api/backend/mocks/beacon_block_header.mock.go +++ b/mod/node-api/backend/mocks/beacon_block_header.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/beacon_state.mock.go b/mod/node-api/backend/mocks/beacon_state.mock.go index a7fec0c058..5f41a8eae7 100644 --- a/mod/node-api/backend/mocks/beacon_state.mock.go +++ b/mod/node-api/backend/mocks/beacon_state.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/block_store.mock.go b/mod/node-api/backend/mocks/block_store.mock.go index 975c5cfde0..280877db8d 100644 --- a/mod/node-api/backend/mocks/block_store.mock.go +++ b/mod/node-api/backend/mocks/block_store.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/deposit_store.mock.go b/mod/node-api/backend/mocks/deposit_store.mock.go index d1e76e3a6b..da5be359a8 100644 --- a/mod/node-api/backend/mocks/deposit_store.mock.go +++ b/mod/node-api/backend/mocks/deposit_store.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/node.mock.go b/mod/node-api/backend/mocks/node.mock.go index de9ecb8835..9bcf49e752 100644 --- a/mod/node-api/backend/mocks/node.mock.go +++ b/mod/node-api/backend/mocks/node.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/state_processor.mock.go b/mod/node-api/backend/mocks/state_processor.mock.go index 428fdf4b1f..b25569a298 100644 --- a/mod/node-api/backend/mocks/state_processor.mock.go +++ b/mod/node-api/backend/mocks/state_processor.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/storage_backend.mock.go b/mod/node-api/backend/mocks/storage_backend.mock.go index 210c236074..8b1f802a35 100644 --- a/mod/node-api/backend/mocks/storage_backend.mock.go +++ b/mod/node-api/backend/mocks/storage_backend.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/validator.mock.go b/mod/node-api/backend/mocks/validator.mock.go index b6eb58a863..ddbafeb79e 100644 --- a/mod/node-api/backend/mocks/validator.mock.go +++ b/mod/node-api/backend/mocks/validator.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/withdrawal.mock.go b/mod/node-api/backend/mocks/withdrawal.mock.go index 2da331074d..dc39646e1d 100644 --- a/mod/node-api/backend/mocks/withdrawal.mock.go +++ b/mod/node-api/backend/mocks/withdrawal.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-api/backend/mocks/withdrawal_credentials.mock.go b/mod/node-api/backend/mocks/withdrawal_credentials.mock.go index e5565d9421..95d9a1441a 100644 --- a/mod/node-api/backend/mocks/withdrawal_credentials.mock.go +++ b/mod/node-api/backend/mocks/withdrawal_credentials.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/node-core/pkg/components/api.go b/mod/node-core/pkg/components/api.go index 554f851344..c6450938a7 100644 --- a/mod/node-core/pkg/components/api.go +++ b/mod/node-core/pkg/components/api.go @@ -42,9 +42,9 @@ func ProvideNodeAPIEngine() *NodeAPIEngine { type NodeAPIBackendInput struct { depinject.In - StorageBackend *StorageBackend ChainSpec common.ChainSpec StateProcessor *StateProcessor + StorageBackend *StorageBackend } func ProvideNodeAPIBackend(in NodeAPIBackendInput) *NodeAPIBackend { @@ -82,8 +82,8 @@ type NodeAPIServerInput struct { Engine *NodeAPIEngine Config *config.Config - Logger log.AdvancedLogger[any, sdklog.Logger] Handlers []handlers.Handlers[NodeAPIContext] + Logger log.AdvancedLogger[any, sdklog.Logger] } func ProvideNodeAPIServer(in NodeAPIServerInput) *NodeAPIServer { @@ -99,3 +99,11 @@ func ProvideNodeAPIServer(in NodeAPIServerInput) *NodeAPIServer { in.Handlers..., ) } + +func DefaultNodeAPIComponents() []any { + return []any{ + ProvideNodeAPIServer, + ProvideNodeAPIEngine, + ProvideNodeAPIBackend, + } +} diff --git a/mod/node-core/pkg/components/api_handlers.go b/mod/node-core/pkg/components/api_handlers.go index 856b5c13be..9ff3d9c2a1 100644 --- a/mod/node-core/pkg/components/api_handlers.go +++ b/mod/node-core/pkg/components/api_handlers.go @@ -90,3 +90,16 @@ func ProvideNodeAPINodeHandler() *NodeAPIHandler { func ProvideNodeAPIProofHandler(b *NodeAPIBackend) *ProofAPIHandler { return proofapi.NewHandler[NodeAPIContext](b) } + +func DefaultNodeAPIHandlers() []any { + return []any{ + ProvideNodeAPIHandlers, + ProvideNodeAPIBeaconHandler, + ProvideNodeAPIBuilderHandler, + ProvideNodeAPIConfigHandler, + ProvideNodeAPIDebugHandler, + ProvideNodeAPIEventsHandler, + ProvideNodeAPINodeHandler, + ProvideNodeAPIProofHandler, + } +} diff --git a/mod/node-core/pkg/components/attributes_factory.go b/mod/node-core/pkg/components/attributes_factory.go index 6415169271..e2dbd87ea6 100644 --- a/mod/node-core/pkg/components/attributes_factory.go +++ b/mod/node-core/pkg/components/attributes_factory.go @@ -21,18 +21,25 @@ package components import ( + "cosmossdk.io/depinject" "github.com/berachain/beacon-kit/mod/config" "github.com/berachain/beacon-kit/mod/log" "github.com/berachain/beacon-kit/mod/payload/pkg/attributes" "github.com/berachain/beacon-kit/mod/primitives/pkg/common" ) +type AttributesFactoryInput struct { + depinject.In + + ChainSpec common.ChainSpec + Config *config.Config + Logger log.Logger[any] + StateProcessor *StateProcessor +} + // ProvideAttributesFactory provides an AttributesFactory for the client. func ProvideAttributesFactory( - sp *StateProcessor, - chainSpec common.ChainSpec, - logger log.Logger[any], - cfg *config.Config, + in AttributesFactoryInput, ) (*AttributesFactory, error) { return attributes.NewAttributesFactory[ *BeaconState, @@ -40,9 +47,9 @@ func ProvideAttributesFactory( *PayloadAttributes, *Withdrawal, ]( - sp, - chainSpec, - logger, - cfg.PayloadBuilder.SuggestedFeeRecipient, + in.StateProcessor, + in.ChainSpec, + in.Logger, + in.Config.PayloadBuilder.SuggestedFeeRecipient, ), nil } diff --git a/mod/node-core/pkg/components/backend.go b/mod/node-core/pkg/components/backend.go index b853dbc356..57f3f69aca 100644 --- a/mod/node-core/pkg/components/backend.go +++ b/mod/node-core/pkg/components/backend.go @@ -30,10 +30,10 @@ import ( type StorageBackendInput struct { depinject.In AvailabilityStore *AvailabilityStore + BlockStore *BlockStore ChainSpec common.ChainSpec DepositStore *DepositStore KVStore *KVStore - BlockStore *BlockStore } // ProvideStorageBackend is the depinject provider that returns a beacon storage diff --git a/mod/node-core/pkg/components/block_store.go b/mod/node-core/pkg/components/block_store.go index 944852f550..eb1eab57bf 100644 --- a/mod/node-core/pkg/components/block_store.go +++ b/mod/node-core/pkg/components/block_store.go @@ -60,9 +60,9 @@ func ProvideBlockStore( type BlockPrunerInput struct { depinject.In - Config *config.Config BlockBroker *BlockBroker BlockStore *BlockStore + Config *config.Config Logger log.Logger } diff --git a/mod/node-core/pkg/components/block_store_service.go b/mod/node-core/pkg/components/block_store_service.go index 554998dca4..7d04e79ff3 100644 --- a/mod/node-core/pkg/components/block_store_service.go +++ b/mod/node-core/pkg/components/block_store_service.go @@ -31,10 +31,10 @@ import ( type BlockServiceInput struct { depinject.In - Config *config.Config - Logger log.Logger[any] BlockBroker *BlockBroker BlockStore *BlockStore + Config *config.Config + Logger log.Logger[any] } // ProvideBlockStoreService provides the block service. diff --git a/mod/node-core/pkg/components/brokers.go b/mod/node-core/pkg/components/brokers.go index f30a6431b2..0cc9d84d2c 100644 --- a/mod/node-core/pkg/components/brokers.go +++ b/mod/node-core/pkg/components/brokers.go @@ -24,15 +24,15 @@ import ( "github.com/berachain/beacon-kit/mod/async/pkg/broker" ) -// ProvideBlobFeed provides a blob feed for the depinject framework. -func ProvideBlobFeed() *SidecarsBroker { +// ProvideBlobBroker provides a blob feed for the depinject framework. +func ProvideBlobBroker() *SidecarsBroker { return broker.New[*SidecarEvent]( "blob-broker", ) } -// ProvideBlockFeed provides a block feed for the depinject framework. -func ProvideBlockFeed() *BlockBroker { +// ProvideBlockBroker provides a block feed for the depinject framework. +func ProvideBlockBroker() *BlockBroker { return broker.New[*BlockEvent]( "blk-broker", ) @@ -65,3 +65,15 @@ func ProvideValidatorUpdateBroker() *ValidatorUpdateBroker { "validator-updates-broker", ) } + +// DefaultBrokerProviders returns a slice of the default broker providers. +func DefaultBrokerProviders() []interface{} { + return []interface{}{ + ProvideBlobBroker, + ProvideBlockBroker, + ProvideGenesisBroker, + ProvideSlotBroker, + ProvideStatusBroker, + ProvideValidatorUpdateBroker, + } +} diff --git a/mod/node-core/pkg/components/chain_service.go b/mod/node-core/pkg/components/chain_service.go index 590be34848..e843c7a442 100644 --- a/mod/node-core/pkg/components/chain_service.go +++ b/mod/node-core/pkg/components/chain_service.go @@ -34,6 +34,7 @@ import ( // ChainServiceInput is the input for the chain service provider. type ChainServiceInput struct { depinject.In + BlockBroker *BlockBroker ChainSpec common.ChainSpec Cfg *config.Config diff --git a/mod/node-core/pkg/components/db_manager.go b/mod/node-core/pkg/components/db_manager.go index 98606790a2..ff3c7002ef 100644 --- a/mod/node-core/pkg/components/db_manager.go +++ b/mod/node-core/pkg/components/db_manager.go @@ -30,8 +30,8 @@ import ( type DBManagerInput struct { depinject.In AvailabilityPruner DAPruner - DepositPruner DepositPruner BlockPruner BlockPruner + DepositPruner DepositPruner Logger log.Logger } diff --git a/mod/node-core/pkg/components/defaults.go b/mod/node-core/pkg/components/defaults.go index 5d785825f8..29b5f596ff 100644 --- a/mod/node-core/pkg/components/defaults.go +++ b/mod/node-core/pkg/components/defaults.go @@ -21,20 +21,19 @@ package components func DefaultComponentsWithStandardTypes() []any { - return []any{ + components := []any{ ProvideABCIMiddleware, ProvideAttributesFactory, ProvideAvailabilityPruner, ProvideAvailibilityStore, + ProvideBeaconDepositContract, + ProvideBlockPruner, + ProvideBlockStore, + ProvideBlockStoreService, ProvideBlsSigner, - ProvideBlobFeed, - ProvideBlockFeed, ProvideBlobProcessor, ProvideBlobProofVerifier, ProvideBlobVerifier, - ProvideBlockStoreService, - ProvideBlockPruner, - ProvideBlockStore, ProvideChainService, ProvideChainSpec, ProvideConfig, @@ -44,32 +43,21 @@ func DefaultComponentsWithStandardTypes() []any { ProvideDepositPruner, ProvideDepositService, ProvideDepositStore, - ProvideBeaconDepositContract, ProvideEngineClient, ProvideExecutionEngine, - ProvideGenesisBroker, ProvideJWTSecret, ProvideLocalBuilder, - ProvideNodeAPIBackend, - ProvideNodeAPIEngine, - ProvideNodeAPIHandlers, - ProvideNodeAPIBeaconHandler, - ProvideNodeAPIBuilderHandler, - ProvideNodeAPIConfigHandler, - ProvideNodeAPIDebugHandler, - ProvideNodeAPIEventsHandler, - ProvideNodeAPINodeHandler, - ProvideNodeAPIProofHandler, - ProvideNodeAPIServer, + ProvideReportingService, ProvideServiceRegistry, ProvideSidecarFactory, ProvideStateProcessor, - ProvideSlotBroker, - ProvideStatusBroker, ProvideStorageBackend, ProvideTelemetrySink, ProvideTrustedSetup, ProvideValidatorService, - ProvideValidatorUpdateBroker, } + components = append(components, DefaultNodeAPIComponents()...) + components = append(components, DefaultNodeAPIHandlers()...) + components = append(components, DefaultBrokerProviders()...) + return components } diff --git a/mod/node-core/pkg/components/middleware.go b/mod/node-core/pkg/components/middleware.go index f4668eb367..1a9879763f 100644 --- a/mod/node-core/pkg/components/middleware.go +++ b/mod/node-core/pkg/components/middleware.go @@ -32,7 +32,6 @@ import ( type ABCIMiddlewareInput struct { depinject.In BeaconBlockFeed *BlockBroker - ChainService *ChainService ChainSpec common.ChainSpec GenesisBroker *GenesisBroker Logger log.Logger[any] @@ -56,7 +55,6 @@ func ProvideABCIMiddleware( *Deposit, *ExecutionPayload, *Genesis, *SlotData, ]( in.ChainSpec, - in.ChainService, in.Logger, in.TelemetrySink, in.GenesisBroker, diff --git a/mod/node-core/pkg/components/reporting_service.go b/mod/node-core/pkg/components/reporting_service.go new file mode 100644 index 0000000000..c62dc8b851 --- /dev/null +++ b/mod/node-core/pkg/components/reporting_service.go @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: BUSL-1.1 +// +// Copyright (C) 2024, Berachain Foundation. All rights reserved. +// Use of this software is governed by the Business Source License included +// in the LICENSE file of this repository and at www.mariadb.com/bsl11. +// +// ANY USE OF THE LICENSED WORK IN VIOLATION OF THIS LICENSE WILL AUTOMATICALLY +// TERMINATE YOUR RIGHTS UNDER THIS LICENSE FOR THE CURRENT AND ALL OTHER +// VERSIONS OF THE LICENSED WORK. +// +// THIS LICENSE DOES NOT GRANT YOU ANY RIGHT IN ANY TRADEMARK OR LOGO OF +// LICENSOR OR ITS AFFILIATES (PROVIDED THAT YOU MAY USE A TRADEMARK OR LOGO OF +// LICENSOR AS EXPRESSLY REQUIRED BY THIS LICENSE). +// +// TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON +// AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, +// EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND +// TITLE. + +package components + +import ( + "cosmossdk.io/depinject" + sdklog "cosmossdk.io/log" + "github.com/berachain/beacon-kit/mod/log" + "github.com/berachain/beacon-kit/mod/node-core/pkg/components/metrics" + "github.com/berachain/beacon-kit/mod/node-core/pkg/services/version" + sdkversion "github.com/cosmos/cosmos-sdk/version" +) + +type ReportingServiceInput struct { + depinject.In + Logger log.AdvancedLogger[any, sdklog.Logger] + TelemetrySink *metrics.TelemetrySink +} + +func ProvideReportingService(in ReportingServiceInput) *ReportingService { + return version.NewReportingService( + in.Logger.With("service", "reporting"), + in.TelemetrySink, + sdkversion.Version, + ) +} diff --git a/mod/node-core/pkg/components/service_registry.go b/mod/node-core/pkg/components/service_registry.go index 1a0de23686..f48d5dc770 100644 --- a/mod/node-core/pkg/components/service_registry.go +++ b/mod/node-core/pkg/components/service_registry.go @@ -24,9 +24,7 @@ import ( "cosmossdk.io/depinject" "cosmossdk.io/log" "github.com/berachain/beacon-kit/mod/node-core/pkg/components/metrics" - "github.com/berachain/beacon-kit/mod/node-core/pkg/services/version" "github.com/berachain/beacon-kit/mod/runtime/pkg/service" - sdkversion "github.com/cosmos/cosmos-sdk/version" ) // ServiceRegistryInput is the input for the service registry provider. @@ -36,13 +34,14 @@ type ServiceRegistryInput struct { BlockBroker *BlockBroker BlockStoreService *BlockStoreService ChainService *ChainService - DBManager *DBManager DAService *DAService + DBManager *DBManager DepositService *DepositService EngineClient *EngineClient GenesisBroker *GenesisBroker Logger log.Logger NodeAPIServer *NodeAPIServer + ReportingService *ReportingService SidecarsBroker *SidecarsBroker SlotBroker *SlotBroker TelemetrySink *metrics.TelemetrySink @@ -63,11 +62,7 @@ func ProvideServiceRegistry( service.WithService(in.DepositService), service.WithService(in.ABCIService), service.WithService(in.NodeAPIServer), - service.WithService(version.NewReportingService( - in.Logger.With("service", "reporting"), - in.TelemetrySink, - sdkversion.Version, - )), + service.WithService(in.ReportingService), service.WithService(in.DBManager), service.WithService(in.GenesisBroker), service.WithService(in.BlockBroker), diff --git a/mod/node-core/pkg/components/types.go b/mod/node-core/pkg/components/types.go index d221f18a8e..2d3e5d58da 100644 --- a/mod/node-core/pkg/components/types.go +++ b/mod/node-core/pkg/components/types.go @@ -50,6 +50,7 @@ import ( "github.com/berachain/beacon-kit/mod/node-api/server" "github.com/berachain/beacon-kit/mod/node-core/pkg/components/signer" "github.com/berachain/beacon-kit/mod/node-core/pkg/components/storage" + "github.com/berachain/beacon-kit/mod/node-core/pkg/services/version" nodetypes "github.com/berachain/beacon-kit/mod/node-core/pkg/types" "github.com/berachain/beacon-kit/mod/payload/pkg/attributes" payloadbuilder "github.com/berachain/beacon-kit/mod/payload/pkg/builder" @@ -322,6 +323,9 @@ type ( // PayloadID is a type alias for the payload ID. PayloadID = engineprimitives.PayloadID + // ReportingService is a type alias for the reporting service. + ReportingService = version.ReportingService + // SidecarFactory is a type alias for the sidecar factory. SidecarFactory = dablob.SidecarFactory[ *BeaconBlock, diff --git a/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go b/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go index 4349c2e668..9fb73fde2a 100644 --- a/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go +++ b/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/runtime/pkg/middleware/middleware.go b/mod/runtime/pkg/middleware/middleware.go index f1c19f08b9..9c2ea8c9b7 100644 --- a/mod/runtime/pkg/middleware/middleware.go +++ b/mod/runtime/pkg/middleware/middleware.go @@ -52,10 +52,6 @@ type ABCIMiddleware[ ] struct { // chainSpec is the chain specification. chainSpec common.ChainSpec - // chainService represents the blockchain service. - chainService BlockchainService[ - BeaconBlockT, BlobSidecarsT, DepositT, GenesisT, - ] // TODO: we will eventually gossip the blobs separately from // CometBFT, but for now, these are no-op gossipers. blobGossiper p2p.PublisherReceiver[ @@ -115,9 +111,6 @@ func NewABCIMiddleware[ SlotDataT any, ]( chainSpec common.ChainSpec, - chainService BlockchainService[ - BeaconBlockT, BlobSidecarsT, DepositT, GenesisT, - ], logger log.Logger[any], telemetrySink TelemetrySink, genesisBroker *broker.Broker[*asynctypes.Event[GenesisT]], @@ -133,8 +126,7 @@ func NewABCIMiddleware[ AvailabilityStoreT, BeaconBlockT, BlobSidecarsT, DepositT, ExecutionPayloadT, GenesisT, SlotDataT, ]{ - chainSpec: chainSpec, - chainService: chainService, + chainSpec: chainSpec, blobGossiper: rp2p.NewNoopBlobHandler[ BlobSidecarsT, encoding.ABCIRequest, ](), diff --git a/mod/runtime/pkg/service/mocks/basic.mock.go b/mod/runtime/pkg/service/mocks/basic.mock.go index 2b5f800e57..3b38040653 100644 --- a/mod/runtime/pkg/service/mocks/basic.mock.go +++ b/mod/runtime/pkg/service/mocks/basic.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/runtime/pkg/service/mocks/registry_option.mock.go b/mod/runtime/pkg/service/mocks/registry_option.mock.go index c861cdc5a2..530e656459 100644 --- a/mod/runtime/pkg/service/mocks/registry_option.mock.go +++ b/mod/runtime/pkg/service/mocks/registry_option.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/storage/pkg/interfaces/mocks/db.mock.go b/mod/storage/pkg/interfaces/mocks/db.mock.go index b40393d0f7..7ffc71a9e1 100644 --- a/mod/storage/pkg/interfaces/mocks/db.mock.go +++ b/mod/storage/pkg/interfaces/mocks/db.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/storage/pkg/pruner/mocks/beacon_block.mock.go b/mod/storage/pkg/pruner/mocks/beacon_block.mock.go index a3e48326b4..14c7a66d22 100644 --- a/mod/storage/pkg/pruner/mocks/beacon_block.mock.go +++ b/mod/storage/pkg/pruner/mocks/beacon_block.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/storage/pkg/pruner/mocks/block_event.mock.go b/mod/storage/pkg/pruner/mocks/block_event.mock.go index 07e11d5d3d..a08e70cc18 100644 --- a/mod/storage/pkg/pruner/mocks/block_event.mock.go +++ b/mod/storage/pkg/pruner/mocks/block_event.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/storage/pkg/pruner/mocks/prunable.mock.go b/mod/storage/pkg/pruner/mocks/prunable.mock.go index bd620f6ced..5958e29fc4 100644 --- a/mod/storage/pkg/pruner/mocks/prunable.mock.go +++ b/mod/storage/pkg/pruner/mocks/prunable.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks diff --git a/mod/storage/pkg/pruner/mocks/pruner.mock.go b/mod/storage/pkg/pruner/mocks/pruner.mock.go index 2bca80cc5b..cb882d94f3 100644 --- a/mod/storage/pkg/pruner/mocks/pruner.mock.go +++ b/mod/storage/pkg/pruner/mocks/pruner.mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.44.1. DO NOT EDIT. package mocks From 964f80792c805e4dd2fa7a6aaf6d3e80abef0b5c Mon Sep 17 00:00:00 2001 From: ocnc-two Date: Fri, 2 Aug 2024 20:11:24 -0400 Subject: [PATCH 2/2] merge conflicts --- mod/node-core/pkg/components/attributes_factory.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mod/node-core/pkg/components/attributes_factory.go b/mod/node-core/pkg/components/attributes_factory.go index 240ae24c07..4cb2d020d6 100644 --- a/mod/node-core/pkg/components/attributes_factory.go +++ b/mod/node-core/pkg/components/attributes_factory.go @@ -31,10 +31,9 @@ import ( type AttributesFactoryInput struct { depinject.In - ChainSpec common.ChainSpec - Config *config.Config - Logger log.Logger[any] - StateProcessor *StateProcessor + ChainSpec common.ChainSpec + Config *config.Config + Logger log.Logger[any] } // ProvideAttributesFactory provides an AttributesFactory for the client. @@ -46,7 +45,6 @@ func ProvideAttributesFactory( *PayloadAttributes, *Withdrawal, ]( - in.StateProcessor, in.ChainSpec, in.Logger, in.Config.PayloadBuilder.SuggestedFeeRecipient,