[CRE-491] Prepare relay/evm files to be moved to chainlink-evm (#22650)

* Minor.

* Minor.

* Minor.

* Minor.

Author: pavel-raykov

.mockery.yaml

@@ -232,6 +232,11 @@ packages:
       dir: "core/services/relay/evm/types/mocks"
     interfaces:
       LogPollerWrapper:
+  github.com/smartcontractkit/chainlink-evm/pkg/keys:
+    config:
+      dir: "core/services/relay/evm/types/mocks"
+    interfaces:
+      AddressLister:
   github.com/smartcontractkit/chainlink/v2/core/services/s4:
     interfaces:
       ORM:

core/services/relay/evm/config_poller.go

@@ -70,10 +70,10 @@ type CPConfig struct {
 }
 
 func NewConfigPoller(ctx context.Context, lggr logger.Logger, cfg CPConfig) (config.ConfigPoller, error) {
-	return newConfigPoller(ctx, lggr, cfg.Client, cfg.DestinationChainPoller, cfg.AggregatorContractAddress, cfg.ConfigStoreAddress, cfg.LogDecoder)
+	return NewConfigPollerWithParams(ctx, lggr, cfg.Client, cfg.DestinationChainPoller, cfg.AggregatorContractAddress, cfg.ConfigStoreAddress, cfg.LogDecoder)
 }
 
-func newConfigPoller(ctx context.Context, lggr logger.Logger, client client.Client, destChainPoller logpoller.LogPoller, aggregatorContractAddr common.Address, configStoreAddr *common.Address, ld LogDecoder) (*configPoller, error) {
+func NewConfigPollerWithParams(ctx context.Context, lggr logger.Logger, client client.Client, destChainPoller logpoller.LogPoller, aggregatorContractAddr common.Address, configStoreAddr *common.Address, ld LogDecoder) (config.ConfigPoller, error) {
 	err := destChainPoller.RegisterFilter(ctx, logpoller.Filter{Name: configPollerFilterName(aggregatorContractAddr), EventSigs: []common.Hash{ld.EventSig()}, Addresses: []common.Address{aggregatorContractAddr}})
 	if err != nil {
 		return nil, err

core/services/relay/evm/config_poller_test.go

@@ -1,4 +1,4 @@
-package evm
+package evm_test
 
 import (
 	"database/sql"
@@ -41,6 +41,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/common/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/testhelpers"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -60,7 +61,7 @@ func TestConfigPoller(t *testing.T) {
 	var accessAddress common.Address
 	ctx := testutils.Context(t)
 
-	ld := OCR2AggregatorLogDecoder
+	ld := evm.OCR2AggregatorLogDecoder
 
 	{
 		key, err := crypto.GenerateKey()
@@ -110,7 +111,7 @@ func TestConfigPoller(t *testing.T) {
 	}
 
 	t.Run("LatestConfig errors if there is no config in logs and config store is unconfigured", func(t *testing.T) {
-		cp, err := NewConfigPoller(ctx, lggr, CPConfig{ethClient, lp, ocrAddress, nil, ld})
+		cp, err := evm.NewConfigPoller(ctx, lggr, evm.CPConfig{ethClient, lp, ocrAddress, nil, ld})
 		require.NoError(t, err)
 
 		_, err = cp.LatestConfig(testutils.Context(t), 0)
@@ -119,7 +120,7 @@ func TestConfigPoller(t *testing.T) {
 	})
 
 	t.Run("happy path (with config store)", func(t *testing.T) {
-		cp, err := NewConfigPoller(ctx, lggr, CPConfig{ethClient, lp, ocrAddress, &configStoreContractAddr, ld})
+		cp, err := evm.NewConfigPoller(ctx, lggr, evm.CPConfig{ethClient, lp, ocrAddress, &configStoreContractAddr, ld})
 		require.NoError(t, err)
 		// Should have no config to begin with.
 		_, configDigest, err := cp.LatestConfigDetails(testutils.Context(t))
@@ -190,7 +191,7 @@ func TestConfigPoller(t *testing.T) {
 		mp.On("LatestLogByEventSigWithConfs", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, sql.ErrNoRows)
 
 		t.Run("if callLatestConfigDetails succeeds", func(t *testing.T) {
-			cp, err := newConfigPoller(ctx, lggr, ethClient, mp, ocrAddress, &configStoreContractAddr, ld)
+			cp, err := evm.NewConfigPollerWithParams(ctx, lggr, ethClient, mp, ocrAddress, &configStoreContractAddr, ld)
 			require.NoError(t, err)
 
 			t.Run("when config has not been set, returns zero values", func(t *testing.T) {
@@ -227,12 +228,9 @@ func TestConfigPoller(t *testing.T) {
 			failingClient := new(clienttest.Client)
 			failingClient.On("ConfiguredChainID").Return(big.NewInt(42))
 			failingClient.On("CallContract", mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("something exploded"))
-			cp, err := newConfigPoller(ctx, lggr, failingClient, mp, ocrAddress, &configStoreContractAddr, ld)
+			cp, err := evm.NewConfigPollerWithParams(ctx, lggr, failingClient, mp, ocrAddress, &configStoreContractAddr, ld)
 			require.NoError(t, err)
 
-			cp.configStoreContractAddr = &configStoreContractAddr
-			cp.configStoreContract = configStoreContract
-
 			_, _, err = cp.LatestConfigDetails(testutils.Context(t))
 			assert.EqualError(t, err, "something exploded")
 
@@ -266,7 +264,7 @@ func TestConfigPoller(t *testing.T) {
 		mp.On("LatestLogByEventSigWithConfs", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, sql.ErrNoRows)
 
 		t.Run("if callReadConfig succeeds", func(t *testing.T) {
-			cp, err := newConfigPoller(ctx, lggr, ethClient, mp, ocrAddress, &configStoreContractAddr, ld)
+			cp, err := evm.NewConfigPollerWithParams(ctx, lggr, ethClient, mp, ocrAddress, &configStoreContractAddr, ld)
 			require.NoError(t, err)
 
 			t.Run("when config has not been set, returns error", func(t *testing.T) {
@@ -288,9 +286,9 @@ func TestConfigPoller(t *testing.T) {
 					DeltaC:              10,
 				}, ocrContract, user)
 
-				signerAddresses, err := OnchainPublicKeyToAddress(contractConfig.Signers)
+				signerAddresses, err := evm.OnchainPublicKeyToAddress(contractConfig.Signers)
 				require.NoError(t, err)
-				transmitterAddresses, err := AccountToAddress(contractConfig.Transmitters)
+				transmitterAddresses, err := evm.AccountToAddress(contractConfig.Transmitters)
 				require.NoError(t, err)
 
 				configuration := ocrconfigurationstoreevmsimple.OCRConfigurationStoreEVMSimpleConfigurationEVMSimple{
@@ -328,7 +326,7 @@ func TestConfigPoller(t *testing.T) {
 				// initial call to retrieve config store address from aggregator
 				return *callArgs.To == ocrAddress
 			}), mock.Anything).Return(nil, errors.New("something exploded")).Once()
-			cp, err := newConfigPoller(ctx, lggr, failingClient, mp, ocrAddress, &configStoreContractAddr, ld)
+			cp, err := evm.NewConfigPollerWithParams(ctx, lggr, failingClient, mp, ocrAddress, &configStoreContractAddr, ld)
 			require.NoError(t, err)
 
 			_, err = cp.LatestConfig(testutils.Context(t), 0)
@@ -377,9 +375,9 @@ func setConfig(t *testing.T, pluginConfig median.OffchainConfig, ocrContract *oc
 		onchainConfig,
 	)
 	require.NoError(t, err)
-	signerAddresses, err := OnchainPublicKeyToAddress(signers)
+	signerAddresses, err := evm.OnchainPublicKeyToAddress(signers)
 	require.NoError(t, err)
-	transmitterAddresses, err := AccountToAddress(transmitters)
+	transmitterAddresses, err := evm.AccountToAddress(transmitters)
 	require.NoError(t, err)
 	_, err = ocrContract.SetConfig(user, signerAddresses, transmitterAddresses, threshold, onchainConfig, offchainConfigVersion, offchainConfig)
 	require.NoError(t, err)

core/services/relay/evm/evm_service_test.go

@@ -24,14 +24,13 @@ import (
 	configmocks "github.com/smartcontractkit/chainlink-evm/pkg/config/mocks"
 	"github.com/smartcontractkit/chainlink-evm/pkg/heads/headstest"
 	"github.com/smartcontractkit/chainlink-evm/pkg/logpoller"
-	evmtestutils "github.com/smartcontractkit/chainlink-evm/pkg/testutils"
 	"github.com/smartcontractkit/chainlink-evm/pkg/txmgr"
 	"github.com/smartcontractkit/chainlink-evm/pkg/types"
 	fwtxmgr "github.com/smartcontractkit/chainlink-framework/chains/txmgr"
 	evmmocks "github.com/smartcontractkit/chainlink/v2/common/chains/mocks"
 	lpmocks "github.com/smartcontractkit/chainlink/v2/common/logpoller/mocks"
 	txmmocks "github.com/smartcontractkit/chainlink/v2/common/txmgr/mocks"
-	keystoremocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
+	addressmocks "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types/mocks"
 )
 
 const ExpectedTxHash = "0xabcd"
@@ -46,7 +45,7 @@ type Mocks struct {
 	Poller        *lpmocks.LogPoller
 	HeaderTracker *headstest.Tracker[*types.Head, common.Hash]
 	Relayer       *Relayer
-	KeyStoreMock  keyStoreMock
+	AddressLister *addressmocks.AddressLister
 }
 
 type returnedStatusAndReceipts struct {
@@ -64,15 +63,6 @@ func createMockReceipt(t *testing.T) *txmgr.ChainReceipt {
 	return &receipt
 }
 
-type keyStoreMock struct {
-	chainID *big.Int
-	*keystoremocks.Eth
-}
-
-func (_m keyStoreMock) EnabledAddresses(ctx context.Context) ([]common.Address, error) {
-	return _m.EnabledAddressesForChain(ctx, _m.chainID)
-}
-
 func setupMocksAndRelayer(t *testing.T) (*Mocks, *Relayer) {
 	chain := evmmocks.NewChain(t)
 	txManager := txmmocks.NewMockEvmTxManager(t)
@@ -82,8 +72,8 @@ func setupMocksAndRelayer(t *testing.T) (*Mocks, *Relayer) {
 	evmClient := clienttest.NewClient(t)
 	poller := lpmocks.NewLogPoller(t)
 	ht := headstest.NewTracker[*types.Head](t)
-	ksMock := keyStoreMock{chainID: evmtestutils.FixtureChainID, Eth: keystoremocks.NewEth(t)}
-	ksMock.Eth.EXPECT().EnabledAddressesForChain(mock.Anything, mock.Anything).Return([]common.Address{createFromAddress().Address()}, nil).Maybe()
+	addressMock := addressmocks.NewAddressLister(t)
+	addressMock.EXPECT().EnabledAddresses(mock.Anything).Return([]common.Address{createFromAddress().Address()}, nil).Maybe()
 	mockEVM.EXPECT().ConfirmationTimeout().Return(2 * time.Second).Maybe()
 	chain.On("TxManager").Return(txManager).Maybe()
 	chain.On("LogPoller").Return(poller).Maybe()
@@ -96,7 +86,7 @@ func setupMocksAndRelayer(t *testing.T) (*Mocks, *Relayer) {
 	require.NoError(t, err)
 	relayer := &Relayer{
 		chain:      chain,
-		evmService: evmService{addressLister: ksMock, chain: chain, logger: lggr},
+		evmService: evmService{addressLister: addressMock, chain: chain, logger: lggr},
 	}
 
 	return &Mocks{
@@ -108,7 +98,7 @@ func setupMocksAndRelayer(t *testing.T) (*Mocks, *Relayer) {
 		EvmClient:     evmClient,
 		Poller:        poller,
 		HeaderTracker: ht,
-		KeyStoreMock:  ksMock,
+		AddressLister: addressMock,
 	}, relayer
 }
 
@@ -390,19 +380,19 @@ func TestEVMService(t *testing.T) {
 			Name: "Fails with failed to get enabled addresses",
 			SetupMocks: func(m *Mocks, ctx any) {
 				// Clear the default expectation first
-				m.KeyStoreMock.Eth.EXPECT().EnabledAddressesForChain(mock.Anything, mock.Anything).Unset()
+				m.AddressLister.EXPECT().EnabledAddresses(mock.Anything).Unset()
 				// Set new expectation
-				m.KeyStoreMock.EXPECT().EnabledAddressesForChain(mock.Anything, mock.Anything).Return([]common.Address{}, errors.New("some error")).Once()
+				m.AddressLister.EXPECT().EnabledAddresses(mock.Anything).Return([]common.Address{}, errors.New("some error")).Once()
 			},
 			ExpectedError: "failed to get enabled addresses: some error",
 		},
 		{
 			Name: "Fails with no enabled addresses",
 			SetupMocks: func(m *Mocks, ctx any) {
 				// Clear the default expectation first
-				m.KeyStoreMock.Eth.EXPECT().EnabledAddressesForChain(mock.Anything, mock.Anything).Unset()
+				m.AddressLister.EXPECT().EnabledAddresses(mock.Anything).Unset()
 				// Set new expectation
-				m.KeyStoreMock.Eth.EXPECT().EnabledAddressesForChain(mock.Anything, mock.Anything).Return([]common.Address{}, nil).Once()
+				m.AddressLister.EXPECT().EnabledAddresses(mock.Anything).Return([]common.Address{}, nil).Once()
 			},
 			ExpectedError: "no enabled addresses available",
 		},
@@ -413,8 +403,8 @@ func TestEVMService(t *testing.T) {
 				lowBalanceAddr := common.HexToAddress("0x333")
 
 				// Clear the default expectation and return multiple addresses
-				m.KeyStoreMock.Eth.EXPECT().EnabledAddressesForChain(mock.Anything, mock.Anything).Unset()
-				m.KeyStoreMock.Eth.EXPECT().EnabledAddressesForChain(mock.Anything, mock.Anything).Return(
+				m.AddressLister.EXPECT().EnabledAddresses(mock.Anything).Unset()
+				m.AddressLister.EXPECT().EnabledAddresses(mock.Anything).Return(
 					[]common.Address{lowBalanceAddr, highBalanceAddr}, nil,
 				).Once()