Merge branch 'develop' into fix/inject-df-decoder

Author: silaslenihan

pkg/chains/legacyevm/chain.go

@@ -31,6 +31,7 @@ import (
 	"github.com/smartcontractkit/chainlink-evm/pkg/logpoller"
 	"github.com/smartcontractkit/chainlink-evm/pkg/monitor"
 	"github.com/smartcontractkit/chainlink-evm/pkg/txmgr"
+	evmtypes "github.com/smartcontractkit/chainlink-evm/pkg/types"
 	ubig "github.com/smartcontractkit/chainlink-evm/pkg/utils/big"
 	trontxm "github.com/smartcontractkit/chainlink-tron/relayer/txm"
 )
@@ -64,33 +65,43 @@ var (
 
 // LegacyChains implements [LegacyChainContainer]
 type LegacyChains struct {
-	*chains.ChainsKV[types.ChainService]
+	*chains.ChainsKV[Chain]
+
+	cfgs toml.EVMConfigs
 }
 
-// LegacyChainContainer is container for EVM chains of type [types.ChainService], which may be castable to [Chain].
-// The cast will fail if the chain is running in LOOPP mode, in which case the legacy API is limited to the overlapping set
-// defined by [types.ChainService].
+// LegacyChainContainer is container for EVM chains.
 type LegacyChainContainer interface {
-	Get(id string) (types.ChainService, error)
+	Get(id string) (Chain, error)
 	Len() int
-	List(ids ...string) ([]types.ChainService, error)
-	Slice() []types.ChainService
+	List(ids ...string) ([]Chain, error)
+	Slice() []Chain
+
+	// BCF-2516: this is only used for EVMORM. When we delete that
+	// we can promote/move the needed funcs from it to LegacyChainContainer
+	// so instead of EVMORM().XYZ() we'd have something like legacyChains.XYZ()
+	ChainNodeConfigs() evmtypes.Configs
 }
 
 var _ LegacyChainContainer = &LegacyChains{}
 
-func NewLegacyChains(m map[string]types.ChainService) *LegacyChains {
+func NewLegacyChains(m map[string]Chain, evmCfgs toml.EVMConfigs) *LegacyChains {
 	return &LegacyChains{
-		ChainsKV: chains.NewChainsKV[types.ChainService](m),
+		ChainsKV: chains.NewChainsKV[Chain](m),
+		cfgs:     evmCfgs,
 	}
 }
 
+func (c *LegacyChains) ChainNodeConfigs() evmtypes.Configs {
+	return c.cfgs
+}
+
 // backward compatibility.
 // eth keys are represented as multiple types in the code base;
 // *big.Int, string, and int64.
 //
 // TODO BCF-2507 unify the type system
-func (c *LegacyChains) Get(id string) (types.ChainService, error) {
+func (c *LegacyChains) Get(id string) (Chain, error) {
 	if id == nilBigInt.String() || id == emptyString {
 		return nil, fmt.Errorf("invalid chain id requested: %q", id)
 	}

pkg/chains/legacyevm/chain_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil/sqltest"
-	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 	"github.com/smartcontractkit/chainlink-evm/pkg/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink-evm/pkg/chains/legacyevm/mocks"
@@ -18,9 +17,10 @@ import (
 func TestLegacyChains(t *testing.T) {
 	c := mocks.NewChain(t)
 	c.On("ID").Return(big.NewInt(7))
-	m := map[string]types.ChainService{c.ID().String(): c}
+	m := map[string]legacyevm.Chain{c.ID().String(): c}
 
-	l := legacyevm.NewLegacyChains(m)
+	l := legacyevm.NewLegacyChains(m, []*toml.EVMConfig{})
+	assert.NotNil(t, l.ChainNodeConfigs())
 	got, err := l.Get(c.ID().String())
 	assert.NoError(t, err)
 	assert.Equal(t, c, got)

pkg/logpoller/log_poller.go

@@ -1220,7 +1220,7 @@ func (lp *logPoller) PruneOldBlocks(ctx context.Context) (bool, error) {
 	// Remove <= 2
 	rowsRemoved, err := lp.orm.DeleteBlocksBefore(
 		ctx,
-		latestBlock.FinalizedBlockNumber-lp.keepFinalizedBlocksDepth,
+		referenceBlockNumber-lp.keepFinalizedBlocksDepth,
 		lp.logPrunePageSize,
 	)
 	return lp.logPrunePageSize == 0 || rowsRemoved < lp.logPrunePageSize, err