diff --git a/.github/workflows/check-generated.yml b/.github/workflows/check-generated.yml
index f49ee9ce1..5b751145a 100644
--- a/.github/workflows/check-generated.yml
+++ b/.github/workflows/check-generated.yml
@@ -31,7 +31,7 @@ jobs:
         run: |
           set -euo pipefail
 
-          readonly MOCKERY=2.49.1  # N.B. no leading "v"
+          readonly MOCKERY=2.50.0  # N.B. no leading "v"
           curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
           make mockery 2>/dev/null
 
diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go
index a63990256..7c2d06285 100644
--- a/abci/client/mocks/client.go
+++ b/abci/client/mocks/client.go
@@ -199,7 +199,7 @@ func (_c *Client_Echo_Call) RunAndReturn(run func(context.Context, string) (*typ
 	return _c
 }
 
-// Error provides a mock function with given fields:
+// Error provides a mock function with no fields
 func (_m *Client) Error() error {
 	ret := _m.Called()
 
@@ -526,7 +526,7 @@ func (_c *Client_InitChain_Call) RunAndReturn(run func(context.Context, *types.R
 	return _c
 }
 
-// IsRunning provides a mock function with given fields:
+// IsRunning provides a mock function with no fields
 func (_m *Client) IsRunning() bool {
 	ret := _m.Called()
 
@@ -1030,7 +1030,7 @@ func (_c *Client_VerifyVoteExtension_Call) RunAndReturn(run func(context.Context
 	return _c
 }
 
-// Wait provides a mock function with given fields:
+// Wait provides a mock function with no fields
 func (_m *Client) Wait() {
 	_m.Called()
 }
@@ -1058,7 +1058,7 @@ func (_c *Client_Wait_Call) Return() *Client_Wait_Call {
 }
 
 func (_c *Client_Wait_Call) RunAndReturn(run func()) *Client_Wait_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
diff --git a/dash/core/mocks/client.go b/dash/core/mocks/client.go
index 677f59b94..34625cd01 100644
--- a/dash/core/mocks/client.go
+++ b/dash/core/mocks/client.go
@@ -24,7 +24,7 @@ func (_m *Client) EXPECT() *Client_Expecter {
 	return &Client_Expecter{mock: &_m.Mock}
 }
 
-// Close provides a mock function with given fields:
+// Close provides a mock function with no fields
 func (_m *Client) Close() error {
 	ret := _m.Called()
 
@@ -69,7 +69,7 @@ func (_c *Client_Close_Call) RunAndReturn(run func() error) *Client_Close_Call {
 	return _c
 }
 
-// GetNetworkInfo provides a mock function with given fields:
+// GetNetworkInfo provides a mock function with no fields
 func (_m *Client) GetNetworkInfo() (*btcjson.GetNetworkInfoResult, error) {
 	ret := _m.Called()
 
@@ -184,7 +184,7 @@ func (_c *Client_MasternodeListJSON_Call) RunAndReturn(run func(string) (map[str
 	return _c
 }
 
-// MasternodeStatus provides a mock function with given fields:
+// MasternodeStatus provides a mock function with no fields
 func (_m *Client) MasternodeStatus() (*btcjson.MasternodeStatusResult, error) {
 	ret := _m.Called()
 
@@ -241,7 +241,7 @@ func (_c *Client_MasternodeStatus_Call) RunAndReturn(run func() (*btcjson.Master
 	return _c
 }
 
-// Ping provides a mock function with given fields:
+// Ping provides a mock function with no fields
 func (_m *Client) Ping() error {
 	ret := _m.Called()
 
diff --git a/go.mod b/go.mod
index 1ea9d5acc..5fc256e66 100644
--- a/go.mod
+++ b/go.mod
@@ -51,7 +51,7 @@ require (
 	github.com/creachadair/taskgroup v0.13.2
 	github.com/go-pkgz/jrpc v0.2.0
 	github.com/google/go-cmp v0.6.0
-	github.com/vektra/mockery/v2 v2.49.1
+	github.com/vektra/mockery/v2 v2.50.0
 )
 
 require (
diff --git a/go.sum b/go.sum
index 79a25c687..c7378044a 100644
--- a/go.sum
+++ b/go.sum
@@ -833,8 +833,8 @@ github.com/uudashr/iface v1.2.1 h1:vHHyzAUmWZ64Olq6NZT3vg/z1Ws56kyPdBOd5kTXDF8=
 github.com/uudashr/iface v1.2.1/go.mod h1:4QvspiRd3JLPAEXBQ9AiZpLbJlrWWgRChOKDJEuQTdg=
 github.com/vbatts/tar-split v0.11.6 h1:4SjTW5+PU11n6fZenf2IPoV8/tz3AaYHMWjf23envGs=
 github.com/vbatts/tar-split v0.11.6/go.mod h1:dqKNtesIOr2j2Qv3W/cHjnvk9I8+G7oAkFDFN6TCBEI=
-github.com/vektra/mockery/v2 v2.49.1 h1:P33NkpxL5QNsteqdtOAEOJ94kKXaqdsTHeD6GtVuNUc=
-github.com/vektra/mockery/v2 v2.49.1/go.mod h1:xO2DeYemEPC2tCzIZ+a1tifZ/7Laf/Chxg3vlc+oDsI=
+github.com/vektra/mockery/v2 v2.50.0 h1:0GYRH38nKiRghwUq+0aJXG1sT3yyTYj/J1xQRM8kGzQ=
+github.com/vektra/mockery/v2 v2.50.0/go.mod h1:xO2DeYemEPC2tCzIZ+a1tifZ/7Laf/Chxg3vlc+oDsI=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
diff --git a/internal/consensus/mocks/gossiper.go b/internal/consensus/mocks/gossiper.go
index 22a3d374a..e4548d1c6 100644
--- a/internal/consensus/mocks/gossiper.go
+++ b/internal/consensus/mocks/gossiper.go
@@ -53,7 +53,7 @@ func (_c *Gossiper_GossipBlockPartsForCatchup_Call) Return() *Gossiper_GossipBlo
 }
 
 func (_c *Gossiper_GossipBlockPartsForCatchup_Call) RunAndReturn(run func(context.Context, types.RoundState, *types.PeerRoundState)) *Gossiper_GossipBlockPartsForCatchup_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -88,7 +88,7 @@ func (_c *Gossiper_GossipCommit_Call) Return() *Gossiper_GossipCommit_Call {
 }
 
 func (_c *Gossiper_GossipCommit_Call) RunAndReturn(run func(context.Context, types.RoundState, *types.PeerRoundState)) *Gossiper_GossipCommit_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -123,7 +123,7 @@ func (_c *Gossiper_GossipProposal_Call) Return() *Gossiper_GossipProposal_Call {
 }
 
 func (_c *Gossiper_GossipProposal_Call) RunAndReturn(run func(context.Context, types.RoundState, *types.PeerRoundState)) *Gossiper_GossipProposal_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -158,7 +158,7 @@ func (_c *Gossiper_GossipProposalBlockParts_Call) Return() *Gossiper_GossipPropo
 }
 
 func (_c *Gossiper_GossipProposalBlockParts_Call) RunAndReturn(run func(context.Context, types.RoundState, *types.PeerRoundState)) *Gossiper_GossipProposalBlockParts_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -193,7 +193,7 @@ func (_c *Gossiper_GossipVote_Call) Return() *Gossiper_GossipVote_Call {
 }
 
 func (_c *Gossiper_GossipVote_Call) RunAndReturn(run func(context.Context, types.RoundState, *types.PeerRoundState)) *Gossiper_GossipVote_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -228,7 +228,7 @@ func (_c *Gossiper_GossipVoteSetMaj23_Call) Return() *Gossiper_GossipVoteSetMaj2
 }
 
 func (_c *Gossiper_GossipVoteSetMaj23_Call) RunAndReturn(run func(context.Context, types.RoundState, *types.PeerRoundState)) *Gossiper_GossipVoteSetMaj23_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
diff --git a/internal/consensus/versioned/selectproposer/mocks/proposerselector.go b/internal/consensus/versioned/selectproposer/mocks/proposerselector.go
index 6daf7600a..bcee70886 100644
--- a/internal/consensus/versioned/selectproposer/mocks/proposerselector.go
+++ b/internal/consensus/versioned/selectproposer/mocks/proposerselector.go
@@ -21,7 +21,7 @@ func (_m *ProposerSelector) EXPECT() *ProposerSelector_Expecter {
 	return &ProposerSelector_Expecter{mock: &_m.Mock}
 }
 
-// Copy provides a mock function with given fields:
+// Copy provides a mock function with no fields
 func (_m *ProposerSelector) Copy() selectproposer.ProposerSelector {
 	ret := _m.Called()
 
@@ -223,7 +223,7 @@ func (_c *ProposerSelector_UpdateHeightRound_Call) RunAndReturn(run func(int64,
 	return _c
 }
 
-// ValidatorSet provides a mock function with given fields:
+// ValidatorSet provides a mock function with no fields
 func (_m *ProposerSelector) ValidatorSet() *types.ValidatorSet {
 	ret := _m.Called()
 
diff --git a/internal/evidence/mocks/blockstore.go b/internal/evidence/mocks/blockstore.go
index 0d34b27b2..cc27dc4d2 100644
--- a/internal/evidence/mocks/blockstore.go
+++ b/internal/evidence/mocks/blockstore.go
@@ -20,7 +20,7 @@ func (_m *BlockStore) EXPECT() *BlockStore_Expecter {
 	return &BlockStore_Expecter{mock: &_m.Mock}
 }
 
-// Base provides a mock function with given fields:
+// Base provides a mock function with no fields
 func (_m *BlockStore) Base() int64 {
 	ret := _m.Called()
 
@@ -65,7 +65,7 @@ func (_c *BlockStore_Base_Call) RunAndReturn(run func() int64) *BlockStore_Base_
 	return _c
 }
 
-// Height provides a mock function with given fields:
+// Height provides a mock function with no fields
 func (_m *BlockStore) Height() int64 {
 	ret := _m.Called()
 
diff --git a/internal/mempool/mocks/mempool.go b/internal/mempool/mocks/mempool.go
index 671bbea63..b8a04669f 100644
--- a/internal/mempool/mocks/mempool.go
+++ b/internal/mempool/mocks/mempool.go
@@ -76,7 +76,7 @@ func (_c *Mempool_CheckTx_Call) RunAndReturn(run func(context.Context, types.Tx,
 	return _c
 }
 
-// EnableTxsAvailable provides a mock function with given fields:
+// EnableTxsAvailable provides a mock function with no fields
 func (_m *Mempool) EnableTxsAvailable() {
 	_m.Called()
 }
@@ -104,11 +104,11 @@ func (_c *Mempool_EnableTxsAvailable_Call) Return() *Mempool_EnableTxsAvailable_
 }
 
 func (_c *Mempool_EnableTxsAvailable_Call) RunAndReturn(run func()) *Mempool_EnableTxsAvailable_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
-// Flush provides a mock function with given fields:
+// Flush provides a mock function with no fields
 func (_m *Mempool) Flush() {
 	_m.Called()
 }
@@ -136,7 +136,7 @@ func (_c *Mempool_Flush_Call) Return() *Mempool_Flush_Call {
 }
 
 func (_c *Mempool_Flush_Call) RunAndReturn(run func()) *Mempool_Flush_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -186,7 +186,7 @@ func (_c *Mempool_FlushAppConn_Call) RunAndReturn(run func(context.Context) erro
 	return _c
 }
 
-// Lock provides a mock function with given fields:
+// Lock provides a mock function with no fields
 func (_m *Mempool) Lock() {
 	_m.Called()
 }
@@ -214,7 +214,7 @@ func (_c *Mempool_Lock_Call) Return() *Mempool_Lock_Call {
 }
 
 func (_c *Mempool_Lock_Call) RunAndReturn(run func()) *Mempool_Lock_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -361,7 +361,7 @@ func (_c *Mempool_RemoveTxByKey_Call) RunAndReturn(run func(types.TxKey) error)
 	return _c
 }
 
-// Size provides a mock function with given fields:
+// Size provides a mock function with no fields
 func (_m *Mempool) Size() int {
 	ret := _m.Called()
 
@@ -406,7 +406,7 @@ func (_c *Mempool_Size_Call) RunAndReturn(run func() int) *Mempool_Size_Call {
 	return _c
 }
 
-// SizeBytes provides a mock function with given fields:
+// SizeBytes provides a mock function with no fields
 func (_m *Mempool) SizeBytes() int64 {
 	ret := _m.Called()
 
@@ -451,7 +451,7 @@ func (_c *Mempool_SizeBytes_Call) RunAndReturn(run func() int64) *Mempool_SizeBy
 	return _c
 }
 
-// TxsAvailable provides a mock function with given fields:
+// TxsAvailable provides a mock function with no fields
 func (_m *Mempool) TxsAvailable() <-chan struct{} {
 	ret := _m.Called()
 
@@ -498,7 +498,7 @@ func (_c *Mempool_TxsAvailable_Call) RunAndReturn(run func() <-chan struct{}) *M
 	return _c
 }
 
-// Unlock provides a mock function with given fields:
+// Unlock provides a mock function with no fields
 func (_m *Mempool) Unlock() {
 	_m.Called()
 }
@@ -526,7 +526,7 @@ func (_c *Mempool_Unlock_Call) Return() *Mempool_Unlock_Call {
 }
 
 func (_c *Mempool_Unlock_Call) RunAndReturn(run func()) *Mempool_Unlock_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
diff --git a/internal/p2p/mocks/channel.go b/internal/p2p/mocks/channel.go
index 9ff79d4f5..9af5e12e5 100644
--- a/internal/p2p/mocks/channel.go
+++ b/internal/p2p/mocks/channel.go
@@ -22,7 +22,7 @@ func (_m *Channel) EXPECT() *Channel_Expecter {
 	return &Channel_Expecter{mock: &_m.Mock}
 }
 
-// Err provides a mock function with given fields:
+// Err provides a mock function with no fields
 func (_m *Channel) Err() error {
 	ret := _m.Called()
 
@@ -209,7 +209,7 @@ func (_c *Channel_SendError_Call) RunAndReturn(run func(context.Context, p2p.Pee
 	return _c
 }
 
-// String provides a mock function with given fields:
+// String provides a mock function with no fields
 func (_m *Channel) String() string {
 	ret := _m.Called()
 
diff --git a/internal/p2p/mocks/connection.go b/internal/p2p/mocks/connection.go
index 1b0611d4b..fd1fcad61 100644
--- a/internal/p2p/mocks/connection.go
+++ b/internal/p2p/mocks/connection.go
@@ -28,7 +28,7 @@ func (_m *Connection) EXPECT() *Connection_Expecter {
 	return &Connection_Expecter{mock: &_m.Mock}
 }
 
-// Close provides a mock function with given fields:
+// Close provides a mock function with no fields
 func (_m *Connection) Close() error {
 	ret := _m.Called()
 
@@ -141,7 +141,7 @@ func (_c *Connection_Handshake_Call) RunAndReturn(run func(context.Context, time
 	return _c
 }
 
-// LocalEndpoint provides a mock function with given fields:
+// LocalEndpoint provides a mock function with no fields
 func (_m *Connection) LocalEndpoint() p2p.Endpoint {
 	ret := _m.Called()
 
@@ -251,7 +251,7 @@ func (_c *Connection_ReceiveMessage_Call) RunAndReturn(run func(context.Context)
 	return _c
 }
 
-// RemoteEndpoint provides a mock function with given fields:
+// RemoteEndpoint provides a mock function with no fields
 func (_m *Connection) RemoteEndpoint() p2p.Endpoint {
 	ret := _m.Called()
 
@@ -344,7 +344,7 @@ func (_c *Connection_SendMessage_Call) RunAndReturn(run func(context.Context, p2
 	return _c
 }
 
-// String provides a mock function with given fields:
+// String provides a mock function with no fields
 func (_m *Connection) String() string {
 	ret := _m.Called()
 
diff --git a/internal/p2p/mocks/transport.go b/internal/p2p/mocks/transport.go
index 90cc99b41..9ad3323d8 100644
--- a/internal/p2p/mocks/transport.go
+++ b/internal/p2p/mocks/transport.go
@@ -109,11 +109,11 @@ func (_c *Transport_AddChannelDescriptors_Call) Return() *Transport_AddChannelDe
 }
 
 func (_c *Transport_AddChannelDescriptors_Call) RunAndReturn(run func([]*p2p.ChannelDescriptor)) *Transport_AddChannelDescriptors_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
-// Close provides a mock function with given fields:
+// Close provides a mock function with no fields
 func (_m *Transport) Close() error {
 	ret := _m.Called()
 
@@ -217,7 +217,7 @@ func (_c *Transport_Dial_Call) RunAndReturn(run func(context.Context, *p2p.Endpo
 	return _c
 }
 
-// Endpoint provides a mock function with given fields:
+// Endpoint provides a mock function with no fields
 func (_m *Transport) Endpoint() (*p2p.Endpoint, error) {
 	ret := _m.Called()
 
@@ -320,7 +320,7 @@ func (_c *Transport_Listen_Call) RunAndReturn(run func(*p2p.Endpoint) error) *Tr
 	return _c
 }
 
-// Protocols provides a mock function with given fields:
+// Protocols provides a mock function with no fields
 func (_m *Transport) Protocols() []p2p.Protocol {
 	ret := _m.Called()
 
@@ -367,7 +367,7 @@ func (_c *Transport_Protocols_Call) RunAndReturn(run func() []p2p.Protocol) *Tra
 	return _c
 }
 
-// String provides a mock function with given fields:
+// String provides a mock function with no fields
 func (_m *Transport) String() string {
 	ret := _m.Called()
 
diff --git a/internal/state/indexer/mocks/eventsink.go b/internal/state/indexer/mocks/eventsink.go
index a40a3729d..1d9d86ec3 100644
--- a/internal/state/indexer/mocks/eventsink.go
+++ b/internal/state/indexer/mocks/eventsink.go
@@ -352,7 +352,7 @@ func (_c *EventSink_SearchTxEvents_Call) RunAndReturn(run func(context.Context,
 	return _c
 }
 
-// Stop provides a mock function with given fields:
+// Stop provides a mock function with no fields
 func (_m *EventSink) Stop() error {
 	ret := _m.Called()
 
@@ -397,7 +397,7 @@ func (_c *EventSink_Stop_Call) RunAndReturn(run func() error) *EventSink_Stop_Ca
 	return _c
 }
 
-// Type provides a mock function with given fields:
+// Type provides a mock function with no fields
 func (_m *EventSink) Type() indexer.EventSinkType {
 	ret := _m.Called()
 
diff --git a/internal/state/mocks/blockstore.go b/internal/state/mocks/blockstore.go
index dc3b8e9e0..388e81e13 100644
--- a/internal/state/mocks/blockstore.go
+++ b/internal/state/mocks/blockstore.go
@@ -21,7 +21,7 @@ func (_m *BlockStore) EXPECT() *BlockStore_Expecter {
 	return &BlockStore_Expecter{mock: &_m.Mock}
 }
 
-// Base provides a mock function with given fields:
+// Base provides a mock function with no fields
 func (_m *BlockStore) Base() int64 {
 	ret := _m.Called()
 
@@ -66,7 +66,7 @@ func (_c *BlockStore_Base_Call) RunAndReturn(run func() int64) *BlockStore_Base_
 	return _c
 }
 
-// CoreChainLockedHeight provides a mock function with given fields:
+// CoreChainLockedHeight provides a mock function with no fields
 func (_m *BlockStore) CoreChainLockedHeight() uint32 {
 	ret := _m.Called()
 
@@ -111,7 +111,7 @@ func (_c *BlockStore_CoreChainLockedHeight_Call) RunAndReturn(run func() uint32)
 	return _c
 }
 
-// Height provides a mock function with given fields:
+// Height provides a mock function with no fields
 func (_m *BlockStore) Height() int64 {
 	ret := _m.Called()
 
@@ -156,7 +156,7 @@ func (_c *BlockStore_Height_Call) RunAndReturn(run func() int64) *BlockStore_Hei
 	return _c
 }
 
-// LoadBaseMeta provides a mock function with given fields:
+// LoadBaseMeta provides a mock function with no fields
 func (_m *BlockStore) LoadBaseMeta() *types.BlockMeta {
 	ret := _m.Called()
 
@@ -492,7 +492,7 @@ func (_c *BlockStore_LoadBlockPart_Call) RunAndReturn(run func(int64, int) *type
 	return _c
 }
 
-// LoadSeenCommit provides a mock function with given fields:
+// LoadSeenCommit provides a mock function with no fields
 func (_m *BlockStore) LoadSeenCommit() *types.Commit {
 	ret := _m.Called()
 
@@ -674,11 +674,11 @@ func (_c *BlockStore_SaveBlock_Call) Return() *BlockStore_SaveBlock_Call {
 }
 
 func (_c *BlockStore_SaveBlock_Call) RunAndReturn(run func(*types.Block, *types.PartSet, *types.Commit)) *BlockStore_SaveBlock_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
-// Size provides a mock function with given fields:
+// Size provides a mock function with no fields
 func (_m *BlockStore) Size() int64 {
 	ret := _m.Called()
 
diff --git a/internal/state/mocks/evidencepool.go b/internal/state/mocks/evidencepool.go
index 3b2f161f3..1491806b7 100644
--- a/internal/state/mocks/evidencepool.go
+++ b/internal/state/mocks/evidencepool.go
@@ -207,7 +207,7 @@ func (_c *EvidencePool_Update_Call) Return() *EvidencePool_Update_Call {
 }
 
 func (_c *EvidencePool_Update_Call) RunAndReturn(run func(context.Context, state.State, types.EvidenceList)) *EvidencePool_Update_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
diff --git a/internal/state/mocks/executor.go b/internal/state/mocks/executor.go
index 23a56e2b5..a1a19d63e 100644
--- a/internal/state/mocks/executor.go
+++ b/internal/state/mocks/executor.go
@@ -185,7 +185,7 @@ func (_c *Executor_ExtendVote_Call) Return() *Executor_ExtendVote_Call {
 }
 
 func (_c *Executor_ExtendVote_Call) RunAndReturn(run func(context.Context, *types.Vote)) *Executor_ExtendVote_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
diff --git a/internal/state/mocks/store.go b/internal/state/mocks/store.go
index 556985c83..499ce2c31 100644
--- a/internal/state/mocks/store.go
+++ b/internal/state/mocks/store.go
@@ -71,7 +71,7 @@ func (_c *Store_Bootstrap_Call) RunAndReturn(run func(state.State) error) *Store
 	return _c
 }
 
-// Close provides a mock function with given fields:
+// Close provides a mock function with no fields
 func (_m *Store) Close() error {
 	ret := _m.Called()
 
@@ -116,7 +116,7 @@ func (_c *Store_Close_Call) RunAndReturn(run func() error) *Store_Close_Call {
 	return _c
 }
 
-// Load provides a mock function with given fields:
+// Load provides a mock function with no fields
 func (_m *Store) Load() (state.State, error) {
 	ret := _m.Called()
 
diff --git a/libs/store/mocks/store.go b/libs/store/mocks/store.go
index 35a294875..bf43f9b90 100644
--- a/libs/store/mocks/store.go
+++ b/libs/store/mocks/store.go
@@ -20,7 +20,7 @@ func (_m *Store[K, V]) EXPECT() *Store_Expecter[K, V] {
 	return &Store_Expecter[K, V]{mock: &_m.Mock}
 }
 
-// All provides a mock function with given fields:
+// All provides a mock function with no fields
 func (_m *Store[K, V]) All() []V {
 	ret := _m.Called()
 
@@ -96,7 +96,7 @@ func (_c *Store_Delete_Call[K, V]) Return() *Store_Delete_Call[K, V] {
 }
 
 func (_c *Store_Delete_Call[K, V]) RunAndReturn(run func(K)) *Store_Delete_Call[K, V] {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -216,7 +216,7 @@ func (_c *Store_GetAndDelete_Call[K, V]) RunAndReturn(run func(K) (V, bool)) *St
 	return _c
 }
 
-// IsZero provides a mock function with given fields:
+// IsZero provides a mock function with no fields
 func (_m *Store[K, V]) IsZero() bool {
 	ret := _m.Called()
 
@@ -261,7 +261,7 @@ func (_c *Store_IsZero_Call[K, V]) RunAndReturn(run func() bool) *Store_IsZero_C
 	return _c
 }
 
-// Len provides a mock function with given fields:
+// Len provides a mock function with no fields
 func (_m *Store[K, V]) Len() int {
 	ret := _m.Called()
 
@@ -336,7 +336,7 @@ func (_c *Store_Put_Call[K, V]) Return() *Store_Put_Call[K, V] {
 }
 
 func (_c *Store_Put_Call[K, V]) RunAndReturn(run func(K, V)) *Store_Put_Call[K, V] {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
@@ -433,7 +433,7 @@ func (_c *Store_Update_Call[K, V]) Return() *Store_Update_Call[K, V] {
 }
 
 func (_c *Store_Update_Call[K, V]) RunAndReturn(run func(K, ...store.UpdateFunc[K, V])) *Store_Update_Call[K, V] {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
diff --git a/light/provider/mocks/provider.go b/light/provider/mocks/provider.go
index 137e9958b..08e6a15f5 100644
--- a/light/provider/mocks/provider.go
+++ b/light/provider/mocks/provider.go
@@ -23,7 +23,7 @@ func (_m *Provider) EXPECT() *Provider_Expecter {
 	return &Provider_Expecter{mock: &_m.Mock}
 }
 
-// ID provides a mock function with given fields:
+// ID provides a mock function with no fields
 func (_m *Provider) ID() string {
 	ret := _m.Called()
 
diff --git a/light/rpc/mocks/lightclient.go b/light/rpc/mocks/lightclient.go
index 6edc4304d..0856f41f8 100644
--- a/light/rpc/mocks/lightclient.go
+++ b/light/rpc/mocks/lightclient.go
@@ -25,7 +25,7 @@ func (_m *LightClient) EXPECT() *LightClient_Expecter {
 	return &LightClient_Expecter{mock: &_m.Mock}
 }
 
-// ChainID provides a mock function with given fields:
+// ChainID provides a mock function with no fields
 func (_m *LightClient) ChainID() string {
 	ret := _m.Called()
 
diff --git a/rpc/client/mocks/remoteclient.go b/rpc/client/mocks/remoteclient.go
index 1fed245b7..91f48561f 100644
--- a/rpc/client/mocks/remoteclient.go
+++ b/rpc/client/mocks/remoteclient.go
@@ -1562,7 +1562,7 @@ func (_c *RemoteClient_NumUnconfirmedTxs_Call) RunAndReturn(run func(context.Con
 	return _c
 }
 
-// Remote provides a mock function with given fields:
+// Remote provides a mock function with no fields
 func (_m *RemoteClient) Remote() string {
 	ret := _m.Called()
 
diff --git a/scripts/mockery_generate.sh b/scripts/mockery_generate.sh
index f9e94f77a..a24786250 100755
--- a/scripts/mockery_generate.sh
+++ b/scripts/mockery_generate.sh
@@ -6,7 +6,7 @@
 # runs the published Docker container. This legerdemain is so that the CI build
 # and a local build can work off the same script.
 #
-VERSION=v2.49.1
+VERSION=v2.50.0
 
 if ! mockery --version 2>/dev/null | grep $VERSION; then
   echo "Please install mockery $VERSION, example for Linux x86_64:"
diff --git a/types/mocks/privvalidator.go b/types/mocks/privvalidator.go
index dc21796ed..f875b0c42 100644
--- a/types/mocks/privvalidator.go
+++ b/types/mocks/privvalidator.go
@@ -577,7 +577,7 @@ func (_c *PrivValidator_UpdatePrivateKey_Call) Return() *PrivValidator_UpdatePri
 }
 
 func (_c *PrivValidator_UpdatePrivateKey_Call) RunAndReturn(run func(context.Context, crypto.PrivKey, crypto.QuorumHash, crypto.PubKey, int64)) *PrivValidator_UpdatePrivateKey_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }