From 4985834f09278a7358869b564e26926311837834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartosz=20R=C3=B3=C5=BCa=C5=84ski?= <bartek.roza@gmail.com>
Date: Wed, 20 Sep 2023 17:18:10 +0200
Subject: [PATCH] Bump go.uber.org/mock/mockgen to v0.3.0

---
 Makefile                         |  2 +-
 activation/mocks.go              | 64 +++++++++++++-----------
 activation/nipost_mocks.go       | 18 ++++---
 api/grpcserver/mocks.go          | 44 ++++++++--------
 beacon/mocks.go                  | 32 ++++++------
 beacon/weakcoin/mocks.go         | 14 ++++--
 blocks/mocks/mocks.go            | 22 ++++----
 bootstrap/mocks.go               |  6 ++-
 fetch/mocks/mocks.go             | 16 +++---
 genvm/core/mocks/handler.go      | 22 ++++----
 genvm/core/mocks/template.go     | 22 ++++----
 genvm/core/mocks/updater.go      |  8 ++-
 hare/eligibility/mocks.go        | 12 +++--
 hare/mocks/mocks.go              | 30 ++++++-----
 log/log_mock.go                  | 40 ++++++++-------
 malfeasance/mocks.go             | 12 +++--
 mesh/mocks/mocks.go              | 18 ++++---
 miner/mocks.go                   | 26 ++++++----
 p2p/pubsub/mocks/publisher.go    | 22 ++++----
 p2p/server/mocks/mocks.go        | 14 ++++--
 proposals/mocks.go               | 26 ++++++----
 prune/mocks.go                   |  6 ++-
 syncer/blockssync/mocks.go       |  8 ++-
 syncer/mocks/mocks.go            | 86 +++++++++++++++++---------------
 system/mocks/beacons.go          | 10 ++--
 system/mocks/fetcher.go          | 42 +++++++++-------
 system/mocks/sync.go             | 10 ++--
 system/mocks/tortoise.go         | 20 +++++---
 system/mocks/vm.go               |  6 ++-
 timesync/peersync/mocks/mocks.go |  6 ++-
 txs/txs_mocks.go                 | 28 ++++++-----
 31 files changed, 406 insertions(+), 286 deletions(-)

diff --git a/Makefile b/Makefile
index 2fbfc923ad..ab9e48783d 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ install:
 	go mod download
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.54.2
 	go install github.com/spacemeshos/go-scale/scalegen@v1.1.11
-	go install go.uber.org/mock/mockgen@v0.2.0
+	go install go.uber.org/mock/mockgen@v0.3.0
 	go install gotest.tools/gotestsum@v1.10.1
 	go install honnef.co/go/tools/cmd/staticcheck@v0.4.5
 .PHONY: install
diff --git a/activation/mocks.go b/activation/mocks.go
index 2c907b1b4c..b4e7ac44e9 100644
--- a/activation/mocks.go
+++ b/activation/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=activation -destination=./mocks.go -source=./interface.go
+//
 // Package activation is a generated GoMock package.
 package activation
 
@@ -46,7 +50,7 @@ func (m *MockAtxReceiver) OnAtx(arg0 *types.ActivationTxHeader) {
 }
 
 // OnAtx indicates an expected call of OnAtx.
