From 69af02c7117db841626f6e290810346432c461ed Mon Sep 17 00:00:00 2001
From: aBear <abear@berachain.com>
Date: Sat, 28 Sep 2024 18:08:57 +0200
Subject: [PATCH] run make generate-check

---
 .../mocks/blobs_bundle.mock.go                |  2 +-
 .../mocks/built_execution_payload_env.mock.go | 16 ++--
 .../mocks/payload_attributer.mock.go          |  2 +-
 .../backend/mocks/availability_store.mock.go  | 12 +--
 .../backend/mocks/beacon_block_header.mock.go | 28 +++----
 .../backend/mocks/beacon_state.mock.go        | 74 ++++++++++---------
 .../backend/mocks/block_store.mock.go         | 14 ++--
 .../backend/mocks/deposit_store.mock.go       | 14 ++--
 mod/node-api/backend/mocks/node.mock.go       | 10 +--
 .../backend/mocks/state_processor.mock.go     | 10 +--
 .../backend/mocks/storage_backend.mock.go     | 16 ++--
 mod/node-api/backend/mocks/validator.mock.go  |  2 +-
 mod/node-api/backend/mocks/withdrawal.mock.go | 10 +--
 .../mocks/withdrawal_credentials.mock.go      |  2 +-
 .../pkg/services/registry/mocks/basic.mock.go |  2 +-
 .../registry/mocks/dispatcher.mock.go         |  2 +-
 .../registry/mocks/registry_option.mock.go    |  2 +-
 .../pkg/crypto/mocks/bls_signer.mock.go       | 49 ++++++------
 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 +-
 23 files changed, 137 insertions(+), 140 deletions(-)

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 78e3c2842c..b6479d42c9 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.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 a4bf840c76..72872323c1 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
@@ -10,11 +10,11 @@ import (
 )
 
 // BuiltExecutionPayloadEnv is an autogenerated mock type for the BuiltExecutionPayloadEnv type
