Update simulated geth client wrapper & LogPoller tests

core/chains/evm/forwarders/forwarder_manager_test.go

@@ -5,15 +5,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient/simulated"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -42,26 +42,26 @@ func TestFwdMgr_MaybeForwardTransaction(t *testing.T) {
 	owner := testutils.MustNewSimTransactor(t)
 	ctx := testutils.Context(t)
 
-	ec := backends.NewSimulatedBackend(map[common.Address]core.GenesisAccount{
+	b := simulated.NewBackend(types.GenesisAlloc{
 		owner.From: {
 			Balance: big.NewInt(0).Mul(big.NewInt(10), big.NewInt(1e18)),
 		},
-	}, 10e6)
-	t.Cleanup(func() { ec.Close() })
+	}, simulated.WithBlockGasLimit(10e6))
+	t.Cleanup(func() { b.Close() })
 	linkAddr := common.HexToAddress("0x01BE23585060835E02B77ef475b0Cc51aA1e0709")
-	operatorAddr, _, _, err := operator_wrapper.DeployOperator(owner, ec, linkAddr, owner.From)
+	operatorAddr, _, _, err := operator_wrapper.DeployOperator(owner, b.Client(), linkAddr, owner.From)
 	require.NoError(t, err)
-	forwarderAddr, _, forwarder, err := authorized_forwarder.DeployAuthorizedForwarder(owner, ec, linkAddr, owner.From, operatorAddr, []byte{})
+	forwarderAddr, _, forwarder, err := authorized_forwarder.DeployAuthorizedForwarder(owner, b.Client(), linkAddr, owner.From, operatorAddr, []byte{})
 	require.NoError(t, err)
-	ec.Commit()
+	b.Commit()
 	_, err = forwarder.SetAuthorizedSenders(owner, []common.Address{owner.From})
 	require.NoError(t, err)
-	ec.Commit()
+	b.Commit()
 	authorized, err := forwarder.GetAuthorizedSenders(nil)
 	require.NoError(t, err)
 	t.Log(authorized)
 
