diff --git a/auth/contract/signer_mock.go b/auth/contract/signer_mock.go
index 90c19b6ec1..75956eb70a 100644
--- a/auth/contract/signer_mock.go
+++ b/auth/contract/signer_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=auth/contract/signer_mock.go -package=contract -source=auth/contract/signer.go
 //
+
 // Package contract is a generated GoMock package.
 package contract
 
diff --git a/auth/mock.go b/auth/mock.go
index a1af1bdd49..bc101c2836 100644
--- a/auth/mock.go
+++ b/auth/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=auth/mock.go -package=auth -source=auth/interface.go
 //
+
 // Package auth is a generated GoMock package.
 package auth
 
diff --git a/auth/services/mock.go b/auth/services/mock.go
index 7ac3cd3ae8..10c44d006e 100644
--- a/auth/services/mock.go
+++ b/auth/services/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=auth/services/mock.go -package=services -source=auth/services/services.go
 //
+
 // Package services is a generated GoMock package.
 package services
 
diff --git a/auth/services/oauth/mock.go b/auth/services/oauth/mock.go
index babd76913b..9825de4f95 100644
--- a/auth/services/oauth/mock.go
+++ b/auth/services/oauth/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=auth/services/oauth/mock.go -package=oauth -source=auth/services/oauth/interface.go
 //
+
 // Package oauth is a generated GoMock package.
 package oauth
 
diff --git a/auth/services/selfsigned/types/mock.go b/auth/services/selfsigned/types/mock.go
index 9495b65078..4707ec8b73 100644
--- a/auth/services/selfsigned/types/mock.go
+++ b/auth/services/selfsigned/types/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=auth/services/selfsigned/types/mock.go -package=types -source=auth/services/selfsigned/types/types.go
 //
+
 // Package types is a generated GoMock package.
 package types
 
diff --git a/core/echo_mock.go b/core/echo_mock.go
index 54f8a6e1ae..43d7fc34f5 100644
--- a/core/echo_mock.go
+++ b/core/echo_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=core/echo_mock.go -package=core -source=core/echo.go -imports echo=github.com/labstack/echo/v4
 //
+
 // Package core is a generated GoMock package.
 package core
 
diff --git a/core/engine_mock.go b/core/engine_mock.go
index 4415ba0172..7bfb0a4513 100644
--- a/core/engine_mock.go
+++ b/core/engine_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=core/engine_mock.go -package=core -source=core/engine.go
 //
+
 // Package core is a generated GoMock package.
 package core
 
diff --git a/crypto/mock.go b/crypto/mock.go
index a1bd24b75f..e7bd727bc7 100644
--- a/crypto/mock.go
+++ b/crypto/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=crypto/mock.go -package=crypto -source=crypto/interface.go
 //
+
 // Package crypto is a generated GoMock package.
 package crypto
 
diff --git a/crypto/storage/spi/mock.go b/crypto/storage/spi/mock.go
index b9eec2e176..ef61deaefa 100644
--- a/crypto/storage/spi/mock.go
+++ b/crypto/storage/spi/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=crypto/storage/spi/mock.go -package spi -source=crypto/storage/spi/interface.go
 //
+
 // Package spi is a generated GoMock package.
 package spi
 
diff --git a/didman/mock.go b/didman/mock.go
index bf9740a7e4..08dbe8404b 100644
--- a/didman/mock.go
+++ b/didman/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=didman/mock.go -package=didman -source=didman/types.go
 //
+
 // Package didman is a generated GoMock package.
 package didman
 
diff --git a/discovery/mock.go b/discovery/mock.go
index ade7b84915..391979c563 100644
--- a/discovery/mock.go
+++ b/discovery/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=discovery/mock.go -package=discovery -source=discovery/interface.go
 //
+
 // Package discovery is a generated GoMock package.
 package discovery
 
diff --git a/events/events_mock.go b/events/events_mock.go
index 9c1fed6a9a..0b1844a34c 100644
--- a/events/events_mock.go
+++ b/events/events_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=events/events_mock.go -package=events -source=events/interface.go Event
 //
+
 // Package events is a generated GoMock package.
 package events
 
diff --git a/events/mock.go b/events/mock.go
index 954b9353e0..ca1e31ba68 100644
--- a/events/mock.go
+++ b/events/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=events/mock.go -package=events -source=events/conn.go Conn ConnectionPool
 //
+
 // Package events is a generated GoMock package.
 package events
 