-type BuiltExecutionPayloadEnv[ExecutionPayloadT interface{}] struct {
+type BuiltExecutionPayloadEnv[ExecutionPayloadT any] struct {
 	mock.Mock
 }
 
-type BuiltExecutionPayloadEnv_Expecter[ExecutionPayloadT interface{}] struct {
+type BuiltExecutionPayloadEnv_Expecter[ExecutionPayloadT any] struct {
 	mock *mock.Mock
 }
 
@@ -43,7 +43,7 @@ func (_m *BuiltExecutionPayloadEnv[ExecutionPayloadT]) GetBlobsBundle() enginepr
 }
 
 // BuiltExecutionPayloadEnv_GetBlobsBundle_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetBlobsBundle'
-type BuiltExecutionPayloadEnv_GetBlobsBundle_Call[ExecutionPayloadT interface{}] struct {
+type BuiltExecutionPayloadEnv_GetBlobsBundle_Call[ExecutionPayloadT any] struct {
 	*mock.Call
 }
 
@@ -88,7 +88,7 @@ func (_m *BuiltExecutionPayloadEnv[ExecutionPayloadT]) GetExecutionPayload() Exe
 }
 
 // BuiltExecutionPayloadEnv_GetExecutionPayload_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetExecutionPayload'
-type BuiltExecutionPayloadEnv_GetExecutionPayload_Call[ExecutionPayloadT interface{}] struct {
+type BuiltExecutionPayloadEnv_GetExecutionPayload_Call[ExecutionPayloadT any] struct {
 	*mock.Call
 }
 
@@ -135,7 +135,7 @@ func (_m *BuiltExecutionPayloadEnv[ExecutionPayloadT]) GetValue() *uint256.Int {
 }
 
 // BuiltExecutionPayloadEnv_GetValue_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetValue'
-type BuiltExecutionPayloadEnv_GetValue_Call[ExecutionPayloadT interface{}] struct {
+type BuiltExecutionPayloadEnv_GetValue_Call[ExecutionPayloadT any] struct {
 	*mock.Call
 }
 
@@ -180,7 +180,7 @@ func (_m *BuiltExecutionPayloadEnv[ExecutionPayloadT]) ShouldOverrideBuilder() b
 }
 
 // BuiltExecutionPayloadEnv_ShouldOverrideBuilder_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ShouldOverrideBuilder'
-type BuiltExecutionPayloadEnv_ShouldOverrideBuilder_Call[ExecutionPayloadT interface{}] struct {
+type BuiltExecutionPayloadEnv_ShouldOverrideBuilder_Call[ExecutionPayloadT any] struct {
 	*mock.Call
 }
 
@@ -208,7 +208,7 @@ func (_c *BuiltExecutionPayloadEnv_ShouldOverrideBuilder_Call[ExecutionPayloadT]
 
 // NewBuiltExecutionPayloadEnv creates a new instance of BuiltExecutionPayloadEnv. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewBuiltExecutionPayloadEnv[ExecutionPayloadT interface{}](t interface {
+func NewBuiltExecutionPayloadEnv[ExecutionPayloadT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *BuiltExecutionPayloadEnv[ExecutionPayloadT] {
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 c5e83780a5..7643d0ea2e 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.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 2051739353..9d06105727 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
@@ -10,11 +10,11 @@ import (
 )
 
 // AvailabilityStore is an autogenerated mock type for the AvailabilityStore type
-type AvailabilityStore[BeaconBlockBodyT interface{}, BlobSidecarsT interface{}] struct {
+type AvailabilityStore[BeaconBlockBodyT any, BlobSidecarsT any] struct {
 	mock.Mock
 }
 
-type AvailabilityStore_Expecter[BeaconBlockBodyT interface{}, BlobSidecarsT interface{}] struct {
+type AvailabilityStore_Expecter[BeaconBlockBodyT any, BlobSidecarsT any] struct {
 	mock *mock.Mock
 }
 
@@ -41,7 +41,7 @@ func (_m *AvailabilityStore[BeaconBlockBodyT, BlobSidecarsT]) IsDataAvailable(_a
 }
 
 // AvailabilityStore_IsDataAvailable_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'IsDataAvailable'
-type AvailabilityStore_IsDataAvailable_Call[BeaconBlockBodyT interface{}, BlobSidecarsT interface{}] struct {
+type AvailabilityStore_IsDataAvailable_Call[BeaconBlockBodyT any, BlobSidecarsT any] struct {
 	*mock.Call
 }
 
@@ -89,7 +89,7 @@ func (_m *AvailabilityStore[BeaconBlockBodyT, BlobSidecarsT]) Persist(_a0 math.U
 }
 
 // AvailabilityStore_Persist_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Persist'
-type AvailabilityStore_Persist_Call[BeaconBlockBodyT interface{}, BlobSidecarsT interface{}] struct {
+type AvailabilityStore_Persist_Call[BeaconBlockBodyT any, BlobSidecarsT any] struct {
 	*mock.Call
 }
 
@@ -119,7 +119,7 @@ func (_c *AvailabilityStore_Persist_Call[BeaconBlockBodyT, BlobSidecarsT]) RunAn
 
 // NewAvailabilityStore creates a new instance of AvailabilityStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewAvailabilityStore[BeaconBlockBodyT interface{}, BlobSidecarsT interface{}](t interface {
+func NewAvailabilityStore[BeaconBlockBodyT any, BlobSidecarsT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *AvailabilityStore[BeaconBlockBodyT, BlobSidecarsT] {
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 54fa2c164f..d653d99f61 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
@@ -10,11 +10,11 @@ import (
 )
 
 // BeaconBlockHeader is an autogenerated mock type for the BeaconBlockHeader type
-type BeaconBlockHeader[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader[BeaconBlockHeaderT any] struct {
 	mock.Mock
 }
 
-type BeaconBlockHeader_Expecter[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_Expecter[BeaconBlockHeaderT any] struct {
 	mock *mock.Mock
 }
 
@@ -43,7 +43,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) GetBodyRoot() common.Root {
 }
 
 // BeaconBlockHeader_GetBodyRoot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetBodyRoot'
-type BeaconBlockHeader_GetBodyRoot_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_GetBodyRoot_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -90,7 +90,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) GetParentBlockRoot() common.Roo
 }
 
 // BeaconBlockHeader_GetParentBlockRoot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetParentBlockRoot'
-type BeaconBlockHeader_GetParentBlockRoot_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_GetParentBlockRoot_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -135,7 +135,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) GetProposerIndex() math.U64 {
 }
 
 // BeaconBlockHeader_GetProposerIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetProposerIndex'
-type BeaconBlockHeader_GetProposerIndex_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_GetProposerIndex_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -180,7 +180,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) GetSlot() math.U64 {
 }
 
 // BeaconBlockHeader_GetSlot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSlot'
-type BeaconBlockHeader_GetSlot_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_GetSlot_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -227,7 +227,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) GetStateRoot() common.Root {
 }
 
 // BeaconBlockHeader_GetStateRoot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetStateRoot'
-type BeaconBlockHeader_GetStateRoot_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_GetStateRoot_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -274,7 +274,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) HashTreeRoot() common.Root {
 }
 
 // BeaconBlockHeader_HashTreeRoot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'HashTreeRoot'
-type BeaconBlockHeader_HashTreeRoot_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_HashTreeRoot_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -331,7 +331,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) MarshalSSZ() ([]byte, error) {
 }
 
 // BeaconBlockHeader_MarshalSSZ_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'MarshalSSZ'
-type BeaconBlockHeader_MarshalSSZ_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_MarshalSSZ_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -376,7 +376,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) New(slot math.U64, proposerInde
 }
 
 // BeaconBlockHeader_New_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'New'
-type BeaconBlockHeader_New_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_New_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -413,7 +413,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) SetStateRoot(_a0 common.Root) {
 }
 
 // BeaconBlockHeader_SetStateRoot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetStateRoot'
-type BeaconBlockHeader_SetStateRoot_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_SetStateRoot_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -459,7 +459,7 @@ func (_m *BeaconBlockHeader[BeaconBlockHeaderT]) UnmarshalSSZ(_a0 []byte) error
 }
 
 // BeaconBlockHeader_UnmarshalSSZ_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UnmarshalSSZ'
-type BeaconBlockHeader_UnmarshalSSZ_Call[BeaconBlockHeaderT interface{}] struct {
+type BeaconBlockHeader_UnmarshalSSZ_Call[BeaconBlockHeaderT any] struct {
 	*mock.Call
 }
 
@@ -488,7 +488,7 @@ func (_c *BeaconBlockHeader_UnmarshalSSZ_Call[BeaconBlockHeaderT]) RunAndReturn(
 
 // NewBeaconBlockHeader creates a new instance of BeaconBlockHeader. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewBeaconBlockHeader[BeaconBlockHeaderT interface{}](t interface {
+func NewBeaconBlockHeader[BeaconBlockHeaderT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *BeaconBlockHeader[BeaconBlockHeaderT] {
diff --git a/mod/node-api/backend/mocks/beacon_state.mock.go b/mod/node-api/backend/mocks/beacon_state.mock.go
index 8d54a59f20..8e83c1802c 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
@@ -6,17 +6,19 @@ import (
 	bytes "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes"
 	common "github.com/berachain/beacon-kit/mod/primitives/pkg/common"
 
+	crypto "github.com/berachain/beacon-kit/mod/primitives/pkg/crypto"
+
 	math "github.com/berachain/beacon-kit/mod/primitives/pkg/math"
 
 	mock "github.com/stretchr/testify/mock"
 )
 
 // BeaconState is an autogenerated mock type for the BeaconState type
-type BeaconState[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	mock.Mock
 }
 
-type BeaconState_Expecter[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_Expecter[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	mock *mock.Mock
 }
 
@@ -55,7 +57,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_ExpectedWithdrawals_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ExpectedWithdrawals'
-type BeaconState_ExpectedWithdrawals_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_ExpectedWithdrawals_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -110,7 +112,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetBalance_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetBalance'
-type BeaconState_GetBalance_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetBalance_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -168,7 +170,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetBlockRootAtIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetBlockRootAtIndex'
-type BeaconState_GetBlockRootAtIndex_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetBlockRootAtIndex_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -224,7 +226,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetEth1Data_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetEth1Data'
-type BeaconState_GetEth1Data_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetEth1Data_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -279,7 +281,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetEth1DepositIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetEth1DepositIndex'
-type BeaconState_GetEth1DepositIndex_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetEth1DepositIndex_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -334,7 +336,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetFork_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetFork'
-type BeaconState_GetFork_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetFork_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -391,7 +393,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetGenesisValidatorsRoot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetGenesisValidatorsRoot'
-type BeaconState_GetGenesisValidatorsRoot_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetGenesisValidatorsRoot_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -446,7 +448,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetLatestBlockHeader_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetLatestBlockHeader'
-type BeaconState_GetLatestBlockHeader_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetLatestBlockHeader_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -501,7 +503,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetLatestExecutionPayloadHeader_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetLatestExecutionPayloadHeader'
-type BeaconState_GetLatestExecutionPayloadHeader_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetLatestExecutionPayloadHeader_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -556,7 +558,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetNextWithdrawalIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetNextWithdrawalIndex'
-type BeaconState_GetNextWithdrawalIndex_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetNextWithdrawalIndex_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -611,7 +613,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetNextWithdrawalValidatorIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetNextWithdrawalValidatorIndex'
-type BeaconState_GetNextWithdrawalValidatorIndex_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetNextWithdrawalValidatorIndex_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -668,7 +670,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetRandaoMixAtIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetRandaoMixAtIndex'
-type BeaconState_GetRandaoMixAtIndex_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetRandaoMixAtIndex_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -724,7 +726,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetSlashingAtIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSlashingAtIndex'
-type BeaconState_GetSlashingAtIndex_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetSlashingAtIndex_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -780,7 +782,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetSlot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSlot'
-type BeaconState_GetSlot_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetSlot_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -835,7 +837,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetTotalActiveBalances_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTotalActiveBalances'
-type BeaconState_GetTotalActiveBalances_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetTotalActiveBalances_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -891,7 +893,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetTotalSlashing_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTotalSlashing'
-type BeaconState_GetTotalSlashing_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetTotalSlashing_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -946,7 +948,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetTotalValidators_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetTotalValidators'
-type BeaconState_GetTotalValidators_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetTotalValidators_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -1001,7 +1003,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetValidators_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetValidators'
-type BeaconState_GetValidators_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetValidators_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -1058,7 +1060,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_GetValidatorsByEffectiveBalance_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetValidatorsByEffectiveBalance'
-type BeaconState_GetValidatorsByEffectiveBalance_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_GetValidatorsByEffectiveBalance_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -1103,7 +1105,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_SetSlot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetSlot'
-type BeaconState_SetSlot_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_SetSlot_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -1161,7 +1163,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_StateRootAtIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'StateRootAtIndex'
-type BeaconState_StateRootAtIndex_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_StateRootAtIndex_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -1217,7 +1219,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_ValidatorByIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ValidatorByIndex'
-type BeaconState_ValidatorByIndex_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_ValidatorByIndex_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -1273,7 +1275,7 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_ValidatorIndexByCometBFTAddress_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ValidatorIndexByCometBFTAddress'
-type BeaconState_ValidatorIndexByCometBFTAddress_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_ValidatorIndexByCometBFTAddress_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
@@ -1301,7 +1303,7 @@ func (_c *BeaconState_ValidatorIndexByCometBFTAddress_Call[BeaconBlockHeaderT, E
 }
 
 // ValidatorIndexByPubkey provides a mock function with given fields: _a0
-func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT]) ValidatorIndexByPubkey(_a0 bytes.B48) (math.U64, error) {
+func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT]) ValidatorIndexByPubkey(_a0 crypto.BLSPubkey) (math.U64, error) {
 	ret := _m.Called(_a0)
 
 	if len(ret) == 0 {
@@ -1310,16 +1312,16 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 
 	var r0 math.U64
 	var r1 error
-	if rf, ok := ret.Get(0).(func(bytes.B48) (math.U64, error)); ok {
+	if rf, ok := ret.Get(0).(func(crypto.BLSPubkey) (math.U64, error)); ok {
 		return rf(_a0)
 	}
-	if rf, ok := ret.Get(0).(func(bytes.B48) math.U64); ok {
+	if rf, ok := ret.Get(0).(func(crypto.BLSPubkey) math.U64); ok {
 		r0 = rf(_a0)
 	} else {
 		r0 = ret.Get(0).(math.U64)
 	}
 
-	if rf, ok := ret.Get(1).(func(bytes.B48) error); ok {
+	if rf, ok := ret.Get(1).(func(crypto.BLSPubkey) error); ok {
 		r1 = rf(_a0)
 	} else {
 		r1 = ret.Error(1)
@@ -1329,19 +1331,19 @@ func (_m *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, Fo
 }
 
 // BeaconState_ValidatorIndexByPubkey_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ValidatorIndexByPubkey'
-type BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}] struct {
+type BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any] struct {
 	*mock.Call
 }
 
 // ValidatorIndexByPubkey is a helper method to define mock.On call
-//   - _a0 bytes.B48
+//   - _a0 crypto.BLSPubkey
 func (_e *BeaconState_Expecter[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT]) ValidatorIndexByPubkey(_a0 interface{}) *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT] {
 	return &BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT]{Call: _e.mock.On("ValidatorIndexByPubkey", _a0)}
 }
 
-func (_c *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT]) Run(run func(_a0 bytes.B48)) *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT] {
+func (_c *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT]) Run(run func(_a0 crypto.BLSPubkey)) *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT] {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(bytes.B48))
+		run(args[0].(crypto.BLSPubkey))
 	})
 	return _c
 }
@@ -1351,14 +1353,14 @@ func (_c *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT,
 	return _c
 }
 
-func (_c *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT]) RunAndReturn(run func(bytes.B48) (math.U64, error)) *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT] {
+func (_c *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT]) RunAndReturn(run func(crypto.BLSPubkey) (math.U64, error)) *BeaconState_ValidatorIndexByPubkey_Call[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT] {
 	_c.Call.Return(run)
 	return _c
 }
 
 // NewBeaconState creates a new instance of BeaconState. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewBeaconState[BeaconBlockHeaderT interface{}, Eth1DataT interface{}, ExecutionPayloadHeaderT interface{}, ForkT interface{}, ValidatorT interface{}, ValidatorsT interface{}, WithdrawalT interface{}](t interface {
