Modularise EVM chain family in simulate package

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"
 	"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,25 +18,18 @@ 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 capabilities (cron + HTTP).
+// Chain-specific trigger capabilities are managed by their respective chain family adapters.
 type ManualTriggers struct {
 	ManualCronTrigger *fakes.ManualCronTriggerService
 	ManualHTTPTrigger *fakes.ManualHTTPTriggerService
-	ManualEVMChains   map[uint64]*fakes.FakeEVMChain
 }
 
+// NewManualTriggerCapabilities creates and registers chain-agnostic trigger capabilities.
 func NewManualTriggerCapabilities(
 	ctx context.Context,
 	lggr logger.Logger,
 	registry *capabilities.Registry,
-	cfg ManualTriggerCapabilitiesConfig,
-	dryRunChainWrite bool,
-	limits *SimulationLimits,
 ) (*ManualTriggers, error) {
 	// Cron
 	manualCronTrigger := fakes.NewManualCronTriggerService(lggr)
@@ -55,42 +45,9 @@ func NewManualTriggerCapabilities(
 		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
 }
 
@@ -105,13 +62,6 @@ 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
 }
 
@@ -126,16 +76,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)
 

cmd/workflow/simulate/chainfamily/chainfamily.go

@@ -0,0 +1,110 @@
+// Package chainfamily defines the adapter interface for multi-chain simulation support.
+// Each chain family (EVM, Aptos, Solana, etc.) implements the Adapter interface and
+// self-registers via init(). The core simulate flow iterates registered adapters
+// instead of hardcoding chain-specific logic.
+package chainfamily
+
+import (
+	"context"
+	"io"
+
+	"github.com/spf13/cobra"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities"
+)
+
+// ChainSelector is a uint64 chain selector from the chain-selectors package.
+type ChainSelector = uint64
+
+// SupportedChain describes a chain known to the simulator with its default config.
+type SupportedChain struct {
+	Selector  ChainSelector
+	Forwarder string // hex address, family-specific format
+}
+
+// ExperimentalChainConfig holds per-chain overrides from experimental config,
+// already filtered to a specific adapter's family by the core.
+type ExperimentalChainConfig struct {
+	ChainSelector ChainSelector
+	RPCURL        string
+	Forwarder     string
+}
+
+// SetupConfig contains everything an adapter needs to set itself up.
+// The core populates this once; no viper dependency leaks into adapters.
+// Capability registration happens separately via ChainRuntime.RegisterCapabilities.
+type SetupConfig struct {
+	Logger logger.Logger
+
+	// RPCURLs maps chain name -> RPC URL, scoped to this adapter's family.
+	RPCURLs map[string]string
+
+	// ExperimentalChains filtered to THIS adapter's family by the core.
+	ExperimentalChains []ExperimentalChainConfig
+
+	// DryRun is true when chain writes should be simulated (default behavior).
+	DryRun bool
+
+	// SecretsPath is the path to the secrets file, if any.
+	SecretsPath string
+
+	// FlagValues provides access to family-specific flag values registered via AddFlags.
+	FlagValues func(name string) string
+
+	// ChainWriteReportSizeLimit is the max report size in bytes (0 = no limit).
+	ChainWriteReportSizeLimit int
+
+	// ChainWriteGasLimit is the max gas limit for chain writes (0 = no limit).
+	ChainWriteGasLimit uint64
+}
+
+// TriggerRequest contains everything an adapter needs to build a trigger function.
+type TriggerRequest struct {
+	TriggerID             string // e.g. "evm:ChainSelector:123@1.0.0 LogTrigger"
+	TriggerRegistrationID string
+	ChainSelector         ChainSelector
+	PromptUser            bool // true = interactive mode
+	FlagValues            func(name string) string
+}
+
+// ChainRuntime is the live handle returned by Setup(). The adapter owns its
+// internal state (clients, fake chains) behind this interface. The core code
+// never inspects chain internals - it just calls BuildTriggerFunc and Close.
+type ChainRuntime interface {
+	// RegisterCapabilities registers chain-specific capabilities with the
+	// capability registry. Called during simulator initialization when the
+	// registry is available, not during Setup().
+	RegisterCapabilities(ctx context.Context, registry *capabilities.Registry) error
+
+	// BuildTriggerFunc creates a function that fires the given chain trigger.
+	BuildTriggerFunc(ctx context.Context, req TriggerRequest) (func() error, error)
+
+	// OwnedSelectors returns all chain selectors this runtime manages.
+	// Used for trigger routing without relying on GetSelectorFamily.
+	OwnedSelectors() []ChainSelector
+
+	// Services returns all services managed by this runtime for lifecycle management.
+	Services() []services.Service
+
+	// Close releases all resources (RPC clients, fake chains, etc.)
+	io.Closer
+}
+
+// Adapter is the contract each chain family implements. Adapters self-register
+// via init() + Register().
+type Adapter interface {
+	// Family returns the chain family identifier (e.g. "evm", "aptos", "solana").
+	Family() string
+
+	// SupportedChains returns default chain configs for this family.
+	SupportedChains() []SupportedChain
+
+	// AddFlags registers family-specific CLI flags on the simulate command.
+	AddFlags(cmd *cobra.Command)
+
+	// Setup dials RPCs, health-checks, and returns a ChainRuntime.
+	// Returns (nil, nil) if no chains of this family are configured.
+	Setup(ctx context.Context, cfg SetupConfig) (ChainRuntime, error)
+}