Repository: smartcontractkit/chainlink
Pull request #17513: EVMRelayer -> EVMService, bump common
Author: login: Unheilbar
Created: 2025-04-29T17:42:07Z | Merged: 2025-04-30T10:46:47Z

EVMRelayer renamed, removed embedded Relayer

[chainlink-evm](https://github.com/smartcontractkit/chainlink-evm/pull/45)
[solana](https://github.com/smartcontractkit/chainlink-solana/pull/1224)
[common](https://github.com/smartcontractkit/chainlink-common/pull/1163)


Diff:
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index fe4f375c47e..ab13bb71863 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -35,10 +35,10 @@ require (
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chainlink-automation v0.8.1
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95
-	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f
+	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065
 	github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049
 	github.com/smartcontractkit/chainlink-deployments-framework v0.0.5
-	github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597
+	github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4
 	github.com/smartcontractkit/libocr v0.0.0-20250408131511-c90716988ee0
 	github.com/spf13/cobra v1.8.1
@@ -365,7 +365,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0 // indirect
 	github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
 	github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect
-	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e // indirect
+	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4 // indirect
 	github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250422175525-b7575d96bd4d // indirect
 	github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 7797eebee8e..cbd1b5574af 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1189,16 +1189,16 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95 h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95/go.mod h1:Jb05WL6lj5H89XGcaaOinxTf4Gdj+vXO4TcUhqTgqIM=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7 h1:j6Vo/NX2ABsPdGxETC5pfQLcz/h6iLJu/Yx+8AhPa34=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f h1:WxyGFFDmZ8Jx49vMjB3WGqdnBGwkkLbitR42ix15bxA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065 h1:8UsqHv+LkrO2KdXbfZd5qejsy4Z4Xz5/DNVfUGT6gTM=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049 h1:7HwYt8rDz1ehTcB28oNipdTZUtV17F2sfkLTLtMJC4c=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049/go.mod h1:2MggrMtbhqr0u4U2pcYa21lvAtvaeSawjxdIy1ytHWE=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5 h1:O6j+vodCF5yO9Ep+mQE4eQOFRS7pW9+aC6mTLDLxt1M=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5/go.mod h1:rk7xu88+I/qwe1kVY8tIpyYr8vhEbi5WwK54ykXFHg0=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597 h1:VJE7FviGR6lmXNSBZdplm8F5t4Yq2Hl6JC7FbWc+FdM=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597/go.mod h1:74GUUbN1dYzYmXwTkCgi7rADZLoWbT/0EKu3kbippBQ=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d h1:abvQ+XucsI9Xqq0a0dBBEodAsleENCtWhGjzOeTAZ/Q=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d/go.mod h1:ryXOe2KhplhgO18P4HVwKTzgzdX38mCdrAALs/7IZ34=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250408161305-721208f43882 h1:teDwTZ0GXlxQ65lgVbB44ffbIHlEh4N8wW7zav4lt9c=
@@ -1217,8 +1217,8 @@ github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-1
 github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6/go.mod h1:FRwzI3hGj4CJclNS733gfcffmqQ62ONCkbGi49s658w=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+vOwbM+Hnx8tIN2xCPG8H4o=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e h1:jwJ6cNo3GWBDX/hlGNcxAXo5Zkc3g8RNBGA5M3KJAMc=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e/go.mod h1:13Oevz/mk5ANLZm3xPFZJO7p2hSJylM/g97VwSbjdxs=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d h1:5IJVQo/6TlIxadJyFq75WkZkr12oBTmKJ1eigIMXqgc=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d/go.mod h1:+FW6xcSoPcDMiPnj4bmIBgeDBW6N7vc2a/IDSMMOKEA=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4 h1:ks1FuQQ6f7PY/97VFXxtZhAyWZaT0NCvhT+1wKgyOt0=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4/go.mod h1:zw3QH/GTvPl/7Cjyw+y4cJYnP16QHTEh7wWLJQd9lM8=
 github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4 h1:+kwLuO9kcq1+ZbRUQjxX1SQmzlL2M6ZP6+L0xQMtmkU=
diff --git a/core/services/ocr2/plugins/generic/relayerset_test.go b/core/services/ocr2/plugins/generic/relayerset_test.go
index dcd9e7eb484..e0e02f17c69 100644
--- a/core/services/ocr2/plugins/generic/relayerset_test.go
+++ b/core/services/ocr2/plugins/generic/relayerset_test.go
@@ -158,7 +158,7 @@ func (t *TestRelayer) NewContractReader(_ context.Context, _ []byte) (types.Cont
 	panic("implement me")
 }
 
-func (t *TestRelayer) AsEVMRelayer() (loop.EVMRelayer, error) {
+func (t *TestRelayer) EVM() (types.EVMService, error) {
 	panic("implement me")
 }
 
diff --git a/core/services/relay/dummy/relayer.go b/core/services/relay/dummy/relayer.go
index 165567494a6..4724b49f694 100644
--- a/core/services/relay/dummy/relayer.go
+++ b/core/services/relay/dummy/relayer.go
@@ -40,7 +40,7 @@ func (r *relayer) NewContractReader(ctx context.Context, contractReaderConfig []
 	return nil, nil
 }
 
-func (r *relayer) AsEVMRelayer() (loop.EVMRelayer, error) {
+func (r *relayer) EVM() (types.EVMService, error) {
 	return nil, nil
 }
 
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index 23360f1e0ba..232ec1c295b 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -998,7 +998,7 @@ func (r *Relayer) NewContractReader(ctx context.Context, chainReaderConfig []byt
 	return NewChainReaderService(ctx, r.lggr, r.chain.LogPoller(), r.chain.HeadTracker(), r.chain.Client(), *cfg)
 }
 
-func (r *Relayer) AsEVMRelayer() (commontypes.EVMRelayer, error) {
+func (r *Relayer) EVM() (commontypes.EVMService, error) {
 	return r, nil
 }
 
diff --git a/core/services/relay/evm/write_target.go b/core/services/relay/evm/write_target.go
index bde47e1be8b..a0fb70564f7 100644
--- a/core/services/relay/evm/write_target.go
+++ b/core/services/relay/evm/write_target.go
@@ -84,7 +84,7 @@ func NewWriteTarget(ctx context.Context, relayer *Relayer, chain legacyevm.Chain
 		return nil, err
 	}
 
-	evm, err := relayer.AsEVMRelayer()
+	evm, err := relayer.EVM()
 	if err != nil {
 		return nil, fmt.Errorf("failed to upgrade to evm relayer: %w", err)
 	}
@@ -122,7 +122,7 @@ func NewWriteTarget(ctx context.Context, relayer *Relayer, chain legacyevm.Chain
 		ChainService:     chain,
 		ContractReader:   cr,
 		ChainWriter:      cw,
-		EVMRelayer:       evm,
+		EVMService:       evm,
 		ConfigValidateFn: evaluate,
 		NodeAddress:      config.FromAddress().String(),
 		ForwarderAddress: config.ForwarderAddress().String(),
diff --git a/core/services/relay/relay.go b/core/services/relay/relay.go
index dc2196e1b55..8a6a12e30e3 100644
--- a/core/services/relay/relay.go
+++ b/core/services/relay/relay.go
@@ -2,7 +2,6 @@ package relay
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
@@ -39,27 +38,11 @@ type ServerAdapter struct {
 	types.Relayer
 }
 
-type evmRelayerAdapter struct {
-	*ServerAdapter
-	evmRelayer types.EVMRelayer
-}
-
 // NewServerAdapter returns a new ServerAdapter.
 func NewServerAdapter(r types.Relayer) *ServerAdapter {
 	return &ServerAdapter{Relayer: r}
 }
 
-func (r *ServerAdapter) AsEVMRelayer() (loop.EVMRelayer, error) {
-	if evm, ok := r.Relayer.(types.EVMRelayer); ok {
-		return &evmRelayerAdapter{
-			r,
-			evm,
-		}, nil
-	}
-
-	return nil, errors.New("unimplemented")
-}
-
 func (r *ServerAdapter) NewPluginProvider(ctx context.Context, rargs types.RelayArgs, pargs types.PluginArgs) (types.PluginProvider, error) {
 	switch types.OCR2PluginType(rargs.ProviderType) {
 	case types.Median:
@@ -83,7 +66,3 @@ func (r *ServerAdapter) NewPluginProvider(ctx context.Context, rargs types.Relay
 	}
 	return nil, fmt.Errorf("provider type not recognized: %s", rargs.ProviderType)
 }
-
-func (e *evmRelayerAdapter) GetTransactionFee(ctx context.Context, transactionID string) (*types.TransactionFee, error) {
-	return e.evmRelayer.GetTransactionFee(ctx, transactionID)
-}
diff --git a/core/web/testutils/mock_relayer.go b/core/web/testutils/mock_relayer.go
index 84c70f48faa..f9fd7e5fbd3 100644
--- a/core/web/testutils/mock_relayer.go
+++ b/core/web/testutils/mock_relayer.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"math/big"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/loop"
+	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 )
 
@@ -42,7 +42,7 @@ func (m MockRelayer) NewContractReader(_ context.Context, _ []byte) (commontypes
 	panic("not implemented")
 }
 
-func (m MockRelayer) AsEVMRelayer() (loop.EVMRelayer, error) {
+func (m MockRelayer) EVM() (types.EVMService, error) {
 	panic("not implemented")
 }
 
diff --git a/deployment/go.mod b/deployment/go.mod
index 2b7a08bdc94..a6b2783ac28 100644
--- a/deployment/go.mod
+++ b/deployment/go.mod
@@ -36,13 +36,13 @@ require (
 	github.com/smartcontractkit/chainlink-aptos v0.0.0-20250414155853-651b4e583ee9
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95
 	github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7
-	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f
+	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065
 	github.com/smartcontractkit/chainlink-deployments-framework v0.0.5
-	github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597
+	github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d
 	github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250402142713-6529d36f91f3
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.9.0
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0
-	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e
+	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4
 	github.com/smartcontractkit/libocr v0.0.0-20250408131511-c90716988ee0
diff --git a/deployment/go.sum b/deployment/go.sum
index 05a66c60be6..324d1adf3f2 100644
--- a/deployment/go.sum
+++ b/deployment/go.sum
@@ -1238,16 +1238,16 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95 h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95/go.mod h1:Jb05WL6lj5H89XGcaaOinxTf4Gdj+vXO4TcUhqTgqIM=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7 h1:j6Vo/NX2ABsPdGxETC5pfQLcz/h6iLJu/Yx+8AhPa34=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f h1:WxyGFFDmZ8Jx49vMjB3WGqdnBGwkkLbitR42ix15bxA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065 h1:8UsqHv+LkrO2KdXbfZd5qejsy4Z4Xz5/DNVfUGT6gTM=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049 h1:7HwYt8rDz1ehTcB28oNipdTZUtV17F2sfkLTLtMJC4c=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049/go.mod h1:2MggrMtbhqr0u4U2pcYa21lvAtvaeSawjxdIy1ytHWE=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5 h1:O6j+vodCF5yO9Ep+mQE4eQOFRS7pW9+aC6mTLDLxt1M=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5/go.mod h1:rk7xu88+I/qwe1kVY8tIpyYr8vhEbi5WwK54ykXFHg0=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597 h1:VJE7FviGR6lmXNSBZdplm8F5t4Yq2Hl6JC7FbWc+FdM=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597/go.mod h1:74GUUbN1dYzYmXwTkCgi7rADZLoWbT/0EKu3kbippBQ=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d h1:abvQ+XucsI9Xqq0a0dBBEodAsleENCtWhGjzOeTAZ/Q=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d/go.mod h1:ryXOe2KhplhgO18P4HVwKTzgzdX38mCdrAALs/7IZ34=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250408161305-721208f43882 h1:teDwTZ0GXlxQ65lgVbB44ffbIHlEh4N8wW7zav4lt9c=
@@ -1266,8 +1266,8 @@ github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-1
 github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6/go.mod h1:FRwzI3hGj4CJclNS733gfcffmqQ62ONCkbGi49s658w=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+vOwbM+Hnx8tIN2xCPG8H4o=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e h1:jwJ6cNo3GWBDX/hlGNcxAXo5Zkc3g8RNBGA5M3KJAMc=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e/go.mod h1:13Oevz/mk5ANLZm3xPFZJO7p2hSJylM/g97VwSbjdxs=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d h1:5IJVQo/6TlIxadJyFq75WkZkr12oBTmKJ1eigIMXqgc=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d/go.mod h1:+FW6xcSoPcDMiPnj4bmIBgeDBW6N7vc2a/IDSMMOKEA=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4 h1:ks1FuQQ6f7PY/97VFXxtZhAyWZaT0NCvhT+1wKgyOt0=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4/go.mod h1:zw3QH/GTvPl/7Cjyw+y4cJYnP16QHTEh7wWLJQd9lM8=
 github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4 h1:+kwLuO9kcq1+ZbRUQjxX1SQmzlL2M6ZP6+L0xQMtmkU=
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 7c24c3d8838..2c4d3c73864 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -2697,224 +2697,6 @@ GasLimitDefault = 400000
 
 </p></details>
 
-<details><summary>RSK Mainnet (30)</summary><p>
-
-```toml
-AutoCreateKey = true
-BlockBackfillDepth = 10
-BlockBackfillSkip = false
-FinalityDepth = 50
-FinalityTagEnabled = false
-LinkContractAddress = '0x14AdaE34beF7ca957Ce2dDe5ADD97ea050123827'
-LogBackfillBatchSize = 1000
-LogPollInterval = '30s'
-LogKeepBlocksDepth = 100000
-LogPrunePageSize = 0
-BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 3
-MinContractPayment = '0.001 link'
-NonceAutoSync = true
-NoNewHeadsThreshold = '3m0s'
-LogBroadcasterEnabled = true
-RPCDefaultBatchSize = 250
-RPCBlockQueryDelay = 1
-FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '0s'
-
-[Transactions]
-Enabled = true
-ForwardersEnabled = false
-MaxInFlight = 16
-MaxQueued = 250
-ReaperInterval = '1h0m0s'
-ReaperThreshold = '168h0m0s'
-ResendAfterThreshold = '1m0s'
-
-[Transactions.AutoPurge]
-Enabled = false
-
-[Transactions.TransactionManagerV2]
-Enabled = false
-
-[BalanceMonitor]
-Enabled = true
-
-[GasEstimator]
-Mode = 'BlockHistory'
-PriceDefault = '50 mwei'
-PriceMax = '50 gwei'
-PriceMin = '0'
-LimitDefault = 500000
-LimitMax = 500000
-LimitMultiplier = '1'
-LimitTransfer = 21000
-EstimateLimit = false
-BumpMin = '5 gwei'
-BumpPercent = 20
-BumpThreshold = 3
-EIP1559DynamicFees = false
-FeeCapDefault = '100 mwei'
-TipCapDefault = '1 wei'
-TipCapMin = '1 wei'
-
-[GasEstimator.BlockHistory]
-BatchSize = 25
-BlockHistorySize = 8
-CheckInclusionBlocks = 12
-CheckInclusionPercentile = 90
-TransactionPercentile = 60
-
-[GasEstimator.FeeHistory]
-CacheTimeout = '10s'
-
-[HeadTracker]
-HistoryDepth = 100
-MaxBufferSize = 3
-SamplingInterval = '1s'
-MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
-PersistenceEnabled = true
-
-[NodePool]
-PollFailureThreshold = 5
-PollInterval = '10s'
-SelectionMode = 'HighestHead'
-SyncThreshold = 5
-LeaseDuration = '0s'
-NodeIsSyncingEnabled = false
-FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = true
-DeathDeclarationDelay = '1m0s'
-NewHeadsPollInterval = '0s'
-VerifyChainID = true
-
-[OCR]
-ContractConfirmations = 4
-ContractTransmitterTransmitTimeout = '10s'
-DatabaseTimeout = '10s'
-DeltaCOverride = '168h0m0s'
-DeltaCJitterOverride = '1h0m0s'
-ObservationGracePeriod = '1s'
-
-[OCR2]
-[OCR2.Automation]
-GasLimit = 5400000
-
-[Workflow]
-GasLimitDefault = 400000
-```
-
-</p></details>
-
-<details><summary>RSK Testnet (31)</summary><p>
-
-```toml
-AutoCreateKey = true
-BlockBackfillDepth = 10
-BlockBackfillSkip = false
-FinalityDepth = 50
-FinalityTagEnabled = false
-LinkContractAddress = '0x8bBbd80981FE76d44854D8DF305e8985c19f0e78'
-LogBackfillBatchSize = 1000
-LogPollInterval = '30s'
-LogKeepBlocksDepth = 100000
-LogPrunePageSize = 0
-BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 3
-MinContractPayment = '0.001 link'
-NonceAutoSync = true
-NoNewHeadsThreshold = '3m0s'
-LogBroadcasterEnabled = true
-RPCDefaultBatchSize = 250
-RPCBlockQueryDelay = 1
-FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '0s'
-
-[Transactions]
-Enabled = true
-ForwardersEnabled = false
-MaxInFlight = 16
-MaxQueued = 250
-ReaperInterval = '1h0m0s'
-ReaperThreshold = '168h0m0s'
-ResendAfterThreshold = '1m0s'
-
-[Transactions.AutoPurge]
-Enabled = false
-
-[Transactions.TransactionManagerV2]
-Enabled = false
-
-[BalanceMonitor]
-Enabled = true
-
-[GasEstimator]
-Mode = 'BlockHistory'
-PriceDefault = '50 mwei'
-PriceMax = '50 gwei'
-PriceMin = '0'
-LimitDefault = 500000
-LimitMax = 500000
-LimitMultiplier = '1'
-LimitTransfer = 21000
-EstimateLimit = false
-BumpMin = '5 gwei'
-BumpPercent = 20
-BumpThreshold = 3
-EIP1559DynamicFees = false
-FeeCapDefault = '100 mwei'
-TipCapDefault = '1 wei'
-TipCapMin = '1 wei'
-
-[GasEstimator.BlockHistory]
-BatchSize = 25
-BlockHistorySize = 8
-CheckInclusionBlocks = 12
-CheckInclusionPercentile = 90
-TransactionPercentile = 60
-
-[GasEstimator.FeeHistory]
-CacheTimeout = '10s'
-
-[HeadTracker]
-HistoryDepth = 100
-MaxBufferSize = 3
-SamplingInterval = '1s'
-MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
-PersistenceEnabled = true
-
-[NodePool]
-PollFailureThreshold = 5
-PollInterval = '10s'
-SelectionMode = 'HighestHead'
-SyncThreshold = 5
-LeaseDuration = '0s'
-NodeIsSyncingEnabled = false
-FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = true
-DeathDeclarationDelay = '1m0s'
-NewHeadsPollInterval = '0s'
-VerifyChainID = true
-
-[OCR]
-ContractConfirmations = 4
-ContractTransmitterTransmitTimeout = '10s'
-DatabaseTimeout = '10s'
-DeltaCOverride = '168h0m0s'
-DeltaCJitterOverride = '1h0m0s'
-ObservationGracePeriod = '1s'
-
-[OCR2]
-[OCR2.Automation]
-GasLimit = 5400000
-
-[Workflow]
-GasLimitDefault = 400000
-```
-
-</p></details>
-
 <details><summary>Ethereum Kovan (42)</summary><p>
 
 ```toml
diff --git a/go.mod b/go.mod
index 2aacc37379c..2ae8c19e352 100644
--- a/go.mod
+++ b/go.mod
@@ -79,15 +79,15 @@ require (
 	github.com/smartcontractkit/chainlink-automation v0.8.1
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95
 	github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7
-	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f
+	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065
 	github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049
-	github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597
+	github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d
 	github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135
 	github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250421203809-e0f5602c126c
 	github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250402142713-6529d36f91f3
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0
 	github.com/smartcontractkit/chainlink-protos/svr v1.1.0
-	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e
+	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d
 	github.com/smartcontractkit/chainlink-tron/relayer v0.0.10
 	github.com/smartcontractkit/libocr v0.0.0-20250408131511-c90716988ee0
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20241009055228-33d0c0bf38de
diff --git a/go.sum b/go.sum
index 62a84bcb66c..d77c4a0a0ee 100644
--- a/go.sum
+++ b/go.sum
@@ -1054,14 +1054,14 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95 h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95/go.mod h1:Jb05WL6lj5H89XGcaaOinxTf4Gdj+vXO4TcUhqTgqIM=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7 h1:j6Vo/NX2ABsPdGxETC5pfQLcz/h6iLJu/Yx+8AhPa34=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f h1:WxyGFFDmZ8Jx49vMjB3WGqdnBGwkkLbitR42ix15bxA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065 h1:8UsqHv+LkrO2KdXbfZd5qejsy4Z4Xz5/DNVfUGT6gTM=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049 h1:7HwYt8rDz1ehTcB28oNipdTZUtV17F2sfkLTLtMJC4c=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049/go.mod h1:2MggrMtbhqr0u4U2pcYa21lvAtvaeSawjxdIy1ytHWE=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597 h1:VJE7FviGR6lmXNSBZdplm8F5t4Yq2Hl6JC7FbWc+FdM=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597/go.mod h1:74GUUbN1dYzYmXwTkCgi7rADZLoWbT/0EKu3kbippBQ=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d h1:abvQ+XucsI9Xqq0a0dBBEodAsleENCtWhGjzOeTAZ/Q=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d/go.mod h1:ryXOe2KhplhgO18P4HVwKTzgzdX38mCdrAALs/7IZ34=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250408161305-721208f43882 h1:teDwTZ0GXlxQ65lgVbB44ffbIHlEh4N8wW7zav4lt9c=
@@ -1078,8 +1078,8 @@ github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-1
 github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6/go.mod h1:FRwzI3hGj4CJclNS733gfcffmqQ62ONCkbGi49s658w=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+vOwbM+Hnx8tIN2xCPG8H4o=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e h1:jwJ6cNo3GWBDX/hlGNcxAXo5Zkc3g8RNBGA5M3KJAMc=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e/go.mod h1:13Oevz/mk5ANLZm3xPFZJO7p2hSJylM/g97VwSbjdxs=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d h1:5IJVQo/6TlIxadJyFq75WkZkr12oBTmKJ1eigIMXqgc=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d/go.mod h1:+FW6xcSoPcDMiPnj4bmIBgeDBW6N7vc2a/IDSMMOKEA=
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.10 h1:JMAe0YmiaMMm/2Ip5tB8R3JFK9jIpVY2HMIfkq5hKBU=
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.10/go.mod h1:r+PL9PgWWVErgY686mKZp+B6Xn//WEnUkFdobJAYOAo=
 github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d h1:qLmSOOtB/Ogn79eIDkuujOu8M5Jd747V1H7Brk/nTvo=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 87ceb25fb5f..ab76c8fef71 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -49,9 +49,9 @@ require (
 	github.com/smartcontractkit/chainlink-automation v0.8.1
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95
 	github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7
-	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f
+	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065
 	github.com/smartcontractkit/chainlink-deployments-framework v0.0.5
-	github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597
+	github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.9.0
 	github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4
@@ -463,7 +463,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0 // indirect
 	github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
 	github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect
-	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e // indirect
+	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4 // indirect
 	github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250422175525-b7575d96bd4d // indirect
 	github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 57fa18003f1..ebd96380b9a 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1474,16 +1474,16 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95 h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95/go.mod h1:Jb05WL6lj5H89XGcaaOinxTf4Gdj+vXO4TcUhqTgqIM=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7 h1:j6Vo/NX2ABsPdGxETC5pfQLcz/h6iLJu/Yx+8AhPa34=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f h1:WxyGFFDmZ8Jx49vMjB3WGqdnBGwkkLbitR42ix15bxA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065 h1:8UsqHv+LkrO2KdXbfZd5qejsy4Z4Xz5/DNVfUGT6gTM=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049 h1:7HwYt8rDz1ehTcB28oNipdTZUtV17F2sfkLTLtMJC4c=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049/go.mod h1:2MggrMtbhqr0u4U2pcYa21lvAtvaeSawjxdIy1ytHWE=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5 h1:O6j+vodCF5yO9Ep+mQE4eQOFRS7pW9+aC6mTLDLxt1M=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5/go.mod h1:rk7xu88+I/qwe1kVY8tIpyYr8vhEbi5WwK54ykXFHg0=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597 h1:VJE7FviGR6lmXNSBZdplm8F5t4Yq2Hl6JC7FbWc+FdM=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597/go.mod h1:74GUUbN1dYzYmXwTkCgi7rADZLoWbT/0EKu3kbippBQ=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d h1:abvQ+XucsI9Xqq0a0dBBEodAsleENCtWhGjzOeTAZ/Q=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d/go.mod h1:ryXOe2KhplhgO18P4HVwKTzgzdX38mCdrAALs/7IZ34=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250408161305-721208f43882 h1:teDwTZ0GXlxQ65lgVbB44ffbIHlEh4N8wW7zav4lt9c=
@@ -1502,8 +1502,8 @@ github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-1
 github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6/go.mod h1:FRwzI3hGj4CJclNS733gfcffmqQ62ONCkbGi49s658w=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+vOwbM+Hnx8tIN2xCPG8H4o=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e h1:jwJ6cNo3GWBDX/hlGNcxAXo5Zkc3g8RNBGA5M3KJAMc=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e/go.mod h1:13Oevz/mk5ANLZm3xPFZJO7p2hSJylM/g97VwSbjdxs=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d h1:5IJVQo/6TlIxadJyFq75WkZkr12oBTmKJ1eigIMXqgc=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d/go.mod h1:+FW6xcSoPcDMiPnj4bmIBgeDBW6N7vc2a/IDSMMOKEA=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4 h1:ks1FuQQ6f7PY/97VFXxtZhAyWZaT0NCvhT+1wKgyOt0=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4/go.mod h1:zw3QH/GTvPl/7Cjyw+y4cJYnP16QHTEh7wWLJQd9lM8=
 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 h1:S5HND0EDtlA+xp2E+mD11DlUTp2wD6uojwixye8ZB/k=
diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
index a5c17be84f5..362c56713cc 100644
--- a/integration-tests/load/go.mod
+++ b/integration-tests/load/go.mod
@@ -31,8 +31,8 @@ require (
 	github.com/smartcontractkit/chain-selectors v1.0.52
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95
 	github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7
-	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f
-	github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597
+	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065
+	github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4
 	github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4
@@ -453,7 +453,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0 // indirect
 	github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
 	github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect
-	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e // indirect
+	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0 // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2 // indirect
 	github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250422175525-b7575d96bd4d // indirect
diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum
index a7ee02e72cb..6a73209ec34 100644
--- a/integration-tests/load/go.sum
+++ b/integration-tests/load/go.sum
@@ -1455,16 +1455,16 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95 h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95/go.mod h1:Jb05WL6lj5H89XGcaaOinxTf4Gdj+vXO4TcUhqTgqIM=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7 h1:j6Vo/NX2ABsPdGxETC5pfQLcz/h6iLJu/Yx+8AhPa34=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f h1:WxyGFFDmZ8Jx49vMjB3WGqdnBGwkkLbitR42ix15bxA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065 h1:8UsqHv+LkrO2KdXbfZd5qejsy4Z4Xz5/DNVfUGT6gTM=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049 h1:7HwYt8rDz1ehTcB28oNipdTZUtV17F2sfkLTLtMJC4c=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049/go.mod h1:2MggrMtbhqr0u4U2pcYa21lvAtvaeSawjxdIy1ytHWE=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5 h1:O6j+vodCF5yO9Ep+mQE4eQOFRS7pW9+aC6mTLDLxt1M=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5/go.mod h1:rk7xu88+I/qwe1kVY8tIpyYr8vhEbi5WwK54ykXFHg0=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597 h1:VJE7FviGR6lmXNSBZdplm8F5t4Yq2Hl6JC7FbWc+FdM=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597/go.mod h1:74GUUbN1dYzYmXwTkCgi7rADZLoWbT/0EKu3kbippBQ=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d h1:abvQ+XucsI9Xqq0a0dBBEodAsleENCtWhGjzOeTAZ/Q=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d/go.mod h1:ryXOe2KhplhgO18P4HVwKTzgzdX38mCdrAALs/7IZ34=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250408161305-721208f43882 h1:teDwTZ0GXlxQ65lgVbB44ffbIHlEh4N8wW7zav4lt9c=
@@ -1483,8 +1483,8 @@ github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-1
 github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6/go.mod h1:FRwzI3hGj4CJclNS733gfcffmqQ62ONCkbGi49s658w=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+vOwbM+Hnx8tIN2xCPG8H4o=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e h1:jwJ6cNo3GWBDX/hlGNcxAXo5Zkc3g8RNBGA5M3KJAMc=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e/go.mod h1:13Oevz/mk5ANLZm3xPFZJO7p2hSJylM/g97VwSbjdxs=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d h1:5IJVQo/6TlIxadJyFq75WkZkr12oBTmKJ1eigIMXqgc=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d/go.mod h1:+FW6xcSoPcDMiPnj4bmIBgeDBW6N7vc2a/IDSMMOKEA=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4 h1:ks1FuQQ6f7PY/97VFXxtZhAyWZaT0NCvhT+1wKgyOt0=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.4/go.mod h1:zw3QH/GTvPl/7Cjyw+y4cJYnP16QHTEh7wWLJQd9lM8=
 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 h1:S5HND0EDtlA+xp2E+mD11DlUTp2wD6uojwixye8ZB/k=
diff --git a/plugins/plugins.public.yaml b/plugins/plugins.public.yaml
index e791f568f6e..c9493c64b74 100644
--- a/plugins/plugins.public.yaml
+++ b/plugins/plugins.public.yaml
@@ -25,7 +25,7 @@ plugins:
 
   solana:
     - moduleURI: "github.com/smartcontractkit/chainlink-solana"
-      gitRef: "v1.1.2-0.20250426000843-1697af47a38e"
+      gitRef: "v1.1.2-0.20250429214959-baa3b4c6812d"
       installPath: "github.com/smartcontractkit/chainlink-solana/pkg/solana/cmd/chainlink-solana"
 
   starknet:
diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod
index c258bba8a05..ab2b76653cd 100644
--- a/system-tests/lib/go.mod
+++ b/system-tests/lib/go.mod
@@ -23,9 +23,9 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.33.0
 	github.com/smartcontractkit/chain-selectors v1.0.52
-	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f
+	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065
 	github.com/smartcontractkit/chainlink-deployments-framework v0.0.5
-	github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597
+	github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.9.0
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.5
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4
@@ -368,7 +368,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0 // indirect
 	github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
 	github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect
-	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e // indirect
+	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2 // indirect
 	github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250422175525-b7575d96bd4d // indirect
 	github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum
index 9177ead2bf2..f92a253de8f 100644
--- a/system-tests/lib/go.sum
+++ b/system-tests/lib/go.sum
@@ -1226,16 +1226,16 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95 h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95/go.mod h1:Jb05WL6lj5H89XGcaaOinxTf4Gdj+vXO4TcUhqTgqIM=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7 h1:j6Vo/NX2ABsPdGxETC5pfQLcz/h6iLJu/Yx+8AhPa34=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f h1:WxyGFFDmZ8Jx49vMjB3WGqdnBGwkkLbitR42ix15bxA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065 h1:8UsqHv+LkrO2KdXbfZd5qejsy4Z4Xz5/DNVfUGT6gTM=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049 h1:7HwYt8rDz1ehTcB28oNipdTZUtV17F2sfkLTLtMJC4c=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049/go.mod h1:2MggrMtbhqr0u4U2pcYa21lvAtvaeSawjxdIy1ytHWE=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5 h1:O6j+vodCF5yO9Ep+mQE4eQOFRS7pW9+aC6mTLDLxt1M=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5/go.mod h1:rk7xu88+I/qwe1kVY8tIpyYr8vhEbi5WwK54ykXFHg0=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597 h1:VJE7FviGR6lmXNSBZdplm8F5t4Yq2Hl6JC7FbWc+FdM=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597/go.mod h1:74GUUbN1dYzYmXwTkCgi7rADZLoWbT/0EKu3kbippBQ=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d h1:abvQ+XucsI9Xqq0a0dBBEodAsleENCtWhGjzOeTAZ/Q=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d/go.mod h1:ryXOe2KhplhgO18P4HVwKTzgzdX38mCdrAALs/7IZ34=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250408161305-721208f43882 h1:teDwTZ0GXlxQ65lgVbB44ffbIHlEh4N8wW7zav4lt9c=
@@ -1254,8 +1254,8 @@ github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-1
 github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6/go.mod h1:FRwzI3hGj4CJclNS733gfcffmqQ62ONCkbGi49s658w=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+vOwbM+Hnx8tIN2xCPG8H4o=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e h1:jwJ6cNo3GWBDX/hlGNcxAXo5Zkc3g8RNBGA5M3KJAMc=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e/go.mod h1:13Oevz/mk5ANLZm3xPFZJO7p2hSJylM/g97VwSbjdxs=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d h1:5IJVQo/6TlIxadJyFq75WkZkr12oBTmKJ1eigIMXqgc=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d/go.mod h1:+FW6xcSoPcDMiPnj4bmIBgeDBW6N7vc2a/IDSMMOKEA=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.5 h1:Lk5iUhW5fstUDmHGfnBHro/RAWvxxkMGgfs4ZMXtMqs=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.5/go.mod h1:+C1jbf+diirCT09w9huU9jBKxG6pMRQclGRGJX4+n5Q=
 github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4 h1:+kwLuO9kcq1+ZbRUQjxX1SQmzlL2M6ZP6+L0xQMtmkU=
diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod
index 337a0649e7d..71f034a4a4c 100644
--- a/system-tests/tests/go.mod
+++ b/system-tests/tests/go.mod
@@ -27,9 +27,9 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.33.0
 	github.com/shopspring/decimal v1.4.0
-	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f
+	github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065
 	github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049
-	github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597
+	github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.9.0
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.5
 	github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.7
@@ -441,7 +441,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0 // indirect
 	github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
 	github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect
-	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e // indirect
+	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2 // indirect
 	github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250422175525-b7575d96bd4d // indirect
diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum
index 1ea74ad53b5..34600976e6c 100644
--- a/system-tests/tests/go.sum
+++ b/system-tests/tests/go.sum
@@ -1430,16 +1430,16 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95 h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250429172937-8d7717f45f95/go.mod h1:Jb05WL6lj5H89XGcaaOinxTf4Gdj+vXO4TcUhqTgqIM=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7 h1:j6Vo/NX2ABsPdGxETC5pfQLcz/h6iLJu/Yx+8AhPa34=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250425163923-16aa375957b7/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f h1:WxyGFFDmZ8Jx49vMjB3WGqdnBGwkkLbitR42ix15bxA=
-github.com/smartcontractkit/chainlink-common v0.7.1-0.20250424173217-3df386365d0f/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065 h1:8UsqHv+LkrO2KdXbfZd5qejsy4Z4Xz5/DNVfUGT6gTM=
+github.com/smartcontractkit/chainlink-common v0.7.1-0.20250429205337-7ee5f91ed065/go.mod h1:vHs/mPpAztdKJtzRKLnmLinmpS78fBh9sAuyKqQrQ+I=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049 h1:7HwYt8rDz1ehTcB28oNipdTZUtV17F2sfkLTLtMJC4c=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250417193446-eeb0a7d1e049/go.mod h1:2MggrMtbhqr0u4U2pcYa21lvAtvaeSawjxdIy1ytHWE=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5 h1:O6j+vodCF5yO9Ep+mQE4eQOFRS7pW9+aC6mTLDLxt1M=
 github.com/smartcontractkit/chainlink-deployments-framework v0.0.5/go.mod h1:rk7xu88+I/qwe1kVY8tIpyYr8vhEbi5WwK54ykXFHg0=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597 h1:VJE7FviGR6lmXNSBZdplm8F5t4Yq2Hl6JC7FbWc+FdM=
-github.com/smartcontractkit/chainlink-evm v0.0.0-20250424162751-35c5921b8597/go.mod h1:74GUUbN1dYzYmXwTkCgi7rADZLoWbT/0EKu3kbippBQ=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d h1:abvQ+XucsI9Xqq0a0dBBEodAsleENCtWhGjzOeTAZ/Q=
+github.com/smartcontractkit/chainlink-evm v0.0.0-20250429210946-16bf64f3931d/go.mod h1:ryXOe2KhplhgO18P4HVwKTzgzdX38mCdrAALs/7IZ34=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
 github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
 github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250408161305-721208f43882 h1:teDwTZ0GXlxQ65lgVbB44ffbIHlEh4N8wW7zav4lt9c=
@@ -1458,8 +1458,8 @@ github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-1
 github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6/go.mod h1:FRwzI3hGj4CJclNS733gfcffmqQ62ONCkbGi49s658w=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+vOwbM+Hnx8tIN2xCPG8H4o=
 github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e h1:jwJ6cNo3GWBDX/hlGNcxAXo5Zkc3g8RNBGA5M3KJAMc=
-github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250426000843-1697af47a38e/go.mod h1:13Oevz/mk5ANLZm3xPFZJO7p2hSJylM/g97VwSbjdxs=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d h1:5IJVQo/6TlIxadJyFq75WkZkr12oBTmKJ1eigIMXqgc=
+github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250429214959-baa3b4c6812d/go.mod h1:+FW6xcSoPcDMiPnj4bmIBgeDBW6N7vc2a/IDSMMOKEA=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.5 h1:Lk5iUhW5fstUDmHGfnBHro/RAWvxxkMGgfs4ZMXtMqs=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.7.5/go.mod h1:+C1jbf+diirCT09w9huU9jBKxG6pMRQclGRGJX4+n5Q=
 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.7 h1:ANltXlvv6CbOXieasPD9erc4BewtCHm1tKDPAYvuWLw=


Reviews:
user: login: jmank88
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-04-29T20:26:24Z
user: login: jmank88
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-04-29T20:26:48Z
user: login: Unheilbar
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-04-29T21:17:48Z
user: login: jmank88
state: DISMISSED
author_association: CONTRIBUTOR
submitted_at: 2025-04-29T22:04:24Z
user: login: patrickhuie19
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-04-29T22:20:22Z
user: login: patrickhuie19
state: DISMISSED
author_association: CONTRIBUTOR
submitted_at: 2025-04-29T22:20:27Z
user: login: ilija42
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-04-30T09:44:17Z
user: login: cedric-cordenier
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-04-30T10:05:24Z
user: login: Unheilbar
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-04-30T17:43:07Z
user: login: jmank88
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-04-30T18:14:16Z

Review comments:
path: docs/CONFIG.md
user: login: jmank88
body: Why is a chain being removed? Maybe need to rebase?
created_at: 2025-04-29T20:26:24Z
author_association: CONTRIBUTOR
path: docs/CONFIG.md
user: login: jmank88
body: Er this comes from the evm module I guess
created_at: 2025-04-29T20:26:48Z
author_association: CONTRIBUTOR
path: docs/CONFIG.md
user: login: Unheilbar
body: RSK mainnet/testnet tomls have been removed in evm develop
https://github.com/smartcontractkit/chainlink-evm/commit/2910142d49ec92653568268d7f597743faba6690
created_at: 2025-04-29T21:17:47Z
author_association: COLLABORATOR
diff_hunk: @@ -998,7 +998,7 @@ func (r *Relayer) NewContractReader(ctx context.Context, chainReaderConfig []byt
 	return NewChainReaderService(ctx, r.lggr, r.chain.LogPoller(), r.chain.HeadTracker(), r.chain.Client(), *cfg)
 }
 
-func (r *Relayer) AsEVMRelayer() (commontypes.EVMRelayer, error) {
+func (r *Relayer) EVM() (commontypes.EVMService, error) {
path: core/services/relay/evm/evm.go
user: login: patrickhuie19
body: Since we're divorcing the EVMService from the relayer, should we separate out the EVM Service completely? I find this misdirection confusing - we could just as easily create the chain service when we create the Relayer and drill it through the application. 

We don't need to address this PR
created_at: 2025-04-29T22:20:22Z
author_association: CONTRIBUTOR
diff_hunk: @@ -998,7 +998,7 @@ func (r *Relayer) NewContractReader(ctx context.Context, chainReaderConfig []byt
 	return NewChainReaderService(ctx, r.lggr, r.chain.LogPoller(), r.chain.HeadTracker(), r.chain.Client(), *cfg)
 }
 
-func (r *Relayer) AsEVMRelayer() (commontypes.EVMRelayer, error) {
+func (r *Relayer) EVM() (commontypes.EVMService, error) {
path: core/services/relay/evm/evm.go
user: login: Unheilbar
body: There was an attempt to do this, [here](https://github.com/smartcontractkit/chainlink/pull/17336) it got stopped.
What would be the purpose of this wrapper?

created_at: 2025-04-30T17:43:07Z
author_association: COLLABORATOR
diff_hunk: @@ -998,7 +998,7 @@ func (r *Relayer) NewContractReader(ctx context.Context, chainReaderConfig []byt
 	return NewChainReaderService(ctx, r.lggr, r.chain.LogPoller(), r.chain.HeadTracker(), r.chain.Client(), *cfg)
 }
 
-func (r *Relayer) AsEVMRelayer() (commontypes.EVMRelayer, error) {
+func (r *Relayer) EVM() (commontypes.EVMService, error) {
path: core/services/relay/evm/evm.go
user: login: jmank88
body: > we could just as easily create the chain service when we create the Relayer and drill it through the application.

What do you mean by this? Why do we need to create a new thing to be the chain service? We just need to implement the methods, and there are no conflicts at the relayer level currently. The chain internals could be returned directly instead if that becomes a problem.
created_at: 2025-04-30T18:14:16Z
author_association: CONTRIBUTOR

PR comments:
user: login: github-actions[bot]
created_at: 2025-04-29T17:43:15Z
body: I see you updated files related to `core`. Please run `pnpm changeset` in the root directory to add a changeset as well as in the text include at least one of the following tags:
- `#added` For any new functionality added.
- `#breaking_change` For any functionality that requires manual action for the node to boot.
- `#bugfix` For bug fixes.
- `#changed` For any change to the existing functionality.
- `#db_update` For any feature that introduces updates to database schema.
- `#deprecation_notice` For any upcoming deprecation functionality.
- `#internal` For changesets that need to be excluded from the final changelog.
- `#nops` For any feature that is NOP facing and needs to be in the official Release Notes for the release.
- `#removed` For any functionality/config that is removed.
- `#updated` For any functionality that is updated.
- `#wip` For any change that is not ready yet and external communication about it should be held off till it is feature complete.
<!-- thollander/actions-comment-pull-request "changeset-core" -->
author_association: CONTRIBUTOR
user: login: cl-sonarqube-production[bot]
created_at: 2025-04-30T09:53:13Z
body: ## [![Quality Gate passed](https://raw.githubusercontent.com/SonarSource/sonarqube-static-resources/master/v104/checks/QualityGateBadge/passed-16px.png 'Quality Gate passed')](https://sonarqube.main.prod.cldev.sh/dashboard?id=smartcontractkit_chainlink&pullRequest=17513) **Quality Gate passed**  
Issues  
[![](https://raw.githubusercontent.com/SonarSource/sonarqube-static-resources/master/v104/common/passed-16px.png '')](https://sonarqube.main.prod.cldev.sh/project/issues?id=smartcontractkit_chainlink&pullRequest=17513&resolved=false) [0 New issues](https://sonarqube.main.prod.cldev.sh/project/issues?id=smartcontractkit_chainlink&pullRequest=17513&resolved=false)  
[![](https://raw.githubusercontent.com/SonarSource/sonarqube-static-resources/master/v104/common/fixed-16px.png '')](https://sonarqube.main.prod.cldev.sh/project/issues?id=smartcontractkit_chainlink&fixedInPullRequest=17513) [0 Fixed issues](https://sonarqube.main.prod.cldev.sh/project/issues?id=smartcontractkit_chainlink&fixedInPullRequest=17513)  
[![](https://raw.githubusercontent.com/SonarSource/sonarqube-static-resources/master/v104/common/accepted-16px.png '')](https://sonarqube.main.prod.cldev.sh/project/issues?id=smartcontractkit_chainlink&pullRequest=17513&issueStatuses=ACCEPTED) [0 Accepted issues](https://sonarqube.main.prod.cldev.sh/project/issues?id=smartcontractkit_chainlink&pullRequest=17513&issueStatuses=ACCEPTED)

Measures  
[![](https://raw.githubusercontent.com/SonarSource/sonarqube-static-resources/master/v104/common/passed-16px.png '')](https://sonarqube.main.prod.cldev.sh/security_hotspots?id=smartcontractkit_chainlink&pullRequest=17513) [0 Security Hotspots](https://sonarqube.main.prod.cldev.sh/security_hotspots?id=smartcontractkit_chainlink&pullRequest=17513)  
[![](https://raw.githubusercontent.com/SonarSource/sonarqube-static-resources/master/v104/common/passed-16px.png '')](https://sonarqube.main.prod.cldev.sh/component_measures?id=smartcontractkit_chainlink&pullRequest=17513&metric=new_coverage&view=list) [0.0% Coverage on New Code](https://sonarqube.main.prod.cldev.sh/component_measures?id=smartcontractkit_chainlink&pullRequest=17513&metric=new_coverage&view=list)  
[![](https://raw.githubusercontent.com/SonarSource/sonarqube-static-resources/master/v104/common/passed-16px.png '')](https://sonarqube.main.prod.cldev.sh/component_measures?id=smartcontractkit_chainlink&pullRequest=17513&metric=new_duplicated_lines_density&view=list) [0.0% Duplication on New Code](https://sonarqube.main.prod.cldev.sh/component_measures?id=smartcontractkit_chainlink&pullRequest=17513&metric=new_duplicated_lines_density&view=list)  
  
[See analysis details on SonarQube](https://sonarqube.main.prod.cldev.sh/dashboard?id=smartcontractkit_chainlink&pullRequest=17513)


author_association: NONE