+func NewBeaconState[BeaconBlockHeaderT any, Eth1DataT any, ExecutionPayloadHeaderT any, ForkT any, ValidatorT any, ValidatorsT any, WithdrawalT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *BeaconState[BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT, ForkT, ValidatorT, ValidatorsT, WithdrawalT] {
diff --git a/mod/node-api/backend/mocks/block_store.mock.go b/mod/node-api/backend/mocks/block_store.mock.go
index 1a0bf79276..54697e55ed 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
@@ -10,11 +10,11 @@ import (
 )
 
 // BlockStore is an autogenerated mock type for the BlockStore type
-type BlockStore[BeaconBlockT interface{}] struct {
+type BlockStore[BeaconBlockT any] struct {
 	mock.Mock
 }
 
-type BlockStore_Expecter[BeaconBlockT interface{}] struct {
+type BlockStore_Expecter[BeaconBlockT any] struct {
 	mock *mock.Mock
 }
 
@@ -51,7 +51,7 @@ func (_m *BlockStore[BeaconBlockT]) GetSlotByBlockRoot(root common.Root) (math.U
 }
 
 // BlockStore_GetSlotByBlockRoot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSlotByBlockRoot'
-type BlockStore_GetSlotByBlockRoot_Call[BeaconBlockT interface{}] struct {
+type BlockStore_GetSlotByBlockRoot_Call[BeaconBlockT any] struct {
 	*mock.Call
 }
 
@@ -107,7 +107,7 @@ func (_m *BlockStore[BeaconBlockT]) GetSlotByExecutionNumber(executionNumber mat
 }
 
 // BlockStore_GetSlotByExecutionNumber_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSlotByExecutionNumber'
-type BlockStore_GetSlotByExecutionNumber_Call[BeaconBlockT interface{}] struct {
+type BlockStore_GetSlotByExecutionNumber_Call[BeaconBlockT any] struct {
 	*mock.Call
 }
 
@@ -163,7 +163,7 @@ func (_m *BlockStore[BeaconBlockT]) GetSlotByStateRoot(root common.Root) (math.U
 }
 
 // BlockStore_GetSlotByStateRoot_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSlotByStateRoot'
-type BlockStore_GetSlotByStateRoot_Call[BeaconBlockT interface{}] struct {
+type BlockStore_GetSlotByStateRoot_Call[BeaconBlockT any] struct {
 	*mock.Call
 }
 
@@ -192,7 +192,7 @@ func (_c *BlockStore_GetSlotByStateRoot_Call[BeaconBlockT]) RunAndReturn(run fun
 
 // NewBlockStore creates a new instance of BlockStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewBlockStore[BeaconBlockT interface{}](t interface {
+func NewBlockStore[BeaconBlockT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *BlockStore[BeaconBlockT] {
diff --git a/mod/node-api/backend/mocks/deposit_store.mock.go b/mod/node-api/backend/mocks/deposit_store.mock.go
index f97ccda70d..b58d3f343f 100644
--- a/mod/node-api/backend/mocks/deposit_store.mock.go
+++ b/mod/node-api/backend/mocks/deposit_store.mock.go
@@ -1,15 +1,15 @@
-// Code generated by mockery v2.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
 import mock "github.com/stretchr/testify/mock"
 
 // DepositStore is an autogenerated mock type for the DepositStore type
-type DepositStore[DepositT interface{}] struct {
+type DepositStore[DepositT any] struct {
 	mock.Mock
 }
 
-type DepositStore_Expecter[DepositT interface{}] struct {
+type DepositStore_Expecter[DepositT any] struct {
 	mock *mock.Mock
 }
 
@@ -36,7 +36,7 @@ func (_m *DepositStore[DepositT]) EnqueueDeposits(deposits []DepositT) error {
 }
 
 // DepositStore_EnqueueDeposits_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'EnqueueDeposits'
-type DepositStore_EnqueueDeposits_Call[DepositT interface{}] struct {
+type DepositStore_EnqueueDeposits_Call[DepositT any] struct {
 	*mock.Call
 }
 
@@ -94,7 +94,7 @@ func (_m *DepositStore[DepositT]) GetDepositsByIndex(startIndex uint64, numView
 }
 
 // DepositStore_GetDepositsByIndex_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetDepositsByIndex'
-type DepositStore_GetDepositsByIndex_Call[DepositT interface{}] struct {
+type DepositStore_GetDepositsByIndex_Call[DepositT any] struct {
 	*mock.Call
 }
 
@@ -141,7 +141,7 @@ func (_m *DepositStore[DepositT]) Prune(start uint64, end uint64) error {
 }
 
 // DepositStore_Prune_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Prune'
-type DepositStore_Prune_Call[DepositT interface{}] struct {
+type DepositStore_Prune_Call[DepositT any] struct {
 	*mock.Call
 }
 
@@ -171,7 +171,7 @@ func (_c *DepositStore_Prune_Call[DepositT]) RunAndReturn(run func(uint64, uint6
 
 // NewDepositStore creates a new instance of DepositStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewDepositStore[DepositT interface{}](t interface {
+func NewDepositStore[DepositT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *DepositStore[DepositT] {
diff --git a/mod/node-api/backend/mocks/node.mock.go b/mod/node-api/backend/mocks/node.mock.go
index 9ef028b2b2..d1b4f47f38 100644
--- a/mod/node-api/backend/mocks/node.mock.go
+++ b/mod/node-api/backend/mocks/node.mock.go
@@ -1,15 +1,15 @@
-// Code generated by mockery v2.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
 import mock "github.com/stretchr/testify/mock"
 
 // Node is an autogenerated mock type for the Node type
-type Node[ContextT interface{}] struct {
+type Node[ContextT any] struct {
 	mock.Mock
 }
 
-type Node_Expecter[ContextT interface{}] struct {
+type Node_Expecter[ContextT any] struct {
 	mock *mock.Mock
 }
 
@@ -46,7 +46,7 @@ func (_m *Node[ContextT]) CreateQueryContext(height int64, prove bool) (ContextT
 }
 
 // Node_CreateQueryContext_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateQueryContext'
-type Node_CreateQueryContext_Call[ContextT interface{}] struct {
+type Node_CreateQueryContext_Call[ContextT any] struct {
 	*mock.Call
 }
 
@@ -76,7 +76,7 @@ func (_c *Node_CreateQueryContext_Call[ContextT]) RunAndReturn(run func(int64, b
 
 // NewNode creates a new instance of Node. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewNode[ContextT interface{}](t interface {
+func NewNode[ContextT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *Node[ContextT] {
diff --git a/mod/node-api/backend/mocks/state_processor.mock.go b/mod/node-api/backend/mocks/state_processor.mock.go
index 5c309f9ba7..ed2421ae1a 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
@@ -10,11 +10,11 @@ import (
 )
 
 // StateProcessor is an autogenerated mock type for the StateProcessor type
-type StateProcessor[BeaconStateT interface{}] struct {
+type StateProcessor[BeaconStateT any] struct {
 	mock.Mock
 }
 
-type StateProcessor_Expecter[BeaconStateT interface{}] struct {
+type StateProcessor_Expecter[BeaconStateT any] struct {
 	mock *mock.Mock
 }
 
@@ -53,7 +53,7 @@ func (_m *StateProcessor[BeaconStateT]) ProcessSlots(_a0 BeaconStateT, _a1 math.
 }
 
 // StateProcessor_ProcessSlots_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ProcessSlots'
-type StateProcessor_ProcessSlots_Call[BeaconStateT interface{}] struct {
+type StateProcessor_ProcessSlots_Call[BeaconStateT any] struct {
 	*mock.Call
 }
 
@@ -83,7 +83,7 @@ func (_c *StateProcessor_ProcessSlots_Call[BeaconStateT]) RunAndReturn(run func(
 
 // NewStateProcessor creates a new instance of StateProcessor. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewStateProcessor[BeaconStateT interface{}](t interface {
+func NewStateProcessor[BeaconStateT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *StateProcessor[BeaconStateT] {
diff --git a/mod/node-api/backend/mocks/storage_backend.mock.go b/mod/node-api/backend/mocks/storage_backend.mock.go
index 25960c5e1a..7d36ea8b5c 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
@@ -9,11 +9,11 @@ import (
 )
 
 // StorageBackend is an autogenerated mock type for the StorageBackend type
-type StorageBackend[AvailabilityStoreT interface{}, BeaconStateT interface{}, BlockStoreT interface{}, DepositStoreT interface{}] struct {
+type StorageBackend[AvailabilityStoreT any, BeaconStateT any, BlockStoreT any, DepositStoreT any] struct {
 	mock.Mock
 }
 
-type StorageBackend_Expecter[AvailabilityStoreT interface{}, BeaconStateT interface{}, BlockStoreT interface{}, DepositStoreT interface{}] struct {
+type StorageBackend_Expecter[AvailabilityStoreT any, BeaconStateT any, BlockStoreT any, DepositStoreT any] struct {
 	mock *mock.Mock
 }
 
@@ -40,7 +40,7 @@ func (_m *StorageBackend[AvailabilityStoreT, BeaconStateT, BlockStoreT, DepositS
 }
 
 // StorageBackend_AvailabilityStore_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'AvailabilityStore'
-type StorageBackend_AvailabilityStore_Call[AvailabilityStoreT interface{}, BeaconStateT interface{}, BlockStoreT interface{}, DepositStoreT interface{}] struct {
+type StorageBackend_AvailabilityStore_Call[AvailabilityStoreT any, BeaconStateT any, BlockStoreT any, DepositStoreT any] struct {
 	*mock.Call
 }
 
@@ -85,7 +85,7 @@ func (_m *StorageBackend[AvailabilityStoreT, BeaconStateT, BlockStoreT, DepositS
 }
 
 // StorageBackend_BlockStore_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'BlockStore'
-type StorageBackend_BlockStore_Call[AvailabilityStoreT interface{}, BeaconStateT interface{}, BlockStoreT interface{}, DepositStoreT interface{}] struct {
+type StorageBackend_BlockStore_Call[AvailabilityStoreT any, BeaconStateT any, BlockStoreT any, DepositStoreT any] struct {
 	*mock.Call
 }
 
@@ -130,7 +130,7 @@ func (_m *StorageBackend[AvailabilityStoreT, BeaconStateT, BlockStoreT, DepositS
 }
 
 // StorageBackend_DepositStore_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DepositStore'
-type StorageBackend_DepositStore_Call[AvailabilityStoreT interface{}, BeaconStateT interface{}, BlockStoreT interface{}, DepositStoreT interface{}] struct {
+type StorageBackend_DepositStore_Call[AvailabilityStoreT any, BeaconStateT any, BlockStoreT any, DepositStoreT any] struct {
 	*mock.Call
 }
 
@@ -175,7 +175,7 @@ func (_m *StorageBackend[AvailabilityStoreT, BeaconStateT, BlockStoreT, DepositS
 }
 
 // StorageBackend_StateFromContext_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'StateFromContext'
-type StorageBackend_StateFromContext_Call[AvailabilityStoreT interface{}, BeaconStateT interface{}, BlockStoreT interface{}, DepositStoreT interface{}] struct {
+type StorageBackend_StateFromContext_Call[AvailabilityStoreT any, BeaconStateT any, BlockStoreT any, DepositStoreT any] struct {
 	*mock.Call
 }
 
@@ -204,7 +204,7 @@ func (_c *StorageBackend_StateFromContext_Call[AvailabilityStoreT, BeaconStateT,
 
 // NewStorageBackend creates a new instance of StorageBackend. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewStorageBackend[AvailabilityStoreT interface{}, BeaconStateT interface{}, BlockStoreT interface{}, DepositStoreT interface{}](t interface {
+func NewStorageBackend[AvailabilityStoreT any, BeaconStateT any, BlockStoreT any, DepositStoreT any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *StorageBackend[AvailabilityStoreT, BeaconStateT, BlockStoreT, DepositStoreT] {
diff --git a/mod/node-api/backend/mocks/validator.mock.go b/mod/node-api/backend/mocks/validator.mock.go
index 8370f9cbdf..06f9856b18 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.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 40cf79a8e9..76f6fc1f08 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
@@ -10,11 +10,11 @@ import (
 )
 
 // Withdrawal is an autogenerated mock type for the Withdrawal type
-type Withdrawal[T interface{}] struct {
+type Withdrawal[T any] struct {
 	mock.Mock
 }
 
-type Withdrawal_Expecter[T interface{}] struct {
+type Withdrawal_Expecter[T any] struct {
 	mock *mock.Mock
 }
 
@@ -41,7 +41,7 @@ func (_m *Withdrawal[T]) New(index math.U64, validator math.U64, address common.
 }
 
 // Withdrawal_New_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'New'
-type Withdrawal_New_Call[T interface{}] struct {
+type Withdrawal_New_Call[T any] struct {
 	*mock.Call
 }
 
@@ -73,7 +73,7 @@ func (_c *Withdrawal_New_Call[T]) RunAndReturn(run func(math.U64, math.U64, comm
 
 // NewWithdrawal creates a new instance of Withdrawal. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewWithdrawal[T interface{}](t interface {
+func NewWithdrawal[T any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *Withdrawal[T] {
diff --git a/mod/node-api/backend/mocks/withdrawal_credentials.mock.go b/mod/node-api/backend/mocks/withdrawal_credentials.mock.go
index 37f2878eb2..2d3cd746cf 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-core/pkg/services/registry/mocks/basic.mock.go b/mod/node-core/pkg/services/registry/mocks/basic.mock.go
index 7f32af9bba..3e0d760b88 100644
--- a/mod/node-core/pkg/services/registry/mocks/basic.mock.go
+++ b/mod/node-core/pkg/services/registry/mocks/basic.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-core/pkg/services/registry/mocks/dispatcher.mock.go b/mod/node-core/pkg/services/registry/mocks/dispatcher.mock.go
index 8f70a0eaff..bdead0d532 100644
--- a/mod/node-core/pkg/services/registry/mocks/dispatcher.mock.go
+++ b/mod/node-core/pkg/services/registry/mocks/dispatcher.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/node-core/pkg/services/registry/mocks/registry_option.mock.go b/mod/node-core/pkg/services/registry/mocks/registry_option.mock.go
index 46a65b41c2..565e8021e8 100644
--- a/mod/node-core/pkg/services/registry/mocks/registry_option.mock.go
+++ b/mod/node-core/pkg/services/registry/mocks/registry_option.mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
diff --git a/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go b/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go
index cf5f5026cf..149525b88f 100644
--- a/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go
+++ b/mod/primitives/pkg/crypto/mocks/bls_signer.mock.go
@@ -1,10 +1,9 @@
-// Code generated by mockery v2.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks
 
 import (
-	bytes "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes"
-
+	crypto "github.com/berachain/beacon-kit/mod/primitives/pkg/crypto"
 	mock "github.com/stretchr/testify/mock"
 )
 
@@ -22,20 +21,18 @@ func (_m *BLSSigner) EXPECT() *BLSSigner_Expecter {
 }
 
 // PublicKey provides a mock function with given fields:
-func (_m *BLSSigner) PublicKey() bytes.B48 {
+func (_m *BLSSigner) PublicKey() crypto.BLSPubkey {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
 		panic("no return value specified for PublicKey")
 	}
 
-	var r0 bytes.B48
-	if rf, ok := ret.Get(0).(func() bytes.B48); ok {
+	var r0 crypto.BLSPubkey
+	if rf, ok := ret.Get(0).(func() crypto.BLSPubkey); ok {
 		r0 = rf()
 	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(bytes.B48)
-		}
+		r0 = ret.Get(0).(crypto.BLSPubkey)
 	}
 
 	return r0
@@ -58,35 +55,33 @@ func (_c *BLSSigner_PublicKey_Call) Run(run func()) *BLSSigner_PublicKey_Call {
 	return _c
 }
 
-func (_c *BLSSigner_PublicKey_Call) Return(_a0 bytes.B48) *BLSSigner_PublicKey_Call {
+func (_c *BLSSigner_PublicKey_Call) Return(_a0 crypto.BLSPubkey) *BLSSigner_PublicKey_Call {
 	_c.Call.Return(_a0)
 	return _c
 }
 
-func (_c *BLSSigner_PublicKey_Call) RunAndReturn(run func() bytes.B48) *BLSSigner_PublicKey_Call {
+func (_c *BLSSigner_PublicKey_Call) RunAndReturn(run func() crypto.BLSPubkey) *BLSSigner_PublicKey_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // Sign provides a mock function with given fields: _a0
-func (_m *BLSSigner) Sign(_a0 []byte) (bytes.B96, error) {
+func (_m *BLSSigner) Sign(_a0 []byte) (crypto.BLSSignature, error) {
 	ret := _m.Called(_a0)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Sign")
 	}
 
-	var r0 bytes.B96
+	var r0 crypto.BLSSignature
 	var r1 error
-	if rf, ok := ret.Get(0).(func([]byte) (bytes.B96, error)); ok {
+	if rf, ok := ret.Get(0).(func([]byte) (crypto.BLSSignature, error)); ok {
 		return rf(_a0)
 	}
-	if rf, ok := ret.Get(0).(func([]byte) bytes.B96); ok {
+	if rf, ok := ret.Get(0).(func([]byte) crypto.BLSSignature); ok {
 		r0 = rf(_a0)
 	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(bytes.B96)
-		}
+		r0 = ret.Get(0).(crypto.BLSSignature)
 	}
 
 	if rf, ok := ret.Get(1).(func([]byte) error); ok {
@@ -116,18 +111,18 @@ func (_c *BLSSigner_Sign_Call) Run(run func(_a0 []byte)) *BLSSigner_Sign_Call {
 	return _c
 }
 
-func (_c *BLSSigner_Sign_Call) Return(_a0 bytes.B96, _a1 error) *BLSSigner_Sign_Call {
+func (_c *BLSSigner_Sign_Call) Return(_a0 crypto.BLSSignature, _a1 error) *BLSSigner_Sign_Call {
 	_c.Call.Return(_a0, _a1)
 	return _c
 }
 
-func (_c *BLSSigner_Sign_Call) RunAndReturn(run func([]byte) (bytes.B96, error)) *BLSSigner_Sign_Call {
+func (_c *BLSSigner_Sign_Call) RunAndReturn(run func([]byte) (crypto.BLSSignature, error)) *BLSSigner_Sign_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
 // VerifySignature provides a mock function with given fields: pubKey, msg, signature
-func (_m *BLSSigner) VerifySignature(pubKey bytes.B48, msg []byte, signature bytes.B96) error {
+func (_m *BLSSigner) VerifySignature(pubKey crypto.BLSPubkey, msg []byte, signature crypto.BLSSignature) error {
 	ret := _m.Called(pubKey, msg, signature)
 
 	if len(ret) == 0 {
@@ -135,7 +130,7 @@ func (_m *BLSSigner) VerifySignature(pubKey bytes.B48, msg []byte, signature byt
 	}
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(bytes.B48, []byte, bytes.B96) error); ok {
+	if rf, ok := ret.Get(0).(func(crypto.BLSPubkey, []byte, crypto.BLSSignature) error); ok {
 		r0 = rf(pubKey, msg, signature)
 	} else {
 		r0 = ret.Error(0)
@@ -150,16 +145,16 @@ type BLSSigner_VerifySignature_Call struct {
 }
 
 // VerifySignature is a helper method to define mock.On call
-//   - pubKey bytes.B48
+//   - pubKey crypto.BLSPubkey
 //   - msg []byte
-//   - signature bytes.B96
+//   - signature crypto.BLSSignature
 func (_e *BLSSigner_Expecter) VerifySignature(pubKey interface{}, msg interface{}, signature interface{}) *BLSSigner_VerifySignature_Call {
 	return &BLSSigner_VerifySignature_Call{Call: _e.mock.On("VerifySignature", pubKey, msg, signature)}
 }
 
-func (_c *BLSSigner_VerifySignature_Call) Run(run func(pubKey bytes.B48, msg []byte, signature bytes.B96)) *BLSSigner_VerifySignature_Call {
+func (_c *BLSSigner_VerifySignature_Call) Run(run func(pubKey crypto.BLSPubkey, msg []byte, signature crypto.BLSSignature)) *BLSSigner_VerifySignature_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(bytes.B48), args[1].([]byte), args[2].(bytes.B96))
+		run(args[0].(crypto.BLSPubkey), args[1].([]byte), args[2].(crypto.BLSSignature))
 	})
 	return _c
 }
@@ -169,7 +164,7 @@ func (_c *BLSSigner_VerifySignature_Call) Return(_a0 error) *BLSSigner_VerifySig
 	return _c
 }
 
-func (_c *BLSSigner_VerifySignature_Call) RunAndReturn(run func(bytes.B48, []byte, bytes.B96) error) *BLSSigner_VerifySignature_Call {
+func (_c *BLSSigner_VerifySignature_Call) RunAndReturn(run func(crypto.BLSPubkey, []byte, crypto.BLSSignature) error) *BLSSigner_VerifySignature_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/mod/storage/pkg/interfaces/mocks/db.mock.go b/mod/storage/pkg/interfaces/mocks/db.mock.go
index 9a6a20a1e4..683f7fc14f 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.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 13714fcd7c..4fdea13a1b 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.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 fdbf6511e0..515ac303ef 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.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 ff3e664db7..3116601d8c 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.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 e71297d66f..a437f0fd73 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.46.0. DO NOT EDIT.
+// Code generated by mockery v2.46.1. DO NOT EDIT.
 
 package mocks