-func (mr *MockAtxReceiverMockRecorder) OnAtx(arg0 interface{}) *AtxReceiverOnAtxCall {
+func (mr *MockAtxReceiverMockRecorder) OnAtx(arg0 any) *AtxReceiverOnAtxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnAtx", reflect.TypeOf((*MockAtxReceiver)(nil).OnAtx), arg0)
 	return &AtxReceiverOnAtxCall{Call: call}
@@ -139,7 +143,7 @@ func (c *PostVerifierCloseCall) DoAndReturn(f func() error) *PostVerifierCloseCa
 // Verify mocks base method.
 func (m_2 *MockPostVerifier) Verify(ctx context.Context, p *shared.Proof, m *shared.ProofMetadata, opts ...verifying.OptionFunc) error {
 	m_2.ctrl.T.Helper()
-	varargs := []interface{}{ctx, p, m}
+	varargs := []any{ctx, p, m}
 	for _, a := range opts {
 		varargs = append(varargs, a)
 	}
@@ -149,9 +153,9 @@ func (m_2 *MockPostVerifier) Verify(ctx context.Context, p *shared.Proof, m *sha
 }
 
 // Verify indicates an expected call of Verify.
-func (mr *MockPostVerifierMockRecorder) Verify(ctx, p, m interface{}, opts ...interface{}) *PostVerifierVerifyCall {
+func (mr *MockPostVerifierMockRecorder) Verify(ctx, p, m any, opts ...any) *PostVerifierVerifyCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{ctx, p, m}, opts...)
+	varargs := append([]any{ctx, p, m}, opts...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Verify", reflect.TypeOf((*MockPostVerifier)(nil).Verify), varargs...)
 	return &PostVerifierVerifyCall{Call: call}
 }
@@ -211,7 +215,7 @@ func (m *MocknipostValidator) InitialNIPostChallenge(challenge *types.NIPostChal
 }
 
 // InitialNIPostChallenge indicates an expected call of InitialNIPostChallenge.
-func (mr *MocknipostValidatorMockRecorder) InitialNIPostChallenge(challenge, atxs, goldenATXID interface{}) *nipostValidatorInitialNIPostChallengeCall {
+func (mr *MocknipostValidatorMockRecorder) InitialNIPostChallenge(challenge, atxs, goldenATXID any) *nipostValidatorInitialNIPostChallengeCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InitialNIPostChallenge", reflect.TypeOf((*MocknipostValidator)(nil).InitialNIPostChallenge), challenge, atxs, goldenATXID)
 	return &nipostValidatorInitialNIPostChallengeCall{Call: call}
@@ -250,7 +254,7 @@ func (m *MocknipostValidator) NIPost(ctx context.Context, nodeId types.NodeID, a
 }
 
 // NIPost indicates an expected call of NIPost.
-func (mr *MocknipostValidatorMockRecorder) NIPost(ctx, nodeId, atxId, NIPost, expectedChallenge, numUnits interface{}) *nipostValidatorNIPostCall {
+func (mr *MocknipostValidatorMockRecorder) NIPost(ctx, nodeId, atxId, NIPost, expectedChallenge, numUnits any) *nipostValidatorNIPostCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NIPost", reflect.TypeOf((*MocknipostValidator)(nil).NIPost), ctx, nodeId, atxId, NIPost, expectedChallenge, numUnits)
 	return &nipostValidatorNIPostCall{Call: call}
@@ -288,7 +292,7 @@ func (m *MocknipostValidator) NIPostChallenge(challenge *types.NIPostChallenge,
 }
 
 // NIPostChallenge indicates an expected call of NIPostChallenge.
-func (mr *MocknipostValidatorMockRecorder) NIPostChallenge(challenge, atxs, nodeID interface{}) *nipostValidatorNIPostChallengeCall {
+func (mr *MocknipostValidatorMockRecorder) NIPostChallenge(challenge, atxs, nodeID any) *nipostValidatorNIPostChallengeCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NIPostChallenge", reflect.TypeOf((*MocknipostValidator)(nil).NIPostChallenge), challenge, atxs, nodeID)
 	return &nipostValidatorNIPostChallengeCall{Call: call}
@@ -326,7 +330,7 @@ func (m *MocknipostValidator) NumUnits(cfg *PostConfig, numUnits uint32) error {
 }
 
 // NumUnits indicates an expected call of NumUnits.
-func (mr *MocknipostValidatorMockRecorder) NumUnits(cfg, numUnits interface{}) *nipostValidatorNumUnitsCall {
+func (mr *MocknipostValidatorMockRecorder) NumUnits(cfg, numUnits any) *nipostValidatorNumUnitsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NumUnits", reflect.TypeOf((*MocknipostValidator)(nil).NumUnits), cfg, numUnits)
 	return &nipostValidatorNumUnitsCall{Call: call}
@@ -364,7 +368,7 @@ func (m *MocknipostValidator) PositioningAtx(id types.ATXID, atxs atxProvider, g
 }
 
 // PositioningAtx indicates an expected call of PositioningAtx.
-func (mr *MocknipostValidatorMockRecorder) PositioningAtx(id, atxs, goldenATXID, pubepoch interface{}) *nipostValidatorPositioningAtxCall {
+func (mr *MocknipostValidatorMockRecorder) PositioningAtx(id, atxs, goldenATXID, pubepoch any) *nipostValidatorPositioningAtxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PositioningAtx", reflect.TypeOf((*MocknipostValidator)(nil).PositioningAtx), id, atxs, goldenATXID, pubepoch)
 	return &nipostValidatorPositioningAtxCall{Call: call}
@@ -402,7 +406,7 @@ func (m *MocknipostValidator) Post(ctx context.Context, nodeId types.NodeID, atx
 }
 
 // Post indicates an expected call of Post.
-func (mr *MocknipostValidatorMockRecorder) Post(ctx, nodeId, atxId, Post, PostMetadata, numUnits interface{}) *nipostValidatorPostCall {
+func (mr *MocknipostValidatorMockRecorder) Post(ctx, nodeId, atxId, Post, PostMetadata, numUnits any) *nipostValidatorPostCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Post", reflect.TypeOf((*MocknipostValidator)(nil).Post), ctx, nodeId, atxId, Post, PostMetadata, numUnits)
 	return &nipostValidatorPostCall{Call: call}
@@ -440,7 +444,7 @@ func (m *MocknipostValidator) PostMetadata(cfg *PostConfig, metadata *types.Post
 }
 
 // PostMetadata indicates an expected call of PostMetadata.
-func (mr *MocknipostValidatorMockRecorder) PostMetadata(cfg, metadata interface{}) *nipostValidatorPostMetadataCall {
+func (mr *MocknipostValidatorMockRecorder) PostMetadata(cfg, metadata any) *nipostValidatorPostMetadataCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PostMetadata", reflect.TypeOf((*MocknipostValidator)(nil).PostMetadata), cfg, metadata)
 	return &nipostValidatorPostMetadataCall{Call: call}
@@ -478,7 +482,7 @@ func (m *MocknipostValidator) VRFNonce(nodeId types.NodeID, commitmentAtxId type
 }
 
 // VRFNonce indicates an expected call of VRFNonce.
-func (mr *MocknipostValidatorMockRecorder) VRFNonce(nodeId, commitmentAtxId, vrfNonce, PostMetadata, numUnits interface{}) *nipostValidatorVRFNonceCall {
+func (mr *MocknipostValidatorMockRecorder) VRFNonce(nodeId, commitmentAtxId, vrfNonce, PostMetadata, numUnits any) *nipostValidatorVRFNonceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VRFNonce", reflect.TypeOf((*MocknipostValidator)(nil).VRFNonce), nodeId, commitmentAtxId, vrfNonce, PostMetadata, numUnits)
 	return &nipostValidatorVRFNonceCall{Call: call}
@@ -539,7 +543,7 @@ func (m *MocklayerClock) AwaitLayer(layerID types.LayerID) <-chan struct{} {
 }
 
 // AwaitLayer indicates an expected call of AwaitLayer.
-func (mr *MocklayerClockMockRecorder) AwaitLayer(layerID interface{}) *layerClockAwaitLayerCall {
+func (mr *MocklayerClockMockRecorder) AwaitLayer(layerID any) *layerClockAwaitLayerCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AwaitLayer", reflect.TypeOf((*MocklayerClock)(nil).AwaitLayer), layerID)
 	return &layerClockAwaitLayerCall{Call: call}
@@ -615,7 +619,7 @@ func (m *MocklayerClock) LayerToTime(arg0 types.LayerID) time.Time {
 }
 
 // LayerToTime indicates an expected call of LayerToTime.
-func (mr *MocklayerClockMockRecorder) LayerToTime(arg0 interface{}) *layerClockLayerToTimeCall {
+func (mr *MocklayerClockMockRecorder) LayerToTime(arg0 any) *layerClockLayerToTimeCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LayerToTime", reflect.TypeOf((*MocklayerClock)(nil).LayerToTime), arg0)
 	return &layerClockLayerToTimeCall{Call: call}
@@ -677,7 +681,7 @@ func (m *MocknipostBuilder) BuildNIPost(ctx context.Context, challenge *types.NI
 }
 
 // BuildNIPost indicates an expected call of BuildNIPost.
-func (mr *MocknipostBuilderMockRecorder) BuildNIPost(ctx, challenge interface{}) *nipostBuilderBuildNIPostCall {
+func (mr *MocknipostBuilderMockRecorder) BuildNIPost(ctx, challenge any) *nipostBuilderBuildNIPostCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BuildNIPost", reflect.TypeOf((*MocknipostBuilder)(nil).BuildNIPost), ctx, challenge)
 	return &nipostBuilderBuildNIPostCall{Call: call}
@@ -751,7 +755,7 @@ func (m *MocknipostBuilder) UpdatePoETProvers(arg0 []PoetProvingServiceClient) {
 }
 
 // UpdatePoETProvers indicates an expected call of UpdatePoETProvers.
-func (mr *MocknipostBuilderMockRecorder) UpdatePoETProvers(arg0 interface{}) *nipostBuilderUpdatePoETProversCall {
+func (mr *MocknipostBuilderMockRecorder) UpdatePoETProvers(arg0 any) *nipostBuilderUpdatePoETProversCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePoETProvers", reflect.TypeOf((*MocknipostBuilder)(nil).UpdatePoETProvers), arg0)
 	return &nipostBuilderUpdatePoETProversCall{Call: call}
@@ -812,7 +816,7 @@ func (m *MockatxHandler) AwaitAtx(id types.ATXID) chan struct{} {
 }
 
 // AwaitAtx indicates an expected call of AwaitAtx.
-func (mr *MockatxHandlerMockRecorder) AwaitAtx(id interface{}) *atxHandlerAwaitAtxCall {
+func (mr *MockatxHandlerMockRecorder) AwaitAtx(id any) *atxHandlerAwaitAtxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AwaitAtx", reflect.TypeOf((*MockatxHandler)(nil).AwaitAtx), id)
 	return &atxHandlerAwaitAtxCall{Call: call}
@@ -848,7 +852,7 @@ func (m *MockatxHandler) UnsubscribeAtx(id types.ATXID) {
 }
 
 // UnsubscribeAtx indicates an expected call of UnsubscribeAtx.
-func (mr *MockatxHandlerMockRecorder) UnsubscribeAtx(id interface{}) *atxHandlerUnsubscribeAtxCall {
+func (mr *MockatxHandlerMockRecorder) UnsubscribeAtx(id any) *atxHandlerUnsubscribeAtxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnsubscribeAtx", reflect.TypeOf((*MockatxHandler)(nil).UnsubscribeAtx), id)
 	return &atxHandlerUnsubscribeAtxCall{Call: call}
@@ -971,7 +975,7 @@ func (m *MockatxProvider) GetAtxHeader(id types.ATXID) (*types.ActivationTxHeade
 }
 
 // GetAtxHeader indicates an expected call of GetAtxHeader.
-func (mr *MockatxProviderMockRecorder) GetAtxHeader(id interface{}) *atxProviderGetAtxHeaderCall {
+func (mr *MockatxProviderMockRecorder) GetAtxHeader(id any) *atxProviderGetAtxHeaderCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAtxHeader", reflect.TypeOf((*MockatxProvider)(nil).GetAtxHeader), id)
 	return &atxProviderGetAtxHeaderCall{Call: call}
@@ -1033,7 +1037,7 @@ func (m *MockpostSetupProvider) Benchmark(p PostSetupProvider) (int, error) {
 }
 
 // Benchmark indicates an expected call of Benchmark.
-func (mr *MockpostSetupProviderMockRecorder) Benchmark(p interface{}) *postSetupProviderBenchmarkCall {
+func (mr *MockpostSetupProviderMockRecorder) Benchmark(p any) *postSetupProviderBenchmarkCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Benchmark", reflect.TypeOf((*MockpostSetupProvider)(nil).Benchmark), p)
 	return &postSetupProviderBenchmarkCall{Call: call}
@@ -1142,7 +1146,7 @@ func (c *postSetupProviderConfigCall) DoAndReturn(f func() PostConfig) *postSetu
 // GenerateProof mocks base method.
 func (m *MockpostSetupProvider) GenerateProof(ctx context.Context, challenge []byte, options ...proving.OptionFunc) (*types.Post, *types.PostMetadata, error) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{ctx, challenge}
+	varargs := []any{ctx, challenge}
 	for _, a := range options {
 		varargs = append(varargs, a)
 	}
@@ -1154,9 +1158,9 @@ func (m *MockpostSetupProvider) GenerateProof(ctx context.Context, challenge []b
 }
 
 // GenerateProof indicates an expected call of GenerateProof.
-func (mr *MockpostSetupProviderMockRecorder) GenerateProof(ctx, challenge interface{}, options ...interface{}) *postSetupProviderGenerateProofCall {
+func (mr *MockpostSetupProviderMockRecorder) GenerateProof(ctx, challenge any, options ...any) *postSetupProviderGenerateProofCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{ctx, challenge}, options...)
+	varargs := append([]any{ctx, challenge}, options...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateProof", reflect.TypeOf((*MockpostSetupProvider)(nil).GenerateProof), varargs...)
 	return &postSetupProviderGenerateProofCall{Call: call}
 }
@@ -1231,7 +1235,7 @@ func (m *MockpostSetupProvider) PrepareInitializer(ctx context.Context, opts Pos
 }
 
 // PrepareInitializer indicates an expected call of PrepareInitializer.
-func (mr *MockpostSetupProviderMockRecorder) PrepareInitializer(ctx, opts interface{}) *postSetupProviderPrepareInitializerCall {
+func (mr *MockpostSetupProviderMockRecorder) PrepareInitializer(ctx, opts any) *postSetupProviderPrepareInitializerCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrepareInitializer", reflect.TypeOf((*MockpostSetupProvider)(nil).PrepareInitializer), ctx, opts)
 	return &postSetupProviderPrepareInitializerCall{Call: call}
@@ -1346,7 +1350,7 @@ func (m *MockpostSetupProvider) StartSession(context context.Context) error {
 }
 
 // StartSession indicates an expected call of StartSession.
-func (mr *MockpostSetupProviderMockRecorder) StartSession(context interface{}) *postSetupProviderStartSessionCall {
+func (mr *MockpostSetupProviderMockRecorder) StartSession(context any) *postSetupProviderStartSessionCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartSession", reflect.TypeOf((*MockpostSetupProvider)(nil).StartSession), context)
 	return &postSetupProviderStartSessionCall{Call: call}
@@ -1520,7 +1524,7 @@ func (m *MockSmeshingProvider) SetCoinbase(coinbase types.Address) {
 }
 
 // SetCoinbase indicates an expected call of SetCoinbase.
-func (mr *MockSmeshingProviderMockRecorder) SetCoinbase(coinbase interface{}) *SmeshingProviderSetCoinbaseCall {
+func (mr *MockSmeshingProviderMockRecorder) SetCoinbase(coinbase any) *SmeshingProviderSetCoinbaseCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCoinbase", reflect.TypeOf((*MockSmeshingProvider)(nil).SetCoinbase), coinbase)
 	return &SmeshingProviderSetCoinbaseCall{Call: call}
@@ -1634,7 +1638,7 @@ func (m *MockSmeshingProvider) StartSmeshing(arg0 types.Address, arg1 PostSetupO
 }
 
 // StartSmeshing indicates an expected call of StartSmeshing.
-func (mr *MockSmeshingProviderMockRecorder) StartSmeshing(arg0, arg1 interface{}) *SmeshingProviderStartSmeshingCall {
+func (mr *MockSmeshingProviderMockRecorder) StartSmeshing(arg0, arg1 any) *SmeshingProviderStartSmeshingCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartSmeshing", reflect.TypeOf((*MockSmeshingProvider)(nil).StartSmeshing), arg0, arg1)
 	return &SmeshingProviderStartSmeshingCall{Call: call}
@@ -1672,7 +1676,7 @@ func (m *MockSmeshingProvider) StopSmeshing(arg0 bool) error {
 }
 
 // StopSmeshing indicates an expected call of StopSmeshing.
-func (mr *MockSmeshingProviderMockRecorder) StopSmeshing(arg0 interface{}) *SmeshingProviderStopSmeshingCall {
+func (mr *MockSmeshingProviderMockRecorder) StopSmeshing(arg0 any) *SmeshingProviderStopSmeshingCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StopSmeshing", reflect.TypeOf((*MockSmeshingProvider)(nil).StopSmeshing), arg0)
 	return &SmeshingProviderStopSmeshingCall{Call: call}
@@ -1710,7 +1714,7 @@ func (m *MockSmeshingProvider) UpdatePoETServers(ctx context.Context, endpoints
 }
 
 // UpdatePoETServers indicates an expected call of UpdatePoETServers.
-func (mr *MockSmeshingProviderMockRecorder) UpdatePoETServers(ctx, endpoints interface{}) *SmeshingProviderUpdatePoETServersCall {
+func (mr *MockSmeshingProviderMockRecorder) UpdatePoETServers(ctx, endpoints any) *SmeshingProviderUpdatePoETServersCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePoETServers", reflect.TypeOf((*MockSmeshingProvider)(nil).UpdatePoETServers), ctx, endpoints)
 	return &SmeshingProviderUpdatePoETServersCall{Call: call}
diff --git a/activation/nipost_mocks.go b/activation/nipost_mocks.go
index cdfce1f420..5d832724eb 100644
--- a/activation/nipost_mocks.go
+++ b/activation/nipost_mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./nipost.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=activation -destination=./nipost_mocks.go -source=./nipost.go PoetProvingServiceClient
+//
 // Package activation is a generated GoMock package.
 package activation
 
@@ -83,7 +87,7 @@ func (m *MockPoetProvingServiceClient) PoetServiceID(arg0 context.Context) (type
 }
 
 // PoetServiceID indicates an expected call of PoetServiceID.
-func (mr *MockPoetProvingServiceClientMockRecorder) PoetServiceID(arg0 interface{}) *PoetProvingServiceClientPoetServiceIDCall {
+func (mr *MockPoetProvingServiceClientMockRecorder) PoetServiceID(arg0 any) *PoetProvingServiceClientPoetServiceIDCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PoetServiceID", reflect.TypeOf((*MockPoetProvingServiceClient)(nil).PoetServiceID), arg0)
 	return &PoetProvingServiceClientPoetServiceIDCall{Call: call}
@@ -122,7 +126,7 @@ func (m *MockPoetProvingServiceClient) PowParams(ctx context.Context) (*PoetPowP
 }
 
 // PowParams indicates an expected call of PowParams.
-func (mr *MockPoetProvingServiceClientMockRecorder) PowParams(ctx interface{}) *PoetProvingServiceClientPowParamsCall {
+func (mr *MockPoetProvingServiceClientMockRecorder) PowParams(ctx any) *PoetProvingServiceClientPowParamsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PowParams", reflect.TypeOf((*MockPoetProvingServiceClient)(nil).PowParams), ctx)
 	return &PoetProvingServiceClientPowParamsCall{Call: call}
@@ -162,7 +166,7 @@ func (m *MockPoetProvingServiceClient) Proof(ctx context.Context, roundID string
 }
 
 // Proof indicates an expected call of Proof.
-func (mr *MockPoetProvingServiceClientMockRecorder) Proof(ctx, roundID interface{}) *PoetProvingServiceClientProofCall {
+func (mr *MockPoetProvingServiceClientMockRecorder) Proof(ctx, roundID any) *PoetProvingServiceClientProofCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Proof", reflect.TypeOf((*MockPoetProvingServiceClient)(nil).Proof), ctx, roundID)
 	return &PoetProvingServiceClientProofCall{Call: call}
@@ -201,7 +205,7 @@ func (m *MockPoetProvingServiceClient) Submit(ctx context.Context, prefix, chall
 }
 
 // Submit indicates an expected call of Submit.
-func (mr *MockPoetProvingServiceClientMockRecorder) Submit(ctx, prefix, challenge, signature, nodeID, pow interface{}) *PoetProvingServiceClientSubmitCall {
+func (mr *MockPoetProvingServiceClientMockRecorder) Submit(ctx, prefix, challenge, signature, nodeID, pow any) *PoetProvingServiceClientSubmitCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Submit", reflect.TypeOf((*MockPoetProvingServiceClient)(nil).Submit), ctx, prefix, challenge, signature, nodeID, pow)
 	return &PoetProvingServiceClientSubmitCall{Call: call}
@@ -264,7 +268,7 @@ func (m *MockpoetDbAPI) GetProof(arg0 types.PoetProofRef) (*types.PoetProof, *ty
 }
 
 // GetProof indicates an expected call of GetProof.
-func (mr *MockpoetDbAPIMockRecorder) GetProof(arg0 interface{}) *poetDbAPIGetProofCall {
+func (mr *MockpoetDbAPIMockRecorder) GetProof(arg0 any) *poetDbAPIGetProofCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProof", reflect.TypeOf((*MockpoetDbAPI)(nil).GetProof), arg0)
 	return &poetDbAPIGetProofCall{Call: call}
@@ -302,7 +306,7 @@ func (m *MockpoetDbAPI) ValidateAndStore(ctx context.Context, proofMessage *type
 }
 
 // ValidateAndStore indicates an expected call of ValidateAndStore.
-func (mr *MockpoetDbAPIMockRecorder) ValidateAndStore(ctx, proofMessage interface{}) *poetDbAPIValidateAndStoreCall {
+func (mr *MockpoetDbAPIMockRecorder) ValidateAndStore(ctx, proofMessage any) *poetDbAPIValidateAndStoreCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAndStore", reflect.TypeOf((*MockpoetDbAPI)(nil).ValidateAndStore), ctx, proofMessage)
 	return &poetDbAPIValidateAndStoreCall{Call: call}
diff --git a/api/grpcserver/mocks.go b/api/grpcserver/mocks.go
index f0c3b13b0d..4f632a778f 100644
--- a/api/grpcserver/mocks.go
+++ b/api/grpcserver/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=grpcserver -destination=./mocks.go -source=./interface.go
+//
 // Package grpcserver is a generated GoMock package.
 package grpcserver
 
@@ -149,7 +153,7 @@ func (m *MockconservativeState) GetBalance(arg0 types.Address) (uint64, error) {
 }
 
 // GetBalance indicates an expected call of GetBalance.
-func (mr *MockconservativeStateMockRecorder) GetBalance(arg0 interface{}) *conservativeStateGetBalanceCall {
+func (mr *MockconservativeStateMockRecorder) GetBalance(arg0 any) *conservativeStateGetBalanceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBalance", reflect.TypeOf((*MockconservativeState)(nil).GetBalance), arg0)
 	return &conservativeStateGetBalanceCall{Call: call}
@@ -188,7 +192,7 @@ func (m *MockconservativeState) GetLayerStateRoot(arg0 types.LayerID) (types.Has
 }
 
 // GetLayerStateRoot indicates an expected call of GetLayerStateRoot.
-func (mr *MockconservativeStateMockRecorder) GetLayerStateRoot(arg0 interface{}) *conservativeStateGetLayerStateRootCall {
+func (mr *MockconservativeStateMockRecorder) GetLayerStateRoot(arg0 any) *conservativeStateGetLayerStateRootCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLayerStateRoot", reflect.TypeOf((*MockconservativeState)(nil).GetLayerStateRoot), arg0)
 	return &conservativeStateGetLayerStateRootCall{Call: call}
@@ -227,7 +231,7 @@ func (m *MockconservativeState) GetMeshTransaction(arg0 types.TransactionID) (*t
 }
 
 // GetMeshTransaction indicates an expected call of GetMeshTransaction.
-func (mr *MockconservativeStateMockRecorder) GetMeshTransaction(arg0 interface{}) *conservativeStateGetMeshTransactionCall {
+func (mr *MockconservativeStateMockRecorder) GetMeshTransaction(arg0 any) *conservativeStateGetMeshTransactionCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMeshTransaction", reflect.TypeOf((*MockconservativeState)(nil).GetMeshTransaction), arg0)
 	return &conservativeStateGetMeshTransactionCall{Call: call}
@@ -266,7 +270,7 @@ func (m *MockconservativeState) GetMeshTransactions(arg0 []types.TransactionID)
 }
 
 // GetMeshTransactions indicates an expected call of GetMeshTransactions.
-func (mr *MockconservativeStateMockRecorder) GetMeshTransactions(arg0 interface{}) *conservativeStateGetMeshTransactionsCall {
+func (mr *MockconservativeStateMockRecorder) GetMeshTransactions(arg0 any) *conservativeStateGetMeshTransactionsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMeshTransactions", reflect.TypeOf((*MockconservativeState)(nil).GetMeshTransactions), arg0)
 	return &conservativeStateGetMeshTransactionsCall{Call: call}
@@ -305,7 +309,7 @@ func (m *MockconservativeState) GetNonce(arg0 types.Address) (types.Nonce, error
 }
 
 // GetNonce indicates an expected call of GetNonce.
-func (mr *MockconservativeStateMockRecorder) GetNonce(arg0 interface{}) *conservativeStateGetNonceCall {
+func (mr *MockconservativeStateMockRecorder) GetNonce(arg0 any) *conservativeStateGetNonceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNonce", reflect.TypeOf((*MockconservativeState)(nil).GetNonce), arg0)
 	return &conservativeStateGetNonceCall{Call: call}
@@ -344,7 +348,7 @@ func (m *MockconservativeState) GetProjection(arg0 types.Address) (uint64, uint6
 }
 
 // GetProjection indicates an expected call of GetProjection.
-func (mr *MockconservativeStateMockRecorder) GetProjection(arg0 interface{}) *conservativeStateGetProjectionCall {
+func (mr *MockconservativeStateMockRecorder) GetProjection(arg0 any) *conservativeStateGetProjectionCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProjection", reflect.TypeOf((*MockconservativeState)(nil).GetProjection), arg0)
 	return &conservativeStateGetProjectionCall{Call: call}
@@ -422,7 +426,7 @@ func (m *MockconservativeState) GetTransactionsByAddress(arg0, arg1 types.LayerI
 }
 
 // GetTransactionsByAddress indicates an expected call of GetTransactionsByAddress.
-func (mr *MockconservativeStateMockRecorder) GetTransactionsByAddress(arg0, arg1, arg2 interface{}) *conservativeStateGetTransactionsByAddressCall {
+func (mr *MockconservativeStateMockRecorder) GetTransactionsByAddress(arg0, arg1, arg2 any) *conservativeStateGetTransactionsByAddressCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTransactionsByAddress", reflect.TypeOf((*MockconservativeState)(nil).GetTransactionsByAddress), arg0, arg1, arg2)
 	return &conservativeStateGetTransactionsByAddressCall{Call: call}
@@ -460,7 +464,7 @@ func (m *MockconservativeState) Validation(raw types.RawTx) system.ValidationReq
 }
 
 // Validation indicates an expected call of Validation.
-func (mr *MockconservativeStateMockRecorder) Validation(raw interface{}) *conservativeStateValidationCall {
+func (mr *MockconservativeStateMockRecorder) Validation(raw any) *conservativeStateValidationCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validation", reflect.TypeOf((*MockconservativeState)(nil).Validation), raw)
 	return &conservativeStateValidationCall{Call: call}
@@ -521,7 +525,7 @@ func (m *Mocksyncer) IsSynced(arg0 context.Context) bool {
 }
 
 // IsSynced indicates an expected call of IsSynced.
-func (mr *MocksyncerMockRecorder) IsSynced(arg0 interface{}) *syncerIsSyncedCall {
+func (mr *MocksyncerMockRecorder) IsSynced(arg0 any) *syncerIsSyncedCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsSynced", reflect.TypeOf((*Mocksyncer)(nil).IsSynced), arg0)
 	return &syncerIsSyncedCall{Call: call}
@@ -582,7 +586,7 @@ func (m *MocktxValidator) VerifyAndCacheTx(arg0 context.Context, arg1 []byte) er
 }
 
 // VerifyAndCacheTx indicates an expected call of VerifyAndCacheTx.
-func (mr *MocktxValidatorMockRecorder) VerifyAndCacheTx(arg0, arg1 interface{}) *txValidatorVerifyAndCacheTxCall {
+func (mr *MocktxValidatorMockRecorder) VerifyAndCacheTx(arg0, arg1 any) *txValidatorVerifyAndCacheTxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VerifyAndCacheTx", reflect.TypeOf((*MocktxValidator)(nil).VerifyAndCacheTx), arg0, arg1)
 	return &txValidatorVerifyAndCacheTxCall{Call: call}
@@ -644,7 +648,7 @@ func (m *MockatxProvider) GetFullAtx(id types.ATXID) (*types.VerifiedActivationT
 }
 
 // GetFullAtx indicates an expected call of GetFullAtx.
-func (mr *MockatxProviderMockRecorder) GetFullAtx(id interface{}) *atxProviderGetFullAtxCall {
+func (mr *MockatxProviderMockRecorder) GetFullAtx(id any) *atxProviderGetFullAtxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFullAtx", reflect.TypeOf((*MockatxProvider)(nil).GetFullAtx), id)
 	return &atxProviderGetFullAtxCall{Call: call}
@@ -683,7 +687,7 @@ func (m *MockatxProvider) GetMalfeasanceProof(id types.NodeID) (*types.Malfeasan
 }
 
 // GetMalfeasanceProof indicates an expected call of GetMalfeasanceProof.
-func (mr *MockatxProviderMockRecorder) GetMalfeasanceProof(id interface{}) *atxProviderGetMalfeasanceProofCall {
+func (mr *MockatxProviderMockRecorder) GetMalfeasanceProof(id any) *atxProviderGetMalfeasanceProofCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMalfeasanceProof", reflect.TypeOf((*MockatxProvider)(nil).GetMalfeasanceProof), id)
 	return &atxProviderGetMalfeasanceProofCall{Call: call}
@@ -784,7 +788,7 @@ func (m *MockpostSetupProvider) Benchmark(p activation.PostSetupProvider) (int,
 }
 
 // Benchmark indicates an expected call of Benchmark.
-func (mr *MockpostSetupProviderMockRecorder) Benchmark(p interface{}) *postSetupProviderBenchmarkCall {
+func (mr *MockpostSetupProviderMockRecorder) Benchmark(p any) *postSetupProviderBenchmarkCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Benchmark", reflect.TypeOf((*MockpostSetupProvider)(nil).Benchmark), p)
 	return &postSetupProviderBenchmarkCall{Call: call}
@@ -1021,7 +1025,7 @@ func (m *Mockpeers) ConnectedPeerInfo(arg0 p2p.Peer) *p2p.PeerInfo {
 }
 
 // ConnectedPeerInfo indicates an expected call of ConnectedPeerInfo.
-func (mr *MockpeersMockRecorder) ConnectedPeerInfo(arg0 interface{}) *peersConnectedPeerInfoCall {
+func (mr *MockpeersMockRecorder) ConnectedPeerInfo(arg0 any) *peersConnectedPeerInfoCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConnectedPeerInfo", reflect.TypeOf((*Mockpeers)(nil).ConnectedPeerInfo), arg0)
 	return &peersConnectedPeerInfoCall{Call: call}
@@ -1220,7 +1224,7 @@ func (m *MockmeshAPI) GetATXs(arg0 context.Context, arg1 []types.ATXID) (map[typ
 }
 
 // GetATXs indicates an expected call of GetATXs.
-func (mr *MockmeshAPIMockRecorder) GetATXs(arg0, arg1 interface{}) *meshAPIGetATXsCall {
+func (mr *MockmeshAPIMockRecorder) GetATXs(arg0, arg1 any) *meshAPIGetATXsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetATXs", reflect.TypeOf((*MockmeshAPI)(nil).GetATXs), arg0, arg1)
 	return &meshAPIGetATXsCall{Call: call}
@@ -1259,7 +1263,7 @@ func (m *MockmeshAPI) GetLayer(arg0 types.LayerID) (*types.Layer, error) {
 }
 
 // GetLayer indicates an expected call of GetLayer.
-func (mr *MockmeshAPIMockRecorder) GetLayer(arg0 interface{}) *meshAPIGetLayerCall {
+func (mr *MockmeshAPIMockRecorder) GetLayer(arg0 any) *meshAPIGetLayerCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLayer", reflect.TypeOf((*MockmeshAPI)(nil).GetLayer), arg0)
 	return &meshAPIGetLayerCall{Call: call}
@@ -1298,7 +1302,7 @@ func (m *MockmeshAPI) GetRewards(arg0 types.Address) ([]*types.Reward, error) {
 }
 
 // GetRewards indicates an expected call of GetRewards.
-func (mr *MockmeshAPIMockRecorder) GetRewards(arg0 interface{}) *meshAPIGetRewardsCall {
+func (mr *MockmeshAPIMockRecorder) GetRewards(arg0 any) *meshAPIGetRewardsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRewards", reflect.TypeOf((*MockmeshAPI)(nil).GetRewards), arg0)
 	return &meshAPIGetRewardsCall{Call: call}
@@ -1413,7 +1417,7 @@ func (m *MockmeshAPI) MeshHash(arg0 types.LayerID) (types.Hash32, error) {
 }
 
 // MeshHash indicates an expected call of MeshHash.
-func (mr *MockmeshAPIMockRecorder) MeshHash(arg0 interface{}) *meshAPIMeshHashCall {
+func (mr *MockmeshAPIMockRecorder) MeshHash(arg0 any) *meshAPIMeshHashCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MeshHash", reflect.TypeOf((*MockmeshAPI)(nil).MeshHash), arg0)
 	return &meshAPIMeshHashCall{Call: call}
@@ -1513,7 +1517,7 @@ func (m *Mockoracle) ActiveSet(arg0 context.Context, arg1 types.EpochID) ([]type
 }
 
 // ActiveSet indicates an expected call of ActiveSet.
-func (mr *MockoracleMockRecorder) ActiveSet(arg0, arg1 interface{}) *oracleActiveSetCall {
+func (mr *MockoracleMockRecorder) ActiveSet(arg0, arg1 any) *oracleActiveSetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ActiveSet", reflect.TypeOf((*Mockoracle)(nil).ActiveSet), arg0, arg1)
 	return &oracleActiveSetCall{Call: call}
diff --git a/beacon/mocks.go b/beacon/mocks.go
index 94bdfd3e9d..9d62418cf4 100644
--- a/beacon/mocks.go
+++ b/beacon/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=beacon -destination=./mocks.go -source=./interface.go
+//
 // Package beacon is a generated GoMock package.
 package beacon
 
@@ -44,7 +48,7 @@ func (m *Mockcoin) FinishEpoch(arg0 context.Context, arg1 types.EpochID) {
 }
 
 // FinishEpoch indicates an expected call of FinishEpoch.
-func (mr *MockcoinMockRecorder) FinishEpoch(arg0, arg1 interface{}) *coinFinishEpochCall {
+func (mr *MockcoinMockRecorder) FinishEpoch(arg0, arg1 any) *coinFinishEpochCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishEpoch", reflect.TypeOf((*Mockcoin)(nil).FinishEpoch), arg0, arg1)
 	return &coinFinishEpochCall{Call: call}
@@ -80,7 +84,7 @@ func (m *Mockcoin) FinishRound(arg0 context.Context) {
 }
 
 // FinishRound indicates an expected call of FinishRound.
-func (mr *MockcoinMockRecorder) FinishRound(arg0 interface{}) *coinFinishRoundCall {
+func (mr *MockcoinMockRecorder) FinishRound(arg0 any) *coinFinishRoundCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishRound", reflect.TypeOf((*Mockcoin)(nil).FinishRound), arg0)
 	return &coinFinishRoundCall{Call: call}
@@ -119,7 +123,7 @@ func (m *Mockcoin) Get(arg0 context.Context, arg1 types.EpochID, arg2 types.Roun
 }
 
 // Get indicates an expected call of Get.
-func (mr *MockcoinMockRecorder) Get(arg0, arg1, arg2 interface{}) *coinGetCall {
+func (mr *MockcoinMockRecorder) Get(arg0, arg1, arg2 any) *coinGetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*Mockcoin)(nil).Get), arg0, arg1, arg2)
 	return &coinGetCall{Call: call}
@@ -157,7 +161,7 @@ func (m *Mockcoin) HandleProposal(arg0 context.Context, arg1 p2p.Peer, arg2 []by
 }
 
 // HandleProposal indicates an expected call of HandleProposal.
-func (mr *MockcoinMockRecorder) HandleProposal(arg0, arg1, arg2 interface{}) *coinHandleProposalCall {
+func (mr *MockcoinMockRecorder) HandleProposal(arg0, arg1, arg2 any) *coinHandleProposalCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleProposal", reflect.TypeOf((*Mockcoin)(nil).HandleProposal), arg0, arg1, arg2)
 	return &coinHandleProposalCall{Call: call}
@@ -193,7 +197,7 @@ func (m *Mockcoin) StartEpoch(arg0 context.Context, arg1 types.EpochID) {
 }
 
 // StartEpoch indicates an expected call of StartEpoch.
-func (mr *MockcoinMockRecorder) StartEpoch(arg0, arg1 interface{}) *coinStartEpochCall {
+func (mr *MockcoinMockRecorder) StartEpoch(arg0, arg1 any) *coinStartEpochCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartEpoch", reflect.TypeOf((*Mockcoin)(nil).StartEpoch), arg0, arg1)
 	return &coinStartEpochCall{Call: call}
@@ -229,7 +233,7 @@ func (m *Mockcoin) StartRound(arg0 context.Context, arg1 types.RoundID, arg2 *ty
 }
 
 // StartRound indicates an expected call of StartRound.
-func (mr *MockcoinMockRecorder) StartRound(arg0, arg1, arg2 interface{}) *coinStartRoundCall {
+func (mr *MockcoinMockRecorder) StartRound(arg0, arg1, arg2 any) *coinStartRoundCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartRound", reflect.TypeOf((*Mockcoin)(nil).StartRound), arg0, arg1, arg2)
 	return &coinStartRoundCall{Call: call}
@@ -290,7 +294,7 @@ func (m *MockeligibilityChecker) PassStrictThreshold(arg0 types.VrfSignature) bo
 }
 
 // PassStrictThreshold indicates an expected call of PassStrictThreshold.
-func (mr *MockeligibilityCheckerMockRecorder) PassStrictThreshold(arg0 interface{}) *eligibilityCheckerPassStrictThresholdCall {
+func (mr *MockeligibilityCheckerMockRecorder) PassStrictThreshold(arg0 any) *eligibilityCheckerPassStrictThresholdCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PassStrictThreshold", reflect.TypeOf((*MockeligibilityChecker)(nil).PassStrictThreshold), arg0)
 	return &eligibilityCheckerPassStrictThresholdCall{Call: call}
@@ -328,7 +332,7 @@ func (m *MockeligibilityChecker) PassThreshold(arg0 types.VrfSignature) bool {
 }
 
 // PassThreshold indicates an expected call of PassThreshold.
-func (mr *MockeligibilityCheckerMockRecorder) PassThreshold(arg0 interface{}) *eligibilityCheckerPassThresholdCall {
+func (mr *MockeligibilityCheckerMockRecorder) PassThreshold(arg0 any) *eligibilityCheckerPassThresholdCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PassThreshold", reflect.TypeOf((*MockeligibilityChecker)(nil).PassThreshold), arg0)
 	return &eligibilityCheckerPassThresholdCall{Call: call}
@@ -389,7 +393,7 @@ func (m *MocklayerClock) AwaitLayer(arg0 types.LayerID) <-chan struct{} {
 }
 
 // AwaitLayer indicates an expected call of AwaitLayer.
-func (mr *MocklayerClockMockRecorder) AwaitLayer(arg0 interface{}) *layerClockAwaitLayerCall {
+func (mr *MocklayerClockMockRecorder) AwaitLayer(arg0 any) *layerClockAwaitLayerCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AwaitLayer", reflect.TypeOf((*MocklayerClock)(nil).AwaitLayer), arg0)
 	return &layerClockAwaitLayerCall{Call: call}
@@ -465,7 +469,7 @@ func (m *MocklayerClock) LayerToTime(arg0 types.LayerID) time.Time {
 }
 
 // LayerToTime indicates an expected call of LayerToTime.
-func (mr *MocklayerClockMockRecorder) LayerToTime(arg0 interface{}) *layerClockLayerToTimeCall {
+func (mr *MocklayerClockMockRecorder) LayerToTime(arg0 any) *layerClockLayerToTimeCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LayerToTime", reflect.TypeOf((*MocklayerClock)(nil).LayerToTime), arg0)
 	return &layerClockLayerToTimeCall{Call: call}
@@ -602,7 +606,7 @@ func (m *MockvrfSigner) Sign(msg []byte) types.VrfSignature {
 }
 
 // Sign indicates an expected call of Sign.
-func (mr *MockvrfSignerMockRecorder) Sign(msg interface{}) *vrfSignerSignCall {
+func (mr *MockvrfSignerMockRecorder) Sign(msg any) *vrfSignerSignCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sign", reflect.TypeOf((*MockvrfSigner)(nil).Sign), msg)
 	return &vrfSignerSignCall{Call: call}
@@ -663,7 +667,7 @@ func (m *MockvrfVerifier) Verify(nodeID types.NodeID, msg []byte, sig types.VrfS
 }
 
 // Verify indicates an expected call of Verify.
-func (mr *MockvrfVerifierMockRecorder) Verify(nodeID, msg, sig interface{}) *vrfVerifierVerifyCall {
+func (mr *MockvrfVerifierMockRecorder) Verify(nodeID, msg, sig any) *vrfVerifierVerifyCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Verify", reflect.TypeOf((*MockvrfVerifier)(nil).Verify), nodeID, msg, sig)
 	return &vrfVerifierVerifyCall{Call: call}
@@ -725,7 +729,7 @@ func (m *MocknonceFetcher) VRFNonce(arg0 types.NodeID, arg1 types.EpochID) (type
 }
 
 // VRFNonce indicates an expected call of VRFNonce.
-func (mr *MocknonceFetcherMockRecorder) VRFNonce(arg0, arg1 interface{}) *nonceFetcherVRFNonceCall {
+func (mr *MocknonceFetcherMockRecorder) VRFNonce(arg0, arg1 any) *nonceFetcherVRFNonceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VRFNonce", reflect.TypeOf((*MocknonceFetcher)(nil).VRFNonce), arg0, arg1)
 	return &nonceFetcherVRFNonceCall{Call: call}
diff --git a/beacon/weakcoin/mocks.go b/beacon/weakcoin/mocks.go
index 5cc05a37f9..1bc89bc68f 100644
--- a/beacon/weakcoin/mocks.go
+++ b/beacon/weakcoin/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=weakcoin -destination=./mocks.go -source=./interface.go
+//
 // Package weakcoin is a generated GoMock package.
 package weakcoin
 
@@ -119,7 +123,7 @@ func (m *MockvrfSigner) Sign(msg []byte) types.VrfSignature {
 }
 
 // Sign indicates an expected call of Sign.
-func (mr *MockvrfSignerMockRecorder) Sign(msg interface{}) *vrfSignerSignCall {
+func (mr *MockvrfSignerMockRecorder) Sign(msg any) *vrfSignerSignCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sign", reflect.TypeOf((*MockvrfSigner)(nil).Sign), msg)
 	return &vrfSignerSignCall{Call: call}
@@ -180,7 +184,7 @@ func (m *MockvrfVerifier) Verify(nodeID types.NodeID, msg []byte, sig types.VrfS
 }
 
 // Verify indicates an expected call of Verify.
-func (mr *MockvrfVerifierMockRecorder) Verify(nodeID, msg, sig interface{}) *vrfVerifierVerifyCall {
+func (mr *MockvrfVerifierMockRecorder) Verify(nodeID, msg, sig any) *vrfVerifierVerifyCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Verify", reflect.TypeOf((*MockvrfVerifier)(nil).Verify), nodeID, msg, sig)
 	return &vrfVerifierVerifyCall{Call: call}
@@ -242,7 +246,7 @@ func (m *MocknonceFetcher) VRFNonce(arg0 types.NodeID, arg1 types.EpochID) (type
 }
 
 // VRFNonce indicates an expected call of VRFNonce.
-func (mr *MocknonceFetcherMockRecorder) VRFNonce(arg0, arg1 interface{}) *nonceFetcherVRFNonceCall {
+func (mr *MocknonceFetcherMockRecorder) VRFNonce(arg0, arg1 any) *nonceFetcherVRFNonceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VRFNonce", reflect.TypeOf((*MocknonceFetcher)(nil).VRFNonce), arg0, arg1)
 	return &nonceFetcherVRFNonceCall{Call: call}
@@ -303,7 +307,7 @@ func (m *Mockallowance) MinerAllowance(arg0 types.EpochID, arg1 types.NodeID) ui
 }
 
 // MinerAllowance indicates an expected call of MinerAllowance.
-func (mr *MockallowanceMockRecorder) MinerAllowance(arg0, arg1 interface{}) *allowanceMinerAllowanceCall {
+func (mr *MockallowanceMockRecorder) MinerAllowance(arg0, arg1 any) *allowanceMinerAllowanceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MinerAllowance", reflect.TypeOf((*Mockallowance)(nil).MinerAllowance), arg0, arg1)
 	return &allowanceMinerAllowanceCall{Call: call}
diff --git a/blocks/mocks/mocks.go b/blocks/mocks/mocks.go
index 8c45e4c5db..82f8fa08f9 100644
--- a/blocks/mocks/mocks.go
+++ b/blocks/mocks/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/mocks.go -source=./interface.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -43,7 +47,7 @@ func (m *MocklayerPatrol) CompleteHare(arg0 types.LayerID) {
 }
 
 // CompleteHare indicates an expected call of CompleteHare.
-func (mr *MocklayerPatrolMockRecorder) CompleteHare(arg0 interface{}) *layerPatrolCompleteHareCall {
+func (mr *MocklayerPatrolMockRecorder) CompleteHare(arg0 any) *layerPatrolCompleteHareCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CompleteHare", reflect.TypeOf((*MocklayerPatrol)(nil).CompleteHare), arg0)
 	return &layerPatrolCompleteHareCall{Call: call}
@@ -104,7 +108,7 @@ func (m *MockmeshProvider) AddBlockWithTXs(arg0 context.Context, arg1 *types.Blo
 }
 
 // AddBlockWithTXs indicates an expected call of AddBlockWithTXs.
-func (mr *MockmeshProviderMockRecorder) AddBlockWithTXs(arg0, arg1 interface{}) *meshProviderAddBlockWithTXsCall {
+func (mr *MockmeshProviderMockRecorder) AddBlockWithTXs(arg0, arg1 any) *meshProviderAddBlockWithTXsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddBlockWithTXs", reflect.TypeOf((*MockmeshProvider)(nil).AddBlockWithTXs), arg0, arg1)
 	return &meshProviderAddBlockWithTXsCall{Call: call}
@@ -142,7 +146,7 @@ func (m *MockmeshProvider) ProcessLayerPerHareOutput(arg0 context.Context, arg1
 }
 
 // ProcessLayerPerHareOutput indicates an expected call of ProcessLayerPerHareOutput.
-func (mr *MockmeshProviderMockRecorder) ProcessLayerPerHareOutput(arg0, arg1, arg2, arg3 interface{}) *meshProviderProcessLayerPerHareOutputCall {
+func (mr *MockmeshProviderMockRecorder) ProcessLayerPerHareOutput(arg0, arg1, arg2, arg3 any) *meshProviderProcessLayerPerHareOutputCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProcessLayerPerHareOutput", reflect.TypeOf((*MockmeshProvider)(nil).ProcessLayerPerHareOutput), arg0, arg1, arg2, arg3)
 	return &meshProviderProcessLayerPerHareOutputCall{Call: call}
@@ -242,7 +246,7 @@ func (m *Mockexecutor) ExecuteOptimistic(arg0 context.Context, arg1 types.LayerI
 }
 
 // ExecuteOptimistic indicates an expected call of ExecuteOptimistic.
-func (mr *MockexecutorMockRecorder) ExecuteOptimistic(arg0, arg1, arg2, arg3, arg4 interface{}) *executorExecuteOptimisticCall {
+func (mr *MockexecutorMockRecorder) ExecuteOptimistic(arg0, arg1, arg2, arg3, arg4 any) *executorExecuteOptimisticCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteOptimistic", reflect.TypeOf((*Mockexecutor)(nil).ExecuteOptimistic), arg0, arg1, arg2, arg3, arg4)
 	return &executorExecuteOptimisticCall{Call: call}
@@ -303,7 +307,7 @@ func (m *MocklayerClock) AwaitLayer(layerID types.LayerID) <-chan struct{} {
 }
 
 // AwaitLayer indicates an expected call of AwaitLayer.
-func (mr *MocklayerClockMockRecorder) AwaitLayer(layerID interface{}) *layerClockAwaitLayerCall {
+func (mr *MocklayerClockMockRecorder) AwaitLayer(layerID any) *layerClockAwaitLayerCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AwaitLayer", reflect.TypeOf((*MocklayerClock)(nil).AwaitLayer), layerID)
 	return &layerClockAwaitLayerCall{Call: call}
@@ -402,7 +406,7 @@ func (m *Mockcertifier) CertifyIfEligible(arg0 context.Context, arg1 log.Log, ar
 }
 
 // CertifyIfEligible indicates an expected call of CertifyIfEligible.
-func (mr *MockcertifierMockRecorder) CertifyIfEligible(arg0, arg1, arg2, arg3 interface{}) *certifierCertifyIfEligibleCall {
+func (mr *MockcertifierMockRecorder) CertifyIfEligible(arg0, arg1, arg2, arg3 any) *certifierCertifyIfEligibleCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CertifyIfEligible", reflect.TypeOf((*Mockcertifier)(nil).CertifyIfEligible), arg0, arg1, arg2, arg3)
 	return &certifierCertifyIfEligibleCall{Call: call}
@@ -440,7 +444,7 @@ func (m *Mockcertifier) RegisterForCert(arg0 context.Context, arg1 types.LayerID
 }
 
 // RegisterForCert indicates an expected call of RegisterForCert.
-func (mr *MockcertifierMockRecorder) RegisterForCert(arg0, arg1, arg2 interface{}) *certifierRegisterForCertCall {
+func (mr *MockcertifierMockRecorder) RegisterForCert(arg0, arg1, arg2 any) *certifierRegisterForCertCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterForCert", reflect.TypeOf((*Mockcertifier)(nil).RegisterForCert), arg0, arg1, arg2)
 	return &certifierRegisterForCertCall{Call: call}
@@ -501,7 +505,7 @@ func (m *MocktortoiseProvider) GetMissingActiveSet(arg0 types.EpochID, arg1 []ty
 }
 
 // GetMissingActiveSet indicates an expected call of GetMissingActiveSet.
-func (mr *MocktortoiseProviderMockRecorder) GetMissingActiveSet(arg0, arg1 interface{}) *tortoiseProviderGetMissingActiveSetCall {
+func (mr *MocktortoiseProviderMockRecorder) GetMissingActiveSet(arg0, arg1 any) *tortoiseProviderGetMissingActiveSetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMissingActiveSet", reflect.TypeOf((*MocktortoiseProvider)(nil).GetMissingActiveSet), arg0, arg1)
 	return &tortoiseProviderGetMissingActiveSetCall{Call: call}
diff --git a/bootstrap/mocks.go b/bootstrap/mocks.go
index dd77862a21..be79259865 100644
--- a/bootstrap/mocks.go
+++ b/bootstrap/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=bootstrap -destination=./mocks.go -source=./interface.go
+//
 // Package bootstrap is a generated GoMock package.
 package bootstrap
 
diff --git a/fetch/mocks/mocks.go b/fetch/mocks/mocks.go
index 611acce0a3..f65a0649e2 100644
--- a/fetch/mocks/mocks.go
+++ b/fetch/mocks/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/mocks.go -source=./interface.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -46,7 +50,7 @@ func (m *Mockrequester) Request(arg0 context.Context, arg1 p2p.Peer, arg2 []byte
 }
 
 // Request indicates an expected call of Request.
-func (mr *MockrequesterMockRecorder) Request(arg0, arg1, arg2, arg3, arg4 interface{}) *requesterRequestCall {
+func (mr *MockrequesterMockRecorder) Request(arg0, arg1, arg2, arg3, arg4 any) *requesterRequestCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Request", reflect.TypeOf((*Mockrequester)(nil).Request), arg0, arg1, arg2, arg3, arg4)
 	return &requesterRequestCall{Call: call}
@@ -107,7 +111,7 @@ func (m *MockSyncValidator) HandleMessage(arg0 context.Context, arg1 types.Hash3
 }
 
 // HandleMessage indicates an expected call of HandleMessage.
-func (mr *MockSyncValidatorMockRecorder) HandleMessage(arg0, arg1, arg2, arg3 interface{}) *SyncValidatorHandleMessageCall {
+func (mr *MockSyncValidatorMockRecorder) HandleMessage(arg0, arg1, arg2, arg3 any) *SyncValidatorHandleMessageCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleMessage", reflect.TypeOf((*MockSyncValidator)(nil).HandleMessage), arg0, arg1, arg2, arg3)
 	return &SyncValidatorHandleMessageCall{Call: call}
@@ -168,7 +172,7 @@ func (m *MockPoetValidator) ValidateAndStoreMsg(arg0 context.Context, arg1 types
 }
 
 // ValidateAndStoreMsg indicates an expected call of ValidateAndStoreMsg.
-func (mr *MockPoetValidatorMockRecorder) ValidateAndStoreMsg(arg0, arg1, arg2, arg3 interface{}) *PoetValidatorValidateAndStoreMsgCall {
+func (mr *MockPoetValidatorMockRecorder) ValidateAndStoreMsg(arg0, arg1, arg2, arg3 any) *PoetValidatorValidateAndStoreMsgCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAndStoreMsg", reflect.TypeOf((*MockPoetValidator)(nil).ValidateAndStoreMsg), arg0, arg1, arg2, arg3)
 	return &PoetValidatorValidateAndStoreMsgCall{Call: call}
@@ -328,7 +332,7 @@ func (m *Mockhost) Connected(arg0 p2p.Peer) bool {
 }
 
 // Connected indicates an expected call of Connected.
-func (mr *MockhostMockRecorder) Connected(arg0 interface{}) *hostConnectedCall {
+func (mr *MockhostMockRecorder) Connected(arg0 any) *hostConnectedCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Connected", reflect.TypeOf((*Mockhost)(nil).Connected), arg0)
 	return &hostConnectedCall{Call: call}
@@ -443,7 +447,7 @@ func (m *Mockhost) PeerProtocols(arg0 p2p.Peer) ([]protocol.ID, error) {
 }
 
 // PeerProtocols indicates an expected call of PeerProtocols.
-func (mr *MockhostMockRecorder) PeerProtocols(arg0 interface{}) *hostPeerProtocolsCall {
+func (mr *MockhostMockRecorder) PeerProtocols(arg0 any) *hostPeerProtocolsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerProtocols", reflect.TypeOf((*Mockhost)(nil).PeerProtocols), arg0)
 	return &hostPeerProtocolsCall{Call: call}
diff --git a/genvm/core/mocks/handler.go b/genvm/core/mocks/handler.go
index a38a903525..0ead71d8e0 100644
--- a/genvm/core/mocks/handler.go
+++ b/genvm/core/mocks/handler.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/spacemeshos/go-spacemesh/genvm/core (interfaces: Handler)
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/handler.go github.com/spacemeshos/go-spacemesh/genvm/core Handler
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -44,7 +48,7 @@ func (m *MockHandler) Args(arg0 byte) scale.Type {
 }
 
 // Args indicates an expected call of Args.
-func (mr *MockHandlerMockRecorder) Args(arg0 interface{}) *HandlerArgsCall {
+func (mr *MockHandlerMockRecorder) Args(arg0 any) *HandlerArgsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Args", reflect.TypeOf((*MockHandler)(nil).Args), arg0)
 	return &HandlerArgsCall{Call: call}
@@ -82,7 +86,7 @@ func (m *MockHandler) Exec(arg0 core.Host, arg1 byte, arg2 scale.Encodable) erro
 }
 
 // Exec indicates an expected call of Exec.
-func (mr *MockHandlerMockRecorder) Exec(arg0, arg1, arg2 interface{}) *HandlerExecCall {
+func (mr *MockHandlerMockRecorder) Exec(arg0, arg1, arg2 any) *HandlerExecCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockHandler)(nil).Exec), arg0, arg1, arg2)
 	return &HandlerExecCall{Call: call}
@@ -121,7 +125,7 @@ func (m *MockHandler) Load(arg0 []byte) (core.Template, error) {
 }
 
 // Load indicates an expected call of Load.
-func (mr *MockHandlerMockRecorder) Load(arg0 interface{}) *HandlerLoadCall {
+func (mr *MockHandlerMockRecorder) Load(arg0 any) *HandlerLoadCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Load", reflect.TypeOf((*MockHandler)(nil).Load), arg0)
 	return &HandlerLoadCall{Call: call}
@@ -151,7 +155,7 @@ func (c *HandlerLoadCall) DoAndReturn(f func([]byte) (core.Template, error)) *Ha
 }
 
 // New mocks base method.
-func (m *MockHandler) New(arg0 interface{}) (core.Template, error) {
+func (m *MockHandler) New(arg0 any) (core.Template, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "New", arg0)
 	ret0, _ := ret[0].(core.Template)
@@ -160,7 +164,7 @@ func (m *MockHandler) New(arg0 interface{}) (core.Template, error) {
 }
 
 // New indicates an expected call of New.
-func (mr *MockHandlerMockRecorder) New(arg0 interface{}) *HandlerNewCall {
+func (mr *MockHandlerMockRecorder) New(arg0 any) *HandlerNewCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockHandler)(nil).New), arg0)
 	return &HandlerNewCall{Call: call}
@@ -178,13 +182,13 @@ func (c *HandlerNewCall) Return(arg0 core.Template, arg1 error) *HandlerNewCall
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *HandlerNewCall) Do(f func(interface{}) (core.Template, error)) *HandlerNewCall {
+func (c *HandlerNewCall) Do(f func(any) (core.Template, error)) *HandlerNewCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *HandlerNewCall) DoAndReturn(f func(interface{}) (core.Template, error)) *HandlerNewCall {
+func (c *HandlerNewCall) DoAndReturn(f func(any) (core.Template, error)) *HandlerNewCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -199,7 +203,7 @@ func (m *MockHandler) Parse(arg0 core.Host, arg1 byte, arg2 *scale.Decoder) (cor
 }
 
 // Parse indicates an expected call of Parse.
-func (mr *MockHandlerMockRecorder) Parse(arg0, arg1, arg2 interface{}) *HandlerParseCall {
+func (mr *MockHandlerMockRecorder) Parse(arg0, arg1, arg2 any) *HandlerParseCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Parse", reflect.TypeOf((*MockHandler)(nil).Parse), arg0, arg1, arg2)
 	return &HandlerParseCall{Call: call}
diff --git a/genvm/core/mocks/template.go b/genvm/core/mocks/template.go
index 5fc890128f..35f6e4f46d 100644
--- a/genvm/core/mocks/template.go
+++ b/genvm/core/mocks/template.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/spacemeshos/go-spacemesh/genvm/core (interfaces: Template)
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/template.go github.com/spacemeshos/go-spacemesh/genvm/core Template
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -44,7 +48,7 @@ func (m *MockTemplate) BaseGas(arg0 byte) uint64 {
 }
 
 // BaseGas indicates an expected call of BaseGas.
-func (mr *MockTemplateMockRecorder) BaseGas(arg0 interface{}) *TemplateBaseGasCall {
+func (mr *MockTemplateMockRecorder) BaseGas(arg0 any) *TemplateBaseGasCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BaseGas", reflect.TypeOf((*MockTemplate)(nil).BaseGas), arg0)
 	return &TemplateBaseGasCall{Call: call}
@@ -83,7 +87,7 @@ func (m *MockTemplate) EncodeScale(arg0 *scale.Encoder) (int, error) {
 }
 
 // EncodeScale indicates an expected call of EncodeScale.
-func (mr *MockTemplateMockRecorder) EncodeScale(arg0 interface{}) *TemplateEncodeScaleCall {
+func (mr *MockTemplateMockRecorder) EncodeScale(arg0 any) *TemplateEncodeScaleCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EncodeScale", reflect.TypeOf((*MockTemplate)(nil).EncodeScale), arg0)
 	return &TemplateEncodeScaleCall{Call: call}
@@ -121,7 +125,7 @@ func (m *MockTemplate) ExecGas(arg0 byte) uint64 {
 }
 
 // ExecGas indicates an expected call of ExecGas.
-func (mr *MockTemplateMockRecorder) ExecGas(arg0 interface{}) *TemplateExecGasCall {
+func (mr *MockTemplateMockRecorder) ExecGas(arg0 any) *TemplateExecGasCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecGas", reflect.TypeOf((*MockTemplate)(nil).ExecGas), arg0)
 	return &TemplateExecGasCall{Call: call}
@@ -189,7 +193,7 @@ func (c *TemplateLoadGasCall) DoAndReturn(f func() uint64) *TemplateLoadGasCall
 }
 
 // MaxSpend mocks base method.
-func (m *MockTemplate) MaxSpend(arg0 byte, arg1 interface{}) (uint64, error) {
+func (m *MockTemplate) MaxSpend(arg0 byte, arg1 any) (uint64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "MaxSpend", arg0, arg1)
 	ret0, _ := ret[0].(uint64)
@@ -198,7 +202,7 @@ func (m *MockTemplate) MaxSpend(arg0 byte, arg1 interface{}) (uint64, error) {
 }
 
 // MaxSpend indicates an expected call of MaxSpend.
-func (mr *MockTemplateMockRecorder) MaxSpend(arg0, arg1 interface{}) *TemplateMaxSpendCall {
+func (mr *MockTemplateMockRecorder) MaxSpend(arg0, arg1 any) *TemplateMaxSpendCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MaxSpend", reflect.TypeOf((*MockTemplate)(nil).MaxSpend), arg0, arg1)
 	return &TemplateMaxSpendCall{Call: call}
@@ -216,13 +220,13 @@ func (c *TemplateMaxSpendCall) Return(arg0 uint64, arg1 error) *TemplateMaxSpend
 }
 
 // Do rewrite *gomock.Call.Do
-func (c *TemplateMaxSpendCall) Do(f func(byte, interface{}) (uint64, error)) *TemplateMaxSpendCall {
+func (c *TemplateMaxSpendCall) Do(f func(byte, any) (uint64, error)) *TemplateMaxSpendCall {
 	c.Call = c.Call.Do(f)
 	return c
 }
 
 // DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *TemplateMaxSpendCall) DoAndReturn(f func(byte, interface{}) (uint64, error)) *TemplateMaxSpendCall {
+func (c *TemplateMaxSpendCall) DoAndReturn(f func(byte, any) (uint64, error)) *TemplateMaxSpendCall {
 	c.Call = c.Call.DoAndReturn(f)
 	return c
 }
@@ -236,7 +240,7 @@ func (m *MockTemplate) Verify(arg0 core.Host, arg1 []byte, arg2 *scale.Decoder)
 }
 
 // Verify indicates an expected call of Verify.
-func (mr *MockTemplateMockRecorder) Verify(arg0, arg1, arg2 interface{}) *TemplateVerifyCall {
+func (mr *MockTemplateMockRecorder) Verify(arg0, arg1, arg2 any) *TemplateVerifyCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Verify", reflect.TypeOf((*MockTemplate)(nil).Verify), arg0, arg1, arg2)
 	return &TemplateVerifyCall{Call: call}
diff --git a/genvm/core/mocks/updater.go b/genvm/core/mocks/updater.go
index 81eadaadb2..ba04f7f189 100644
--- a/genvm/core/mocks/updater.go
+++ b/genvm/core/mocks/updater.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/spacemeshos/go-spacemesh/genvm/core (interfaces: AccountUpdater)
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/updater.go github.com/spacemeshos/go-spacemesh/genvm/core AccountUpdater
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -43,7 +47,7 @@ func (m *MockAccountUpdater) Update(arg0 types.Account) error {
 }
 
 // Update indicates an expected call of Update.
-func (mr *MockAccountUpdaterMockRecorder) Update(arg0 interface{}) *AccountUpdaterUpdateCall {
+func (mr *MockAccountUpdaterMockRecorder) Update(arg0 any) *AccountUpdaterUpdateCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockAccountUpdater)(nil).Update), arg0)
 	return &AccountUpdaterUpdateCall{Call: call}
diff --git a/hare/eligibility/mocks.go b/hare/eligibility/mocks.go
index ef823ab841..80d1f505cb 100644
--- a/hare/eligibility/mocks.go
+++ b/hare/eligibility/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=eligibility -destination=./mocks.go -source=./interface.go
+//
 // Package eligibility is a generated GoMock package.
 package eligibility
 
@@ -43,7 +47,7 @@ func (m *MockactiveSetCache) Add(key types.EpochID, value *cachedActiveSet) bool
 }
 
 // Add indicates an expected call of Add.
-func (mr *MockactiveSetCacheMockRecorder) Add(key, value interface{}) *activeSetCacheAddCall {
+func (mr *MockactiveSetCacheMockRecorder) Add(key, value any) *activeSetCacheAddCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockactiveSetCache)(nil).Add), key, value)
 	return &activeSetCacheAddCall{Call: call}
@@ -82,7 +86,7 @@ func (m *MockactiveSetCache) Get(key types.EpochID) (*cachedActiveSet, bool) {
 }
 
 // Get indicates an expected call of Get.
-func (mr *MockactiveSetCacheMockRecorder) Get(key interface{}) *activeSetCacheGetCall {
+func (mr *MockactiveSetCacheMockRecorder) Get(key any) *activeSetCacheGetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockactiveSetCache)(nil).Get), key)
 	return &activeSetCacheGetCall{Call: call}
@@ -143,7 +147,7 @@ func (m *MockvrfVerifier) Verify(nodeID types.NodeID, msg []byte, sig types.VrfS
 }
 
 // Verify indicates an expected call of Verify.
-func (mr *MockvrfVerifierMockRecorder) Verify(nodeID, msg, sig interface{}) *vrfVerifierVerifyCall {
+func (mr *MockvrfVerifierMockRecorder) Verify(nodeID, msg, sig any) *vrfVerifierVerifyCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Verify", reflect.TypeOf((*MockvrfVerifier)(nil).Verify), nodeID, msg, sig)
 	return &vrfVerifierVerifyCall{Call: call}
diff --git a/hare/mocks/mocks.go b/hare/mocks/mocks.go
index 6d3f8ce386..04b4b4706d 100644
--- a/hare/mocks/mocks.go
+++ b/hare/mocks/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interfaces.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/mocks.go -source=./interfaces.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -43,7 +47,7 @@ func (m *MocklayerPatrol) SetHareInCharge(arg0 types.LayerID) {
 }
 
 // SetHareInCharge indicates an expected call of SetHareInCharge.
-func (mr *MocklayerPatrolMockRecorder) SetHareInCharge(arg0 interface{}) *layerPatrolSetHareInChargeCall {
+func (mr *MocklayerPatrolMockRecorder) SetHareInCharge(arg0 any) *layerPatrolSetHareInChargeCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHareInCharge", reflect.TypeOf((*MocklayerPatrol)(nil).SetHareInCharge), arg0)
 	return &layerPatrolSetHareInChargeCall{Call: call}
@@ -105,7 +109,7 @@ func (m *MockRolacle) CalcEligibility(arg0 context.Context, arg1 types.LayerID,
 }
 
 // CalcEligibility indicates an expected call of CalcEligibility.
-func (mr *MockRolacleMockRecorder) CalcEligibility(arg0, arg1, arg2, arg3, arg4, arg5 interface{}) *RolacleCalcEligibilityCall {
+func (mr *MockRolacleMockRecorder) CalcEligibility(arg0, arg1, arg2, arg3, arg4, arg5 any) *RolacleCalcEligibilityCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CalcEligibility", reflect.TypeOf((*MockRolacle)(nil).CalcEligibility), arg0, arg1, arg2, arg3, arg4, arg5)
 	return &RolacleCalcEligibilityCall{Call: call}
@@ -144,7 +148,7 @@ func (m *MockRolacle) IsIdentityActiveOnConsensusView(arg0 context.Context, arg1
 }
 
 // IsIdentityActiveOnConsensusView indicates an expected call of IsIdentityActiveOnConsensusView.
-func (mr *MockRolacleMockRecorder) IsIdentityActiveOnConsensusView(arg0, arg1, arg2 interface{}) *RolacleIsIdentityActiveOnConsensusViewCall {
+func (mr *MockRolacleMockRecorder) IsIdentityActiveOnConsensusView(arg0, arg1, arg2 any) *RolacleIsIdentityActiveOnConsensusViewCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsIdentityActiveOnConsensusView", reflect.TypeOf((*MockRolacle)(nil).IsIdentityActiveOnConsensusView), arg0, arg1, arg2)
 	return &RolacleIsIdentityActiveOnConsensusViewCall{Call: call}
@@ -183,7 +187,7 @@ func (m *MockRolacle) Proof(arg0 context.Context, arg1 types.LayerID, arg2 uint3
 }
 
 // Proof indicates an expected call of Proof.
-func (mr *MockRolacleMockRecorder) Proof(arg0, arg1, arg2 interface{}) *RolacleProofCall {
+func (mr *MockRolacleMockRecorder) Proof(arg0, arg1, arg2 any) *RolacleProofCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Proof", reflect.TypeOf((*MockRolacle)(nil).Proof), arg0, arg1, arg2)
 	return &RolacleProofCall{Call: call}
@@ -222,7 +226,7 @@ func (m *MockRolacle) Validate(arg0 context.Context, arg1 types.LayerID, arg2 ui
 }
 
 // Validate indicates an expected call of Validate.
-func (mr *MockRolacleMockRecorder) Validate(arg0, arg1, arg2, arg3, arg4, arg5, arg6 interface{}) *RolacleValidateCall {
+func (mr *MockRolacleMockRecorder) Validate(arg0, arg1, arg2, arg3, arg4, arg5, arg6 any) *RolacleValidateCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validate", reflect.TypeOf((*MockRolacle)(nil).Validate), arg0, arg1, arg2, arg3, arg4, arg5, arg6)
 	return &RolacleValidateCall{Call: call}
@@ -284,7 +288,7 @@ func (m *MockstateQuerier) IsIdentityActiveOnConsensusView(arg0 context.Context,
 }
 
 // IsIdentityActiveOnConsensusView indicates an expected call of IsIdentityActiveOnConsensusView.
-func (mr *MockstateQuerierMockRecorder) IsIdentityActiveOnConsensusView(arg0, arg1, arg2 interface{}) *stateQuerierIsIdentityActiveOnConsensusViewCall {
+func (mr *MockstateQuerierMockRecorder) IsIdentityActiveOnConsensusView(arg0, arg1, arg2 any) *stateQuerierIsIdentityActiveOnConsensusViewCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsIdentityActiveOnConsensusView", reflect.TypeOf((*MockstateQuerier)(nil).IsIdentityActiveOnConsensusView), arg0, arg1, arg2)
 	return &stateQuerierIsIdentityActiveOnConsensusViewCall{Call: call}
@@ -346,7 +350,7 @@ func (m *Mockmesh) Ballot(arg0 types.BallotID) (*types.Ballot, error) {
 }
 
 // Ballot indicates an expected call of Ballot.
-func (mr *MockmeshMockRecorder) Ballot(arg0 interface{}) *meshBallotCall {
+func (mr *MockmeshMockRecorder) Ballot(arg0 any) *meshBallotCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ballot", reflect.TypeOf((*Mockmesh)(nil).Ballot), arg0)
 	return &meshBallotCall{Call: call}
@@ -423,7 +427,7 @@ func (m *Mockmesh) GetAtxHeader(arg0 types.ATXID) (*types.ActivationTxHeader, er
 }
 
 // GetAtxHeader indicates an expected call of GetAtxHeader.
-func (mr *MockmeshMockRecorder) GetAtxHeader(arg0 interface{}) *meshGetAtxHeaderCall {
+func (mr *MockmeshMockRecorder) GetAtxHeader(arg0 any) *meshGetAtxHeaderCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAtxHeader", reflect.TypeOf((*Mockmesh)(nil).GetAtxHeader), arg0)
 	return &meshGetAtxHeaderCall{Call: call}
@@ -462,7 +466,7 @@ func (m *Mockmesh) GetEpochAtx(arg0 types.EpochID, arg1 types.NodeID) (*types.Ac
 }
 
 // GetEpochAtx indicates an expected call of GetEpochAtx.
-func (mr *MockmeshMockRecorder) GetEpochAtx(arg0, arg1 interface{}) *meshGetEpochAtxCall {
+func (mr *MockmeshMockRecorder) GetEpochAtx(arg0, arg1 any) *meshGetEpochAtxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEpochAtx", reflect.TypeOf((*Mockmesh)(nil).GetEpochAtx), arg0, arg1)
 	return &meshGetEpochAtxCall{Call: call}
@@ -501,7 +505,7 @@ func (m *Mockmesh) GetMalfeasanceProof(arg0 types.NodeID) (*types.MalfeasancePro
 }
 
 // GetMalfeasanceProof indicates an expected call of GetMalfeasanceProof.
-func (mr *MockmeshMockRecorder) GetMalfeasanceProof(arg0 interface{}) *meshGetMalfeasanceProofCall {
+func (mr *MockmeshMockRecorder) GetMalfeasanceProof(arg0 any) *meshGetMalfeasanceProofCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMalfeasanceProof", reflect.TypeOf((*Mockmesh)(nil).GetMalfeasanceProof), arg0)
 	return &meshGetMalfeasanceProofCall{Call: call}
@@ -540,7 +544,7 @@ func (m *Mockmesh) Proposals(arg0 types.LayerID) ([]*types.Proposal, error) {
 }
 
 // Proposals indicates an expected call of Proposals.
-func (mr *MockmeshMockRecorder) Proposals(arg0 interface{}) *meshProposalsCall {
+func (mr *MockmeshMockRecorder) Proposals(arg0 any) *meshProposalsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Proposals", reflect.TypeOf((*Mockmesh)(nil).Proposals), arg0)
 	return &meshProposalsCall{Call: call}
@@ -601,7 +605,7 @@ func (m *MockweakCoin) Set(arg0 types.LayerID, arg1 bool) error {
 }
 
 // Set indicates an expected call of Set.
-func (mr *MockweakCoinMockRecorder) Set(arg0, arg1 interface{}) *weakCoinSetCall {
+func (mr *MockweakCoinMockRecorder) Set(arg0, arg1 any) *weakCoinSetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockweakCoin)(nil).Set), arg0, arg1)
 	return &weakCoinSetCall{Call: call}
diff --git a/log/log_mock.go b/log/log_mock.go
index aa6c6a6312..ff5565cbd9 100644
--- a/log/log_mock.go
+++ b/log/log_mock.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./log.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=log -destination=./log_mock.go -source=./log.go
+//
 // Package log is a generated GoMock package.
 package log
 
@@ -37,7 +41,7 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder {
 // Debug mocks base method.
 func (m *MockLogger) Debug(format string, args ...any) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{format}
+	varargs := []any{format}
 	for _, a := range args {
 		varargs = append(varargs, a)
 	}
@@ -45,9 +49,9 @@ func (m *MockLogger) Debug(format string, args ...any) {
 }
 
 // Debug indicates an expected call of Debug.
-func (mr *MockLoggerMockRecorder) Debug(format interface{}, args ...interface{}) *LoggerDebugCall {
+func (mr *MockLoggerMockRecorder) Debug(format any, args ...any) *LoggerDebugCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{format}, args...)
+	varargs := append([]any{format}, args...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), varargs...)
 	return &LoggerDebugCall{Call: call}
 }
@@ -78,7 +82,7 @@ func (c *LoggerDebugCall) DoAndReturn(f func(string, ...any)) *LoggerDebugCall {
 // Error mocks base method.
 func (m *MockLogger) Error(format string, args ...any) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{format}
+	varargs := []any{format}
 	for _, a := range args {
 		varargs = append(varargs, a)
 	}
@@ -86,9 +90,9 @@ func (m *MockLogger) Error(format string, args ...any) {
 }
 
 // Error indicates an expected call of Error.
-func (mr *MockLoggerMockRecorder) Error(format interface{}, args ...interface{}) *LoggerErrorCall {
+func (mr *MockLoggerMockRecorder) Error(format any, args ...any) *LoggerErrorCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{format}, args...)
+	varargs := append([]any{format}, args...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), varargs...)
 	return &LoggerErrorCall{Call: call}
 }
@@ -119,7 +123,7 @@ func (c *LoggerErrorCall) DoAndReturn(f func(string, ...any)) *LoggerErrorCall {
 // Info mocks base method.
 func (m *MockLogger) Info(format string, args ...any) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{format}
+	varargs := []any{format}
 	for _, a := range args {
 		varargs = append(varargs, a)
 	}
@@ -127,9 +131,9 @@ func (m *MockLogger) Info(format string, args ...any) {
 }
 
 // Info indicates an expected call of Info.
-func (mr *MockLoggerMockRecorder) Info(format interface{}, args ...interface{}) *LoggerInfoCall {
+func (mr *MockLoggerMockRecorder) Info(format any, args ...any) *LoggerInfoCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{format}, args...)
+	varargs := append([]any{format}, args...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), varargs...)
 	return &LoggerInfoCall{Call: call}
 }
@@ -160,7 +164,7 @@ func (c *LoggerInfoCall) DoAndReturn(f func(string, ...any)) *LoggerInfoCall {
 // Panic mocks base method.
 func (m *MockLogger) Panic(format string, args ...any) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{format}
+	varargs := []any{format}
 	for _, a := range args {
 		varargs = append(varargs, a)
 	}
@@ -168,9 +172,9 @@ func (m *MockLogger) Panic(format string, args ...any) {
 }
 
 // Panic indicates an expected call of Panic.
-func (mr *MockLoggerMockRecorder) Panic(format interface{}, args ...interface{}) *LoggerPanicCall {
+func (mr *MockLoggerMockRecorder) Panic(format any, args ...any) *LoggerPanicCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{format}, args...)
+	varargs := append([]any{format}, args...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Panic", reflect.TypeOf((*MockLogger)(nil).Panic), varargs...)
 	return &LoggerPanicCall{Call: call}
 }
@@ -201,7 +205,7 @@ func (c *LoggerPanicCall) DoAndReturn(f func(string, ...any)) *LoggerPanicCall {
 // Warning mocks base method.
 func (m *MockLogger) Warning(format string, args ...any) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{format}
+	varargs := []any{format}
 	for _, a := range args {
 		varargs = append(varargs, a)
 	}
@@ -209,9 +213,9 @@ func (m *MockLogger) Warning(format string, args ...any) {
 }
 
 // Warning indicates an expected call of Warning.
-func (mr *MockLoggerMockRecorder) Warning(format interface{}, args ...interface{}) *LoggerWarningCall {
+func (mr *MockLoggerMockRecorder) Warning(format any, args ...any) *LoggerWarningCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{format}, args...)
+	varargs := append([]any{format}, args...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warning", reflect.TypeOf((*MockLogger)(nil).Warning), varargs...)
 	return &LoggerWarningCall{Call: call}
 }
@@ -286,7 +290,7 @@ func (m *MockLogger) WithContext(arg0 context.Context) Log {
 }
 
 // WithContext indicates an expected call of WithContext.
-func (mr *MockLoggerMockRecorder) WithContext(arg0 interface{}) *LoggerWithContextCall {
+func (mr *MockLoggerMockRecorder) WithContext(arg0 any) *LoggerWithContextCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithContext", reflect.TypeOf((*MockLogger)(nil).WithContext), arg0)
 	return &LoggerWithContextCall{Call: call}
@@ -324,7 +328,7 @@ func (m *MockLogger) WithName(arg0 string) Log {
 }
 
 // WithName indicates an expected call of WithName.
-func (mr *MockLoggerMockRecorder) WithName(arg0 interface{}) *LoggerWithNameCall {
+func (mr *MockLoggerMockRecorder) WithName(arg0 any) *LoggerWithNameCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithName", reflect.TypeOf((*MockLogger)(nil).WithName), arg0)
 	return &LoggerWithNameCall{Call: call}
diff --git a/malfeasance/mocks.go b/malfeasance/mocks.go
index 466348c11d..266af624c7 100644
--- a/malfeasance/mocks.go
+++ b/malfeasance/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=malfeasance -destination=./mocks.go -source=./interface.go
+//
 // Package malfeasance is a generated GoMock package.
 package malfeasance
 
@@ -43,7 +47,7 @@ func (m *MockconsensusProtocol) HandleEligibility(arg0 context.Context, arg1 *ty
 }
 
 // HandleEligibility indicates an expected call of HandleEligibility.
-func (mr *MockconsensusProtocolMockRecorder) HandleEligibility(arg0, arg1 interface{}) *consensusProtocolHandleEligibilityCall {
+func (mr *MockconsensusProtocolMockRecorder) HandleEligibility(arg0, arg1 any) *consensusProtocolHandleEligibilityCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleEligibility", reflect.TypeOf((*MockconsensusProtocol)(nil).HandleEligibility), arg0, arg1)
 	return &consensusProtocolHandleEligibilityCall{Call: call}
@@ -104,7 +108,7 @@ func (m *MockSigVerifier) Verify(arg0 signing.Domain, arg1 types.NodeID, arg2 []
 }
 
 // Verify indicates an expected call of Verify.
-func (mr *MockSigVerifierMockRecorder) Verify(arg0, arg1, arg2, arg3 interface{}) *SigVerifierVerifyCall {
+func (mr *MockSigVerifierMockRecorder) Verify(arg0, arg1, arg2, arg3 any) *SigVerifierVerifyCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Verify", reflect.TypeOf((*MockSigVerifier)(nil).Verify), arg0, arg1, arg2, arg3)
 	return &SigVerifierVerifyCall{Call: call}
@@ -163,7 +167,7 @@ func (m *Mocktortoise) OnMalfeasance(arg0 types.NodeID) {
 }
 
 // OnMalfeasance indicates an expected call of OnMalfeasance.
-func (mr *MocktortoiseMockRecorder) OnMalfeasance(arg0 interface{}) *tortoiseOnMalfeasanceCall {
+func (mr *MocktortoiseMockRecorder) OnMalfeasance(arg0 any) *tortoiseOnMalfeasanceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnMalfeasance", reflect.TypeOf((*Mocktortoise)(nil).OnMalfeasance), arg0)
 	return &tortoiseOnMalfeasanceCall{Call: call}
diff --git a/mesh/mocks/mocks.go b/mesh/mocks/mocks.go
index 79bb070477..44fd6e6d44 100644
--- a/mesh/mocks/mocks.go
+++ b/mesh/mocks/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/mocks.go -source=./interface.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -45,7 +49,7 @@ func (m *MockconservativeState) LinkTXsWithBlock(arg0 types.LayerID, arg1 types.
 }
 
 // LinkTXsWithBlock indicates an expected call of LinkTXsWithBlock.
-func (mr *MockconservativeStateMockRecorder) LinkTXsWithBlock(arg0, arg1, arg2 interface{}) *conservativeStateLinkTXsWithBlockCall {
+func (mr *MockconservativeStateMockRecorder) LinkTXsWithBlock(arg0, arg1, arg2 any) *conservativeStateLinkTXsWithBlockCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkTXsWithBlock", reflect.TypeOf((*MockconservativeState)(nil).LinkTXsWithBlock), arg0, arg1, arg2)
 	return &conservativeStateLinkTXsWithBlockCall{Call: call}
@@ -83,7 +87,7 @@ func (m *MockconservativeState) LinkTXsWithProposal(arg0 types.LayerID, arg1 typ
 }
 
 // LinkTXsWithProposal indicates an expected call of LinkTXsWithProposal.
-func (mr *MockconservativeStateMockRecorder) LinkTXsWithProposal(arg0, arg1, arg2 interface{}) *conservativeStateLinkTXsWithProposalCall {
+func (mr *MockconservativeStateMockRecorder) LinkTXsWithProposal(arg0, arg1, arg2 any) *conservativeStateLinkTXsWithProposalCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkTXsWithProposal", reflect.TypeOf((*MockconservativeState)(nil).LinkTXsWithProposal), arg0, arg1, arg2)
 	return &conservativeStateLinkTXsWithProposalCall{Call: call}
@@ -121,7 +125,7 @@ func (m *MockconservativeState) RevertCache(arg0 types.LayerID) error {
 }
 
 // RevertCache indicates an expected call of RevertCache.
-func (mr *MockconservativeStateMockRecorder) RevertCache(arg0 interface{}) *conservativeStateRevertCacheCall {
+func (mr *MockconservativeStateMockRecorder) RevertCache(arg0 any) *conservativeStateRevertCacheCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevertCache", reflect.TypeOf((*MockconservativeState)(nil).RevertCache), arg0)
 	return &conservativeStateRevertCacheCall{Call: call}
@@ -159,7 +163,7 @@ func (m *MockconservativeState) UpdateCache(arg0 context.Context, arg1 types.Lay
 }
 
 // UpdateCache indicates an expected call of UpdateCache.
-func (mr *MockconservativeStateMockRecorder) UpdateCache(arg0, arg1, arg2, arg3, arg4 interface{}) *conservativeStateUpdateCacheCall {
+func (mr *MockconservativeStateMockRecorder) UpdateCache(arg0, arg1, arg2, arg3, arg4 any) *conservativeStateUpdateCacheCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateCache", reflect.TypeOf((*MockconservativeState)(nil).UpdateCache), arg0, arg1, arg2, arg3, arg4)
 	return &conservativeStateUpdateCacheCall{Call: call}
@@ -222,7 +226,7 @@ func (m *MockvmState) Apply(arg0 vm.ApplyContext, arg1 []types.Transaction, arg2
 }
 
 // Apply indicates an expected call of Apply.
-func (mr *MockvmStateMockRecorder) Apply(arg0, arg1, arg2 interface{}) *vmStateApplyCall {
+func (mr *MockvmStateMockRecorder) Apply(arg0, arg1, arg2 any) *vmStateApplyCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Apply", reflect.TypeOf((*MockvmState)(nil).Apply), arg0, arg1, arg2)
 	return &vmStateApplyCall{Call: call}
@@ -299,7 +303,7 @@ func (m *MockvmState) Revert(arg0 types.LayerID) error {
 }
 
 // Revert indicates an expected call of Revert.
-func (mr *MockvmStateMockRecorder) Revert(arg0 interface{}) *vmStateRevertCall {
+func (mr *MockvmStateMockRecorder) Revert(arg0 any) *vmStateRevertCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Revert", reflect.TypeOf((*MockvmState)(nil).Revert), arg0)
 	return &vmStateRevertCall{Call: call}
diff --git a/miner/mocks.go b/miner/mocks.go
index 77f4f4d1af..b3d55c6672 100644
--- a/miner/mocks.go
+++ b/miner/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=miner -destination=./mocks.go -source=./interface.go
+//
 // Package miner is a generated GoMock package.
 package miner
 
@@ -47,7 +51,7 @@ func (m *MockproposalOracle) ProposalEligibility(arg0 types.LayerID, arg1 types.
 }
 
 // ProposalEligibility indicates an expected call of ProposalEligibility.
-func (mr *MockproposalOracleMockRecorder) ProposalEligibility(arg0, arg1, arg2 interface{}) *proposalOracleProposalEligibilityCall {
+func (mr *MockproposalOracleMockRecorder) ProposalEligibility(arg0, arg1, arg2 any) *proposalOracleProposalEligibilityCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposalEligibility", reflect.TypeOf((*MockproposalOracle)(nil).ProposalEligibility), arg0, arg1, arg2)
 	return &proposalOracleProposalEligibilityCall{Call: call}
@@ -108,7 +112,7 @@ func (m *MockconservativeState) SelectProposalTXs(arg0 types.LayerID, arg1 int)
 }
 
 // SelectProposalTXs indicates an expected call of SelectProposalTXs.
-func (mr *MockconservativeStateMockRecorder) SelectProposalTXs(arg0, arg1 interface{}) *conservativeStateSelectProposalTXsCall {
+func (mr *MockconservativeStateMockRecorder) SelectProposalTXs(arg0, arg1 any) *conservativeStateSelectProposalTXsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SelectProposalTXs", reflect.TypeOf((*MockconservativeState)(nil).SelectProposalTXs), arg0, arg1)
 	return &conservativeStateSelectProposalTXsCall{Call: call}
@@ -163,7 +167,7 @@ func (m *MockvotesEncoder) EXPECT() *MockvotesEncoderMockRecorder {
 // EncodeVotes mocks base method.
 func (m *MockvotesEncoder) EncodeVotes(arg0 context.Context, arg1 ...tortoise.EncodeVotesOpts) (*types.Opinion, error) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0}
+	varargs := []any{arg0}
 	for _, a := range arg1 {
 		varargs = append(varargs, a)
 	}
@@ -174,9 +178,9 @@ func (m *MockvotesEncoder) EncodeVotes(arg0 context.Context, arg1 ...tortoise.En
 }
 
 // EncodeVotes indicates an expected call of EncodeVotes.
-func (mr *MockvotesEncoderMockRecorder) EncodeVotes(arg0 interface{}, arg1 ...interface{}) *votesEncoderEncodeVotesCall {
+func (mr *MockvotesEncoderMockRecorder) EncodeVotes(arg0 any, arg1 ...any) *votesEncoderEncodeVotesCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0}, arg1...)
+	varargs := append([]any{arg0}, arg1...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EncodeVotes", reflect.TypeOf((*MockvotesEncoder)(nil).EncodeVotes), varargs...)
 	return &votesEncoderEncodeVotesCall{Call: call}
 }
@@ -249,7 +253,7 @@ func (m *MockvotesEncoder) TallyVotes(arg0 context.Context, arg1 types.LayerID)
 }
 
 // TallyVotes indicates an expected call of TallyVotes.
-func (mr *MockvotesEncoderMockRecorder) TallyVotes(arg0, arg1 interface{}) *votesEncoderTallyVotesCall {
+func (mr *MockvotesEncoderMockRecorder) TallyVotes(arg0, arg1 any) *votesEncoderTallyVotesCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TallyVotes", reflect.TypeOf((*MockvotesEncoder)(nil).TallyVotes), arg0, arg1)
 	return &votesEncoderTallyVotesCall{Call: call}
@@ -311,7 +315,7 @@ func (m *MocknonceFetcher) VRFNonce(arg0 types.NodeID, arg1 types.EpochID) (type
 }
 
 // VRFNonce indicates an expected call of VRFNonce.
-func (mr *MocknonceFetcherMockRecorder) VRFNonce(arg0, arg1 interface{}) *nonceFetcherVRFNonceCall {
+func (mr *MocknonceFetcherMockRecorder) VRFNonce(arg0, arg1 any) *nonceFetcherVRFNonceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VRFNonce", reflect.TypeOf((*MocknonceFetcher)(nil).VRFNonce), arg0, arg1)
 	return &nonceFetcherVRFNonceCall{Call: call}
@@ -373,7 +377,7 @@ func (m *Mockmesh) GetMalfeasanceProof(nodeID types.NodeID) (*types.MalfeasanceP
 }
 
 // GetMalfeasanceProof indicates an expected call of GetMalfeasanceProof.
-func (mr *MockmeshMockRecorder) GetMalfeasanceProof(nodeID interface{}) *meshGetMalfeasanceProofCall {
+func (mr *MockmeshMockRecorder) GetMalfeasanceProof(nodeID any) *meshGetMalfeasanceProofCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMalfeasanceProof", reflect.TypeOf((*Mockmesh)(nil).GetMalfeasanceProof), nodeID)
 	return &meshGetMalfeasanceProofCall{Call: call}
@@ -434,7 +438,7 @@ func (m *MocklayerClock) AwaitLayer(layerID types.LayerID) <-chan struct{} {
 }
 
 // AwaitLayer indicates an expected call of AwaitLayer.
-func (mr *MocklayerClockMockRecorder) AwaitLayer(layerID interface{}) *layerClockAwaitLayerCall {
+func (mr *MocklayerClockMockRecorder) AwaitLayer(layerID any) *layerClockAwaitLayerCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AwaitLayer", reflect.TypeOf((*MocklayerClock)(nil).AwaitLayer), layerID)
 	return &layerClockAwaitLayerCall{Call: call}
@@ -510,7 +514,7 @@ func (m *MocklayerClock) LayerToTime(arg0 types.LayerID) time.Time {
 }
 
 // LayerToTime indicates an expected call of LayerToTime.
-func (mr *MocklayerClockMockRecorder) LayerToTime(arg0 interface{}) *layerClockLayerToTimeCall {
+func (mr *MocklayerClockMockRecorder) LayerToTime(arg0 any) *layerClockLayerToTimeCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LayerToTime", reflect.TypeOf((*MocklayerClock)(nil).LayerToTime), arg0)
 	return &layerClockLayerToTimeCall{Call: call}
diff --git a/p2p/pubsub/mocks/publisher.go b/p2p/pubsub/mocks/publisher.go
index 32a4646f61..03e6d60d4b 100644
--- a/p2p/pubsub/mocks/publisher.go
+++ b/p2p/pubsub/mocks/publisher.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./pubsub.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/publisher.go -source=./pubsub.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -44,7 +48,7 @@ func (m *MockPublisher) Publish(arg0 context.Context, arg1 string, arg2 []byte)
 }
 
 // Publish indicates an expected call of Publish.
-func (mr *MockPublisherMockRecorder) Publish(arg0, arg1, arg2 interface{}) *PublisherPublishCall {
+func (mr *MockPublisherMockRecorder) Publish(arg0, arg1, arg2 any) *PublisherPublishCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Publish", reflect.TypeOf((*MockPublisher)(nil).Publish), arg0, arg1, arg2)
 	return &PublisherPublishCall{Call: call}
@@ -99,7 +103,7 @@ func (m *MockSubscriber) EXPECT() *MockSubscriberMockRecorder {
 // Register mocks base method.
 func (m *MockSubscriber) Register(arg0 string, arg1 pubsub.GossipHandler, arg2 ...pubsub.ValidatorOpt) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0, arg1}
+	varargs := []any{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
 	}
@@ -107,9 +111,9 @@ func (m *MockSubscriber) Register(arg0 string, arg1 pubsub.GossipHandler, arg2 .
 }
 
 // Register indicates an expected call of Register.
-func (mr *MockSubscriberMockRecorder) Register(arg0, arg1 interface{}, arg2 ...interface{}) *SubscriberRegisterCall {
+func (mr *MockSubscriberMockRecorder) Register(arg0, arg1 any, arg2 ...any) *SubscriberRegisterCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0, arg1}, arg2...)
+	varargs := append([]any{arg0, arg1}, arg2...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Register", reflect.TypeOf((*MockSubscriber)(nil).Register), varargs...)
 	return &SubscriberRegisterCall{Call: call}
 }
@@ -169,7 +173,7 @@ func (m *MockPublishSubsciber) Publish(arg0 context.Context, arg1 string, arg2 [
 }
 
 // Publish indicates an expected call of Publish.
-func (mr *MockPublishSubsciberMockRecorder) Publish(arg0, arg1, arg2 interface{}) *PublishSubsciberPublishCall {
+func (mr *MockPublishSubsciberMockRecorder) Publish(arg0, arg1, arg2 any) *PublishSubsciberPublishCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Publish", reflect.TypeOf((*MockPublishSubsciber)(nil).Publish), arg0, arg1, arg2)
 	return &PublishSubsciberPublishCall{Call: call}
@@ -201,7 +205,7 @@ func (c *PublishSubsciberPublishCall) DoAndReturn(f func(context.Context, string
 // Register mocks base method.
 func (m *MockPublishSubsciber) Register(arg0 string, arg1 pubsub.GossipHandler, arg2 ...pubsub.ValidatorOpt) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0, arg1}
+	varargs := []any{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
 	}
@@ -209,9 +213,9 @@ func (m *MockPublishSubsciber) Register(arg0 string, arg1 pubsub.GossipHandler,
 }
 
 // Register indicates an expected call of Register.
-func (mr *MockPublishSubsciberMockRecorder) Register(arg0, arg1 interface{}, arg2 ...interface{}) *PublishSubsciberRegisterCall {
+func (mr *MockPublishSubsciberMockRecorder) Register(arg0, arg1 any, arg2 ...any) *PublishSubsciberRegisterCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0, arg1}, arg2...)
+	varargs := append([]any{arg0, arg1}, arg2...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Register", reflect.TypeOf((*MockPublishSubsciber)(nil).Register), varargs...)
 	return &PublishSubsciberRegisterCall{Call: call}
 }
diff --git a/p2p/server/mocks/mocks.go b/p2p/server/mocks/mocks.go
index b9cc09c091..50557f6320 100644
--- a/p2p/server/mocks/mocks.go
+++ b/p2p/server/mocks/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./server.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/mocks.go -source=./server.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -78,7 +82,7 @@ func (c *HostNetworkCall) DoAndReturn(f func() network.Network) *HostNetworkCall
 // NewStream mocks base method.
 func (m *MockHost) NewStream(arg0 context.Context, arg1 peer.ID, arg2 ...protocol.ID) (network.Stream, error) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0, arg1}
+	varargs := []any{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
 	}
@@ -89,9 +93,9 @@ func (m *MockHost) NewStream(arg0 context.Context, arg1 peer.ID, arg2 ...protoco
 }
 
 // NewStream indicates an expected call of NewStream.
-func (mr *MockHostMockRecorder) NewStream(arg0, arg1 interface{}, arg2 ...interface{}) *HostNewStreamCall {
+func (mr *MockHostMockRecorder) NewStream(arg0, arg1 any, arg2 ...any) *HostNewStreamCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0, arg1}, arg2...)
+	varargs := append([]any{arg0, arg1}, arg2...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewStream", reflect.TypeOf((*MockHost)(nil).NewStream), varargs...)
 	return &HostNewStreamCall{Call: call}
 }
@@ -126,7 +130,7 @@ func (m *MockHost) SetStreamHandler(arg0 protocol.ID, arg1 network.StreamHandler
 }
 
 // SetStreamHandler indicates an expected call of SetStreamHandler.
-func (mr *MockHostMockRecorder) SetStreamHandler(arg0, arg1 interface{}) *HostSetStreamHandlerCall {
+func (mr *MockHostMockRecorder) SetStreamHandler(arg0, arg1 any) *HostSetStreamHandlerCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetStreamHandler", reflect.TypeOf((*MockHost)(nil).SetStreamHandler), arg0, arg1)
 	return &HostSetStreamHandlerCall{Call: call}
diff --git a/proposals/mocks.go b/proposals/mocks.go
index 72d52582e6..4c7918c393 100644
--- a/proposals/mocks.go
+++ b/proposals/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=proposals -destination=./mocks.go -source=./interface.go
+//
 // Package proposals is a generated GoMock package.
 package proposals
 
@@ -47,7 +51,7 @@ func (m *MockmeshProvider) AddBallot(arg0 context.Context, arg1 *types.Ballot) (
 }
 
 // AddBallot indicates an expected call of AddBallot.
-func (mr *MockmeshProviderMockRecorder) AddBallot(arg0, arg1 interface{}) *meshProviderAddBallotCall {
+func (mr *MockmeshProviderMockRecorder) AddBallot(arg0, arg1 any) *meshProviderAddBallotCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddBallot", reflect.TypeOf((*MockmeshProvider)(nil).AddBallot), arg0, arg1)
 	return &meshProviderAddBallotCall{Call: call}
@@ -85,7 +89,7 @@ func (m *MockmeshProvider) AddTXsFromProposal(arg0 context.Context, arg1 types.L
 }
 
 // AddTXsFromProposal indicates an expected call of AddTXsFromProposal.
-func (mr *MockmeshProviderMockRecorder) AddTXsFromProposal(arg0, arg1, arg2, arg3 interface{}) *meshProviderAddTXsFromProposalCall {
+func (mr *MockmeshProviderMockRecorder) AddTXsFromProposal(arg0, arg1, arg2, arg3 any) *meshProviderAddTXsFromProposalCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddTXsFromProposal", reflect.TypeOf((*MockmeshProvider)(nil).AddTXsFromProposal), arg0, arg1, arg2, arg3)
 	return &meshProviderAddTXsFromProposalCall{Call: call}
@@ -185,7 +189,7 @@ func (m *MockeligibilityValidator) CheckEligibility(arg0 context.Context, arg1 *
 }
 
 // CheckEligibility indicates an expected call of CheckEligibility.
-func (mr *MockeligibilityValidatorMockRecorder) CheckEligibility(arg0, arg1, arg2 interface{}) *eligibilityValidatorCheckEligibilityCall {
+func (mr *MockeligibilityValidatorMockRecorder) CheckEligibility(arg0, arg1, arg2 any) *eligibilityValidatorCheckEligibilityCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckEligibility", reflect.TypeOf((*MockeligibilityValidator)(nil).CheckEligibility), arg0, arg1, arg2)
 	return &eligibilityValidatorCheckEligibilityCall{Call: call}
@@ -247,7 +251,7 @@ func (m *MocktortoiseProvider) DecodeBallot(arg0 *types.BallotTortoiseData) (*to
 }
 
 // DecodeBallot indicates an expected call of DecodeBallot.
-func (mr *MocktortoiseProviderMockRecorder) DecodeBallot(arg0 interface{}) *tortoiseProviderDecodeBallotCall {
+func (mr *MocktortoiseProviderMockRecorder) DecodeBallot(arg0 any) *tortoiseProviderDecodeBallotCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DecodeBallot", reflect.TypeOf((*MocktortoiseProvider)(nil).DecodeBallot), arg0)
 	return &tortoiseProviderDecodeBallotCall{Call: call}
@@ -285,7 +289,7 @@ func (m *MocktortoiseProvider) GetBallot(arg0 types.BallotID) *tortoise.BallotDa
 }
 
 // GetBallot indicates an expected call of GetBallot.
-func (mr *MocktortoiseProviderMockRecorder) GetBallot(arg0 interface{}) *tortoiseProviderGetBallotCall {
+func (mr *MocktortoiseProviderMockRecorder) GetBallot(arg0 any) *tortoiseProviderGetBallotCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBallot", reflect.TypeOf((*MocktortoiseProvider)(nil).GetBallot), arg0)
 	return &tortoiseProviderGetBallotCall{Call: call}
@@ -323,7 +327,7 @@ func (m *MocktortoiseProvider) GetMissingActiveSet(arg0 types.EpochID, arg1 []ty
 }
 
 // GetMissingActiveSet indicates an expected call of GetMissingActiveSet.
-func (mr *MocktortoiseProviderMockRecorder) GetMissingActiveSet(arg0, arg1 interface{}) *tortoiseProviderGetMissingActiveSetCall {
+func (mr *MocktortoiseProviderMockRecorder) GetMissingActiveSet(arg0, arg1 any) *tortoiseProviderGetMissingActiveSetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMissingActiveSet", reflect.TypeOf((*MocktortoiseProvider)(nil).GetMissingActiveSet), arg0, arg1)
 	return &tortoiseProviderGetMissingActiveSetCall{Call: call}
@@ -361,7 +365,7 @@ func (m *MocktortoiseProvider) StoreBallot(arg0 *tortoise.DecodedBallot) error {
 }
 
 // StoreBallot indicates an expected call of StoreBallot.
-func (mr *MocktortoiseProviderMockRecorder) StoreBallot(arg0 interface{}) *tortoiseProviderStoreBallotCall {
+func (mr *MocktortoiseProviderMockRecorder) StoreBallot(arg0 any) *tortoiseProviderStoreBallotCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreBallot", reflect.TypeOf((*MocktortoiseProvider)(nil).StoreBallot), arg0)
 	return &tortoiseProviderStoreBallotCall{Call: call}
@@ -422,7 +426,7 @@ func (m *MockvrfVerifier) Verify(arg0 types.NodeID, arg1 []byte, arg2 types.VrfS
 }
 
 // Verify indicates an expected call of Verify.
-func (mr *MockvrfVerifierMockRecorder) Verify(arg0, arg1, arg2 interface{}) *vrfVerifierVerifyCall {
+func (mr *MockvrfVerifierMockRecorder) Verify(arg0, arg1, arg2 any) *vrfVerifierVerifyCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Verify", reflect.TypeOf((*MockvrfVerifier)(nil).Verify), arg0, arg1, arg2)
 	return &vrfVerifierVerifyCall{Call: call}
@@ -484,7 +488,7 @@ func (m *MocknonceFetcher) VRFNonce(arg0 types.NodeID, arg1 types.EpochID) (type
 }
 
 // VRFNonce indicates an expected call of VRFNonce.
-func (mr *MocknonceFetcherMockRecorder) VRFNonce(arg0, arg1 interface{}) *nonceFetcherVRFNonceCall {
+func (mr *MocknonceFetcherMockRecorder) VRFNonce(arg0, arg1 any) *nonceFetcherVRFNonceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VRFNonce", reflect.TypeOf((*MocknonceFetcher)(nil).VRFNonce), arg0, arg1)
 	return &nonceFetcherVRFNonceCall{Call: call}
@@ -583,7 +587,7 @@ func (m *MocklayerClock) LayerToTime(arg0 types.LayerID) time.Time {
 }
 
 // LayerToTime indicates an expected call of LayerToTime.
-func (mr *MocklayerClockMockRecorder) LayerToTime(arg0 interface{}) *layerClockLayerToTimeCall {
+func (mr *MocklayerClockMockRecorder) LayerToTime(arg0 any) *layerClockLayerToTimeCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LayerToTime", reflect.TypeOf((*MocklayerClock)(nil).LayerToTime), arg0)
 	return &layerClockLayerToTimeCall{Call: call}
diff --git a/prune/mocks.go b/prune/mocks.go
index 41857e78ab..328eb8db10 100644
--- a/prune/mocks.go
+++ b/prune/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=prune -destination=./mocks.go -source=./interface.go
+//
 // Package prune is a generated GoMock package.
 package prune
 
diff --git a/syncer/blockssync/mocks.go b/syncer/blockssync/mocks.go
index 3e97a07566..cbbbca4e81 100644
--- a/syncer/blockssync/mocks.go
+++ b/syncer/blockssync/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./blocks.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=blockssync -destination=./mocks.go -source=./blocks.go
+//
 // Package blockssync is a generated GoMock package.
 package blockssync
 
@@ -44,7 +48,7 @@ func (m *MockblockFetcher) GetBlocks(arg0 context.Context, arg1 []types.BlockID)
 }
 
 // GetBlocks indicates an expected call of GetBlocks.
-func (mr *MockblockFetcherMockRecorder) GetBlocks(arg0, arg1 interface{}) *blockFetcherGetBlocksCall {
+func (mr *MockblockFetcherMockRecorder) GetBlocks(arg0, arg1 any) *blockFetcherGetBlocksCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocks", reflect.TypeOf((*MockblockFetcher)(nil).GetBlocks), arg0, arg1)
 	return &blockFetcherGetBlocksCall{Call: call}
diff --git a/syncer/mocks/mocks.go b/syncer/mocks/mocks.go
index 94dd836fb4..53eb33263c 100644
--- a/syncer/mocks/mocks.go
+++ b/syncer/mocks/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/mocks.go -source=./interface.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -106,7 +110,7 @@ func (m *MockmeshProvider) SetZeroBlockLayer(arg0 context.Context, arg1 types.La
 }
 
 // SetZeroBlockLayer indicates an expected call of SetZeroBlockLayer.
-func (mr *MockmeshProviderMockRecorder) SetZeroBlockLayer(arg0, arg1 interface{}) *meshProviderSetZeroBlockLayerCall {
+func (mr *MockmeshProviderMockRecorder) SetZeroBlockLayer(arg0, arg1 any) *meshProviderSetZeroBlockLayerCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetZeroBlockLayer", reflect.TypeOf((*MockmeshProvider)(nil).SetZeroBlockLayer), arg0, arg1)
 	return &meshProviderSetZeroBlockLayerCall{Call: call}
@@ -167,7 +171,7 @@ func (m *MockactiveSetCache) GetMissingActiveSet(arg0 types.EpochID, arg1 []type
 }
 
 // GetMissingActiveSet indicates an expected call of GetMissingActiveSet.
-func (mr *MockactiveSetCacheMockRecorder) GetMissingActiveSet(arg0, arg1 interface{}) *activeSetCacheGetMissingActiveSetCall {
+func (mr *MockactiveSetCacheMockRecorder) GetMissingActiveSet(arg0, arg1 any) *activeSetCacheGetMissingActiveSetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMissingActiveSet", reflect.TypeOf((*MockactiveSetCache)(nil).GetMissingActiveSet), arg0, arg1)
 	return &activeSetCacheGetMissingActiveSetCall{Call: call}
@@ -228,7 +232,7 @@ func (m *MockfetchLogic) GetAtxs(arg0 context.Context, arg1 []types.ATXID) error
 }
 
 // GetAtxs indicates an expected call of GetAtxs.
-func (mr *MockfetchLogicMockRecorder) GetAtxs(arg0, arg1 interface{}) *fetchLogicGetAtxsCall {
+func (mr *MockfetchLogicMockRecorder) GetAtxs(arg0, arg1 any) *fetchLogicGetAtxsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAtxs", reflect.TypeOf((*MockfetchLogic)(nil).GetAtxs), arg0, arg1)
 	return &fetchLogicGetAtxsCall{Call: call}
@@ -266,7 +270,7 @@ func (m *MockfetchLogic) GetBallots(arg0 context.Context, arg1 []types.BallotID)
 }
 
 // GetBallots indicates an expected call of GetBallots.
-func (mr *MockfetchLogicMockRecorder) GetBallots(arg0, arg1 interface{}) *fetchLogicGetBallotsCall {
+func (mr *MockfetchLogicMockRecorder) GetBallots(arg0, arg1 any) *fetchLogicGetBallotsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBallots", reflect.TypeOf((*MockfetchLogic)(nil).GetBallots), arg0, arg1)
 	return &fetchLogicGetBallotsCall{Call: call}
@@ -304,7 +308,7 @@ func (m *MockfetchLogic) GetBlocks(arg0 context.Context, arg1 []types.BlockID) e
 }
 
 // GetBlocks indicates an expected call of GetBlocks.
-func (mr *MockfetchLogicMockRecorder) GetBlocks(arg0, arg1 interface{}) *fetchLogicGetBlocksCall {
+func (mr *MockfetchLogicMockRecorder) GetBlocks(arg0, arg1 any) *fetchLogicGetBlocksCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocks", reflect.TypeOf((*MockfetchLogic)(nil).GetBlocks), arg0, arg1)
 	return &fetchLogicGetBlocksCall{Call: call}
@@ -343,7 +347,7 @@ func (m *MockfetchLogic) GetCert(arg0 context.Context, arg1 types.LayerID, arg2
 }
 
 // GetCert indicates an expected call of GetCert.
-func (mr *MockfetchLogicMockRecorder) GetCert(arg0, arg1, arg2, arg3 interface{}) *fetchLogicGetCertCall {
+func (mr *MockfetchLogicMockRecorder) GetCert(arg0, arg1, arg2, arg3 any) *fetchLogicGetCertCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCert", reflect.TypeOf((*MockfetchLogic)(nil).GetCert), arg0, arg1, arg2, arg3)
 	return &fetchLogicGetCertCall{Call: call}
@@ -381,7 +385,7 @@ func (m *MockfetchLogic) GetEpochATXs(arg0 context.Context, arg1 types.EpochID)
 }
 
 // GetEpochATXs indicates an expected call of GetEpochATXs.
-func (mr *MockfetchLogicMockRecorder) GetEpochATXs(arg0, arg1 interface{}) *fetchLogicGetEpochATXsCall {
+func (mr *MockfetchLogicMockRecorder) GetEpochATXs(arg0, arg1 any) *fetchLogicGetEpochATXsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEpochATXs", reflect.TypeOf((*MockfetchLogic)(nil).GetEpochATXs), arg0, arg1)
 	return &fetchLogicGetEpochATXsCall{Call: call}
@@ -419,7 +423,7 @@ func (m *MockfetchLogic) GetLayerData(arg0 context.Context, arg1 []p2p.Peer, arg
 }
 
 // GetLayerData indicates an expected call of GetLayerData.
-func (mr *MockfetchLogicMockRecorder) GetLayerData(arg0, arg1, arg2, arg3, arg4 interface{}) *fetchLogicGetLayerDataCall {
+func (mr *MockfetchLogicMockRecorder) GetLayerData(arg0, arg1, arg2, arg3, arg4 any) *fetchLogicGetLayerDataCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLayerData", reflect.TypeOf((*MockfetchLogic)(nil).GetLayerData), arg0, arg1, arg2, arg3, arg4)
 	return &fetchLogicGetLayerDataCall{Call: call}
@@ -457,7 +461,7 @@ func (m *MockfetchLogic) GetLayerOpinions(arg0 context.Context, arg1 []p2p.Peer,
 }
 
 // GetLayerOpinions indicates an expected call of GetLayerOpinions.
-func (mr *MockfetchLogicMockRecorder) GetLayerOpinions(arg0, arg1, arg2, arg3, arg4 interface{}) *fetchLogicGetLayerOpinionsCall {
+func (mr *MockfetchLogicMockRecorder) GetLayerOpinions(arg0, arg1, arg2, arg3, arg4 any) *fetchLogicGetLayerOpinionsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLayerOpinions", reflect.TypeOf((*MockfetchLogic)(nil).GetLayerOpinions), arg0, arg1, arg2, arg3, arg4)
 	return &fetchLogicGetLayerOpinionsCall{Call: call}
@@ -495,7 +499,7 @@ func (m *MockfetchLogic) GetMalfeasanceProofs(arg0 context.Context, arg1 []types
 }
 
 // GetMalfeasanceProofs indicates an expected call of GetMalfeasanceProofs.
-func (mr *MockfetchLogicMockRecorder) GetMalfeasanceProofs(arg0, arg1 interface{}) *fetchLogicGetMalfeasanceProofsCall {
+func (mr *MockfetchLogicMockRecorder) GetMalfeasanceProofs(arg0, arg1 any) *fetchLogicGetMalfeasanceProofsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMalfeasanceProofs", reflect.TypeOf((*MockfetchLogic)(nil).GetMalfeasanceProofs), arg0, arg1)
 	return &fetchLogicGetMalfeasanceProofsCall{Call: call}
@@ -533,7 +537,7 @@ func (m *MockfetchLogic) GetMaliciousIDs(arg0 context.Context, arg1 []p2p.Peer,
 }
 
 // GetMaliciousIDs indicates an expected call of GetMaliciousIDs.
-func (mr *MockfetchLogicMockRecorder) GetMaliciousIDs(arg0, arg1, arg2, arg3 interface{}) *fetchLogicGetMaliciousIDsCall {
+func (mr *MockfetchLogicMockRecorder) GetMaliciousIDs(arg0, arg1, arg2, arg3 any) *fetchLogicGetMaliciousIDsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMaliciousIDs", reflect.TypeOf((*MockfetchLogic)(nil).GetMaliciousIDs), arg0, arg1, arg2, arg3)
 	return &fetchLogicGetMaliciousIDsCall{Call: call}
@@ -610,7 +614,7 @@ func (m *MockfetchLogic) PeerEpochInfo(arg0 context.Context, arg1 p2p.Peer, arg2
 }
 
 // PeerEpochInfo indicates an expected call of PeerEpochInfo.
-func (mr *MockfetchLogicMockRecorder) PeerEpochInfo(arg0, arg1, arg2 interface{}) *fetchLogicPeerEpochInfoCall {
+func (mr *MockfetchLogicMockRecorder) PeerEpochInfo(arg0, arg1, arg2 any) *fetchLogicPeerEpochInfoCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerEpochInfo", reflect.TypeOf((*MockfetchLogic)(nil).PeerEpochInfo), arg0, arg1, arg2)
 	return &fetchLogicPeerEpochInfoCall{Call: call}
@@ -649,7 +653,7 @@ func (m *MockfetchLogic) PeerMeshHashes(arg0 context.Context, arg1 p2p.Peer, arg
 }
 
 // PeerMeshHashes indicates an expected call of PeerMeshHashes.
-func (mr *MockfetchLogicMockRecorder) PeerMeshHashes(arg0, arg1, arg2 interface{}) *fetchLogicPeerMeshHashesCall {
+func (mr *MockfetchLogicMockRecorder) PeerMeshHashes(arg0, arg1, arg2 any) *fetchLogicPeerMeshHashesCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerMeshHashes", reflect.TypeOf((*MockfetchLogic)(nil).PeerMeshHashes), arg0, arg1, arg2)
 	return &fetchLogicPeerMeshHashesCall{Call: call}
@@ -681,7 +685,7 @@ func (c *fetchLogicPeerMeshHashesCall) DoAndReturn(f func(context.Context, p2p.P
 // PollLayerData mocks base method.
 func (m *MockfetchLogic) PollLayerData(arg0 context.Context, arg1 types.LayerID, arg2 ...p2p.Peer) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0, arg1}
+	varargs := []any{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
 	}
@@ -691,9 +695,9 @@ func (m *MockfetchLogic) PollLayerData(arg0 context.Context, arg1 types.LayerID,
 }
 
 // PollLayerData indicates an expected call of PollLayerData.
-func (mr *MockfetchLogicMockRecorder) PollLayerData(arg0, arg1 interface{}, arg2 ...interface{}) *fetchLogicPollLayerDataCall {
+func (mr *MockfetchLogicMockRecorder) PollLayerData(arg0, arg1 any, arg2 ...any) *fetchLogicPollLayerDataCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0, arg1}, arg2...)
+	varargs := append([]any{arg0, arg1}, arg2...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PollLayerData", reflect.TypeOf((*MockfetchLogic)(nil).PollLayerData), varargs...)
 	return &fetchLogicPollLayerDataCall{Call: call}
 }
@@ -732,7 +736,7 @@ func (m *MockfetchLogic) PollLayerOpinions(arg0 context.Context, arg1 types.Laye
 }
 
 // PollLayerOpinions indicates an expected call of PollLayerOpinions.
-func (mr *MockfetchLogicMockRecorder) PollLayerOpinions(arg0, arg1, arg2, arg3 interface{}) *fetchLogicPollLayerOpinionsCall {
+func (mr *MockfetchLogicMockRecorder) PollLayerOpinions(arg0, arg1, arg2, arg3 any) *fetchLogicPollLayerOpinionsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PollLayerOpinions", reflect.TypeOf((*MockfetchLogic)(nil).PollLayerOpinions), arg0, arg1, arg2, arg3)
 	return &fetchLogicPollLayerOpinionsCall{Call: call}
@@ -770,7 +774,7 @@ func (m *MockfetchLogic) PollMaliciousProofs(ctx context.Context) error {
 }
 
 // PollMaliciousProofs indicates an expected call of PollMaliciousProofs.
-func (mr *MockfetchLogicMockRecorder) PollMaliciousProofs(ctx interface{}) *fetchLogicPollMaliciousProofsCall {
+func (mr *MockfetchLogicMockRecorder) PollMaliciousProofs(ctx any) *fetchLogicPollMaliciousProofsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PollMaliciousProofs", reflect.TypeOf((*MockfetchLogic)(nil).PollMaliciousProofs), ctx)
 	return &fetchLogicPollMaliciousProofsCall{Call: call}
@@ -806,7 +810,7 @@ func (m *MockfetchLogic) RegisterPeerHashes(peer p2p.Peer, hashes []types.Hash32
 }
 
 // RegisterPeerHashes indicates an expected call of RegisterPeerHashes.
-func (mr *MockfetchLogicMockRecorder) RegisterPeerHashes(peer, hashes interface{}) *fetchLogicRegisterPeerHashesCall {
+func (mr *MockfetchLogicMockRecorder) RegisterPeerHashes(peer, hashes any) *fetchLogicRegisterPeerHashesCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterPeerHashes", reflect.TypeOf((*MockfetchLogic)(nil).RegisterPeerHashes), peer, hashes)
 	return &fetchLogicRegisterPeerHashesCall{Call: call}
@@ -867,7 +871,7 @@ func (m *Mockfetcher) GetAtxs(arg0 context.Context, arg1 []types.ATXID) error {
 }
 
 // GetAtxs indicates an expected call of GetAtxs.
-func (mr *MockfetcherMockRecorder) GetAtxs(arg0, arg1 interface{}) *fetcherGetAtxsCall {
+func (mr *MockfetcherMockRecorder) GetAtxs(arg0, arg1 any) *fetcherGetAtxsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAtxs", reflect.TypeOf((*Mockfetcher)(nil).GetAtxs), arg0, arg1)
 	return &fetcherGetAtxsCall{Call: call}
@@ -905,7 +909,7 @@ func (m *Mockfetcher) GetBallots(arg0 context.Context, arg1 []types.BallotID) er
 }
 
 // GetBallots indicates an expected call of GetBallots.
-func (mr *MockfetcherMockRecorder) GetBallots(arg0, arg1 interface{}) *fetcherGetBallotsCall {
+func (mr *MockfetcherMockRecorder) GetBallots(arg0, arg1 any) *fetcherGetBallotsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBallots", reflect.TypeOf((*Mockfetcher)(nil).GetBallots), arg0, arg1)
 	return &fetcherGetBallotsCall{Call: call}
@@ -943,7 +947,7 @@ func (m *Mockfetcher) GetBlocks(arg0 context.Context, arg1 []types.BlockID) erro
 }
 
 // GetBlocks indicates an expected call of GetBlocks.
-func (mr *MockfetcherMockRecorder) GetBlocks(arg0, arg1 interface{}) *fetcherGetBlocksCall {
+func (mr *MockfetcherMockRecorder) GetBlocks(arg0, arg1 any) *fetcherGetBlocksCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocks", reflect.TypeOf((*Mockfetcher)(nil).GetBlocks), arg0, arg1)
 	return &fetcherGetBlocksCall{Call: call}
@@ -982,7 +986,7 @@ func (m *Mockfetcher) GetCert(arg0 context.Context, arg1 types.LayerID, arg2 typ
 }
 
 // GetCert indicates an expected call of GetCert.
-func (mr *MockfetcherMockRecorder) GetCert(arg0, arg1, arg2, arg3 interface{}) *fetcherGetCertCall {
+func (mr *MockfetcherMockRecorder) GetCert(arg0, arg1, arg2, arg3 any) *fetcherGetCertCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCert", reflect.TypeOf((*Mockfetcher)(nil).GetCert), arg0, arg1, arg2, arg3)
 	return &fetcherGetCertCall{Call: call}
@@ -1020,7 +1024,7 @@ func (m *Mockfetcher) GetLayerData(arg0 context.Context, arg1 []p2p.Peer, arg2 t
 }
 
 // GetLayerData indicates an expected call of GetLayerData.
-func (mr *MockfetcherMockRecorder) GetLayerData(arg0, arg1, arg2, arg3, arg4 interface{}) *fetcherGetLayerDataCall {
+func (mr *MockfetcherMockRecorder) GetLayerData(arg0, arg1, arg2, arg3, arg4 any) *fetcherGetLayerDataCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLayerData", reflect.TypeOf((*Mockfetcher)(nil).GetLayerData), arg0, arg1, arg2, arg3, arg4)
 	return &fetcherGetLayerDataCall{Call: call}
@@ -1058,7 +1062,7 @@ func (m *Mockfetcher) GetLayerOpinions(arg0 context.Context, arg1 []p2p.Peer, ar
 }
 
 // GetLayerOpinions indicates an expected call of GetLayerOpinions.
-func (mr *MockfetcherMockRecorder) GetLayerOpinions(arg0, arg1, arg2, arg3, arg4 interface{}) *fetcherGetLayerOpinionsCall {
+func (mr *MockfetcherMockRecorder) GetLayerOpinions(arg0, arg1, arg2, arg3, arg4 any) *fetcherGetLayerOpinionsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLayerOpinions", reflect.TypeOf((*Mockfetcher)(nil).GetLayerOpinions), arg0, arg1, arg2, arg3, arg4)
 	return &fetcherGetLayerOpinionsCall{Call: call}
@@ -1096,7 +1100,7 @@ func (m *Mockfetcher) GetMalfeasanceProofs(arg0 context.Context, arg1 []types.No
 }
 
 // GetMalfeasanceProofs indicates an expected call of GetMalfeasanceProofs.
-func (mr *MockfetcherMockRecorder) GetMalfeasanceProofs(arg0, arg1 interface{}) *fetcherGetMalfeasanceProofsCall {
+func (mr *MockfetcherMockRecorder) GetMalfeasanceProofs(arg0, arg1 any) *fetcherGetMalfeasanceProofsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMalfeasanceProofs", reflect.TypeOf((*Mockfetcher)(nil).GetMalfeasanceProofs), arg0, arg1)
 	return &fetcherGetMalfeasanceProofsCall{Call: call}
@@ -1134,7 +1138,7 @@ func (m *Mockfetcher) GetMaliciousIDs(arg0 context.Context, arg1 []p2p.Peer, arg
 }
 
 // GetMaliciousIDs indicates an expected call of GetMaliciousIDs.
-func (mr *MockfetcherMockRecorder) GetMaliciousIDs(arg0, arg1, arg2, arg3 interface{}) *fetcherGetMaliciousIDsCall {
+func (mr *MockfetcherMockRecorder) GetMaliciousIDs(arg0, arg1, arg2, arg3 any) *fetcherGetMaliciousIDsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMaliciousIDs", reflect.TypeOf((*Mockfetcher)(nil).GetMaliciousIDs), arg0, arg1, arg2, arg3)
 	return &fetcherGetMaliciousIDsCall{Call: call}
@@ -1211,7 +1215,7 @@ func (m *Mockfetcher) PeerEpochInfo(arg0 context.Context, arg1 p2p.Peer, arg2 ty
 }
 
 // PeerEpochInfo indicates an expected call of PeerEpochInfo.
-func (mr *MockfetcherMockRecorder) PeerEpochInfo(arg0, arg1, arg2 interface{}) *fetcherPeerEpochInfoCall {
+func (mr *MockfetcherMockRecorder) PeerEpochInfo(arg0, arg1, arg2 any) *fetcherPeerEpochInfoCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerEpochInfo", reflect.TypeOf((*Mockfetcher)(nil).PeerEpochInfo), arg0, arg1, arg2)
 	return &fetcherPeerEpochInfoCall{Call: call}
@@ -1250,7 +1254,7 @@ func (m *Mockfetcher) PeerMeshHashes(arg0 context.Context, arg1 p2p.Peer, arg2 *
 }
 
 // PeerMeshHashes indicates an expected call of PeerMeshHashes.
-func (mr *MockfetcherMockRecorder) PeerMeshHashes(arg0, arg1, arg2 interface{}) *fetcherPeerMeshHashesCall {
+func (mr *MockfetcherMockRecorder) PeerMeshHashes(arg0, arg1, arg2 any) *fetcherPeerMeshHashesCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerMeshHashes", reflect.TypeOf((*Mockfetcher)(nil).PeerMeshHashes), arg0, arg1, arg2)
 	return &fetcherPeerMeshHashesCall{Call: call}
@@ -1286,7 +1290,7 @@ func (m *Mockfetcher) RegisterPeerHashes(peer p2p.Peer, hashes []types.Hash32) {
 }
 
 // RegisterPeerHashes indicates an expected call of RegisterPeerHashes.
-func (mr *MockfetcherMockRecorder) RegisterPeerHashes(peer, hashes interface{}) *fetcherRegisterPeerHashesCall {
+func (mr *MockfetcherMockRecorder) RegisterPeerHashes(peer, hashes any) *fetcherRegisterPeerHashesCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterPeerHashes", reflect.TypeOf((*Mockfetcher)(nil).RegisterPeerHashes), peer, hashes)
 	return &fetcherRegisterPeerHashesCall{Call: call}
@@ -1347,7 +1351,7 @@ func (m *MocklayerPatrol) IsHareInCharge(arg0 types.LayerID) bool {
 }
 
 // IsHareInCharge indicates an expected call of IsHareInCharge.
-func (mr *MocklayerPatrolMockRecorder) IsHareInCharge(arg0 interface{}) *layerPatrolIsHareInChargeCall {
+func (mr *MocklayerPatrolMockRecorder) IsHareInCharge(arg0 any) *layerPatrolIsHareInChargeCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsHareInCharge", reflect.TypeOf((*MocklayerPatrol)(nil).IsHareInCharge), arg0)
 	return &layerPatrolIsHareInChargeCall{Call: call}
@@ -1408,7 +1412,7 @@ func (m *MockcertHandler) HandleSyncedCertificate(arg0 context.Context, arg1 typ
 }
 
 // HandleSyncedCertificate indicates an expected call of HandleSyncedCertificate.
-func (mr *MockcertHandlerMockRecorder) HandleSyncedCertificate(arg0, arg1, arg2 interface{}) *certHandlerHandleSyncedCertificateCall {
+func (mr *MockcertHandlerMockRecorder) HandleSyncedCertificate(arg0, arg1, arg2 any) *certHandlerHandleSyncedCertificateCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleSyncedCertificate", reflect.TypeOf((*MockcertHandler)(nil).HandleSyncedCertificate), arg0, arg1, arg2)
 	return &certHandlerHandleSyncedCertificateCall{Call: call}
@@ -1467,7 +1471,7 @@ func (m *MockforkFinder) AddResynced(arg0 types.LayerID, arg1 types.Hash32) {
 }
 
 // AddResynced indicates an expected call of AddResynced.
-func (mr *MockforkFinderMockRecorder) AddResynced(arg0, arg1 interface{}) *forkFinderAddResyncedCall {
+func (mr *MockforkFinderMockRecorder) AddResynced(arg0, arg1 any) *forkFinderAddResyncedCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddResynced", reflect.TypeOf((*MockforkFinder)(nil).AddResynced), arg0, arg1)
 	return &forkFinderAddResyncedCall{Call: call}
@@ -1506,7 +1510,7 @@ func (m *MockforkFinder) FindFork(arg0 context.Context, arg1 p2p.Peer, arg2 type
 }
 
 // FindFork indicates an expected call of FindFork.
-func (mr *MockforkFinderMockRecorder) FindFork(arg0, arg1, arg2, arg3 interface{}) *forkFinderFindForkCall {
+func (mr *MockforkFinderMockRecorder) FindFork(arg0, arg1, arg2, arg3 any) *forkFinderFindForkCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindFork", reflect.TypeOf((*MockforkFinder)(nil).FindFork), arg0, arg1, arg2, arg3)
 	return &forkFinderFindForkCall{Call: call}
@@ -1544,7 +1548,7 @@ func (m *MockforkFinder) NeedResync(arg0 types.LayerID, arg1 types.Hash32) bool
 }
 
 // NeedResync indicates an expected call of NeedResync.
-func (mr *MockforkFinderMockRecorder) NeedResync(arg0, arg1 interface{}) *forkFinderNeedResyncCall {
+func (mr *MockforkFinderMockRecorder) NeedResync(arg0, arg1 any) *forkFinderNeedResyncCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NeedResync", reflect.TypeOf((*MockforkFinder)(nil).NeedResync), arg0, arg1)
 	return &forkFinderNeedResyncCall{Call: call}
@@ -1576,7 +1580,7 @@ func (c *forkFinderNeedResyncCall) DoAndReturn(f func(types.LayerID, types.Hash3
 // Purge mocks base method.
 func (m *MockforkFinder) Purge(arg0 bool, arg1 ...p2p.Peer) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0}
+	varargs := []any{arg0}
 	for _, a := range arg1 {
 		varargs = append(varargs, a)
 	}
@@ -1584,9 +1588,9 @@ func (m *MockforkFinder) Purge(arg0 bool, arg1 ...p2p.Peer) {
 }
 
 // Purge indicates an expected call of Purge.
-func (mr *MockforkFinderMockRecorder) Purge(arg0 interface{}, arg1 ...interface{}) *forkFinderPurgeCall {
+func (mr *MockforkFinderMockRecorder) Purge(arg0 any, arg1 ...any) *forkFinderPurgeCall {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0}, arg1...)
+	varargs := append([]any{arg0}, arg1...)
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Purge", reflect.TypeOf((*MockforkFinder)(nil).Purge), varargs...)
 	return &forkFinderPurgeCall{Call: call}
 }
@@ -1621,7 +1625,7 @@ func (m *MockforkFinder) UpdateAgreement(arg0 p2p.Peer, arg1 types.LayerID, arg2
 }
 
 // UpdateAgreement indicates an expected call of UpdateAgreement.
-func (mr *MockforkFinderMockRecorder) UpdateAgreement(arg0, arg1, arg2, arg3 interface{}) *forkFinderUpdateAgreementCall {
+func (mr *MockforkFinderMockRecorder) UpdateAgreement(arg0, arg1, arg2, arg3 any) *forkFinderUpdateAgreementCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateAgreement", reflect.TypeOf((*MockforkFinder)(nil).UpdateAgreement), arg0, arg1, arg2, arg3)
 	return &forkFinderUpdateAgreementCall{Call: call}
@@ -1683,7 +1687,7 @@ func (m *MockidProvider) IdentityExists(id types.NodeID) (bool, error) {
 }
 
 // IdentityExists indicates an expected call of IdentityExists.
-func (mr *MockidProviderMockRecorder) IdentityExists(id interface{}) *idProviderIdentityExistsCall {
+func (mr *MockidProviderMockRecorder) IdentityExists(id any) *idProviderIdentityExistsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IdentityExists", reflect.TypeOf((*MockidProvider)(nil).IdentityExists), id)
 	return &idProviderIdentityExistsCall{Call: call}
diff --git a/system/mocks/beacons.go b/system/mocks/beacons.go
index adc11eec0b..a64810e27e 100644
--- a/system/mocks/beacons.go
+++ b/system/mocks/beacons.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./beacons.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/beacons.go -source=./beacons.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -42,7 +46,7 @@ func (m *MockBeaconCollector) ReportBeaconFromBallot(arg0 types.EpochID, arg1 *t
 }
 
 // ReportBeaconFromBallot indicates an expected call of ReportBeaconFromBallot.
-func (mr *MockBeaconCollectorMockRecorder) ReportBeaconFromBallot(arg0, arg1, arg2, arg3 interface{}) *BeaconCollectorReportBeaconFromBallotCall {
+func (mr *MockBeaconCollectorMockRecorder) ReportBeaconFromBallot(arg0, arg1, arg2, arg3 any) *BeaconCollectorReportBeaconFromBallotCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReportBeaconFromBallot", reflect.TypeOf((*MockBeaconCollector)(nil).ReportBeaconFromBallot), arg0, arg1, arg2, arg3)
 	return &BeaconCollectorReportBeaconFromBallotCall{Call: call}
@@ -104,7 +108,7 @@ func (m *MockBeaconGetter) GetBeacon(arg0 types.EpochID) (types.Beacon, error) {
 }
 
 // GetBeacon indicates an expected call of GetBeacon.
-func (mr *MockBeaconGetterMockRecorder) GetBeacon(arg0 interface{}) *BeaconGetterGetBeaconCall {
+func (mr *MockBeaconGetterMockRecorder) GetBeacon(arg0 any) *BeaconGetterGetBeaconCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBeacon", reflect.TypeOf((*MockBeaconGetter)(nil).GetBeacon), arg0)
 	return &BeaconGetterGetBeaconCall{Call: call}
diff --git a/system/mocks/fetcher.go b/system/mocks/fetcher.go
index 1e271c2c9d..224a5bf6ec 100644
--- a/system/mocks/fetcher.go
+++ b/system/mocks/fetcher.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./fetcher.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/fetcher.go -source=./fetcher.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -45,7 +49,7 @@ func (m *MockFetcher) GetActiveSet(arg0 context.Context, arg1 types.Hash32) erro
 }
 
 // GetActiveSet indicates an expected call of GetActiveSet.
-func (mr *MockFetcherMockRecorder) GetActiveSet(arg0, arg1 interface{}) *FetcherGetActiveSetCall {
+func (mr *MockFetcherMockRecorder) GetActiveSet(arg0, arg1 any) *FetcherGetActiveSetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetActiveSet", reflect.TypeOf((*MockFetcher)(nil).GetActiveSet), arg0, arg1)
 	return &FetcherGetActiveSetCall{Call: call}
@@ -83,7 +87,7 @@ func (m *MockFetcher) GetAtxs(arg0 context.Context, arg1 []types.ATXID) error {
 }
 
 // GetAtxs indicates an expected call of GetAtxs.
-func (mr *MockFetcherMockRecorder) GetAtxs(arg0, arg1 interface{}) *FetcherGetAtxsCall {
+func (mr *MockFetcherMockRecorder) GetAtxs(arg0, arg1 any) *FetcherGetAtxsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAtxs", reflect.TypeOf((*MockFetcher)(nil).GetAtxs), arg0, arg1)
 	return &FetcherGetAtxsCall{Call: call}
@@ -121,7 +125,7 @@ func (m *MockFetcher) GetBallots(arg0 context.Context, arg1 []types.BallotID) er
 }
 
 // GetBallots indicates an expected call of GetBallots.
-func (mr *MockFetcherMockRecorder) GetBallots(arg0, arg1 interface{}) *FetcherGetBallotsCall {
+func (mr *MockFetcherMockRecorder) GetBallots(arg0, arg1 any) *FetcherGetBallotsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBallots", reflect.TypeOf((*MockFetcher)(nil).GetBallots), arg0, arg1)
 	return &FetcherGetBallotsCall{Call: call}
@@ -159,7 +163,7 @@ func (m *MockFetcher) GetBlockTxs(arg0 context.Context, arg1 []types.Transaction
 }
 
 // GetBlockTxs indicates an expected call of GetBlockTxs.
-func (mr *MockFetcherMockRecorder) GetBlockTxs(arg0, arg1 interface{}) *FetcherGetBlockTxsCall {
+func (mr *MockFetcherMockRecorder) GetBlockTxs(arg0, arg1 any) *FetcherGetBlockTxsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlockTxs", reflect.TypeOf((*MockFetcher)(nil).GetBlockTxs), arg0, arg1)
 	return &FetcherGetBlockTxsCall{Call: call}
@@ -197,7 +201,7 @@ func (m *MockFetcher) GetBlocks(arg0 context.Context, arg1 []types.BlockID) erro
 }
 
 // GetBlocks indicates an expected call of GetBlocks.
-func (mr *MockFetcherMockRecorder) GetBlocks(arg0, arg1 interface{}) *FetcherGetBlocksCall {
+func (mr *MockFetcherMockRecorder) GetBlocks(arg0, arg1 any) *FetcherGetBlocksCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocks", reflect.TypeOf((*MockFetcher)(nil).GetBlocks), arg0, arg1)
 	return &FetcherGetBlocksCall{Call: call}
@@ -235,7 +239,7 @@ func (m *MockFetcher) GetPoetProof(arg0 context.Context, arg1 types.Hash32) erro
 }
 
 // GetPoetProof indicates an expected call of GetPoetProof.
-func (mr *MockFetcherMockRecorder) GetPoetProof(arg0, arg1 interface{}) *FetcherGetPoetProofCall {
+func (mr *MockFetcherMockRecorder) GetPoetProof(arg0, arg1 any) *FetcherGetPoetProofCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPoetProof", reflect.TypeOf((*MockFetcher)(nil).GetPoetProof), arg0, arg1)
 	return &FetcherGetPoetProofCall{Call: call}
@@ -273,7 +277,7 @@ func (m *MockFetcher) GetProposalTxs(arg0 context.Context, arg1 []types.Transact
 }
 
 // GetProposalTxs indicates an expected call of GetProposalTxs.
-func (mr *MockFetcherMockRecorder) GetProposalTxs(arg0, arg1 interface{}) *FetcherGetProposalTxsCall {
+func (mr *MockFetcherMockRecorder) GetProposalTxs(arg0, arg1 any) *FetcherGetProposalTxsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProposalTxs", reflect.TypeOf((*MockFetcher)(nil).GetProposalTxs), arg0, arg1)
 	return &FetcherGetProposalTxsCall{Call: call}
@@ -311,7 +315,7 @@ func (m *MockFetcher) GetProposals(arg0 context.Context, arg1 []types.ProposalID
 }
 
 // GetProposals indicates an expected call of GetProposals.
-func (mr *MockFetcherMockRecorder) GetProposals(arg0, arg1 interface{}) *FetcherGetProposalsCall {
+func (mr *MockFetcherMockRecorder) GetProposals(arg0, arg1 any) *FetcherGetProposalsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProposals", reflect.TypeOf((*MockFetcher)(nil).GetProposals), arg0, arg1)
 	return &FetcherGetProposalsCall{Call: call}
@@ -347,7 +351,7 @@ func (m *MockFetcher) RegisterPeerHashes(peer p2p.Peer, hashes []types.Hash32) {
 }
 
 // RegisterPeerHashes indicates an expected call of RegisterPeerHashes.
-func (mr *MockFetcherMockRecorder) RegisterPeerHashes(peer, hashes interface{}) *FetcherRegisterPeerHashesCall {
+func (mr *MockFetcherMockRecorder) RegisterPeerHashes(peer, hashes any) *FetcherRegisterPeerHashesCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterPeerHashes", reflect.TypeOf((*MockFetcher)(nil).RegisterPeerHashes), peer, hashes)
 	return &FetcherRegisterPeerHashesCall{Call: call}
@@ -408,7 +412,7 @@ func (m *MockBlockFetcher) GetBlocks(arg0 context.Context, arg1 []types.BlockID)
 }
 
 // GetBlocks indicates an expected call of GetBlocks.
-func (mr *MockBlockFetcherMockRecorder) GetBlocks(arg0, arg1 interface{}) *BlockFetcherGetBlocksCall {
+func (mr *MockBlockFetcherMockRecorder) GetBlocks(arg0, arg1 any) *BlockFetcherGetBlocksCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocks", reflect.TypeOf((*MockBlockFetcher)(nil).GetBlocks), arg0, arg1)
 	return &BlockFetcherGetBlocksCall{Call: call}
@@ -469,7 +473,7 @@ func (m *MockAtxFetcher) GetAtxs(arg0 context.Context, arg1 []types.ATXID) error
 }
 
 // GetAtxs indicates an expected call of GetAtxs.
-func (mr *MockAtxFetcherMockRecorder) GetAtxs(arg0, arg1 interface{}) *AtxFetcherGetAtxsCall {
+func (mr *MockAtxFetcherMockRecorder) GetAtxs(arg0, arg1 any) *AtxFetcherGetAtxsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAtxs", reflect.TypeOf((*MockAtxFetcher)(nil).GetAtxs), arg0, arg1)
 	return &AtxFetcherGetAtxsCall{Call: call}
@@ -530,7 +534,7 @@ func (m *MockTxFetcher) GetBlockTxs(arg0 context.Context, arg1 []types.Transacti
 }
 
 // GetBlockTxs indicates an expected call of GetBlockTxs.
-func (mr *MockTxFetcherMockRecorder) GetBlockTxs(arg0, arg1 interface{}) *TxFetcherGetBlockTxsCall {
+func (mr *MockTxFetcherMockRecorder) GetBlockTxs(arg0, arg1 any) *TxFetcherGetBlockTxsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlockTxs", reflect.TypeOf((*MockTxFetcher)(nil).GetBlockTxs), arg0, arg1)
 	return &TxFetcherGetBlockTxsCall{Call: call}
@@ -568,7 +572,7 @@ func (m *MockTxFetcher) GetProposalTxs(arg0 context.Context, arg1 []types.Transa
 }
 
 // GetProposalTxs indicates an expected call of GetProposalTxs.
-func (mr *MockTxFetcherMockRecorder) GetProposalTxs(arg0, arg1 interface{}) *TxFetcherGetProposalTxsCall {
+func (mr *MockTxFetcherMockRecorder) GetProposalTxs(arg0, arg1 any) *TxFetcherGetProposalTxsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProposalTxs", reflect.TypeOf((*MockTxFetcher)(nil).GetProposalTxs), arg0, arg1)
 	return &TxFetcherGetProposalTxsCall{Call: call}
@@ -629,7 +633,7 @@ func (m *MockPoetProofFetcher) GetPoetProof(arg0 context.Context, arg1 types.Has
 }
 
 // GetPoetProof indicates an expected call of GetPoetProof.
-func (mr *MockPoetProofFetcherMockRecorder) GetPoetProof(arg0, arg1 interface{}) *PoetProofFetcherGetPoetProofCall {
+func (mr *MockPoetProofFetcherMockRecorder) GetPoetProof(arg0, arg1 any) *PoetProofFetcherGetPoetProofCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPoetProof", reflect.TypeOf((*MockPoetProofFetcher)(nil).GetPoetProof), arg0, arg1)
 	return &PoetProofFetcherGetPoetProofCall{Call: call}
@@ -690,7 +694,7 @@ func (m *MockBallotFetcher) GetBallots(arg0 context.Context, arg1 []types.Ballot
 }
 
 // GetBallots indicates an expected call of GetBallots.
-func (mr *MockBallotFetcherMockRecorder) GetBallots(arg0, arg1 interface{}) *BallotFetcherGetBallotsCall {
+func (mr *MockBallotFetcherMockRecorder) GetBallots(arg0, arg1 any) *BallotFetcherGetBallotsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBallots", reflect.TypeOf((*MockBallotFetcher)(nil).GetBallots), arg0, arg1)
 	return &BallotFetcherGetBallotsCall{Call: call}
@@ -751,7 +755,7 @@ func (m *MockProposalFetcher) GetProposals(arg0 context.Context, arg1 []types.Pr
 }
 
 // GetProposals indicates an expected call of GetProposals.
-func (mr *MockProposalFetcherMockRecorder) GetProposals(arg0, arg1 interface{}) *ProposalFetcherGetProposalsCall {
+func (mr *MockProposalFetcherMockRecorder) GetProposals(arg0, arg1 any) *ProposalFetcherGetProposalsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProposals", reflect.TypeOf((*MockProposalFetcher)(nil).GetProposals), arg0, arg1)
 	return &ProposalFetcherGetProposalsCall{Call: call}
@@ -812,7 +816,7 @@ func (m *MockActiveSetFetcher) GetActiveSet(arg0 context.Context, arg1 types.Has
 }
 
 // GetActiveSet indicates an expected call of GetActiveSet.
-func (mr *MockActiveSetFetcherMockRecorder) GetActiveSet(arg0, arg1 interface{}) *ActiveSetFetcherGetActiveSetCall {
+func (mr *MockActiveSetFetcherMockRecorder) GetActiveSet(arg0, arg1 any) *ActiveSetFetcherGetActiveSetCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetActiveSet", reflect.TypeOf((*MockActiveSetFetcher)(nil).GetActiveSet), arg0, arg1)
 	return &ActiveSetFetcherGetActiveSetCall{Call: call}
@@ -871,7 +875,7 @@ func (m *MockPeerTracker) RegisterPeerHashes(peer p2p.Peer, hashes []types.Hash3
 }
 
 // RegisterPeerHashes indicates an expected call of RegisterPeerHashes.
-func (mr *MockPeerTrackerMockRecorder) RegisterPeerHashes(peer, hashes interface{}) *PeerTrackerRegisterPeerHashesCall {
+func (mr *MockPeerTrackerMockRecorder) RegisterPeerHashes(peer, hashes any) *PeerTrackerRegisterPeerHashesCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterPeerHashes", reflect.TypeOf((*MockPeerTracker)(nil).RegisterPeerHashes), peer, hashes)
 	return &PeerTrackerRegisterPeerHashesCall{Call: call}
diff --git a/system/mocks/sync.go b/system/mocks/sync.go
index ea7d2f05d8..042ba9ea9c 100644
--- a/system/mocks/sync.go
+++ b/system/mocks/sync.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./sync.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/sync.go -source=./sync.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -44,7 +48,7 @@ func (m *MockSyncStateProvider) IsBeaconSynced(arg0 types.EpochID) bool {
 }
 
 // IsBeaconSynced indicates an expected call of IsBeaconSynced.
-func (mr *MockSyncStateProviderMockRecorder) IsBeaconSynced(arg0 interface{}) *SyncStateProviderIsBeaconSyncedCall {
+func (mr *MockSyncStateProviderMockRecorder) IsBeaconSynced(arg0 any) *SyncStateProviderIsBeaconSyncedCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsBeaconSynced", reflect.TypeOf((*MockSyncStateProvider)(nil).IsBeaconSynced), arg0)
 	return &SyncStateProviderIsBeaconSyncedCall{Call: call}
@@ -82,7 +86,7 @@ func (m *MockSyncStateProvider) IsSynced(arg0 context.Context) bool {
 }
 
 // IsSynced indicates an expected call of IsSynced.
-func (mr *MockSyncStateProviderMockRecorder) IsSynced(arg0 interface{}) *SyncStateProviderIsSyncedCall {
+func (mr *MockSyncStateProviderMockRecorder) IsSynced(arg0 any) *SyncStateProviderIsSyncedCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsSynced", reflect.TypeOf((*MockSyncStateProvider)(nil).IsSynced), arg0)
 	return &SyncStateProviderIsSyncedCall{Call: call}
diff --git a/system/mocks/tortoise.go b/system/mocks/tortoise.go
index 3bf72e6cb3..e03c2e5c60 100644
--- a/system/mocks/tortoise.go
+++ b/system/mocks/tortoise.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./tortoise.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/tortoise.go -source=./tortoise.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -81,7 +85,7 @@ func (m *MockTortoise) OnAtx(arg0 *types.AtxTortoiseData) {
 }
 
 // OnAtx indicates an expected call of OnAtx.
-func (mr *MockTortoiseMockRecorder) OnAtx(arg0 interface{}) *TortoiseOnAtxCall {
+func (mr *MockTortoiseMockRecorder) OnAtx(arg0 any) *TortoiseOnAtxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnAtx", reflect.TypeOf((*MockTortoise)(nil).OnAtx), arg0)
 	return &TortoiseOnAtxCall{Call: call}
@@ -117,7 +121,7 @@ func (m *MockTortoise) OnBlock(arg0 types.BlockHeader) {
 }
 
 // OnBlock indicates an expected call of OnBlock.
-func (mr *MockTortoiseMockRecorder) OnBlock(arg0 interface{}) *TortoiseOnBlockCall {
+func (mr *MockTortoiseMockRecorder) OnBlock(arg0 any) *TortoiseOnBlockCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnBlock", reflect.TypeOf((*MockTortoise)(nil).OnBlock), arg0)
 	return &TortoiseOnBlockCall{Call: call}
@@ -153,7 +157,7 @@ func (m *MockTortoise) OnHareOutput(arg0 types.LayerID, arg1 types.BlockID) {
 }
 
 // OnHareOutput indicates an expected call of OnHareOutput.
-func (mr *MockTortoiseMockRecorder) OnHareOutput(arg0, arg1 interface{}) *TortoiseOnHareOutputCall {
+func (mr *MockTortoiseMockRecorder) OnHareOutput(arg0, arg1 any) *TortoiseOnHareOutputCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnHareOutput", reflect.TypeOf((*MockTortoise)(nil).OnHareOutput), arg0, arg1)
 	return &TortoiseOnHareOutputCall{Call: call}
@@ -189,7 +193,7 @@ func (m *MockTortoise) OnMalfeasance(arg0 types.NodeID) {
 }
 
 // OnMalfeasance indicates an expected call of OnMalfeasance.
-func (mr *MockTortoiseMockRecorder) OnMalfeasance(arg0 interface{}) *TortoiseOnMalfeasanceCall {
+func (mr *MockTortoiseMockRecorder) OnMalfeasance(arg0 any) *TortoiseOnMalfeasanceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnMalfeasance", reflect.TypeOf((*MockTortoise)(nil).OnMalfeasance), arg0)
 	return &TortoiseOnMalfeasanceCall{Call: call}
@@ -225,7 +229,7 @@ func (m *MockTortoise) OnWeakCoin(arg0 types.LayerID, arg1 bool) {
 }
 
 // OnWeakCoin indicates an expected call of OnWeakCoin.
-func (mr *MockTortoiseMockRecorder) OnWeakCoin(arg0, arg1 interface{}) *TortoiseOnWeakCoinCall {
+func (mr *MockTortoiseMockRecorder) OnWeakCoin(arg0, arg1 any) *TortoiseOnWeakCoinCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnWeakCoin", reflect.TypeOf((*MockTortoise)(nil).OnWeakCoin), arg0, arg1)
 	return &TortoiseOnWeakCoinCall{Call: call}
@@ -264,7 +268,7 @@ func (m *MockTortoise) Results(from, to types.LayerID) ([]result.Layer, error) {
 }
 
 // Results indicates an expected call of Results.
-func (mr *MockTortoiseMockRecorder) Results(from, to interface{}) *TortoiseResultsCall {
+func (mr *MockTortoiseMockRecorder) Results(from, to any) *TortoiseResultsCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Results", reflect.TypeOf((*MockTortoise)(nil).Results), from, to)
 	return &TortoiseResultsCall{Call: call}
@@ -300,7 +304,7 @@ func (m *MockTortoise) TallyVotes(arg0 context.Context, arg1 types.LayerID) {
 }
 
 // TallyVotes indicates an expected call of TallyVotes.
-func (mr *MockTortoiseMockRecorder) TallyVotes(arg0, arg1 interface{}) *TortoiseTallyVotesCall {
+func (mr *MockTortoiseMockRecorder) TallyVotes(arg0, arg1 any) *TortoiseTallyVotesCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TallyVotes", reflect.TypeOf((*MockTortoise)(nil).TallyVotes), arg0, arg1)
 	return &TortoiseTallyVotesCall{Call: call}
diff --git a/system/mocks/vm.go b/system/mocks/vm.go
index bf10dc71df..5fb300c8fd 100644
--- a/system/mocks/vm.go
+++ b/system/mocks/vm.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./vm.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/vm.go -source=./vm.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
diff --git a/timesync/peersync/mocks/mocks.go b/timesync/peersync/mocks/mocks.go
index af6bde6957..7d72caeeee 100644
--- a/timesync/peersync/mocks/mocks.go
+++ b/timesync/peersync/mocks/mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./sync.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=mocks -destination=./mocks/mocks.go -source=./sync.go
+//
 // Package mocks is a generated GoMock package.
 package mocks
 
diff --git a/txs/txs_mocks.go b/txs/txs_mocks.go
index b76d2c35ed..02c7c61a51 100644
--- a/txs/txs_mocks.go
+++ b/txs/txs_mocks.go
@@ -1,6 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./interface.go
-
+//
+// Generated by this command:
+//
+//	mockgen -typed -package=txs -destination=./txs_mocks.go -source=./interface.go
+//
 // Package txs is a generated GoMock package.
 package txs
 
@@ -47,7 +51,7 @@ func (m *MockconservativeState) AddToCache(arg0 context.Context, arg1 *types.Tra
 }
 
 // AddToCache indicates an expected call of AddToCache.
-func (mr *MockconservativeStateMockRecorder) AddToCache(arg0, arg1, arg2 interface{}) *conservativeStateAddToCacheCall {
+func (mr *MockconservativeStateMockRecorder) AddToCache(arg0, arg1, arg2 any) *conservativeStateAddToCacheCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddToCache", reflect.TypeOf((*MockconservativeState)(nil).AddToCache), arg0, arg1, arg2)
 	return &conservativeStateAddToCacheCall{Call: call}
@@ -85,7 +89,7 @@ func (m *MockconservativeState) AddToDB(arg0 *types.Transaction) error {
 }
 
 // AddToDB indicates an expected call of AddToDB.
-func (mr *MockconservativeStateMockRecorder) AddToDB(arg0 interface{}) *conservativeStateAddToDBCall {
+func (mr *MockconservativeStateMockRecorder) AddToDB(arg0 any) *conservativeStateAddToDBCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddToDB", reflect.TypeOf((*MockconservativeState)(nil).AddToDB), arg0)
 	return &conservativeStateAddToDBCall{Call: call}
@@ -124,7 +128,7 @@ func (m *MockconservativeState) GetMeshTransaction(arg0 types.TransactionID) (*t
 }
 
 // GetMeshTransaction indicates an expected call of GetMeshTransaction.
-func (mr *MockconservativeStateMockRecorder) GetMeshTransaction(arg0 interface{}) *conservativeStateGetMeshTransactionCall {
+func (mr *MockconservativeStateMockRecorder) GetMeshTransaction(arg0 any) *conservativeStateGetMeshTransactionCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMeshTransaction", reflect.TypeOf((*MockconservativeState)(nil).GetMeshTransaction), arg0)
 	return &conservativeStateGetMeshTransactionCall{Call: call}
@@ -163,7 +167,7 @@ func (m *MockconservativeState) HasTx(arg0 types.TransactionID) (bool, error) {
 }
 
 // HasTx indicates an expected call of HasTx.
-func (mr *MockconservativeStateMockRecorder) HasTx(arg0 interface{}) *conservativeStateHasTxCall {
+func (mr *MockconservativeStateMockRecorder) HasTx(arg0 any) *conservativeStateHasTxCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasTx", reflect.TypeOf((*MockconservativeState)(nil).HasTx), arg0)
 	return &conservativeStateHasTxCall{Call: call}
@@ -201,7 +205,7 @@ func (m *MockconservativeState) Validation(arg0 types.RawTx) system.ValidationRe
 }
 
 // Validation indicates an expected call of Validation.
-func (mr *MockconservativeStateMockRecorder) Validation(arg0 interface{}) *conservativeStateValidationCall {
+func (mr *MockconservativeStateMockRecorder) Validation(arg0 any) *conservativeStateValidationCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validation", reflect.TypeOf((*MockconservativeState)(nil).Validation), arg0)
 	return &conservativeStateValidationCall{Call: call}
@@ -302,7 +306,7 @@ func (m *MockvmState) GetBalance(arg0 types.Address) (uint64, error) {
 }
 
 // GetBalance indicates an expected call of GetBalance.
-func (mr *MockvmStateMockRecorder) GetBalance(arg0 interface{}) *vmStateGetBalanceCall {
+func (mr *MockvmStateMockRecorder) GetBalance(arg0 any) *vmStateGetBalanceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBalance", reflect.TypeOf((*MockvmState)(nil).GetBalance), arg0)
 	return &vmStateGetBalanceCall{Call: call}
@@ -341,7 +345,7 @@ func (m *MockvmState) GetLayerApplied(arg0 types.TransactionID) (types.LayerID,
 }
 
 // GetLayerApplied indicates an expected call of GetLayerApplied.
-func (mr *MockvmStateMockRecorder) GetLayerApplied(arg0 interface{}) *vmStateGetLayerAppliedCall {
+func (mr *MockvmStateMockRecorder) GetLayerApplied(arg0 any) *vmStateGetLayerAppliedCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLayerApplied", reflect.TypeOf((*MockvmState)(nil).GetLayerApplied), arg0)
 	return &vmStateGetLayerAppliedCall{Call: call}
@@ -380,7 +384,7 @@ func (m *MockvmState) GetLayerStateRoot(arg0 types.LayerID) (types.Hash32, error
 }
 
 // GetLayerStateRoot indicates an expected call of GetLayerStateRoot.
-func (mr *MockvmStateMockRecorder) GetLayerStateRoot(arg0 interface{}) *vmStateGetLayerStateRootCall {
+func (mr *MockvmStateMockRecorder) GetLayerStateRoot(arg0 any) *vmStateGetLayerStateRootCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLayerStateRoot", reflect.TypeOf((*MockvmState)(nil).GetLayerStateRoot), arg0)
 	return &vmStateGetLayerStateRootCall{Call: call}
@@ -419,7 +423,7 @@ func (m *MockvmState) GetNonce(arg0 types.Address) (types.Nonce, error) {
 }
 
 // GetNonce indicates an expected call of GetNonce.
-func (mr *MockvmStateMockRecorder) GetNonce(arg0 interface{}) *vmStateGetNonceCall {
+func (mr *MockvmStateMockRecorder) GetNonce(arg0 any) *vmStateGetNonceCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNonce", reflect.TypeOf((*MockvmState)(nil).GetNonce), arg0)
 	return &vmStateGetNonceCall{Call: call}
@@ -496,7 +500,7 @@ func (m *MockvmState) Validation(arg0 types.RawTx) system.ValidationRequest {
 }
 
 // Validation indicates an expected call of Validation.
-func (mr *MockvmStateMockRecorder) Validation(arg0 interface{}) *vmStateValidationCall {
+func (mr *MockvmStateMockRecorder) Validation(arg0 any) *vmStateValidationCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validation", reflect.TypeOf((*MockvmState)(nil).Validation), arg0)
 	return &vmStateValidationCall{Call: call}
@@ -557,7 +561,7 @@ func (m *MockconStateCache) GetMempool(arg0 log.Log) map[types.Address][]*NanoTX
 }
 
 // GetMempool indicates an expected call of GetMempool.
-func (mr *MockconStateCacheMockRecorder) GetMempool(arg0 interface{}) *conStateCacheGetMempoolCall {
+func (mr *MockconStateCacheMockRecorder) GetMempool(arg0 any) *conStateCacheGetMempoolCall {
 	mr.mock.ctrl.T.Helper()
 	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMempool", reflect.TypeOf((*MockconStateCache)(nil).GetMempool), arg0)
 	return &conStateCacheGetMempoolCall{Call: call}