refactor: make simulator chain-agnostic with pluggable chain families

cmd/workflow/simulate/capabilities.go

@@ -2,16 +2,13 @@ package simulate
 
 import (
 	"context"
-	"crypto/ecdsa"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
 
-	chaintype "github.com/smartcontractkit/chainlink-common/keystore/corekeys"
+	corekeys "github.com/smartcontractkit/chainlink-common/keystore/corekeys"
 	"github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key"
 	confhttpserver "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/actions/confidentialhttp/server"
 	httpserver "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/actions/http/server"
-	evmserver "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/chain-capabilities/evm/server"
 	consensusserver "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/consensus/server"
 	crontrigger "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/triggers/cron/server"
 	httptrigger "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/triggers/http/server"
@@ -21,79 +18,34 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/fakes"
 )
 
-type ManualTriggerCapabilitiesConfig struct {
-	Clients    map[uint64]*ethclient.Client
-	Forwarders map[uint64]common.Address
-	PrivateKey *ecdsa.PrivateKey
-}
-
+// ManualTriggers holds chain-agnostic trigger services used in simulation.
 type ManualTriggers struct {
 	ManualCronTrigger *fakes.ManualCronTriggerService
 	ManualHTTPTrigger *fakes.ManualHTTPTriggerService
-	ManualEVMChains   map[uint64]*fakes.FakeEVMChain
 }
 