diff --git a/go.mod b/go.mod
index 7846efed58..1ed229075f 100644
--- a/go.mod
+++ b/go.mod
@@ -44,7 +44,7 @@ require (
 	go.etcd.io/bbolt v1.3.8
 	go.uber.org/atomic v1.11.0
 	go.uber.org/goleak v1.3.0
-	go.uber.org/mock v0.3.0
+	go.uber.org/mock v0.4.0
 	golang.org/x/crypto v0.17.0
 	golang.org/x/time v0.5.0
 	google.golang.org/grpc v1.60.1
diff --git a/go.sum b/go.sum
index 3473ee156f..e78f3b2f11 100644
--- a/go.sum
+++ b/go.sum
@@ -634,8 +634,8 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
-go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
diff --git a/http/echo_mock.go b/http/echo_mock.go
index 3ccb6cfbab..284eb54e1b 100644
--- a/http/echo_mock.go
+++ b/http/echo_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=http/echo_mock.go -package=http -source=http/echo.go -imports echo=github.com/labstack/echo/v4
 //
+
 // Package http is a generated GoMock package.
 package http
 
diff --git a/makefile b/makefile
index 1365b36384..00b89a383a 100644
--- a/makefile
+++ b/makefile
@@ -4,7 +4,7 @@ run-generators: gen-mocks gen-api gen-protobuf
 
 install-tools:
 	go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.0.0
-	go install go.uber.org/mock/mockgen@v0.3.0
+	go install go.uber.org/mock/mockgen@v0.4.0
 	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0
 	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
 
diff --git a/network/dag/mock.go b/network/dag/mock.go
index 5de19ea3f8..073c18889e 100644
--- a/network/dag/mock.go
+++ b/network/dag/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/dag/mock.go -package=dag -source=network/dag/interface.go State
 //
+
 // Package dag is a generated GoMock package.
 package dag
 
diff --git a/network/dag/notifier_mock.go b/network/dag/notifier_mock.go
index ede58268c1..d21bac735d 100644
--- a/network/dag/notifier_mock.go
+++ b/network/dag/notifier_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/dag/notifier_mock.go -package=dag -source=network/dag/notifier.go Notifier
 //
+
 // Package dag is a generated GoMock package.
 package dag
 
diff --git a/network/mock.go b/network/mock.go
index 627b5f109f..f4ae30bfe5 100644
--- a/network/mock.go
+++ b/network/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/mock.go -package=network -source=network/interface.go
 //
+
 // Package network is a generated GoMock package.
 package network
 
diff --git a/network/transport/connection_manager_mock.go b/network/transport/connection_manager_mock.go
index da0d360e03..cbc098971d 100644
--- a/network/transport/connection_manager_mock.go
+++ b/network/transport/connection_manager_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/transport/connection_manager_mock.go -package=transport -source=network/transport/connection_manager.go
 //
+
 // Package transport is a generated GoMock package.
 package transport
 
diff --git a/network/transport/grpc/authenticator_mock.go b/network/transport/grpc/authenticator_mock.go
index baf80fb3a7..1d51801629 100644
--- a/network/transport/grpc/authenticator_mock.go
+++ b/network/transport/grpc/authenticator_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/transport/grpc/authenticator_mock.go -package=grpc -source=network/transport/grpc/authenticator.go
 //
+
 // Package grpc is a generated GoMock package.
 package grpc
 
diff --git a/network/transport/grpc/connection_list_mock.go b/network/transport/grpc/connection_list_mock.go
index f10b853d37..9fa134794f 100644
--- a/network/transport/grpc/connection_list_mock.go
+++ b/network/transport/grpc/connection_list_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/transport/grpc/connection_list_mock.go -package=grpc -source=network/transport/grpc/connection_list.go
 //
+
 // Package grpc is a generated GoMock package.
 package grpc
 
diff --git a/network/transport/grpc/connection_mock.go b/network/transport/grpc/connection_mock.go
index 5e9d320010..d5cc18ae03 100644
--- a/network/transport/grpc/connection_mock.go
+++ b/network/transport/grpc/connection_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/transport/grpc/connection_mock.go -package=grpc -source=network/transport/grpc/connection.go
 //
+
 // Package grpc is a generated GoMock package.
 package grpc
 
diff --git a/network/transport/grpc/interface_mock.go b/network/transport/grpc/interface_mock.go
index 049e5afcdd..ca04f9a756 100644
--- a/network/transport/grpc/interface_mock.go
+++ b/network/transport/grpc/interface_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/transport/grpc/interface_mock.go -package=grpc -source=network/transport/grpc/interface.go
 //
+
 // Package grpc is a generated GoMock package.
 package grpc
 
diff --git a/network/transport/protocol_mock.go b/network/transport/protocol_mock.go
index e1eaeaa6c8..bda7b5f01d 100644
--- a/network/transport/protocol_mock.go
+++ b/network/transport/protocol_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/transport/protocol_mock.go -package=transport -source=network/transport/protocol.go Protocol
 //
+
 // Package transport is a generated GoMock package.
 package transport
 
diff --git a/network/transport/v2/gossip/mock.go b/network/transport/v2/gossip/mock.go
index 74dd2edb2b..3b3c91818a 100644
--- a/network/transport/v2/gossip/mock.go
+++ b/network/transport/v2/gossip/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/transport/v2/gossip/mock.go -package=gossip -source=network/transport/v2/gossip/manager.go
 //
+
 // Package gossip is a generated GoMock package.
 package gossip
 
diff --git a/network/transport/v2/senders_mock.go b/network/transport/v2/senders_mock.go
index c052d9f076..fbd0177e86 100644
--- a/network/transport/v2/senders_mock.go
+++ b/network/transport/v2/senders_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=network/transport/v2/senders_mock.go -package=v2 -source=network/transport/v2/senders.go
 //
+
 // Package v2 is a generated GoMock package.
 package v2
 
diff --git a/pki/mock.go b/pki/mock.go
index d184cfa1e0..293a7a1fd7 100644
--- a/pki/mock.go
+++ b/pki/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=pki/mock.go -package=pki -source=pki/interface.go
 //
+
 // Package pki is a generated GoMock package.
 package pki
 
diff --git a/storage/mock.go b/storage/mock.go
index ecbfce1b17..241edf7804 100644
--- a/storage/mock.go
+++ b/storage/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=storage/mock.go -package=storage -source=storage/interface.go
 //
+
 // Package storage is a generated GoMock package.
 package storage
 
diff --git a/vcr/holder/mock.go b/vcr/holder/mock.go
index 4ea283f52b..12b892696f 100644
--- a/vcr/holder/mock.go
+++ b/vcr/holder/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/holder/mock.go -package=holder -source=vcr/holder/interface.go
 //
+
 // Package holder is a generated GoMock package.
 package holder
 
diff --git a/vcr/holder/openid_mock.go b/vcr/holder/openid_mock.go
index c3a992f738..402f2d72c8 100644
--- a/vcr/holder/openid_mock.go
+++ b/vcr/holder/openid_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/holder/openid_mock.go -package=holder -source=vcr/holder/openid.go
 //
+
 // Package holder is a generated GoMock package.
 package holder
 
diff --git a/vcr/issuer/mock.go b/vcr/issuer/mock.go
index 5724b935df..13240360d1 100644
--- a/vcr/issuer/mock.go
+++ b/vcr/issuer/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/issuer/mock.go -package=issuer -source=vcr/issuer/interface.go
 //
+
 // Package issuer is a generated GoMock package.
 package issuer
 
diff --git a/vcr/issuer/openid_mock.go b/vcr/issuer/openid_mock.go
index 60678f126e..367ddca9c1 100644
--- a/vcr/issuer/openid_mock.go
+++ b/vcr/issuer/openid_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/issuer/openid_mock.go -package=issuer -source=vcr/issuer/openid.go
 //
+
 // Package issuer is a generated GoMock package.
 package issuer
 
diff --git a/vcr/mock.go b/vcr/mock.go
index 91ac316497..a04f6a1f51 100644
--- a/vcr/mock.go
+++ b/vcr/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/mock.go -package=vcr -source=vcr/interface.go
 //
+
 // Package vcr is a generated GoMock package.
 package vcr
 
diff --git a/vcr/openid4vci/identifiers_mock.go b/vcr/openid4vci/identifiers_mock.go
index dfd3d673a9..9bb1b76c9a 100644
--- a/vcr/openid4vci/identifiers_mock.go
+++ b/vcr/openid4vci/identifiers_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/openid4vci/identifiers_mock.go -package=openid4vci -source=vcr/openid4vci/identifiers.go
 //
+
 // Package openid4vci is a generated GoMock package.
 package openid4vci
 
diff --git a/vcr/openid4vci/issuer_client_mock.go b/vcr/openid4vci/issuer_client_mock.go
index 9da6b18275..1774ed253d 100644
--- a/vcr/openid4vci/issuer_client_mock.go
+++ b/vcr/openid4vci/issuer_client_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/openid4vci/issuer_client_mock.go -package=openid4vci -source=vcr/openid4vci/issuer_client.go
 //
+
 // Package openid4vci is a generated GoMock package.
 package openid4vci
 
diff --git a/vcr/openid4vci/wallet_client_mock.go b/vcr/openid4vci/wallet_client_mock.go
index e371837b48..b67b5cad6e 100644
--- a/vcr/openid4vci/wallet_client_mock.go
+++ b/vcr/openid4vci/wallet_client_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/openid4vci/wallet_client_mock.go -package=openid4vci -source=vcr/openid4vci/wallet_client.go
 //
+
 // Package openid4vci is a generated GoMock package.
 package openid4vci
 
diff --git a/vcr/signature/mock.go b/vcr/signature/mock.go
index b552ce7470..ddc2cd6e88 100644
--- a/vcr/signature/mock.go
+++ b/vcr/signature/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/signature/mock.go -package=signature -source=vcr/signature/signature.go
 //
+
 // Package signature is a generated GoMock package.
 package signature
 
diff --git a/vcr/types/mock.go b/vcr/types/mock.go
index 73a6b83990..7c0785d395 100644
--- a/vcr/types/mock.go
+++ b/vcr/types/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/types/mock.go -package=types -source=vcr/types/interface.go
 //
+
 // Package types is a generated GoMock package.
 package types
 
diff --git a/vcr/verifier/mock.go b/vcr/verifier/mock.go
index a0557a852d..5979a7bf0e 100644
--- a/vcr/verifier/mock.go
+++ b/vcr/verifier/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vcr/verifier/mock.go -package=verifier -source=vcr/verifier/interface.go
 //
+
 // Package verifier is a generated GoMock package.
 package verifier
 
diff --git a/vdr/didnuts/ambassador_mock.go b/vdr/didnuts/ambassador_mock.go
index c7f11c2714..9553bffa18 100644
--- a/vdr/didnuts/ambassador_mock.go
+++ b/vdr/didnuts/ambassador_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vdr/didnuts/ambassador_mock.go -package=didnuts -source=vdr/didnuts/ambassador.go
 //
+
 // Package didnuts is a generated GoMock package.
 package didnuts
 
diff --git a/vdr/didnuts/didstore/mock.go b/vdr/didnuts/didstore/mock.go
index fda940544a..4ff8c833a1 100644
--- a/vdr/didnuts/didstore/mock.go
+++ b/vdr/didnuts/didstore/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vdr/didnuts/didstore/mock.go -package=didstore -source=vdr/didnuts/didstore/interface.go
 //
+
 // Package didstore is a generated GoMock package.
 package didstore
 
diff --git a/vdr/management/finder_mock.go b/vdr/management/finder_mock.go
index ab666f7b96..6af6fee402 100644
--- a/vdr/management/finder_mock.go
+++ b/vdr/management/finder_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vdr/management/finder_mock.go -package=management -source=vdr/management/finder.go
 //
+
 // Package management is a generated GoMock package.
 package management
 
diff --git a/vdr/management/management_mock.go b/vdr/management/management_mock.go
index f3d5f10cc2..b8f665e9b0 100644
--- a/vdr/management/management_mock.go
+++ b/vdr/management/management_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vdr/management/management_mock.go -package=management -source=vdr/management/management.go
 //
+
 // Package management is a generated GoMock package.
 package management
 
diff --git a/vdr/mock.go b/vdr/mock.go
index 78c91ade0d..e6cb7c2b1b 100644
--- a/vdr/mock.go
+++ b/vdr/mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vdr/mock.go -package=vdr -source=vdr/interface.go
 //
+
 // Package vdr is a generated GoMock package.
 package vdr
 
diff --git a/vdr/resolver/did_mock.go b/vdr/resolver/did_mock.go
index 6bf78a93b0..7123ce35b1 100644
--- a/vdr/resolver/did_mock.go
+++ b/vdr/resolver/did_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vdr/resolver/did_mock.go -package=resolver -source=vdr/resolver/did.go
 //
+
 // Package resolver is a generated GoMock package.
 package resolver
 
diff --git a/vdr/resolver/key_mock.go b/vdr/resolver/key_mock.go
index e62e4723f8..5b19fd4834 100644
--- a/vdr/resolver/key_mock.go
+++ b/vdr/resolver/key_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vdr/resolver/key_mock.go -package=resolver -source=vdr/resolver/key.go
 //
+
 // Package resolver is a generated GoMock package.
 package resolver
 
diff --git a/vdr/resolver/service_mock.go b/vdr/resolver/service_mock.go
index 5c6f0ee04b..6fe0453fc6 100644
--- a/vdr/resolver/service_mock.go
+++ b/vdr/resolver/service_mock.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -destination=vdr/resolver/service_mock.go -package=resolver -source=vdr/resolver/service.go
 //
+
 // Package resolver is a generated GoMock package.
 package resolver