-	evmClient := client.NewSimulatedBackendClient(t, ec, testutils.FixtureChainID)
+	evmClient := client.NewSimulatedBackendClient(t, b, testutils.FixtureChainID)
 
 	lpOpts := logpoller.Opts{
 		PollPeriod:               100 * time.Millisecond,
@@ -109,21 +109,21 @@ func TestFwdMgr_AccountUnauthorizedToForward_SkipsForwarding(t *testing.T) {
 	cfg := configtest.NewTestGeneralConfig(t)
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 	owner := testutils.MustNewSimTransactor(t)
-	ec := backends.NewSimulatedBackend(map[common.Address]core.GenesisAccount{
+	b := simulated.NewBackend(types.GenesisAlloc{
 		owner.From: {
 			Balance: big.NewInt(0).Mul(big.NewInt(10), big.NewInt(1e18)),
 		},
-	}, 10e6)
-	t.Cleanup(func() { ec.Close() })
+	}, simulated.WithBlockGasLimit(10e6))
+	t.Cleanup(func() { b.Close() })
 	linkAddr := common.HexToAddress("0x01BE23585060835E02B77ef475b0Cc51aA1e0709")
-	operatorAddr, _, _, err := operator_wrapper.DeployOperator(owner, ec, linkAddr, owner.From)
+	operatorAddr, _, _, err := operator_wrapper.DeployOperator(owner, b.Client(), linkAddr, owner.From)
 	require.NoError(t, err)
 
-	forwarderAddr, _, _, err := authorized_forwarder.DeployAuthorizedForwarder(owner, ec, linkAddr, owner.From, operatorAddr, []byte{})
+	forwarderAddr, _, _, err := authorized_forwarder.DeployAuthorizedForwarder(owner, b.Client(), linkAddr, owner.From, operatorAddr, []byte{})
 	require.NoError(t, err)
-	ec.Commit()
+	b.Commit()
 
-	evmClient := client.NewSimulatedBackendClient(t, ec, testutils.FixtureChainID)
+	evmClient := client.NewSimulatedBackendClient(t, b, testutils.FixtureChainID)
 	lpOpts := logpoller.Opts{
 		PollPeriod:               100 * time.Millisecond,
 		FinalityDepth:            2,

core/chains/evm/logpoller/helper_test.go

@@ -9,19 +9,20 @@ import (
 	"time"
 
 	pkgerrors "github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient/simulated"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
@@ -37,7 +38,8 @@ type TestHarness struct {
 	ChainID, ChainID2                *big.Int
 	ORM, ORM2                        logpoller.ORM
 	LogPoller                        logpoller.LogPollerTest
-	Client                           *backends.SimulatedBackend
+	Client                           *client.SimulatedBackendClient
+	Backend                          evmtypes.Backend
 	Owner                            *bind.TransactOpts
 	Emitter1, Emitter2               *log_emitter.LogEmitter
 	EmitterAddress1, EmitterAddress2 common.Address
@@ -52,36 +54,37 @@ func SetupTH(t testing.TB, opts logpoller.Opts) TestHarness {
 	o := logpoller.NewORM(chainID, db, lggr)
 	o2 := logpoller.NewORM(chainID2, db, lggr)
 	owner := testutils.MustNewSimTransactor(t)
-	ec := backends.NewSimulatedBackend(map[common.Address]core.GenesisAccount{
+
+	backend := simulated.NewBackend(types.GenesisAlloc{
 		owner.From: {
 			Balance: big.NewInt(0).Mul(big.NewInt(10), big.NewInt(1e18)),
 		},
-	}, 10e6)
+	}, simulated.WithBlockGasLimit(10e6))
+
 	// Poll period doesn't matter, we intend to call poll and save logs directly in the test.
 	// Set it to some insanely high value to not interfere with any tests.
-	esc := client.NewSimulatedBackendClient(t, ec, chainID)
-	// Mark genesis block as finalized to avoid any nulls in the tests
-	//TODO OK to drop?
-	//head := esc.Backend().Blockchain().CurrentHeader()
-	//esc.Backend().Blockchain().SetFinalized(head)
+
+	esc := client.NewSimulatedBackendClient(t, backend, chainID)
 
 	if opts.PollPeriod == 0 {
 		opts.PollPeriod = 1 * time.Hour
 	}
 	lp := logpoller.NewLogPoller(o, esc, lggr, opts)
-	emitterAddress1, _, emitter1, err := log_emitter.DeployLogEmitter(owner, ec)
+	emitterAddress1, _, emitter1, err := log_emitter.DeployLogEmitter(owner, backend.Client())
 	require.NoError(t, err)
-	emitterAddress2, _, emitter2, err := log_emitter.DeployLogEmitter(owner, ec)
+	emitterAddress2, _, emitter2, err := log_emitter.DeployLogEmitter(owner, backend.Client())
 	require.NoError(t, err)
-	ec.Commit()
+	backend.Commit()
+
 	return TestHarness{
 		Lggr:            lggr,
 		ChainID:         chainID,
 		ChainID2:        chainID2,
 		ORM:             o,
 		ORM2:            o2,
 		LogPoller:       lp,
-		Client:          ec,
+		Client:          esc,
+		Backend:         backend,
 		Owner:           owner,
 		Emitter1:        emitter1,
 		Emitter2:        emitter2,
@@ -112,3 +115,10 @@ func (th *TestHarness) assertHaveCanonical(t *testing.T, start, end int) {
 		assert.Equal(t, chainBlk.Hash().Bytes(), blk.BlockHash.Bytes(), "block %v", i)
 	}
 }
+
+// Simulates an RPC failover event to an alternate rpc server. This can also be used to
+// simulate switching back to the primary rpc after it recovers.
+func (th *TestHarness) SetActiveClient(backend evmtypes.Backend, chainFamily evmtypes.ChainFamily) {
+	th.Backend = backend
+	th.Client.SetBackend(backend, chainFamily)
+}

core/chains/evm/logpoller/log_poller.go

@@ -27,6 +27,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/types/query"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"