-func NewManualTriggerCapabilities(
-	ctx context.Context,
-	lggr logger.Logger,
-	registry *capabilities.Registry,
-	cfg ManualTriggerCapabilitiesConfig,
-	dryRunChainWrite bool,
-	limits *SimulationLimits,
-) (*ManualTriggers, error) {
-	// Cron
+// NewManualTriggerCapabilities creates and registers cron and HTTP trigger capabilities.
+// These are chain-agnostic and shared across all chain types.
+func NewManualTriggerCapabilities(ctx context.Context, lggr logger.Logger, registry *capabilities.Registry) (*ManualTriggers, error) {
 	manualCronTrigger := fakes.NewManualCronTriggerService(lggr)
 	manualCronTriggerServer := crontrigger.NewCronServer(manualCronTrigger)
 	if err := registry.Add(ctx, manualCronTriggerServer); err != nil {
 		return nil, err
 	}
 
-	// HTTP
 	manualHTTPTrigger := fakes.NewManualHTTPTriggerService(lggr)
 	manualHTTPTriggerServer := httptrigger.NewHTTPServer(manualHTTPTrigger)
 	if err := registry.Add(ctx, manualHTTPTriggerServer); err != nil {
 		return nil, err
 	}
 
-	// EVM
-	evmChains := make(map[uint64]*fakes.FakeEVMChain)
-	for sel, client := range cfg.Clients {
-		fwd, ok := cfg.Forwarders[sel]
-		if !ok {
-			lggr.Infow("Forwarder not found for chain", "selector", sel)
-			continue
-		}
-
-		evm := fakes.NewFakeEvmChain(
-			lggr,
-			client,
-			cfg.PrivateKey,
-			fwd,
-			sel,
-			dryRunChainWrite,
-		)
-
-		// Wrap with limits enforcement if limits are enabled
-		var evmCap evmserver.ClientCapability = evm
-		if limits != nil {
-			evmCap = NewLimitedEVMChain(evm, limits)
-		}
-
-		evmServer := evmserver.NewClientServer(evmCap)
-		if err := registry.Add(ctx, evmServer); err != nil {
-			return nil, err
-		}
-
-		evmChains[sel] = evm
-	}
-
 	return &ManualTriggers{
 		ManualCronTrigger: manualCronTrigger,
 		ManualHTTPTrigger: manualHTTPTrigger,
-		ManualEVMChains:   evmChains,
 	}, nil
 }
 
+// Start starts cron and HTTP trigger services.
 func (m *ManualTriggers) Start(ctx context.Context) error {
 	err := m.ManualCronTrigger.Start(ctx)
 	if err != nil {
@@ -105,16 +57,10 @@ func (m *ManualTriggers) Start(ctx context.Context) error {
 		return err
 	}
 
-	// Start all configured EVM chains
-	for _, evm := range m.ManualEVMChains {
-		if err := evm.Start(ctx); err != nil {
-			return err
-		}
-	}
-
 	return nil
 }
 
+// Close closes cron and HTTP trigger services.
 func (m *ManualTriggers) Close() error {
 	err := m.ManualCronTrigger.Close()
 	if err != nil {
@@ -126,16 +72,10 @@ func (m *ManualTriggers) Close() error {
 		return err
 	}
 
-	// Close all EVM chains
-	for _, evm := range m.ManualEVMChains {
-		if err := evm.Close(); err != nil {
-			return err
-		}
-	}
 	return nil
 }
 
-// NewFakeCapabilities builds faked capabilities, then registers them with the capability registry.
+// NewFakeActionCapabilities builds faked capabilities, then registers them with the capability registry.
 func NewFakeActionCapabilities(ctx context.Context, lggr logger.Logger, registry *capabilities.Registry, secretsPath string, limits *SimulationLimits) ([]services.Service, error) {
 	caps := make([]services.Service, 0)
 
@@ -144,7 +84,7 @@ func NewFakeActionCapabilities(ctx context.Context, lggr logger.Logger, registry
 	nSigners := 4
 	signers := []ocr2key.KeyBundle{}
 	for i := 0; i < nSigners; i++ {
-		signer := ocr2key.MustNewInsecure(fakes.SeedForKeys(), chaintype.EVM)
+		signer := ocr2key.MustNewInsecure(fakes.SeedForKeys(), corekeys.EVM)
 		lggr.Infow("Generated new consensus signer", "address", common.BytesToAddress(signer.PublicKey()))
 		signers = append(signers, signer)
 	}

cmd/workflow/simulate/chain/evm/capabilities.go

@@ -0,0 +1,88 @@
+package evm
+
+import (
+	"context"
+	"crypto/ecdsa"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+
+	evmserver "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/chain-capabilities/evm/server"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities/fakes"
+)
+
+// EVMChainCapabilities holds the EVM chain capability servers created for simulation.
+type EVMChainCapabilities struct {
+	EVMChains map[uint64]*fakes.FakeEVMChain
+}
+
+// NewEVMChainCapabilities creates EVM chain capability servers and registers them
+// with the capability registry. Cron and HTTP triggers are not created here — they
+// are chain-agnostic and managed by the simulate command directly.
+func NewEVMChainCapabilities(
+	ctx context.Context,
+	lggr logger.Logger,
+	registry *capabilities.Registry,
+	clients map[uint64]*ethclient.Client,
+	forwarders map[uint64]string,
+	privateKey *ecdsa.PrivateKey,
+	dryRunChainWrite bool,
+	limits EVMChainLimits,
+) (*EVMChainCapabilities, error) {
+	evmChains := make(map[uint64]*fakes.FakeEVMChain)
+	for sel, client := range clients {
+		fwdStr, ok := forwarders[sel]
+		if !ok {
+			lggr.Infow("Forwarder not found for chain", "selector", sel)
+			continue
+		}
+
+		evm := fakes.NewFakeEvmChain(
+			lggr,
+			client,
+			privateKey,
+			common.HexToAddress(fwdStr),
+			sel,
+			dryRunChainWrite,
+		)
+
+		// Wrap with limits enforcement if limits are provided
+		var evmCap evmserver.ClientCapability = evm
+		if limits != nil {
+			evmCap = NewLimitedEVMChain(evm, limits)
+		}
+
+		evmServer := evmserver.NewClientServer(evmCap)
+		if err := registry.Add(ctx, evmServer); err != nil {
+			return nil, err
+		}
+
+		evmChains[sel] = evm
+	}
+
+	return &EVMChainCapabilities{
+		EVMChains: evmChains,
+	}, nil
+}
+
+// Start starts all configured EVM chains.
+func (c *EVMChainCapabilities) Start(ctx context.Context) error {
+	for _, evm := range c.EVMChains {
+		if err := evm.Start(ctx); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// Close closes all EVM chains.
+func (c *EVMChainCapabilities) Close() error {
+	for _, evm := range c.EVMChains {
+		if err := evm.Close(); err != nil {
+			return err
+		}
+	}
+	return nil
+}