diff --git a/.tool-versions b/.tool-versions
index c60396ccb86..d78ce677cda 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,5 +1,5 @@
 golang 1.21.4
-mockery 2.35.4
+mockery 2.38.0
 nodejs 16.16.0
 postgres 13.3
 helm 3.10.3
diff --git a/GNUmakefile b/GNUmakefile
index 6cd5ab7143e..7d0753911a3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -112,7 +112,7 @@ presubmit: ## Format go files and imports.
 
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.
-	go install github.com/vektra/mockery/v2@v2.35.4
+	go install github.com/vektra/mockery/v2@v2.38.0
 
 .PHONY: codecgen
 codecgen: $(codecgen) ## Install codecgen
diff --git a/common/client/mock_head_test.go b/common/client/mock_head_test.go
index 1b69eedf438..747770480f5 100644
--- a/common/client/mock_head_test.go
+++ b/common/client/mock_head_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -17,6 +17,10 @@ type mockHead struct {
 func (_m *mockHead) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockDifficulty")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -33,6 +37,10 @@ func (_m *mockHead) BlockDifficulty() *big.Int {
 func (_m *mockHead) BlockNumber() int64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockNumber")
+	}
+
 	var r0 int64
 	if rf, ok := ret.Get(0).(func() int64); ok {
 		r0 = rf()
diff --git a/common/client/mock_node_client_test.go b/common/client/mock_node_client_test.go
index 7c8eb69171f..661ad68ede5 100644
--- a/common/client/mock_node_client_test.go
+++ b/common/client/mock_node_client_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -18,6 +18,10 @@ type mockNodeClient[CHAIN_ID types.ID, HEAD Head] struct {
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) ChainID(ctx context.Context) (CHAIN_ID, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 CHAIN_ID
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (CHAIN_ID, error)); ok {
@@ -42,6 +46,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) ChainID(ctx context.Context) (CHAIN_ID
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) ClientVersion(_a0 context.Context) (string, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClientVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (string, error)); ok {
@@ -71,6 +79,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) Close() {
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) Dial(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Dial")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -85,6 +97,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) Dial(ctx context.Context) error {
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) DialHTTP() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DialHTTP")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -112,6 +128,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) Subscribe(ctx context.Context, channel
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subscribe")
+	}
+
 	var r0 types.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, chan<- HEAD, ...interface{}) (types.Subscription, error)); ok {
@@ -138,6 +158,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) Subscribe(ctx context.Context, channel
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) SubscribersCount() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribersCount")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
diff --git a/common/client/mock_node_selector_test.go b/common/client/mock_node_selector_test.go
index e7b8d9ecb8d..bd0805fa4e6 100644
--- a/common/client/mock_node_selector_test.go
+++ b/common/client/mock_node_selector_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -16,6 +16,10 @@ type mockNodeSelector[CHAIN_ID types.ID, HEAD Head, RPC NodeClient[CHAIN_ID, HEA
 func (_m *mockNodeSelector[CHAIN_ID, HEAD, RPC]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -30,6 +34,10 @@ func (_m *mockNodeSelector[CHAIN_ID, HEAD, RPC]) Name() string {
 func (_m *mockNodeSelector[CHAIN_ID, HEAD, RPC]) Select() Node[CHAIN_ID, HEAD, RPC] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Select")
+	}
+
 	var r0 Node[CHAIN_ID, HEAD, RPC]
 	if rf, ok := ret.Get(0).(func() Node[CHAIN_ID, HEAD, RPC]); ok {
 		r0 = rf()
diff --git a/common/client/mock_node_test.go b/common/client/mock_node_test.go
index ea0e7d1a120..56132b2cee8 100644
--- a/common/client/mock_node_test.go
+++ b/common/client/mock_node_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -20,6 +20,10 @@ type mockNode[CHAIN_ID types.ID, HEAD Head, RPC NodeClient[CHAIN_ID, HEAD]] stru
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Close() error {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) ConfiguredChainID() CHAIN_ID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConfiguredChainID")
+	}
+
 	var r0 CHAIN_ID
 	if rf, ok := ret.Get(0).(func() CHAIN_ID); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) ConfiguredChainID() CHAIN_ID {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -62,6 +74,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Name() string {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Order() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Order")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -76,6 +92,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Order() int32 {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) RPC() RPC {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RPC")
+	}
+
 	var r0 RPC
 	if rf, ok := ret.Get(0).(func() RPC); ok {
 		r0 = rf()
@@ -90,6 +110,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) RPC() RPC {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -104,6 +128,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Start(_a0 context.Context) error {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) State() nodeState {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for State")
+	}
+
 	var r0 nodeState
 	if rf, ok := ret.Get(0).(func() nodeState); ok {
 		r0 = rf()
@@ -118,6 +146,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) State() nodeState {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *big.Int) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StateAndLatest")
+	}
+
 	var r0 nodeState
 	var r1 int64
 	var r2 *big.Int
@@ -151,6 +183,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *bi
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -165,6 +201,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) String() string {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) SubscribersCount() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribersCount")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
diff --git a/common/client/mock_rpc_test.go b/common/client/mock_rpc_test.go
index d5e8db82836..d87a02d47c1 100644
--- a/common/client/mock_rpc_test.go
+++ b/common/client/mock_rpc_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -25,6 +25,10 @@ type mockRPC[CHAIN_ID types.ID, SEQ types.Sequence, ADDR types.Hashable, BLOCK_H
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) BalanceAt(ctx context.Context, accountAddress ADDR, blockNumber *big.Int) (*big.Int, error) {
 	ret := _m.Called(ctx, accountAddress, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BalanceAt")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, *big.Int) (*big.Int, error)); ok {
@@ -51,6 +55,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) BatchCallContext(ctx context.Context, b []interface{}) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []interface{}) error); ok {
 		r0 = rf(ctx, b)
@@ -65,6 +73,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) BlockByHash(ctx context.Context, hash BLOCK_HASH) (HEAD, error) {
 	ret := _m.Called(ctx, hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByHash")
+	}
+
 	var r0 HEAD
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, BLOCK_HASH) (HEAD, error)); ok {
@@ -89,6 +101,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) BlockByNumber(ctx context.Context, number *big.Int) (HEAD, error) {
 	ret := _m.Called(ctx, number)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByNumber")
+	}
+
 	var r0 HEAD
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (HEAD, error)); ok {
@@ -116,6 +132,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok {
 		r0 = rf(ctx, result, method, args...)
@@ -130,6 +150,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) CallContract(ctx context.Context, msg interface{}, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, *big.Int) ([]byte, error)); ok {
@@ -156,6 +180,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) ChainID(ctx context.Context) (CHAIN_ID, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 CHAIN_ID
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (CHAIN_ID, error)); ok {
@@ -180,6 +208,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) ClientVersion(_a0 context.Context) (string, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClientVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (string, error)); ok {
@@ -209,6 +241,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) CodeAt(ctx context.Context, account ADDR, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, *big.Int) ([]byte, error)); ok {
@@ -235,6 +271,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) Dial(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Dial")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -249,6 +289,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) DialHTTP() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DialHTTP")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -268,6 +312,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) EstimateGas(ctx context.Context, call interface{}) (uint64, error) {
 	ret := _m.Called(ctx, call)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EstimateGas")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}) (uint64, error)); ok {
@@ -292,6 +340,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) FilterEvents(ctx context.Context, query EVENT_OPS) ([]EVENT, error) {
 	ret := _m.Called(ctx, query)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterEvents")
+	}
+
 	var r0 []EVENT
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, EVENT_OPS) ([]EVENT, error)); ok {
@@ -318,6 +370,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) LINKBalance(ctx context.Context, accountAddress ADDR, linkAddress ADDR) (*assets.Link, error) {
 	ret := _m.Called(ctx, accountAddress, linkAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LINKBalance")
+	}
+
 	var r0 *assets.Link
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, ADDR) (*assets.Link, error)); ok {
@@ -344,6 +400,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) LatestBlockHeight(_a0 context.Context) (*big.Int, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockHeight")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -370,6 +430,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) PendingSequenceAt(ctx context.Context, addr ADDR) (SEQ, error) {
 	ret := _m.Called(ctx, addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingSequenceAt")
+	}
+
 	var r0 SEQ
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR) (SEQ, error)); ok {
@@ -394,6 +458,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SendEmptyTransaction(ctx context.Context, newTxAttempt func(SEQ, uint32, FEE, ADDR) (interface{}, error), seq SEQ, gasLimit uint32, fee FEE, fromAddress ADDR) (string, error) {
 	ret := _m.Called(ctx, newTxAttempt, seq, gasLimit, fee, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendEmptyTransaction")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, func(SEQ, uint32, FEE, ADDR) (interface{}, error), SEQ, uint32, FEE, ADDR) (string, error)); ok {
@@ -418,6 +486,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SendTransaction(ctx context.Context, tx TX) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, TX) error); ok {
 		r0 = rf(ctx, tx)
@@ -432,6 +504,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SequenceAt(ctx context.Context, accountAddress ADDR, blockNumber *big.Int) (SEQ, error) {
 	ret := _m.Called(ctx, accountAddress, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SequenceAt")
+	}
+
 	var r0 SEQ
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, *big.Int) (SEQ, error)); ok {
@@ -461,6 +537,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SimulateTransaction(ctx context.Context, tx TX) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SimulateTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, TX) error); ok {
 		r0 = rf(ctx, tx)
@@ -478,6 +558,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subscribe")
+	}
+
 	var r0 types.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, chan<- HEAD, ...interface{}) (types.Subscription, error)); ok {
@@ -504,6 +588,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SubscribersCount() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribersCount")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -518,6 +606,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) TokenBalance(ctx context.Context, accountAddress ADDR, tokenAddress ADDR) (*big.Int, error) {
 	ret := _m.Called(ctx, accountAddress, tokenAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TokenBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, ADDR) (*big.Int, error)); ok {
@@ -544,6 +636,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) TransactionByHash(ctx context.Context, txHash TX_HASH) (TX, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionByHash")
+	}
+
 	var r0 TX
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, TX_HASH) (TX, error)); ok {
@@ -568,6 +664,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) TransactionReceipt(ctx context.Context, txHash TX_HASH) (TX_RECEIPT, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionReceipt")
+	}
+
 	var r0 TX_RECEIPT
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, TX_HASH) (TX_RECEIPT, error)); ok {
diff --git a/common/client/mock_send_only_client_test.go b/common/client/mock_send_only_client_test.go
index 481b2602ea3..b667a2ceb59 100644
--- a/common/client/mock_send_only_client_test.go
+++ b/common/client/mock_send_only_client_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -18,6 +18,10 @@ type mockSendOnlyClient[CHAIN_ID types.ID] struct {
 func (_m *mockSendOnlyClient[CHAIN_ID]) ChainID(_a0 context.Context) (CHAIN_ID, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 CHAIN_ID
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (CHAIN_ID, error)); ok {
@@ -47,6 +51,10 @@ func (_m *mockSendOnlyClient[CHAIN_ID]) Close() {
 func (_m *mockSendOnlyClient[CHAIN_ID]) DialHTTP() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DialHTTP")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
diff --git a/common/client/mock_send_only_node_test.go b/common/client/mock_send_only_node_test.go
index 524d7d8a6c5..0a319db5f78 100644
--- a/common/client/mock_send_only_node_test.go
+++ b/common/client/mock_send_only_node_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -18,6 +18,10 @@ type mockSendOnlyNode[CHAIN_ID types.ID, RPC sendOnlyClient[CHAIN_ID]] struct {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Close() error {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) ConfiguredChainID() CHAIN_ID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConfiguredChainID")
+	}
+
 	var r0 CHAIN_ID
 	if rf, ok := ret.Get(0).(func() CHAIN_ID); ok {
 		r0 = rf()
@@ -46,6 +54,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) ConfiguredChainID() CHAIN_ID {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -60,6 +72,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Name() string {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) RPC() RPC {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RPC")
+	}
+
 	var r0 RPC
 	if rf, ok := ret.Get(0).(func() RPC); ok {
 		r0 = rf()
@@ -74,6 +90,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) RPC() RPC {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -88,6 +108,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Start(_a0 context.Context) error {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) State() nodeState {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for State")
+	}
+
 	var r0 nodeState
 	if rf, ok := ret.Get(0).(func() nodeState); ok {
 		r0 = rf()
@@ -102,6 +126,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) State() nodeState {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
diff --git a/common/headtracker/types/mocks/head.go b/common/headtracker/types/mocks/head.go
index 79c483c9978..f86df1d7fce 100644
--- a/common/headtracker/types/mocks/head.go
+++ b/common/headtracker/types/mocks/head.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Head[BLOCK_HASH types.Hashable, CHAIN_ID types.ID] struct {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockDifficulty")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -37,6 +41,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockDifficulty() *big.Int {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockHash() BLOCK_HASH {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockHash")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func() BLOCK_HASH); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockHash() BLOCK_HASH {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockNumber() int64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockNumber")
+	}
+
 	var r0 int64
 	if rf, ok := ret.Get(0).(func() int64); ok {
 		r0 = rf()
@@ -65,6 +77,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockNumber() int64 {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) ChainID() CHAIN_ID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 CHAIN_ID
 	if rf, ok := ret.Get(0).(func() CHAIN_ID); ok {
 		r0 = rf()
@@ -79,6 +95,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) ChainID() CHAIN_ID {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) ChainLength() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainLength")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -93,6 +113,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) ChainLength() uint32 {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) EarliestHeadInChain() types.Head[BLOCK_HASH] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EarliestHeadInChain")
+	}
+
 	var r0 types.Head[BLOCK_HASH]
 	if rf, ok := ret.Get(0).(func() types.Head[BLOCK_HASH]); ok {
 		r0 = rf()
@@ -109,6 +133,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) EarliestHeadInChain() types.Head[BLOCK_HAS
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetParent() types.Head[BLOCK_HASH] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParent")
+	}
+
 	var r0 types.Head[BLOCK_HASH]
 	if rf, ok := ret.Get(0).(func() types.Head[BLOCK_HASH]); ok {
 		r0 = rf()
@@ -125,6 +153,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetParent() types.Head[BLOCK_HASH] {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetParentHash() BLOCK_HASH {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParentHash")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func() BLOCK_HASH); ok {
 		r0 = rf()
@@ -139,6 +171,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetParentHash() BLOCK_HASH {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetTimestamp() time.Time {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTimestamp")
+	}
+
 	var r0 time.Time
 	if rf, ok := ret.Get(0).(func() time.Time); ok {
 		r0 = rf()
@@ -153,6 +189,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetTimestamp() time.Time {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) HasChainID() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasChainID")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -167,6 +207,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) HasChainID() bool {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) HashAtHeight(blockNum int64) BLOCK_HASH {
 	ret := _m.Called(blockNum)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HashAtHeight")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func(int64) BLOCK_HASH); ok {
 		r0 = rf(blockNum)
@@ -181,6 +225,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) HashAtHeight(blockNum int64) BLOCK_HASH {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) IsValid() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsValid")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
diff --git a/common/mocks/head_broadcaster.go b/common/mocks/head_broadcaster.go
index 12036f67843..265fceae91e 100644
--- a/common/mocks/head_broadcaster.go
+++ b/common/mocks/head_broadcaster.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -23,6 +23,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) BroadcastNewLongestChain(_a0 H) {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -37,6 +41,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) Close() error {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -53,6 +61,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) HealthReport() map[string]error {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -67,6 +79,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) Name() string {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -81,6 +97,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) Ready() error {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -95,6 +115,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) Start(_a0 context.Context) error {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Subscribe(callback types.HeadTrackable[H, BLOCK_HASH]) (H, func()) {
 	ret := _m.Called(callback)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subscribe")
+	}
+
 	var r0 H
 	var r1 func()
 	if rf, ok := ret.Get(0).(func(types.HeadTrackable[H, BLOCK_HASH]) (H, func())); ok {
diff --git a/common/mocks/head_tracker.go b/common/mocks/head_tracker.go
index 2a1f64eeeb7..83ee54b1847 100644
--- a/common/mocks/head_tracker.go
+++ b/common/mocks/head_tracker.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type HeadTracker[H types.Head[BLOCK_HASH], BLOCK_HASH types.Hashable] struct {
 func (_m *HeadTracker[H, BLOCK_HASH]) Backfill(ctx context.Context, headWithChain H, depth uint) error {
 	ret := _m.Called(ctx, headWithChain, depth)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Backfill")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, H, uint) error); ok {
 		r0 = rf(ctx, headWithChain, depth)
@@ -32,6 +36,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) Backfill(ctx context.Context, headWithChai
 func (_m *HeadTracker[H, BLOCK_HASH]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -46,6 +54,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) Close() error {
 func (_m *HeadTracker[H, BLOCK_HASH]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -62,6 +74,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) HealthReport() map[string]error {
 func (_m *HeadTracker[H, BLOCK_HASH]) LatestChain() H {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestChain")
+	}
+
 	var r0 H
 	if rf, ok := ret.Get(0).(func() H); ok {
 		r0 = rf()
@@ -76,6 +92,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) LatestChain() H {
 func (_m *HeadTracker[H, BLOCK_HASH]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -90,6 +110,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) Name() string {
 func (_m *HeadTracker[H, BLOCK_HASH]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -104,6 +128,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) Ready() error {
 func (_m *HeadTracker[H, BLOCK_HASH]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/common/txmgr/mocks/tx_manager.go b/common/txmgr/mocks/tx_manager.go
index 27077218f6e..45a3675aced 100644
--- a/common/txmgr/mocks/tx_manager.go
+++ b/common/txmgr/mocks/tx_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -27,6 +27,10 @@ type TxManager[CHAIN_ID types.ID, HEAD types.Head[BLOCK_HASH], ADDR types.Hashab
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -41,6 +45,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Close(
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState) (uint32, error) {
 	ret := _m.Called(ctx, state)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountTransactionsByState")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxState) (uint32, error)); ok {
@@ -65,6 +73,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CountT
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CreateTransaction(ctx context.Context, txRequest txmgrtypes.TxRequest[ADDR, TX_HASH]) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, txRequest)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateTransaction")
+	}
+
 	var r0 txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxRequest[ADDR, TX_HASH]) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -89,6 +101,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Create
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEarliestUnconfirmedBroadcastTime(ctx context.Context) (null.Time, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedBroadcastTime")
+	}
+
 	var r0 null.Time
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (null.Time, error)); ok {
@@ -113,6 +129,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEa
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context) (null.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedTxAttemptBlock")
+	}
+
 	var r0 null.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (null.Int, error)); ok {
@@ -137,6 +157,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEa
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesByMetaFieldAndStates(ctx context.Context, metaField string, metaValue string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, metaValue, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesByMetaFieldAndStates")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -163,6 +187,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTx
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.Context, ids []big.Int, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, ids, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithAttemptsAndReceiptsByIdsAndState")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []big.Int, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -189,6 +217,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTx
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context, metaField string, blockNum int64, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByReceiptBlockNum")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, int64, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -215,6 +247,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTx
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesWithMetaFieldByStates(ctx context.Context, metaField string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByStates")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -241,6 +277,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTx
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetForwarderForEOA(eoa ADDR) (ADDR, error) {
 	ret := _m.Called(eoa)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForwarderForEOA")
+	}
+
 	var r0 ADDR
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ADDR) (ADDR, error)); ok {
@@ -265,6 +305,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetFor
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -281,6 +325,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Health
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -300,6 +348,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) OnNewL
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -319,6 +371,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Regist
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Reset(addr ADDR, abandon bool) error {
 	ret := _m.Called(addr, abandon)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Reset")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(ADDR, bool) error); ok {
 		r0 = rf(addr, abandon)
@@ -333,6 +389,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Reset(
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) SendNativeToken(ctx context.Context, chainID CHAIN_ID, from ADDR, to ADDR, value big.Int, gasLimit uint32) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, chainID, from, to, value, gasLimit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendNativeToken")
+	}
+
 	var r0 txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID, ADDR, ADDR, big.Int, uint32) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -357,6 +417,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) SendNa
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/common/txmgr/types/mocks/forwarder_manager.go b/common/txmgr/types/mocks/forwarder_manager.go
index abf176550b2..bf61d0c3d27 100644
--- a/common/txmgr/types/mocks/forwarder_manager.go
+++ b/common/txmgr/types/mocks/forwarder_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type ForwarderManager[ADDR types.Hashable] struct {
 func (_m *ForwarderManager[ADDR]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -33,6 +37,10 @@ func (_m *ForwarderManager[ADDR]) Close() error {
 func (_m *ForwarderManager[ADDR]) ConvertPayload(dest ADDR, origPayload []byte) ([]byte, error) {
 	ret := _m.Called(dest, origPayload)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConvertPayload")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ADDR, []byte) ([]byte, error)); ok {
@@ -59,6 +67,10 @@ func (_m *ForwarderManager[ADDR]) ConvertPayload(dest ADDR, origPayload []byte)
 func (_m *ForwarderManager[ADDR]) ForwarderFor(addr ADDR) (ADDR, error) {
 	ret := _m.Called(addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ForwarderFor")
+	}
+
 	var r0 ADDR
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ADDR) (ADDR, error)); ok {
@@ -83,6 +95,10 @@ func (_m *ForwarderManager[ADDR]) ForwarderFor(addr ADDR) (ADDR, error) {
 func (_m *ForwarderManager[ADDR]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -99,6 +115,10 @@ func (_m *ForwarderManager[ADDR]) HealthReport() map[string]error {
 func (_m *ForwarderManager[ADDR]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -113,6 +133,10 @@ func (_m *ForwarderManager[ADDR]) Name() string {
 func (_m *ForwarderManager[ADDR]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -127,6 +151,10 @@ func (_m *ForwarderManager[ADDR]) Ready() error {
 func (_m *ForwarderManager[ADDR]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/common/txmgr/types/mocks/key_store.go b/common/txmgr/types/mocks/key_store.go
index ad5178c09d1..d440528a41d 100644
--- a/common/txmgr/types/mocks/key_store.go
+++ b/common/txmgr/types/mocks/key_store.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type KeyStore[ADDR types.Hashable, CHAIN_ID types.ID, SEQ types.Sequence] struct
 func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) CheckEnabled(address ADDR, chainID CHAIN_ID) error {
 	ret := _m.Called(address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckEnabled")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(ADDR, CHAIN_ID) error); ok {
 		r0 = rf(address, chainID)
@@ -31,6 +35,10 @@ func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) CheckEnabled(address ADDR, chainID CHAI
 func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) EnabledAddressesForChain(chainId CHAIN_ID) ([]ADDR, error) {
 	ret := _m.Called(chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnabledAddressesForChain")
+	}
+
 	var r0 []ADDR
 	var r1 error
 	if rf, ok := ret.Get(0).(func(CHAIN_ID) ([]ADDR, error)); ok {
@@ -57,6 +65,10 @@ func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) EnabledAddressesForChain(chainId CHAIN_
 func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) SubscribeToKeyChanges() (chan struct{}, func()) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeToKeyChanges")
+	}
+
 	var r0 chan struct{}
 	var r1 func()
 	if rf, ok := ret.Get(0).(func() (chan struct{}, func())); ok {
diff --git a/common/txmgr/types/mocks/reaper_chain_config.go b/common/txmgr/types/mocks/reaper_chain_config.go
index a733b223701..041214b80c6 100644
--- a/common/txmgr/types/mocks/reaper_chain_config.go
+++ b/common/txmgr/types/mocks/reaper_chain_config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type ReaperConfig struct {
 func (_m *ReaperConfig) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
diff --git a/common/txmgr/types/mocks/tx_attempt_builder.go b/common/txmgr/types/mocks/tx_attempt_builder.go
index 0f3d3e3fba1..b3b6ff761fb 100644
--- a/common/txmgr/types/mocks/tx_attempt_builder.go
+++ b/common/txmgr/types/mocks/tx_attempt_builder.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -24,6 +24,10 @@ type TxAttemptBuilder[CHAIN_ID types.ID, HEAD types.Head[BLOCK_HASH], ADDR types
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -38,6 +42,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -54,6 +62,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -68,6 +80,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) NewBumpTxAttempt(ctx context.Context, tx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], previousAttempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], priorAttempts []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], lggr logger.Logger) (txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], FEE, uint32, bool, error) {
 	ret := _m.Called(ctx, tx, previousAttempt, priorAttempts, lggr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewBumpTxAttempt")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 FEE
 	var r2 uint32
@@ -113,6 +129,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) NewCustomTxAttempt(tx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], fee FEE, gasLimit uint32, txType int, lggr logger.Logger) (txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], bool, error) {
 	ret := _m.Called(tx, fee, gasLimit, txType, lggr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewCustomTxAttempt")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 bool
 	var r2 error
@@ -144,6 +164,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) NewEmptyTxAttempt(seq SEQ, feeLimit uint32, fee FEE, fromAddress ADDR) (txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(seq, feeLimit, fee, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewEmptyTxAttempt")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(SEQ, uint32, FEE, ADDR) (txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -175,6 +199,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewTxAttempt")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 FEE
 	var r2 uint32
@@ -227,6 +255,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewTxAttemptWithType")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 FEE
 	var r2 uint32
@@ -277,6 +309,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -291,6 +327,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/common/txmgr/types/mocks/tx_store.go b/common/txmgr/types/mocks/tx_store.go
index df1528a4c24..16c20df31d7 100644
--- a/common/txmgr/types/mocks/tx_store.go
+++ b/common/txmgr/types/mocks/tx_store.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -29,6 +29,10 @@ type TxStore[ADDR types.Hashable, CHAIN_ID types.ID, TX_HASH types.Hashable, BLO
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Abandon(ctx context.Context, id CHAIN_ID, addr ADDR) error {
 	ret := _m.Called(ctx, id, addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Abandon")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID, ADDR) error); ok {
 		r0 = rf(ctx, id, addr)
@@ -43,6 +47,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Abandon(ctx
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CheckTxQueueCapacity(ctx context.Context, fromAddress ADDR, maxQueuedTransactions uint64, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, fromAddress, maxQueuedTransactions, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckTxQueueCapacity")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, uint64, CHAIN_ID) error); ok {
 		r0 = rf(ctx, fromAddress, maxQueuedTransactions, chainID)
@@ -62,6 +70,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Close() {
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState, chainID CHAIN_ID) (uint32, error) {
 	ret := _m.Called(ctx, state, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountTransactionsByState")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxState, CHAIN_ID) (uint32, error)); ok {
@@ -86,6 +98,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountTransa
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnconfirmedTransactions(ctx context.Context, fromAddress ADDR, chainID CHAIN_ID) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountUnconfirmedTransactions")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) (uint32, error)); ok {
@@ -110,6 +126,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnconf
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnstartedTransactions(ctx context.Context, fromAddress ADDR, chainID CHAIN_ID) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountUnstartedTransactions")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) (uint32, error)); ok {
@@ -134,6 +154,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnstar
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CreateTransaction(ctx context.Context, txRequest txmgrtypes.TxRequest[ADDR, TX_HASH], chainID CHAIN_ID) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, txRequest, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateTransaction")
+	}
+
 	var r0 txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxRequest[ADDR, TX_HASH], CHAIN_ID) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -158,6 +182,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CreateTrans
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) DeleteInProgressAttempt(ctx context.Context, attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, attempt)
@@ -172,6 +200,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) DeleteInPro
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarliestUnconfirmedBroadcastTime(ctx context.Context, chainID CHAIN_ID) (null.Time, error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedBroadcastTime")
+	}
+
 	var r0 null.Time
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) (null.Time, error)); ok {
@@ -196,6 +228,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarlies
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context, chainID CHAIN_ID) (null.Int, error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedTxAttemptBlock")
+	}
+
 	var r0 null.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) (null.Int, error)); ok {
@@ -220,6 +256,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarlies
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindLatestSequence(ctx context.Context, fromAddress ADDR, chainId CHAIN_ID) (SEQ, error) {
 	ret := _m.Called(ctx, fromAddress, chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindLatestSequence")
+	}
+
 	var r0 SEQ
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) (SEQ, error)); ok {
@@ -244,6 +284,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindLatestS
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindNextUnstartedTransactionFromAddress(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], fromAddress ADDR, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, etx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindNextUnstartedTransactionFromAddress")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], ADDR, CHAIN_ID) error); ok {
 		r0 = rf(ctx, etx, fromAddress, chainID)
@@ -258,6 +302,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindNextUns
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTransactionsConfirmedInBlockRange(ctx context.Context, highBlockNumber int64, lowBlockNumber int64, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, highBlockNumber, lowBlockNumber, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTransactionsConfirmedInBlockRange")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -284,6 +332,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTransac
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttemptsConfirmedMissingReceipt(ctx context.Context, chainID CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsConfirmedMissingReceipt")
+	}
+
 	var r0 []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -310,6 +362,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttem
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttemptsRequiringReceiptFetch(ctx context.Context, chainID CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsRequiringReceiptFetch")
+	}
+
 	var r0 []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -336,6 +392,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttem
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttemptsRequiringResend(ctx context.Context, olderThan time.Time, maxInFlightTransactions uint32, chainID CHAIN_ID, address ADDR) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, olderThan, maxInFlightTransactions, chainID, address)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsRequiringResend")
+	}
+
 	var r0 []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, uint32, CHAIN_ID, ADDR) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -362,6 +422,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttem
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxWithIdempotencyKey(ctx context.Context, idempotencyKey string, chainID CHAIN_ID) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, idempotencyKey, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithIdempotencyKey")
+	}
+
 	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, CHAIN_ID) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -388,6 +452,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxWithI
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxWithSequence(ctx context.Context, fromAddress ADDR, seq SEQ) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, fromAddress, seq)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithSequence")
+	}
+
 	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, SEQ) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -414,6 +482,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxWithS
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesByMetaFieldAndStates(ctx context.Context, metaField string, metaValue string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, metaValue, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesByMetaFieldAndStates")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -440,6 +512,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesByM
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesPendingCallback(ctx context.Context, blockNum int64, chainID CHAIN_ID) ([]txmgrtypes.ReceiptPlus[R], error) {
 	ret := _m.Called(ctx, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesPendingCallback")
+	}
+
 	var r0 []txmgrtypes.ReceiptPlus[R]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, CHAIN_ID) ([]txmgrtypes.ReceiptPlus[R], error)); ok {
@@ -466,6 +542,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesPen
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.Context, ids []big.Int, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, ids, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithAttemptsAndReceiptsByIdsAndState")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []big.Int, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -492,6 +572,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWit
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context, metaField string, blockNum int64, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByReceiptBlockNum")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, int64, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -518,6 +602,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWit
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWithMetaFieldByStates(ctx context.Context, metaField string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByStates")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -544,6 +632,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWit
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxsRequiringGasBump(ctx context.Context, address ADDR, blockNum int64, gasBumpThreshold int64, depth int64, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, address, blockNum, gasBumpThreshold, depth, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxsRequiringGasBump")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, int64, int64, int64, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -570,6 +662,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxsRequ
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxsRequiringResubmissionDueToInsufficientFunds(ctx context.Context, address ADDR, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxsRequiringResubmissionDueToInsufficientFunds")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -596,6 +692,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxsRequ
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetInProgressTxAttempts(ctx context.Context, address ADDR, chainID CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetInProgressTxAttempts")
+	}
+
 	var r0 []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -622,6 +722,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetInProgre
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetNonFatalTransactions(ctx context.Context, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNonFatalTransactions")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -648,6 +752,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetNonFatal
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxByID(ctx context.Context, id int64) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTxByID")
+	}
+
 	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -674,6 +782,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxByID(c
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxInProgress(ctx context.Context, fromAddress ADDR) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTxInProgress")
+	}
+
 	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -700,6 +812,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxInProg
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) HasInProgressTransaction(ctx context.Context, account ADDR, chainID CHAIN_ID) (bool, error) {
 	ret := _m.Called(ctx, account, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasInProgressTransaction")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) (bool, error)); ok {
@@ -724,6 +840,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) HasInProgre
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID CHAIN_ID) (bool, error) {
 	ret := _m.Called(ctx, blockHeight, txID, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsTxFinalized")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, CHAIN_ID) (bool, error)); ok {
@@ -748,6 +868,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) IsTxFinaliz
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) LoadTxAttempts(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LoadTxAttempts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, etx)
@@ -762,6 +886,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) LoadTxAttem
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkAllConfirmedMissingReceipt(ctx context.Context, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkAllConfirmedMissingReceipt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) error); ok {
 		r0 = rf(ctx, chainID)
@@ -776,6 +904,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkAllConf
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkOldTxesMissingReceiptAsErrored(ctx context.Context, blockNum int64, finalityDepth uint32, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, blockNum, finalityDepth, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkOldTxesMissingReceiptAsErrored")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, uint32, CHAIN_ID) error); ok {
 		r0 = rf(ctx, blockNum, finalityDepth, chainID)
@@ -790,6 +922,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkOldTxes
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) PreloadTxes(ctx context.Context, attempts []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PreloadTxes")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, attempts)
@@ -804,6 +940,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) PreloadTxes
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) PruneUnstartedTxQueue(ctx context.Context, queueSize uint32, subject uuid.UUID) (int64, error) {
 	ret := _m.Called(ctx, queueSize, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PruneUnstartedTxQueue")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, uint32, uuid.UUID) (int64, error)); ok {
@@ -828,6 +968,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) PruneUnstar
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) ReapTxHistory(ctx context.Context, minBlockNumberToKeep int64, timeThreshold time.Time, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, minBlockNumberToKeep, timeThreshold, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReapTxHistory")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, time.Time, CHAIN_ID) error); ok {
 		r0 = rf(ctx, minBlockNumberToKeep, timeThreshold, chainID)
@@ -842,6 +986,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) ReapTxHisto
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveConfirmedMissingReceiptAttempt(ctx context.Context, timeout time.Duration, attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveConfirmedMissingReceiptAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -856,6 +1004,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveConfirm
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveFetchedReceipts(ctx context.Context, receipts []R, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, receipts, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveFetchedReceipts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []R, CHAIN_ID) error); ok {
 		r0 = rf(ctx, receipts, chainID)
@@ -870,6 +1022,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveFetched
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveInProgressAttempt(ctx context.Context, attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, attempt)
@@ -884,6 +1040,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveInProgr
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveInsufficientFundsAttempt(ctx context.Context, timeout time.Duration, attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveInsufficientFundsAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -898,6 +1058,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveInsuffi
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveReplacementInProgressAttempt(ctx context.Context, oldAttempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], replacementAttempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, oldAttempt, replacementAttempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveReplacementInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, oldAttempt, replacementAttempt)
@@ -912,6 +1076,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveReplace
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveSentAttempt(ctx context.Context, timeout time.Duration, attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveSentAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -926,6 +1094,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveSentAtt
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SetBroadcastBeforeBlockNum(ctx context.Context, blockNum int64, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetBroadcastBeforeBlockNum")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, CHAIN_ID) error); ok {
 		r0 = rf(ctx, blockNum, chainID)
@@ -940,6 +1112,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SetBroadcas
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateBroadcastAts(ctx context.Context, now time.Time, etxIDs []int64) error {
 	ret := _m.Called(ctx, now, etxIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateBroadcastAts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, []int64) error); ok {
 		r0 = rf(ctx, now, etxIDs)
@@ -954,6 +1130,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateBroad
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxAttemptInProgressToBroadcast(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], NewAttemptState txmgrtypes.TxAttemptState) error {
 	ret := _m.Called(ctx, etx, attempt, NewAttemptState)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxAttemptInProgressToBroadcast")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], txmgrtypes.TxAttemptState) error); ok {
 		r0 = rf(ctx, etx, attempt, NewAttemptState)
@@ -968,6 +1148,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxAtt
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxCallbackCompleted(ctx context.Context, pipelineTaskRunRid uuid.UUID, chainId CHAIN_ID) error {
 	ret := _m.Called(ctx, pipelineTaskRunRid, chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxCallbackCompleted")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, uuid.UUID, CHAIN_ID) error); ok {
 		r0 = rf(ctx, pipelineTaskRunRid, chainId)
@@ -982,6 +1166,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxCal
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxFatalError(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxFatalError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, etx)
@@ -996,6 +1184,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxFat
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxForRebroadcast(ctx context.Context, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], etxAttempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx, etxAttempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxForRebroadcast")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, etx, etxAttempt)
@@ -1010,6 +1202,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxFor
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxUnstartedToInProgress(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxUnstartedToInProgress")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, etx, attempt)
@@ -1024,6 +1220,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxUns
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxsUnconfirmed(ctx context.Context, ids []int64) error {
 	ret := _m.Called(ctx, ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxsUnconfirmed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []int64) error); ok {
 		r0 = rf(ctx, ids)
diff --git a/common/txmgr/types/mocks/tx_strategy.go b/common/txmgr/types/mocks/tx_strategy.go
index f4ec9bef49a..7992c3fe05f 100644
--- a/common/txmgr/types/mocks/tx_strategy.go
+++ b/common/txmgr/types/mocks/tx_strategy.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type TxStrategy struct {
 func (_m *TxStrategy) PruneQueue(ctx context.Context, pruneService types.UnstartedTxQueuePruner) (int64, error) {
 	ret := _m.Called(ctx, pruneService)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PruneQueue")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.UnstartedTxQueuePruner) (int64, error)); ok {
@@ -44,6 +48,10 @@ func (_m *TxStrategy) PruneQueue(ctx context.Context, pruneService types.Unstart
 func (_m *TxStrategy) Subject() uuid.NullUUID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subject")
+	}
+
 	var r0 uuid.NullUUID
 	if rf, ok := ret.Get(0).(func() uuid.NullUUID); ok {
 		r0 = rf()
diff --git a/common/types/mocks/head.go b/common/types/mocks/head.go
index 99d2a265b44..29b6d073656 100644
--- a/common/types/mocks/head.go
+++ b/common/types/mocks/head.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type Head[BLOCK_HASH types.Hashable] struct {
 func (_m *Head[BLOCK_HASH]) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockDifficulty")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *Head[BLOCK_HASH]) BlockDifficulty() *big.Int {
 func (_m *Head[BLOCK_HASH]) BlockHash() BLOCK_HASH {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockHash")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func() BLOCK_HASH); ok {
 		r0 = rf()
@@ -50,6 +58,10 @@ func (_m *Head[BLOCK_HASH]) BlockHash() BLOCK_HASH {
 func (_m *Head[BLOCK_HASH]) BlockNumber() int64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockNumber")
+	}
+
 	var r0 int64
 	if rf, ok := ret.Get(0).(func() int64); ok {
 		r0 = rf()
@@ -64,6 +76,10 @@ func (_m *Head[BLOCK_HASH]) BlockNumber() int64 {
 func (_m *Head[BLOCK_HASH]) ChainLength() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainLength")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -78,6 +94,10 @@ func (_m *Head[BLOCK_HASH]) ChainLength() uint32 {
 func (_m *Head[BLOCK_HASH]) EarliestHeadInChain() types.Head[BLOCK_HASH] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EarliestHeadInChain")
+	}
+
 	var r0 types.Head[BLOCK_HASH]
 	if rf, ok := ret.Get(0).(func() types.Head[BLOCK_HASH]); ok {
 		r0 = rf()
@@ -94,6 +114,10 @@ func (_m *Head[BLOCK_HASH]) EarliestHeadInChain() types.Head[BLOCK_HASH] {
 func (_m *Head[BLOCK_HASH]) GetParent() types.Head[BLOCK_HASH] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParent")
+	}
+
 	var r0 types.Head[BLOCK_HASH]
 	if rf, ok := ret.Get(0).(func() types.Head[BLOCK_HASH]); ok {
 		r0 = rf()
@@ -110,6 +134,10 @@ func (_m *Head[BLOCK_HASH]) GetParent() types.Head[BLOCK_HASH] {
 func (_m *Head[BLOCK_HASH]) GetParentHash() BLOCK_HASH {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParentHash")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func() BLOCK_HASH); ok {
 		r0 = rf()
@@ -124,6 +152,10 @@ func (_m *Head[BLOCK_HASH]) GetParentHash() BLOCK_HASH {
 func (_m *Head[BLOCK_HASH]) GetTimestamp() time.Time {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTimestamp")
+	}
+
 	var r0 time.Time
 	if rf, ok := ret.Get(0).(func() time.Time); ok {
 		r0 = rf()
@@ -138,6 +170,10 @@ func (_m *Head[BLOCK_HASH]) GetTimestamp() time.Time {
 func (_m *Head[BLOCK_HASH]) HashAtHeight(blockNum int64) BLOCK_HASH {
 	ret := _m.Called(blockNum)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HashAtHeight")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func(int64) BLOCK_HASH); ok {
 		r0 = rf(blockNum)
diff --git a/common/types/mocks/head_trackable.go b/common/types/mocks/head_trackable.go
index e63e9ca2497..55f0ebd288e 100644
--- a/common/types/mocks/head_trackable.go
+++ b/common/types/mocks/head_trackable.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/common/types/mocks/subscription.go b/common/types/mocks/subscription.go
index 5577ee4a62a..32db6dfa769 100644
--- a/common/types/mocks/subscription.go
+++ b/common/types/mocks/subscription.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type Subscription struct {
 func (_m *Subscription) Err() <-chan error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Err")
+	}
+
 	var r0 <-chan error
 	if rf, ok := ret.Get(0).(func() <-chan error); ok {
 		r0 = rf()
diff --git a/core/bridges/mocks/orm.go b/core/bridges/mocks/orm.go
index ba8c7526d1c..2c92a7e8024 100644
--- a/core/bridges/mocks/orm.go
+++ b/core/bridges/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type ORM struct {
 func (_m *ORM) BridgeTypes(offset int, limit int) ([]bridges.BridgeType, int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BridgeTypes")
+	}
+
 	var r0 []bridges.BridgeType
 	var r1 int
 	var r2 error
@@ -53,6 +57,10 @@ func (_m *ORM) BridgeTypes(offset int, limit int) ([]bridges.BridgeType, int, er
 func (_m *ORM) CreateBridgeType(bt *bridges.BridgeType) error {
 	ret := _m.Called(bt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateBridgeType")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bridges.BridgeType) error); ok {
 		r0 = rf(bt)
@@ -67,6 +75,10 @@ func (_m *ORM) CreateBridgeType(bt *bridges.BridgeType) error {
 func (_m *ORM) CreateExternalInitiator(externalInitiator *bridges.ExternalInitiator) error {
 	ret := _m.Called(externalInitiator)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateExternalInitiator")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bridges.ExternalInitiator) error); ok {
 		r0 = rf(externalInitiator)
@@ -81,6 +93,10 @@ func (_m *ORM) CreateExternalInitiator(externalInitiator *bridges.ExternalInitia
 func (_m *ORM) DeleteBridgeType(bt *bridges.BridgeType) error {
 	ret := _m.Called(bt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteBridgeType")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bridges.BridgeType) error); ok {
 		r0 = rf(bt)
@@ -95,6 +111,10 @@ func (_m *ORM) DeleteBridgeType(bt *bridges.BridgeType) error {
 func (_m *ORM) DeleteExternalInitiator(name string) error {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteExternalInitiator")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(name)
@@ -109,6 +129,10 @@ func (_m *ORM) DeleteExternalInitiator(name string) error {
 func (_m *ORM) ExternalInitiators(offset int, limit int) ([]bridges.ExternalInitiator, int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExternalInitiators")
+	}
+
 	var r0 []bridges.ExternalInitiator
 	var r1 int
 	var r2 error
@@ -142,6 +166,10 @@ func (_m *ORM) ExternalInitiators(offset int, limit int) ([]bridges.ExternalInit
 func (_m *ORM) FindBridge(name bridges.BridgeName) (bridges.BridgeType, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindBridge")
+	}
+
 	var r0 bridges.BridgeType
 	var r1 error
 	if rf, ok := ret.Get(0).(func(bridges.BridgeName) (bridges.BridgeType, error)); ok {
@@ -166,6 +194,10 @@ func (_m *ORM) FindBridge(name bridges.BridgeName) (bridges.BridgeType, error) {
 func (_m *ORM) FindBridges(name []bridges.BridgeName) ([]bridges.BridgeType, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindBridges")
+	}
+
 	var r0 []bridges.BridgeType
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]bridges.BridgeName) ([]bridges.BridgeType, error)); ok {
@@ -192,6 +224,10 @@ func (_m *ORM) FindBridges(name []bridges.BridgeName) ([]bridges.BridgeType, err
 func (_m *ORM) FindExternalInitiator(eia *auth.Token) (*bridges.ExternalInitiator, error) {
 	ret := _m.Called(eia)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindExternalInitiator")
+	}
+
 	var r0 *bridges.ExternalInitiator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*auth.Token) (*bridges.ExternalInitiator, error)); ok {
@@ -218,6 +254,10 @@ func (_m *ORM) FindExternalInitiator(eia *auth.Token) (*bridges.ExternalInitiato
 func (_m *ORM) FindExternalInitiatorByName(iname string) (bridges.ExternalInitiator, error) {
 	ret := _m.Called(iname)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindExternalInitiatorByName")
+	}
+
 	var r0 bridges.ExternalInitiator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bridges.ExternalInitiator, error)); ok {
@@ -242,6 +282,10 @@ func (_m *ORM) FindExternalInitiatorByName(iname string) (bridges.ExternalInitia
 func (_m *ORM) GetCachedResponse(dotId string, specId int32, maxElapsed time.Duration) ([]byte, error) {
 	ret := _m.Called(dotId, specId, maxElapsed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCachedResponse")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int32, time.Duration) ([]byte, error)); ok {
@@ -268,6 +312,10 @@ func (_m *ORM) GetCachedResponse(dotId string, specId int32, maxElapsed time.Dur
 func (_m *ORM) UpdateBridgeType(bt *bridges.BridgeType, btr *bridges.BridgeTypeRequest) error {
 	ret := _m.Called(bt, btr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateBridgeType")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bridges.BridgeType, *bridges.BridgeTypeRequest) error); ok {
 		r0 = rf(bt, btr)
@@ -282,6 +330,10 @@ func (_m *ORM) UpdateBridgeType(bt *bridges.BridgeType, btr *bridges.BridgeTypeR
 func (_m *ORM) UpsertBridgeResponse(dotId string, specId int32, response []byte) error {
 	ret := _m.Called(dotId, specId, response)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertBridgeResponse")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int32, []byte) error); ok {
 		r0 = rf(dotId, specId, response)
diff --git a/core/chains/evm/client/mocks/batch_sender.go b/core/chains/evm/client/mocks/batch_sender.go
index 7f1a5bdee69..3d65749b5bc 100644
--- a/core/chains/evm/client/mocks/batch_sender.go
+++ b/core/chains/evm/client/mocks/batch_sender.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type BatchSender struct {
 func (_m *BatchSender) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
diff --git a/core/chains/evm/client/mocks/client.go b/core/chains/evm/client/mocks/client.go
index 22498370a2a..0b45894cf28 100644
--- a/core/chains/evm/client/mocks/client.go
+++ b/core/chains/evm/client/mocks/client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -33,6 +33,10 @@ type Client struct {
 func (_m *Client) BalanceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BalanceAt")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (*big.Int, error)); ok {
@@ -59,6 +63,10 @@ func (_m *Client) BalanceAt(ctx context.Context, account common.Address, blockNu
 func (_m *Client) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
@@ -73,6 +81,10 @@ func (_m *Client) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error
 func (_m *Client) BatchCallContextAll(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContextAll")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
@@ -87,6 +99,10 @@ func (_m *Client) BatchCallContextAll(ctx context.Context, b []rpc.BatchElem) er
 func (_m *Client) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) {
 	ret := _m.Called(ctx, hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByHash")
+	}
+
 	var r0 *types.Block
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Block, error)); ok {
@@ -113,6 +129,10 @@ func (_m *Client) BlockByHash(ctx context.Context, hash common.Hash) (*types.Blo
 func (_m *Client) BlockByNumber(ctx context.Context, number *big.Int) (*types.Block, error) {
 	ret := _m.Called(ctx, number)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByNumber")
+	}
+
 	var r0 *types.Block
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*types.Block, error)); ok {
@@ -142,6 +162,10 @@ func (_m *Client) CallContext(ctx context.Context, result interface{}, method st
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok {
 		r0 = rf(ctx, result, method, args...)
@@ -156,6 +180,10 @@ func (_m *Client) CallContext(ctx context.Context, result interface{}, method st
 func (_m *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error)); ok {
@@ -182,6 +210,10 @@ func (_m *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockN
 func (_m *Client) ChainID() (*big.Int, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (*big.Int, error)); ok {
@@ -213,6 +245,10 @@ func (_m *Client) Close() {
 func (_m *Client) CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) ([]byte, error)); ok {
@@ -239,6 +275,10 @@ func (_m *Client) CodeAt(ctx context.Context, account common.Address, blockNumbe
 func (_m *Client) ConfiguredChainID() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConfiguredChainID")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -255,6 +295,10 @@ func (_m *Client) ConfiguredChainID() *big.Int {
 func (_m *Client) Dial(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Dial")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -269,6 +313,10 @@ func (_m *Client) Dial(ctx context.Context) error {
 func (_m *Client) EstimateGas(ctx context.Context, call ethereum.CallMsg) (uint64, error) {
 	ret := _m.Called(ctx, call)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EstimateGas")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg) (uint64, error)); ok {
@@ -293,6 +341,10 @@ func (_m *Client) EstimateGas(ctx context.Context, call ethereum.CallMsg) (uint6
 func (_m *Client) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error) {
 	ret := _m.Called(ctx, q)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterLogs")
+	}
+
 	var r0 []types.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.FilterQuery) ([]types.Log, error)); ok {
@@ -319,6 +371,10 @@ func (_m *Client) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]typ
 func (_m *Client) HeadByHash(ctx context.Context, n common.Hash) (*evmtypes.Head, error) {
 	ret := _m.Called(ctx, n)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeadByHash")
+	}
+
 	var r0 *evmtypes.Head
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*evmtypes.Head, error)); ok {
@@ -345,6 +401,10 @@ func (_m *Client) HeadByHash(ctx context.Context, n common.Hash) (*evmtypes.Head
 func (_m *Client) HeadByNumber(ctx context.Context, n *big.Int) (*evmtypes.Head, error) {
 	ret := _m.Called(ctx, n)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeadByNumber")
+	}
+
 	var r0 *evmtypes.Head
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*evmtypes.Head, error)); ok {
@@ -371,6 +431,10 @@ func (_m *Client) HeadByNumber(ctx context.Context, n *big.Int) (*evmtypes.Head,
 func (_m *Client) HeaderByHash(ctx context.Context, h common.Hash) (*types.Header, error) {
 	ret := _m.Called(ctx, h)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeaderByHash")
+	}
+
 	var r0 *types.Header
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Header, error)); ok {
@@ -397,6 +461,10 @@ func (_m *Client) HeaderByHash(ctx context.Context, h common.Hash) (*types.Heade
 func (_m *Client) HeaderByNumber(ctx context.Context, n *big.Int) (*types.Header, error) {
 	ret := _m.Called(ctx, n)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeaderByNumber")
+	}
+
 	var r0 *types.Header
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*types.Header, error)); ok {
@@ -423,6 +491,10 @@ func (_m *Client) HeaderByNumber(ctx context.Context, n *big.Int) (*types.Header
 func (_m *Client) IsL2() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsL2")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -437,6 +509,10 @@ func (_m *Client) IsL2() bool {
 func (_m *Client) LINKBalance(ctx context.Context, address common.Address, linkAddress common.Address) (*assets.Link, error) {
 	ret := _m.Called(ctx, address, linkAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LINKBalance")
+	}
+
 	var r0 *assets.Link
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, common.Address) (*assets.Link, error)); ok {
@@ -463,6 +539,10 @@ func (_m *Client) LINKBalance(ctx context.Context, address common.Address, linkA
 func (_m *Client) LatestBlockHeight(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockHeight")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -489,6 +569,10 @@ func (_m *Client) LatestBlockHeight(ctx context.Context) (*big.Int, error) {
 func (_m *Client) NodeStates() map[string]string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for NodeStates")
+	}
+
 	var r0 map[string]string
 	if rf, ok := ret.Get(0).(func() map[string]string); ok {
 		r0 = rf()
@@ -505,6 +589,10 @@ func (_m *Client) NodeStates() map[string]string {
 func (_m *Client) PendingCodeAt(ctx context.Context, account common.Address) ([]byte, error) {
 	ret := _m.Called(ctx, account)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingCodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) ([]byte, error)); ok {
@@ -531,6 +619,10 @@ func (_m *Client) PendingCodeAt(ctx context.Context, account common.Address) ([]
 func (_m *Client) PendingNonceAt(ctx context.Context, account common.Address) (uint64, error) {
 	ret := _m.Called(ctx, account)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingNonceAt")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) (uint64, error)); ok {
@@ -555,6 +647,10 @@ func (_m *Client) PendingNonceAt(ctx context.Context, account common.Address) (u
 func (_m *Client) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction) error); ok {
 		r0 = rf(ctx, tx)
@@ -569,6 +665,10 @@ func (_m *Client) SendTransaction(ctx context.Context, tx *types.Transaction) er
 func (_m *Client) SendTransactionReturnCode(ctx context.Context, tx *types.Transaction, fromAddress common.Address) (commonclient.SendTxReturnCode, error) {
 	ret := _m.Called(ctx, tx, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransactionReturnCode")
+	}
+
 	var r0 commonclient.SendTxReturnCode
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction, common.Address) (commonclient.SendTxReturnCode, error)); ok {
@@ -593,6 +693,10 @@ func (_m *Client) SendTransactionReturnCode(ctx context.Context, tx *types.Trans
 func (_m *Client) SequenceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (evmtypes.Nonce, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SequenceAt")
+	}
+
 	var r0 evmtypes.Nonce
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (evmtypes.Nonce, error)); ok {
@@ -617,6 +721,10 @@ func (_m *Client) SequenceAt(ctx context.Context, account common.Address, blockN
 func (_m *Client) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error) {
 	ret := _m.Called(ctx, q, ch)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeFilterLogs")
+	}
+
 	var r0 ethereum.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.FilterQuery, chan<- types.Log) (ethereum.Subscription, error)); ok {
@@ -643,6 +751,10 @@ func (_m *Client) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuer
 func (_m *Client) SubscribeNewHead(ctx context.Context, ch chan<- *evmtypes.Head) (ethereum.Subscription, error) {
 	ret := _m.Called(ctx, ch)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeNewHead")
+	}
+
 	var r0 ethereum.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, chan<- *evmtypes.Head) (ethereum.Subscription, error)); ok {
@@ -669,6 +781,10 @@ func (_m *Client) SubscribeNewHead(ctx context.Context, ch chan<- *evmtypes.Head
 func (_m *Client) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SuggestGasPrice")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -695,6 +811,10 @@ func (_m *Client) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 func (_m *Client) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SuggestGasTipCap")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -721,6 +841,10 @@ func (_m *Client) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
 func (_m *Client) TokenBalance(ctx context.Context, address common.Address, contractAddress common.Address) (*big.Int, error) {
 	ret := _m.Called(ctx, address, contractAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TokenBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, common.Address) (*big.Int, error)); ok {
@@ -747,6 +871,10 @@ func (_m *Client) TokenBalance(ctx context.Context, address common.Address, cont
 func (_m *Client) TransactionByHash(ctx context.Context, txHash common.Hash) (*types.Transaction, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionByHash")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Transaction, error)); ok {
@@ -773,6 +901,10 @@ func (_m *Client) TransactionByHash(ctx context.Context, txHash common.Hash) (*t
 func (_m *Client) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionReceipt")
+	}
+
 	var r0 *types.Receipt
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Receipt, error)); ok {
diff --git a/core/chains/evm/client/mocks/tx_sender.go b/core/chains/evm/client/mocks/tx_sender.go
index 889069dcfca..a769a786a18 100644
--- a/core/chains/evm/client/mocks/tx_sender.go
+++ b/core/chains/evm/client/mocks/tx_sender.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type TxSender struct {
 func (_m *TxSender) ChainID(_a0 context.Context) (*big.Int, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -47,6 +51,10 @@ func (_m *TxSender) ChainID(_a0 context.Context) (*big.Int, error) {
 func (_m *TxSender) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction) error); ok {
 		r0 = rf(ctx, tx)
diff --git a/core/chains/evm/config/mocks/chain_scoped_config.go b/core/chains/evm/config/mocks/chain_scoped_config.go
index cb18282f495..badba1d69f3 100644
--- a/core/chains/evm/config/mocks/chain_scoped_config.go
+++ b/core/chains/evm/config/mocks/chain_scoped_config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -24,6 +24,10 @@ type ChainScopedConfig struct {
 func (_m *ChainScopedConfig) AppID() uuid.UUID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AppID")
+	}
+
 	var r0 uuid.UUID
 	if rf, ok := ret.Get(0).(func() uuid.UUID); ok {
 		r0 = rf()
@@ -40,6 +44,10 @@ func (_m *ChainScopedConfig) AppID() uuid.UUID {
 func (_m *ChainScopedConfig) AuditLogger() coreconfig.AuditLogger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AuditLogger")
+	}
+
 	var r0 coreconfig.AuditLogger
 	if rf, ok := ret.Get(0).(func() coreconfig.AuditLogger); ok {
 		r0 = rf()
@@ -56,6 +64,10 @@ func (_m *ChainScopedConfig) AuditLogger() coreconfig.AuditLogger {
 func (_m *ChainScopedConfig) AutoPprof() coreconfig.AutoPprof {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AutoPprof")
+	}
+
 	var r0 coreconfig.AutoPprof
 	if rf, ok := ret.Get(0).(func() coreconfig.AutoPprof); ok {
 		r0 = rf()
@@ -72,6 +84,10 @@ func (_m *ChainScopedConfig) AutoPprof() coreconfig.AutoPprof {
 func (_m *ChainScopedConfig) CosmosEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CosmosEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -86,6 +102,10 @@ func (_m *ChainScopedConfig) CosmosEnabled() bool {
 func (_m *ChainScopedConfig) Database() coreconfig.Database {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Database")
+	}
+
 	var r0 coreconfig.Database
 	if rf, ok := ret.Get(0).(func() coreconfig.Database); ok {
 		r0 = rf()
@@ -102,6 +122,10 @@ func (_m *ChainScopedConfig) Database() coreconfig.Database {
 func (_m *ChainScopedConfig) EVM() config.EVM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVM")
+	}
+
 	var r0 config.EVM
 	if rf, ok := ret.Get(0).(func() config.EVM); ok {
 		r0 = rf()
@@ -118,6 +142,10 @@ func (_m *ChainScopedConfig) EVM() config.EVM {
 func (_m *ChainScopedConfig) EVMEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -132,6 +160,10 @@ func (_m *ChainScopedConfig) EVMEnabled() bool {
 func (_m *ChainScopedConfig) EVMRPCEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMRPCEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -146,6 +178,10 @@ func (_m *ChainScopedConfig) EVMRPCEnabled() bool {
 func (_m *ChainScopedConfig) Feature() coreconfig.Feature {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Feature")
+	}
+
 	var r0 coreconfig.Feature
 	if rf, ok := ret.Get(0).(func() coreconfig.Feature); ok {
 		r0 = rf()
@@ -162,6 +198,10 @@ func (_m *ChainScopedConfig) Feature() coreconfig.Feature {
 func (_m *ChainScopedConfig) FluxMonitor() coreconfig.FluxMonitor {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FluxMonitor")
+	}
+
 	var r0 coreconfig.FluxMonitor
 	if rf, ok := ret.Get(0).(func() coreconfig.FluxMonitor); ok {
 		r0 = rf()
@@ -178,6 +218,10 @@ func (_m *ChainScopedConfig) FluxMonitor() coreconfig.FluxMonitor {
 func (_m *ChainScopedConfig) Insecure() coreconfig.Insecure {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Insecure")
+	}
+
 	var r0 coreconfig.Insecure
 	if rf, ok := ret.Get(0).(func() coreconfig.Insecure); ok {
 		r0 = rf()
@@ -194,6 +238,10 @@ func (_m *ChainScopedConfig) Insecure() coreconfig.Insecure {
 func (_m *ChainScopedConfig) InsecureFastScrypt() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsecureFastScrypt")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -208,6 +256,10 @@ func (_m *ChainScopedConfig) InsecureFastScrypt() bool {
 func (_m *ChainScopedConfig) JobPipeline() coreconfig.JobPipeline {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobPipeline")
+	}
+
 	var r0 coreconfig.JobPipeline
 	if rf, ok := ret.Get(0).(func() coreconfig.JobPipeline); ok {
 		r0 = rf()
@@ -224,6 +276,10 @@ func (_m *ChainScopedConfig) JobPipeline() coreconfig.JobPipeline {
 func (_m *ChainScopedConfig) Keeper() coreconfig.Keeper {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Keeper")
+	}
+
 	var r0 coreconfig.Keeper
 	if rf, ok := ret.Get(0).(func() coreconfig.Keeper); ok {
 		r0 = rf()
@@ -240,6 +296,10 @@ func (_m *ChainScopedConfig) Keeper() coreconfig.Keeper {
 func (_m *ChainScopedConfig) Log() coreconfig.Log {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Log")
+	}
+
 	var r0 coreconfig.Log
 	if rf, ok := ret.Get(0).(func() coreconfig.Log); ok {
 		r0 = rf()
@@ -261,6 +321,10 @@ func (_m *ChainScopedConfig) LogConfiguration(log coreconfig.LogfFn, warn coreco
 func (_m *ChainScopedConfig) Mercury() coreconfig.Mercury {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Mercury")
+	}
+
 	var r0 coreconfig.Mercury
 	if rf, ok := ret.Get(0).(func() coreconfig.Mercury); ok {
 		r0 = rf()
@@ -277,6 +341,10 @@ func (_m *ChainScopedConfig) Mercury() coreconfig.Mercury {
 func (_m *ChainScopedConfig) OCR() coreconfig.OCR {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR")
+	}
+
 	var r0 coreconfig.OCR
 	if rf, ok := ret.Get(0).(func() coreconfig.OCR); ok {
 		r0 = rf()
@@ -293,6 +361,10 @@ func (_m *ChainScopedConfig) OCR() coreconfig.OCR {
 func (_m *ChainScopedConfig) OCR2() coreconfig.OCR2 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR2")
+	}
+
 	var r0 coreconfig.OCR2
 	if rf, ok := ret.Get(0).(func() coreconfig.OCR2); ok {
 		r0 = rf()
@@ -309,6 +381,10 @@ func (_m *ChainScopedConfig) OCR2() coreconfig.OCR2 {
 func (_m *ChainScopedConfig) P2P() coreconfig.P2P {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for P2P")
+	}
+
 	var r0 coreconfig.P2P
 	if rf, ok := ret.Get(0).(func() coreconfig.P2P); ok {
 		r0 = rf()
@@ -325,6 +401,10 @@ func (_m *ChainScopedConfig) P2P() coreconfig.P2P {
 func (_m *ChainScopedConfig) Password() coreconfig.Password {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Password")
+	}
+
 	var r0 coreconfig.Password
 	if rf, ok := ret.Get(0).(func() coreconfig.Password); ok {
 		r0 = rf()
@@ -341,6 +421,10 @@ func (_m *ChainScopedConfig) Password() coreconfig.Password {
 func (_m *ChainScopedConfig) Prometheus() coreconfig.Prometheus {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Prometheus")
+	}
+
 	var r0 coreconfig.Prometheus
 	if rf, ok := ret.Get(0).(func() coreconfig.Prometheus); ok {
 		r0 = rf()
@@ -357,6 +441,10 @@ func (_m *ChainScopedConfig) Prometheus() coreconfig.Prometheus {
 func (_m *ChainScopedConfig) Pyroscope() coreconfig.Pyroscope {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Pyroscope")
+	}
+
 	var r0 coreconfig.Pyroscope
 	if rf, ok := ret.Get(0).(func() coreconfig.Pyroscope); ok {
 		r0 = rf()
@@ -373,6 +461,10 @@ func (_m *ChainScopedConfig) Pyroscope() coreconfig.Pyroscope {
 func (_m *ChainScopedConfig) RootDir() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RootDir")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -387,6 +479,10 @@ func (_m *ChainScopedConfig) RootDir() string {
 func (_m *ChainScopedConfig) Sentry() coreconfig.Sentry {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sentry")
+	}
+
 	var r0 coreconfig.Sentry
 	if rf, ok := ret.Get(0).(func() coreconfig.Sentry); ok {
 		r0 = rf()
@@ -403,6 +499,10 @@ func (_m *ChainScopedConfig) Sentry() coreconfig.Sentry {
 func (_m *ChainScopedConfig) SetLogLevel(lvl zapcore.Level) error {
 	ret := _m.Called(lvl)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetLogLevel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(zapcore.Level) error); ok {
 		r0 = rf(lvl)
@@ -427,6 +527,10 @@ func (_m *ChainScopedConfig) SetPasswords(keystore *string, vrf *string) {
 func (_m *ChainScopedConfig) ShutdownGracePeriod() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ShutdownGracePeriod")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -441,6 +545,10 @@ func (_m *ChainScopedConfig) ShutdownGracePeriod() time.Duration {
 func (_m *ChainScopedConfig) SolanaEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SolanaEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -455,6 +563,10 @@ func (_m *ChainScopedConfig) SolanaEnabled() bool {
 func (_m *ChainScopedConfig) StarkNetEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StarkNetEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -469,6 +581,10 @@ func (_m *ChainScopedConfig) StarkNetEnabled() bool {
 func (_m *ChainScopedConfig) TelemetryIngress() coreconfig.TelemetryIngress {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TelemetryIngress")
+	}
+
 	var r0 coreconfig.TelemetryIngress
 	if rf, ok := ret.Get(0).(func() coreconfig.TelemetryIngress); ok {
 		r0 = rf()
@@ -485,6 +601,10 @@ func (_m *ChainScopedConfig) TelemetryIngress() coreconfig.TelemetryIngress {
 func (_m *ChainScopedConfig) Threshold() coreconfig.Threshold {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Threshold")
+	}
+
 	var r0 coreconfig.Threshold
 	if rf, ok := ret.Get(0).(func() coreconfig.Threshold); ok {
 		r0 = rf()
@@ -501,6 +621,10 @@ func (_m *ChainScopedConfig) Threshold() coreconfig.Threshold {
 func (_m *ChainScopedConfig) Tracing() coreconfig.Tracing {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Tracing")
+	}
+
 	var r0 coreconfig.Tracing
 	if rf, ok := ret.Get(0).(func() coreconfig.Tracing); ok {
 		r0 = rf()
@@ -517,6 +641,10 @@ func (_m *ChainScopedConfig) Tracing() coreconfig.Tracing {
 func (_m *ChainScopedConfig) Validate() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Validate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -531,6 +659,10 @@ func (_m *ChainScopedConfig) Validate() error {
 func (_m *ChainScopedConfig) ValidateDB() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ValidateDB")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -545,6 +677,10 @@ func (_m *ChainScopedConfig) ValidateDB() error {
 func (_m *ChainScopedConfig) WebServer() coreconfig.WebServer {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for WebServer")
+	}
+
 	var r0 coreconfig.WebServer
 	if rf, ok := ret.Get(0).(func() coreconfig.WebServer); ok {
 		r0 = rf()
diff --git a/core/chains/evm/config/mocks/gas_estimator.go b/core/chains/evm/config/mocks/gas_estimator.go
index 6260b3cd501..69a2c852757 100644
--- a/core/chains/evm/config/mocks/gas_estimator.go
+++ b/core/chains/evm/config/mocks/gas_estimator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type GasEstimator struct {
 func (_m *GasEstimator) BlockHistory() config.BlockHistory {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockHistory")
+	}
+
 	var r0 config.BlockHistory
 	if rf, ok := ret.Get(0).(func() config.BlockHistory); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *GasEstimator) BlockHistory() config.BlockHistory {
 func (_m *GasEstimator) BumpMin() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpMin")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -52,6 +60,10 @@ func (_m *GasEstimator) BumpMin() *assets.Wei {
 func (_m *GasEstimator) BumpPercent() uint16 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpPercent")
+	}
+
 	var r0 uint16
 	if rf, ok := ret.Get(0).(func() uint16); ok {
 		r0 = rf()
@@ -66,6 +78,10 @@ func (_m *GasEstimator) BumpPercent() uint16 {
 func (_m *GasEstimator) BumpThreshold() uint64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpThreshold")
+	}
+
 	var r0 uint64
 	if rf, ok := ret.Get(0).(func() uint64); ok {
 		r0 = rf()
@@ -80,6 +96,10 @@ func (_m *GasEstimator) BumpThreshold() uint64 {
 func (_m *GasEstimator) BumpTxDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpTxDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -94,6 +114,10 @@ func (_m *GasEstimator) BumpTxDepth() uint32 {
 func (_m *GasEstimator) EIP1559DynamicFees() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EIP1559DynamicFees")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -108,6 +132,10 @@ func (_m *GasEstimator) EIP1559DynamicFees() bool {
 func (_m *GasEstimator) FeeCapDefault() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FeeCapDefault")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -124,6 +152,10 @@ func (_m *GasEstimator) FeeCapDefault() *assets.Wei {
 func (_m *GasEstimator) LimitDefault() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitDefault")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -138,6 +170,10 @@ func (_m *GasEstimator) LimitDefault() uint32 {
 func (_m *GasEstimator) LimitJobType() config.LimitJobType {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitJobType")
+	}
+
 	var r0 config.LimitJobType
 	if rf, ok := ret.Get(0).(func() config.LimitJobType); ok {
 		r0 = rf()
@@ -154,6 +190,10 @@ func (_m *GasEstimator) LimitJobType() config.LimitJobType {
 func (_m *GasEstimator) LimitMax() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitMax")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -168,6 +208,10 @@ func (_m *GasEstimator) LimitMax() uint32 {
 func (_m *GasEstimator) LimitMultiplier() float32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitMultiplier")
+	}
+
 	var r0 float32
 	if rf, ok := ret.Get(0).(func() float32); ok {
 		r0 = rf()
@@ -182,6 +226,10 @@ func (_m *GasEstimator) LimitMultiplier() float32 {
 func (_m *GasEstimator) LimitTransfer() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitTransfer")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -196,6 +244,10 @@ func (_m *GasEstimator) LimitTransfer() uint32 {
 func (_m *GasEstimator) Mode() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Mode")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -210,6 +262,10 @@ func (_m *GasEstimator) Mode() string {
 func (_m *GasEstimator) PriceDefault() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceDefault")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -226,6 +282,10 @@ func (_m *GasEstimator) PriceDefault() *assets.Wei {
 func (_m *GasEstimator) PriceMax() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceMax")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -242,6 +302,10 @@ func (_m *GasEstimator) PriceMax() *assets.Wei {
 func (_m *GasEstimator) PriceMaxKey(_a0 common.Address) *assets.Wei {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceMaxKey")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func(common.Address) *assets.Wei); ok {
 		r0 = rf(_a0)
@@ -258,6 +322,10 @@ func (_m *GasEstimator) PriceMaxKey(_a0 common.Address) *assets.Wei {
 func (_m *GasEstimator) PriceMin() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceMin")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -274,6 +342,10 @@ func (_m *GasEstimator) PriceMin() *assets.Wei {
 func (_m *GasEstimator) TipCapDefault() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TipCapDefault")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -290,6 +362,10 @@ func (_m *GasEstimator) TipCapDefault() *assets.Wei {
 func (_m *GasEstimator) TipCapMin() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TipCapMin")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
diff --git a/core/chains/evm/forwarders/mocks/orm.go b/core/chains/evm/forwarders/mocks/orm.go
index e8ab62ce7de..c06a04b8eb1 100644
--- a/core/chains/evm/forwarders/mocks/orm.go
+++ b/core/chains/evm/forwarders/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type ORM struct {
 func (_m *ORM) CreateForwarder(addr common.Address, evmChainId utils.Big) (forwarders.Forwarder, error) {
 	ret := _m.Called(addr, evmChainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateForwarder")
+	}
+
 	var r0 forwarders.Forwarder
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address, utils.Big) (forwarders.Forwarder, error)); ok {
@@ -45,6 +49,10 @@ func (_m *ORM) CreateForwarder(addr common.Address, evmChainId utils.Big) (forwa
 func (_m *ORM) DeleteForwarder(id int64, cleanup func(pg.Queryer, int64, common.Address) error) error {
 	ret := _m.Called(id, cleanup)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteForwarder")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, func(pg.Queryer, int64, common.Address) error) error); ok {
 		r0 = rf(id, cleanup)
@@ -59,6 +67,10 @@ func (_m *ORM) DeleteForwarder(id int64, cleanup func(pg.Queryer, int64, common.
 func (_m *ORM) FindForwarders(offset int, limit int) ([]forwarders.Forwarder, int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindForwarders")
+	}
+
 	var r0 []forwarders.Forwarder
 	var r1 int
 	var r2 error
@@ -92,6 +104,10 @@ func (_m *ORM) FindForwarders(offset int, limit int) ([]forwarders.Forwarder, in
 func (_m *ORM) FindForwardersByChain(evmChainId utils.Big) ([]forwarders.Forwarder, error) {
 	ret := _m.Called(evmChainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindForwardersByChain")
+	}
+
 	var r0 []forwarders.Forwarder
 	var r1 error
 	if rf, ok := ret.Get(0).(func(utils.Big) ([]forwarders.Forwarder, error)); ok {
@@ -118,6 +134,10 @@ func (_m *ORM) FindForwardersByChain(evmChainId utils.Big) ([]forwarders.Forward
 func (_m *ORM) FindForwardersInListByChain(evmChainId utils.Big, addrs []common.Address) ([]forwarders.Forwarder, error) {
 	ret := _m.Called(evmChainId, addrs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindForwardersInListByChain")
+	}
+
 	var r0 []forwarders.Forwarder
 	var r1 error
 	if rf, ok := ret.Get(0).(func(utils.Big, []common.Address) ([]forwarders.Forwarder, error)); ok {
diff --git a/core/chains/evm/gas/mocks/config.go b/core/chains/evm/gas/mocks/config.go
index c09005b5e3d..4a7b6f4d7eb 100644
--- a/core/chains/evm/gas/mocks/config.go
+++ b/core/chains/evm/gas/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type Config struct {
 func (_m *Config) ChainType() config.ChainType {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainType")
+	}
+
 	var r0 config.ChainType
 	if rf, ok := ret.Get(0).(func() config.ChainType); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *Config) ChainType() config.ChainType {
 func (_m *Config) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -45,6 +53,10 @@ func (_m *Config) FinalityDepth() uint32 {
 func (_m *Config) FinalityTagEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityTagEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
diff --git a/core/chains/evm/gas/mocks/eth_client.go b/core/chains/evm/gas/mocks/eth_client.go
index 2b0aaff0257..bb0784f8515 100644
--- a/core/chains/evm/gas/mocks/eth_client.go
+++ b/core/chains/evm/gas/mocks/eth_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type ETHClient struct {
 func (_m *ETHClient) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error)); ok {
diff --git a/core/chains/evm/gas/mocks/evm_estimator.go b/core/chains/evm/gas/mocks/evm_estimator.go
index f2cb51f8560..29705b2a5d9 100644
--- a/core/chains/evm/gas/mocks/evm_estimator.go
+++ b/core/chains/evm/gas/mocks/evm_estimator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -25,6 +25,10 @@ type EvmEstimator struct {
 func (_m *EvmEstimator) BumpDynamicFee(ctx context.Context, original gas.DynamicFee, gasLimit uint32, maxGasPriceWei *assets.Wei, attempts []gas.EvmPriorAttempt) (gas.DynamicFee, uint32, error) {
 	ret := _m.Called(ctx, original, gasLimit, maxGasPriceWei, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpDynamicFee")
+	}
+
 	var r0 gas.DynamicFee
 	var r1 uint32
 	var r2 error
@@ -56,6 +60,10 @@ func (_m *EvmEstimator) BumpDynamicFee(ctx context.Context, original gas.Dynamic
 func (_m *EvmEstimator) BumpLegacyGas(ctx context.Context, originalGasPrice *assets.Wei, gasLimit uint32, maxGasPriceWei *assets.Wei, attempts []gas.EvmPriorAttempt) (*assets.Wei, uint32, error) {
 	ret := _m.Called(ctx, originalGasPrice, gasLimit, maxGasPriceWei, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpLegacyGas")
+	}
+
 	var r0 *assets.Wei
 	var r1 uint32
 	var r2 error
@@ -89,6 +97,10 @@ func (_m *EvmEstimator) BumpLegacyGas(ctx context.Context, originalGasPrice *ass
 func (_m *EvmEstimator) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -103,6 +115,10 @@ func (_m *EvmEstimator) Close() error {
 func (_m *EvmEstimator) GetDynamicFee(ctx context.Context, gasLimit uint32, maxGasPriceWei *assets.Wei) (gas.DynamicFee, uint32, error) {
 	ret := _m.Called(ctx, gasLimit, maxGasPriceWei)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetDynamicFee")
+	}
+
 	var r0 gas.DynamicFee
 	var r1 uint32
 	var r2 error
@@ -141,6 +157,10 @@ func (_m *EvmEstimator) GetLegacyGas(ctx context.Context, calldata []byte, gasLi
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLegacyGas")
+	}
+
 	var r0 *assets.Wei
 	var r1 uint32
 	var r2 error
@@ -174,6 +194,10 @@ func (_m *EvmEstimator) GetLegacyGas(ctx context.Context, calldata []byte, gasLi
 func (_m *EvmEstimator) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -190,6 +214,10 @@ func (_m *EvmEstimator) HealthReport() map[string]error {
 func (_m *EvmEstimator) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -209,6 +237,10 @@ func (_m *EvmEstimator) OnNewLongestChain(ctx context.Context, head *evmtypes.He
 func (_m *EvmEstimator) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -223,6 +255,10 @@ func (_m *EvmEstimator) Ready() error {
 func (_m *EvmEstimator) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/chains/evm/gas/mocks/evm_fee_estimator.go b/core/chains/evm/gas/mocks/evm_fee_estimator.go
index b9b16367796..66acbdbf7ff 100644
--- a/core/chains/evm/gas/mocks/evm_fee_estimator.go
+++ b/core/chains/evm/gas/mocks/evm_fee_estimator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -29,6 +29,10 @@ type EvmFeeEstimator struct {
 func (_m *EvmFeeEstimator) BumpFee(ctx context.Context, originalFee gas.EvmFee, feeLimit uint32, maxFeePrice *assets.Wei, attempts []gas.EvmPriorAttempt) (gas.EvmFee, uint32, error) {
 	ret := _m.Called(ctx, originalFee, feeLimit, maxFeePrice, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpFee")
+	}
+
 	var r0 gas.EvmFee
 	var r1 uint32
 	var r2 error
@@ -60,6 +64,10 @@ func (_m *EvmFeeEstimator) BumpFee(ctx context.Context, originalFee gas.EvmFee,
 func (_m *EvmFeeEstimator) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -81,6 +89,10 @@ func (_m *EvmFeeEstimator) GetFee(ctx context.Context, calldata []byte, feeLimit
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFee")
+	}
+
 	var r0 gas.EvmFee
 	var r1 uint32
 	var r2 error
@@ -119,6 +131,10 @@ func (_m *EvmFeeEstimator) GetMaxCost(ctx context.Context, amount assets.Eth, ca
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMaxCost")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, assets.Eth, []byte, uint32, *assets.Wei, ...types.Opt) (*big.Int, error)); ok {
@@ -145,6 +161,10 @@ func (_m *EvmFeeEstimator) GetMaxCost(ctx context.Context, amount assets.Eth, ca
 func (_m *EvmFeeEstimator) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -161,6 +181,10 @@ func (_m *EvmFeeEstimator) HealthReport() map[string]error {
 func (_m *EvmFeeEstimator) L1Oracle() rollups.L1Oracle {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for L1Oracle")
+	}
+
 	var r0 rollups.L1Oracle
 	if rf, ok := ret.Get(0).(func() rollups.L1Oracle); ok {
 		r0 = rf()
@@ -177,6 +201,10 @@ func (_m *EvmFeeEstimator) L1Oracle() rollups.L1Oracle {
 func (_m *EvmFeeEstimator) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -196,6 +224,10 @@ func (_m *EvmFeeEstimator) OnNewLongestChain(ctx context.Context, head *evmtypes
 func (_m *EvmFeeEstimator) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -210,6 +242,10 @@ func (_m *EvmFeeEstimator) Ready() error {
 func (_m *EvmFeeEstimator) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/chains/evm/gas/mocks/rpc_client.go b/core/chains/evm/gas/mocks/rpc_client.go
index 6f6ac8d6b79..d1262665f66 100644
--- a/core/chains/evm/gas/mocks/rpc_client.go
+++ b/core/chains/evm/gas/mocks/rpc_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ func (_m *RPCClient) CallContext(ctx context.Context, result interface{}, method
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok {
 		r0 = rf(ctx, result, method, args...)
diff --git a/core/chains/evm/gas/rollups/mocks/eth_client.go b/core/chains/evm/gas/rollups/mocks/eth_client.go
index 2b0aaff0257..bb0784f8515 100644
--- a/core/chains/evm/gas/rollups/mocks/eth_client.go
+++ b/core/chains/evm/gas/rollups/mocks/eth_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type ETHClient struct {
 func (_m *ETHClient) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error)); ok {
diff --git a/core/chains/evm/gas/rollups/mocks/l1_oracle.go b/core/chains/evm/gas/rollups/mocks/l1_oracle.go
index f6f8cc736af..9e52a3ec38e 100644
--- a/core/chains/evm/gas/rollups/mocks/l1_oracle.go
+++ b/core/chains/evm/gas/rollups/mocks/l1_oracle.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type L1Oracle struct {
 func (_m *L1Oracle) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -33,6 +37,10 @@ func (_m *L1Oracle) Close() error {
 func (_m *L1Oracle) GasPrice(ctx context.Context) (*assets.Wei, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GasPrice")
+	}
+
 	var r0 *assets.Wei
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*assets.Wei, error)); ok {
@@ -59,6 +67,10 @@ func (_m *L1Oracle) GasPrice(ctx context.Context) (*assets.Wei, error) {
 func (_m *L1Oracle) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -75,6 +87,10 @@ func (_m *L1Oracle) HealthReport() map[string]error {
 func (_m *L1Oracle) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -89,6 +105,10 @@ func (_m *L1Oracle) Name() string {
 func (_m *L1Oracle) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -103,6 +123,10 @@ func (_m *L1Oracle) Ready() error {
 func (_m *L1Oracle) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/chains/evm/headtracker/mocks/config.go b/core/chains/evm/headtracker/mocks/config.go
index b505cfc445d..74376a71362 100644
--- a/core/chains/evm/headtracker/mocks/config.go
+++ b/core/chains/evm/headtracker/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type Config struct {
 func (_m *Config) BlockEmissionIdleWarningThreshold() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockEmissionIdleWarningThreshold")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *Config) BlockEmissionIdleWarningThreshold() time.Duration {
 func (_m *Config) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
diff --git a/core/chains/evm/log/mocks/abigen_contract.go b/core/chains/evm/log/mocks/abigen_contract.go
index dcc95a1acdb..fde8949e4fe 100644
--- a/core/chains/evm/log/mocks/abigen_contract.go
+++ b/core/chains/evm/log/mocks/abigen_contract.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type AbigenContract struct {
 func (_m *AbigenContract) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *AbigenContract) Address() common.Address {
 func (_m *AbigenContract) ParseLog(_a0 types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
diff --git a/core/chains/evm/log/mocks/broadcast.go b/core/chains/evm/log/mocks/broadcast.go
index a58ce9f30e4..6d9a83716d5 100644
--- a/core/chains/evm/log/mocks/broadcast.go
+++ b/core/chains/evm/log/mocks/broadcast.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Broadcast struct {
 func (_m *Broadcast) DecodedLog() interface{} {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DecodedLog")
+	}
+
 	var r0 interface{}
 	if rf, ok := ret.Get(0).(func() interface{}); ok {
 		r0 = rf()
@@ -37,6 +41,10 @@ func (_m *Broadcast) DecodedLog() interface{} {
 func (_m *Broadcast) EVMChainID() big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMChainID")
+	}
+
 	var r0 big.Int
 	if rf, ok := ret.Get(0).(func() big.Int); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *Broadcast) EVMChainID() big.Int {
 func (_m *Broadcast) JobID() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobID")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -65,6 +77,10 @@ func (_m *Broadcast) JobID() int32 {
 func (_m *Broadcast) LatestBlockHash() common.Hash {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockHash")
+	}
+
 	var r0 common.Hash
 	if rf, ok := ret.Get(0).(func() common.Hash); ok {
 		r0 = rf()
@@ -81,6 +97,10 @@ func (_m *Broadcast) LatestBlockHash() common.Hash {
 func (_m *Broadcast) LatestBlockNumber() uint64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockNumber")
+	}
+
 	var r0 uint64
 	if rf, ok := ret.Get(0).(func() uint64); ok {
 		r0 = rf()
@@ -95,6 +115,10 @@ func (_m *Broadcast) LatestBlockNumber() uint64 {
 func (_m *Broadcast) RawLog() types.Log {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RawLog")
+	}
+
 	var r0 types.Log
 	if rf, ok := ret.Get(0).(func() types.Log); ok {
 		r0 = rf()
@@ -109,6 +133,10 @@ func (_m *Broadcast) RawLog() types.Log {
 func (_m *Broadcast) ReceiptsRoot() common.Hash {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReceiptsRoot")
+	}
+
 	var r0 common.Hash
 	if rf, ok := ret.Get(0).(func() common.Hash); ok {
 		r0 = rf()
@@ -125,6 +153,10 @@ func (_m *Broadcast) ReceiptsRoot() common.Hash {
 func (_m *Broadcast) StateRoot() common.Hash {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StateRoot")
+	}
+
 	var r0 common.Hash
 	if rf, ok := ret.Get(0).(func() common.Hash); ok {
 		r0 = rf()
@@ -141,6 +173,10 @@ func (_m *Broadcast) StateRoot() common.Hash {
 func (_m *Broadcast) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -155,6 +191,10 @@ func (_m *Broadcast) String() string {
 func (_m *Broadcast) TransactionsRoot() common.Hash {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionsRoot")
+	}
+
 	var r0 common.Hash
 	if rf, ok := ret.Get(0).(func() common.Hash); ok {
 		r0 = rf()
diff --git a/core/chains/evm/log/mocks/broadcaster.go b/core/chains/evm/log/mocks/broadcaster.go
index 84f143b39e4..031bdaaa7d9 100644
--- a/core/chains/evm/log/mocks/broadcaster.go
+++ b/core/chains/evm/log/mocks/broadcaster.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -27,6 +27,10 @@ func (_m *Broadcaster) AddDependents(n int) {
 func (_m *Broadcaster) AwaitDependents() <-chan struct{} {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AwaitDependents")
+	}
+
 	var r0 <-chan struct{}
 	if rf, ok := ret.Get(0).(func() <-chan struct{}); ok {
 		r0 = rf()
@@ -43,6 +47,10 @@ func (_m *Broadcaster) AwaitDependents() <-chan struct{} {
 func (_m *Broadcaster) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -62,6 +70,10 @@ func (_m *Broadcaster) DependentReady() {
 func (_m *Broadcaster) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -78,6 +90,10 @@ func (_m *Broadcaster) HealthReport() map[string]error {
 func (_m *Broadcaster) IsConnected() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsConnected")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -99,6 +115,10 @@ func (_m *Broadcaster) MarkConsumed(lb log.Broadcast, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkConsumed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(log.Broadcast, ...pg.QOpt) error); ok {
 		r0 = rf(lb, qopts...)
@@ -120,6 +140,10 @@ func (_m *Broadcaster) MarkManyConsumed(lbs []log.Broadcast, qopts ...pg.QOpt) e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkManyConsumed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]log.Broadcast, ...pg.QOpt) error); ok {
 		r0 = rf(lbs, qopts...)
@@ -134,6 +158,10 @@ func (_m *Broadcaster) MarkManyConsumed(lbs []log.Broadcast, qopts ...pg.QOpt) e
 func (_m *Broadcaster) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -153,6 +181,10 @@ func (_m *Broadcaster) OnNewLongestChain(ctx context.Context, head *types.Head)
 func (_m *Broadcaster) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -167,6 +199,10 @@ func (_m *Broadcaster) Ready() error {
 func (_m *Broadcaster) Register(listener log.Listener, opts log.ListenerOpts) func() {
 	ret := _m.Called(listener, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Register")
+	}
+
 	var r0 func()
 	if rf, ok := ret.Get(0).(func(log.Listener, log.ListenerOpts) func()); ok {
 		r0 = rf(listener, opts)
@@ -188,6 +224,10 @@ func (_m *Broadcaster) ReplayFromBlock(number int64, forceBroadcast bool) {
 func (_m *Broadcaster) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -209,6 +249,10 @@ func (_m *Broadcaster) WasAlreadyConsumed(lb log.Broadcast, qopts ...pg.QOpt) (b
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WasAlreadyConsumed")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(log.Broadcast, ...pg.QOpt) (bool, error)); ok {
diff --git a/core/chains/evm/logpoller/mocks/log_poller.go b/core/chains/evm/logpoller/mocks/log_poller.go
index fe4ccc965cc..65d808b98d5 100644
--- a/core/chains/evm/logpoller/mocks/log_poller.go
+++ b/core/chains/evm/logpoller/mocks/log_poller.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -25,6 +25,10 @@ type LogPoller struct {
 func (_m *LogPoller) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -46,6 +50,10 @@ func (_m *LogPoller) GetBlocksRange(ctx context.Context, numbers []uint64, qopts
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetBlocksRange")
+	}
+
 	var r0 []logpoller.LogPollerBlock
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []uint64, ...pg.QOpt) ([]logpoller.LogPollerBlock, error)); ok {
@@ -72,6 +80,10 @@ func (_m *LogPoller) GetBlocksRange(ctx context.Context, numbers []uint64, qopts
 func (_m *LogPoller) HasFilter(name string) bool {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasFilter")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func(string) bool); ok {
 		r0 = rf(name)
@@ -86,6 +98,10 @@ func (_m *LogPoller) HasFilter(name string) bool {
 func (_m *LogPoller) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -109,6 +125,10 @@ func (_m *LogPoller) IndexedLogs(eventSig common.Hash, address common.Address, t
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogs")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, []common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -142,6 +162,10 @@ func (_m *LogPoller) IndexedLogsByBlockRange(start int64, end int64, eventSig co
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsByBlockRange")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64, common.Hash, common.Address, int, []common.Hash, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -175,6 +199,10 @@ func (_m *LogPoller) IndexedLogsByTxHash(eventSig common.Hash, address common.Ad
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsByTxHash")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, common.Hash, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -208,6 +236,10 @@ func (_m *LogPoller) IndexedLogsCreatedAfter(eventSig common.Hash, address commo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsCreatedAfter")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, []common.Hash, time.Time, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -241,6 +273,10 @@ func (_m *LogPoller) IndexedLogsTopicGreaterThan(eventSig common.Hash, address c
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsTopicGreaterThan")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -274,6 +310,10 @@ func (_m *LogPoller) IndexedLogsTopicRange(eventSig common.Hash, address common.
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsTopicRange")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, common.Hash, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -307,6 +347,10 @@ func (_m *LogPoller) IndexedLogsWithSigsExcluding(address common.Address, eventS
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsWithSigsExcluding")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address, common.Hash, common.Hash, int, int64, int64, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -339,6 +383,10 @@ func (_m *LogPoller) LatestBlock(qopts ...pg.QOpt) (logpoller.LogPollerBlock, er
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlock")
+	}
+
 	var r0 logpoller.LogPollerBlock
 	var r1 error
 	if rf, ok := ret.Get(0).(func(...pg.QOpt) (logpoller.LogPollerBlock, error)); ok {
@@ -370,6 +418,10 @@ func (_m *LogPoller) LatestBlockByEventSigsAddrsWithConfs(fromBlock int64, event
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockByEventSigsAddrsWithConfs")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, []common.Hash, []common.Address, logpoller.Confirmations, ...pg.QOpt) (int64, error)); ok {
@@ -401,6 +453,10 @@ func (_m *LogPoller) LatestLogByEventSigWithConfs(eventSig common.Hash, address
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestLogByEventSigWithConfs")
+	}
+
 	var r0 *logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, logpoller.Confirmations, ...pg.QOpt) (*logpoller.Log, error)); ok {
@@ -434,6 +490,10 @@ func (_m *LogPoller) LatestLogEventSigsAddrsWithConfs(fromBlock int64, eventSigs
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestLogEventSigsAddrsWithConfs")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, []common.Hash, []common.Address, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -467,6 +527,10 @@ func (_m *LogPoller) Logs(start int64, end int64, eventSig common.Hash, address
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Logs")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64, common.Hash, common.Address, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -500,6 +564,10 @@ func (_m *LogPoller) LogsCreatedAfter(eventSig common.Hash, address common.Addre
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsCreatedAfter")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, time.Time, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -533,6 +601,10 @@ func (_m *LogPoller) LogsDataWordBetween(eventSig common.Hash, address common.Ad
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsDataWordBetween")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -566,6 +638,10 @@ func (_m *LogPoller) LogsDataWordGreaterThan(eventSig common.Hash, address commo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsDataWordGreaterThan")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -599,6 +675,10 @@ func (_m *LogPoller) LogsDataWordRange(eventSig common.Hash, address common.Addr
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsDataWordRange")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, common.Hash, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -632,6 +712,10 @@ func (_m *LogPoller) LogsWithSigs(start int64, end int64, eventSigs []common.Has
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsWithSigs")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64, []common.Hash, common.Address, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -658,6 +742,10 @@ func (_m *LogPoller) LogsWithSigs(start int64, end int64, eventSigs []common.Has
 func (_m *LogPoller) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -672,6 +760,10 @@ func (_m *LogPoller) Name() string {
 func (_m *LogPoller) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -693,6 +785,10 @@ func (_m *LogPoller) RegisterFilter(filter logpoller.Filter, qopts ...pg.QOpt) e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RegisterFilter")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(logpoller.Filter, ...pg.QOpt) error); ok {
 		r0 = rf(filter, qopts...)
@@ -707,6 +803,10 @@ func (_m *LogPoller) RegisterFilter(filter logpoller.Filter, qopts ...pg.QOpt) e
 func (_m *LogPoller) Replay(ctx context.Context, fromBlock int64) error {
 	ret := _m.Called(ctx, fromBlock)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Replay")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, fromBlock)
@@ -726,6 +826,10 @@ func (_m *LogPoller) ReplayAsync(fromBlock int64) {
 func (_m *LogPoller) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -747,6 +851,10 @@ func (_m *LogPoller) UnregisterFilter(name string, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UnregisterFilter")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, ...pg.QOpt) error); ok {
 		r0 = rf(name, qopts...)
diff --git a/core/chains/evm/mocks/balance_monitor.go b/core/chains/evm/mocks/balance_monitor.go
index cdda18b7f03..f03fd8829cc 100644
--- a/core/chains/evm/mocks/balance_monitor.go
+++ b/core/chains/evm/mocks/balance_monitor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -22,6 +22,10 @@ type BalanceMonitor struct {
 func (_m *BalanceMonitor) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *BalanceMonitor) Close() error {
 func (_m *BalanceMonitor) GetEthBalance(_a0 common.Address) *assets.Eth {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetEthBalance")
+	}
+
 	var r0 *assets.Eth
 	if rf, ok := ret.Get(0).(func(common.Address) *assets.Eth); ok {
 		r0 = rf(_a0)
@@ -52,6 +60,10 @@ func (_m *BalanceMonitor) GetEthBalance(_a0 common.Address) *assets.Eth {
 func (_m *BalanceMonitor) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -68,6 +80,10 @@ func (_m *BalanceMonitor) HealthReport() map[string]error {
 func (_m *BalanceMonitor) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -87,6 +103,10 @@ func (_m *BalanceMonitor) OnNewLongestChain(ctx context.Context, head *types.Hea
 func (_m *BalanceMonitor) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -101,6 +121,10 @@ func (_m *BalanceMonitor) Ready() error {
 func (_m *BalanceMonitor) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/chains/evm/mocks/node.go b/core/chains/evm/mocks/node.go
index 69020d411f4..8f27218aec7 100644
--- a/core/chains/evm/mocks/node.go
+++ b/core/chains/evm/mocks/node.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -30,6 +30,10 @@ type Node struct {
 func (_m *Node) BalanceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BalanceAt")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (*big.Int, error)); ok {
@@ -56,6 +60,10 @@ func (_m *Node) BalanceAt(ctx context.Context, account common.Address, blockNumb
 func (_m *Node) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
@@ -70,6 +78,10 @@ func (_m *Node) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 func (_m *Node) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) {
 	ret := _m.Called(ctx, hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByHash")
+	}
+
 	var r0 *types.Block
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Block, error)); ok {
@@ -96,6 +108,10 @@ func (_m *Node) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block
 func (_m *Node) BlockByNumber(ctx context.Context, number *big.Int) (*types.Block, error) {
 	ret := _m.Called(ctx, number)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByNumber")
+	}
+
 	var r0 *types.Block
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*types.Block, error)); ok {
@@ -122,6 +138,10 @@ func (_m *Node) BlockByNumber(ctx context.Context, number *big.Int) (*types.Bloc
 func (_m *Node) BlockNumber(ctx context.Context) (uint64, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockNumber")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (uint64, error)); ok {
@@ -149,6 +169,10 @@ func (_m *Node) CallContext(ctx context.Context, result interface{}, method stri
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok {
 		r0 = rf(ctx, result, method, args...)
@@ -163,6 +187,10 @@ func (_m *Node) CallContext(ctx context.Context, result interface{}, method stri
 func (_m *Node) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error)); ok {
@@ -189,6 +217,10 @@ func (_m *Node) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNum
 func (_m *Node) ChainID() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -205,6 +237,10 @@ func (_m *Node) ChainID() *big.Int {
 func (_m *Node) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -219,6 +255,10 @@ func (_m *Node) Close() error {
 func (_m *Node) CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) ([]byte, error)); ok {
@@ -245,6 +285,10 @@ func (_m *Node) CodeAt(ctx context.Context, account common.Address, blockNumber
 func (_m *Node) EstimateGas(ctx context.Context, call ethereum.CallMsg) (uint64, error) {
 	ret := _m.Called(ctx, call)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EstimateGas")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg) (uint64, error)); ok {
@@ -272,6 +316,10 @@ func (_m *Node) EthSubscribe(ctx context.Context, channel chan<- *evmtypes.Head,
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EthSubscribe")
+	}
+
 	var r0 ethereum.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, chan<- *evmtypes.Head, ...interface{}) (ethereum.Subscription, error)); ok {
@@ -298,6 +346,10 @@ func (_m *Node) EthSubscribe(ctx context.Context, channel chan<- *evmtypes.Head,
 func (_m *Node) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error) {
 	ret := _m.Called(ctx, q)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterLogs")
+	}
+
 	var r0 []types.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.FilterQuery) ([]types.Log, error)); ok {
@@ -324,6 +376,10 @@ func (_m *Node) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types
 func (_m *Node) HeaderByHash(_a0 context.Context, _a1 common.Hash) (*types.Header, error) {
 	ret := _m.Called(_a0, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeaderByHash")
+	}
+
 	var r0 *types.Header
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Header, error)); ok {
@@ -350,6 +406,10 @@ func (_m *Node) HeaderByHash(_a0 context.Context, _a1 common.Hash) (*types.Heade
 func (_m *Node) HeaderByNumber(_a0 context.Context, _a1 *big.Int) (*types.Header, error) {
 	ret := _m.Called(_a0, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeaderByNumber")
+	}
+
 	var r0 *types.Header
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*types.Header, error)); ok {
@@ -376,6 +436,10 @@ func (_m *Node) HeaderByNumber(_a0 context.Context, _a1 *big.Int) (*types.Header
 func (_m *Node) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -390,6 +454,10 @@ func (_m *Node) Name() string {
 func (_m *Node) NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NonceAt")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (uint64, error)); ok {
@@ -414,6 +482,10 @@ func (_m *Node) NonceAt(ctx context.Context, account common.Address, blockNumber
 func (_m *Node) Order() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Order")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -428,6 +500,10 @@ func (_m *Node) Order() int32 {
 func (_m *Node) PendingCodeAt(ctx context.Context, account common.Address) ([]byte, error) {
 	ret := _m.Called(ctx, account)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingCodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) ([]byte, error)); ok {
@@ -454,6 +530,10 @@ func (_m *Node) PendingCodeAt(ctx context.Context, account common.Address) ([]by
 func (_m *Node) PendingNonceAt(ctx context.Context, account common.Address) (uint64, error) {
 	ret := _m.Called(ctx, account)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingNonceAt")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) (uint64, error)); ok {
@@ -478,6 +558,10 @@ func (_m *Node) PendingNonceAt(ctx context.Context, account common.Address) (uin
 func (_m *Node) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction) error); ok {
 		r0 = rf(ctx, tx)
@@ -492,6 +576,10 @@ func (_m *Node) SendTransaction(ctx context.Context, tx *types.Transaction) erro
 func (_m *Node) Start(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -506,6 +594,10 @@ func (_m *Node) Start(ctx context.Context) error {
 func (_m *Node) State() client.NodeState {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for State")
+	}
+
 	var r0 client.NodeState
 	if rf, ok := ret.Get(0).(func() client.NodeState); ok {
 		r0 = rf()
@@ -520,6 +612,10 @@ func (_m *Node) State() client.NodeState {
 func (_m *Node) StateAndLatest() (client.NodeState, int64, *big.Int) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StateAndLatest")
+	}
+
 	var r0 client.NodeState
 	var r1 int64
 	var r2 *big.Int
@@ -553,6 +649,10 @@ func (_m *Node) StateAndLatest() (client.NodeState, int64, *big.Int) {
 func (_m *Node) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -567,6 +667,10 @@ func (_m *Node) String() string {
 func (_m *Node) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error) {
 	ret := _m.Called(ctx, q, ch)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeFilterLogs")
+	}
+
 	var r0 ethereum.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.FilterQuery, chan<- types.Log) (ethereum.Subscription, error)); ok {
@@ -593,6 +697,10 @@ func (_m *Node) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery,
 func (_m *Node) SubscribersCount() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribersCount")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -607,6 +715,10 @@ func (_m *Node) SubscribersCount() int32 {
 func (_m *Node) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SuggestGasPrice")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -633,6 +745,10 @@ func (_m *Node) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 func (_m *Node) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SuggestGasTipCap")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -659,6 +775,10 @@ func (_m *Node) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
 func (_m *Node) TransactionByHash(ctx context.Context, txHash common.Hash) (*types.Transaction, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionByHash")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Transaction, error)); ok {
@@ -685,6 +805,10 @@ func (_m *Node) TransactionByHash(ctx context.Context, txHash common.Hash) (*typ
 func (_m *Node) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionReceipt")
+	}
+
 	var r0 *types.Receipt
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Receipt, error)); ok {
diff --git a/core/chains/evm/mocks/send_only_node.go b/core/chains/evm/mocks/send_only_node.go
index c836399a8ba..8ec3270281d 100644
--- a/core/chains/evm/mocks/send_only_node.go
+++ b/core/chains/evm/mocks/send_only_node.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -24,6 +24,10 @@ type SendOnlyNode struct {
 func (_m *SendOnlyNode) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
@@ -38,6 +42,10 @@ func (_m *SendOnlyNode) BatchCallContext(ctx context.Context, b []rpc.BatchElem)
 func (_m *SendOnlyNode) ChainID() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -54,6 +62,10 @@ func (_m *SendOnlyNode) ChainID() *big.Int {
 func (_m *SendOnlyNode) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -68,6 +80,10 @@ func (_m *SendOnlyNode) Close() error {
 func (_m *SendOnlyNode) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -82,6 +98,10 @@ func (_m *SendOnlyNode) Name() string {
 func (_m *SendOnlyNode) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction) error); ok {
 		r0 = rf(ctx, tx)
@@ -96,6 +116,10 @@ func (_m *SendOnlyNode) SendTransaction(ctx context.Context, tx *types.Transacti
 func (_m *SendOnlyNode) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -110,6 +134,10 @@ func (_m *SendOnlyNode) Start(_a0 context.Context) error {
 func (_m *SendOnlyNode) State() client.NodeState {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for State")
+	}
+
 	var r0 client.NodeState
 	if rf, ok := ret.Get(0).(func() client.NodeState); ok {
 		r0 = rf()
@@ -124,6 +152,10 @@ func (_m *SendOnlyNode) State() client.NodeState {
 func (_m *SendOnlyNode) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
diff --git a/core/chains/evm/txmgr/mocks/config.go b/core/chains/evm/txmgr/mocks/config.go
index ab98d686c85..0a0ece4b90b 100644
--- a/core/chains/evm/txmgr/mocks/config.go
+++ b/core/chains/evm/txmgr/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type Config struct {
 func (_m *Config) ChainType() config.ChainType {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainType")
+	}
+
 	var r0 config.ChainType
 	if rf, ok := ret.Get(0).(func() config.ChainType); ok {
 		r0 = rf()
@@ -30,6 +34,10 @@ func (_m *Config) ChainType() config.ChainType {
 func (_m *Config) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -44,6 +52,10 @@ func (_m *Config) FinalityDepth() uint32 {
 func (_m *Config) FinalityTagEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityTagEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -58,6 +70,10 @@ func (_m *Config) FinalityTagEnabled() bool {
 func (_m *Config) NonceAutoSync() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for NonceAutoSync")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -72,6 +88,10 @@ func (_m *Config) NonceAutoSync() bool {
 func (_m *Config) RPCDefaultBatchSize() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RPCDefaultBatchSize")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
diff --git a/core/chains/evm/txmgr/mocks/evm_tx_store.go b/core/chains/evm/txmgr/mocks/evm_tx_store.go
index bf3088b2aa1..a9a7023ac1f 100644
--- a/core/chains/evm/txmgr/mocks/evm_tx_store.go
+++ b/core/chains/evm/txmgr/mocks/evm_tx_store.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -32,6 +32,10 @@ type EvmTxStore struct {
 func (_m *EvmTxStore) Abandon(ctx context.Context, id *big.Int, addr common.Address) error {
 	ret := _m.Called(ctx, id, addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Abandon")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int, common.Address) error); ok {
 		r0 = rf(ctx, id, addr)
@@ -46,6 +50,10 @@ func (_m *EvmTxStore) Abandon(ctx context.Context, id *big.Int, addr common.Addr
 func (_m *EvmTxStore) CheckTxQueueCapacity(ctx context.Context, fromAddress common.Address, maxQueuedTransactions uint64, chainID *big.Int) error {
 	ret := _m.Called(ctx, fromAddress, maxQueuedTransactions, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckTxQueueCapacity")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, uint64, *big.Int) error); ok {
 		r0 = rf(ctx, fromAddress, maxQueuedTransactions, chainID)
@@ -65,6 +73,10 @@ func (_m *EvmTxStore) Close() {
 func (_m *EvmTxStore) CountTransactionsByState(ctx context.Context, state types.TxState, chainID *big.Int) (uint32, error) {
 	ret := _m.Called(ctx, state, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountTransactionsByState")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.TxState, *big.Int) (uint32, error)); ok {
@@ -89,6 +101,10 @@ func (_m *EvmTxStore) CountTransactionsByState(ctx context.Context, state types.
 func (_m *EvmTxStore) CountUnconfirmedTransactions(ctx context.Context, fromAddress common.Address, chainID *big.Int) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountUnconfirmedTransactions")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (uint32, error)); ok {
@@ -113,6 +129,10 @@ func (_m *EvmTxStore) CountUnconfirmedTransactions(ctx context.Context, fromAddr
 func (_m *EvmTxStore) CountUnstartedTransactions(ctx context.Context, fromAddress common.Address, chainID *big.Int) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountUnstartedTransactions")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (uint32, error)); ok {
@@ -137,6 +157,10 @@ func (_m *EvmTxStore) CountUnstartedTransactions(ctx context.Context, fromAddres
 func (_m *EvmTxStore) CreateTransaction(ctx context.Context, txRequest types.TxRequest[common.Address, common.Hash], chainID *big.Int) (types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, txRequest, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateTransaction")
+	}
+
 	var r0 types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.TxRequest[common.Address, common.Hash], *big.Int) (types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -161,6 +185,10 @@ func (_m *EvmTxStore) CreateTransaction(ctx context.Context, txRequest types.TxR
 func (_m *EvmTxStore) DeleteInProgressAttempt(ctx context.Context, attempt types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, attempt)
@@ -175,6 +203,10 @@ func (_m *EvmTxStore) DeleteInProgressAttempt(ctx context.Context, attempt types
 func (_m *EvmTxStore) FindEarliestUnconfirmedBroadcastTime(ctx context.Context, chainID *big.Int) (null.Time, error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedBroadcastTime")
+	}
+
 	var r0 null.Time
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (null.Time, error)); ok {
@@ -199,6 +231,10 @@ func (_m *EvmTxStore) FindEarliestUnconfirmedBroadcastTime(ctx context.Context,
 func (_m *EvmTxStore) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context, chainID *big.Int) (null.Int, error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedTxAttemptBlock")
+	}
+
 	var r0 null.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (null.Int, error)); ok {
@@ -223,6 +259,10 @@ func (_m *EvmTxStore) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context,
 func (_m *EvmTxStore) FindLatestSequence(ctx context.Context, fromAddress common.Address, chainId *big.Int) (evmtypes.Nonce, error) {
 	ret := _m.Called(ctx, fromAddress, chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindLatestSequence")
+	}
+
 	var r0 evmtypes.Nonce
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (evmtypes.Nonce, error)); ok {
@@ -247,6 +287,10 @@ func (_m *EvmTxStore) FindLatestSequence(ctx context.Context, fromAddress common
 func (_m *EvmTxStore) FindNextUnstartedTransactionFromAddress(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], fromAddress common.Address, chainID *big.Int) error {
 	ret := _m.Called(ctx, etx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindNextUnstartedTransactionFromAddress")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], common.Address, *big.Int) error); ok {
 		r0 = rf(ctx, etx, fromAddress, chainID)
@@ -261,6 +305,10 @@ func (_m *EvmTxStore) FindNextUnstartedTransactionFromAddress(ctx context.Contex
 func (_m *EvmTxStore) FindTransactionsConfirmedInBlockRange(ctx context.Context, highBlockNumber int64, lowBlockNumber int64, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, highBlockNumber, lowBlockNumber, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTransactionsConfirmedInBlockRange")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -287,6 +335,10 @@ func (_m *EvmTxStore) FindTransactionsConfirmedInBlockRange(ctx context.Context,
 func (_m *EvmTxStore) FindTxAttempt(hash common.Hash) (*types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttempt")
+	}
+
 	var r0 *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash) (*types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -313,6 +365,10 @@ func (_m *EvmTxStore) FindTxAttempt(hash common.Hash) (*types.TxAttempt[*big.Int
 func (_m *EvmTxStore) FindTxAttemptConfirmedByTxIDs(ids []int64) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptConfirmedByTxIDs")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -339,6 +395,10 @@ func (_m *EvmTxStore) FindTxAttemptConfirmedByTxIDs(ids []int64) ([]types.TxAtte
 func (_m *EvmTxStore) FindTxAttemptsConfirmedMissingReceipt(ctx context.Context, chainID *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsConfirmedMissingReceipt")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -365,6 +425,10 @@ func (_m *EvmTxStore) FindTxAttemptsConfirmedMissingReceipt(ctx context.Context,
 func (_m *EvmTxStore) FindTxAttemptsRequiringReceiptFetch(ctx context.Context, chainID *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsRequiringReceiptFetch")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -391,6 +455,10 @@ func (_m *EvmTxStore) FindTxAttemptsRequiringReceiptFetch(ctx context.Context, c
 func (_m *EvmTxStore) FindTxAttemptsRequiringResend(ctx context.Context, olderThan time.Time, maxInFlightTransactions uint32, chainID *big.Int, address common.Address) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, olderThan, maxInFlightTransactions, chainID, address)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsRequiringResend")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, uint32, *big.Int, common.Address) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -417,6 +485,10 @@ func (_m *EvmTxStore) FindTxAttemptsRequiringResend(ctx context.Context, olderTh
 func (_m *EvmTxStore) FindTxByHash(hash common.Hash) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxByHash")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -443,6 +515,10 @@ func (_m *EvmTxStore) FindTxByHash(hash common.Hash) (*types.Tx[*big.Int, common
 func (_m *EvmTxStore) FindTxWithAttempts(etxID int64) (types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(etxID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithAttempts")
+	}
+
 	var r0 types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -467,6 +543,10 @@ func (_m *EvmTxStore) FindTxWithAttempts(etxID int64) (types.Tx[*big.Int, common
 func (_m *EvmTxStore) FindTxWithIdempotencyKey(ctx context.Context, idempotencyKey string, chainID *big.Int) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, idempotencyKey, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithIdempotencyKey")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, *big.Int) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -493,6 +573,10 @@ func (_m *EvmTxStore) FindTxWithIdempotencyKey(ctx context.Context, idempotencyK
 func (_m *EvmTxStore) FindTxWithSequence(ctx context.Context, fromAddress common.Address, seq evmtypes.Nonce) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, fromAddress, seq)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithSequence")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, evmtypes.Nonce) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -519,6 +603,10 @@ func (_m *EvmTxStore) FindTxWithSequence(ctx context.Context, fromAddress common
 func (_m *EvmTxStore) FindTxesByMetaFieldAndStates(ctx context.Context, metaField string, metaValue string, states []types.TxState, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, metaField, metaValue, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesByMetaFieldAndStates")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, []types.TxState, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -545,6 +633,10 @@ func (_m *EvmTxStore) FindTxesByMetaFieldAndStates(ctx context.Context, metaFiel
 func (_m *EvmTxStore) FindTxesPendingCallback(ctx context.Context, blockNum int64, chainID *big.Int) ([]types.ReceiptPlus[*evmtypes.Receipt], error) {
 	ret := _m.Called(ctx, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesPendingCallback")
+	}
+
 	var r0 []types.ReceiptPlus[*evmtypes.Receipt]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, *big.Int) ([]types.ReceiptPlus[*evmtypes.Receipt], error)); ok {
@@ -571,6 +663,10 @@ func (_m *EvmTxStore) FindTxesPendingCallback(ctx context.Context, blockNum int6
 func (_m *EvmTxStore) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.Context, ids []big.Int, states []types.TxState, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, ids, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithAttemptsAndReceiptsByIdsAndState")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []big.Int, []types.TxState, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -597,6 +693,10 @@ func (_m *EvmTxStore) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.C
 func (_m *EvmTxStore) FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context, metaField string, blockNum int64, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, metaField, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByReceiptBlockNum")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, int64, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -623,6 +723,10 @@ func (_m *EvmTxStore) FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context
 func (_m *EvmTxStore) FindTxesWithMetaFieldByStates(ctx context.Context, metaField string, states []types.TxState, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, metaField, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByStates")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, []types.TxState, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -649,6 +753,10 @@ func (_m *EvmTxStore) FindTxesWithMetaFieldByStates(ctx context.Context, metaFie
 func (_m *EvmTxStore) FindTxsRequiringGasBump(ctx context.Context, address common.Address, blockNum int64, gasBumpThreshold int64, depth int64, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, address, blockNum, gasBumpThreshold, depth, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxsRequiringGasBump")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, int64, int64, int64, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -675,6 +783,10 @@ func (_m *EvmTxStore) FindTxsRequiringGasBump(ctx context.Context, address commo
 func (_m *EvmTxStore) FindTxsRequiringResubmissionDueToInsufficientFunds(ctx context.Context, address common.Address, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxsRequiringResubmissionDueToInsufficientFunds")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -701,6 +813,10 @@ func (_m *EvmTxStore) FindTxsRequiringResubmissionDueToInsufficientFunds(ctx con
 func (_m *EvmTxStore) GetInProgressTxAttempts(ctx context.Context, address common.Address, chainID *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetInProgressTxAttempts")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -727,6 +843,10 @@ func (_m *EvmTxStore) GetInProgressTxAttempts(ctx context.Context, address commo
 func (_m *EvmTxStore) GetNonFatalTransactions(ctx context.Context, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNonFatalTransactions")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -753,6 +873,10 @@ func (_m *EvmTxStore) GetNonFatalTransactions(ctx context.Context, chainID *big.
 func (_m *EvmTxStore) GetTxByID(ctx context.Context, id int64) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTxByID")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -779,6 +903,10 @@ func (_m *EvmTxStore) GetTxByID(ctx context.Context, id int64) (*types.Tx[*big.I
 func (_m *EvmTxStore) GetTxInProgress(ctx context.Context, fromAddress common.Address) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTxInProgress")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -805,6 +933,10 @@ func (_m *EvmTxStore) GetTxInProgress(ctx context.Context, fromAddress common.Ad
 func (_m *EvmTxStore) HasInProgressTransaction(ctx context.Context, account common.Address, chainID *big.Int) (bool, error) {
 	ret := _m.Called(ctx, account, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasInProgressTransaction")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (bool, error)); ok {
@@ -829,6 +961,10 @@ func (_m *EvmTxStore) HasInProgressTransaction(ctx context.Context, account comm
 func (_m *EvmTxStore) IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID *big.Int) (bool, error) {
 	ret := _m.Called(ctx, blockHeight, txID, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsTxFinalized")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, *big.Int) (bool, error)); ok {
@@ -853,6 +989,10 @@ func (_m *EvmTxStore) IsTxFinalized(ctx context.Context, blockHeight int64, txID
 func (_m *EvmTxStore) LoadTxAttempts(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LoadTxAttempts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, etx)
@@ -867,6 +1007,10 @@ func (_m *EvmTxStore) LoadTxAttempts(ctx context.Context, etx *types.Tx[*big.Int
 func (_m *EvmTxStore) MarkAllConfirmedMissingReceipt(ctx context.Context, chainID *big.Int) error {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkAllConfirmedMissingReceipt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) error); ok {
 		r0 = rf(ctx, chainID)
@@ -881,6 +1025,10 @@ func (_m *EvmTxStore) MarkAllConfirmedMissingReceipt(ctx context.Context, chainI
 func (_m *EvmTxStore) MarkOldTxesMissingReceiptAsErrored(ctx context.Context, blockNum int64, finalityDepth uint32, chainID *big.Int) error {
 	ret := _m.Called(ctx, blockNum, finalityDepth, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkOldTxesMissingReceiptAsErrored")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, uint32, *big.Int) error); ok {
 		r0 = rf(ctx, blockNum, finalityDepth, chainID)
@@ -895,6 +1043,10 @@ func (_m *EvmTxStore) MarkOldTxesMissingReceiptAsErrored(ctx context.Context, bl
 func (_m *EvmTxStore) PreloadTxes(ctx context.Context, attempts []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PreloadTxes")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, attempts)
@@ -909,6 +1061,10 @@ func (_m *EvmTxStore) PreloadTxes(ctx context.Context, attempts []types.TxAttemp
 func (_m *EvmTxStore) PruneUnstartedTxQueue(ctx context.Context, queueSize uint32, subject uuid.UUID) (int64, error) {
 	ret := _m.Called(ctx, queueSize, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PruneUnstartedTxQueue")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, uint32, uuid.UUID) (int64, error)); ok {
@@ -933,6 +1089,10 @@ func (_m *EvmTxStore) PruneUnstartedTxQueue(ctx context.Context, queueSize uint3
 func (_m *EvmTxStore) ReapTxHistory(ctx context.Context, minBlockNumberToKeep int64, timeThreshold time.Time, chainID *big.Int) error {
 	ret := _m.Called(ctx, minBlockNumberToKeep, timeThreshold, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReapTxHistory")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, time.Time, *big.Int) error); ok {
 		r0 = rf(ctx, minBlockNumberToKeep, timeThreshold, chainID)
@@ -947,6 +1107,10 @@ func (_m *EvmTxStore) ReapTxHistory(ctx context.Context, minBlockNumberToKeep in
 func (_m *EvmTxStore) SaveConfirmedMissingReceiptAttempt(ctx context.Context, timeout time.Duration, attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveConfirmedMissingReceiptAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -961,6 +1125,10 @@ func (_m *EvmTxStore) SaveConfirmedMissingReceiptAttempt(ctx context.Context, ti
 func (_m *EvmTxStore) SaveFetchedReceipts(ctx context.Context, receipts []*evmtypes.Receipt, chainID *big.Int) error {
 	ret := _m.Called(ctx, receipts, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveFetchedReceipts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []*evmtypes.Receipt, *big.Int) error); ok {
 		r0 = rf(ctx, receipts, chainID)
@@ -975,6 +1143,10 @@ func (_m *EvmTxStore) SaveFetchedReceipts(ctx context.Context, receipts []*evmty
 func (_m *EvmTxStore) SaveInProgressAttempt(ctx context.Context, attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, attempt)
@@ -989,6 +1161,10 @@ func (_m *EvmTxStore) SaveInProgressAttempt(ctx context.Context, attempt *types.
 func (_m *EvmTxStore) SaveInsufficientFundsAttempt(ctx context.Context, timeout time.Duration, attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveInsufficientFundsAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -1003,6 +1179,10 @@ func (_m *EvmTxStore) SaveInsufficientFundsAttempt(ctx context.Context, timeout
 func (_m *EvmTxStore) SaveReplacementInProgressAttempt(ctx context.Context, oldAttempt types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], replacementAttempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, oldAttempt, replacementAttempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveReplacementInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, oldAttempt, replacementAttempt)
@@ -1017,6 +1197,10 @@ func (_m *EvmTxStore) SaveReplacementInProgressAttempt(ctx context.Context, oldA
 func (_m *EvmTxStore) SaveSentAttempt(ctx context.Context, timeout time.Duration, attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveSentAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -1031,6 +1215,10 @@ func (_m *EvmTxStore) SaveSentAttempt(ctx context.Context, timeout time.Duration
 func (_m *EvmTxStore) SetBroadcastBeforeBlockNum(ctx context.Context, blockNum int64, chainID *big.Int) error {
 	ret := _m.Called(ctx, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetBroadcastBeforeBlockNum")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, *big.Int) error); ok {
 		r0 = rf(ctx, blockNum, chainID)
@@ -1045,6 +1233,10 @@ func (_m *EvmTxStore) SetBroadcastBeforeBlockNum(ctx context.Context, blockNum i
 func (_m *EvmTxStore) Transactions(offset int, limit int) ([]types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Transactions")
+	}
+
 	var r0 []types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 int
 	var r2 error
@@ -1078,6 +1270,10 @@ func (_m *EvmTxStore) Transactions(offset int, limit int) ([]types.Tx[*big.Int,
 func (_m *EvmTxStore) TransactionsWithAttempts(offset int, limit int) ([]types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionsWithAttempts")
+	}
+
 	var r0 []types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 int
 	var r2 error
@@ -1111,6 +1307,10 @@ func (_m *EvmTxStore) TransactionsWithAttempts(offset int, limit int) ([]types.T
 func (_m *EvmTxStore) TxAttempts(offset int, limit int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TxAttempts")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 int
 	var r2 error
@@ -1144,6 +1344,10 @@ func (_m *EvmTxStore) TxAttempts(offset int, limit int) ([]types.TxAttempt[*big.
 func (_m *EvmTxStore) UpdateBroadcastAts(ctx context.Context, now time.Time, etxIDs []int64) error {
 	ret := _m.Called(ctx, now, etxIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateBroadcastAts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, []int64) error); ok {
 		r0 = rf(ctx, now, etxIDs)
@@ -1158,6 +1362,10 @@ func (_m *EvmTxStore) UpdateBroadcastAts(ctx context.Context, now time.Time, etx
 func (_m *EvmTxStore) UpdateTxAttemptInProgressToBroadcast(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], attempt types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], NewAttemptState types.TxAttemptState) error {
 	ret := _m.Called(ctx, etx, attempt, NewAttemptState)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxAttemptInProgressToBroadcast")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], types.TxAttemptState) error); ok {
 		r0 = rf(ctx, etx, attempt, NewAttemptState)
@@ -1172,6 +1380,10 @@ func (_m *EvmTxStore) UpdateTxAttemptInProgressToBroadcast(ctx context.Context,
 func (_m *EvmTxStore) UpdateTxCallbackCompleted(ctx context.Context, pipelineTaskRunRid uuid.UUID, chainId *big.Int) error {
 	ret := _m.Called(ctx, pipelineTaskRunRid, chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxCallbackCompleted")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, uuid.UUID, *big.Int) error); ok {
 		r0 = rf(ctx, pipelineTaskRunRid, chainId)
@@ -1186,6 +1398,10 @@ func (_m *EvmTxStore) UpdateTxCallbackCompleted(ctx context.Context, pipelineTas
 func (_m *EvmTxStore) UpdateTxFatalError(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxFatalError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, etx)
@@ -1200,6 +1416,10 @@ func (_m *EvmTxStore) UpdateTxFatalError(ctx context.Context, etx *types.Tx[*big
 func (_m *EvmTxStore) UpdateTxForRebroadcast(ctx context.Context, etx types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], etxAttempt types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx, etxAttempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxForRebroadcast")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, etx, etxAttempt)
@@ -1214,6 +1434,10 @@ func (_m *EvmTxStore) UpdateTxForRebroadcast(ctx context.Context, etx types.Tx[*
 func (_m *EvmTxStore) UpdateTxUnstartedToInProgress(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxUnstartedToInProgress")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, etx, attempt)
@@ -1228,6 +1452,10 @@ func (_m *EvmTxStore) UpdateTxUnstartedToInProgress(ctx context.Context, etx *ty
 func (_m *EvmTxStore) UpdateTxsUnconfirmed(ctx context.Context, ids []int64) error {
 	ret := _m.Called(ctx, ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxsUnconfirmed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []int64) error); ok {
 		r0 = rf(ctx, ids)
diff --git a/core/chains/legacyevm/mocks/chain.go b/core/chains/legacyevm/mocks/chain.go
index 3a686887d76..d8cc4895493 100644
--- a/core/chains/legacyevm/mocks/chain.go
+++ b/core/chains/legacyevm/mocks/chain.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -42,6 +42,10 @@ type Chain struct {
 func (_m *Chain) BalanceMonitor() monitor.BalanceMonitor {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BalanceMonitor")
+	}
+
 	var r0 monitor.BalanceMonitor
 	if rf, ok := ret.Get(0).(func() monitor.BalanceMonitor); ok {
 		r0 = rf()
@@ -58,6 +62,10 @@ func (_m *Chain) BalanceMonitor() monitor.BalanceMonitor {
 func (_m *Chain) Client() client.Client {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Client")
+	}
+
 	var r0 client.Client
 	if rf, ok := ret.Get(0).(func() client.Client); ok {
 		r0 = rf()
@@ -74,6 +82,10 @@ func (_m *Chain) Client() client.Client {
 func (_m *Chain) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -88,6 +100,10 @@ func (_m *Chain) Close() error {
 func (_m *Chain) Config() config.ChainScopedConfig {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Config")
+	}
+
 	var r0 config.ChainScopedConfig
 	if rf, ok := ret.Get(0).(func() config.ChainScopedConfig); ok {
 		r0 = rf()
@@ -104,6 +120,10 @@ func (_m *Chain) Config() config.ChainScopedConfig {
 func (_m *Chain) GasEstimator() gas.EvmFeeEstimator {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GasEstimator")
+	}
+
 	var r0 gas.EvmFeeEstimator
 	if rf, ok := ret.Get(0).(func() gas.EvmFeeEstimator); ok {
 		r0 = rf()
@@ -120,6 +140,10 @@ func (_m *Chain) GasEstimator() gas.EvmFeeEstimator {
 func (_m *Chain) GetChainStatus(ctx context.Context) (types.ChainStatus, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChainStatus")
+	}
+
 	var r0 types.ChainStatus
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (types.ChainStatus, error)); ok {
@@ -144,6 +168,10 @@ func (_m *Chain) GetChainStatus(ctx context.Context) (types.ChainStatus, error)
 func (_m *Chain) HeadBroadcaster() commontypes.HeadBroadcaster[*evmtypes.Head, common.Hash] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeadBroadcaster")
+	}
+
 	var r0 commontypes.HeadBroadcaster[*evmtypes.Head, common.Hash]
 	if rf, ok := ret.Get(0).(func() commontypes.HeadBroadcaster[*evmtypes.Head, common.Hash]); ok {
 		r0 = rf()
@@ -160,6 +188,10 @@ func (_m *Chain) HeadBroadcaster() commontypes.HeadBroadcaster[*evmtypes.Head, c
 func (_m *Chain) HeadTracker() commontypes.HeadTracker[*evmtypes.Head, common.Hash] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeadTracker")
+	}
+
 	var r0 commontypes.HeadTracker[*evmtypes.Head, common.Hash]
 	if rf, ok := ret.Get(0).(func() commontypes.HeadTracker[*evmtypes.Head, common.Hash]); ok {
 		r0 = rf()
@@ -176,6 +208,10 @@ func (_m *Chain) HeadTracker() commontypes.HeadTracker[*evmtypes.Head, common.Ha
 func (_m *Chain) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -192,6 +228,10 @@ func (_m *Chain) HealthReport() map[string]error {
 func (_m *Chain) ID() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ID")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -208,6 +248,10 @@ func (_m *Chain) ID() *big.Int {
 func (_m *Chain) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken string) ([]types.NodeStatus, string, int, error) {
 	ret := _m.Called(ctx, pageSize, pageToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListNodeStatuses")
+	}
+
 	var r0 []types.NodeStatus
 	var r1 string
 	var r2 int
@@ -248,6 +292,10 @@ func (_m *Chain) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken
 func (_m *Chain) LogBroadcaster() log.Broadcaster {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogBroadcaster")
+	}
+
 	var r0 log.Broadcaster
 	if rf, ok := ret.Get(0).(func() log.Broadcaster); ok {
 		r0 = rf()
@@ -264,6 +312,10 @@ func (_m *Chain) LogBroadcaster() log.Broadcaster {
 func (_m *Chain) LogPoller() logpoller.LogPoller {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogPoller")
+	}
+
 	var r0 logpoller.LogPoller
 	if rf, ok := ret.Get(0).(func() logpoller.LogPoller); ok {
 		r0 = rf()
@@ -280,6 +332,10 @@ func (_m *Chain) LogPoller() logpoller.LogPoller {
 func (_m *Chain) Logger() logger.Logger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Logger")
+	}
+
 	var r0 logger.Logger
 	if rf, ok := ret.Get(0).(func() logger.Logger); ok {
 		r0 = rf()
@@ -296,6 +352,10 @@ func (_m *Chain) Logger() logger.Logger {
 func (_m *Chain) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -310,6 +370,10 @@ func (_m *Chain) Name() string {
 func (_m *Chain) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -324,6 +388,10 @@ func (_m *Chain) Ready() error {
 func (_m *Chain) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -338,6 +406,10 @@ func (_m *Chain) Start(_a0 context.Context) error {
 func (_m *Chain) Transact(ctx context.Context, from string, to string, amount *big.Int, balanceCheck bool) error {
 	ret := _m.Called(ctx, from, to, amount, balanceCheck)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Transact")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, *big.Int, bool) error); ok {
 		r0 = rf(ctx, from, to, amount, balanceCheck)
@@ -352,6 +424,10 @@ func (_m *Chain) Transact(ctx context.Context, from string, to string, amount *b
 func (_m *Chain) TxManager() txmgr.TxManager[*big.Int, *evmtypes.Head, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TxManager")
+	}
+
 	var r0 txmgr.TxManager[*big.Int, *evmtypes.Head, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	if rf, ok := ret.Get(0).(func() txmgr.TxManager[*big.Int, *evmtypes.Head, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]); ok {
 		r0 = rf()
diff --git a/core/chains/legacyevm/mocks/legacy_chain_container.go b/core/chains/legacyevm/mocks/legacy_chain_container.go
index 9ebacb890aa..812b95d3697 100644
--- a/core/chains/legacyevm/mocks/legacy_chain_container.go
+++ b/core/chains/legacyevm/mocks/legacy_chain_container.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type LegacyChainContainer struct {
 func (_m *LegacyChainContainer) ChainNodeConfigs() types.Configs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainNodeConfigs")
+	}
+
 	var r0 types.Configs
 	if rf, ok := ret.Get(0).(func() types.Configs); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *LegacyChainContainer) ChainNodeConfigs() types.Configs {
 func (_m *LegacyChainContainer) Get(id string) (legacyevm.Chain, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 legacyevm.Chain
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (legacyevm.Chain, error)); ok {
@@ -60,6 +68,10 @@ func (_m *LegacyChainContainer) Get(id string) (legacyevm.Chain, error) {
 func (_m *LegacyChainContainer) Len() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Len")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -80,6 +92,10 @@ func (_m *LegacyChainContainer) List(ids ...string) ([]legacyevm.Chain, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
 	var r0 []legacyevm.Chain
 	var r1 error
 	if rf, ok := ret.Get(0).(func(...string) ([]legacyevm.Chain, error)); ok {
@@ -106,6 +122,10 @@ func (_m *LegacyChainContainer) List(ids ...string) ([]legacyevm.Chain, error) {
 func (_m *LegacyChainContainer) Slice() []legacyevm.Chain {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Slice")
+	}
+
 	var r0 []legacyevm.Chain
 	if rf, ok := ret.Get(0).(func() []legacyevm.Chain); ok {
 		r0 = rf()
diff --git a/core/cmd/mocks/prompter.go b/core/cmd/mocks/prompter.go
index c0f682d5b9f..a05d24d671b 100644
--- a/core/cmd/mocks/prompter.go
+++ b/core/cmd/mocks/prompter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type Prompter struct {
 func (_m *Prompter) IsTerminal() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsTerminal")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -27,6 +31,10 @@ func (_m *Prompter) IsTerminal() bool {
 func (_m *Prompter) PasswordPrompt(_a0 string) string {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PasswordPrompt")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func(string) string); ok {
 		r0 = rf(_a0)
@@ -41,6 +49,10 @@ func (_m *Prompter) PasswordPrompt(_a0 string) string {
 func (_m *Prompter) Prompt(_a0 string) string {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Prompt")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func(string) string); ok {
 		r0 = rf(_a0)
diff --git a/core/config/mocks/telemetry_ingress.go b/core/config/mocks/telemetry_ingress.go
index 59f4ed10dad..ed5dbc4cf52 100644
--- a/core/config/mocks/telemetry_ingress.go
+++ b/core/config/mocks/telemetry_ingress.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type TelemetryIngress struct {
 func (_m *TelemetryIngress) BufferSize() uint {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BufferSize")
+	}
+
 	var r0 uint
 	if rf, ok := ret.Get(0).(func() uint); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *TelemetryIngress) BufferSize() uint {
 func (_m *TelemetryIngress) Endpoints() []config.TelemetryIngressEndpoint {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Endpoints")
+	}
+
 	var r0 []config.TelemetryIngressEndpoint
 	if rf, ok := ret.Get(0).(func() []config.TelemetryIngressEndpoint); ok {
 		r0 = rf()
@@ -50,6 +58,10 @@ func (_m *TelemetryIngress) Endpoints() []config.TelemetryIngressEndpoint {
 func (_m *TelemetryIngress) Logging() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Logging")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -64,6 +76,10 @@ func (_m *TelemetryIngress) Logging() bool {
 func (_m *TelemetryIngress) MaxBatchSize() uint {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaxBatchSize")
+	}
+
 	var r0 uint
 	if rf, ok := ret.Get(0).(func() uint); ok {
 		r0 = rf()
@@ -78,6 +94,10 @@ func (_m *TelemetryIngress) MaxBatchSize() uint {
 func (_m *TelemetryIngress) SendInterval() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendInterval")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -92,6 +112,10 @@ func (_m *TelemetryIngress) SendInterval() time.Duration {
 func (_m *TelemetryIngress) SendTimeout() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTimeout")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -106,6 +130,10 @@ func (_m *TelemetryIngress) SendTimeout() time.Duration {
 func (_m *TelemetryIngress) ServerPubKey() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ServerPubKey")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -120,6 +148,10 @@ func (_m *TelemetryIngress) ServerPubKey() string {
 func (_m *TelemetryIngress) URL() *url.URL {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for URL")
+	}
+
 	var r0 *url.URL
 	if rf, ok := ret.Get(0).(func() *url.URL); ok {
 		r0 = rf()
@@ -136,6 +168,10 @@ func (_m *TelemetryIngress) URL() *url.URL {
 func (_m *TelemetryIngress) UniConn() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for UniConn")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -150,6 +186,10 @@ func (_m *TelemetryIngress) UniConn() bool {
 func (_m *TelemetryIngress) UseBatchSend() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for UseBatchSend")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
diff --git a/core/config/mocks/telemetry_ingress_endpoint.go b/core/config/mocks/telemetry_ingress_endpoint.go
index 7aa6f46aa2b..08432cfe0ee 100644
--- a/core/config/mocks/telemetry_ingress_endpoint.go
+++ b/core/config/mocks/telemetry_ingress_endpoint.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type TelemetryIngressEndpoint struct {
 func (_m *TelemetryIngressEndpoint) ChainID() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *TelemetryIngressEndpoint) ChainID() string {
 func (_m *TelemetryIngressEndpoint) Network() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Network")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -45,6 +53,10 @@ func (_m *TelemetryIngressEndpoint) Network() string {
 func (_m *TelemetryIngressEndpoint) ServerPubKey() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ServerPubKey")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -59,6 +71,10 @@ func (_m *TelemetryIngressEndpoint) ServerPubKey() string {
 func (_m *TelemetryIngressEndpoint) URL() *url.URL {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for URL")
+	}
+
 	var r0 *url.URL
 	if rf, ok := ret.Get(0).(func() *url.URL); ok {
 		r0 = rf()
diff --git a/core/internal/mocks/application.go b/core/internal/mocks/application.go
index 48f8e12dac3..20874e4b60e 100644
--- a/core/internal/mocks/application.go
+++ b/core/internal/mocks/application.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -53,6 +53,10 @@ type Application struct {
 func (_m *Application) AddJobV2(ctx context.Context, _a1 *job.Job) error {
 	ret := _m.Called(ctx, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddJobV2")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *job.Job) error); ok {
 		r0 = rf(ctx, _a1)
@@ -67,6 +71,10 @@ func (_m *Application) AddJobV2(ctx context.Context, _a1 *job.Job) error {
 func (_m *Application) AuthenticationProvider() sessions.AuthenticationProvider {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AuthenticationProvider")
+	}
+
 	var r0 sessions.AuthenticationProvider
 	if rf, ok := ret.Get(0).(func() sessions.AuthenticationProvider); ok {
 		r0 = rf()
@@ -83,6 +91,10 @@ func (_m *Application) AuthenticationProvider() sessions.AuthenticationProvider
 func (_m *Application) BasicAdminUsersORM() sessions.BasicAdminUsersORM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BasicAdminUsersORM")
+	}
+
 	var r0 sessions.BasicAdminUsersORM
 	if rf, ok := ret.Get(0).(func() sessions.BasicAdminUsersORM); ok {
 		r0 = rf()
@@ -99,6 +111,10 @@ func (_m *Application) BasicAdminUsersORM() sessions.BasicAdminUsersORM {
 func (_m *Application) BridgeORM() bridges.ORM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BridgeORM")
+	}
+
 	var r0 bridges.ORM
 	if rf, ok := ret.Get(0).(func() bridges.ORM); ok {
 		r0 = rf()
@@ -115,6 +131,10 @@ func (_m *Application) BridgeORM() bridges.ORM {
 func (_m *Application) DeleteJob(ctx context.Context, jobID int32) error {
 	ret := _m.Called(ctx, jobID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int32) error); ok {
 		r0 = rf(ctx, jobID)
@@ -129,6 +149,10 @@ func (_m *Application) DeleteJob(ctx context.Context, jobID int32) error {
 func (_m *Application) EVMORM() types.Configs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMORM")
+	}
+
 	var r0 types.Configs
 	if rf, ok := ret.Get(0).(func() types.Configs); ok {
 		r0 = rf()
@@ -145,6 +169,10 @@ func (_m *Application) EVMORM() types.Configs {
 func (_m *Application) GetAuditLogger() audit.AuditLogger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAuditLogger")
+	}
+
 	var r0 audit.AuditLogger
 	if rf, ok := ret.Get(0).(func() audit.AuditLogger); ok {
 		r0 = rf()
@@ -161,6 +189,10 @@ func (_m *Application) GetAuditLogger() audit.AuditLogger {
 func (_m *Application) GetConfig() chainlink.GeneralConfig {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConfig")
+	}
+
 	var r0 chainlink.GeneralConfig
 	if rf, ok := ret.Get(0).(func() chainlink.GeneralConfig); ok {
 		r0 = rf()
@@ -177,6 +209,10 @@ func (_m *Application) GetConfig() chainlink.GeneralConfig {
 func (_m *Application) GetExternalInitiatorManager() webhook.ExternalInitiatorManager {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetExternalInitiatorManager")
+	}
+
 	var r0 webhook.ExternalInitiatorManager
 	if rf, ok := ret.Get(0).(func() webhook.ExternalInitiatorManager); ok {
 		r0 = rf()
@@ -193,6 +229,10 @@ func (_m *Application) GetExternalInitiatorManager() webhook.ExternalInitiatorMa
 func (_m *Application) GetFeedsService() feeds.Service {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFeedsService")
+	}
+
 	var r0 feeds.Service
 	if rf, ok := ret.Get(0).(func() feeds.Service); ok {
 		r0 = rf()
@@ -209,6 +249,10 @@ func (_m *Application) GetFeedsService() feeds.Service {
 func (_m *Application) GetHealthChecker() services.Checker {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetHealthChecker")
+	}
+
 	var r0 services.Checker
 	if rf, ok := ret.Get(0).(func() services.Checker); ok {
 		r0 = rf()
@@ -225,6 +269,10 @@ func (_m *Application) GetHealthChecker() services.Checker {
 func (_m *Application) GetKeyStore() keystore.Master {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetKeyStore")
+	}
+
 	var r0 keystore.Master
 	if rf, ok := ret.Get(0).(func() keystore.Master); ok {
 		r0 = rf()
@@ -241,6 +289,10 @@ func (_m *Application) GetKeyStore() keystore.Master {
 func (_m *Application) GetLogger() logger.SugaredLogger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLogger")
+	}
+
 	var r0 logger.SugaredLogger
 	if rf, ok := ret.Get(0).(func() logger.SugaredLogger); ok {
 		r0 = rf()
@@ -257,6 +309,10 @@ func (_m *Application) GetLogger() logger.SugaredLogger {
 func (_m *Application) GetLoopRegistry() *plugins.LoopRegistry {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLoopRegistry")
+	}
+
 	var r0 *plugins.LoopRegistry
 	if rf, ok := ret.Get(0).(func() *plugins.LoopRegistry); ok {
 		r0 = rf()
@@ -273,6 +329,10 @@ func (_m *Application) GetLoopRegistry() *plugins.LoopRegistry {
 func (_m *Application) GetRelayers() chainlink.RelayerChainInteroperators {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRelayers")
+	}
+
 	var r0 chainlink.RelayerChainInteroperators
 	if rf, ok := ret.Get(0).(func() chainlink.RelayerChainInteroperators); ok {
 		r0 = rf()
@@ -289,6 +349,10 @@ func (_m *Application) GetRelayers() chainlink.RelayerChainInteroperators {
 func (_m *Application) GetSqlxDB() *sqlx.DB {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSqlxDB")
+	}
+
 	var r0 *sqlx.DB
 	if rf, ok := ret.Get(0).(func() *sqlx.DB); ok {
 		r0 = rf()
@@ -305,6 +369,10 @@ func (_m *Application) GetSqlxDB() *sqlx.DB {
 func (_m *Application) GetWebAuthnConfiguration() sessions.WebAuthnConfiguration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetWebAuthnConfiguration")
+	}
+
 	var r0 sessions.WebAuthnConfiguration
 	if rf, ok := ret.Get(0).(func() sessions.WebAuthnConfiguration); ok {
 		r0 = rf()
@@ -319,6 +387,10 @@ func (_m *Application) GetWebAuthnConfiguration() sessions.WebAuthnConfiguration
 func (_m *Application) ID() uuid.UUID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ID")
+	}
+
 	var r0 uuid.UUID
 	if rf, ok := ret.Get(0).(func() uuid.UUID); ok {
 		r0 = rf()
@@ -335,6 +407,10 @@ func (_m *Application) ID() uuid.UUID {
 func (_m *Application) JobORM() job.ORM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobORM")
+	}
+
 	var r0 job.ORM
 	if rf, ok := ret.Get(0).(func() job.ORM); ok {
 		r0 = rf()
@@ -351,6 +427,10 @@ func (_m *Application) JobORM() job.ORM {
 func (_m *Application) JobSpawner() job.Spawner {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobSpawner")
+	}
+
 	var r0 job.Spawner
 	if rf, ok := ret.Get(0).(func() job.Spawner); ok {
 		r0 = rf()
@@ -367,6 +447,10 @@ func (_m *Application) JobSpawner() job.Spawner {
 func (_m *Application) PipelineORM() pipeline.ORM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PipelineORM")
+	}
+
 	var r0 pipeline.ORM
 	if rf, ok := ret.Get(0).(func() pipeline.ORM); ok {
 		r0 = rf()
@@ -383,6 +467,10 @@ func (_m *Application) PipelineORM() pipeline.ORM {
 func (_m *Application) ReplayFromBlock(chainID *big.Int, number uint64, forceBroadcast bool) error {
 	ret := _m.Called(chainID, number, forceBroadcast)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReplayFromBlock")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*big.Int, uint64, bool) error); ok {
 		r0 = rf(chainID, number, forceBroadcast)
@@ -397,6 +485,10 @@ func (_m *Application) ReplayFromBlock(chainID *big.Int, number uint64, forceBro
 func (_m *Application) ResumeJobV2(ctx context.Context, taskID uuid.UUID, result pipeline.Result) error {
 	ret := _m.Called(ctx, taskID, result)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ResumeJobV2")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, uuid.UUID, pipeline.Result) error); ok {
 		r0 = rf(ctx, taskID, result)
@@ -411,6 +503,10 @@ func (_m *Application) ResumeJobV2(ctx context.Context, taskID uuid.UUID, result
 func (_m *Application) RunJobV2(ctx context.Context, jobID int32, meta map[string]interface{}) (int64, error) {
 	ret := _m.Called(ctx, jobID, meta)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RunJobV2")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int32, map[string]interface{}) (int64, error)); ok {
@@ -435,6 +531,10 @@ func (_m *Application) RunJobV2(ctx context.Context, jobID int32, meta map[strin
 func (_m *Application) RunWebhookJobV2(ctx context.Context, jobUUID uuid.UUID, requestBody string, meta pipeline.JSONSerializable) (int64, error) {
 	ret := _m.Called(ctx, jobUUID, requestBody, meta)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RunWebhookJobV2")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, uuid.UUID, string, pipeline.JSONSerializable) (int64, error)); ok {
@@ -459,6 +559,10 @@ func (_m *Application) RunWebhookJobV2(ctx context.Context, jobUUID uuid.UUID, r
 func (_m *Application) SecretGenerator() chainlink.SecretGenerator {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SecretGenerator")
+	}
+
 	var r0 chainlink.SecretGenerator
 	if rf, ok := ret.Get(0).(func() chainlink.SecretGenerator); ok {
 		r0 = rf()
@@ -475,6 +579,10 @@ func (_m *Application) SecretGenerator() chainlink.SecretGenerator {
 func (_m *Application) SetLogLevel(lvl zapcore.Level) error {
 	ret := _m.Called(lvl)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetLogLevel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(zapcore.Level) error); ok {
 		r0 = rf(lvl)
@@ -489,6 +597,10 @@ func (_m *Application) SetLogLevel(lvl zapcore.Level) error {
 func (_m *Application) Start(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -503,6 +615,10 @@ func (_m *Application) Start(ctx context.Context) error {
 func (_m *Application) Stop() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Stop")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -517,6 +633,10 @@ func (_m *Application) Stop() error {
 func (_m *Application) TxmStorageService() txmgr.EvmTxStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TxmStorageService")
+	}
+
 	var r0 txmgr.EvmTxStore
 	if rf, ok := ret.Get(0).(func() txmgr.EvmTxStore); ok {
 		r0 = rf()
diff --git a/core/internal/mocks/flags.go b/core/internal/mocks/flags.go
index 5b5aa812680..32d21326ba0 100644
--- a/core/internal/mocks/flags.go
+++ b/core/internal/mocks/flags.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -26,6 +26,10 @@ type Flags struct {
 func (_m *Flags) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -52,6 +56,10 @@ func (_m *Flags) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, e
 func (_m *Flags) AddAccess(opts *bind.TransactOpts, _user common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddAccess")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -78,6 +86,10 @@ func (_m *Flags) AddAccess(opts *bind.TransactOpts, _user common.Address) (*type
 func (_m *Flags) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -94,6 +106,10 @@ func (_m *Flags) Address() common.Address {
 func (_m *Flags) CheckEnabled(opts *bind.CallOpts) (bool, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckEnabled")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (bool, error)); ok {
@@ -118,6 +134,10 @@ func (_m *Flags) CheckEnabled(opts *bind.CallOpts) (bool, error) {
 func (_m *Flags) DisableAccessCheck(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DisableAccessCheck")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -144,6 +164,10 @@ func (_m *Flags) DisableAccessCheck(opts *bind.TransactOpts) (*types.Transaction
 func (_m *Flags) EnableAccessCheck(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnableAccessCheck")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -170,6 +194,10 @@ func (_m *Flags) EnableAccessCheck(opts *bind.TransactOpts) (*types.Transaction,
 func (_m *Flags) FilterAddedAccess(opts *bind.FilterOpts) (*flags_wrapper.FlagsAddedAccessIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterAddedAccess")
+	}
+
 	var r0 *flags_wrapper.FlagsAddedAccessIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*flags_wrapper.FlagsAddedAccessIterator, error)); ok {
@@ -196,6 +224,10 @@ func (_m *Flags) FilterAddedAccess(opts *bind.FilterOpts) (*flags_wrapper.FlagsA
 func (_m *Flags) FilterCheckAccessDisabled(opts *bind.FilterOpts) (*flags_wrapper.FlagsCheckAccessDisabledIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCheckAccessDisabled")
+	}
+
 	var r0 *flags_wrapper.FlagsCheckAccessDisabledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*flags_wrapper.FlagsCheckAccessDisabledIterator, error)); ok {
@@ -222,6 +254,10 @@ func (_m *Flags) FilterCheckAccessDisabled(opts *bind.FilterOpts) (*flags_wrappe
 func (_m *Flags) FilterCheckAccessEnabled(opts *bind.FilterOpts) (*flags_wrapper.FlagsCheckAccessEnabledIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCheckAccessEnabled")
+	}
+
 	var r0 *flags_wrapper.FlagsCheckAccessEnabledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*flags_wrapper.FlagsCheckAccessEnabledIterator, error)); ok {
@@ -248,6 +284,10 @@ func (_m *Flags) FilterCheckAccessEnabled(opts *bind.FilterOpts) (*flags_wrapper
 func (_m *Flags) FilterFlagLowered(opts *bind.FilterOpts, subject []common.Address) (*flags_wrapper.FlagsFlagLoweredIterator, error) {
 	ret := _m.Called(opts, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterFlagLowered")
+	}
+
 	var r0 *flags_wrapper.FlagsFlagLoweredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*flags_wrapper.FlagsFlagLoweredIterator, error)); ok {
@@ -274,6 +314,10 @@ func (_m *Flags) FilterFlagLowered(opts *bind.FilterOpts, subject []common.Addre
 func (_m *Flags) FilterFlagRaised(opts *bind.FilterOpts, subject []common.Address) (*flags_wrapper.FlagsFlagRaisedIterator, error) {
 	ret := _m.Called(opts, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterFlagRaised")
+	}
+
 	var r0 *flags_wrapper.FlagsFlagRaisedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*flags_wrapper.FlagsFlagRaisedIterator, error)); ok {
@@ -300,6 +344,10 @@ func (_m *Flags) FilterFlagRaised(opts *bind.FilterOpts, subject []common.Addres
 func (_m *Flags) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*flags_wrapper.FlagsOwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *flags_wrapper.FlagsOwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flags_wrapper.FlagsOwnershipTransferRequestedIterator, error)); ok {
@@ -326,6 +374,10 @@ func (_m *Flags) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []
 func (_m *Flags) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*flags_wrapper.FlagsOwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *flags_wrapper.FlagsOwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flags_wrapper.FlagsOwnershipTransferredIterator, error)); ok {
@@ -352,6 +404,10 @@ func (_m *Flags) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common
 func (_m *Flags) FilterRaisingAccessControllerUpdated(opts *bind.FilterOpts, previous []common.Address, current []common.Address) (*flags_wrapper.FlagsRaisingAccessControllerUpdatedIterator, error) {
 	ret := _m.Called(opts, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRaisingAccessControllerUpdated")
+	}
+
 	var r0 *flags_wrapper.FlagsRaisingAccessControllerUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flags_wrapper.FlagsRaisingAccessControllerUpdatedIterator, error)); ok {
@@ -378,6 +434,10 @@ func (_m *Flags) FilterRaisingAccessControllerUpdated(opts *bind.FilterOpts, pre
 func (_m *Flags) FilterRemovedAccess(opts *bind.FilterOpts) (*flags_wrapper.FlagsRemovedAccessIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRemovedAccess")
+	}
+
 	var r0 *flags_wrapper.FlagsRemovedAccessIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*flags_wrapper.FlagsRemovedAccessIterator, error)); ok {
@@ -404,6 +464,10 @@ func (_m *Flags) FilterRemovedAccess(opts *bind.FilterOpts) (*flags_wrapper.Flag
 func (_m *Flags) GetFlag(opts *bind.CallOpts, subject common.Address) (bool, error) {
 	ret := _m.Called(opts, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFlag")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (bool, error)); ok {
@@ -428,6 +492,10 @@ func (_m *Flags) GetFlag(opts *bind.CallOpts, subject common.Address) (bool, err
 func (_m *Flags) GetFlags(opts *bind.CallOpts, subjects []common.Address) ([]bool, error) {
 	ret := _m.Called(opts, subjects)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFlags")
+	}
+
 	var r0 []bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, []common.Address) ([]bool, error)); ok {
@@ -454,6 +522,10 @@ func (_m *Flags) GetFlags(opts *bind.CallOpts, subjects []common.Address) ([]boo
 func (_m *Flags) HasAccess(opts *bind.CallOpts, _user common.Address, _calldata []byte) (bool, error) {
 	ret := _m.Called(opts, _user, _calldata)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasAccess")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, []byte) (bool, error)); ok {
@@ -478,6 +550,10 @@ func (_m *Flags) HasAccess(opts *bind.CallOpts, _user common.Address, _calldata
 func (_m *Flags) LowerFlags(opts *bind.TransactOpts, subjects []common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subjects)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LowerFlags")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address) (*types.Transaction, error)); ok {
@@ -504,6 +580,10 @@ func (_m *Flags) LowerFlags(opts *bind.TransactOpts, subjects []common.Address)
 func (_m *Flags) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -530,6 +610,10 @@ func (_m *Flags) Owner(opts *bind.CallOpts) (common.Address, error) {
 func (_m *Flags) ParseAddedAccess(log types.Log) (*flags_wrapper.FlagsAddedAccess, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseAddedAccess")
+	}
+
 	var r0 *flags_wrapper.FlagsAddedAccess
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsAddedAccess, error)); ok {
@@ -556,6 +640,10 @@ func (_m *Flags) ParseAddedAccess(log types.Log) (*flags_wrapper.FlagsAddedAcces
 func (_m *Flags) ParseCheckAccessDisabled(log types.Log) (*flags_wrapper.FlagsCheckAccessDisabled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCheckAccessDisabled")
+	}
+
 	var r0 *flags_wrapper.FlagsCheckAccessDisabled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsCheckAccessDisabled, error)); ok {
@@ -582,6 +670,10 @@ func (_m *Flags) ParseCheckAccessDisabled(log types.Log) (*flags_wrapper.FlagsCh
 func (_m *Flags) ParseCheckAccessEnabled(log types.Log) (*flags_wrapper.FlagsCheckAccessEnabled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCheckAccessEnabled")
+	}
+
 	var r0 *flags_wrapper.FlagsCheckAccessEnabled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsCheckAccessEnabled, error)); ok {
@@ -608,6 +700,10 @@ func (_m *Flags) ParseCheckAccessEnabled(log types.Log) (*flags_wrapper.FlagsChe
 func (_m *Flags) ParseFlagLowered(log types.Log) (*flags_wrapper.FlagsFlagLowered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseFlagLowered")
+	}
+
 	var r0 *flags_wrapper.FlagsFlagLowered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsFlagLowered, error)); ok {
@@ -634,6 +730,10 @@ func (_m *Flags) ParseFlagLowered(log types.Log) (*flags_wrapper.FlagsFlagLowere
 func (_m *Flags) ParseFlagRaised(log types.Log) (*flags_wrapper.FlagsFlagRaised, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseFlagRaised")
+	}
+
 	var r0 *flags_wrapper.FlagsFlagRaised
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsFlagRaised, error)); ok {
@@ -660,6 +760,10 @@ func (_m *Flags) ParseFlagRaised(log types.Log) (*flags_wrapper.FlagsFlagRaised,
 func (_m *Flags) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -686,6 +790,10 @@ func (_m *Flags) ParseLog(log types.Log) (generated.AbigenLog, error) {
 func (_m *Flags) ParseOwnershipTransferRequested(log types.Log) (*flags_wrapper.FlagsOwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *flags_wrapper.FlagsOwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsOwnershipTransferRequested, error)); ok {
@@ -712,6 +820,10 @@ func (_m *Flags) ParseOwnershipTransferRequested(log types.Log) (*flags_wrapper.
 func (_m *Flags) ParseOwnershipTransferred(log types.Log) (*flags_wrapper.FlagsOwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *flags_wrapper.FlagsOwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsOwnershipTransferred, error)); ok {
@@ -738,6 +850,10 @@ func (_m *Flags) ParseOwnershipTransferred(log types.Log) (*flags_wrapper.FlagsO
 func (_m *Flags) ParseRaisingAccessControllerUpdated(log types.Log) (*flags_wrapper.FlagsRaisingAccessControllerUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRaisingAccessControllerUpdated")
+	}
+
 	var r0 *flags_wrapper.FlagsRaisingAccessControllerUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsRaisingAccessControllerUpdated, error)); ok {
@@ -764,6 +880,10 @@ func (_m *Flags) ParseRaisingAccessControllerUpdated(log types.Log) (*flags_wrap
 func (_m *Flags) ParseRemovedAccess(log types.Log) (*flags_wrapper.FlagsRemovedAccess, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRemovedAccess")
+	}
+
 	var r0 *flags_wrapper.FlagsRemovedAccess
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsRemovedAccess, error)); ok {
@@ -790,6 +910,10 @@ func (_m *Flags) ParseRemovedAccess(log types.Log) (*flags_wrapper.FlagsRemovedA
 func (_m *Flags) RaiseFlag(opts *bind.TransactOpts, subject common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RaiseFlag")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -816,6 +940,10 @@ func (_m *Flags) RaiseFlag(opts *bind.TransactOpts, subject common.Address) (*ty
 func (_m *Flags) RaiseFlags(opts *bind.TransactOpts, subjects []common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subjects)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RaiseFlags")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address) (*types.Transaction, error)); ok {
@@ -842,6 +970,10 @@ func (_m *Flags) RaiseFlags(opts *bind.TransactOpts, subjects []common.Address)
 func (_m *Flags) RaisingAccessController(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RaisingAccessController")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -868,6 +1000,10 @@ func (_m *Flags) RaisingAccessController(opts *bind.CallOpts) (common.Address, e
 func (_m *Flags) RemoveAccess(opts *bind.TransactOpts, _user common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAccess")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -894,6 +1030,10 @@ func (_m *Flags) RemoveAccess(opts *bind.TransactOpts, _user common.Address) (*t
 func (_m *Flags) SetRaisingAccessController(opts *bind.TransactOpts, racAddress common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, racAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetRaisingAccessController")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -920,6 +1060,10 @@ func (_m *Flags) SetRaisingAccessController(opts *bind.TransactOpts, racAddress
 func (_m *Flags) TransferOwnership(opts *bind.TransactOpts, _to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -946,6 +1090,10 @@ func (_m *Flags) TransferOwnership(opts *bind.TransactOpts, _to common.Address)
 func (_m *Flags) WatchAddedAccess(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsAddedAccess) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchAddedAccess")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsAddedAccess) (event.Subscription, error)); ok {
@@ -972,6 +1120,10 @@ func (_m *Flags) WatchAddedAccess(opts *bind.WatchOpts, sink chan<- *flags_wrapp
 func (_m *Flags) WatchCheckAccessDisabled(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsCheckAccessDisabled) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCheckAccessDisabled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsCheckAccessDisabled) (event.Subscription, error)); ok {
@@ -998,6 +1150,10 @@ func (_m *Flags) WatchCheckAccessDisabled(opts *bind.WatchOpts, sink chan<- *fla
 func (_m *Flags) WatchCheckAccessEnabled(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsCheckAccessEnabled) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCheckAccessEnabled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsCheckAccessEnabled) (event.Subscription, error)); ok {
@@ -1024,6 +1180,10 @@ func (_m *Flags) WatchCheckAccessEnabled(opts *bind.WatchOpts, sink chan<- *flag
 func (_m *Flags) WatchFlagLowered(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsFlagLowered, subject []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchFlagLowered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsFlagLowered, []common.Address) (event.Subscription, error)); ok {
@@ -1050,6 +1210,10 @@ func (_m *Flags) WatchFlagLowered(opts *bind.WatchOpts, sink chan<- *flags_wrapp
 func (_m *Flags) WatchFlagRaised(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsFlagRaised, subject []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchFlagRaised")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsFlagRaised, []common.Address) (event.Subscription, error)); ok {
@@ -1076,6 +1240,10 @@ func (_m *Flags) WatchFlagRaised(opts *bind.WatchOpts, sink chan<- *flags_wrappe
 func (_m *Flags) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1102,6 +1270,10 @@ func (_m *Flags) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan
 func (_m *Flags) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1128,6 +1300,10 @@ func (_m *Flags) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *fl
 func (_m *Flags) WatchRaisingAccessControllerUpdated(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsRaisingAccessControllerUpdated, previous []common.Address, current []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRaisingAccessControllerUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsRaisingAccessControllerUpdated, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1154,6 +1330,10 @@ func (_m *Flags) WatchRaisingAccessControllerUpdated(opts *bind.WatchOpts, sink
 func (_m *Flags) WatchRemovedAccess(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsRemovedAccess) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRemovedAccess")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsRemovedAccess) (event.Subscription, error)); ok {
diff --git a/core/internal/mocks/flux_aggregator.go b/core/internal/mocks/flux_aggregator.go
index e3da1b83dff..ac72bd07db8 100644
--- a/core/internal/mocks/flux_aggregator.go
+++ b/core/internal/mocks/flux_aggregator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ type FluxAggregator struct {
 func (_m *FluxAggregator) AcceptAdmin(opts *bind.TransactOpts, _oracle common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptAdmin")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -54,6 +58,10 @@ func (_m *FluxAggregator) AcceptAdmin(opts *bind.TransactOpts, _oracle common.Ad
 func (_m *FluxAggregator) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -80,6 +88,10 @@ func (_m *FluxAggregator) AcceptOwnership(opts *bind.TransactOpts) (*types.Trans
 func (_m *FluxAggregator) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -96,6 +108,10 @@ func (_m *FluxAggregator) Address() common.Address {
 func (_m *FluxAggregator) AllocatedFunds(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AllocatedFunds")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -122,6 +138,10 @@ func (_m *FluxAggregator) AllocatedFunds(opts *bind.CallOpts) (*big.Int, error)
 func (_m *FluxAggregator) AvailableFunds(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AvailableFunds")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -148,6 +168,10 @@ func (_m *FluxAggregator) AvailableFunds(opts *bind.CallOpts) (*big.Int, error)
 func (_m *FluxAggregator) ChangeOracles(opts *bind.TransactOpts, _removed []common.Address, _added []common.Address, _addedAdmins []common.Address, _minSubmissions uint32, _maxSubmissions uint32, _restartDelay uint32) (*types.Transaction, error) {
 	ret := _m.Called(opts, _removed, _added, _addedAdmins, _minSubmissions, _maxSubmissions, _restartDelay)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChangeOracles")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address, []common.Address, uint32, uint32, uint32) (*types.Transaction, error)); ok {
@@ -174,6 +198,10 @@ func (_m *FluxAggregator) ChangeOracles(opts *bind.TransactOpts, _removed []comm
 func (_m *FluxAggregator) Decimals(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Decimals")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -198,6 +226,10 @@ func (_m *FluxAggregator) Decimals(opts *bind.CallOpts) (uint8, error) {
 func (_m *FluxAggregator) Description(opts *bind.CallOpts) (string, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Description")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
@@ -222,6 +254,10 @@ func (_m *FluxAggregator) Description(opts *bind.CallOpts) (string, error) {
 func (_m *FluxAggregator) FilterAnswerUpdated(opts *bind.FilterOpts, current []*big.Int, roundId []*big.Int) (*flux_aggregator_wrapper.FluxAggregatorAnswerUpdatedIterator, error) {
 	ret := _m.Called(opts, current, roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterAnswerUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorAnswerUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []*big.Int) (*flux_aggregator_wrapper.FluxAggregatorAnswerUpdatedIterator, error)); ok {
@@ -248,6 +284,10 @@ func (_m *FluxAggregator) FilterAnswerUpdated(opts *bind.FilterOpts, current []*
 func (_m *FluxAggregator) FilterAvailableFundsUpdated(opts *bind.FilterOpts, amount []*big.Int) (*flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdatedIterator, error) {
 	ret := _m.Called(opts, amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterAvailableFundsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdatedIterator, error)); ok {
@@ -274,6 +314,10 @@ func (_m *FluxAggregator) FilterAvailableFundsUpdated(opts *bind.FilterOpts, amo
 func (_m *FluxAggregator) FilterNewRound(opts *bind.FilterOpts, roundId []*big.Int, startedBy []common.Address) (*flux_aggregator_wrapper.FluxAggregatorNewRoundIterator, error) {
 	ret := _m.Called(opts, roundId, startedBy)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterNewRound")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorNewRoundIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorNewRoundIterator, error)); ok {
@@ -300,6 +344,10 @@ func (_m *FluxAggregator) FilterNewRound(opts *bind.FilterOpts, roundId []*big.I
 func (_m *FluxAggregator) FilterOracleAdminUpdateRequested(opts *bind.FilterOpts, oracle []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequestedIterator, error) {
 	ret := _m.Called(opts, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOracleAdminUpdateRequested")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequestedIterator, error)); ok {
@@ -326,6 +374,10 @@ func (_m *FluxAggregator) FilterOracleAdminUpdateRequested(opts *bind.FilterOpts
 func (_m *FluxAggregator) FilterOracleAdminUpdated(opts *bind.FilterOpts, oracle []common.Address, newAdmin []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdatedIterator, error) {
 	ret := _m.Called(opts, oracle, newAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOracleAdminUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdatedIterator, error)); ok {
@@ -352,6 +404,10 @@ func (_m *FluxAggregator) FilterOracleAdminUpdated(opts *bind.FilterOpts, oracle
 func (_m *FluxAggregator) FilterOraclePermissionsUpdated(opts *bind.FilterOpts, oracle []common.Address, whitelisted []bool) (*flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdatedIterator, error) {
 	ret := _m.Called(opts, oracle, whitelisted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOraclePermissionsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []bool) (*flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdatedIterator, error)); ok {
@@ -378,6 +434,10 @@ func (_m *FluxAggregator) FilterOraclePermissionsUpdated(opts *bind.FilterOpts,
 func (_m *FluxAggregator) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequestedIterator, error)); ok {
@@ -404,6 +464,10 @@ func (_m *FluxAggregator) FilterOwnershipTransferRequested(opts *bind.FilterOpts
 func (_m *FluxAggregator) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferredIterator, error)); ok {
@@ -430,6 +494,10 @@ func (_m *FluxAggregator) FilterOwnershipTransferred(opts *bind.FilterOpts, from
 func (_m *FluxAggregator) FilterRequesterPermissionsSet(opts *bind.FilterOpts, requester []common.Address) (*flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSetIterator, error) {
 	ret := _m.Called(opts, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRequesterPermissionsSet")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSetIterator, error)); ok {
@@ -456,6 +524,10 @@ func (_m *FluxAggregator) FilterRequesterPermissionsSet(opts *bind.FilterOpts, r
 func (_m *FluxAggregator) FilterRoundDetailsUpdated(opts *bind.FilterOpts, paymentAmount []*big.Int, minSubmissionCount []uint32, maxSubmissionCount []uint32) (*flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdatedIterator, error) {
 	ret := _m.Called(opts, paymentAmount, minSubmissionCount, maxSubmissionCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRoundDetailsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []uint32, []uint32) (*flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdatedIterator, error)); ok {
@@ -482,6 +554,10 @@ func (_m *FluxAggregator) FilterRoundDetailsUpdated(opts *bind.FilterOpts, payme
 func (_m *FluxAggregator) FilterSubmissionReceived(opts *bind.FilterOpts, submission []*big.Int, round []uint32, oracle []common.Address) (*flux_aggregator_wrapper.FluxAggregatorSubmissionReceivedIterator, error) {
 	ret := _m.Called(opts, submission, round, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubmissionReceived")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorSubmissionReceivedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []uint32, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorSubmissionReceivedIterator, error)); ok {
@@ -508,6 +584,10 @@ func (_m *FluxAggregator) FilterSubmissionReceived(opts *bind.FilterOpts, submis
 func (_m *FluxAggregator) FilterValidatorUpdated(opts *bind.FilterOpts, previous []common.Address, current []common.Address) (*flux_aggregator_wrapper.FluxAggregatorValidatorUpdatedIterator, error) {
 	ret := _m.Called(opts, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterValidatorUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorValidatorUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorValidatorUpdatedIterator, error)); ok {
@@ -534,6 +614,10 @@ func (_m *FluxAggregator) FilterValidatorUpdated(opts *bind.FilterOpts, previous
 func (_m *FluxAggregator) GetAdmin(opts *bind.CallOpts, _oracle common.Address) (common.Address, error) {
 	ret := _m.Called(opts, _oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAdmin")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (common.Address, error)); ok {
@@ -560,6 +644,10 @@ func (_m *FluxAggregator) GetAdmin(opts *bind.CallOpts, _oracle common.Address)
 func (_m *FluxAggregator) GetAnswer(opts *bind.CallOpts, _roundId *big.Int) (*big.Int, error) {
 	ret := _m.Called(opts, _roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAnswer")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (*big.Int, error)); ok {
@@ -586,6 +674,10 @@ func (_m *FluxAggregator) GetAnswer(opts *bind.CallOpts, _roundId *big.Int) (*bi
 func (_m *FluxAggregator) GetOracles(opts *bind.CallOpts) ([]common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOracles")
+	}
+
 	var r0 []common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([]common.Address, error)); ok {
@@ -612,6 +704,10 @@ func (_m *FluxAggregator) GetOracles(opts *bind.CallOpts) ([]common.Address, err
 func (_m *FluxAggregator) GetRoundData(opts *bind.CallOpts, _roundId *big.Int) (flux_aggregator_wrapper.GetRoundData, error) {
 	ret := _m.Called(opts, _roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRoundData")
+	}
+
 	var r0 flux_aggregator_wrapper.GetRoundData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (flux_aggregator_wrapper.GetRoundData, error)); ok {
@@ -636,6 +732,10 @@ func (_m *FluxAggregator) GetRoundData(opts *bind.CallOpts, _roundId *big.Int) (
 func (_m *FluxAggregator) GetTimestamp(opts *bind.CallOpts, _roundId *big.Int) (*big.Int, error) {
 	ret := _m.Called(opts, _roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTimestamp")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (*big.Int, error)); ok {
@@ -662,6 +762,10 @@ func (_m *FluxAggregator) GetTimestamp(opts *bind.CallOpts, _roundId *big.Int) (
 func (_m *FluxAggregator) LatestAnswer(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestAnswer")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -688,6 +792,10 @@ func (_m *FluxAggregator) LatestAnswer(opts *bind.CallOpts) (*big.Int, error) {
 func (_m *FluxAggregator) LatestRound(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestRound")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -714,6 +822,10 @@ func (_m *FluxAggregator) LatestRound(opts *bind.CallOpts) (*big.Int, error) {
 func (_m *FluxAggregator) LatestRoundData(opts *bind.CallOpts) (flux_aggregator_wrapper.LatestRoundData, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestRoundData")
+	}
+
 	var r0 flux_aggregator_wrapper.LatestRoundData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (flux_aggregator_wrapper.LatestRoundData, error)); ok {
@@ -738,6 +850,10 @@ func (_m *FluxAggregator) LatestRoundData(opts *bind.CallOpts) (flux_aggregator_
 func (_m *FluxAggregator) LatestTimestamp(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestTimestamp")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -764,6 +880,10 @@ func (_m *FluxAggregator) LatestTimestamp(opts *bind.CallOpts) (*big.Int, error)
 func (_m *FluxAggregator) LinkToken(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LinkToken")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -790,6 +910,10 @@ func (_m *FluxAggregator) LinkToken(opts *bind.CallOpts) (common.Address, error)
 func (_m *FluxAggregator) MaxSubmissionCount(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaxSubmissionCount")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -814,6 +938,10 @@ func (_m *FluxAggregator) MaxSubmissionCount(opts *bind.CallOpts) (uint32, error
 func (_m *FluxAggregator) MaxSubmissionValue(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaxSubmissionValue")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -840,6 +968,10 @@ func (_m *FluxAggregator) MaxSubmissionValue(opts *bind.CallOpts) (*big.Int, err
 func (_m *FluxAggregator) MinSubmissionCount(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MinSubmissionCount")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -864,6 +996,10 @@ func (_m *FluxAggregator) MinSubmissionCount(opts *bind.CallOpts) (uint32, error
 func (_m *FluxAggregator) MinSubmissionValue(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MinSubmissionValue")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -890,6 +1026,10 @@ func (_m *FluxAggregator) MinSubmissionValue(opts *bind.CallOpts) (*big.Int, err
 func (_m *FluxAggregator) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.Address, arg1 *big.Int, _data []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, arg0, arg1, _data)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OnTokenTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -916,6 +1056,10 @@ func (_m *FluxAggregator) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.A
 func (_m *FluxAggregator) OracleCount(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OracleCount")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -940,6 +1084,10 @@ func (_m *FluxAggregator) OracleCount(opts *bind.CallOpts) (uint8, error) {
 func (_m *FluxAggregator) OracleRoundState(opts *bind.CallOpts, _oracle common.Address, _queriedRoundId uint32) (flux_aggregator_wrapper.OracleRoundState, error) {
 	ret := _m.Called(opts, _oracle, _queriedRoundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OracleRoundState")
+	}
+
 	var r0 flux_aggregator_wrapper.OracleRoundState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, uint32) (flux_aggregator_wrapper.OracleRoundState, error)); ok {
@@ -964,6 +1112,10 @@ func (_m *FluxAggregator) OracleRoundState(opts *bind.CallOpts, _oracle common.A
 func (_m *FluxAggregator) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -990,6 +1142,10 @@ func (_m *FluxAggregator) Owner(opts *bind.CallOpts) (common.Address, error) {
 func (_m *FluxAggregator) ParseAnswerUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorAnswerUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseAnswerUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorAnswerUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorAnswerUpdated, error)); ok {
@@ -1016,6 +1172,10 @@ func (_m *FluxAggregator) ParseAnswerUpdated(log types.Log) (*flux_aggregator_wr
 func (_m *FluxAggregator) ParseAvailableFundsUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseAvailableFundsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated, error)); ok {
@@ -1042,6 +1202,10 @@ func (_m *FluxAggregator) ParseAvailableFundsUpdated(log types.Log) (*flux_aggre
 func (_m *FluxAggregator) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -1068,6 +1232,10 @@ func (_m *FluxAggregator) ParseLog(log types.Log) (generated.AbigenLog, error) {
 func (_m *FluxAggregator) ParseNewRound(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorNewRound, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseNewRound")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorNewRound
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorNewRound, error)); ok {
@@ -1094,6 +1262,10 @@ func (_m *FluxAggregator) ParseNewRound(log types.Log) (*flux_aggregator_wrapper
 func (_m *FluxAggregator) ParseOracleAdminUpdateRequested(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOracleAdminUpdateRequested")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested, error)); ok {
@@ -1120,6 +1292,10 @@ func (_m *FluxAggregator) ParseOracleAdminUpdateRequested(log types.Log) (*flux_
 func (_m *FluxAggregator) ParseOracleAdminUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOracleAdminUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated, error)); ok {
@@ -1146,6 +1322,10 @@ func (_m *FluxAggregator) ParseOracleAdminUpdated(log types.Log) (*flux_aggregat
 func (_m *FluxAggregator) ParseOraclePermissionsUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOraclePermissionsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated, error)); ok {
@@ -1172,6 +1352,10 @@ func (_m *FluxAggregator) ParseOraclePermissionsUpdated(log types.Log) (*flux_ag
 func (_m *FluxAggregator) ParseOwnershipTransferRequested(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested, error)); ok {
@@ -1198,6 +1382,10 @@ func (_m *FluxAggregator) ParseOwnershipTransferRequested(log types.Log) (*flux_
 func (_m *FluxAggregator) ParseOwnershipTransferred(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred, error)); ok {
@@ -1224,6 +1412,10 @@ func (_m *FluxAggregator) ParseOwnershipTransferred(log types.Log) (*flux_aggreg
 func (_m *FluxAggregator) ParseRequesterPermissionsSet(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRequesterPermissionsSet")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet, error)); ok {
@@ -1250,6 +1442,10 @@ func (_m *FluxAggregator) ParseRequesterPermissionsSet(log types.Log) (*flux_agg
 func (_m *FluxAggregator) ParseRoundDetailsUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRoundDetailsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated, error)); ok {
@@ -1276,6 +1472,10 @@ func (_m *FluxAggregator) ParseRoundDetailsUpdated(log types.Log) (*flux_aggrega
 func (_m *FluxAggregator) ParseSubmissionReceived(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorSubmissionReceived, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubmissionReceived")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorSubmissionReceived
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorSubmissionReceived, error)); ok {
@@ -1302,6 +1502,10 @@ func (_m *FluxAggregator) ParseSubmissionReceived(log types.Log) (*flux_aggregat
 func (_m *FluxAggregator) ParseValidatorUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorValidatorUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseValidatorUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorValidatorUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorValidatorUpdated, error)); ok {
@@ -1328,6 +1532,10 @@ func (_m *FluxAggregator) ParseValidatorUpdated(log types.Log) (*flux_aggregator
 func (_m *FluxAggregator) PaymentAmount(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PaymentAmount")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -1354,6 +1562,10 @@ func (_m *FluxAggregator) PaymentAmount(opts *bind.CallOpts) (*big.Int, error) {
 func (_m *FluxAggregator) RequestNewRound(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestNewRound")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -1380,6 +1592,10 @@ func (_m *FluxAggregator) RequestNewRound(opts *bind.TransactOpts) (*types.Trans
 func (_m *FluxAggregator) RestartDelay(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RestartDelay")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -1404,6 +1620,10 @@ func (_m *FluxAggregator) RestartDelay(opts *bind.CallOpts) (uint32, error) {
 func (_m *FluxAggregator) SetRequesterPermissions(opts *bind.TransactOpts, _requester common.Address, _authorized bool, _delay uint32) (*types.Transaction, error) {
 	ret := _m.Called(opts, _requester, _authorized, _delay)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetRequesterPermissions")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, bool, uint32) (*types.Transaction, error)); ok {
@@ -1430,6 +1650,10 @@ func (_m *FluxAggregator) SetRequesterPermissions(opts *bind.TransactOpts, _requ
 func (_m *FluxAggregator) SetValidator(opts *bind.TransactOpts, _newValidator common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _newValidator)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetValidator")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1456,6 +1680,10 @@ func (_m *FluxAggregator) SetValidator(opts *bind.TransactOpts, _newValidator co
 func (_m *FluxAggregator) Submit(opts *bind.TransactOpts, _roundId *big.Int, _submission *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, _roundId, _submission)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Submit")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, *big.Int) (*types.Transaction, error)); ok {
@@ -1482,6 +1710,10 @@ func (_m *FluxAggregator) Submit(opts *bind.TransactOpts, _roundId *big.Int, _su
 func (_m *FluxAggregator) Timeout(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Timeout")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -1506,6 +1738,10 @@ func (_m *FluxAggregator) Timeout(opts *bind.CallOpts) (uint32, error) {
 func (_m *FluxAggregator) TransferAdmin(opts *bind.TransactOpts, _oracle common.Address, _newAdmin common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _oracle, _newAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferAdmin")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, common.Address) (*types.Transaction, error)); ok {
@@ -1532,6 +1768,10 @@ func (_m *FluxAggregator) TransferAdmin(opts *bind.TransactOpts, _oracle common.
 func (_m *FluxAggregator) TransferOwnership(opts *bind.TransactOpts, _to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1558,6 +1798,10 @@ func (_m *FluxAggregator) TransferOwnership(opts *bind.TransactOpts, _to common.
 func (_m *FluxAggregator) UpdateAvailableFunds(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateAvailableFunds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -1584,6 +1828,10 @@ func (_m *FluxAggregator) UpdateAvailableFunds(opts *bind.TransactOpts) (*types.
 func (_m *FluxAggregator) UpdateFutureRounds(opts *bind.TransactOpts, _paymentAmount *big.Int, _minSubmissions uint32, _maxSubmissions uint32, _restartDelay uint32, _timeout uint32) (*types.Transaction, error) {
 	ret := _m.Called(opts, _paymentAmount, _minSubmissions, _maxSubmissions, _restartDelay, _timeout)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateFutureRounds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, uint32, uint32, uint32, uint32) (*types.Transaction, error)); ok {
@@ -1610,6 +1858,10 @@ func (_m *FluxAggregator) UpdateFutureRounds(opts *bind.TransactOpts, _paymentAm
 func (_m *FluxAggregator) Validator(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Validator")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1636,6 +1888,10 @@ func (_m *FluxAggregator) Validator(opts *bind.CallOpts) (common.Address, error)
 func (_m *FluxAggregator) Version(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Version")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -1662,6 +1918,10 @@ func (_m *FluxAggregator) Version(opts *bind.CallOpts) (*big.Int, error) {
 func (_m *FluxAggregator) WatchAnswerUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorAnswerUpdated, current []*big.Int, roundId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, current, roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchAnswerUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorAnswerUpdated, []*big.Int, []*big.Int) (event.Subscription, error)); ok {
@@ -1688,6 +1948,10 @@ func (_m *FluxAggregator) WatchAnswerUpdated(opts *bind.WatchOpts, sink chan<- *
 func (_m *FluxAggregator) WatchAvailableFundsUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated, amount []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchAvailableFundsUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated, []*big.Int) (event.Subscription, error)); ok {
@@ -1714,6 +1978,10 @@ func (_m *FluxAggregator) WatchAvailableFundsUpdated(opts *bind.WatchOpts, sink
 func (_m *FluxAggregator) WatchNewRound(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorNewRound, roundId []*big.Int, startedBy []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, roundId, startedBy)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchNewRound")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorNewRound, []*big.Int, []common.Address) (event.Subscription, error)); ok {
@@ -1740,6 +2008,10 @@ func (_m *FluxAggregator) WatchNewRound(opts *bind.WatchOpts, sink chan<- *flux_
 func (_m *FluxAggregator) WatchOracleAdminUpdateRequested(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested, oracle []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOracleAdminUpdateRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested, []common.Address) (event.Subscription, error)); ok {
@@ -1766,6 +2038,10 @@ func (_m *FluxAggregator) WatchOracleAdminUpdateRequested(opts *bind.WatchOpts,
 func (_m *FluxAggregator) WatchOracleAdminUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated, oracle []common.Address, newAdmin []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle, newAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOracleAdminUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1792,6 +2068,10 @@ func (_m *FluxAggregator) WatchOracleAdminUpdated(opts *bind.WatchOpts, sink cha
 func (_m *FluxAggregator) WatchOraclePermissionsUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated, oracle []common.Address, whitelisted []bool) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle, whitelisted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOraclePermissionsUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated, []common.Address, []bool) (event.Subscription, error)); ok {
@@ -1818,6 +2098,10 @@ func (_m *FluxAggregator) WatchOraclePermissionsUpdated(opts *bind.WatchOpts, si
 func (_m *FluxAggregator) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1844,6 +2128,10 @@ func (_m *FluxAggregator) WatchOwnershipTransferRequested(opts *bind.WatchOpts,
 func (_m *FluxAggregator) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1870,6 +2158,10 @@ func (_m *FluxAggregator) WatchOwnershipTransferred(opts *bind.WatchOpts, sink c
 func (_m *FluxAggregator) WatchRequesterPermissionsSet(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet, requester []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRequesterPermissionsSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet, []common.Address) (event.Subscription, error)); ok {
@@ -1896,6 +2188,10 @@ func (_m *FluxAggregator) WatchRequesterPermissionsSet(opts *bind.WatchOpts, sin
 func (_m *FluxAggregator) WatchRoundDetailsUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated, paymentAmount []*big.Int, minSubmissionCount []uint32, maxSubmissionCount []uint32) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, paymentAmount, minSubmissionCount, maxSubmissionCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRoundDetailsUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated, []*big.Int, []uint32, []uint32) (event.Subscription, error)); ok {
@@ -1922,6 +2218,10 @@ func (_m *FluxAggregator) WatchRoundDetailsUpdated(opts *bind.WatchOpts, sink ch
 func (_m *FluxAggregator) WatchSubmissionReceived(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorSubmissionReceived, submission []*big.Int, round []uint32, oracle []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, submission, round, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubmissionReceived")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorSubmissionReceived, []*big.Int, []uint32, []common.Address) (event.Subscription, error)); ok {
@@ -1948,6 +2248,10 @@ func (_m *FluxAggregator) WatchSubmissionReceived(opts *bind.WatchOpts, sink cha
 func (_m *FluxAggregator) WatchValidatorUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorValidatorUpdated, previous []common.Address, current []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchValidatorUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorValidatorUpdated, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1974,6 +2278,10 @@ func (_m *FluxAggregator) WatchValidatorUpdated(opts *bind.WatchOpts, sink chan<
 func (_m *FluxAggregator) WithdrawFunds(opts *bind.TransactOpts, _recipient common.Address, _amount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, _recipient, _amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawFunds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -2000,6 +2308,10 @@ func (_m *FluxAggregator) WithdrawFunds(opts *bind.TransactOpts, _recipient comm
 func (_m *FluxAggregator) WithdrawPayment(opts *bind.TransactOpts, _oracle common.Address, _recipient common.Address, _amount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, _oracle, _recipient, _amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawPayment")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -2026,6 +2338,10 @@ func (_m *FluxAggregator) WithdrawPayment(opts *bind.TransactOpts, _oracle commo
 func (_m *FluxAggregator) WithdrawablePayment(opts *bind.CallOpts, _oracle common.Address) (*big.Int, error) {
 	ret := _m.Called(opts, _oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawablePayment")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (*big.Int, error)); ok {
diff --git a/core/internal/mocks/prometheus_backend.go b/core/internal/mocks/prometheus_backend.go
index b2556a0bad4..6573dbaf03f 100644
--- a/core/internal/mocks/prometheus_backend.go
+++ b/core/internal/mocks/prometheus_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/core/logger/logger_mock_test.go b/core/logger/logger_mock_test.go
index 2b6dfcf3b22..afddd031888 100644
--- a/core/logger/logger_mock_test.go
+++ b/core/logger/logger_mock_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package logger
 
@@ -108,6 +108,10 @@ func (_m *MockLogger) Fatalw(msg string, keysAndValues ...interface{}) {
 func (_m *MockLogger) Helper(skip int) Logger {
 	ret := _m.Called(skip)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Helper")
+	}
+
 	var r0 Logger
 	if rf, ok := ret.Get(0).(func(int) Logger); ok {
 		r0 = rf(skip)
@@ -147,6 +151,10 @@ func (_m *MockLogger) Infow(msg string, keysAndValues ...interface{}) {
 func (_m *MockLogger) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -161,6 +169,10 @@ func (_m *MockLogger) Name() string {
 func (_m *MockLogger) Named(name string) Logger {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Named")
+	}
+
 	var r0 Logger
 	if rf, ok := ret.Get(0).(func(string) Logger); ok {
 		r0 = rf(name)
@@ -210,6 +222,10 @@ func (_m *MockLogger) SetLogLevel(_a0 zapcore.Level) {
 func (_m *MockLogger) Sync() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sync")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -272,6 +288,10 @@ func (_m *MockLogger) With(args ...interface{}) Logger {
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for With")
+	}
+
 	var r0 Logger
 	if rf, ok := ret.Get(0).(func(...interface{}) Logger); ok {
 		r0 = rf(args...)
diff --git a/core/logger/mocks/logger.go b/core/logger/mocks/logger.go
index 965bd57baaf..316f6216b90 100644
--- a/core/logger/mocks/logger.go
+++ b/core/logger/mocks/logger.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -110,6 +110,10 @@ func (_m *Logger) Fatalw(msg string, keysAndValues ...interface{}) {
 func (_m *Logger) Helper(skip int) logger.Logger {
 	ret := _m.Called(skip)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Helper")
+	}
+
 	var r0 logger.Logger
 	if rf, ok := ret.Get(0).(func(int) logger.Logger); ok {
 		r0 = rf(skip)
@@ -149,6 +153,10 @@ func (_m *Logger) Infow(msg string, keysAndValues ...interface{}) {
 func (_m *Logger) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -163,6 +171,10 @@ func (_m *Logger) Name() string {
 func (_m *Logger) Named(name string) logger.Logger {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Named")
+	}
+
 	var r0 logger.Logger
 	if rf, ok := ret.Get(0).(func(string) logger.Logger); ok {
 		r0 = rf(name)
@@ -212,6 +224,10 @@ func (_m *Logger) SetLogLevel(_a0 zapcore.Level) {
 func (_m *Logger) Sync() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sync")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -274,6 +290,10 @@ func (_m *Logger) With(args ...interface{}) logger.Logger {
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for With")
+	}
+
 	var r0 logger.Logger
 	if rf, ok := ret.Get(0).(func(...interface{}) logger.Logger); ok {
 		r0 = rf(args...)
diff --git a/core/services/blockhashstore/mocks/bhs.go b/core/services/blockhashstore/mocks/bhs.go
index 51ddca46a0d..a69016c8026 100644
--- a/core/services/blockhashstore/mocks/bhs.go
+++ b/core/services/blockhashstore/mocks/bhs.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type BHS struct {
 func (_m *BHS) IsStored(ctx context.Context, blockNum uint64) (bool, error) {
 	ret := _m.Called(ctx, blockNum)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsStored")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, uint64) (bool, error)); ok {
@@ -43,6 +47,10 @@ func (_m *BHS) IsStored(ctx context.Context, blockNum uint64) (bool, error) {
 func (_m *BHS) IsTrusted() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsTrusted")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -57,6 +65,10 @@ func (_m *BHS) IsTrusted() bool {
 func (_m *BHS) Store(ctx context.Context, blockNum uint64) error {
 	ret := _m.Called(ctx, blockNum)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Store")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, uint64) error); ok {
 		r0 = rf(ctx, blockNum)
@@ -71,6 +83,10 @@ func (_m *BHS) Store(ctx context.Context, blockNum uint64) error {
 func (_m *BHS) StoreEarliest(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StoreEarliest")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -85,6 +101,10 @@ func (_m *BHS) StoreEarliest(ctx context.Context) error {
 func (_m *BHS) StoreTrusted(ctx context.Context, blockNums []uint64, blockhashes []common.Hash, recentBlock uint64, recentBlockhash common.Hash) error {
 	ret := _m.Called(ctx, blockNums, blockhashes, recentBlock, recentBlockhash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StoreTrusted")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []uint64, []common.Hash, uint64, common.Hash) error); ok {
 		r0 = rf(ctx, blockNums, blockhashes, recentBlock, recentBlockhash)
diff --git a/core/services/blockhashstore/mocks/timer.go b/core/services/blockhashstore/mocks/timer.go
index c116163a3df..4236bdf8d92 100644
--- a/core/services/blockhashstore/mocks/timer.go
+++ b/core/services/blockhashstore/mocks/timer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type Timer struct {
 func (_m *Timer) After(d time.Duration) <-chan time.Time {
 	ret := _m.Called(d)
 
+	if len(ret) == 0 {
+		panic("no return value specified for After")
+	}
+
 	var r0 <-chan time.Time
 	if rf, ok := ret.Get(0).(func(time.Duration) <-chan time.Time); ok {
 		r0 = rf(d)
diff --git a/core/services/chainlink/mocks/general_config.go b/core/services/chainlink/mocks/general_config.go
index 98796e90053..1dd85875395 100644
--- a/core/services/chainlink/mocks/general_config.go
+++ b/core/services/chainlink/mocks/general_config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -30,6 +30,10 @@ type GeneralConfig struct {
 func (_m *GeneralConfig) AppID() uuid.UUID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AppID")
+	}
+
 	var r0 uuid.UUID
 	if rf, ok := ret.Get(0).(func() uuid.UUID); ok {
 		r0 = rf()
@@ -46,6 +50,10 @@ func (_m *GeneralConfig) AppID() uuid.UUID {
 func (_m *GeneralConfig) AuditLogger() config.AuditLogger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AuditLogger")
+	}
+
 	var r0 config.AuditLogger
 	if rf, ok := ret.Get(0).(func() config.AuditLogger); ok {
 		r0 = rf()
@@ -62,6 +70,10 @@ func (_m *GeneralConfig) AuditLogger() config.AuditLogger {
 func (_m *GeneralConfig) AutoPprof() config.AutoPprof {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AutoPprof")
+	}
+
 	var r0 config.AutoPprof
 	if rf, ok := ret.Get(0).(func() config.AutoPprof); ok {
 		r0 = rf()
@@ -78,6 +90,10 @@ func (_m *GeneralConfig) AutoPprof() config.AutoPprof {
 func (_m *GeneralConfig) ConfigTOML() (string, string) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConfigTOML")
+	}
+
 	var r0 string
 	var r1 string
 	if rf, ok := ret.Get(0).(func() (string, string)); ok {
@@ -102,6 +118,10 @@ func (_m *GeneralConfig) ConfigTOML() (string, string) {
 func (_m *GeneralConfig) CosmosConfigs() cosmosconfig.TOMLConfigs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CosmosConfigs")
+	}
+
 	var r0 cosmosconfig.TOMLConfigs
 	if rf, ok := ret.Get(0).(func() cosmosconfig.TOMLConfigs); ok {
 		r0 = rf()
@@ -118,6 +138,10 @@ func (_m *GeneralConfig) CosmosConfigs() cosmosconfig.TOMLConfigs {
 func (_m *GeneralConfig) CosmosEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CosmosEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -132,6 +156,10 @@ func (_m *GeneralConfig) CosmosEnabled() bool {
 func (_m *GeneralConfig) Database() config.Database {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Database")
+	}
+
 	var r0 config.Database
 	if rf, ok := ret.Get(0).(func() config.Database); ok {
 		r0 = rf()
@@ -148,6 +176,10 @@ func (_m *GeneralConfig) Database() config.Database {
 func (_m *GeneralConfig) EVMConfigs() toml.EVMConfigs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMConfigs")
+	}
+
 	var r0 toml.EVMConfigs
 	if rf, ok := ret.Get(0).(func() toml.EVMConfigs); ok {
 		r0 = rf()
@@ -164,6 +196,10 @@ func (_m *GeneralConfig) EVMConfigs() toml.EVMConfigs {
 func (_m *GeneralConfig) EVMEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -178,6 +214,10 @@ func (_m *GeneralConfig) EVMEnabled() bool {
 func (_m *GeneralConfig) EVMRPCEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMRPCEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -192,6 +232,10 @@ func (_m *GeneralConfig) EVMRPCEnabled() bool {
 func (_m *GeneralConfig) Feature() config.Feature {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Feature")
+	}
+
 	var r0 config.Feature
 	if rf, ok := ret.Get(0).(func() config.Feature); ok {
 		r0 = rf()
@@ -208,6 +252,10 @@ func (_m *GeneralConfig) Feature() config.Feature {
 func (_m *GeneralConfig) FluxMonitor() config.FluxMonitor {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FluxMonitor")
+	}
+
 	var r0 config.FluxMonitor
 	if rf, ok := ret.Get(0).(func() config.FluxMonitor); ok {
 		r0 = rf()
@@ -224,6 +272,10 @@ func (_m *GeneralConfig) FluxMonitor() config.FluxMonitor {
 func (_m *GeneralConfig) Insecure() config.Insecure {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Insecure")
+	}
+
 	var r0 config.Insecure
 	if rf, ok := ret.Get(0).(func() config.Insecure); ok {
 		r0 = rf()
@@ -240,6 +292,10 @@ func (_m *GeneralConfig) Insecure() config.Insecure {
 func (_m *GeneralConfig) InsecureFastScrypt() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsecureFastScrypt")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -254,6 +310,10 @@ func (_m *GeneralConfig) InsecureFastScrypt() bool {
 func (_m *GeneralConfig) JobPipeline() config.JobPipeline {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobPipeline")
+	}
+
 	var r0 config.JobPipeline
 	if rf, ok := ret.Get(0).(func() config.JobPipeline); ok {
 		r0 = rf()
@@ -270,6 +330,10 @@ func (_m *GeneralConfig) JobPipeline() config.JobPipeline {
 func (_m *GeneralConfig) Keeper() config.Keeper {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Keeper")
+	}
+
 	var r0 config.Keeper
 	if rf, ok := ret.Get(0).(func() config.Keeper); ok {
 		r0 = rf()
@@ -286,6 +350,10 @@ func (_m *GeneralConfig) Keeper() config.Keeper {
 func (_m *GeneralConfig) Log() config.Log {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Log")
+	}
+
 	var r0 config.Log
 	if rf, ok := ret.Get(0).(func() config.Log); ok {
 		r0 = rf()
@@ -307,6 +375,10 @@ func (_m *GeneralConfig) LogConfiguration(log config.LogfFn, warn config.LogfFn)
 func (_m *GeneralConfig) Mercury() config.Mercury {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Mercury")
+	}
+
 	var r0 config.Mercury
 	if rf, ok := ret.Get(0).(func() config.Mercury); ok {
 		r0 = rf()
@@ -323,6 +395,10 @@ func (_m *GeneralConfig) Mercury() config.Mercury {
 func (_m *GeneralConfig) OCR() config.OCR {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR")
+	}
+
 	var r0 config.OCR
 	if rf, ok := ret.Get(0).(func() config.OCR); ok {
 		r0 = rf()
@@ -339,6 +415,10 @@ func (_m *GeneralConfig) OCR() config.OCR {
 func (_m *GeneralConfig) OCR2() config.OCR2 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR2")
+	}
+
 	var r0 config.OCR2
 	if rf, ok := ret.Get(0).(func() config.OCR2); ok {
 		r0 = rf()
@@ -355,6 +435,10 @@ func (_m *GeneralConfig) OCR2() config.OCR2 {
 func (_m *GeneralConfig) P2P() config.P2P {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for P2P")
+	}
+
 	var r0 config.P2P
 	if rf, ok := ret.Get(0).(func() config.P2P); ok {
 		r0 = rf()
@@ -371,6 +455,10 @@ func (_m *GeneralConfig) P2P() config.P2P {
 func (_m *GeneralConfig) Password() config.Password {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Password")
+	}
+
 	var r0 config.Password
 	if rf, ok := ret.Get(0).(func() config.Password); ok {
 		r0 = rf()
@@ -387,6 +475,10 @@ func (_m *GeneralConfig) Password() config.Password {
 func (_m *GeneralConfig) Prometheus() config.Prometheus {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Prometheus")
+	}
+
 	var r0 config.Prometheus
 	if rf, ok := ret.Get(0).(func() config.Prometheus); ok {
 		r0 = rf()
@@ -403,6 +495,10 @@ func (_m *GeneralConfig) Prometheus() config.Prometheus {
 func (_m *GeneralConfig) Pyroscope() config.Pyroscope {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Pyroscope")
+	}
+
 	var r0 config.Pyroscope
 	if rf, ok := ret.Get(0).(func() config.Pyroscope); ok {
 		r0 = rf()
@@ -419,6 +515,10 @@ func (_m *GeneralConfig) Pyroscope() config.Pyroscope {
 func (_m *GeneralConfig) RootDir() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RootDir")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -433,6 +533,10 @@ func (_m *GeneralConfig) RootDir() string {
 func (_m *GeneralConfig) Sentry() config.Sentry {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sentry")
+	}
+
 	var r0 config.Sentry
 	if rf, ok := ret.Get(0).(func() config.Sentry); ok {
 		r0 = rf()
@@ -449,6 +553,10 @@ func (_m *GeneralConfig) Sentry() config.Sentry {
 func (_m *GeneralConfig) SetLogLevel(lvl zapcore.Level) error {
 	ret := _m.Called(lvl)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetLogLevel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(zapcore.Level) error); ok {
 		r0 = rf(lvl)
@@ -473,6 +581,10 @@ func (_m *GeneralConfig) SetPasswords(keystore *string, vrf *string) {
 func (_m *GeneralConfig) ShutdownGracePeriod() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ShutdownGracePeriod")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -487,6 +599,10 @@ func (_m *GeneralConfig) ShutdownGracePeriod() time.Duration {
 func (_m *GeneralConfig) SolanaConfigs() solana.TOMLConfigs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SolanaConfigs")
+	}
+
 	var r0 solana.TOMLConfigs
 	if rf, ok := ret.Get(0).(func() solana.TOMLConfigs); ok {
 		r0 = rf()
@@ -503,6 +619,10 @@ func (_m *GeneralConfig) SolanaConfigs() solana.TOMLConfigs {
 func (_m *GeneralConfig) SolanaEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SolanaEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -517,6 +637,10 @@ func (_m *GeneralConfig) SolanaEnabled() bool {
 func (_m *GeneralConfig) StarkNetEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StarkNetEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -531,6 +655,10 @@ func (_m *GeneralConfig) StarkNetEnabled() bool {
 func (_m *GeneralConfig) StarknetConfigs() chainlinkconfig.TOMLConfigs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StarknetConfigs")
+	}
+
 	var r0 chainlinkconfig.TOMLConfigs
 	if rf, ok := ret.Get(0).(func() chainlinkconfig.TOMLConfigs); ok {
 		r0 = rf()
@@ -547,6 +675,10 @@ func (_m *GeneralConfig) StarknetConfigs() chainlinkconfig.TOMLConfigs {
 func (_m *GeneralConfig) TelemetryIngress() config.TelemetryIngress {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TelemetryIngress")
+	}
+
 	var r0 config.TelemetryIngress
 	if rf, ok := ret.Get(0).(func() config.TelemetryIngress); ok {
 		r0 = rf()
@@ -563,6 +695,10 @@ func (_m *GeneralConfig) TelemetryIngress() config.TelemetryIngress {
 func (_m *GeneralConfig) Threshold() config.Threshold {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Threshold")
+	}
+
 	var r0 config.Threshold
 	if rf, ok := ret.Get(0).(func() config.Threshold); ok {
 		r0 = rf()
@@ -579,6 +715,10 @@ func (_m *GeneralConfig) Threshold() config.Threshold {
 func (_m *GeneralConfig) Tracing() config.Tracing {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Tracing")
+	}
+
 	var r0 config.Tracing
 	if rf, ok := ret.Get(0).(func() config.Tracing); ok {
 		r0 = rf()
@@ -595,6 +735,10 @@ func (_m *GeneralConfig) Tracing() config.Tracing {
 func (_m *GeneralConfig) Validate() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Validate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -609,6 +753,10 @@ func (_m *GeneralConfig) Validate() error {
 func (_m *GeneralConfig) ValidateDB() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ValidateDB")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -623,6 +771,10 @@ func (_m *GeneralConfig) ValidateDB() error {
 func (_m *GeneralConfig) WebServer() config.WebServer {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for WebServer")
+	}
+
 	var r0 config.WebServer
 	if rf, ok := ret.Get(0).(func() config.WebServer); ok {
 		r0 = rf()
diff --git a/core/services/feeds/mocks/connections_manager.go b/core/services/feeds/mocks/connections_manager.go
index e72c98a987a..5bdc5087108 100644
--- a/core/services/feeds/mocks/connections_manager.go
+++ b/core/services/feeds/mocks/connections_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ func (_m *ConnectionsManager) Connect(opts feeds.ConnectOpts) {
 func (_m *ConnectionsManager) Disconnect(id int64) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Disconnect")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64) error); ok {
 		r0 = rf(id)
@@ -42,6 +46,10 @@ func (_m *ConnectionsManager) Disconnect(id int64) error {
 func (_m *ConnectionsManager) GetClient(id int64) (proto.FeedsManagerClient, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetClient")
+	}
+
 	var r0 proto.FeedsManagerClient
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (proto.FeedsManagerClient, error)); ok {
@@ -68,6 +76,10 @@ func (_m *ConnectionsManager) GetClient(id int64) (proto.FeedsManagerClient, err
 func (_m *ConnectionsManager) IsConnected(id int64) bool {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsConnected")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func(int64) bool); ok {
 		r0 = rf(id)
diff --git a/core/services/feeds/mocks/feeds_manager_client.go b/core/services/feeds/mocks/feeds_manager_client.go
index 9d0037ceabc..f07200cc8fd 100644
--- a/core/services/feeds/mocks/feeds_manager_client.go
+++ b/core/services/feeds/mocks/feeds_manager_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type FeedsManagerClient struct {
 func (_m *FeedsManagerClient) ApprovedJob(ctx context.Context, in *proto.ApprovedJobRequest) (*proto.ApprovedJobResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ApprovedJob")
+	}
+
 	var r0 *proto.ApprovedJobResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.ApprovedJobRequest) (*proto.ApprovedJobResponse, error)); ok {
@@ -44,6 +48,10 @@ func (_m *FeedsManagerClient) ApprovedJob(ctx context.Context, in *proto.Approve
 func (_m *FeedsManagerClient) CancelledJob(ctx context.Context, in *proto.CancelledJobRequest) (*proto.CancelledJobResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelledJob")
+	}
+
 	var r0 *proto.CancelledJobResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.CancelledJobRequest) (*proto.CancelledJobResponse, error)); ok {
@@ -70,6 +78,10 @@ func (_m *FeedsManagerClient) CancelledJob(ctx context.Context, in *proto.Cancel
 func (_m *FeedsManagerClient) Healthcheck(ctx context.Context, in *proto.HealthcheckRequest) (*proto.HealthcheckResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Healthcheck")
+	}
+
 	var r0 *proto.HealthcheckResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.HealthcheckRequest) (*proto.HealthcheckResponse, error)); ok {
@@ -96,6 +108,10 @@ func (_m *FeedsManagerClient) Healthcheck(ctx context.Context, in *proto.Healthc
 func (_m *FeedsManagerClient) RejectedJob(ctx context.Context, in *proto.RejectedJobRequest) (*proto.RejectedJobResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RejectedJob")
+	}
+
 	var r0 *proto.RejectedJobResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.RejectedJobRequest) (*proto.RejectedJobResponse, error)); ok {
@@ -122,6 +138,10 @@ func (_m *FeedsManagerClient) RejectedJob(ctx context.Context, in *proto.Rejecte
 func (_m *FeedsManagerClient) UpdateNode(ctx context.Context, in *proto.UpdateNodeRequest) (*proto.UpdateNodeResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateNode")
+	}
+
 	var r0 *proto.UpdateNodeResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.UpdateNodeRequest) (*proto.UpdateNodeResponse, error)); ok {
diff --git a/core/services/feeds/mocks/orm.go b/core/services/feeds/mocks/orm.go
index 09326ada518..73bc4c4d4a0 100644
--- a/core/services/feeds/mocks/orm.go
+++ b/core/services/feeds/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -35,6 +35,10 @@ func (_m *ORM) ApproveSpec(id int64, externalJobID uuid.UUID, qopts ...pg.QOpt)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ApproveSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, uuid.UUID, ...pg.QOpt) error); ok {
 		r0 = rf(id, externalJobID, qopts...)
@@ -93,6 +97,10 @@ func (_m *ORM) CancelSpec(id int64, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -143,6 +151,10 @@ func (_c *ORM_CancelSpec_Call) RunAndReturn(run func(int64, ...pg.QOpt) error) *
 func (_m *ORM) CountJobProposals() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountJobProposals")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -194,6 +206,10 @@ func (_c *ORM_CountJobProposals_Call) RunAndReturn(run func() (int64, error)) *O
 func (_m *ORM) CountJobProposalsByStatus() (*feeds.JobProposalCounts, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountJobProposalsByStatus")
+	}
+
 	var r0 *feeds.JobProposalCounts
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (*feeds.JobProposalCounts, error)); ok {
@@ -247,6 +263,10 @@ func (_c *ORM_CountJobProposalsByStatus_Call) RunAndReturn(run func() (*feeds.Jo
 func (_m *ORM) CountManagers() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountManagers")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -305,6 +325,10 @@ func (_m *ORM) CreateBatchChainConfig(cfgs []feeds.ChainConfig, qopts ...pg.QOpt
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateBatchChainConfig")
+	}
+
 	var r0 []int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]feeds.ChainConfig, ...pg.QOpt) ([]int64, error)); ok {
@@ -374,6 +398,10 @@ func (_m *ORM) CreateChainConfig(cfg feeds.ChainConfig, qopts ...pg.QOpt) (int64
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(feeds.ChainConfig, ...pg.QOpt) (int64, error)); ok {
@@ -434,6 +462,10 @@ func (_c *ORM_CreateChainConfig_Call) RunAndReturn(run func(feeds.ChainConfig, .
 func (_m *ORM) CreateJobProposal(jp *feeds.JobProposal) (int64, error) {
 	ret := _m.Called(jp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateJobProposal")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*feeds.JobProposal) (int64, error)); ok {
@@ -493,6 +525,10 @@ func (_m *ORM) CreateManager(ms *feeds.FeedsManager, qopts ...pg.QOpt) (int64, e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateManager")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*feeds.FeedsManager, ...pg.QOpt) (int64, error)); ok {
@@ -560,6 +596,10 @@ func (_m *ORM) CreateSpec(spec feeds.JobProposalSpec, qopts ...pg.QOpt) (int64,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSpec")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(feeds.JobProposalSpec, ...pg.QOpt) (int64, error)); ok {
@@ -620,6 +660,10 @@ func (_c *ORM_CreateSpec_Call) RunAndReturn(run func(feeds.JobProposalSpec, ...p
 func (_m *ORM) DeleteChainConfig(id int64) (int64, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (int64, error)); ok {
@@ -679,6 +723,10 @@ func (_m *ORM) DeleteProposal(id int64, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteProposal")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -736,6 +784,10 @@ func (_m *ORM) ExistsSpecByJobProposalIDAndVersion(jpID int64, version int32, qo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExistsSpecByJobProposalIDAndVersion")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int32, ...pg.QOpt) (bool, error)); ok {
@@ -804,6 +856,10 @@ func (_m *ORM) GetApprovedSpec(jpID int64, qopts ...pg.QOpt) (*feeds.JobProposal
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetApprovedSpec")
+	}
+
 	var r0 *feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (*feeds.JobProposalSpec, error)); ok {
@@ -866,6 +922,10 @@ func (_c *ORM_GetApprovedSpec_Call) RunAndReturn(run func(int64, ...pg.QOpt) (*f
 func (_m *ORM) GetChainConfig(id int64) (*feeds.ChainConfig, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChainConfig")
+	}
+
 	var r0 *feeds.ChainConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.ChainConfig, error)); ok {
@@ -927,6 +987,10 @@ func (_m *ORM) GetJobProposal(id int64, qopts ...pg.QOpt) (*feeds.JobProposal, e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetJobProposal")
+	}
+
 	var r0 *feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (*feeds.JobProposal, error)); ok {
@@ -989,6 +1053,10 @@ func (_c *ORM_GetJobProposal_Call) RunAndReturn(run func(int64, ...pg.QOpt) (*fe
 func (_m *ORM) GetJobProposalByRemoteUUID(_a0 uuid.UUID) (*feeds.JobProposal, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetJobProposalByRemoteUUID")
+	}
+
 	var r0 *feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func(uuid.UUID) (*feeds.JobProposal, error)); ok {
@@ -1043,6 +1111,10 @@ func (_c *ORM_GetJobProposalByRemoteUUID_Call) RunAndReturn(run func(uuid.UUID)
 func (_m *ORM) GetLatestSpec(jpID int64) (*feeds.JobProposalSpec, error) {
 	ret := _m.Called(jpID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLatestSpec")
+	}
+
 	var r0 *feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.JobProposalSpec, error)); ok {
@@ -1097,6 +1169,10 @@ func (_c *ORM_GetLatestSpec_Call) RunAndReturn(run func(int64) (*feeds.JobPropos
 func (_m *ORM) GetManager(id int64) (*feeds.FeedsManager, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetManager")
+	}
+
 	var r0 *feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.FeedsManager, error)); ok {
@@ -1158,6 +1234,10 @@ func (_m *ORM) GetSpec(id int64, qopts ...pg.QOpt) (*feeds.JobProposalSpec, erro
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSpec")
+	}
+
 	var r0 *feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (*feeds.JobProposalSpec, error)); ok {
@@ -1227,6 +1307,10 @@ func (_m *ORM) IsJobManaged(jobID int64, qopts ...pg.QOpt) (bool, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsJobManaged")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (bool, error)); ok {
@@ -1287,6 +1371,10 @@ func (_c *ORM_IsJobManaged_Call) RunAndReturn(run func(int64, ...pg.QOpt) (bool,
 func (_m *ORM) ListChainConfigsByManagerIDs(mgrIDs []int64) ([]feeds.ChainConfig, error) {
 	ret := _m.Called(mgrIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListChainConfigsByManagerIDs")
+	}
+
 	var r0 []feeds.ChainConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.ChainConfig, error)); ok {
@@ -1341,6 +1429,10 @@ func (_c *ORM_ListChainConfigsByManagerIDs_Call) RunAndReturn(run func([]int64)
 func (_m *ORM) ListJobProposals() ([]feeds.JobProposal, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListJobProposals")
+	}
+
 	var r0 []feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]feeds.JobProposal, error)); ok {
@@ -1401,6 +1493,10 @@ func (_m *ORM) ListJobProposalsByManagersIDs(ids []int64, qopts ...pg.QOpt) ([]f
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListJobProposalsByManagersIDs")
+	}
+
 	var r0 []feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64, ...pg.QOpt) ([]feeds.JobProposal, error)); ok {
@@ -1463,6 +1559,10 @@ func (_c *ORM_ListJobProposalsByManagersIDs_Call) RunAndReturn(run func([]int64,
 func (_m *ORM) ListManagers() ([]feeds.FeedsManager, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListManagers")
+	}
+
 	var r0 []feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]feeds.FeedsManager, error)); ok {
@@ -1516,6 +1616,10 @@ func (_c *ORM_ListManagers_Call) RunAndReturn(run func() ([]feeds.FeedsManager,
 func (_m *ORM) ListManagersByIDs(ids []int64) ([]feeds.FeedsManager, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListManagersByIDs")
+	}
+
 	var r0 []feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.FeedsManager, error)); ok {
@@ -1577,6 +1681,10 @@ func (_m *ORM) ListSpecsByJobProposalIDs(ids []int64, qopts ...pg.QOpt) ([]feeds
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListSpecsByJobProposalIDs")
+	}
+
 	var r0 []feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64, ...pg.QOpt) ([]feeds.JobProposalSpec, error)); ok {
@@ -1646,6 +1754,10 @@ func (_m *ORM) RejectSpec(id int64, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RejectSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -1703,6 +1815,10 @@ func (_m *ORM) RevokeSpec(id int64, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RevokeSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -1753,6 +1869,10 @@ func (_c *ORM_RevokeSpec_Call) RunAndReturn(run func(int64, ...pg.QOpt) error) *
 func (_m *ORM) UpdateChainConfig(cfg feeds.ChainConfig) (int64, error) {
 	ret := _m.Called(cfg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(feeds.ChainConfig) (int64, error)); ok {
@@ -1812,6 +1932,10 @@ func (_m *ORM) UpdateJobProposalStatus(id int64, status feeds.JobProposalStatus,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateJobProposalStatus")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, feeds.JobProposalStatus, ...pg.QOpt) error); ok {
 		r0 = rf(id, status, qopts...)
@@ -1870,6 +1994,10 @@ func (_m *ORM) UpdateManager(mgr feeds.FeedsManager, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateManager")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(feeds.FeedsManager, ...pg.QOpt) error); ok {
 		r0 = rf(mgr, qopts...)
@@ -1927,6 +2055,10 @@ func (_m *ORM) UpdateSpecDefinition(id int64, spec string, qopts ...pg.QOpt) err
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateSpecDefinition")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, string, ...pg.QOpt) error); ok {
 		r0 = rf(id, spec, qopts...)
@@ -1985,6 +2117,10 @@ func (_m *ORM) UpsertJobProposal(jp *feeds.JobProposal, qopts ...pg.QOpt) (int64
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertJobProposal")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*feeds.JobProposal, ...pg.QOpt) (int64, error)); ok {
diff --git a/core/services/feeds/mocks/service.go b/core/services/feeds/mocks/service.go
index 1681918bb74..d8bc88c8159 100644
--- a/core/services/feeds/mocks/service.go
+++ b/core/services/feeds/mocks/service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type Service struct {
 func (_m *Service) ApproveSpec(ctx context.Context, id int64, force bool) error {
 	ret := _m.Called(ctx, id, force)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ApproveSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, bool) error); ok {
 		r0 = rf(ctx, id, force)
@@ -32,6 +36,10 @@ func (_m *Service) ApproveSpec(ctx context.Context, id int64, force bool) error
 func (_m *Service) CancelSpec(ctx context.Context, id int64) error {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, id)
@@ -46,6 +54,10 @@ func (_m *Service) CancelSpec(ctx context.Context, id int64) error {
 func (_m *Service) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -60,6 +72,10 @@ func (_m *Service) Close() error {
 func (_m *Service) CountJobProposalsByStatus() (*feeds.JobProposalCounts, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountJobProposalsByStatus")
+	}
+
 	var r0 *feeds.JobProposalCounts
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (*feeds.JobProposalCounts, error)); ok {
@@ -86,6 +102,10 @@ func (_m *Service) CountJobProposalsByStatus() (*feeds.JobProposalCounts, error)
 func (_m *Service) CountManagers() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountManagers")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -110,6 +130,10 @@ func (_m *Service) CountManagers() (int64, error) {
 func (_m *Service) CreateChainConfig(ctx context.Context, cfg feeds.ChainConfig) (int64, error) {
 	ret := _m.Called(ctx, cfg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, feeds.ChainConfig) (int64, error)); ok {
@@ -134,6 +158,10 @@ func (_m *Service) CreateChainConfig(ctx context.Context, cfg feeds.ChainConfig)
 func (_m *Service) DeleteChainConfig(ctx context.Context, id int64) (int64, error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) (int64, error)); ok {
@@ -158,6 +186,10 @@ func (_m *Service) DeleteChainConfig(ctx context.Context, id int64) (int64, erro
 func (_m *Service) DeleteJob(ctx context.Context, args *feeds.DeleteJobArgs) (int64, error) {
 	ret := _m.Called(ctx, args)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *feeds.DeleteJobArgs) (int64, error)); ok {
@@ -182,6 +214,10 @@ func (_m *Service) DeleteJob(ctx context.Context, args *feeds.DeleteJobArgs) (in
 func (_m *Service) GetChainConfig(id int64) (*feeds.ChainConfig, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChainConfig")
+	}
+
 	var r0 *feeds.ChainConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.ChainConfig, error)); ok {
@@ -208,6 +244,10 @@ func (_m *Service) GetChainConfig(id int64) (*feeds.ChainConfig, error) {
 func (_m *Service) GetJobProposal(id int64) (*feeds.JobProposal, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetJobProposal")
+	}
+
 	var r0 *feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.JobProposal, error)); ok {
@@ -234,6 +274,10 @@ func (_m *Service) GetJobProposal(id int64) (*feeds.JobProposal, error) {
 func (_m *Service) GetManager(id int64) (*feeds.FeedsManager, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetManager")
+	}
+
 	var r0 *feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.FeedsManager, error)); ok {
@@ -260,6 +304,10 @@ func (_m *Service) GetManager(id int64) (*feeds.FeedsManager, error) {
 func (_m *Service) GetSpec(id int64) (*feeds.JobProposalSpec, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSpec")
+	}
+
 	var r0 *feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.JobProposalSpec, error)); ok {
@@ -286,6 +334,10 @@ func (_m *Service) GetSpec(id int64) (*feeds.JobProposalSpec, error) {
 func (_m *Service) IsJobManaged(ctx context.Context, jobID int64) (bool, error) {
 	ret := _m.Called(ctx, jobID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsJobManaged")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) (bool, error)); ok {
@@ -310,6 +362,10 @@ func (_m *Service) IsJobManaged(ctx context.Context, jobID int64) (bool, error)
 func (_m *Service) ListChainConfigsByManagerIDs(mgrIDs []int64) ([]feeds.ChainConfig, error) {
 	ret := _m.Called(mgrIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListChainConfigsByManagerIDs")
+	}
+
 	var r0 []feeds.ChainConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.ChainConfig, error)); ok {
@@ -336,6 +392,10 @@ func (_m *Service) ListChainConfigsByManagerIDs(mgrIDs []int64) ([]feeds.ChainCo
 func (_m *Service) ListJobProposals() ([]feeds.JobProposal, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListJobProposals")
+	}
+
 	var r0 []feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]feeds.JobProposal, error)); ok {
@@ -362,6 +422,10 @@ func (_m *Service) ListJobProposals() ([]feeds.JobProposal, error) {
 func (_m *Service) ListJobProposalsByManagersIDs(ids []int64) ([]feeds.JobProposal, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListJobProposalsByManagersIDs")
+	}
+
 	var r0 []feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.JobProposal, error)); ok {
@@ -388,6 +452,10 @@ func (_m *Service) ListJobProposalsByManagersIDs(ids []int64) ([]feeds.JobPropos
 func (_m *Service) ListManagers() ([]feeds.FeedsManager, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListManagers")
+	}
+
 	var r0 []feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]feeds.FeedsManager, error)); ok {
@@ -414,6 +482,10 @@ func (_m *Service) ListManagers() ([]feeds.FeedsManager, error) {
 func (_m *Service) ListManagersByIDs(ids []int64) ([]feeds.FeedsManager, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListManagersByIDs")
+	}
+
 	var r0 []feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.FeedsManager, error)); ok {
@@ -440,6 +512,10 @@ func (_m *Service) ListManagersByIDs(ids []int64) ([]feeds.FeedsManager, error)
 func (_m *Service) ListSpecsByJobProposalIDs(ids []int64) ([]feeds.JobProposalSpec, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListSpecsByJobProposalIDs")
+	}
+
 	var r0 []feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.JobProposalSpec, error)); ok {
@@ -466,6 +542,10 @@ func (_m *Service) ListSpecsByJobProposalIDs(ids []int64) ([]feeds.JobProposalSp
 func (_m *Service) ProposeJob(ctx context.Context, args *feeds.ProposeJobArgs) (int64, error) {
 	ret := _m.Called(ctx, args)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ProposeJob")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *feeds.ProposeJobArgs) (int64, error)); ok {
@@ -490,6 +570,10 @@ func (_m *Service) ProposeJob(ctx context.Context, args *feeds.ProposeJobArgs) (
 func (_m *Service) RegisterManager(ctx context.Context, params feeds.RegisterManagerParams) (int64, error) {
 	ret := _m.Called(ctx, params)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RegisterManager")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, feeds.RegisterManagerParams) (int64, error)); ok {
@@ -514,6 +598,10 @@ func (_m *Service) RegisterManager(ctx context.Context, params feeds.RegisterMan
 func (_m *Service) RejectSpec(ctx context.Context, id int64) error {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RejectSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, id)
@@ -528,6 +616,10 @@ func (_m *Service) RejectSpec(ctx context.Context, id int64) error {
 func (_m *Service) RevokeJob(ctx context.Context, args *feeds.RevokeJobArgs) (int64, error) {
 	ret := _m.Called(ctx, args)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RevokeJob")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *feeds.RevokeJobArgs) (int64, error)); ok {
@@ -552,6 +644,10 @@ func (_m *Service) RevokeJob(ctx context.Context, args *feeds.RevokeJobArgs) (in
 func (_m *Service) Start(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -566,6 +662,10 @@ func (_m *Service) Start(ctx context.Context) error {
 func (_m *Service) SyncNodeInfo(ctx context.Context, id int64) error {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SyncNodeInfo")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, id)
@@ -585,6 +685,10 @@ func (_m *Service) Unsafe_SetConnectionsManager(_a0 feeds.ConnectionsManager) {
 func (_m *Service) UpdateChainConfig(ctx context.Context, cfg feeds.ChainConfig) (int64, error) {
 	ret := _m.Called(ctx, cfg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, feeds.ChainConfig) (int64, error)); ok {
@@ -609,6 +713,10 @@ func (_m *Service) UpdateChainConfig(ctx context.Context, cfg feeds.ChainConfig)
 func (_m *Service) UpdateManager(ctx context.Context, mgr feeds.FeedsManager) error {
 	ret := _m.Called(ctx, mgr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateManager")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, feeds.FeedsManager) error); ok {
 		r0 = rf(ctx, mgr)
@@ -623,6 +731,10 @@ func (_m *Service) UpdateManager(ctx context.Context, mgr feeds.FeedsManager) er
 func (_m *Service) UpdateSpecDefinition(ctx context.Context, id int64, spec string) error {
 	ret := _m.Called(ctx, id, spec)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateSpecDefinition")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, string) error); ok {
 		r0 = rf(ctx, id, spec)
diff --git a/core/services/fluxmonitorv2/mocks/contract_submitter.go b/core/services/fluxmonitorv2/mocks/contract_submitter.go
index 03540a6cb1c..3154b4c86ee 100644
--- a/core/services/fluxmonitorv2/mocks/contract_submitter.go
+++ b/core/services/fluxmonitorv2/mocks/contract_submitter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type ContractSubmitter struct {
 func (_m *ContractSubmitter) Submit(ctx context.Context, roundID *big.Int, submission *big.Int, idempotencyKey *string) error {
 	ret := _m.Called(ctx, roundID, submission, idempotencyKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Submit")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int, *big.Int, *string) error); ok {
 		r0 = rf(ctx, roundID, submission, idempotencyKey)
diff --git a/core/services/fluxmonitorv2/mocks/flags.go b/core/services/fluxmonitorv2/mocks/flags.go
index 08ad0f5b3f7..6ff1616111b 100644
--- a/core/services/fluxmonitorv2/mocks/flags.go
+++ b/core/services/fluxmonitorv2/mocks/flags.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Flags struct {
 func (_m *Flags) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -37,6 +41,10 @@ func (_m *Flags) Address() common.Address {
 func (_m *Flags) ContractExists() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ContractExists")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *Flags) ContractExists() bool {
 func (_m *Flags) IsLowered(contractAddr common.Address) (bool, error) {
 	ret := _m.Called(contractAddr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsLowered")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address) (bool, error)); ok {
@@ -75,6 +87,10 @@ func (_m *Flags) IsLowered(contractAddr common.Address) (bool, error) {
 func (_m *Flags) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
diff --git a/core/services/fluxmonitorv2/mocks/key_store_interface.go b/core/services/fluxmonitorv2/mocks/key_store_interface.go
index c409a987e02..98f5ab71020 100644
--- a/core/services/fluxmonitorv2/mocks/key_store_interface.go
+++ b/core/services/fluxmonitorv2/mocks/key_store_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type KeyStoreInterface struct {
 func (_m *KeyStoreInterface) EnabledKeysForChain(chainID *big.Int) ([]ethkey.KeyV2, error) {
 	ret := _m.Called(chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnabledKeysForChain")
+	}
+
 	var r0 []ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int) ([]ethkey.KeyV2, error)); ok {
@@ -53,6 +57,10 @@ func (_m *KeyStoreInterface) GetRoundRobinAddress(chainID *big.Int, addrs ...com
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRoundRobinAddress")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int, ...common.Address) (common.Address, error)); ok {
diff --git a/core/services/fluxmonitorv2/mocks/orm.go b/core/services/fluxmonitorv2/mocks/orm.go
index 5080f19edf0..8d277d61d2e 100644
--- a/core/services/fluxmonitorv2/mocks/orm.go
+++ b/core/services/fluxmonitorv2/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -23,6 +23,10 @@ type ORM struct {
 func (_m *ORM) CountFluxMonitorRoundStats() (int, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountFluxMonitorRoundStats")
+	}
+
 	var r0 int
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int, error)); ok {
@@ -47,6 +51,10 @@ func (_m *ORM) CountFluxMonitorRoundStats() (int, error) {
 func (_m *ORM) CreateEthTransaction(ctx context.Context, fromAddress common.Address, toAddress common.Address, payload []byte, gasLimit uint32, idempotencyKey *string) error {
 	ret := _m.Called(ctx, fromAddress, toAddress, payload, gasLimit, idempotencyKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateEthTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, common.Address, []byte, uint32, *string) error); ok {
 		r0 = rf(ctx, fromAddress, toAddress, payload, gasLimit, idempotencyKey)
@@ -61,6 +69,10 @@ func (_m *ORM) CreateEthTransaction(ctx context.Context, fromAddress common.Addr
 func (_m *ORM) DeleteFluxMonitorRoundsBackThrough(aggregator common.Address, roundID uint32) error {
 	ret := _m.Called(aggregator, roundID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteFluxMonitorRoundsBackThrough")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, uint32) error); ok {
 		r0 = rf(aggregator, roundID)
@@ -75,6 +87,10 @@ func (_m *ORM) DeleteFluxMonitorRoundsBackThrough(aggregator common.Address, rou
 func (_m *ORM) FindOrCreateFluxMonitorRoundStats(aggregator common.Address, roundID uint32, newRoundLogs uint) (fluxmonitorv2.FluxMonitorRoundStatsV2, error) {
 	ret := _m.Called(aggregator, roundID, newRoundLogs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindOrCreateFluxMonitorRoundStats")
+	}
+
 	var r0 fluxmonitorv2.FluxMonitorRoundStatsV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address, uint32, uint) (fluxmonitorv2.FluxMonitorRoundStatsV2, error)); ok {
@@ -99,6 +115,10 @@ func (_m *ORM) FindOrCreateFluxMonitorRoundStats(aggregator common.Address, roun
 func (_m *ORM) MostRecentFluxMonitorRoundID(aggregator common.Address) (uint32, error) {
 	ret := _m.Called(aggregator)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MostRecentFluxMonitorRoundID")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address) (uint32, error)); ok {
@@ -130,6 +150,10 @@ func (_m *ORM) UpdateFluxMonitorRoundStats(aggregator common.Address, roundID ui
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateFluxMonitorRoundStats")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, uint32, int64, uint, ...pg.QOpt) error); ok {
 		r0 = rf(aggregator, roundID, runID, newRoundLogsAddition, qopts...)
diff --git a/core/services/functions/mocks/bridge_accessor.go b/core/services/functions/mocks/bridge_accessor.go
index 65e81ab8b83..fa765287c44 100644
--- a/core/services/functions/mocks/bridge_accessor.go
+++ b/core/services/functions/mocks/bridge_accessor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type BridgeAccessor struct {
 func (_m *BridgeAccessor) NewExternalAdapterClient() (functions.ExternalAdapterClient, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewExternalAdapterClient")
+	}
+
 	var r0 functions.ExternalAdapterClient
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (functions.ExternalAdapterClient, error)); ok {
diff --git a/core/services/functions/mocks/external_adapter_client.go b/core/services/functions/mocks/external_adapter_client.go
index b06f13fdea7..dbf4081c95d 100644
--- a/core/services/functions/mocks/external_adapter_client.go
+++ b/core/services/functions/mocks/external_adapter_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type ExternalAdapterClient struct {
 func (_m *ExternalAdapterClient) FetchEncryptedSecrets(ctx context.Context, encryptedSecretsUrls []byte, requestId string, jobName string) ([]byte, []byte, error) {
 	ret := _m.Called(ctx, encryptedSecretsUrls, requestId, jobName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FetchEncryptedSecrets")
+	}
+
 	var r0 []byte
 	var r1 []byte
 	var r2 error
@@ -53,6 +57,10 @@ func (_m *ExternalAdapterClient) FetchEncryptedSecrets(ctx context.Context, encr
 func (_m *ExternalAdapterClient) RunComputation(ctx context.Context, requestId string, jobName string, subscriptionOwner string, subscriptionId uint64, flags functions.RequestFlags, nodeProvidedSecrets string, requestData *functions.RequestData) ([]byte, []byte, []string, error) {
 	ret := _m.Called(ctx, requestId, jobName, subscriptionOwner, subscriptionId, flags, nodeProvidedSecrets, requestData)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RunComputation")
+	}
+
 	var r0 []byte
 	var r1 []byte
 	var r2 []string
diff --git a/core/services/functions/mocks/functions_listener.go b/core/services/functions/mocks/functions_listener.go
index d2aeb2ddab8..d63248f00cf 100644
--- a/core/services/functions/mocks/functions_listener.go
+++ b/core/services/functions/mocks/functions_listener.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type FunctionsListener struct {
 func (_m *FunctionsListener) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *FunctionsListener) Close() error {
 func (_m *FunctionsListener) HandleOffchainRequest(ctx context.Context, request *functions.OffchainRequest) error {
 	ret := _m.Called(ctx, request)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HandleOffchainRequest")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *functions.OffchainRequest) error); ok {
 		r0 = rf(ctx, request)
@@ -46,6 +54,10 @@ func (_m *FunctionsListener) HandleOffchainRequest(ctx context.Context, request
 func (_m *FunctionsListener) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/functions/mocks/offchain_transmitter.go b/core/services/functions/mocks/offchain_transmitter.go
index d9a7be04dd4..5eee967e685 100644
--- a/core/services/functions/mocks/offchain_transmitter.go
+++ b/core/services/functions/mocks/offchain_transmitter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type OffchainTransmitter struct {
 func (_m *OffchainTransmitter) ReportChannel() chan *functions.OffchainResponse {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReportChannel")
+	}
+
 	var r0 chan *functions.OffchainResponse
 	if rf, ok := ret.Get(0).(func() chan *functions.OffchainResponse); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *OffchainTransmitter) ReportChannel() chan *functions.OffchainResponse
 func (_m *OffchainTransmitter) TransmitReport(ctx context.Context, report *functions.OffchainResponse) error {
 	ret := _m.Called(ctx, report)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransmitReport")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *functions.OffchainResponse) error); ok {
 		r0 = rf(ctx, report)
diff --git a/core/services/functions/mocks/orm.go b/core/services/functions/mocks/orm.go
index 8d11b0b9817..90055fe6286 100644
--- a/core/services/functions/mocks/orm.go
+++ b/core/services/functions/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -27,6 +27,10 @@ func (_m *ORM) CreateRequest(request *functions.Request, qopts ...pg.QOpt) error
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateRequest")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*functions.Request, ...pg.QOpt) error); ok {
 		r0 = rf(request, qopts...)
@@ -48,6 +52,10 @@ func (_m *ORM) FindById(requestID functions.RequestID, qopts ...pg.QOpt) (*funct
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindById")
+	}
+
 	var r0 *functions.Request
 	var r1 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, ...pg.QOpt) (*functions.Request, error)); ok {
@@ -81,6 +89,10 @@ func (_m *ORM) FindOldestEntriesByState(state functions.RequestState, limit uint
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindOldestEntriesByState")
+	}
+
 	var r0 []functions.Request
 	var r1 error
 	if rf, ok := ret.Get(0).(func(functions.RequestState, uint32, ...pg.QOpt) ([]functions.Request, error)); ok {
@@ -114,6 +126,10 @@ func (_m *ORM) PruneOldestRequests(maxRequestsInDB uint32, batchSize uint32, qop
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PruneOldestRequests")
+	}
+
 	var r0 uint32
 	var r1 uint32
 	var r2 error
@@ -152,6 +168,10 @@ func (_m *ORM) SetConfirmed(requestID functions.RequestID, qopts ...pg.QOpt) err
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetConfirmed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, ...pg.QOpt) error); ok {
 		r0 = rf(requestID, qopts...)
@@ -173,6 +193,10 @@ func (_m *ORM) SetError(requestID functions.RequestID, errorType functions.ErrTy
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, functions.ErrType, []byte, time.Time, bool, ...pg.QOpt) error); ok {
 		r0 = rf(requestID, errorType, computationError, readyAt, readyForProcessing, qopts...)
@@ -194,6 +218,10 @@ func (_m *ORM) SetFinalized(requestID functions.RequestID, reportedResult []byte
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetFinalized")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, []byte, []byte, ...pg.QOpt) error); ok {
 		r0 = rf(requestID, reportedResult, reportedError, qopts...)
@@ -215,6 +243,10 @@ func (_m *ORM) SetResult(requestID functions.RequestID, computationResult []byte
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetResult")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, []byte, time.Time, ...pg.QOpt) error); ok {
 		r0 = rf(requestID, computationResult, readyAt, qopts...)
@@ -236,6 +268,10 @@ func (_m *ORM) TimeoutExpiredResults(cutoff time.Time, limit uint32, qopts ...pg
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TimeoutExpiredResults")
+	}
+
 	var r0 []functions.RequestID
 	var r1 error
 	if rf, ok := ret.Get(0).(func(time.Time, uint32, ...pg.QOpt) ([]functions.RequestID, error)); ok {
diff --git a/core/services/gateway/connector/mocks/gateway_connector.go b/core/services/gateway/connector/mocks/gateway_connector.go
index a9fa69e1e3b..ba972425f66 100644
--- a/core/services/gateway/connector/mocks/gateway_connector.go
+++ b/core/services/gateway/connector/mocks/gateway_connector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type GatewayConnector struct {
 func (_m *GatewayConnector) ChallengeResponse(_a0 *url.URL, challenge []byte) ([]byte, error) {
 	ret := _m.Called(_a0, challenge)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChallengeResponse")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*url.URL, []byte) ([]byte, error)); ok {
@@ -47,6 +51,10 @@ func (_m *GatewayConnector) ChallengeResponse(_a0 *url.URL, challenge []byte) ([
 func (_m *GatewayConnector) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -61,6 +69,10 @@ func (_m *GatewayConnector) Close() error {
 func (_m *GatewayConnector) NewAuthHeader(_a0 *url.URL) ([]byte, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewAuthHeader")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*url.URL) ([]byte, error)); ok {
@@ -87,6 +99,10 @@ func (_m *GatewayConnector) NewAuthHeader(_a0 *url.URL) ([]byte, error) {
 func (_m *GatewayConnector) SendToGateway(ctx context.Context, gatewayId string, msg *api.Message) error {
 	ret := _m.Called(ctx, gatewayId, msg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendToGateway")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, *api.Message) error); ok {
 		r0 = rf(ctx, gatewayId, msg)
@@ -101,6 +117,10 @@ func (_m *GatewayConnector) SendToGateway(ctx context.Context, gatewayId string,
 func (_m *GatewayConnector) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/connector/mocks/gateway_connector_handler.go b/core/services/gateway/connector/mocks/gateway_connector_handler.go
index 8eb27708a5a..e83e06b60e3 100644
--- a/core/services/gateway/connector/mocks/gateway_connector_handler.go
+++ b/core/services/gateway/connector/mocks/gateway_connector_handler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type GatewayConnectorHandler struct {
 func (_m *GatewayConnectorHandler) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -38,6 +42,10 @@ func (_m *GatewayConnectorHandler) HandleGatewayMessage(ctx context.Context, gat
 func (_m *GatewayConnectorHandler) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/connector/mocks/signer.go b/core/services/gateway/connector/mocks/signer.go
index 497b25d8df3..18c7186f7fc 100644
--- a/core/services/gateway/connector/mocks/signer.go
+++ b/core/services/gateway/connector/mocks/signer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ func (_m *Signer) Sign(data ...[]byte) ([]byte, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sign")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(...[]byte) ([]byte, error)); ok {
diff --git a/core/services/gateway/handlers/functions/mocks/onchain_allowlist.go b/core/services/gateway/handlers/functions/mocks/onchain_allowlist.go
index 8cbf301f0ea..6668a3c76ff 100644
--- a/core/services/gateway/handlers/functions/mocks/onchain_allowlist.go
+++ b/core/services/gateway/handlers/functions/mocks/onchain_allowlist.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type OnchainAllowlist struct {
 func (_m *OnchainAllowlist) Allow(_a0 common.Address) bool {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Allow")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func(common.Address) bool); ok {
 		r0 = rf(_a0)
@@ -33,6 +37,10 @@ func (_m *OnchainAllowlist) Allow(_a0 common.Address) bool {
 func (_m *OnchainAllowlist) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -47,6 +55,10 @@ func (_m *OnchainAllowlist) Close() error {
 func (_m *OnchainAllowlist) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -61,6 +73,10 @@ func (_m *OnchainAllowlist) Start(_a0 context.Context) error {
 func (_m *OnchainAllowlist) UpdateFromContract(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateFromContract")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
diff --git a/core/services/gateway/handlers/functions/mocks/onchain_subscriptions.go b/core/services/gateway/handlers/functions/mocks/onchain_subscriptions.go
index 64e2960f949..5f2054c4e47 100644
--- a/core/services/gateway/handlers/functions/mocks/onchain_subscriptions.go
+++ b/core/services/gateway/handlers/functions/mocks/onchain_subscriptions.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type OnchainSubscriptions struct {
 func (_m *OnchainSubscriptions) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *OnchainSubscriptions) Close() error {
 func (_m *OnchainSubscriptions) GetMaxUserBalance(_a0 common.Address) (*big.Int, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMaxUserBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address) (*big.Int, error)); ok {
@@ -60,6 +68,10 @@ func (_m *OnchainSubscriptions) GetMaxUserBalance(_a0 common.Address) (*big.Int,
 func (_m *OnchainSubscriptions) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/handlers/mocks/don.go b/core/services/gateway/handlers/mocks/don.go
index 02df7c0334f..6e88708dd7d 100644
--- a/core/services/gateway/handlers/mocks/don.go
+++ b/core/services/gateway/handlers/mocks/don.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type DON struct {
 func (_m *DON) SendToNode(ctx context.Context, nodeAddress string, msg *api.Message) error {
 	ret := _m.Called(ctx, nodeAddress, msg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendToNode")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, *api.Message) error); ok {
 		r0 = rf(ctx, nodeAddress, msg)
diff --git a/core/services/gateway/handlers/mocks/handler.go b/core/services/gateway/handlers/mocks/handler.go
index 10a31c6d76e..7dfe1eae784 100644
--- a/core/services/gateway/handlers/mocks/handler.go
+++ b/core/services/gateway/handlers/mocks/handler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Handler struct {
 func (_m *Handler) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -35,6 +39,10 @@ func (_m *Handler) Close() error {
 func (_m *Handler) HandleNodeMessage(ctx context.Context, msg *api.Message, nodeAddr string) error {
 	ret := _m.Called(ctx, msg, nodeAddr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HandleNodeMessage")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *api.Message, string) error); ok {
 		r0 = rf(ctx, msg, nodeAddr)
@@ -49,6 +57,10 @@ func (_m *Handler) HandleNodeMessage(ctx context.Context, msg *api.Message, node
 func (_m *Handler) HandleUserMessage(ctx context.Context, msg *api.Message, callbackCh chan<- handlers.UserCallbackPayload) error {
 	ret := _m.Called(ctx, msg, callbackCh)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HandleUserMessage")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *api.Message, chan<- handlers.UserCallbackPayload) error); ok {
 		r0 = rf(ctx, msg, callbackCh)
@@ -63,6 +75,10 @@ func (_m *Handler) HandleUserMessage(ctx context.Context, msg *api.Message, call
 func (_m *Handler) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/network/mocks/connection_acceptor.go b/core/services/gateway/network/mocks/connection_acceptor.go
index 738904984af..c45cc7fbe3e 100644
--- a/core/services/gateway/network/mocks/connection_acceptor.go
+++ b/core/services/gateway/network/mocks/connection_acceptor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -22,6 +22,10 @@ func (_m *ConnectionAcceptor) AbortHandshake(attemptId string) {
 func (_m *ConnectionAcceptor) FinalizeHandshake(attemptId string, response []byte, conn *websocket.Conn) error {
 	ret := _m.Called(attemptId, response, conn)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalizeHandshake")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []byte, *websocket.Conn) error); ok {
 		r0 = rf(attemptId, response, conn)
@@ -36,6 +40,10 @@ func (_m *ConnectionAcceptor) FinalizeHandshake(attemptId string, response []byt
 func (_m *ConnectionAcceptor) StartHandshake(authHeader []byte) (string, []byte, error) {
 	ret := _m.Called(authHeader)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StartHandshake")
+	}
+
 	var r0 string
 	var r1 []byte
 	var r2 error
diff --git a/core/services/gateway/network/mocks/connection_initiator.go b/core/services/gateway/network/mocks/connection_initiator.go
index 3ff60e61398..87e4f407328 100644
--- a/core/services/gateway/network/mocks/connection_initiator.go
+++ b/core/services/gateway/network/mocks/connection_initiator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type ConnectionInitiator struct {
 func (_m *ConnectionInitiator) ChallengeResponse(_a0 *url.URL, challenge []byte) ([]byte, error) {
 	ret := _m.Called(_a0, challenge)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChallengeResponse")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*url.URL, []byte) ([]byte, error)); ok {
@@ -43,6 +47,10 @@ func (_m *ConnectionInitiator) ChallengeResponse(_a0 *url.URL, challenge []byte)
 func (_m *ConnectionInitiator) NewAuthHeader(_a0 *url.URL) ([]byte, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewAuthHeader")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*url.URL) ([]byte, error)); ok {
diff --git a/core/services/gateway/network/mocks/http_request_handler.go b/core/services/gateway/network/mocks/http_request_handler.go
index 7716626ac72..7c5ff4025cf 100644
--- a/core/services/gateway/network/mocks/http_request_handler.go
+++ b/core/services/gateway/network/mocks/http_request_handler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type HTTPRequestHandler struct {
 func (_m *HTTPRequestHandler) ProcessRequest(ctx context.Context, rawRequest []byte) ([]byte, int) {
 	ret := _m.Called(ctx, rawRequest)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ProcessRequest")
+	}
+
 	var r0 []byte
 	var r1 int
 	if rf, ok := ret.Get(0).(func(context.Context, []byte) ([]byte, int)); ok {
diff --git a/core/services/gateway/network/mocks/http_server.go b/core/services/gateway/network/mocks/http_server.go
index 197e77f1b8a..81e180e7b8d 100644
--- a/core/services/gateway/network/mocks/http_server.go
+++ b/core/services/gateway/network/mocks/http_server.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type HttpServer struct {
 func (_m *HttpServer) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *HttpServer) Close() error {
 func (_m *HttpServer) GetPort() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPort")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *HttpServer) SetHTTPRequestHandler(handler network.HTTPRequestHandler)
 func (_m *HttpServer) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/network/mocks/web_socket_server.go b/core/services/gateway/network/mocks/web_socket_server.go
index d88cd5ba4f7..4f75f3b7d0f 100644
--- a/core/services/gateway/network/mocks/web_socket_server.go
+++ b/core/services/gateway/network/mocks/web_socket_server.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type WebSocketServer struct {
 func (_m *WebSocketServer) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *WebSocketServer) Close() error {
 func (_m *WebSocketServer) GetPort() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPort")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -45,6 +53,10 @@ func (_m *WebSocketServer) GetPort() int {
 func (_m *WebSocketServer) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/job/mocks/orm.go b/core/services/job/mocks/orm.go
index 9e18573f4e5..66602c60053 100644
--- a/core/services/job/mocks/orm.go
+++ b/core/services/job/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -31,6 +31,10 @@ type ORM struct {
 func (_m *ORM) AssertBridgesExist(p pipeline.Pipeline) error {
 	ret := _m.Called(p)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AssertBridgesExist")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(pipeline.Pipeline) error); ok {
 		r0 = rf(p)
@@ -45,6 +49,10 @@ func (_m *ORM) AssertBridgesExist(p pipeline.Pipeline) error {
 func (_m *ORM) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -59,6 +67,10 @@ func (_m *ORM) Close() error {
 func (_m *ORM) CountPipelineRunsByJobID(jobID int32) (int32, error) {
 	ret := _m.Called(jobID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountPipelineRunsByJobID")
+	}
+
 	var r0 int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int32) (int32, error)); ok {
@@ -90,6 +102,10 @@ func (_m *ORM) CreateJob(jb *job.Job, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*job.Job, ...pg.QOpt) error); ok {
 		r0 = rf(jb, qopts...)
@@ -111,6 +127,10 @@ func (_m *ORM) DeleteJob(id int32, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -125,6 +145,10 @@ func (_m *ORM) DeleteJob(id int32, qopts ...pg.QOpt) error {
 func (_m *ORM) DismissError(ctx context.Context, errorID int64) error {
 	ret := _m.Called(ctx, errorID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DismissError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, errorID)
@@ -139,6 +163,10 @@ func (_m *ORM) DismissError(ctx context.Context, errorID int64) error {
 func (_m *ORM) FindJob(ctx context.Context, id int32) (job.Job, error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJob")
+	}
+
 	var r0 job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int32) (job.Job, error)); ok {
@@ -170,6 +198,10 @@ func (_m *ORM) FindJobByExternalJobID(_a0 uuid.UUID, qopts ...pg.QOpt) (job.Job,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobByExternalJobID")
+	}
+
 	var r0 job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(uuid.UUID, ...pg.QOpt) (job.Job, error)); ok {
@@ -201,6 +233,10 @@ func (_m *ORM) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *utils
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobIDByAddress")
+	}
+
 	var r0 int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ethkey.EIP55Address, *utils.Big, ...pg.QOpt) (int32, error)); ok {
@@ -225,6 +261,10 @@ func (_m *ORM) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *utils
 func (_m *ORM) FindJobIDsWithBridge(name string) ([]int32, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobIDsWithBridge")
+	}
+
 	var r0 []int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]int32, error)); ok {
@@ -251,6 +291,10 @@ func (_m *ORM) FindJobIDsWithBridge(name string) ([]int32, error) {
 func (_m *ORM) FindJobTx(ctx context.Context, id int32) (job.Job, error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobTx")
+	}
+
 	var r0 job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int32) (job.Job, error)); ok {
@@ -275,6 +319,10 @@ func (_m *ORM) FindJobTx(ctx context.Context, id int32) (job.Job, error) {
 func (_m *ORM) FindJobWithoutSpecErrors(id int32) (job.Job, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobWithoutSpecErrors")
+	}
+
 	var r0 job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int32) (job.Job, error)); ok {
@@ -299,6 +347,10 @@ func (_m *ORM) FindJobWithoutSpecErrors(id int32) (job.Job, error) {
 func (_m *ORM) FindJobs(offset int, limit int) ([]job.Job, int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobs")
+	}
+
 	var r0 []job.Job
 	var r1 int
 	var r2 error
@@ -332,6 +384,10 @@ func (_m *ORM) FindJobs(offset int, limit int) ([]job.Job, int, error) {
 func (_m *ORM) FindJobsByPipelineSpecIDs(ids []int32) ([]job.Job, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobsByPipelineSpecIDs")
+	}
+
 	var r0 []job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int32) ([]job.Job, error)); ok {
@@ -365,6 +421,10 @@ func (_m *ORM) FindOCR2JobIDByAddress(contractID string, feedID *common.Hash, qo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindOCR2JobIDByAddress")
+	}
+
 	var r0 int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *common.Hash, ...pg.QOpt) (int32, error)); ok {
@@ -389,6 +449,10 @@ func (_m *ORM) FindOCR2JobIDByAddress(contractID string, feedID *common.Hash, qo
 func (_m *ORM) FindPipelineRunByID(id int64) (pipeline.Run, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindPipelineRunByID")
+	}
+
 	var r0 pipeline.Run
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (pipeline.Run, error)); ok {
@@ -413,6 +477,10 @@ func (_m *ORM) FindPipelineRunByID(id int64) (pipeline.Run, error) {
 func (_m *ORM) FindPipelineRunIDsByJobID(jobID int32, offset int, limit int) ([]int64, error) {
 	ret := _m.Called(jobID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindPipelineRunIDsByJobID")
+	}
+
 	var r0 []int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int32, int, int) ([]int64, error)); ok {
@@ -439,6 +507,10 @@ func (_m *ORM) FindPipelineRunIDsByJobID(jobID int32, offset int, limit int) ([]
 func (_m *ORM) FindPipelineRunsByIDs(ids []int64) ([]pipeline.Run, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindPipelineRunsByIDs")
+	}
+
 	var r0 []pipeline.Run
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]pipeline.Run, error)); ok {
@@ -472,6 +544,10 @@ func (_m *ORM) FindSpecError(id int64, qopts ...pg.QOpt) (job.SpecError, error)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindSpecError")
+	}
+
 	var r0 job.SpecError
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (job.SpecError, error)); ok {
@@ -503,6 +579,10 @@ func (_m *ORM) FindSpecErrorsByJobIDs(ids []int32, qopts ...pg.QOpt) ([]job.Spec
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindSpecErrorsByJobIDs")
+	}
+
 	var r0 []job.SpecError
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int32, ...pg.QOpt) ([]job.SpecError, error)); ok {
@@ -536,6 +616,10 @@ func (_m *ORM) FindTaskResultByRunIDAndTaskName(runID int64, taskName string, qo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTaskResultByRunIDAndTaskName")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, string, ...pg.QOpt) ([]byte, error)); ok {
@@ -569,6 +653,10 @@ func (_m *ORM) InsertJob(_a0 *job.Job, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*job.Job, ...pg.QOpt) error); ok {
 		r0 = rf(_a0, qopts...)
@@ -590,6 +678,10 @@ func (_m *ORM) InsertWebhookSpec(webhookSpec *job.WebhookSpec, qopts ...pg.QOpt)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertWebhookSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*job.WebhookSpec, ...pg.QOpt) error); ok {
 		r0 = rf(webhookSpec, qopts...)
@@ -604,6 +696,10 @@ func (_m *ORM) InsertWebhookSpec(webhookSpec *job.WebhookSpec, qopts ...pg.QOpt)
 func (_m *ORM) PipelineRuns(jobID *int32, offset int, size int) ([]pipeline.Run, int, error) {
 	ret := _m.Called(jobID, offset, size)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PipelineRuns")
+	}
+
 	var r0 []pipeline.Run
 	var r1 int
 	var r2 error
@@ -644,6 +740,10 @@ func (_m *ORM) RecordError(jobID int32, description string, qopts ...pg.QOpt) er
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RecordError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32, string, ...pg.QOpt) error); ok {
 		r0 = rf(jobID, description, qopts...)
diff --git a/core/services/job/mocks/service_ctx.go b/core/services/job/mocks/service_ctx.go
index 93ef76619d9..43c28632963 100644
--- a/core/services/job/mocks/service_ctx.go
+++ b/core/services/job/mocks/service_ctx.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type ServiceCtx struct {
 func (_m *ServiceCtx) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *ServiceCtx) Close() error {
 func (_m *ServiceCtx) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/job/mocks/spawner.go b/core/services/job/mocks/spawner.go
index 6866f1fc156..60d36b18fa5 100644
--- a/core/services/job/mocks/spawner.go
+++ b/core/services/job/mocks/spawner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type Spawner struct {
 func (_m *Spawner) ActiveJobs() map[int32]job.Job {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ActiveJobs")
+	}
+
 	var r0 map[int32]job.Job
 	if rf, ok := ret.Get(0).(func() map[int32]job.Job); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *Spawner) ActiveJobs() map[int32]job.Job {
 func (_m *Spawner) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -57,6 +65,10 @@ func (_m *Spawner) CreateJob(jb *job.Job, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*job.Job, ...pg.QOpt) error); ok {
 		r0 = rf(jb, qopts...)
@@ -78,6 +90,10 @@ func (_m *Spawner) DeleteJob(jobID int32, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32, ...pg.QOpt) error); ok {
 		r0 = rf(jobID, qopts...)
@@ -92,6 +108,10 @@ func (_m *Spawner) DeleteJob(jobID int32, qopts ...pg.QOpt) error {
 func (_m *Spawner) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -108,6 +128,10 @@ func (_m *Spawner) HealthReport() map[string]error {
 func (_m *Spawner) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -122,6 +146,10 @@ func (_m *Spawner) Name() string {
 func (_m *Spawner) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -136,6 +164,10 @@ func (_m *Spawner) Ready() error {
 func (_m *Spawner) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -157,6 +189,10 @@ func (_m *Spawner) StartService(ctx context.Context, spec job.Job, qopts ...pg.Q
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StartService")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, job.Job, ...pg.QOpt) error); ok {
 		r0 = rf(ctx, spec, qopts...)
diff --git a/core/services/keystore/mocks/cosmos.go b/core/services/keystore/mocks/cosmos.go
index b8d5d56c373..40ba12d15d7 100644
--- a/core/services/keystore/mocks/cosmos.go
+++ b/core/services/keystore/mocks/cosmos.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type Cosmos struct {
 func (_m *Cosmos) Add(key cosmoskey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(cosmoskey.Key) error); ok {
 		r0 = rf(key)
@@ -31,6 +35,10 @@ func (_m *Cosmos) Add(key cosmoskey.Key) error {
 func (_m *Cosmos) Create() (cosmoskey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (cosmoskey.Key, error)); ok {
@@ -55,6 +63,10 @@ func (_m *Cosmos) Create() (cosmoskey.Key, error) {
 func (_m *Cosmos) Delete(id string) (cosmoskey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (cosmoskey.Key, error)); ok {
@@ -79,6 +91,10 @@ func (_m *Cosmos) Delete(id string) (cosmoskey.Key, error) {
 func (_m *Cosmos) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -93,6 +109,10 @@ func (_m *Cosmos) EnsureKey() error {
 func (_m *Cosmos) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *Cosmos) Export(id string, password string) ([]byte, error) {
 func (_m *Cosmos) Get(id string) (cosmoskey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (cosmoskey.Key, error)); ok {
@@ -143,6 +167,10 @@ func (_m *Cosmos) Get(id string) (cosmoskey.Key, error) {
 func (_m *Cosmos) GetAll() ([]cosmoskey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]cosmoskey.Key, error)); ok {
@@ -169,6 +197,10 @@ func (_m *Cosmos) GetAll() ([]cosmoskey.Key, error) {
 func (_m *Cosmos) Import(keyJSON []byte, password string) (cosmoskey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (cosmoskey.Key, error)); ok {
diff --git a/core/services/keystore/mocks/csa.go b/core/services/keystore/mocks/csa.go
index 4f4e02a2fe6..ad5b25a27bd 100644
--- a/core/services/keystore/mocks/csa.go
+++ b/core/services/keystore/mocks/csa.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type CSA struct {
 func (_m *CSA) Add(key csakey.KeyV2) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(csakey.KeyV2) error); ok {
 		r0 = rf(key)
@@ -31,6 +35,10 @@ func (_m *CSA) Add(key csakey.KeyV2) error {
 func (_m *CSA) Create() (csakey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (csakey.KeyV2, error)); ok {
@@ -55,6 +63,10 @@ func (_m *CSA) Create() (csakey.KeyV2, error) {
 func (_m *CSA) Delete(id string) (csakey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (csakey.KeyV2, error)); ok {
@@ -79,6 +91,10 @@ func (_m *CSA) Delete(id string) (csakey.KeyV2, error) {
 func (_m *CSA) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -93,6 +109,10 @@ func (_m *CSA) EnsureKey() error {
 func (_m *CSA) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *CSA) Export(id string, password string) ([]byte, error) {
 func (_m *CSA) Get(id string) (csakey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (csakey.KeyV2, error)); ok {
@@ -143,6 +167,10 @@ func (_m *CSA) Get(id string) (csakey.KeyV2, error) {
 func (_m *CSA) GetAll() ([]csakey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]csakey.KeyV2, error)); ok {
@@ -169,6 +197,10 @@ func (_m *CSA) GetAll() ([]csakey.KeyV2, error) {
 func (_m *CSA) Import(keyJSON []byte, password string) (csakey.KeyV2, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (csakey.KeyV2, error)); ok {
diff --git a/core/services/keystore/mocks/dkg_encrypt.go b/core/services/keystore/mocks/dkg_encrypt.go
index e1f83888c48..e7e52bada25 100644
--- a/core/services/keystore/mocks/dkg_encrypt.go
+++ b/core/services/keystore/mocks/dkg_encrypt.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type DKGEncrypt struct {
 func (_m *DKGEncrypt) Add(key dkgencryptkey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(dkgencryptkey.Key) error); ok {
 		r0 = rf(key)
@@ -31,6 +35,10 @@ func (_m *DKGEncrypt) Add(key dkgencryptkey.Key) error {
 func (_m *DKGEncrypt) Create() (dkgencryptkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (dkgencryptkey.Key, error)); ok {
@@ -55,6 +63,10 @@ func (_m *DKGEncrypt) Create() (dkgencryptkey.Key, error) {
 func (_m *DKGEncrypt) Delete(id string) (dkgencryptkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (dkgencryptkey.Key, error)); ok {
@@ -79,6 +91,10 @@ func (_m *DKGEncrypt) Delete(id string) (dkgencryptkey.Key, error) {
 func (_m *DKGEncrypt) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -93,6 +109,10 @@ func (_m *DKGEncrypt) EnsureKey() error {
 func (_m *DKGEncrypt) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *DKGEncrypt) Export(id string, password string) ([]byte, error) {
 func (_m *DKGEncrypt) Get(id string) (dkgencryptkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (dkgencryptkey.Key, error)); ok {
@@ -143,6 +167,10 @@ func (_m *DKGEncrypt) Get(id string) (dkgencryptkey.Key, error) {
 func (_m *DKGEncrypt) GetAll() ([]dkgencryptkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]dkgencryptkey.Key, error)); ok {
@@ -169,6 +197,10 @@ func (_m *DKGEncrypt) GetAll() ([]dkgencryptkey.Key, error) {
 func (_m *DKGEncrypt) Import(keyJSON []byte, password string) (dkgencryptkey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (dkgencryptkey.Key, error)); ok {
diff --git a/core/services/keystore/mocks/dkg_sign.go b/core/services/keystore/mocks/dkg_sign.go
index ed1aa756a6d..e5c6434d90d 100644
--- a/core/services/keystore/mocks/dkg_sign.go
+++ b/core/services/keystore/mocks/dkg_sign.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type DKGSign struct {
 func (_m *DKGSign) Add(key dkgsignkey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(dkgsignkey.Key) error); ok {
 		r0 = rf(key)
@@ -31,6 +35,10 @@ func (_m *DKGSign) Add(key dkgsignkey.Key) error {
 func (_m *DKGSign) Create() (dkgsignkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (dkgsignkey.Key, error)); ok {
@@ -55,6 +63,10 @@ func (_m *DKGSign) Create() (dkgsignkey.Key, error) {
 func (_m *DKGSign) Delete(id string) (dkgsignkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (dkgsignkey.Key, error)); ok {
@@ -79,6 +91,10 @@ func (_m *DKGSign) Delete(id string) (dkgsignkey.Key, error) {
 func (_m *DKGSign) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -93,6 +109,10 @@ func (_m *DKGSign) EnsureKey() error {
 func (_m *DKGSign) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *DKGSign) Export(id string, password string) ([]byte, error) {
 func (_m *DKGSign) Get(id string) (dkgsignkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (dkgsignkey.Key, error)); ok {
@@ -143,6 +167,10 @@ func (_m *DKGSign) Get(id string) (dkgsignkey.Key, error) {
 func (_m *DKGSign) GetAll() ([]dkgsignkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]dkgsignkey.Key, error)); ok {
@@ -169,6 +197,10 @@ func (_m *DKGSign) GetAll() ([]dkgsignkey.Key, error) {
 func (_m *DKGSign) Import(keyJSON []byte, password string) (dkgsignkey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (dkgsignkey.Key, error)); ok {
diff --git a/core/services/keystore/mocks/eth.go b/core/services/keystore/mocks/eth.go
index 6a076e130d1..b3827398fd5 100644
--- a/core/services/keystore/mocks/eth.go
+++ b/core/services/keystore/mocks/eth.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -31,6 +31,10 @@ func (_m *Eth) Add(address common.Address, chainID *big.Int, qopts ...pg.QOpt) e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, *big.Int, ...pg.QOpt) error); ok {
 		r0 = rf(address, chainID, qopts...)
@@ -45,6 +49,10 @@ func (_m *Eth) Add(address common.Address, chainID *big.Int, qopts ...pg.QOpt) e
 func (_m *Eth) CheckEnabled(address common.Address, chainID *big.Int) error {
 	ret := _m.Called(address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckEnabled")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, *big.Int) error); ok {
 		r0 = rf(address, chainID)
@@ -65,6 +73,10 @@ func (_m *Eth) Create(chainIDs ...*big.Int) (ethkey.KeyV2, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(...*big.Int) (ethkey.KeyV2, error)); ok {
@@ -89,6 +101,10 @@ func (_m *Eth) Create(chainIDs ...*big.Int) (ethkey.KeyV2, error) {
 func (_m *Eth) Delete(id string) (ethkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ethkey.KeyV2, error)); ok {
@@ -120,6 +136,10 @@ func (_m *Eth) Disable(address common.Address, chainID *big.Int, qopts ...pg.QOp
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Disable")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, *big.Int, ...pg.QOpt) error); ok {
 		r0 = rf(address, chainID, qopts...)
@@ -141,6 +161,10 @@ func (_m *Eth) Enable(address common.Address, chainID *big.Int, qopts ...pg.QOpt
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Enable")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, *big.Int, ...pg.QOpt) error); ok {
 		r0 = rf(address, chainID, qopts...)
@@ -155,6 +179,10 @@ func (_m *Eth) Enable(address common.Address, chainID *big.Int, qopts ...pg.QOpt
 func (_m *Eth) EnabledAddressesForChain(chainID *big.Int) ([]common.Address, error) {
 	ret := _m.Called(chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnabledAddressesForChain")
+	}
+
 	var r0 []common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int) ([]common.Address, error)); ok {
@@ -181,6 +209,10 @@ func (_m *Eth) EnabledAddressesForChain(chainID *big.Int) ([]common.Address, err
 func (_m *Eth) EnabledKeysForChain(chainID *big.Int) ([]ethkey.KeyV2, error) {
 	ret := _m.Called(chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnabledKeysForChain")
+	}
+
 	var r0 []ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int) ([]ethkey.KeyV2, error)); ok {
@@ -213,6 +245,10 @@ func (_m *Eth) EnsureKeys(chainIDs ...*big.Int) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKeys")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(...*big.Int) error); ok {
 		r0 = rf(chainIDs...)
@@ -227,6 +263,10 @@ func (_m *Eth) EnsureKeys(chainIDs ...*big.Int) error {
 func (_m *Eth) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -253,6 +293,10 @@ func (_m *Eth) Export(id string, password string) ([]byte, error) {
 func (_m *Eth) Get(id string) (ethkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ethkey.KeyV2, error)); ok {
@@ -277,6 +321,10 @@ func (_m *Eth) Get(id string) (ethkey.KeyV2, error) {
 func (_m *Eth) GetAll() ([]ethkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]ethkey.KeyV2, error)); ok {
@@ -310,6 +358,10 @@ func (_m *Eth) GetRoundRobinAddress(chainID *big.Int, addresses ...common.Addres
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRoundRobinAddress")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int, ...common.Address) (common.Address, error)); ok {
@@ -336,6 +388,10 @@ func (_m *Eth) GetRoundRobinAddress(chainID *big.Int, addresses ...common.Addres
 func (_m *Eth) GetState(id string, chainID *big.Int) (ethkey.State, error) {
 	ret := _m.Called(id, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetState")
+	}
+
 	var r0 ethkey.State
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *big.Int) (ethkey.State, error)); ok {
@@ -360,6 +416,10 @@ func (_m *Eth) GetState(id string, chainID *big.Int) (ethkey.State, error) {
 func (_m *Eth) GetStateForKey(_a0 ethkey.KeyV2) (ethkey.State, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetStateForKey")
+	}
+
 	var r0 ethkey.State
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ethkey.KeyV2) (ethkey.State, error)); ok {
@@ -384,6 +444,10 @@ func (_m *Eth) GetStateForKey(_a0 ethkey.KeyV2) (ethkey.State, error) {
 func (_m *Eth) GetStatesForChain(chainID *big.Int) ([]ethkey.State, error) {
 	ret := _m.Called(chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetStatesForChain")
+	}
+
 	var r0 []ethkey.State
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int) ([]ethkey.State, error)); ok {
@@ -410,6 +474,10 @@ func (_m *Eth) GetStatesForChain(chainID *big.Int) ([]ethkey.State, error) {
 func (_m *Eth) GetStatesForKeys(_a0 []ethkey.KeyV2) ([]ethkey.State, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetStatesForKeys")
+	}
+
 	var r0 []ethkey.State
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]ethkey.KeyV2) ([]ethkey.State, error)); ok {
@@ -443,6 +511,10 @@ func (_m *Eth) Import(keyJSON []byte, password string, chainIDs ...*big.Int) (et
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string, ...*big.Int) (ethkey.KeyV2, error)); ok {
@@ -467,6 +539,10 @@ func (_m *Eth) Import(keyJSON []byte, password string, chainIDs ...*big.Int) (et
 func (_m *Eth) SignTx(fromAddress common.Address, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(fromAddress, tx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SignTx")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address, *types.Transaction, *big.Int) (*types.Transaction, error)); ok {
@@ -493,6 +569,10 @@ func (_m *Eth) SignTx(fromAddress common.Address, tx *types.Transaction, chainID
 func (_m *Eth) SubscribeToKeyChanges() (chan struct{}, func()) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeToKeyChanges")
+	}
+
 	var r0 chan struct{}
 	var r1 func()
 	if rf, ok := ret.Get(0).(func() (chan struct{}, func())); ok {
diff --git a/core/services/keystore/mocks/master.go b/core/services/keystore/mocks/master.go
index d29d2fa4692..3025f5b103a 100644
--- a/core/services/keystore/mocks/master.go
+++ b/core/services/keystore/mocks/master.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type Master struct {
 func (_m *Master) CSA() keystore.CSA {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CSA")
+	}
+
 	var r0 keystore.CSA
 	if rf, ok := ret.Get(0).(func() keystore.CSA); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *Master) CSA() keystore.CSA {
 func (_m *Master) Cosmos() keystore.Cosmos {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Cosmos")
+	}
+
 	var r0 keystore.Cosmos
 	if rf, ok := ret.Get(0).(func() keystore.Cosmos); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *Master) Cosmos() keystore.Cosmos {
 func (_m *Master) DKGEncrypt() keystore.DKGEncrypt {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DKGEncrypt")
+	}
+
 	var r0 keystore.DKGEncrypt
 	if rf, ok := ret.Get(0).(func() keystore.DKGEncrypt); ok {
 		r0 = rf()
@@ -64,6 +76,10 @@ func (_m *Master) DKGEncrypt() keystore.DKGEncrypt {
 func (_m *Master) DKGSign() keystore.DKGSign {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DKGSign")
+	}
+
 	var r0 keystore.DKGSign
 	if rf, ok := ret.Get(0).(func() keystore.DKGSign); ok {
 		r0 = rf()
@@ -80,6 +96,10 @@ func (_m *Master) DKGSign() keystore.DKGSign {
 func (_m *Master) Eth() keystore.Eth {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Eth")
+	}
+
 	var r0 keystore.Eth
 	if rf, ok := ret.Get(0).(func() keystore.Eth); ok {
 		r0 = rf()
@@ -96,6 +116,10 @@ func (_m *Master) Eth() keystore.Eth {
 func (_m *Master) IsEmpty() (bool, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsEmpty")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (bool, error)); ok {
@@ -120,6 +144,10 @@ func (_m *Master) IsEmpty() (bool, error) {
 func (_m *Master) OCR() keystore.OCR {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR")
+	}
+
 	var r0 keystore.OCR
 	if rf, ok := ret.Get(0).(func() keystore.OCR); ok {
 		r0 = rf()
@@ -136,6 +164,10 @@ func (_m *Master) OCR() keystore.OCR {
 func (_m *Master) OCR2() keystore.OCR2 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR2")
+	}
+
 	var r0 keystore.OCR2
 	if rf, ok := ret.Get(0).(func() keystore.OCR2); ok {
 		r0 = rf()
@@ -152,6 +184,10 @@ func (_m *Master) OCR2() keystore.OCR2 {
 func (_m *Master) P2P() keystore.P2P {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for P2P")
+	}
+
 	var r0 keystore.P2P
 	if rf, ok := ret.Get(0).(func() keystore.P2P); ok {
 		r0 = rf()
@@ -168,6 +204,10 @@ func (_m *Master) P2P() keystore.P2P {
 func (_m *Master) Solana() keystore.Solana {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Solana")
+	}
+
 	var r0 keystore.Solana
 	if rf, ok := ret.Get(0).(func() keystore.Solana); ok {
 		r0 = rf()
@@ -184,6 +224,10 @@ func (_m *Master) Solana() keystore.Solana {
 func (_m *Master) StarkNet() keystore.StarkNet {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StarkNet")
+	}
+
 	var r0 keystore.StarkNet
 	if rf, ok := ret.Get(0).(func() keystore.StarkNet); ok {
 		r0 = rf()
@@ -200,6 +244,10 @@ func (_m *Master) StarkNet() keystore.StarkNet {
 func (_m *Master) Unlock(password string) error {
 	ret := _m.Called(password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Unlock")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(password)
@@ -214,6 +262,10 @@ func (_m *Master) Unlock(password string) error {
 func (_m *Master) VRF() keystore.VRF {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for VRF")
+	}
+
 	var r0 keystore.VRF
 	if rf, ok := ret.Get(0).(func() keystore.VRF); ok {
 		r0 = rf()
diff --git a/core/services/keystore/mocks/ocr.go b/core/services/keystore/mocks/ocr.go
index 505eaa0e46e..e1c4d588330 100644
--- a/core/services/keystore/mocks/ocr.go
+++ b/core/services/keystore/mocks/ocr.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type OCR struct {
 func (_m *OCR) Add(key ocrkey.KeyV2) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(ocrkey.KeyV2) error); ok {
 		r0 = rf(key)
@@ -30,6 +34,10 @@ func (_m *OCR) Add(key ocrkey.KeyV2) error {
 func (_m *OCR) Create() (ocrkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (ocrkey.KeyV2, error)); ok {
@@ -54,6 +62,10 @@ func (_m *OCR) Create() (ocrkey.KeyV2, error) {
 func (_m *OCR) Delete(id string) (ocrkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ocrkey.KeyV2, error)); ok {
@@ -78,6 +90,10 @@ func (_m *OCR) Delete(id string) (ocrkey.KeyV2, error) {
 func (_m *OCR) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *OCR) EnsureKey() error {
 func (_m *OCR) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -118,6 +138,10 @@ func (_m *OCR) Export(id string, password string) ([]byte, error) {
 func (_m *OCR) Get(id string) (ocrkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ocrkey.KeyV2, error)); ok {
@@ -142,6 +166,10 @@ func (_m *OCR) Get(id string) (ocrkey.KeyV2, error) {
 func (_m *OCR) GetAll() ([]ocrkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]ocrkey.KeyV2, error)); ok {
@@ -168,6 +196,10 @@ func (_m *OCR) GetAll() ([]ocrkey.KeyV2, error) {
 func (_m *OCR) Import(keyJSON []byte, password string) (ocrkey.KeyV2, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (ocrkey.KeyV2, error)); ok {
diff --git a/core/services/keystore/mocks/ocr2.go b/core/services/keystore/mocks/ocr2.go
index 30d870dcdc7..d44e739deed 100644
--- a/core/services/keystore/mocks/ocr2.go
+++ b/core/services/keystore/mocks/ocr2.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type OCR2 struct {
 func (_m *OCR2) Add(key ocr2key.KeyBundle) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(ocr2key.KeyBundle) error); ok {
 		r0 = rf(key)
@@ -33,6 +37,10 @@ func (_m *OCR2) Add(key ocr2key.KeyBundle) error {
 func (_m *OCR2) Create(_a0 chaintype.ChainType) (ocr2key.KeyBundle, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func(chaintype.ChainType) (ocr2key.KeyBundle, error)); ok {
@@ -59,6 +67,10 @@ func (_m *OCR2) Create(_a0 chaintype.ChainType) (ocr2key.KeyBundle, error) {
 func (_m *OCR2) Delete(id string) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(id)
@@ -79,6 +91,10 @@ func (_m *OCR2) EnsureKeys(enabledChains ...chaintype.ChainType) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKeys")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(...chaintype.ChainType) error); ok {
 		r0 = rf(enabledChains...)
@@ -93,6 +109,10 @@ func (_m *OCR2) EnsureKeys(enabledChains ...chaintype.ChainType) error {
 func (_m *OCR2) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *OCR2) Export(id string, password string) ([]byte, error) {
 func (_m *OCR2) Get(id string) (ocr2key.KeyBundle, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ocr2key.KeyBundle, error)); ok {
@@ -145,6 +169,10 @@ func (_m *OCR2) Get(id string) (ocr2key.KeyBundle, error) {
 func (_m *OCR2) GetAll() ([]ocr2key.KeyBundle, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]ocr2key.KeyBundle, error)); ok {
@@ -171,6 +199,10 @@ func (_m *OCR2) GetAll() ([]ocr2key.KeyBundle, error) {
 func (_m *OCR2) GetAllOfType(_a0 chaintype.ChainType) ([]ocr2key.KeyBundle, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllOfType")
+	}
+
 	var r0 []ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func(chaintype.ChainType) ([]ocr2key.KeyBundle, error)); ok {
@@ -197,6 +229,10 @@ func (_m *OCR2) GetAllOfType(_a0 chaintype.ChainType) ([]ocr2key.KeyBundle, erro
 func (_m *OCR2) Import(keyJSON []byte, password string) (ocr2key.KeyBundle, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (ocr2key.KeyBundle, error)); ok {
diff --git a/core/services/keystore/mocks/p2p.go b/core/services/keystore/mocks/p2p.go
index c91be5a4a92..fa2a1b6ceeb 100644
--- a/core/services/keystore/mocks/p2p.go
+++ b/core/services/keystore/mocks/p2p.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type P2P struct {
 func (_m *P2P) Add(key p2pkey.KeyV2) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(p2pkey.KeyV2) error); ok {
 		r0 = rf(key)
@@ -30,6 +34,10 @@ func (_m *P2P) Add(key p2pkey.KeyV2) error {
 func (_m *P2P) Create() (p2pkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (p2pkey.KeyV2, error)); ok {
@@ -54,6 +62,10 @@ func (_m *P2P) Create() (p2pkey.KeyV2, error) {
 func (_m *P2P) Delete(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(p2pkey.PeerID) (p2pkey.KeyV2, error)); ok {
@@ -78,6 +90,10 @@ func (_m *P2P) Delete(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 func (_m *P2P) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *P2P) EnsureKey() error {
 func (_m *P2P) Export(id p2pkey.PeerID, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(p2pkey.PeerID, string) ([]byte, error)); ok {
@@ -118,6 +138,10 @@ func (_m *P2P) Export(id p2pkey.PeerID, password string) ([]byte, error) {
 func (_m *P2P) Get(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(p2pkey.PeerID) (p2pkey.KeyV2, error)); ok {
@@ -142,6 +166,10 @@ func (_m *P2P) Get(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 func (_m *P2P) GetAll() ([]p2pkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]p2pkey.KeyV2, error)); ok {
@@ -168,6 +196,10 @@ func (_m *P2P) GetAll() ([]p2pkey.KeyV2, error) {
 func (_m *P2P) GetOrFirst(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOrFirst")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(p2pkey.PeerID) (p2pkey.KeyV2, error)); ok {
@@ -192,6 +224,10 @@ func (_m *P2P) GetOrFirst(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 func (_m *P2P) Import(keyJSON []byte, password string) (p2pkey.KeyV2, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (p2pkey.KeyV2, error)); ok {
diff --git a/core/services/keystore/mocks/solana.go b/core/services/keystore/mocks/solana.go
index 66357e32b93..c2cc4139bab 100644
--- a/core/services/keystore/mocks/solana.go
+++ b/core/services/keystore/mocks/solana.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type Solana struct {
 func (_m *Solana) Add(key solkey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(solkey.Key) error); ok {
 		r0 = rf(key)
@@ -33,6 +37,10 @@ func (_m *Solana) Add(key solkey.Key) error {
 func (_m *Solana) Create() (solkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (solkey.Key, error)); ok {
@@ -57,6 +65,10 @@ func (_m *Solana) Create() (solkey.Key, error) {
 func (_m *Solana) Delete(id string) (solkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (solkey.Key, error)); ok {
@@ -81,6 +93,10 @@ func (_m *Solana) Delete(id string) (solkey.Key, error) {
 func (_m *Solana) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -95,6 +111,10 @@ func (_m *Solana) EnsureKey() error {
 func (_m *Solana) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -121,6 +141,10 @@ func (_m *Solana) Export(id string, password string) ([]byte, error) {
 func (_m *Solana) Get(id string) (solkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (solkey.Key, error)); ok {
@@ -145,6 +169,10 @@ func (_m *Solana) Get(id string) (solkey.Key, error) {
 func (_m *Solana) GetAll() ([]solkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]solkey.Key, error)); ok {
@@ -171,6 +199,10 @@ func (_m *Solana) GetAll() ([]solkey.Key, error) {
 func (_m *Solana) Import(keyJSON []byte, password string) (solkey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (solkey.Key, error)); ok {
@@ -195,6 +227,10 @@ func (_m *Solana) Import(keyJSON []byte, password string) (solkey.Key, error) {
 func (_m *Solana) Sign(ctx context.Context, id string, msg []byte) ([]byte, error) {
 	ret := _m.Called(ctx, id, msg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sign")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, []byte) ([]byte, error)); ok {
diff --git a/core/services/keystore/mocks/starknet.go b/core/services/keystore/mocks/starknet.go
index ff9b52d7136..c3d74a8389f 100644
--- a/core/services/keystore/mocks/starknet.go
+++ b/core/services/keystore/mocks/starknet.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type StarkNet struct {
 func (_m *StarkNet) Add(key starkkey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(starkkey.Key) error); ok {
 		r0 = rf(key)
@@ -30,6 +34,10 @@ func (_m *StarkNet) Add(key starkkey.Key) error {
 func (_m *StarkNet) Create() (starkkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (starkkey.Key, error)); ok {
@@ -54,6 +62,10 @@ func (_m *StarkNet) Create() (starkkey.Key, error) {
 func (_m *StarkNet) Delete(id string) (starkkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (starkkey.Key, error)); ok {
@@ -78,6 +90,10 @@ func (_m *StarkNet) Delete(id string) (starkkey.Key, error) {
 func (_m *StarkNet) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *StarkNet) EnsureKey() error {
 func (_m *StarkNet) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -118,6 +138,10 @@ func (_m *StarkNet) Export(id string, password string) ([]byte, error) {
 func (_m *StarkNet) Get(id string) (starkkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (starkkey.Key, error)); ok {
@@ -142,6 +166,10 @@ func (_m *StarkNet) Get(id string) (starkkey.Key, error) {
 func (_m *StarkNet) GetAll() ([]starkkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]starkkey.Key, error)); ok {
@@ -168,6 +196,10 @@ func (_m *StarkNet) GetAll() ([]starkkey.Key, error) {
 func (_m *StarkNet) Import(keyJSON []byte, password string) (starkkey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (starkkey.Key, error)); ok {
diff --git a/core/services/keystore/mocks/vrf.go b/core/services/keystore/mocks/vrf.go
index 5aa15dca59e..ab730ebec67 100644
--- a/core/services/keystore/mocks/vrf.go
+++ b/core/services/keystore/mocks/vrf.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type VRF struct {
 func (_m *VRF) Add(key vrfkey.KeyV2) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(vrfkey.KeyV2) error); ok {
 		r0 = rf(key)
@@ -33,6 +37,10 @@ func (_m *VRF) Add(key vrfkey.KeyV2) error {
 func (_m *VRF) Create() (vrfkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (vrfkey.KeyV2, error)); ok {
@@ -57,6 +65,10 @@ func (_m *VRF) Create() (vrfkey.KeyV2, error) {
 func (_m *VRF) Delete(id string) (vrfkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (vrfkey.KeyV2, error)); ok {
@@ -81,6 +93,10 @@ func (_m *VRF) Delete(id string) (vrfkey.KeyV2, error) {
 func (_m *VRF) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -107,6 +123,10 @@ func (_m *VRF) Export(id string, password string) ([]byte, error) {
 func (_m *VRF) GenerateProof(id string, seed *big.Int) (vrfkey.Proof, error) {
 	ret := _m.Called(id, seed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GenerateProof")
+	}
+
 	var r0 vrfkey.Proof
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *big.Int) (vrfkey.Proof, error)); ok {
@@ -131,6 +151,10 @@ func (_m *VRF) GenerateProof(id string, seed *big.Int) (vrfkey.Proof, error) {
 func (_m *VRF) Get(id string) (vrfkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (vrfkey.KeyV2, error)); ok {
@@ -155,6 +179,10 @@ func (_m *VRF) Get(id string) (vrfkey.KeyV2, error) {
 func (_m *VRF) GetAll() ([]vrfkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]vrfkey.KeyV2, error)); ok {
@@ -181,6 +209,10 @@ func (_m *VRF) GetAll() ([]vrfkey.KeyV2, error) {
 func (_m *VRF) Import(keyJSON []byte, password string) (vrfkey.KeyV2, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (vrfkey.KeyV2, error)); ok {
diff --git a/core/services/mocks/checker.go b/core/services/mocks/checker.go
index e0c209d8afb..2572efb1822 100644
--- a/core/services/mocks/checker.go
+++ b/core/services/mocks/checker.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type Checker struct {
 func (_m *Checker) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -30,6 +34,10 @@ func (_m *Checker) Close() error {
 func (_m *Checker) IsHealthy() (bool, map[string]error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsHealthy")
+	}
+
 	var r0 bool
 	var r1 map[string]error
 	if rf, ok := ret.Get(0).(func() (bool, map[string]error)); ok {
@@ -56,6 +64,10 @@ func (_m *Checker) IsHealthy() (bool, map[string]error) {
 func (_m *Checker) IsReady() (bool, map[string]error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsReady")
+	}
+
 	var r0 bool
 	var r1 map[string]error
 	if rf, ok := ret.Get(0).(func() (bool, map[string]error)); ok {
@@ -82,6 +94,10 @@ func (_m *Checker) IsReady() (bool, map[string]error) {
 func (_m *Checker) Register(service pkgservices.HealthReporter) error {
 	ret := _m.Called(service)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Register")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(pkgservices.HealthReporter) error); ok {
 		r0 = rf(service)
@@ -96,6 +112,10 @@ func (_m *Checker) Register(service pkgservices.HealthReporter) error {
 func (_m *Checker) Start() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -110,6 +130,10 @@ func (_m *Checker) Start() error {
 func (_m *Checker) Unregister(name string) error {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Unregister")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(name)
diff --git a/core/services/ocr/mocks/ocr_contract_tracker_db.go b/core/services/ocr/mocks/ocr_contract_tracker_db.go
index a1d2f523ccb..6724e418014 100644
--- a/core/services/ocr/mocks/ocr_contract_tracker_db.go
+++ b/core/services/ocr/mocks/ocr_contract_tracker_db.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type OCRContractTrackerDB struct {
 func (_m *OCRContractTrackerDB) LoadLatestRoundRequested() (offchainaggregator.OffchainAggregatorRoundRequested, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LoadLatestRoundRequested")
+	}
+
 	var r0 offchainaggregator.OffchainAggregatorRoundRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (offchainaggregator.OffchainAggregatorRoundRequested, error)); ok {
@@ -43,6 +47,10 @@ func (_m *OCRContractTrackerDB) LoadLatestRoundRequested() (offchainaggregator.O
 func (_m *OCRContractTrackerDB) SaveLatestRoundRequested(tx pg.Queryer, rr offchainaggregator.OffchainAggregatorRoundRequested) error {
 	ret := _m.Called(tx, rr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveLatestRoundRequested")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(pg.Queryer, offchainaggregator.OffchainAggregatorRoundRequested) error); ok {
 		r0 = rf(tx, rr)
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go
index bc30ac781de..8c8ea721d73 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -25,6 +25,10 @@ type Registry struct {
 func (_m *Registry) GetActiveUpkeepIDs(opts *bind.CallOpts, startIndex *big.Int, maxCount *big.Int) ([]*big.Int, error) {
 	ret := _m.Called(opts, startIndex, maxCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetActiveUpkeepIDs")
+	}
+
 	var r0 []*big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, *big.Int) ([]*big.Int, error)); ok {
@@ -51,6 +55,10 @@ func (_m *Registry) GetActiveUpkeepIDs(opts *bind.CallOpts, startIndex *big.Int,
 func (_m *Registry) GetState(opts *bind.CallOpts) (keeper_registry_wrapper2_0.GetState, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetState")
+	}
+
 	var r0 keeper_registry_wrapper2_0.GetState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (keeper_registry_wrapper2_0.GetState, error)); ok {
@@ -75,6 +83,10 @@ func (_m *Registry) GetState(opts *bind.CallOpts) (keeper_registry_wrapper2_0.Ge
 func (_m *Registry) GetUpkeep(opts *bind.CallOpts, id *big.Int) (keeper_registry_wrapper2_0.UpkeepInfo, error) {
 	ret := _m.Called(opts, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUpkeep")
+	}
+
 	var r0 keeper_registry_wrapper2_0.UpkeepInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (keeper_registry_wrapper2_0.UpkeepInfo, error)); ok {
@@ -99,6 +111,10 @@ func (_m *Registry) GetUpkeep(opts *bind.CallOpts, id *big.Int) (keeper_registry
 func (_m *Registry) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go
index b036fbb26c3..3167cf97aad 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -26,6 +26,10 @@ func (_m *UpkeepStateReader) SelectByWorkIDs(ctx context.Context, workIDs ...str
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SelectByWorkIDs")
+	}
+
 	var r0 []types.UpkeepState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ...string) ([]types.UpkeepState, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go
index 53d347b1c06..d6982e9dbdb 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type HttpClient struct {
 func (_m *HttpClient) Do(req *http.Request) (*http.Response, error) {
 	ret := _m.Called(req)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Do")
+	}
+
 	var r0 *http.Response
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*http.Request) (*http.Response, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go
index a3cbd772b1d..1bb4cb2a325 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -25,6 +25,10 @@ type Registry struct {
 func (_m *Registry) CheckCallback(opts *bind.CallOpts, id *big.Int, values [][]byte, extraData []byte) (i_keeper_registry_master_wrapper_2_1.CheckCallback, error) {
 	ret := _m.Called(opts, id, values, extraData)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckCallback")
+	}
+
 	var r0 i_keeper_registry_master_wrapper_2_1.CheckCallback
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, [][]byte, []byte) (i_keeper_registry_master_wrapper_2_1.CheckCallback, error)); ok {
@@ -49,6 +53,10 @@ func (_m *Registry) CheckCallback(opts *bind.CallOpts, id *big.Int, values [][]b
 func (_m *Registry) GetActiveUpkeepIDs(opts *bind.CallOpts, startIndex *big.Int, maxCount *big.Int) ([]*big.Int, error) {
 	ret := _m.Called(opts, startIndex, maxCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetActiveUpkeepIDs")
+	}
+
 	var r0 []*big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, *big.Int) ([]*big.Int, error)); ok {
@@ -75,6 +83,10 @@ func (_m *Registry) GetActiveUpkeepIDs(opts *bind.CallOpts, startIndex *big.Int,
 func (_m *Registry) GetState(opts *bind.CallOpts) (i_keeper_registry_master_wrapper_2_1.GetState, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetState")
+	}
+
 	var r0 i_keeper_registry_master_wrapper_2_1.GetState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (i_keeper_registry_master_wrapper_2_1.GetState, error)); ok {
@@ -99,6 +111,10 @@ func (_m *Registry) GetState(opts *bind.CallOpts) (i_keeper_registry_master_wrap
 func (_m *Registry) GetUpkeep(opts *bind.CallOpts, id *big.Int) (i_keeper_registry_master_wrapper_2_1.KeeperRegistryBase21UpkeepInfo, error) {
 	ret := _m.Called(opts, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUpkeep")
+	}
+
 	var r0 i_keeper_registry_master_wrapper_2_1.KeeperRegistryBase21UpkeepInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (i_keeper_registry_master_wrapper_2_1.KeeperRegistryBase21UpkeepInfo, error)); ok {
@@ -123,6 +139,10 @@ func (_m *Registry) GetUpkeep(opts *bind.CallOpts, id *big.Int) (i_keeper_regist
 func (_m *Registry) GetUpkeepPrivilegeConfig(opts *bind.CallOpts, upkeepId *big.Int) ([]byte, error) {
 	ret := _m.Called(opts, upkeepId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUpkeepPrivilegeConfig")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) ([]byte, error)); ok {
@@ -149,6 +169,10 @@ func (_m *Registry) GetUpkeepPrivilegeConfig(opts *bind.CallOpts, upkeepId *big.
 func (_m *Registry) GetUpkeepTriggerConfig(opts *bind.CallOpts, upkeepId *big.Int) ([]byte, error) {
 	ret := _m.Called(opts, upkeepId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUpkeepTriggerConfig")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) ([]byte, error)); ok {
@@ -175,6 +199,10 @@ func (_m *Registry) GetUpkeepTriggerConfig(opts *bind.CallOpts, upkeepId *big.In
 func (_m *Registry) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon.go b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon.go
index d3fe5c91195..57521566a71 100644
--- a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon.go
+++ b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ type VRFBeaconInterface struct {
 func (_m *VRFBeaconInterface) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -54,6 +58,10 @@ func (_m *VRFBeaconInterface) AcceptOwnership(opts *bind.TransactOpts) (*types.T
 func (_m *VRFBeaconInterface) AcceptPayeeship(opts *bind.TransactOpts, transmitter common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, transmitter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptPayeeship")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -80,6 +88,10 @@ func (_m *VRFBeaconInterface) AcceptPayeeship(opts *bind.TransactOpts, transmitt
 func (_m *VRFBeaconInterface) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -96,6 +108,10 @@ func (_m *VRFBeaconInterface) Address() common.Address {
 func (_m *VRFBeaconInterface) ExposeType(opts *bind.TransactOpts, arg0 vrf_beacon.VRFBeaconReportReport) (*types.Transaction, error) {
 	ret := _m.Called(opts, arg0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExposeType")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_beacon.VRFBeaconReportReport) (*types.Transaction, error)); ok {
@@ -122,6 +138,10 @@ func (_m *VRFBeaconInterface) ExposeType(opts *bind.TransactOpts, arg0 vrf_beaco
 func (_m *VRFBeaconInterface) FilterBillingAccessControllerSet(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconBillingAccessControllerSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterBillingAccessControllerSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconBillingAccessControllerSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconBillingAccessControllerSetIterator, error)); ok {
@@ -148,6 +168,10 @@ func (_m *VRFBeaconInterface) FilterBillingAccessControllerSet(opts *bind.Filter
 func (_m *VRFBeaconInterface) FilterBillingSet(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconBillingSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterBillingSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconBillingSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconBillingSetIterator, error)); ok {
@@ -174,6 +198,10 @@ func (_m *VRFBeaconInterface) FilterBillingSet(opts *bind.FilterOpts) (*vrf_beac
 func (_m *VRFBeaconInterface) FilterConfigSet(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconConfigSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterConfigSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconConfigSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconConfigSetIterator, error)); ok {
@@ -200,6 +228,10 @@ func (_m *VRFBeaconInterface) FilterConfigSet(opts *bind.FilterOpts) (*vrf_beaco
 func (_m *VRFBeaconInterface) FilterNewTransmission(opts *bind.FilterOpts, epochAndRound []*big.Int) (*vrf_beacon.VRFBeaconNewTransmissionIterator, error) {
 	ret := _m.Called(opts, epochAndRound)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterNewTransmission")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconNewTransmissionIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_beacon.VRFBeaconNewTransmissionIterator, error)); ok {
@@ -226,6 +258,10 @@ func (_m *VRFBeaconInterface) FilterNewTransmission(opts *bind.FilterOpts, epoch
 func (_m *VRFBeaconInterface) FilterOraclePaid(opts *bind.FilterOpts, transmitter []common.Address, payee []common.Address, linkToken []common.Address) (*vrf_beacon.VRFBeaconOraclePaidIterator, error) {
 	ret := _m.Called(opts, transmitter, payee, linkToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOraclePaid")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOraclePaidIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconOraclePaidIterator, error)); ok {
@@ -252,6 +288,10 @@ func (_m *VRFBeaconInterface) FilterOraclePaid(opts *bind.FilterOpts, transmitte
 func (_m *VRFBeaconInterface) FilterOutputsServed(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconOutputsServedIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOutputsServed")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOutputsServedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconOutputsServedIterator, error)); ok {
@@ -278,6 +318,10 @@ func (_m *VRFBeaconInterface) FilterOutputsServed(opts *bind.FilterOpts) (*vrf_b
 func (_m *VRFBeaconInterface) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_beacon.VRFBeaconOwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconOwnershipTransferRequestedIterator, error)); ok {
@@ -304,6 +348,10 @@ func (_m *VRFBeaconInterface) FilterOwnershipTransferRequested(opts *bind.Filter
 func (_m *VRFBeaconInterface) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_beacon.VRFBeaconOwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconOwnershipTransferredIterator, error)); ok {
@@ -330,6 +378,10 @@ func (_m *VRFBeaconInterface) FilterOwnershipTransferred(opts *bind.FilterOpts,
 func (_m *VRFBeaconInterface) FilterPayeeshipTransferRequested(opts *bind.FilterOpts, transmitter []common.Address, current []common.Address, proposed []common.Address) (*vrf_beacon.VRFBeaconPayeeshipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, transmitter, current, proposed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterPayeeshipTransferRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconPayeeshipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconPayeeshipTransferRequestedIterator, error)); ok {
@@ -356,6 +408,10 @@ func (_m *VRFBeaconInterface) FilterPayeeshipTransferRequested(opts *bind.Filter
 func (_m *VRFBeaconInterface) FilterPayeeshipTransferred(opts *bind.FilterOpts, transmitter []common.Address, previous []common.Address, current []common.Address) (*vrf_beacon.VRFBeaconPayeeshipTransferredIterator, error) {
 	ret := _m.Called(opts, transmitter, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterPayeeshipTransferred")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconPayeeshipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconPayeeshipTransferredIterator, error)); ok {
@@ -382,6 +438,10 @@ func (_m *VRFBeaconInterface) FilterPayeeshipTransferred(opts *bind.FilterOpts,
 func (_m *VRFBeaconInterface) FilterRandomWordsFulfilled(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconRandomWordsFulfilledIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomWordsFulfilledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconRandomWordsFulfilledIterator, error)); ok {
@@ -408,6 +468,10 @@ func (_m *VRFBeaconInterface) FilterRandomWordsFulfilled(opts *bind.FilterOpts)
 func (_m *VRFBeaconInterface) FilterRandomnessFulfillmentRequested(opts *bind.FilterOpts, requestID []*big.Int) (*vrf_beacon.VRFBeaconRandomnessFulfillmentRequestedIterator, error) {
 	ret := _m.Called(opts, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessFulfillmentRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessFulfillmentRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_beacon.VRFBeaconRandomnessFulfillmentRequestedIterator, error)); ok {
@@ -434,6 +498,10 @@ func (_m *VRFBeaconInterface) FilterRandomnessFulfillmentRequested(opts *bind.Fi
 func (_m *VRFBeaconInterface) FilterRandomnessRedeemed(opts *bind.FilterOpts, requestID []*big.Int, requester []common.Address) (*vrf_beacon.VRFBeaconRandomnessRedeemedIterator, error) {
 	ret := _m.Called(opts, requestID, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessRedeemed")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessRedeemedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []common.Address) (*vrf_beacon.VRFBeaconRandomnessRedeemedIterator, error)); ok {
@@ -460,6 +528,10 @@ func (_m *VRFBeaconInterface) FilterRandomnessRedeemed(opts *bind.FilterOpts, re
 func (_m *VRFBeaconInterface) FilterRandomnessRequested(opts *bind.FilterOpts, requestID []*big.Int) (*vrf_beacon.VRFBeaconRandomnessRequestedIterator, error) {
 	ret := _m.Called(opts, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_beacon.VRFBeaconRandomnessRequestedIterator, error)); ok {
@@ -486,6 +558,10 @@ func (_m *VRFBeaconInterface) FilterRandomnessRequested(opts *bind.FilterOpts, r
 func (_m *VRFBeaconInterface) GetBilling(opts *bind.CallOpts) (vrf_beacon.GetBilling, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetBilling")
+	}
+
 	var r0 vrf_beacon.GetBilling
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_beacon.GetBilling, error)); ok {
@@ -510,6 +586,10 @@ func (_m *VRFBeaconInterface) GetBilling(opts *bind.CallOpts) (vrf_beacon.GetBil
 func (_m *VRFBeaconInterface) GetBillingAccessController(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetBillingAccessController")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -536,6 +616,10 @@ func (_m *VRFBeaconInterface) GetBillingAccessController(opts *bind.CallOpts) (c
 func (_m *VRFBeaconInterface) ICoordinator(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ICoordinator")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -562,6 +646,10 @@ func (_m *VRFBeaconInterface) ICoordinator(opts *bind.CallOpts) (common.Address,
 func (_m *VRFBeaconInterface) ILink(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ILink")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -588,6 +676,10 @@ func (_m *VRFBeaconInterface) ILink(opts *bind.CallOpts) (common.Address, error)
 func (_m *VRFBeaconInterface) KeyGenerated(opts *bind.TransactOpts, kd vrf_beacon.KeyDataStructKeyData) (*types.Transaction, error) {
 	ret := _m.Called(opts, kd)
 
+	if len(ret) == 0 {
+		panic("no return value specified for KeyGenerated")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_beacon.KeyDataStructKeyData) (*types.Transaction, error)); ok {
@@ -614,6 +706,10 @@ func (_m *VRFBeaconInterface) KeyGenerated(opts *bind.TransactOpts, kd vrf_beaco
 func (_m *VRFBeaconInterface) LatestConfigDetails(opts *bind.CallOpts) (vrf_beacon.LatestConfigDetails, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestConfigDetails")
+	}
+
 	var r0 vrf_beacon.LatestConfigDetails
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_beacon.LatestConfigDetails, error)); ok {
@@ -638,6 +734,10 @@ func (_m *VRFBeaconInterface) LatestConfigDetails(opts *bind.CallOpts) (vrf_beac
 func (_m *VRFBeaconInterface) LatestConfigDigestAndEpoch(opts *bind.CallOpts) (vrf_beacon.LatestConfigDigestAndEpoch, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestConfigDigestAndEpoch")
+	}
+
 	var r0 vrf_beacon.LatestConfigDigestAndEpoch
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_beacon.LatestConfigDigestAndEpoch, error)); ok {
@@ -662,6 +762,10 @@ func (_m *VRFBeaconInterface) LatestConfigDigestAndEpoch(opts *bind.CallOpts) (v
 func (_m *VRFBeaconInterface) LinkAvailableForPayment(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LinkAvailableForPayment")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -688,6 +792,10 @@ func (_m *VRFBeaconInterface) LinkAvailableForPayment(opts *bind.CallOpts) (*big
 func (_m *VRFBeaconInterface) NUMCONFDELAYS(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NUMCONFDELAYS")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -712,6 +820,10 @@ func (_m *VRFBeaconInterface) NUMCONFDELAYS(opts *bind.CallOpts) (uint8, error)
 func (_m *VRFBeaconInterface) NewKeyRequested(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewKeyRequested")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -738,6 +850,10 @@ func (_m *VRFBeaconInterface) NewKeyRequested(opts *bind.TransactOpts) (*types.T
 func (_m *VRFBeaconInterface) OwedPayment(opts *bind.CallOpts, transmitterAddress common.Address) (*big.Int, error) {
 	ret := _m.Called(opts, transmitterAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OwedPayment")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (*big.Int, error)); ok {
@@ -764,6 +880,10 @@ func (_m *VRFBeaconInterface) OwedPayment(opts *bind.CallOpts, transmitterAddres
 func (_m *VRFBeaconInterface) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -790,6 +910,10 @@ func (_m *VRFBeaconInterface) Owner(opts *bind.CallOpts) (common.Address, error)
 func (_m *VRFBeaconInterface) ParseBillingAccessControllerSet(log types.Log) (*vrf_beacon.VRFBeaconBillingAccessControllerSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseBillingAccessControllerSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconBillingAccessControllerSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconBillingAccessControllerSet, error)); ok {
@@ -816,6 +940,10 @@ func (_m *VRFBeaconInterface) ParseBillingAccessControllerSet(log types.Log) (*v
 func (_m *VRFBeaconInterface) ParseBillingSet(log types.Log) (*vrf_beacon.VRFBeaconBillingSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseBillingSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconBillingSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconBillingSet, error)); ok {
@@ -842,6 +970,10 @@ func (_m *VRFBeaconInterface) ParseBillingSet(log types.Log) (*vrf_beacon.VRFBea
 func (_m *VRFBeaconInterface) ParseConfigSet(log types.Log) (*vrf_beacon.VRFBeaconConfigSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseConfigSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconConfigSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconConfigSet, error)); ok {
@@ -868,6 +1000,10 @@ func (_m *VRFBeaconInterface) ParseConfigSet(log types.Log) (*vrf_beacon.VRFBeac
 func (_m *VRFBeaconInterface) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -894,6 +1030,10 @@ func (_m *VRFBeaconInterface) ParseLog(log types.Log) (generated.AbigenLog, erro
 func (_m *VRFBeaconInterface) ParseNewTransmission(log types.Log) (*vrf_beacon.VRFBeaconNewTransmission, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseNewTransmission")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconNewTransmission
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconNewTransmission, error)); ok {
@@ -920,6 +1060,10 @@ func (_m *VRFBeaconInterface) ParseNewTransmission(log types.Log) (*vrf_beacon.V
 func (_m *VRFBeaconInterface) ParseOraclePaid(log types.Log) (*vrf_beacon.VRFBeaconOraclePaid, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOraclePaid")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOraclePaid
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconOraclePaid, error)); ok {
@@ -946,6 +1090,10 @@ func (_m *VRFBeaconInterface) ParseOraclePaid(log types.Log) (*vrf_beacon.VRFBea
 func (_m *VRFBeaconInterface) ParseOutputsServed(log types.Log) (*vrf_beacon.VRFBeaconOutputsServed, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOutputsServed")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOutputsServed
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconOutputsServed, error)); ok {
@@ -972,6 +1120,10 @@ func (_m *VRFBeaconInterface) ParseOutputsServed(log types.Log) (*vrf_beacon.VRF
 func (_m *VRFBeaconInterface) ParseOwnershipTransferRequested(log types.Log) (*vrf_beacon.VRFBeaconOwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconOwnershipTransferRequested, error)); ok {
@@ -998,6 +1150,10 @@ func (_m *VRFBeaconInterface) ParseOwnershipTransferRequested(log types.Log) (*v
 func (_m *VRFBeaconInterface) ParseOwnershipTransferred(log types.Log) (*vrf_beacon.VRFBeaconOwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconOwnershipTransferred, error)); ok {
@@ -1024,6 +1180,10 @@ func (_m *VRFBeaconInterface) ParseOwnershipTransferred(log types.Log) (*vrf_bea
 func (_m *VRFBeaconInterface) ParsePayeeshipTransferRequested(log types.Log) (*vrf_beacon.VRFBeaconPayeeshipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParsePayeeshipTransferRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconPayeeshipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconPayeeshipTransferRequested, error)); ok {
@@ -1050,6 +1210,10 @@ func (_m *VRFBeaconInterface) ParsePayeeshipTransferRequested(log types.Log) (*v
 func (_m *VRFBeaconInterface) ParsePayeeshipTransferred(log types.Log) (*vrf_beacon.VRFBeaconPayeeshipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParsePayeeshipTransferred")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconPayeeshipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconPayeeshipTransferred, error)); ok {
@@ -1076,6 +1240,10 @@ func (_m *VRFBeaconInterface) ParsePayeeshipTransferred(log types.Log) (*vrf_bea
 func (_m *VRFBeaconInterface) ParseRandomWordsFulfilled(log types.Log) (*vrf_beacon.VRFBeaconRandomWordsFulfilled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomWordsFulfilled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconRandomWordsFulfilled, error)); ok {
@@ -1102,6 +1270,10 @@ func (_m *VRFBeaconInterface) ParseRandomWordsFulfilled(log types.Log) (*vrf_bea
 func (_m *VRFBeaconInterface) ParseRandomnessFulfillmentRequested(log types.Log) (*vrf_beacon.VRFBeaconRandomnessFulfillmentRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessFulfillmentRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessFulfillmentRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconRandomnessFulfillmentRequested, error)); ok {
@@ -1128,6 +1300,10 @@ func (_m *VRFBeaconInterface) ParseRandomnessFulfillmentRequested(log types.Log)
 func (_m *VRFBeaconInterface) ParseRandomnessRedeemed(log types.Log) (*vrf_beacon.VRFBeaconRandomnessRedeemed, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessRedeemed")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessRedeemed
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconRandomnessRedeemed, error)); ok {
@@ -1154,6 +1330,10 @@ func (_m *VRFBeaconInterface) ParseRandomnessRedeemed(log types.Log) (*vrf_beaco
 func (_m *VRFBeaconInterface) ParseRandomnessRequested(log types.Log) (*vrf_beacon.VRFBeaconRandomnessRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconRandomnessRequested, error)); ok {
@@ -1180,6 +1360,10 @@ func (_m *VRFBeaconInterface) ParseRandomnessRequested(log types.Log) (*vrf_beac
 func (_m *VRFBeaconInterface) SKeyID(opts *bind.CallOpts) ([32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SKeyID")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([32]byte, error)); ok {
@@ -1206,6 +1390,10 @@ func (_m *VRFBeaconInterface) SKeyID(opts *bind.CallOpts) ([32]byte, error) {
 func (_m *VRFBeaconInterface) SKeyProvider(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SKeyProvider")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1232,6 +1420,10 @@ func (_m *VRFBeaconInterface) SKeyProvider(opts *bind.CallOpts) (common.Address,
 func (_m *VRFBeaconInterface) SProvingKeyHash(opts *bind.CallOpts) ([32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SProvingKeyHash")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([32]byte, error)); ok {
@@ -1258,6 +1450,10 @@ func (_m *VRFBeaconInterface) SProvingKeyHash(opts *bind.CallOpts) ([32]byte, er
 func (_m *VRFBeaconInterface) SetBilling(opts *bind.TransactOpts, maximumGasPrice uint64, reasonableGasPrice uint64, observationPayment uint64, transmissionPayment uint64, accountingGas *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, maximumGasPrice, reasonableGasPrice, observationPayment, transmissionPayment, accountingGas)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetBilling")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, uint64, uint64, uint64, *big.Int) (*types.Transaction, error)); ok {
@@ -1284,6 +1480,10 @@ func (_m *VRFBeaconInterface) SetBilling(opts *bind.TransactOpts, maximumGasPric
 func (_m *VRFBeaconInterface) SetBillingAccessController(opts *bind.TransactOpts, _billingAccessController common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _billingAccessController)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetBillingAccessController")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1310,6 +1510,10 @@ func (_m *VRFBeaconInterface) SetBillingAccessController(opts *bind.TransactOpts
 func (_m *VRFBeaconInterface) SetConfig(opts *bind.TransactOpts, signers []common.Address, transmitters []common.Address, f uint8, onchainConfig []byte, offchainConfigVersion uint64, offchainConfig []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, signers, transmitters, f, onchainConfig, offchainConfigVersion, offchainConfig)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetConfig")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address, uint8, []byte, uint64, []byte) (*types.Transaction, error)); ok {
@@ -1336,6 +1540,10 @@ func (_m *VRFBeaconInterface) SetConfig(opts *bind.TransactOpts, signers []commo
 func (_m *VRFBeaconInterface) SetPayees(opts *bind.TransactOpts, transmitters []common.Address, payees []common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, transmitters, payees)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetPayees")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address) (*types.Transaction, error)); ok {
@@ -1362,6 +1570,10 @@ func (_m *VRFBeaconInterface) SetPayees(opts *bind.TransactOpts, transmitters []
 func (_m *VRFBeaconInterface) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1388,6 +1600,10 @@ func (_m *VRFBeaconInterface) TransferOwnership(opts *bind.TransactOpts, to comm
 func (_m *VRFBeaconInterface) TransferPayeeship(opts *bind.TransactOpts, transmitter common.Address, proposed common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, transmitter, proposed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferPayeeship")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, common.Address) (*types.Transaction, error)); ok {
@@ -1414,6 +1630,10 @@ func (_m *VRFBeaconInterface) TransferPayeeship(opts *bind.TransactOpts, transmi
 func (_m *VRFBeaconInterface) Transmit(opts *bind.TransactOpts, reportContext [3][32]byte, report []byte, rs [][32]byte, ss [][32]byte, rawVs [32]byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, reportContext, report, rs, ss, rawVs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Transmit")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, [3][32]byte, []byte, [][32]byte, [][32]byte, [32]byte) (*types.Transaction, error)); ok {
@@ -1440,6 +1660,10 @@ func (_m *VRFBeaconInterface) Transmit(opts *bind.TransactOpts, reportContext [3
 func (_m *VRFBeaconInterface) TypeAndVersion(opts *bind.CallOpts) (string, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TypeAndVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
@@ -1464,6 +1688,10 @@ func (_m *VRFBeaconInterface) TypeAndVersion(opts *bind.CallOpts) (string, error
 func (_m *VRFBeaconInterface) WatchBillingAccessControllerSet(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconBillingAccessControllerSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchBillingAccessControllerSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconBillingAccessControllerSet) (event.Subscription, error)); ok {
@@ -1490,6 +1718,10 @@ func (_m *VRFBeaconInterface) WatchBillingAccessControllerSet(opts *bind.WatchOp
 func (_m *VRFBeaconInterface) WatchBillingSet(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconBillingSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchBillingSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconBillingSet) (event.Subscription, error)); ok {
@@ -1516,6 +1748,10 @@ func (_m *VRFBeaconInterface) WatchBillingSet(opts *bind.WatchOpts, sink chan<-
 func (_m *VRFBeaconInterface) WatchConfigSet(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconConfigSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchConfigSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconConfigSet) (event.Subscription, error)); ok {
@@ -1542,6 +1778,10 @@ func (_m *VRFBeaconInterface) WatchConfigSet(opts *bind.WatchOpts, sink chan<- *
 func (_m *VRFBeaconInterface) WatchNewTransmission(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconNewTransmission, epochAndRound []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, epochAndRound)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchNewTransmission")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconNewTransmission, []*big.Int) (event.Subscription, error)); ok {
@@ -1568,6 +1808,10 @@ func (_m *VRFBeaconInterface) WatchNewTransmission(opts *bind.WatchOpts, sink ch
 func (_m *VRFBeaconInterface) WatchOraclePaid(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconOraclePaid, transmitter []common.Address, payee []common.Address, linkToken []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, transmitter, payee, linkToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOraclePaid")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconOraclePaid, []common.Address, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1594,6 +1838,10 @@ func (_m *VRFBeaconInterface) WatchOraclePaid(opts *bind.WatchOpts, sink chan<-
 func (_m *VRFBeaconInterface) WatchOutputsServed(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconOutputsServed) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOutputsServed")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconOutputsServed) (event.Subscription, error)); ok {
@@ -1620,6 +1868,10 @@ func (_m *VRFBeaconInterface) WatchOutputsServed(opts *bind.WatchOpts, sink chan
 func (_m *VRFBeaconInterface) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1646,6 +1898,10 @@ func (_m *VRFBeaconInterface) WatchOwnershipTransferRequested(opts *bind.WatchOp
 func (_m *VRFBeaconInterface) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1672,6 +1928,10 @@ func (_m *VRFBeaconInterface) WatchOwnershipTransferred(opts *bind.WatchOpts, si
 func (_m *VRFBeaconInterface) WatchPayeeshipTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconPayeeshipTransferRequested, transmitter []common.Address, current []common.Address, proposed []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, transmitter, current, proposed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchPayeeshipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconPayeeshipTransferRequested, []common.Address, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1698,6 +1958,10 @@ func (_m *VRFBeaconInterface) WatchPayeeshipTransferRequested(opts *bind.WatchOp
 func (_m *VRFBeaconInterface) WatchPayeeshipTransferred(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconPayeeshipTransferred, transmitter []common.Address, previous []common.Address, current []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, transmitter, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchPayeeshipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconPayeeshipTransferred, []common.Address, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1724,6 +1988,10 @@ func (_m *VRFBeaconInterface) WatchPayeeshipTransferred(opts *bind.WatchOpts, si
 func (_m *VRFBeaconInterface) WatchRandomWordsFulfilled(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconRandomWordsFulfilled) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomWordsFulfilled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconRandomWordsFulfilled) (event.Subscription, error)); ok {
@@ -1750,6 +2018,10 @@ func (_m *VRFBeaconInterface) WatchRandomWordsFulfilled(opts *bind.WatchOpts, si
 func (_m *VRFBeaconInterface) WatchRandomnessFulfillmentRequested(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconRandomnessFulfillmentRequested, requestID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessFulfillmentRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconRandomnessFulfillmentRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -1776,6 +2048,10 @@ func (_m *VRFBeaconInterface) WatchRandomnessFulfillmentRequested(opts *bind.Wat
 func (_m *VRFBeaconInterface) WatchRandomnessRedeemed(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconRandomnessRedeemed, requestID []*big.Int, requester []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessRedeemed")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconRandomnessRedeemed, []*big.Int, []common.Address) (event.Subscription, error)); ok {
@@ -1802,6 +2078,10 @@ func (_m *VRFBeaconInterface) WatchRandomnessRedeemed(opts *bind.WatchOpts, sink
 func (_m *VRFBeaconInterface) WatchRandomnessRequested(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconRandomnessRequested, requestID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconRandomnessRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -1828,6 +2108,10 @@ func (_m *VRFBeaconInterface) WatchRandomnessRequested(opts *bind.WatchOpts, sin
 func (_m *VRFBeaconInterface) WithdrawFunds(opts *bind.TransactOpts, recipient common.Address, amount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, recipient, amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawFunds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -1854,6 +2138,10 @@ func (_m *VRFBeaconInterface) WithdrawFunds(opts *bind.TransactOpts, recipient c
 func (_m *VRFBeaconInterface) WithdrawPayment(opts *bind.TransactOpts, transmitter common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, transmitter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawPayment")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon_coordinator.go b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon_coordinator.go
index 835702d136a..c0f85d67e06 100644
--- a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon_coordinator.go
+++ b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon_coordinator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -23,6 +23,10 @@ type VRFBeaconCoordinator struct {
 func (_m *VRFBeaconCoordinator) GetConfirmationDelays(opts *bind.CallOpts) ([8]*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConfirmationDelays")
+	}
+
 	var r0 [8]*big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([8]*big.Int, error)); ok {
@@ -49,6 +53,10 @@ func (_m *VRFBeaconCoordinator) GetConfirmationDelays(opts *bind.CallOpts) ([8]*
 func (_m *VRFBeaconCoordinator) IBeaconPeriodBlocks(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IBeaconPeriodBlocks")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -75,6 +83,10 @@ func (_m *VRFBeaconCoordinator) IBeaconPeriodBlocks(opts *bind.CallOpts) (*big.I
 func (_m *VRFBeaconCoordinator) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -101,6 +113,10 @@ func (_m *VRFBeaconCoordinator) ParseLog(log types.Log) (generated.AbigenLog, er
 func (_m *VRFBeaconCoordinator) SKeyID(opts *bind.CallOpts) ([32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SKeyID")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([32]byte, error)); ok {
@@ -127,6 +143,10 @@ func (_m *VRFBeaconCoordinator) SKeyID(opts *bind.CallOpts) ([32]byte, error) {
 func (_m *VRFBeaconCoordinator) SProvingKeyHash(opts *bind.CallOpts) ([32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SProvingKeyHash")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([32]byte, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_coordinator.go b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_coordinator.go
index d5e373f4bca..4b2155bb4e2 100644
--- a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_coordinator.go
+++ b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_coordinator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ type VRFCoordinatorInterface struct {
 func (_m *VRFCoordinatorInterface) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -54,6 +58,10 @@ func (_m *VRFCoordinatorInterface) AcceptOwnership(opts *bind.TransactOpts) (*ty
 func (_m *VRFCoordinatorInterface) AcceptSubscriptionOwnerTransfer(opts *bind.TransactOpts, subId *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptSubscriptionOwnerTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int) (*types.Transaction, error)); ok {
@@ -80,6 +88,10 @@ func (_m *VRFCoordinatorInterface) AcceptSubscriptionOwnerTransfer(opts *bind.Tr
 func (_m *VRFCoordinatorInterface) AddConsumer(opts *bind.TransactOpts, subId *big.Int, consumer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, consumer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddConsumer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, common.Address) (*types.Transaction, error)); ok {
@@ -106,6 +118,10 @@ func (_m *VRFCoordinatorInterface) AddConsumer(opts *bind.TransactOpts, subId *b
 func (_m *VRFCoordinatorInterface) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -122,6 +138,10 @@ func (_m *VRFCoordinatorInterface) Address() common.Address {
 func (_m *VRFCoordinatorInterface) BatchTransferLink(opts *bind.TransactOpts, recipients []common.Address, paymentsInJuels []*big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, recipients, paymentsInJuels)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchTransferLink")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []*big.Int) (*types.Transaction, error)); ok {
@@ -148,6 +168,10 @@ func (_m *VRFCoordinatorInterface) BatchTransferLink(opts *bind.TransactOpts, re
 func (_m *VRFCoordinatorInterface) CancelSubscription(opts *bind.TransactOpts, subId *big.Int, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, common.Address) (*types.Transaction, error)); ok {
@@ -174,6 +198,10 @@ func (_m *VRFCoordinatorInterface) CancelSubscription(opts *bind.TransactOpts, s
 func (_m *VRFCoordinatorInterface) CreateSubscription(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -200,6 +228,10 @@ func (_m *VRFCoordinatorInterface) CreateSubscription(opts *bind.TransactOpts) (
 func (_m *VRFCoordinatorInterface) DeregisterMigratableCoordinator(opts *bind.TransactOpts, target common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, target)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeregisterMigratableCoordinator")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -226,6 +258,10 @@ func (_m *VRFCoordinatorInterface) DeregisterMigratableCoordinator(opts *bind.Tr
 func (_m *VRFCoordinatorInterface) FilterCallbackConfigSet(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCallbackConfigSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCallbackConfigSet")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCallbackConfigSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCallbackConfigSetIterator, error)); ok {
@@ -252,6 +288,10 @@ func (_m *VRFCoordinatorInterface) FilterCallbackConfigSet(opts *bind.FilterOpts
 func (_m *VRFCoordinatorInterface) FilterCoordinatorConfigSet(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorConfigSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCoordinatorConfigSet")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorConfigSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorConfigSetIterator, error)); ok {
@@ -278,6 +318,10 @@ func (_m *VRFCoordinatorInterface) FilterCoordinatorConfigSet(opts *bind.FilterO
 func (_m *VRFCoordinatorInterface) FilterCoordinatorDeregistered(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorDeregisteredIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCoordinatorDeregistered")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorDeregisteredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorDeregisteredIterator, error)); ok {
@@ -304,6 +348,10 @@ func (_m *VRFCoordinatorInterface) FilterCoordinatorDeregistered(opts *bind.Filt
 func (_m *VRFCoordinatorInterface) FilterCoordinatorRegistered(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorRegisteredIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCoordinatorRegistered")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorRegisteredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorRegisteredIterator, error)); ok {
@@ -330,6 +378,10 @@ func (_m *VRFCoordinatorInterface) FilterCoordinatorRegistered(opts *bind.Filter
 func (_m *VRFCoordinatorInterface) FilterMigrationCompleted(opts *bind.FilterOpts, newVersion []uint8, subID []*big.Int) (*vrf_coordinator.VRFCoordinatorMigrationCompletedIterator, error) {
 	ret := _m.Called(opts, newVersion, subID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterMigrationCompleted")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorMigrationCompletedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint8, []*big.Int) (*vrf_coordinator.VRFCoordinatorMigrationCompletedIterator, error)); ok {
@@ -356,6 +408,10 @@ func (_m *VRFCoordinatorInterface) FilterMigrationCompleted(opts *bind.FilterOpt
 func (_m *VRFCoordinatorInterface) FilterOutputsServed(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorOutputsServedIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOutputsServed")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOutputsServedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorOutputsServedIterator, error)); ok {
@@ -382,6 +438,10 @@ func (_m *VRFCoordinatorInterface) FilterOutputsServed(opts *bind.FilterOpts) (*
 func (_m *VRFCoordinatorInterface) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_coordinator.VRFCoordinatorOwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_coordinator.VRFCoordinatorOwnershipTransferRequestedIterator, error)); ok {
@@ -408,6 +468,10 @@ func (_m *VRFCoordinatorInterface) FilterOwnershipTransferRequested(opts *bind.F
 func (_m *VRFCoordinatorInterface) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_coordinator.VRFCoordinatorOwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_coordinator.VRFCoordinatorOwnershipTransferredIterator, error)); ok {
@@ -434,6 +498,10 @@ func (_m *VRFCoordinatorInterface) FilterOwnershipTransferred(opts *bind.FilterO
 func (_m *VRFCoordinatorInterface) FilterPauseFlagChanged(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorPauseFlagChangedIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterPauseFlagChanged")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorPauseFlagChangedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorPauseFlagChangedIterator, error)); ok {
@@ -460,6 +528,10 @@ func (_m *VRFCoordinatorInterface) FilterPauseFlagChanged(opts *bind.FilterOpts)
 func (_m *VRFCoordinatorInterface) FilterRandomWordsFulfilled(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorRandomWordsFulfilledIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomWordsFulfilledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorRandomWordsFulfilledIterator, error)); ok {
@@ -486,6 +558,10 @@ func (_m *VRFCoordinatorInterface) FilterRandomWordsFulfilled(opts *bind.FilterO
 func (_m *VRFCoordinatorInterface) FilterRandomnessFulfillmentRequested(opts *bind.FilterOpts, requestID []*big.Int) (*vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequestedIterator, error) {
 	ret := _m.Called(opts, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessFulfillmentRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequestedIterator, error)); ok {
@@ -512,6 +588,10 @@ func (_m *VRFCoordinatorInterface) FilterRandomnessFulfillmentRequested(opts *bi
 func (_m *VRFCoordinatorInterface) FilterRandomnessRedeemed(opts *bind.FilterOpts, requestID []*big.Int, requester []common.Address) (*vrf_coordinator.VRFCoordinatorRandomnessRedeemedIterator, error) {
 	ret := _m.Called(opts, requestID, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessRedeemed")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessRedeemedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []common.Address) (*vrf_coordinator.VRFCoordinatorRandomnessRedeemedIterator, error)); ok {
@@ -538,6 +618,10 @@ func (_m *VRFCoordinatorInterface) FilterRandomnessRedeemed(opts *bind.FilterOpt
 func (_m *VRFCoordinatorInterface) FilterRandomnessRequested(opts *bind.FilterOpts, requestID []*big.Int) (*vrf_coordinator.VRFCoordinatorRandomnessRequestedIterator, error) {
 	ret := _m.Called(opts, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorRandomnessRequestedIterator, error)); ok {
@@ -564,6 +648,10 @@ func (_m *VRFCoordinatorInterface) FilterRandomnessRequested(opts *bind.FilterOp
 func (_m *VRFCoordinatorInterface) FilterSubscriptionCanceled(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionCanceledIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionCanceled")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionCanceledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionCanceledIterator, error)); ok {
@@ -590,6 +678,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionCanceled(opts *bind.FilterO
 func (_m *VRFCoordinatorInterface) FilterSubscriptionConsumerAdded(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerAddedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionConsumerAdded")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionConsumerAddedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerAddedIterator, error)); ok {
@@ -616,6 +708,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionConsumerAdded(opts *bind.Fi
 func (_m *VRFCoordinatorInterface) FilterSubscriptionConsumerRemoved(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemovedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionConsumerRemoved")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemovedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemovedIterator, error)); ok {
@@ -642,6 +738,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionConsumerRemoved(opts *bind.
 func (_m *VRFCoordinatorInterface) FilterSubscriptionCreated(opts *bind.FilterOpts, subId []*big.Int, owner []common.Address) (*vrf_coordinator.VRFCoordinatorSubscriptionCreatedIterator, error) {
 	ret := _m.Called(opts, subId, owner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionCreated")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionCreatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []common.Address) (*vrf_coordinator.VRFCoordinatorSubscriptionCreatedIterator, error)); ok {
@@ -668,6 +768,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionCreated(opts *bind.FilterOp
 func (_m *VRFCoordinatorInterface) FilterSubscriptionFunded(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionFundedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionFunded")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionFundedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionFundedIterator, error)); ok {
@@ -694,6 +798,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionFunded(opts *bind.FilterOpt
 func (_m *VRFCoordinatorInterface) FilterSubscriptionOwnerTransferRequested(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequestedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequestedIterator, error)); ok {
@@ -720,6 +828,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionOwnerTransferRequested(opts
 func (_m *VRFCoordinatorInterface) FilterSubscriptionOwnerTransferred(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferredIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionOwnerTransferred")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferredIterator, error)); ok {
@@ -746,6 +858,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionOwnerTransferred(opts *bind
 func (_m *VRFCoordinatorInterface) GetCallbackMemo(opts *bind.CallOpts, requestId *big.Int) ([32]byte, error) {
 	ret := _m.Called(opts, requestId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCallbackMemo")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) ([32]byte, error)); ok {
@@ -772,6 +888,10 @@ func (_m *VRFCoordinatorInterface) GetCallbackMemo(opts *bind.CallOpts, requestI
 func (_m *VRFCoordinatorInterface) GetConfirmationDelays(opts *bind.CallOpts) ([8]*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConfirmationDelays")
+	}
+
 	var r0 [8]*big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([8]*big.Int, error)); ok {
@@ -798,6 +918,10 @@ func (_m *VRFCoordinatorInterface) GetConfirmationDelays(opts *bind.CallOpts) ([
 func (_m *VRFCoordinatorInterface) GetFee(opts *bind.CallOpts, arg0 *big.Int, arg1 []byte) (*big.Int, error) {
 	ret := _m.Called(opts, arg0, arg1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFee")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, []byte) (*big.Int, error)); ok {
@@ -824,6 +948,10 @@ func (_m *VRFCoordinatorInterface) GetFee(opts *bind.CallOpts, arg0 *big.Int, ar
 func (_m *VRFCoordinatorInterface) GetFulfillmentFee(opts *bind.CallOpts, arg0 *big.Int, callbackGasLimit uint32, arguments []byte, arg3 []byte) (*big.Int, error) {
 	ret := _m.Called(opts, arg0, callbackGasLimit, arguments, arg3)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFulfillmentFee")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, uint32, []byte, []byte) (*big.Int, error)); ok {
@@ -850,6 +978,10 @@ func (_m *VRFCoordinatorInterface) GetFulfillmentFee(opts *bind.CallOpts, arg0 *
 func (_m *VRFCoordinatorInterface) GetSubscription(opts *bind.CallOpts, subId *big.Int) (vrf_coordinator.GetSubscription, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSubscription")
+	}
+
 	var r0 vrf_coordinator.GetSubscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (vrf_coordinator.GetSubscription, error)); ok {
@@ -874,6 +1006,10 @@ func (_m *VRFCoordinatorInterface) GetSubscription(opts *bind.CallOpts, subId *b
 func (_m *VRFCoordinatorInterface) GetSubscriptionLinkBalance(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSubscriptionLinkBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -900,6 +1036,10 @@ func (_m *VRFCoordinatorInterface) GetSubscriptionLinkBalance(opts *bind.CallOpt
 func (_m *VRFCoordinatorInterface) IBeaconPeriodBlocks(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IBeaconPeriodBlocks")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -926,6 +1066,10 @@ func (_m *VRFCoordinatorInterface) IBeaconPeriodBlocks(opts *bind.CallOpts) (*bi
 func (_m *VRFCoordinatorInterface) ILink(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ILink")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -952,6 +1096,10 @@ func (_m *VRFCoordinatorInterface) ILink(opts *bind.CallOpts) (common.Address, e
 func (_m *VRFCoordinatorInterface) MAXCONSUMERS(opts *bind.CallOpts) (uint16, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXCONSUMERS")
+	}
+
 	var r0 uint16
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint16, error)); ok {
@@ -976,6 +1124,10 @@ func (_m *VRFCoordinatorInterface) MAXCONSUMERS(opts *bind.CallOpts) (uint16, er
 func (_m *VRFCoordinatorInterface) MAXNUMWORDS(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXNUMWORDS")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -1002,6 +1154,10 @@ func (_m *VRFCoordinatorInterface) MAXNUMWORDS(opts *bind.CallOpts) (*big.Int, e
 func (_m *VRFCoordinatorInterface) Migrate(opts *bind.TransactOpts, newCoordinator common.Address, encodedRequest []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, newCoordinator, encodedRequest)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Migrate")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, []byte) (*types.Transaction, error)); ok {
@@ -1028,6 +1184,10 @@ func (_m *VRFCoordinatorInterface) Migrate(opts *bind.TransactOpts, newCoordinat
 func (_m *VRFCoordinatorInterface) MigrationVersion(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MigrationVersion")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -1052,6 +1212,10 @@ func (_m *VRFCoordinatorInterface) MigrationVersion(opts *bind.CallOpts) (uint8,
 func (_m *VRFCoordinatorInterface) NUMCONFDELAYS(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NUMCONFDELAYS")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -1076,6 +1240,10 @@ func (_m *VRFCoordinatorInterface) NUMCONFDELAYS(opts *bind.CallOpts) (uint8, er
 func (_m *VRFCoordinatorInterface) OnMigration(opts *bind.CallOpts, arg0 []byte) error {
 	ret := _m.Called(opts, arg0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OnMigration")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, []byte) error); ok {
 		r0 = rf(opts, arg0)
@@ -1090,6 +1258,10 @@ func (_m *VRFCoordinatorInterface) OnMigration(opts *bind.CallOpts, arg0 []byte)
 func (_m *VRFCoordinatorInterface) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.Address, amount *big.Int, data []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, arg0, amount, data)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OnTokenTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -1116,6 +1288,10 @@ func (_m *VRFCoordinatorInterface) OnTokenTransfer(opts *bind.TransactOpts, arg0
 func (_m *VRFCoordinatorInterface) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1142,6 +1318,10 @@ func (_m *VRFCoordinatorInterface) Owner(opts *bind.CallOpts) (common.Address, e
 func (_m *VRFCoordinatorInterface) ParseCallbackConfigSet(log types.Log) (*vrf_coordinator.VRFCoordinatorCallbackConfigSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCallbackConfigSet")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCallbackConfigSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorCallbackConfigSet, error)); ok {
@@ -1168,6 +1348,10 @@ func (_m *VRFCoordinatorInterface) ParseCallbackConfigSet(log types.Log) (*vrf_c
 func (_m *VRFCoordinatorInterface) ParseCoordinatorConfigSet(log types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorConfigSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCoordinatorConfigSet")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorConfigSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorConfigSet, error)); ok {
@@ -1194,6 +1378,10 @@ func (_m *VRFCoordinatorInterface) ParseCoordinatorConfigSet(log types.Log) (*vr
 func (_m *VRFCoordinatorInterface) ParseCoordinatorDeregistered(log types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorDeregistered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCoordinatorDeregistered")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorDeregistered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorDeregistered, error)); ok {
@@ -1220,6 +1408,10 @@ func (_m *VRFCoordinatorInterface) ParseCoordinatorDeregistered(log types.Log) (
 func (_m *VRFCoordinatorInterface) ParseCoordinatorRegistered(log types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorRegistered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCoordinatorRegistered")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorRegistered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorRegistered, error)); ok {
@@ -1246,6 +1438,10 @@ func (_m *VRFCoordinatorInterface) ParseCoordinatorRegistered(log types.Log) (*v
 func (_m *VRFCoordinatorInterface) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -1272,6 +1468,10 @@ func (_m *VRFCoordinatorInterface) ParseLog(log types.Log) (generated.AbigenLog,
 func (_m *VRFCoordinatorInterface) ParseMigrationCompleted(log types.Log) (*vrf_coordinator.VRFCoordinatorMigrationCompleted, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseMigrationCompleted")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorMigrationCompleted
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorMigrationCompleted, error)); ok {
@@ -1298,6 +1498,10 @@ func (_m *VRFCoordinatorInterface) ParseMigrationCompleted(log types.Log) (*vrf_
 func (_m *VRFCoordinatorInterface) ParseOutputsServed(log types.Log) (*vrf_coordinator.VRFCoordinatorOutputsServed, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOutputsServed")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOutputsServed
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorOutputsServed, error)); ok {
@@ -1324,6 +1528,10 @@ func (_m *VRFCoordinatorInterface) ParseOutputsServed(log types.Log) (*vrf_coord
 func (_m *VRFCoordinatorInterface) ParseOwnershipTransferRequested(log types.Log) (*vrf_coordinator.VRFCoordinatorOwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorOwnershipTransferRequested, error)); ok {
@@ -1350,6 +1558,10 @@ func (_m *VRFCoordinatorInterface) ParseOwnershipTransferRequested(log types.Log
 func (_m *VRFCoordinatorInterface) ParseOwnershipTransferred(log types.Log) (*vrf_coordinator.VRFCoordinatorOwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorOwnershipTransferred, error)); ok {
@@ -1376,6 +1588,10 @@ func (_m *VRFCoordinatorInterface) ParseOwnershipTransferred(log types.Log) (*vr
 func (_m *VRFCoordinatorInterface) ParsePauseFlagChanged(log types.Log) (*vrf_coordinator.VRFCoordinatorPauseFlagChanged, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParsePauseFlagChanged")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorPauseFlagChanged
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorPauseFlagChanged, error)); ok {
@@ -1402,6 +1618,10 @@ func (_m *VRFCoordinatorInterface) ParsePauseFlagChanged(log types.Log) (*vrf_co
 func (_m *VRFCoordinatorInterface) ParseRandomWordsFulfilled(log types.Log) (*vrf_coordinator.VRFCoordinatorRandomWordsFulfilled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomWordsFulfilled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorRandomWordsFulfilled, error)); ok {
@@ -1428,6 +1648,10 @@ func (_m *VRFCoordinatorInterface) ParseRandomWordsFulfilled(log types.Log) (*vr
 func (_m *VRFCoordinatorInterface) ParseRandomnessFulfillmentRequested(log types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessFulfillmentRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested, error)); ok {
@@ -1454,6 +1678,10 @@ func (_m *VRFCoordinatorInterface) ParseRandomnessFulfillmentRequested(log types
 func (_m *VRFCoordinatorInterface) ParseRandomnessRedeemed(log types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessRedeemed, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessRedeemed")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessRedeemed
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessRedeemed, error)); ok {
@@ -1480,6 +1708,10 @@ func (_m *VRFCoordinatorInterface) ParseRandomnessRedeemed(log types.Log) (*vrf_
 func (_m *VRFCoordinatorInterface) ParseRandomnessRequested(log types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessRequested, error)); ok {
@@ -1506,6 +1738,10 @@ func (_m *VRFCoordinatorInterface) ParseRandomnessRequested(log types.Log) (*vrf
 func (_m *VRFCoordinatorInterface) ParseSubscriptionCanceled(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionCanceled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionCanceled")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionCanceled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionCanceled, error)); ok {
@@ -1532,6 +1768,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionCanceled(log types.Log) (*vr
 func (_m *VRFCoordinatorInterface) ParseSubscriptionConsumerAdded(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionConsumerAdded")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded, error)); ok {
@@ -1558,6 +1798,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionConsumerAdded(log types.Log)
 func (_m *VRFCoordinatorInterface) ParseSubscriptionConsumerRemoved(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionConsumerRemoved")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved, error)); ok {
@@ -1584,6 +1828,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionConsumerRemoved(log types.Lo
 func (_m *VRFCoordinatorInterface) ParseSubscriptionCreated(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionCreated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionCreated")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionCreated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionCreated, error)); ok {
@@ -1610,6 +1858,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionCreated(log types.Log) (*vrf
 func (_m *VRFCoordinatorInterface) ParseSubscriptionFunded(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionFunded, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionFunded")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionFunded
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionFunded, error)); ok {
@@ -1636,6 +1888,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionFunded(log types.Log) (*vrf_
 func (_m *VRFCoordinatorInterface) ParseSubscriptionOwnerTransferRequested(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested, error)); ok {
@@ -1662,6 +1918,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionOwnerTransferRequested(log t
 func (_m *VRFCoordinatorInterface) ParseSubscriptionOwnerTransferred(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionOwnerTransferred")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred, error)); ok {
@@ -1688,6 +1948,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionOwnerTransferred(log types.L
 func (_m *VRFCoordinatorInterface) ProcessVRFOutputs(opts *bind.TransactOpts, vrfOutputs []vrf_coordinator.VRFBeaconTypesVRFOutput, juelsPerFeeCoin *big.Int, reasonableGasPrice uint64, blockHeight uint64) (*types.Transaction, error) {
 	ret := _m.Called(opts, vrfOutputs, juelsPerFeeCoin, reasonableGasPrice, blockHeight)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ProcessVRFOutputs")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []vrf_coordinator.VRFBeaconTypesVRFOutput, *big.Int, uint64, uint64) (*types.Transaction, error)); ok {
@@ -1714,6 +1978,10 @@ func (_m *VRFCoordinatorInterface) ProcessVRFOutputs(opts *bind.TransactOpts, vr
 func (_m *VRFCoordinatorInterface) RedeemRandomness(opts *bind.TransactOpts, subID *big.Int, requestID *big.Int, arg2 []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, subID, requestID, arg2)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RedeemRandomness")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -1740,6 +2008,10 @@ func (_m *VRFCoordinatorInterface) RedeemRandomness(opts *bind.TransactOpts, sub
 func (_m *VRFCoordinatorInterface) RegisterMigratableCoordinator(opts *bind.TransactOpts, target common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, target)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RegisterMigratableCoordinator")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1766,6 +2038,10 @@ func (_m *VRFCoordinatorInterface) RegisterMigratableCoordinator(opts *bind.Tran
 func (_m *VRFCoordinatorInterface) RemoveConsumer(opts *bind.TransactOpts, subId *big.Int, consumer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, consumer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveConsumer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, common.Address) (*types.Transaction, error)); ok {
@@ -1792,6 +2068,10 @@ func (_m *VRFCoordinatorInterface) RemoveConsumer(opts *bind.TransactOpts, subId
 func (_m *VRFCoordinatorInterface) RequestRandomness(opts *bind.TransactOpts, subID *big.Int, numWords uint16, confDelay *big.Int, arg3 []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, subID, numWords, confDelay, arg3)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestRandomness")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, uint16, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -1818,6 +2098,10 @@ func (_m *VRFCoordinatorInterface) RequestRandomness(opts *bind.TransactOpts, su
 func (_m *VRFCoordinatorInterface) RequestRandomnessFulfillment(opts *bind.TransactOpts, subID *big.Int, numWords uint16, confDelay *big.Int, callbackGasLimit uint32, arguments []byte, arg5 []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, subID, numWords, confDelay, callbackGasLimit, arguments, arg5)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestRandomnessFulfillment")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, uint16, *big.Int, uint32, []byte, []byte) (*types.Transaction, error)); ok {
@@ -1844,6 +2128,10 @@ func (_m *VRFCoordinatorInterface) RequestRandomnessFulfillment(opts *bind.Trans
 func (_m *VRFCoordinatorInterface) RequestSubscriptionOwnerTransfer(opts *bind.TransactOpts, subId *big.Int, newOwner common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, newOwner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestSubscriptionOwnerTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, common.Address) (*types.Transaction, error)); ok {
@@ -1870,6 +2158,10 @@ func (_m *VRFCoordinatorInterface) RequestSubscriptionOwnerTransfer(opts *bind.T
 func (_m *VRFCoordinatorInterface) SCallbackConfig(opts *bind.CallOpts) (vrf_coordinator.SCallbackConfig, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SCallbackConfig")
+	}
+
 	var r0 vrf_coordinator.SCallbackConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_coordinator.SCallbackConfig, error)); ok {
@@ -1894,6 +2186,10 @@ func (_m *VRFCoordinatorInterface) SCallbackConfig(opts *bind.CallOpts) (vrf_coo
 func (_m *VRFCoordinatorInterface) SCoordinatorConfig(opts *bind.CallOpts) (vrf_coordinator.SCoordinatorConfig, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SCoordinatorConfig")
+	}
+
 	var r0 vrf_coordinator.SCoordinatorConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_coordinator.SCoordinatorConfig, error)); ok {
@@ -1918,6 +2214,10 @@ func (_m *VRFCoordinatorInterface) SCoordinatorConfig(opts *bind.CallOpts) (vrf_
 func (_m *VRFCoordinatorInterface) SPendingRequests(opts *bind.CallOpts, arg0 *big.Int) (vrf_coordinator.SPendingRequests, error) {
 	ret := _m.Called(opts, arg0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SPendingRequests")
+	}
+
 	var r0 vrf_coordinator.SPendingRequests
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (vrf_coordinator.SPendingRequests, error)); ok {
@@ -1942,6 +2242,10 @@ func (_m *VRFCoordinatorInterface) SPendingRequests(opts *bind.CallOpts, arg0 *b
 func (_m *VRFCoordinatorInterface) SProducer(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SProducer")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1968,6 +2272,10 @@ func (_m *VRFCoordinatorInterface) SProducer(opts *bind.CallOpts) (common.Addres
 func (_m *VRFCoordinatorInterface) SetCallbackConfig(opts *bind.TransactOpts, config vrf_coordinator.VRFCoordinatorCallbackConfig) (*types.Transaction, error) {
 	ret := _m.Called(opts, config)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetCallbackConfig")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_coordinator.VRFCoordinatorCallbackConfig) (*types.Transaction, error)); ok {
@@ -1994,6 +2302,10 @@ func (_m *VRFCoordinatorInterface) SetCallbackConfig(opts *bind.TransactOpts, co
 func (_m *VRFCoordinatorInterface) SetConfirmationDelays(opts *bind.TransactOpts, confDelays [8]*big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, confDelays)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetConfirmationDelays")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, [8]*big.Int) (*types.Transaction, error)); ok {
@@ -2020,6 +2332,10 @@ func (_m *VRFCoordinatorInterface) SetConfirmationDelays(opts *bind.TransactOpts
 func (_m *VRFCoordinatorInterface) SetCoordinatorConfig(opts *bind.TransactOpts, coordinatorConfig vrf_coordinator.VRFBeaconTypesCoordinatorConfig) (*types.Transaction, error) {
 	ret := _m.Called(opts, coordinatorConfig)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetCoordinatorConfig")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_coordinator.VRFBeaconTypesCoordinatorConfig) (*types.Transaction, error)); ok {
@@ -2046,6 +2362,10 @@ func (_m *VRFCoordinatorInterface) SetCoordinatorConfig(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorInterface) SetPauseFlag(opts *bind.TransactOpts, pause bool) (*types.Transaction, error) {
 	ret := _m.Called(opts, pause)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetPauseFlag")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, bool) (*types.Transaction, error)); ok {
@@ -2072,6 +2392,10 @@ func (_m *VRFCoordinatorInterface) SetPauseFlag(opts *bind.TransactOpts, pause b
 func (_m *VRFCoordinatorInterface) SetProducer(opts *bind.TransactOpts, producer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, producer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetProducer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -2098,6 +2422,10 @@ func (_m *VRFCoordinatorInterface) SetProducer(opts *bind.TransactOpts, producer
 func (_m *VRFCoordinatorInterface) TransferLink(opts *bind.TransactOpts, recipient common.Address, juelsAmount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, recipient, juelsAmount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferLink")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -2124,6 +2452,10 @@ func (_m *VRFCoordinatorInterface) TransferLink(opts *bind.TransactOpts, recipie
 func (_m *VRFCoordinatorInterface) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -2150,6 +2482,10 @@ func (_m *VRFCoordinatorInterface) TransferOwnership(opts *bind.TransactOpts, to
 func (_m *VRFCoordinatorInterface) WatchCallbackConfigSet(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorCallbackConfigSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCallbackConfigSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorCallbackConfigSet) (event.Subscription, error)); ok {
@@ -2176,6 +2512,10 @@ func (_m *VRFCoordinatorInterface) WatchCallbackConfigSet(opts *bind.WatchOpts,
 func (_m *VRFCoordinatorInterface) WatchCoordinatorConfigSet(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorCoordinatorConfigSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCoordinatorConfigSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorCoordinatorConfigSet) (event.Subscription, error)); ok {
@@ -2202,6 +2542,10 @@ func (_m *VRFCoordinatorInterface) WatchCoordinatorConfigSet(opts *bind.WatchOpt
 func (_m *VRFCoordinatorInterface) WatchCoordinatorDeregistered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorCoordinatorDeregistered) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCoordinatorDeregistered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorCoordinatorDeregistered) (event.Subscription, error)); ok {
@@ -2228,6 +2572,10 @@ func (_m *VRFCoordinatorInterface) WatchCoordinatorDeregistered(opts *bind.Watch
 func (_m *VRFCoordinatorInterface) WatchCoordinatorRegistered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorCoordinatorRegistered) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCoordinatorRegistered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorCoordinatorRegistered) (event.Subscription, error)); ok {
@@ -2254,6 +2602,10 @@ func (_m *VRFCoordinatorInterface) WatchCoordinatorRegistered(opts *bind.WatchOp
 func (_m *VRFCoordinatorInterface) WatchMigrationCompleted(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorMigrationCompleted, newVersion []uint8, subID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, newVersion, subID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchMigrationCompleted")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorMigrationCompleted, []uint8, []*big.Int) (event.Subscription, error)); ok {
@@ -2280,6 +2632,10 @@ func (_m *VRFCoordinatorInterface) WatchMigrationCompleted(opts *bind.WatchOpts,
 func (_m *VRFCoordinatorInterface) WatchOutputsServed(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorOutputsServed) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOutputsServed")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorOutputsServed) (event.Subscription, error)); ok {
@@ -2306,6 +2662,10 @@ func (_m *VRFCoordinatorInterface) WatchOutputsServed(opts *bind.WatchOpts, sink
 func (_m *VRFCoordinatorInterface) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -2332,6 +2692,10 @@ func (_m *VRFCoordinatorInterface) WatchOwnershipTransferRequested(opts *bind.Wa
 func (_m *VRFCoordinatorInterface) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -2358,6 +2722,10 @@ func (_m *VRFCoordinatorInterface) WatchOwnershipTransferred(opts *bind.WatchOpt
 func (_m *VRFCoordinatorInterface) WatchPauseFlagChanged(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorPauseFlagChanged) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchPauseFlagChanged")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorPauseFlagChanged) (event.Subscription, error)); ok {
@@ -2384,6 +2752,10 @@ func (_m *VRFCoordinatorInterface) WatchPauseFlagChanged(opts *bind.WatchOpts, s
 func (_m *VRFCoordinatorInterface) WatchRandomWordsFulfilled(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorRandomWordsFulfilled) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomWordsFulfilled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorRandomWordsFulfilled) (event.Subscription, error)); ok {
@@ -2410,6 +2782,10 @@ func (_m *VRFCoordinatorInterface) WatchRandomWordsFulfilled(opts *bind.WatchOpt
 func (_m *VRFCoordinatorInterface) WatchRandomnessFulfillmentRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested, requestID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessFulfillmentRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -2436,6 +2812,10 @@ func (_m *VRFCoordinatorInterface) WatchRandomnessFulfillmentRequested(opts *bin
 func (_m *VRFCoordinatorInterface) WatchRandomnessRedeemed(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorRandomnessRedeemed, requestID []*big.Int, requester []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessRedeemed")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorRandomnessRedeemed, []*big.Int, []common.Address) (event.Subscription, error)); ok {
@@ -2462,6 +2842,10 @@ func (_m *VRFCoordinatorInterface) WatchRandomnessRedeemed(opts *bind.WatchOpts,
 func (_m *VRFCoordinatorInterface) WatchRandomnessRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorRandomnessRequested, requestID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorRandomnessRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -2488,6 +2872,10 @@ func (_m *VRFCoordinatorInterface) WatchRandomnessRequested(opts *bind.WatchOpts
 func (_m *VRFCoordinatorInterface) WatchSubscriptionCanceled(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionCanceled, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionCanceled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionCanceled, []*big.Int) (event.Subscription, error)); ok {
@@ -2514,6 +2902,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionCanceled(opts *bind.WatchOpt
 func (_m *VRFCoordinatorInterface) WatchSubscriptionConsumerAdded(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionConsumerAdded")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded, []*big.Int) (event.Subscription, error)); ok {
@@ -2540,6 +2932,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionConsumerAdded(opts *bind.Wat
 func (_m *VRFCoordinatorInterface) WatchSubscriptionConsumerRemoved(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionConsumerRemoved")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved, []*big.Int) (event.Subscription, error)); ok {
@@ -2566,6 +2962,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionConsumerRemoved(opts *bind.W
 func (_m *VRFCoordinatorInterface) WatchSubscriptionCreated(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionCreated, subId []*big.Int, owner []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId, owner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionCreated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionCreated, []*big.Int, []common.Address) (event.Subscription, error)); ok {
@@ -2592,6 +2992,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionCreated(opts *bind.WatchOpts
 func (_m *VRFCoordinatorInterface) WatchSubscriptionFunded(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionFunded, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionFunded")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionFunded, []*big.Int) (event.Subscription, error)); ok {
@@ -2618,6 +3022,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionFunded(opts *bind.WatchOpts,
 func (_m *VRFCoordinatorInterface) WatchSubscriptionOwnerTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -2644,6 +3052,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionOwnerTransferRequested(opts
 func (_m *VRFCoordinatorInterface) WatchSubscriptionOwnerTransferred(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionOwnerTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred, []*big.Int) (event.Subscription, error)); ok {
diff --git a/core/services/ocr2/plugins/promwrapper/mocks/prometheus_backend.go b/core/services/ocr2/plugins/promwrapper/mocks/prometheus_backend.go
index ba97eda30b1..418cb276011 100644
--- a/core/services/ocr2/plugins/promwrapper/mocks/prometheus_backend.go
+++ b/core/services/ocr2/plugins/promwrapper/mocks/prometheus_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/core/services/ocr2/plugins/threshold/mocks/decryptor.go b/core/services/ocr2/plugins/threshold/mocks/decryptor.go
index 4b91cbbd26f..5496483c9dd 100644
--- a/core/services/ocr2/plugins/threshold/mocks/decryptor.go
+++ b/core/services/ocr2/plugins/threshold/mocks/decryptor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type Decryptor struct {
 func (_m *Decryptor) Decrypt(ctx context.Context, ciphertextId decryptionplugin.CiphertextId, ciphertext []byte) ([]byte, error) {
 	ret := _m.Called(ctx, ciphertextId, ciphertext)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Decrypt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, decryptionplugin.CiphertextId, []byte) ([]byte, error)); ok {
diff --git a/core/services/pg/mocks/event_broadcaster.go b/core/services/pg/mocks/event_broadcaster.go
index b4d04b8b999..63f06db494b 100644
--- a/core/services/pg/mocks/event_broadcaster.go
+++ b/core/services/pg/mocks/event_broadcaster.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type EventBroadcaster struct {
 func (_m *EventBroadcaster) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *EventBroadcaster) Close() error {
 func (_m *EventBroadcaster) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *EventBroadcaster) HealthReport() map[string]error {
 func (_m *EventBroadcaster) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -62,6 +74,10 @@ func (_m *EventBroadcaster) Name() string {
 func (_m *EventBroadcaster) Notify(channel string, payload string) error {
 	ret := _m.Called(channel, payload)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Notify")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(channel, payload)
@@ -76,6 +92,10 @@ func (_m *EventBroadcaster) Notify(channel string, payload string) error {
 func (_m *EventBroadcaster) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -90,6 +110,10 @@ func (_m *EventBroadcaster) Ready() error {
 func (_m *EventBroadcaster) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -104,6 +128,10 @@ func (_m *EventBroadcaster) Start(_a0 context.Context) error {
 func (_m *EventBroadcaster) Subscribe(channel string, payloadFilter string) (pg.Subscription, error) {
 	ret := _m.Called(channel, payloadFilter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subscribe")
+	}
+
 	var r0 pg.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (pg.Subscription, error)); ok {
diff --git a/core/services/pg/mocks/subscription.go b/core/services/pg/mocks/subscription.go
index 9cfe4c4f020..fcd194004de 100644
--- a/core/services/pg/mocks/subscription.go
+++ b/core/services/pg/mocks/subscription.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type Subscription struct {
 func (_m *Subscription) ChannelName() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelName")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -35,6 +39,10 @@ func (_m *Subscription) Close() {
 func (_m *Subscription) Events() <-chan pg.Event {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Events")
+	}
+
 	var r0 <-chan pg.Event
 	if rf, ok := ret.Get(0).(func() <-chan pg.Event); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *Subscription) Events() <-chan pg.Event {
 func (_m *Subscription) InterestedIn(event pg.Event) bool {
 	ret := _m.Called(event)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InterestedIn")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func(pg.Event) bool); ok {
 		r0 = rf(event)
diff --git a/core/services/pipeline/mocks/config.go b/core/services/pipeline/mocks/config.go
index eb9a411f423..4cd6bc7a724 100644
--- a/core/services/pipeline/mocks/config.go
+++ b/core/services/pipeline/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type Config struct {
 func (_m *Config) DefaultHTTPLimit() int64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DefaultHTTPLimit")
+	}
+
 	var r0 int64
 	if rf, ok := ret.Get(0).(func() int64); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *Config) DefaultHTTPLimit() int64 {
 func (_m *Config) DefaultHTTPTimeout() models.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DefaultHTTPTimeout")
+	}
+
 	var r0 models.Duration
 	if rf, ok := ret.Get(0).(func() models.Duration); ok {
 		r0 = rf()
@@ -46,6 +54,10 @@ func (_m *Config) DefaultHTTPTimeout() models.Duration {
 func (_m *Config) MaxRunDuration() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaxRunDuration")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -60,6 +72,10 @@ func (_m *Config) MaxRunDuration() time.Duration {
 func (_m *Config) ReaperInterval() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReaperInterval")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -74,6 +90,10 @@ func (_m *Config) ReaperInterval() time.Duration {
 func (_m *Config) ReaperThreshold() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReaperThreshold")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
diff --git a/core/services/pipeline/mocks/orm.go b/core/services/pipeline/mocks/orm.go
index 88d067c6ffa..759686204d4 100644
--- a/core/services/pipeline/mocks/orm.go
+++ b/core/services/pipeline/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -26,6 +26,10 @@ type ORM struct {
 func (_m *ORM) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -47,6 +51,10 @@ func (_m *ORM) CreateRun(run *pipeline.Run, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, ...pg.QOpt) error); ok {
 		r0 = rf(run, qopts...)
@@ -68,6 +76,10 @@ func (_m *ORM) CreateSpec(_a0 pipeline.Pipeline, maxTaskTimeout models.Interval,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSpec")
+	}
+
 	var r0 int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(pipeline.Pipeline, models.Interval, ...pg.QOpt) (int32, error)); ok {
@@ -92,6 +104,10 @@ func (_m *ORM) CreateSpec(_a0 pipeline.Pipeline, maxTaskTimeout models.Interval,
 func (_m *ORM) DeleteRun(id int64) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64) error); ok {
 		r0 = rf(id)
@@ -106,6 +122,10 @@ func (_m *ORM) DeleteRun(id int64) error {
 func (_m *ORM) DeleteRunsOlderThan(_a0 context.Context, _a1 time.Duration) error {
 	ret := _m.Called(_a0, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteRunsOlderThan")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration) error); ok {
 		r0 = rf(_a0, _a1)
@@ -120,6 +140,10 @@ func (_m *ORM) DeleteRunsOlderThan(_a0 context.Context, _a1 time.Duration) error
 func (_m *ORM) FindRun(id int64) (pipeline.Run, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindRun")
+	}
+
 	var r0 pipeline.Run
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (pipeline.Run, error)); ok {
@@ -144,6 +168,10 @@ func (_m *ORM) FindRun(id int64) (pipeline.Run, error) {
 func (_m *ORM) GetAllRuns() ([]pipeline.Run, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllRuns")
+	}
+
 	var r0 []pipeline.Run
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]pipeline.Run, error)); ok {
@@ -170,6 +198,10 @@ func (_m *ORM) GetAllRuns() ([]pipeline.Run, error) {
 func (_m *ORM) GetQ() pg.Q {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetQ")
+	}
+
 	var r0 pg.Q
 	if rf, ok := ret.Get(0).(func() pg.Q); ok {
 		r0 = rf()
@@ -184,6 +216,10 @@ func (_m *ORM) GetQ() pg.Q {
 func (_m *ORM) GetUnfinishedRuns(_a0 context.Context, _a1 time.Time, _a2 func(pipeline.Run) error) error {
 	ret := _m.Called(_a0, _a1, _a2)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUnfinishedRuns")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, func(pipeline.Run) error) error); ok {
 		r0 = rf(_a0, _a1, _a2)
@@ -198,6 +234,10 @@ func (_m *ORM) GetUnfinishedRuns(_a0 context.Context, _a1 time.Time, _a2 func(pi
 func (_m *ORM) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -221,6 +261,10 @@ func (_m *ORM) InsertFinishedRun(run *pipeline.Run, saveSuccessfulTaskRuns bool,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertFinishedRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, bool, ...pg.QOpt) error); ok {
 		r0 = rf(run, saveSuccessfulTaskRuns, qopts...)
@@ -242,6 +286,10 @@ func (_m *ORM) InsertFinishedRuns(run []*pipeline.Run, saveSuccessfulTaskRuns bo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertFinishedRuns")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]*pipeline.Run, bool, ...pg.QOpt) error); ok {
 		r0 = rf(run, saveSuccessfulTaskRuns, qopts...)
@@ -263,6 +311,10 @@ func (_m *ORM) InsertRun(run *pipeline.Run, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, ...pg.QOpt) error); ok {
 		r0 = rf(run, qopts...)
@@ -277,6 +329,10 @@ func (_m *ORM) InsertRun(run *pipeline.Run, qopts ...pg.QOpt) error {
 func (_m *ORM) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -291,6 +347,10 @@ func (_m *ORM) Name() string {
 func (_m *ORM) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -305,6 +365,10 @@ func (_m *ORM) Ready() error {
 func (_m *ORM) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -326,6 +390,10 @@ func (_m *ORM) StoreRun(run *pipeline.Run, qopts ...pg.QOpt) (bool, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StoreRun")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, ...pg.QOpt) (bool, error)); ok {
@@ -350,6 +418,10 @@ func (_m *ORM) StoreRun(run *pipeline.Run, qopts ...pg.QOpt) (bool, error) {
 func (_m *ORM) UpdateTaskRunResult(taskID uuid.UUID, result pipeline.Result) (pipeline.Run, bool, error) {
 	ret := _m.Called(taskID, result)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTaskRunResult")
+	}
+
 	var r0 pipeline.Run
 	var r1 bool
 	var r2 error
diff --git a/core/services/pipeline/mocks/pipeline_param_unmarshaler.go b/core/services/pipeline/mocks/pipeline_param_unmarshaler.go
index 3478ce1322d..40f2ba4dd32 100644
--- a/core/services/pipeline/mocks/pipeline_param_unmarshaler.go
+++ b/core/services/pipeline/mocks/pipeline_param_unmarshaler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type PipelineParamUnmarshaler struct {
 func (_m *PipelineParamUnmarshaler) UnmarshalPipelineParam(val interface{}) error {
 	ret := _m.Called(val)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UnmarshalPipelineParam")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(interface{}) error); ok {
 		r0 = rf(val)
diff --git a/core/services/pipeline/mocks/runner.go b/core/services/pipeline/mocks/runner.go
index 34b55399752..f6e5033eae9 100644
--- a/core/services/pipeline/mocks/runner.go
+++ b/core/services/pipeline/mocks/runner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -24,6 +24,10 @@ type Runner struct {
 func (_m *Runner) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -38,6 +42,10 @@ func (_m *Runner) Close() error {
 func (_m *Runner) ExecuteAndInsertFinishedRun(ctx context.Context, spec pipeline.Spec, vars pipeline.Vars, l logger.Logger, saveSuccessfulTaskRuns bool) (int64, pipeline.FinalResult, error) {
 	ret := _m.Called(ctx, spec, vars, l, saveSuccessfulTaskRuns)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExecuteAndInsertFinishedRun")
+	}
+
 	var r0 int64
 	var r1 pipeline.FinalResult
 	var r2 error
@@ -69,6 +77,10 @@ func (_m *Runner) ExecuteAndInsertFinishedRun(ctx context.Context, spec pipeline
 func (_m *Runner) ExecuteRun(ctx context.Context, spec pipeline.Spec, vars pipeline.Vars, l logger.Logger) (*pipeline.Run, pipeline.TaskRunResults, error) {
 	ret := _m.Called(ctx, spec, vars, l)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExecuteRun")
+	}
+
 	var r0 *pipeline.Run
 	var r1 pipeline.TaskRunResults
 	var r2 error
@@ -104,6 +116,10 @@ func (_m *Runner) ExecuteRun(ctx context.Context, spec pipeline.Spec, vars pipel
 func (_m *Runner) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -127,6 +143,10 @@ func (_m *Runner) InsertFinishedRun(run *pipeline.Run, saveSuccessfulTaskRuns bo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertFinishedRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, bool, ...pg.QOpt) error); ok {
 		r0 = rf(run, saveSuccessfulTaskRuns, qopts...)
@@ -148,6 +168,10 @@ func (_m *Runner) InsertFinishedRuns(runs []*pipeline.Run, saveSuccessfulTaskRun
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertFinishedRuns")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]*pipeline.Run, bool, ...pg.QOpt) error); ok {
 		r0 = rf(runs, saveSuccessfulTaskRuns, qopts...)
@@ -162,6 +186,10 @@ func (_m *Runner) InsertFinishedRuns(runs []*pipeline.Run, saveSuccessfulTaskRun
 func (_m *Runner) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -181,6 +209,10 @@ func (_m *Runner) OnRunFinished(_a0 func(*pipeline.Run)) {
 func (_m *Runner) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -195,6 +227,10 @@ func (_m *Runner) Ready() error {
 func (_m *Runner) ResumeRun(taskID uuid.UUID, value interface{}, err error) error {
 	ret := _m.Called(taskID, value, err)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ResumeRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(uuid.UUID, interface{}, error) error); ok {
 		r0 = rf(taskID, value, err)
@@ -209,6 +245,10 @@ func (_m *Runner) ResumeRun(taskID uuid.UUID, value interface{}, err error) erro
 func (_m *Runner) Run(ctx context.Context, run *pipeline.Run, l logger.Logger, saveSuccessfulTaskRuns bool, fn func(pg.Queryer) error) (bool, error) {
 	ret := _m.Called(ctx, run, l, saveSuccessfulTaskRuns, fn)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Run")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *pipeline.Run, logger.Logger, bool, func(pg.Queryer) error) (bool, error)); ok {
@@ -233,6 +273,10 @@ func (_m *Runner) Run(ctx context.Context, run *pipeline.Run, l logger.Logger, s
 func (_m *Runner) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/relay/evm/mercury/mocks/async_deleter.go b/core/services/relay/evm/mercury/mocks/async_deleter.go
index c0f583efd18..b706e9c771e 100644
--- a/core/services/relay/evm/mercury/mocks/async_deleter.go
+++ b/core/services/relay/evm/mercury/mocks/async_deleter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/core/services/relay/evm/mocks/loop_relay_adapter.go b/core/services/relay/evm/mocks/loop_relay_adapter.go
index 0376c9f27a4..5b927f1b8ac 100644
--- a/core/services/relay/evm/mocks/loop_relay_adapter.go
+++ b/core/services/relay/evm/mocks/loop_relay_adapter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -22,6 +22,10 @@ type LoopRelayAdapter struct {
 func (_m *LoopRelayAdapter) Chain() legacyevm.Chain {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Chain")
+	}
+
 	var r0 legacyevm.Chain
 	if rf, ok := ret.Get(0).(func() legacyevm.Chain); ok {
 		r0 = rf()
@@ -38,6 +42,10 @@ func (_m *LoopRelayAdapter) Chain() legacyevm.Chain {
 func (_m *LoopRelayAdapter) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -52,6 +60,10 @@ func (_m *LoopRelayAdapter) Close() error {
 func (_m *LoopRelayAdapter) GetChainStatus(ctx context.Context) (types.ChainStatus, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChainStatus")
+	}
+
 	var r0 types.ChainStatus
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (types.ChainStatus, error)); ok {
@@ -76,6 +88,10 @@ func (_m *LoopRelayAdapter) GetChainStatus(ctx context.Context) (types.ChainStat
 func (_m *LoopRelayAdapter) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *LoopRelayAdapter) HealthReport() map[string]error {
 func (_m *LoopRelayAdapter) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken string) ([]types.NodeStatus, string, int, error) {
 	ret := _m.Called(ctx, pageSize, pageToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListNodeStatuses")
+	}
+
 	var r0 []types.NodeStatus
 	var r1 string
 	var r2 int
@@ -132,6 +152,10 @@ func (_m *LoopRelayAdapter) ListNodeStatuses(ctx context.Context, pageSize int32
 func (_m *LoopRelayAdapter) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -146,6 +170,10 @@ func (_m *LoopRelayAdapter) Name() string {
 func (_m *LoopRelayAdapter) NewConfigProvider(_a0 context.Context, _a1 types.RelayArgs) (types.ConfigProvider, error) {
 	ret := _m.Called(_a0, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewConfigProvider")
+	}
+
 	var r0 types.ConfigProvider
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.RelayArgs) (types.ConfigProvider, error)); ok {
@@ -172,6 +200,10 @@ func (_m *LoopRelayAdapter) NewConfigProvider(_a0 context.Context, _a1 types.Rel
 func (_m *LoopRelayAdapter) NewPluginProvider(_a0 context.Context, _a1 types.RelayArgs, _a2 types.PluginArgs) (types.PluginProvider, error) {
 	ret := _m.Called(_a0, _a1, _a2)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewPluginProvider")
+	}
+
 	var r0 types.PluginProvider
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.RelayArgs, types.PluginArgs) (types.PluginProvider, error)); ok {
@@ -198,6 +230,10 @@ func (_m *LoopRelayAdapter) NewPluginProvider(_a0 context.Context, _a1 types.Rel
 func (_m *LoopRelayAdapter) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -212,6 +248,10 @@ func (_m *LoopRelayAdapter) Ready() error {
 func (_m *LoopRelayAdapter) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -226,6 +266,10 @@ func (_m *LoopRelayAdapter) Start(_a0 context.Context) error {
 func (_m *LoopRelayAdapter) Transact(ctx context.Context, from string, to string, amount *big.Int, balanceCheck bool) error {
 	ret := _m.Called(ctx, from, to, amount, balanceCheck)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Transact")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, *big.Int, bool) error); ok {
 		r0 = rf(ctx, from, to, amount, balanceCheck)
diff --git a/core/services/relay/evm/mocks/request_round_db.go b/core/services/relay/evm/mocks/request_round_db.go
index 1727e8cc47d..eb27e8bd526 100644
--- a/core/services/relay/evm/mocks/request_round_db.go
+++ b/core/services/relay/evm/mocks/request_round_db.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type RequestRoundDB struct {
 func (_m *RequestRoundDB) LoadLatestRoundRequested() (ocr2aggregator.OCR2AggregatorRoundRequested, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LoadLatestRoundRequested")
+	}
+
 	var r0 ocr2aggregator.OCR2AggregatorRoundRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (ocr2aggregator.OCR2AggregatorRoundRequested, error)); ok {
@@ -41,6 +45,10 @@ func (_m *RequestRoundDB) LoadLatestRoundRequested() (ocr2aggregator.OCR2Aggrega
 func (_m *RequestRoundDB) SaveLatestRoundRequested(tx pg.Queryer, rr ocr2aggregator.OCR2AggregatorRoundRequested) error {
 	ret := _m.Called(tx, rr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveLatestRoundRequested")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(pg.Queryer, ocr2aggregator.OCR2AggregatorRoundRequested) error); ok {
 		r0 = rf(tx, rr)
diff --git a/core/services/relay/evm/types/mocks/log_poller_wrapper.go b/core/services/relay/evm/types/mocks/log_poller_wrapper.go
index 6812ce5aba3..675cf317b14 100644
--- a/core/services/relay/evm/types/mocks/log_poller_wrapper.go
+++ b/core/services/relay/evm/types/mocks/log_poller_wrapper.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type LogPollerWrapper struct {
 func (_m *LogPollerWrapper) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *LogPollerWrapper) Close() error {
 func (_m *LogPollerWrapper) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *LogPollerWrapper) HealthReport() map[string]error {
 func (_m *LogPollerWrapper) LatestEvents() ([]types.OracleRequest, []types.OracleResponse, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestEvents")
+	}
+
 	var r0 []types.OracleRequest
 	var r1 []types.OracleResponse
 	var r2 error
@@ -83,6 +95,10 @@ func (_m *LogPollerWrapper) LatestEvents() ([]types.OracleRequest, []types.Oracl
 func (_m *LogPollerWrapper) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -97,6 +113,10 @@ func (_m *LogPollerWrapper) Name() string {
 func (_m *LogPollerWrapper) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -111,6 +131,10 @@ func (_m *LogPollerWrapper) Ready() error {
 func (_m *LogPollerWrapper) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/s4/mocks/orm.go b/core/services/s4/mocks/orm.go
index f053af9ca7b..706c1194293 100644
--- a/core/services/s4/mocks/orm.go
+++ b/core/services/s4/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ func (_m *ORM) DeleteExpired(limit uint, utcNow time.Time, qopts ...pg.QOpt) (in
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteExpired")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(uint, time.Time, ...pg.QOpt) (int64, error)); ok {
@@ -59,6 +63,10 @@ func (_m *ORM) Get(address *utils.Big, slotId uint, qopts ...pg.QOpt) (*s4.Row,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *s4.Row
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*utils.Big, uint, ...pg.QOpt) (*s4.Row, error)); ok {
@@ -92,6 +100,10 @@ func (_m *ORM) GetSnapshot(addressRange *s4.AddressRange, qopts ...pg.QOpt) ([]*
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSnapshot")
+	}
+
 	var r0 []*s4.SnapshotRow
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*s4.AddressRange, ...pg.QOpt) ([]*s4.SnapshotRow, error)); ok {
@@ -125,6 +137,10 @@ func (_m *ORM) GetUnconfirmedRows(limit uint, qopts ...pg.QOpt) ([]*s4.Row, erro
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUnconfirmedRows")
+	}
+
 	var r0 []*s4.Row
 	var r1 error
 	if rf, ok := ret.Get(0).(func(uint, ...pg.QOpt) ([]*s4.Row, error)); ok {
@@ -158,6 +174,10 @@ func (_m *ORM) Update(row *s4.Row, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*s4.Row, ...pg.QOpt) error); ok {
 		r0 = rf(row, qopts...)
diff --git a/core/services/s4/mocks/storage.go b/core/services/s4/mocks/storage.go
index f4174f171b8..06fc153a358 100644
--- a/core/services/s4/mocks/storage.go
+++ b/core/services/s4/mocks/storage.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Storage struct {
 func (_m *Storage) Constraints() s4.Constraints {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Constraints")
+	}
+
 	var r0 s4.Constraints
 	if rf, ok := ret.Get(0).(func() s4.Constraints); ok {
 		r0 = rf()
@@ -35,6 +39,10 @@ func (_m *Storage) Constraints() s4.Constraints {
 func (_m *Storage) Get(ctx context.Context, key *s4.Key) (*s4.Record, *s4.Metadata, error) {
 	ret := _m.Called(ctx, key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *s4.Record
 	var r1 *s4.Metadata
 	var r2 error
@@ -70,6 +78,10 @@ func (_m *Storage) Get(ctx context.Context, key *s4.Key) (*s4.Record, *s4.Metada
 func (_m *Storage) List(ctx context.Context, address common.Address) ([]*s4.SnapshotRow, error) {
 	ret := _m.Called(ctx, address)
 
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
 	var r0 []*s4.SnapshotRow
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) ([]*s4.SnapshotRow, error)); ok {
@@ -96,6 +108,10 @@ func (_m *Storage) List(ctx context.Context, address common.Address) ([]*s4.Snap
 func (_m *Storage) Put(ctx context.Context, key *s4.Key, record *s4.Record, signature []byte) error {
 	ret := _m.Called(ctx, key, record, signature)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Put")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *s4.Key, *s4.Record, []byte) error); ok {
 		r0 = rf(ctx, key, record, signature)
diff --git a/core/services/synchronization/mocks/telemetry_service.go b/core/services/synchronization/mocks/telemetry_service.go
index bd822666b97..375b46ad7bb 100644
--- a/core/services/synchronization/mocks/telemetry_service.go
+++ b/core/services/synchronization/mocks/telemetry_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type TelemetryService struct {
 func (_m *TelemetryService) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *TelemetryService) Close() error {
 func (_m *TelemetryService) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *TelemetryService) HealthReport() map[string]error {
 func (_m *TelemetryService) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -62,6 +74,10 @@ func (_m *TelemetryService) Name() string {
 func (_m *TelemetryService) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -81,6 +97,10 @@ func (_m *TelemetryService) Send(ctx context.Context, telemetry []byte, contract
 func (_m *TelemetryService) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/vrf/mocks/aggregator_v3_interface.go b/core/services/vrf/mocks/aggregator_v3_interface.go
index 956e315f297..46ca11aa200 100644
--- a/core/services/vrf/mocks/aggregator_v3_interface.go
+++ b/core/services/vrf/mocks/aggregator_v3_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -23,6 +23,10 @@ type AggregatorV3Interface struct {
 func (_m *AggregatorV3Interface) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -39,6 +43,10 @@ func (_m *AggregatorV3Interface) Address() common.Address {
 func (_m *AggregatorV3Interface) Decimals(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Decimals")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -63,6 +71,10 @@ func (_m *AggregatorV3Interface) Decimals(opts *bind.CallOpts) (uint8, error) {
 func (_m *AggregatorV3Interface) Description(opts *bind.CallOpts) (string, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Description")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
@@ -87,6 +99,10 @@ func (_m *AggregatorV3Interface) Description(opts *bind.CallOpts) (string, error
 func (_m *AggregatorV3Interface) GetRoundData(opts *bind.CallOpts, _roundId *big.Int) (aggregator_v3_interface.GetRoundData, error) {
 	ret := _m.Called(opts, _roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRoundData")
+	}
+
 	var r0 aggregator_v3_interface.GetRoundData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (aggregator_v3_interface.GetRoundData, error)); ok {
@@ -111,6 +127,10 @@ func (_m *AggregatorV3Interface) GetRoundData(opts *bind.CallOpts, _roundId *big
 func (_m *AggregatorV3Interface) LatestRoundData(opts *bind.CallOpts) (aggregator_v3_interface.LatestRoundData, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestRoundData")
+	}
+
 	var r0 aggregator_v3_interface.LatestRoundData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (aggregator_v3_interface.LatestRoundData, error)); ok {
@@ -135,6 +155,10 @@ func (_m *AggregatorV3Interface) LatestRoundData(opts *bind.CallOpts) (aggregato
 func (_m *AggregatorV3Interface) Version(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Version")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
diff --git a/core/services/vrf/mocks/config.go b/core/services/vrf/mocks/config.go
index 72d5960f2c9..b46a28ec037 100644
--- a/core/services/vrf/mocks/config.go
+++ b/core/services/vrf/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type Config struct {
 func (_m *Config) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -27,6 +31,10 @@ func (_m *Config) FinalityDepth() uint32 {
 func (_m *Config) MinIncomingConfirmations() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for MinIncomingConfirmations")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
diff --git a/core/services/vrf/mocks/fee_config.go b/core/services/vrf/mocks/fee_config.go
index 067ce7e4455..2f33415b338 100644
--- a/core/services/vrf/mocks/fee_config.go
+++ b/core/services/vrf/mocks/fee_config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type FeeConfig struct {
 func (_m *FeeConfig) LimitDefault() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitDefault")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *FeeConfig) LimitDefault() uint32 {
 func (_m *FeeConfig) LimitJobType() config.LimitJobType {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitJobType")
+	}
+
 	var r0 config.LimitJobType
 	if rf, ok := ret.Get(0).(func() config.LimitJobType); ok {
 		r0 = rf()
@@ -50,6 +58,10 @@ func (_m *FeeConfig) LimitJobType() config.LimitJobType {
 func (_m *FeeConfig) PriceMaxKey(addr common.Address) *assets.Wei {
 	ret := _m.Called(addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceMaxKey")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func(common.Address) *assets.Wei); ok {
 		r0 = rf(addr)
diff --git a/core/services/vrf/mocks/vrf_coordinator_v2.go b/core/services/vrf/mocks/vrf_coordinator_v2.go
index c39995b38e9..529bc789257 100644
--- a/core/services/vrf/mocks/vrf_coordinator_v2.go
+++ b/core/services/vrf/mocks/vrf_coordinator_v2.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ type VRFCoordinatorV2Interface struct {
 func (_m *VRFCoordinatorV2Interface) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -54,6 +58,10 @@ func (_m *VRFCoordinatorV2Interface) AcceptOwnership(opts *bind.TransactOpts) (*
 func (_m *VRFCoordinatorV2Interface) AcceptSubscriptionOwnerTransfer(opts *bind.TransactOpts, subId uint64) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptSubscriptionOwnerTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64) (*types.Transaction, error)); ok {
@@ -80,6 +88,10 @@ func (_m *VRFCoordinatorV2Interface) AcceptSubscriptionOwnerTransfer(opts *bind.
 func (_m *VRFCoordinatorV2Interface) AddConsumer(opts *bind.TransactOpts, subId uint64, consumer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, consumer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddConsumer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, common.Address) (*types.Transaction, error)); ok {
@@ -106,6 +118,10 @@ func (_m *VRFCoordinatorV2Interface) AddConsumer(opts *bind.TransactOpts, subId
 func (_m *VRFCoordinatorV2Interface) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -122,6 +138,10 @@ func (_m *VRFCoordinatorV2Interface) Address() common.Address {
 func (_m *VRFCoordinatorV2Interface) BLOCKHASHSTORE(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BLOCKHASHSTORE")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -148,6 +168,10 @@ func (_m *VRFCoordinatorV2Interface) BLOCKHASHSTORE(opts *bind.CallOpts) (common
 func (_m *VRFCoordinatorV2Interface) CancelSubscription(opts *bind.TransactOpts, subId uint64, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, common.Address) (*types.Transaction, error)); ok {
@@ -174,6 +198,10 @@ func (_m *VRFCoordinatorV2Interface) CancelSubscription(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) CreateSubscription(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -200,6 +228,10 @@ func (_m *VRFCoordinatorV2Interface) CreateSubscription(opts *bind.TransactOpts)
 func (_m *VRFCoordinatorV2Interface) DeregisterProvingKey(opts *bind.TransactOpts, publicProvingKey [2]*big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, publicProvingKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeregisterProvingKey")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, [2]*big.Int) (*types.Transaction, error)); ok {
@@ -226,6 +258,10 @@ func (_m *VRFCoordinatorV2Interface) DeregisterProvingKey(opts *bind.TransactOpt
 func (_m *VRFCoordinatorV2Interface) FilterConfigSet(opts *bind.FilterOpts) (*vrf_coordinator_v2.VRFCoordinatorV2ConfigSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterConfigSet")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ConfigSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator_v2.VRFCoordinatorV2ConfigSetIterator, error)); ok {
@@ -252,6 +288,10 @@ func (_m *VRFCoordinatorV2Interface) FilterConfigSet(opts *bind.FilterOpts) (*vr
 func (_m *VRFCoordinatorV2Interface) FilterFundsRecovered(opts *bind.FilterOpts) (*vrf_coordinator_v2.VRFCoordinatorV2FundsRecoveredIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterFundsRecovered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2FundsRecoveredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator_v2.VRFCoordinatorV2FundsRecoveredIterator, error)); ok {
@@ -278,6 +318,10 @@ func (_m *VRFCoordinatorV2Interface) FilterFundsRecovered(opts *bind.FilterOpts)
 func (_m *VRFCoordinatorV2Interface) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequestedIterator, error)); ok {
@@ -304,6 +348,10 @@ func (_m *VRFCoordinatorV2Interface) FilterOwnershipTransferRequested(opts *bind
 func (_m *VRFCoordinatorV2Interface) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferredIterator, error)); ok {
@@ -330,6 +378,10 @@ func (_m *VRFCoordinatorV2Interface) FilterOwnershipTransferred(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterProvingKeyDeregistered(opts *bind.FilterOpts, oracle []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregisteredIterator, error) {
 	ret := _m.Called(opts, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterProvingKeyDeregistered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregisteredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregisteredIterator, error)); ok {
@@ -356,6 +408,10 @@ func (_m *VRFCoordinatorV2Interface) FilterProvingKeyDeregistered(opts *bind.Fil
 func (_m *VRFCoordinatorV2Interface) FilterProvingKeyRegistered(opts *bind.FilterOpts, oracle []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegisteredIterator, error) {
 	ret := _m.Called(opts, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterProvingKeyRegistered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegisteredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegisteredIterator, error)); ok {
@@ -382,6 +438,10 @@ func (_m *VRFCoordinatorV2Interface) FilterProvingKeyRegistered(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterRandomWordsFulfilled(opts *bind.FilterOpts, requestId []*big.Int) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilledIterator, error) {
 	ret := _m.Called(opts, requestId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilledIterator, error)); ok {
@@ -408,6 +468,10 @@ func (_m *VRFCoordinatorV2Interface) FilterRandomWordsFulfilled(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterRandomWordsRequested(opts *bind.FilterOpts, keyHash [][32]byte, subId []uint64, sender []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequestedIterator, error) {
 	ret := _m.Called(opts, keyHash, subId, sender)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomWordsRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, [][32]byte, []uint64, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequestedIterator, error)); ok {
@@ -434,6 +498,10 @@ func (_m *VRFCoordinatorV2Interface) FilterRandomWordsRequested(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionCanceled(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceledIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionCanceled")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceledIterator, error)); ok {
@@ -460,6 +528,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionCanceled(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionConsumerAdded(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAddedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionConsumerAdded")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAddedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAddedIterator, error)); ok {
@@ -486,6 +558,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionConsumerAdded(opts *bind.
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionConsumerRemoved(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemovedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionConsumerRemoved")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemovedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemovedIterator, error)); ok {
@@ -512,6 +588,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionConsumerRemoved(opts *bin
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionCreated(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreatedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionCreated")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreatedIterator, error)); ok {
@@ -538,6 +618,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionCreated(opts *bind.Filter
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionFunded(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFundedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionFunded")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFundedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFundedIterator, error)); ok {
@@ -564,6 +648,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionFunded(opts *bind.FilterO
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionOwnerTransferRequested(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequestedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequestedIterator, error)); ok {
@@ -590,6 +678,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionOwnerTransferRequested(op
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionOwnerTransferred(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferredIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionOwnerTransferred")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferredIterator, error)); ok {
@@ -616,6 +708,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionOwnerTransferred(opts *bi
 func (_m *VRFCoordinatorV2Interface) FulfillRandomWords(opts *bind.TransactOpts, proof vrf_coordinator_v2.VRFProof, rc vrf_coordinator_v2.VRFCoordinatorV2RequestCommitment) (*types.Transaction, error) {
 	ret := _m.Called(opts, proof, rc)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FulfillRandomWords")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_coordinator_v2.VRFProof, vrf_coordinator_v2.VRFCoordinatorV2RequestCommitment) (*types.Transaction, error)); ok {
@@ -642,6 +738,10 @@ func (_m *VRFCoordinatorV2Interface) FulfillRandomWords(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) GetCommitment(opts *bind.CallOpts, requestId *big.Int) ([32]byte, error) {
 	ret := _m.Called(opts, requestId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCommitment")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) ([32]byte, error)); ok {
@@ -668,6 +768,10 @@ func (_m *VRFCoordinatorV2Interface) GetCommitment(opts *bind.CallOpts, requestI
 func (_m *VRFCoordinatorV2Interface) GetConfig(opts *bind.CallOpts) (vrf_coordinator_v2.GetConfig, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConfig")
+	}
+
 	var r0 vrf_coordinator_v2.GetConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_coordinator_v2.GetConfig, error)); ok {
@@ -692,6 +796,10 @@ func (_m *VRFCoordinatorV2Interface) GetConfig(opts *bind.CallOpts) (vrf_coordin
 func (_m *VRFCoordinatorV2Interface) GetCurrentSubId(opts *bind.CallOpts) (uint64, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCurrentSubId")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint64, error)); ok {
@@ -716,6 +824,10 @@ func (_m *VRFCoordinatorV2Interface) GetCurrentSubId(opts *bind.CallOpts) (uint6
 func (_m *VRFCoordinatorV2Interface) GetFallbackWeiPerUnitLink(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFallbackWeiPerUnitLink")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -742,6 +854,10 @@ func (_m *VRFCoordinatorV2Interface) GetFallbackWeiPerUnitLink(opts *bind.CallOp
 func (_m *VRFCoordinatorV2Interface) GetFeeConfig(opts *bind.CallOpts) (vrf_coordinator_v2.GetFeeConfig, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFeeConfig")
+	}
+
 	var r0 vrf_coordinator_v2.GetFeeConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_coordinator_v2.GetFeeConfig, error)); ok {
@@ -766,6 +882,10 @@ func (_m *VRFCoordinatorV2Interface) GetFeeConfig(opts *bind.CallOpts) (vrf_coor
 func (_m *VRFCoordinatorV2Interface) GetFeeTier(opts *bind.CallOpts, reqCount uint64) (uint32, error) {
 	ret := _m.Called(opts, reqCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFeeTier")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (uint32, error)); ok {
@@ -790,6 +910,10 @@ func (_m *VRFCoordinatorV2Interface) GetFeeTier(opts *bind.CallOpts, reqCount ui
 func (_m *VRFCoordinatorV2Interface) GetRequestConfig(opts *bind.CallOpts) (uint16, uint32, [][32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRequestConfig")
+	}
+
 	var r0 uint16
 	var r1 uint32
 	var r2 [][32]byte
@@ -830,6 +954,10 @@ func (_m *VRFCoordinatorV2Interface) GetRequestConfig(opts *bind.CallOpts) (uint
 func (_m *VRFCoordinatorV2Interface) GetSubscription(opts *bind.CallOpts, subId uint64) (vrf_coordinator_v2.GetSubscription, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSubscription")
+	}
+
 	var r0 vrf_coordinator_v2.GetSubscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (vrf_coordinator_v2.GetSubscription, error)); ok {
@@ -854,6 +982,10 @@ func (_m *VRFCoordinatorV2Interface) GetSubscription(opts *bind.CallOpts, subId
 func (_m *VRFCoordinatorV2Interface) GetTotalBalance(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTotalBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -880,6 +1012,10 @@ func (_m *VRFCoordinatorV2Interface) GetTotalBalance(opts *bind.CallOpts) (*big.
 func (_m *VRFCoordinatorV2Interface) HashOfKey(opts *bind.CallOpts, publicKey [2]*big.Int) ([32]byte, error) {
 	ret := _m.Called(opts, publicKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HashOfKey")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, [2]*big.Int) ([32]byte, error)); ok {
@@ -906,6 +1042,10 @@ func (_m *VRFCoordinatorV2Interface) HashOfKey(opts *bind.CallOpts, publicKey [2
 func (_m *VRFCoordinatorV2Interface) LINK(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LINK")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -932,6 +1072,10 @@ func (_m *VRFCoordinatorV2Interface) LINK(opts *bind.CallOpts) (common.Address,
 func (_m *VRFCoordinatorV2Interface) LINKETHFEED(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LINKETHFEED")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -958,6 +1102,10 @@ func (_m *VRFCoordinatorV2Interface) LINKETHFEED(opts *bind.CallOpts) (common.Ad
 func (_m *VRFCoordinatorV2Interface) MAXCONSUMERS(opts *bind.CallOpts) (uint16, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXCONSUMERS")
+	}
+
 	var r0 uint16
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint16, error)); ok {
@@ -982,6 +1130,10 @@ func (_m *VRFCoordinatorV2Interface) MAXCONSUMERS(opts *bind.CallOpts) (uint16,
 func (_m *VRFCoordinatorV2Interface) MAXNUMWORDS(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXNUMWORDS")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -1006,6 +1158,10 @@ func (_m *VRFCoordinatorV2Interface) MAXNUMWORDS(opts *bind.CallOpts) (uint32, e
 func (_m *VRFCoordinatorV2Interface) MAXREQUESTCONFIRMATIONS(opts *bind.CallOpts) (uint16, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXREQUESTCONFIRMATIONS")
+	}
+
 	var r0 uint16
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint16, error)); ok {
@@ -1030,6 +1186,10 @@ func (_m *VRFCoordinatorV2Interface) MAXREQUESTCONFIRMATIONS(opts *bind.CallOpts
 func (_m *VRFCoordinatorV2Interface) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.Address, amount *big.Int, data []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, arg0, amount, data)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OnTokenTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -1056,6 +1216,10 @@ func (_m *VRFCoordinatorV2Interface) OnTokenTransfer(opts *bind.TransactOpts, ar
 func (_m *VRFCoordinatorV2Interface) OracleWithdraw(opts *bind.TransactOpts, recipient common.Address, amount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, recipient, amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OracleWithdraw")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -1082,6 +1246,10 @@ func (_m *VRFCoordinatorV2Interface) OracleWithdraw(opts *bind.TransactOpts, rec
 func (_m *VRFCoordinatorV2Interface) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1108,6 +1276,10 @@ func (_m *VRFCoordinatorV2Interface) Owner(opts *bind.CallOpts) (common.Address,
 func (_m *VRFCoordinatorV2Interface) OwnerCancelSubscription(opts *bind.TransactOpts, subId uint64) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OwnerCancelSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64) (*types.Transaction, error)); ok {
@@ -1134,6 +1306,10 @@ func (_m *VRFCoordinatorV2Interface) OwnerCancelSubscription(opts *bind.Transact
 func (_m *VRFCoordinatorV2Interface) ParseConfigSet(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ConfigSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseConfigSet")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ConfigSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ConfigSet, error)); ok {
@@ -1160,6 +1336,10 @@ func (_m *VRFCoordinatorV2Interface) ParseConfigSet(log types.Log) (*vrf_coordin
 func (_m *VRFCoordinatorV2Interface) ParseFundsRecovered(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseFundsRecovered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered, error)); ok {
@@ -1186,6 +1366,10 @@ func (_m *VRFCoordinatorV2Interface) ParseFundsRecovered(log types.Log) (*vrf_co
 func (_m *VRFCoordinatorV2Interface) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -1212,6 +1396,10 @@ func (_m *VRFCoordinatorV2Interface) ParseLog(log types.Log) (generated.AbigenLo
 func (_m *VRFCoordinatorV2Interface) ParseOwnershipTransferRequested(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested, error)); ok {
@@ -1238,6 +1426,10 @@ func (_m *VRFCoordinatorV2Interface) ParseOwnershipTransferRequested(log types.L
 func (_m *VRFCoordinatorV2Interface) ParseOwnershipTransferred(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred, error)); ok {
@@ -1264,6 +1456,10 @@ func (_m *VRFCoordinatorV2Interface) ParseOwnershipTransferred(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseProvingKeyDeregistered(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseProvingKeyDeregistered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered, error)); ok {
@@ -1290,6 +1486,10 @@ func (_m *VRFCoordinatorV2Interface) ParseProvingKeyDeregistered(log types.Log)
 func (_m *VRFCoordinatorV2Interface) ParseProvingKeyRegistered(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseProvingKeyRegistered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered, error)); ok {
@@ -1316,6 +1516,10 @@ func (_m *VRFCoordinatorV2Interface) ParseProvingKeyRegistered(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseRandomWordsFulfilled(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, error)); ok {
@@ -1342,6 +1546,10 @@ func (_m *VRFCoordinatorV2Interface) ParseRandomWordsFulfilled(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseRandomWordsRequested(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomWordsRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested, error)); ok {
@@ -1368,6 +1576,10 @@ func (_m *VRFCoordinatorV2Interface) ParseRandomWordsRequested(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionCanceled(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionCanceled")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled, error)); ok {
@@ -1394,6 +1606,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionCanceled(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionConsumerAdded(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionConsumerAdded")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded, error)); ok {
@@ -1420,6 +1636,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionConsumerAdded(log types.Lo
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionConsumerRemoved(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionConsumerRemoved")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved, error)); ok {
@@ -1446,6 +1666,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionConsumerRemoved(log types.
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionCreated(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionCreated")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated, error)); ok {
@@ -1472,6 +1696,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionCreated(log types.Log) (*v
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionFunded(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionFunded")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded, error)); ok {
@@ -1498,6 +1726,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionFunded(log types.Log) (*vr
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionOwnerTransferRequested(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested, error)); ok {
@@ -1524,6 +1756,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionOwnerTransferRequested(log
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionOwnerTransferred(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionOwnerTransferred")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred, error)); ok {
@@ -1550,6 +1786,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionOwnerTransferred(log types
 func (_m *VRFCoordinatorV2Interface) PendingRequestExists(opts *bind.CallOpts, subId uint64) (bool, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingRequestExists")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (bool, error)); ok {
@@ -1574,6 +1814,10 @@ func (_m *VRFCoordinatorV2Interface) PendingRequestExists(opts *bind.CallOpts, s
 func (_m *VRFCoordinatorV2Interface) RecoverFunds(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RecoverFunds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1600,6 +1844,10 @@ func (_m *VRFCoordinatorV2Interface) RecoverFunds(opts *bind.TransactOpts, to co
 func (_m *VRFCoordinatorV2Interface) RegisterProvingKey(opts *bind.TransactOpts, oracle common.Address, publicProvingKey [2]*big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, oracle, publicProvingKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RegisterProvingKey")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, [2]*big.Int) (*types.Transaction, error)); ok {
@@ -1626,6 +1874,10 @@ func (_m *VRFCoordinatorV2Interface) RegisterProvingKey(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) RemoveConsumer(opts *bind.TransactOpts, subId uint64, consumer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, consumer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveConsumer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, common.Address) (*types.Transaction, error)); ok {
@@ -1652,6 +1904,10 @@ func (_m *VRFCoordinatorV2Interface) RemoveConsumer(opts *bind.TransactOpts, sub
 func (_m *VRFCoordinatorV2Interface) RequestRandomWords(opts *bind.TransactOpts, keyHash [32]byte, subId uint64, requestConfirmations uint16, callbackGasLimit uint32, numWords uint32) (*types.Transaction, error) {
 	ret := _m.Called(opts, keyHash, subId, requestConfirmations, callbackGasLimit, numWords)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestRandomWords")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, [32]byte, uint64, uint16, uint32, uint32) (*types.Transaction, error)); ok {
@@ -1678,6 +1934,10 @@ func (_m *VRFCoordinatorV2Interface) RequestRandomWords(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) RequestSubscriptionOwnerTransfer(opts *bind.TransactOpts, subId uint64, newOwner common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, newOwner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestSubscriptionOwnerTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, common.Address) (*types.Transaction, error)); ok {
@@ -1704,6 +1964,10 @@ func (_m *VRFCoordinatorV2Interface) RequestSubscriptionOwnerTransfer(opts *bind
 func (_m *VRFCoordinatorV2Interface) SetConfig(opts *bind.TransactOpts, minimumRequestConfirmations uint16, maxGasLimit uint32, stalenessSeconds uint32, gasAfterPaymentCalculation uint32, fallbackWeiPerUnitLink *big.Int, feeConfig vrf_coordinator_v2.VRFCoordinatorV2FeeConfig) (*types.Transaction, error) {
 	ret := _m.Called(opts, minimumRequestConfirmations, maxGasLimit, stalenessSeconds, gasAfterPaymentCalculation, fallbackWeiPerUnitLink, feeConfig)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetConfig")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint16, uint32, uint32, uint32, *big.Int, vrf_coordinator_v2.VRFCoordinatorV2FeeConfig) (*types.Transaction, error)); ok {
@@ -1730,6 +1994,10 @@ func (_m *VRFCoordinatorV2Interface) SetConfig(opts *bind.TransactOpts, minimumR
 func (_m *VRFCoordinatorV2Interface) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1756,6 +2024,10 @@ func (_m *VRFCoordinatorV2Interface) TransferOwnership(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) TypeAndVersion(opts *bind.CallOpts) (string, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TypeAndVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
@@ -1780,6 +2052,10 @@ func (_m *VRFCoordinatorV2Interface) TypeAndVersion(opts *bind.CallOpts) (string
 func (_m *VRFCoordinatorV2Interface) WatchConfigSet(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2ConfigSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchConfigSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2ConfigSet) (event.Subscription, error)); ok {
@@ -1806,6 +2082,10 @@ func (_m *VRFCoordinatorV2Interface) WatchConfigSet(opts *bind.WatchOpts, sink c
 func (_m *VRFCoordinatorV2Interface) WatchFundsRecovered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchFundsRecovered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered) (event.Subscription, error)); ok {
@@ -1832,6 +2112,10 @@ func (_m *VRFCoordinatorV2Interface) WatchFundsRecovered(opts *bind.WatchOpts, s
 func (_m *VRFCoordinatorV2Interface) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1858,6 +2142,10 @@ func (_m *VRFCoordinatorV2Interface) WatchOwnershipTransferRequested(opts *bind.
 func (_m *VRFCoordinatorV2Interface) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1884,6 +2172,10 @@ func (_m *VRFCoordinatorV2Interface) WatchOwnershipTransferred(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchProvingKeyDeregistered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered, oracle []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchProvingKeyDeregistered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered, []common.Address) (event.Subscription, error)); ok {
@@ -1910,6 +2202,10 @@ func (_m *VRFCoordinatorV2Interface) WatchProvingKeyDeregistered(opts *bind.Watc
 func (_m *VRFCoordinatorV2Interface) WatchProvingKeyRegistered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered, oracle []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchProvingKeyRegistered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered, []common.Address) (event.Subscription, error)); ok {
@@ -1936,6 +2232,10 @@ func (_m *VRFCoordinatorV2Interface) WatchProvingKeyRegistered(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchRandomWordsFulfilled(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, requestId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomWordsFulfilled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, []*big.Int) (event.Subscription, error)); ok {
@@ -1962,6 +2262,10 @@ func (_m *VRFCoordinatorV2Interface) WatchRandomWordsFulfilled(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchRandomWordsRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested, keyHash [][32]byte, subId []uint64, sender []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, keyHash, subId, sender)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomWordsRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested, [][32]byte, []uint64, []common.Address) (event.Subscription, error)); ok {
@@ -1988,6 +2292,10 @@ func (_m *VRFCoordinatorV2Interface) WatchRandomWordsRequested(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionCanceled(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionCanceled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled, []uint64) (event.Subscription, error)); ok {
@@ -2014,6 +2322,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionCanceled(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionConsumerAdded(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionConsumerAdded")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded, []uint64) (event.Subscription, error)); ok {
@@ -2040,6 +2352,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionConsumerAdded(opts *bind.W
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionConsumerRemoved(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionConsumerRemoved")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved, []uint64) (event.Subscription, error)); ok {
@@ -2066,6 +2382,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionConsumerRemoved(opts *bind
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionCreated(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionCreated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated, []uint64) (event.Subscription, error)); ok {
@@ -2092,6 +2412,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionCreated(opts *bind.WatchOp
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionFunded(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionFunded")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded, []uint64) (event.Subscription, error)); ok {
@@ -2118,6 +2442,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionFunded(opts *bind.WatchOpt
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionOwnerTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested, []uint64) (event.Subscription, error)); ok {
@@ -2144,6 +2472,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionOwnerTransferRequested(opt
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionOwnerTransferred(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionOwnerTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred, []uint64) (event.Subscription, error)); ok {
diff --git a/core/services/webhook/mocks/external_initiator_manager.go b/core/services/webhook/mocks/external_initiator_manager.go
index a94f2ffe97d..6c061f5412d 100644
--- a/core/services/webhook/mocks/external_initiator_manager.go
+++ b/core/services/webhook/mocks/external_initiator_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type ExternalInitiatorManager struct {
 func (_m *ExternalInitiatorManager) DeleteJob(webhookSpecID int32) error {
 	ret := _m.Called(webhookSpecID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32) error); ok {
 		r0 = rf(webhookSpecID)
@@ -30,6 +34,10 @@ func (_m *ExternalInitiatorManager) DeleteJob(webhookSpecID int32) error {
 func (_m *ExternalInitiatorManager) FindExternalInitiatorByName(name string) (bridges.ExternalInitiator, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindExternalInitiatorByName")
+	}
+
 	var r0 bridges.ExternalInitiator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bridges.ExternalInitiator, error)); ok {
@@ -54,6 +62,10 @@ func (_m *ExternalInitiatorManager) FindExternalInitiatorByName(name string) (br
 func (_m *ExternalInitiatorManager) Notify(webhookSpecID int32) error {
 	ret := _m.Called(webhookSpecID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Notify")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32) error); ok {
 		r0 = rf(webhookSpecID)
diff --git a/core/services/webhook/mocks/http_client.go b/core/services/webhook/mocks/http_client.go
index b5b448a56d0..fa4f597dc4f 100644
--- a/core/services/webhook/mocks/http_client.go
+++ b/core/services/webhook/mocks/http_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type HTTPClient struct {
 func (_m *HTTPClient) Do(req *http.Request) (*http.Response, error) {
 	ret := _m.Called(req)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Do")
+	}
+
 	var r0 *http.Response
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*http.Request) (*http.Response, error)); ok {
diff --git a/core/sessions/ldapauth/mocks/ldap_client.go b/core/sessions/ldapauth/mocks/ldap_client.go
index 7a44778dcaa..63021636018 100644
--- a/core/sessions/ldapauth/mocks/ldap_client.go
+++ b/core/sessions/ldapauth/mocks/ldap_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type LDAPClient struct {
 func (_m *LDAPClient) CreateEphemeralConnection() (ldapauth.LDAPConn, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateEphemeralConnection")
+	}
+
 	var r0 ldapauth.LDAPConn
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (ldapauth.LDAPConn, error)); ok {
diff --git a/core/sessions/ldapauth/mocks/ldap_conn.go b/core/sessions/ldapauth/mocks/ldap_conn.go
index c05fb6c4fa6..8b4fff82047 100644
--- a/core/sessions/ldapauth/mocks/ldap_conn.go
+++ b/core/sessions/ldapauth/mocks/ldap_conn.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type LDAPConn struct {
 func (_m *LDAPConn) Bind(username string, password string) error {
 	ret := _m.Called(username, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Bind")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(username, password)
@@ -31,6 +35,10 @@ func (_m *LDAPConn) Bind(username string, password string) error {
 func (_m *LDAPConn) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -45,6 +53,10 @@ func (_m *LDAPConn) Close() error {
 func (_m *LDAPConn) Search(searchRequest *ldap.SearchRequest) (*ldap.SearchResult, error) {
 	ret := _m.Called(searchRequest)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Search")
+	}
+
 	var r0 *ldap.SearchResult
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*ldap.SearchRequest) (*ldap.SearchResult, error)); ok {
diff --git a/core/sessions/mocks/authentication_provider.go b/core/sessions/mocks/authentication_provider.go
index d6e33d11e45..d1b846c318b 100644
--- a/core/sessions/mocks/authentication_provider.go
+++ b/core/sessions/mocks/authentication_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type AuthenticationProvider struct {
 func (_m *AuthenticationProvider) AuthorizedUserWithSession(sessionID string) (sessions.User, error) {
 	ret := _m.Called(sessionID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AuthorizedUserWithSession")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (sessions.User, error)); ok {
@@ -44,6 +48,10 @@ func (_m *AuthenticationProvider) AuthorizedUserWithSession(sessionID string) (s
 func (_m *AuthenticationProvider) ClearNonCurrentSessions(sessionID string) error {
 	ret := _m.Called(sessionID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClearNonCurrentSessions")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(sessionID)
@@ -58,6 +66,10 @@ func (_m *AuthenticationProvider) ClearNonCurrentSessions(sessionID string) erro
 func (_m *AuthenticationProvider) CreateAndSetAuthToken(user *sessions.User) (*auth.Token, error) {
 	ret := _m.Called(user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateAndSetAuthToken")
+	}
+
 	var r0 *auth.Token
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*sessions.User) (*auth.Token, error)); ok {
@@ -84,6 +96,10 @@ func (_m *AuthenticationProvider) CreateAndSetAuthToken(user *sessions.User) (*a
 func (_m *AuthenticationProvider) CreateSession(sr sessions.SessionRequest) (string, error) {
 	ret := _m.Called(sr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSession")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(sessions.SessionRequest) (string, error)); ok {
@@ -108,6 +124,10 @@ func (_m *AuthenticationProvider) CreateSession(sr sessions.SessionRequest) (str
 func (_m *AuthenticationProvider) CreateUser(user *sessions.User) error {
 	ret := _m.Called(user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User) error); ok {
 		r0 = rf(user)
@@ -122,6 +142,10 @@ func (_m *AuthenticationProvider) CreateUser(user *sessions.User) error {
 func (_m *AuthenticationProvider) DeleteAuthToken(user *sessions.User) error {
 	ret := _m.Called(user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteAuthToken")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User) error); ok {
 		r0 = rf(user)
@@ -136,6 +160,10 @@ func (_m *AuthenticationProvider) DeleteAuthToken(user *sessions.User) error {
 func (_m *AuthenticationProvider) DeleteUser(email string) error {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(email)
@@ -150,6 +178,10 @@ func (_m *AuthenticationProvider) DeleteUser(email string) error {
 func (_m *AuthenticationProvider) DeleteUserSession(sessionID string) error {
 	ret := _m.Called(sessionID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteUserSession")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(sessionID)
@@ -164,6 +196,10 @@ func (_m *AuthenticationProvider) DeleteUserSession(sessionID string) error {
 func (_m *AuthenticationProvider) FindExternalInitiator(eia *auth.Token) (*bridges.ExternalInitiator, error) {
 	ret := _m.Called(eia)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindExternalInitiator")
+	}
+
 	var r0 *bridges.ExternalInitiator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*auth.Token) (*bridges.ExternalInitiator, error)); ok {
@@ -190,6 +226,10 @@ func (_m *AuthenticationProvider) FindExternalInitiator(eia *auth.Token) (*bridg
 func (_m *AuthenticationProvider) FindUser(email string) (sessions.User, error) {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindUser")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (sessions.User, error)); ok {
@@ -214,6 +254,10 @@ func (_m *AuthenticationProvider) FindUser(email string) (sessions.User, error)
 func (_m *AuthenticationProvider) FindUserByAPIToken(apiToken string) (sessions.User, error) {
 	ret := _m.Called(apiToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindUserByAPIToken")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (sessions.User, error)); ok {
@@ -238,6 +282,10 @@ func (_m *AuthenticationProvider) FindUserByAPIToken(apiToken string) (sessions.
 func (_m *AuthenticationProvider) GetUserWebAuthn(email string) ([]sessions.WebAuthn, error) {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUserWebAuthn")
+	}
+
 	var r0 []sessions.WebAuthn
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]sessions.WebAuthn, error)); ok {
@@ -264,6 +312,10 @@ func (_m *AuthenticationProvider) GetUserWebAuthn(email string) ([]sessions.WebA
 func (_m *AuthenticationProvider) ListUsers() ([]sessions.User, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListUsers")
+	}
+
 	var r0 []sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]sessions.User, error)); ok {
@@ -290,6 +342,10 @@ func (_m *AuthenticationProvider) ListUsers() ([]sessions.User, error) {
 func (_m *AuthenticationProvider) SaveWebAuthn(token *sessions.WebAuthn) error {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveWebAuthn")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.WebAuthn) error); ok {
 		r0 = rf(token)
@@ -304,6 +360,10 @@ func (_m *AuthenticationProvider) SaveWebAuthn(token *sessions.WebAuthn) error {
 func (_m *AuthenticationProvider) Sessions(offset int, limit int) ([]sessions.Session, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sessions")
+	}
+
 	var r0 []sessions.Session
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int) ([]sessions.Session, error)); ok {
@@ -330,6 +390,10 @@ func (_m *AuthenticationProvider) Sessions(offset int, limit int) ([]sessions.Se
 func (_m *AuthenticationProvider) SetAuthToken(user *sessions.User, token *auth.Token) error {
 	ret := _m.Called(user, token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetAuthToken")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User, *auth.Token) error); ok {
 		r0 = rf(user, token)
@@ -344,6 +408,10 @@ func (_m *AuthenticationProvider) SetAuthToken(user *sessions.User, token *auth.
 func (_m *AuthenticationProvider) SetPassword(user *sessions.User, newPassword string) error {
 	ret := _m.Called(user, newPassword)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetPassword")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User, string) error); ok {
 		r0 = rf(user, newPassword)
@@ -358,6 +426,10 @@ func (_m *AuthenticationProvider) SetPassword(user *sessions.User, newPassword s
 func (_m *AuthenticationProvider) TestPassword(email string, password string) error {
 	ret := _m.Called(email, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TestPassword")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(email, password)
@@ -372,6 +444,10 @@ func (_m *AuthenticationProvider) TestPassword(email string, password string) er
 func (_m *AuthenticationProvider) UpdateRole(email string, newRole string) (sessions.User, error) {
 	ret := _m.Called(email, newRole)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateRole")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (sessions.User, error)); ok {
diff --git a/core/sessions/mocks/basic_admin_users_orm.go b/core/sessions/mocks/basic_admin_users_orm.go
index 845e2d8880e..44ee0b1f705 100644
--- a/core/sessions/mocks/basic_admin_users_orm.go
+++ b/core/sessions/mocks/basic_admin_users_orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type BasicAdminUsersORM struct {
 func (_m *BasicAdminUsersORM) CreateUser(user *sessions.User) error {
 	ret := _m.Called(user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User) error); ok {
 		r0 = rf(user)
@@ -30,6 +34,10 @@ func (_m *BasicAdminUsersORM) CreateUser(user *sessions.User) error {
 func (_m *BasicAdminUsersORM) FindUser(email string) (sessions.User, error) {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindUser")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (sessions.User, error)); ok {
@@ -54,6 +62,10 @@ func (_m *BasicAdminUsersORM) FindUser(email string) (sessions.User, error) {
 func (_m *BasicAdminUsersORM) ListUsers() ([]sessions.User, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListUsers")
+	}
+
 	var r0 []sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]sessions.User, error)); ok {