Add validation for a minimum of 16 nops in ccip 2.0 testnet and mainnet env (#2006)

carte7000 · web-flow · commit 6396d357620f · 2026-04-27T13:29:10.000Z
diff --git a/deployment/v2_0_0/changesets/apply_executor_config.go b/deployment/v2_0_0/changesets/apply_executor_config.go
@@ -31,6 +31,9 @@ func ApplyExecutorConfig(registry *adapters.ExecutorConfigRegistry) deployment.C
 		if cfg.Topology == nil {
 			return fmt.Errorf("topology is required")
 		}
+		if err := cfg.Topology.ValidateForEnvironment(e.Name); err != nil {
+			return fmt.Errorf("topology validation failed: %w", err)
+		}
 
 		if cfg.ExecutorQualifier == "" {
 			return fmt.Errorf("executor qualifier is required")
diff --git a/deployment/v2_0_0/changesets/apply_executor_config_test.go b/deployment/v2_0_0/changesets/apply_executor_config_test.go
@@ -69,6 +69,14 @@ func newMinimalTopology(nopAliases []string, executorQualifier string, mode shar
 	}
 }
 
+func makeTestNOPAliases(count int) []string {
+	aliases := make([]string, count)
+	for i := range aliases {
+		aliases[i] = fmt.Sprintf("nop%d", i+1)
+	}
+	return aliases
+}
+
 func newTestExecutorEnv(t *testing.T, selectors []uint64) deployment.Environment {
 	t.Helper()
 	lggr := logger.Test(t)
@@ -125,7 +133,16 @@ func TestApplyExecutorConfig_Validation(t *testing.T) {
 				},
 				ExecutorQualifier: "pool1",
 			},
-			wantErr: "NOP topology with at least one NOP is required",
+			wantErr: "nop_topology is required",
+		},
+		{
+			name: "production topology with fewer than sixteen NOPs returns error",
+			env:  deployment.Environment{Name: "prod_mainnet", BlockChains: newExecutorTestBlockChains([]uint64{sel1})},
+			input: changesets.ApplyExecutorConfigInput{
+				Topology:          newMinimalTopology([]string{"nop1"}, "pool1", ""),
+				ExecutorQualifier: "pool1",
+			},
+			wantErr: "requires at least 16 unique NOPs",
 		},
 		{
 			name: "missing executor qualifier returns error",
@@ -159,7 +176,7 @@ func TestApplyExecutorConfig_Validation(t *testing.T) {
 			env:  deployment.Environment{Name: "mainnet", BlockChains: newExecutorTestBlockChains([]uint64{sel1})},
 			input: changesets.ApplyExecutorConfigInput{
 				Topology: func() *offchain.EnvironmentTopology {
-					topo := newMinimalTopology([]string{"nop1"}, "pool1", "")
+					topo := newMinimalTopology(makeTestNOPAliases(16), "pool1", "")
 					topo.PyroscopeURL = "http://pyroscope"
 					return topo
 				}(),
diff --git a/deployment/v2_0_0/changesets/apply_verifier_config.go b/deployment/v2_0_0/changesets/apply_verifier_config.go
@@ -34,6 +34,9 @@ func ApplyVerifierConfig(registry *adapters.VerifierConfigRegistry) deployment.C
 		if cfg.Topology == nil {
 			return fmt.Errorf("topology is required")
 		}
+		if err := cfg.Topology.ValidateForEnvironment(e.Name); err != nil {
+			return fmt.Errorf("topology validation failed: %w", err)
+		}
 
 		if cfg.Topology.NOPTopology == nil || len(cfg.Topology.NOPTopology.NOPs) == 0 {
 			return fmt.Errorf("NOP topology with at least one NOP is required")
diff --git a/deployment/v2_0_0/changesets/apply_verifier_config_test.go b/deployment/v2_0_0/changesets/apply_verifier_config_test.go
@@ -177,7 +177,7 @@ func TestApplyVerifierConfig_Validation(t *testing.T) {
 				CommitteeQualifier:       "c1",
 				DefaultExecutorQualifier: "pool1",
 			},
-			wantErr: "NOP topology with at least one NOP is required",
+			wantErr: "nop_topology is required",
 		},
 		{
 			name: "committee with no aggregators returns error",
@@ -208,7 +208,7 @@ func TestApplyVerifierConfig_Validation(t *testing.T) {
 			env:  deployment.Environment{Name: "mainnet", BlockChains: cldf_chain.NewBlockChains(map[uint64]cldf_chain.BlockChain{sel1: cldfevm.Chain{Selector: sel1}})},
 			input: changesets.ApplyVerifierConfigInput{
 				Topology: func() *offchain.EnvironmentTopology {
-					topo := newVerifierTopology([]string{"nop1"}, "c1", []uint64{sel1}, "")
+					topo := newVerifierTopology(makeTestNOPAliases(16), "c1", []uint64{sel1}, "")
 					topo.PyroscopeURL = "http://pyroscope"
 					return topo
 				}(),
diff --git a/deployment/v2_0_0/changesets/configure_chains_for_lanes_from_topology.go b/deployment/v2_0_0/changesets/configure_chains_for_lanes_from_topology.go
@@ -160,6 +160,9 @@ func ConfigureChainsForLanesFromTopology(
 		if cfg.Topology == nil {
 			return fmt.Errorf("topology is required")
 		}
+		if err := cfg.Topology.ValidateForEnvironment(e.Name); err != nil {
+			return fmt.Errorf("topology validation failed: %w", err)
+		}
 		if cfg.Topology.NOPTopology == nil || len(cfg.Topology.NOPTopology.Committees) == 0 {
 			return fmt.Errorf("no committees defined in topology")
 		}
diff --git a/deployment/v2_0_0/changesets/configure_chains_for_lanes_from_topology_test.go b/deployment/v2_0_0/changesets/configure_chains_for_lanes_from_topology_test.go
@@ -289,10 +289,10 @@ func TestConfigureChainsForLanesFromTopology_HappyPathAndCrossFamily(t *testing.
 				CommitteeVerifiers: []changesets.CommitteeVerifierInputConfig{
 					{
 						CommitteeQualifier: "default",
-					RemoteChains: map[uint64]changesets.CommitteeVerifierRemoteChainConfig{
-						remoteEVM:    {FeeUSDCents: ptrTo[uint16](10), GasForVerification: ptrTo[uint32](20), PayloadSizeBytes: ptrTo[uint16](30)},
-						remoteSolana: {FeeUSDCents: ptrTo[uint16](40), GasForVerification: ptrTo[uint32](50), PayloadSizeBytes: ptrTo[uint16](60)},
-					},
+						RemoteChains: map[uint64]changesets.CommitteeVerifierRemoteChainConfig{
+							remoteEVM:    {FeeUSDCents: ptrTo[uint16](10), GasForVerification: ptrTo[uint32](20), PayloadSizeBytes: ptrTo[uint16](30)},
+							remoteSolana: {FeeUSDCents: ptrTo[uint16](40), GasForVerification: ptrTo[uint32](50), PayloadSizeBytes: ptrTo[uint16](60)},
+						},
 					},
 				},
 				RemoteChains: map[uint64]changesets.PartialRemoteChainConfig{
@@ -919,12 +919,19 @@ func TestConfigureChainsForLanesFromTopology_VerifyPreconditions(t *testing.T) {
 		)
 		err := cs.VerifyPreconditions(env, changesets.ConfigureChainsForLanesFromTopologyConfig{
 			Topology: &offchain.EnvironmentTopology{
+				IndexerAddress: []string{"http://indexer:8080"},
 				NOPTopology: &offchain.NOPTopology{
-					NOPs: []offchain.NOPConfig{{Alias: "nop-1"}},
+					NOPs: []offchain.NOPConfig{{Alias: "nop-1", Name: "nop-1-name"}},
 					Committees: map[string]offchain.CommitteeConfig{
-						"default": {Qualifier: "default", ChainConfigs: map[string]offchain.ChainCommitteeConfig{
-							fmt.Sprintf("%d", remoteSelector): {NOPAliases: []string{"nop-1"}, Threshold: 1},
-						}},
+						"default": {
+							Qualifier: "default",
+							Aggregators: []offchain.AggregatorConfig{
+								{Name: "agg-1", Address: "http://aggregator:8080"},
+							},
+							ChainConfigs: map[string]offchain.ChainCommitteeConfig{
+								fmt.Sprintf("%d", remoteSelector): {NOPAliases: []string{"nop-1"}, Threshold: 1},
+							},
+						},
 					},
 				},
 			},
@@ -949,12 +956,19 @@ func TestConfigureChainsForLanesFromTopology_VerifyPreconditions(t *testing.T) {
 		)
 		err := cs.VerifyPreconditions(env, changesets.ConfigureChainsForLanesFromTopologyConfig{
 			Topology: &offchain.EnvironmentTopology{
+				IndexerAddress: []string{"http://indexer:8080"},
 				NOPTopology: &offchain.NOPTopology{
-					NOPs: []offchain.NOPConfig{{Alias: "nop-1"}},
+					NOPs: []offchain.NOPConfig{{Alias: "nop-1", Name: "nop-1-name"}},
 					Committees: map[string]offchain.CommitteeConfig{
-						"default": {Qualifier: "default", ChainConfigs: map[string]offchain.ChainCommitteeConfig{
-							fmt.Sprintf("%d", remoteSelector): {NOPAliases: []string{"nop-1"}, Threshold: 1},
-						}},
+						"default": {
+							Qualifier: "default",
+							Aggregators: []offchain.AggregatorConfig{
+								{Name: "agg-1", Address: "http://aggregator:8080"},
+							},
+							ChainConfigs: map[string]offchain.ChainCommitteeConfig{
+								fmt.Sprintf("%d", remoteSelector): {NOPAliases: []string{"nop-1"}, Threshold: 1},
+							},
+						},
 					},
 				},
 			},
diff --git a/deployment/v2_0_0/changesets/deploy_chain_contracts.go b/deployment/v2_0_0/changesets/deploy_chain_contracts.go
@@ -60,6 +60,9 @@ func DeployChainContracts(registry *adapters.DeployChainContractsRegistry) deplo
 		if cfg.Cfg.Topology == nil {
 			return fmt.Errorf("topology is required")
 		}
+		if err := cfg.Cfg.Topology.ValidateForEnvironment(e.Name); err != nil {
+			return fmt.Errorf("topology validation failed: %w", err)
+		}
 
 		if cfg.Cfg.Topology.NOPTopology == nil || len(cfg.Cfg.Topology.NOPTopology.Committees) == 0 {
 			return fmt.Errorf("no committees defined in topology")
diff --git a/deployment/v2_0_0/changesets/generate_aggregator_config.go b/deployment/v2_0_0/changesets/generate_aggregator_config.go
@@ -65,6 +65,9 @@ func resolveAggregatorChainSelectors(e deployment.Environment, cfg GenerateAggre
 	if cfg.Topology == nil {
 		return nil, fmt.Errorf("topology is required")
 	}
+	if err := cfg.Topology.ValidateForEnvironment(e.Name); err != nil {
+		return nil, fmt.Errorf("topology validation failed: %w", err)
+	}
 	if cfg.Topology.NOPTopology == nil {
 		return nil, fmt.Errorf("NOP topology is required")
 	}
diff --git a/deployment/v2_0_0/changesets/generate_aggregator_config_test.go b/deployment/v2_0_0/changesets/generate_aggregator_config_test.go
@@ -62,15 +62,23 @@ func newAggregatorConfigRegistry() *adapters.AggregatorConfigRegistry {
 func newTopologyForCommittee(qualifier string, selectors []uint64) *offchain.EnvironmentTopology {
 	chainConfigs := make(map[string]offchain.ChainCommitteeConfig, len(selectors))
 	for _, sel := range selectors {
-		chainConfigs[strconv.FormatUint(sel, 10)] = offchain.ChainCommitteeConfig{}
+		chainConfigs[strconv.FormatUint(sel, 10)] = offchain.ChainCommitteeConfig{
+			NOPAliases: []string{"nop1"},
+			Threshold:  1,
+		}
 	}
 
 	return &offchain.EnvironmentTopology{
+		IndexerAddress: []string{"http://indexer:8080"},
 		NOPTopology: &offchain.NOPTopology{
+			NOPs: []offchain.NOPConfig{{Alias: "nop1", Name: "nop1-name"}},
 			Committees: map[string]offchain.CommitteeConfig{
 				qualifier: {
 					Qualifier:    qualifier,
 					ChainConfigs: chainConfigs,
+					Aggregators: []offchain.AggregatorConfig{
+						{Name: "agg-1", Address: "http://aggregator:8080"},
+					},
 				},
 			},
 		},
@@ -118,15 +126,19 @@ func TestGenerateAggregatorConfig_Validation(t *testing.T) {
 				CommitteeQualifier: "default",
 				Topology:           &offchain.EnvironmentTopology{},
 			},
-			errContains: "NOP topology is required",
+			errContains: "nop_topology is required",
 		},
 		{
 			name: "missing committee in topology",
 			input: changesets.GenerateAggregatorConfigInput{
 				ServiceIdentifier:  "agg",
 				CommitteeQualifier: "default",
 				Topology: &offchain.EnvironmentTopology{
-					NOPTopology: &offchain.NOPTopology{Committees: map[string]offchain.CommitteeConfig{}},
+					IndexerAddress: []string{"http://indexer:8080"},
+					NOPTopology: &offchain.NOPTopology{
+						NOPs:       []offchain.NOPConfig{{Alias: "nop1", Name: "nop1-name"}},
+						Committees: map[string]offchain.CommitteeConfig{},
+					},
 				},
 			},
 			errContains: `committee "default" not found in topology`,
diff --git a/deployment/v2_0_0/offchain/shared/types.go b/deployment/v2_0_0/offchain/shared/types.go
@@ -200,7 +200,12 @@ func ConvertStringToNopAliases(strs []string) []NOPAlias {
 }
 
 func IsProductionEnvironment(env string) bool {
-	return env == "mainnet"
+	switch env {
+	case "mainnet", "prod_mainnet", "prod_testnet":
+		return true
+	default:
+		return false
+	}
 }
 
 func NOPAliasSliceToSet(slice []NOPAlias) map[NOPAlias]bool {
diff --git a/deployment/v2_0_0/offchain/shared/types_test.go b/deployment/v2_0_0/offchain/shared/types_test.go
@@ -0,0 +1,26 @@
+package shared
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsProductionEnvironment(t *testing.T) {
+	tests := []struct {
+		name string
+		env  string
+		want bool
+	}{
+		{name: "prod mainnet", env: "prod_mainnet", want: true},
+		{name: "prod testnet", env: "prod_testnet", want: true},
+		{name: "legacy mainnet", env: "mainnet", want: true},
+		{name: "non prod", env: "test", want: false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.want, IsProductionEnvironment(tt.env))
+		})
+	}
+}
diff --git a/deployment/v2_0_0/offchain/topology.go b/deployment/v2_0_0/offchain/topology.go
@@ -14,6 +14,8 @@ import (
 	"github.com/smartcontractkit/chainlink-ccip/deployment/v2_0_0/offchain/shared"
 )
 
+const minProductionChainNOPs = 16
+
 // EnvironmentTopology holds all environment-specific configuration that cannot be inferred
 // from the datastore. This serves as the single source of truth for the desired state of both off-chain
 // (job specs) and on-chain (committee contracts) configuration.
@@ -188,7 +190,32 @@ func WriteEnvironmentTopology(path string, cfg EnvironmentTopology) error {
 	return nil
 }
 
+func (c *EnvironmentTopology) ValidateForEnvironment(envName string) error {
+	if err := c.Validate(); err != nil {
+		return err
+	}
+
+	if !shared.IsProductionEnvironment(envName) {
+		return nil
+	}
+
+	if err := c.NOPTopology.validateMinimumNOPsPerChain(); err != nil {
+		return err
+	}
+	for poolName, pool := range c.ExecutorPools {
+		if err := pool.validateMinimumNOPsPerChain(poolName); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (c *EnvironmentTopology) Validate() error {
+	if c.NOPTopology == nil {
+		return fmt.Errorf("nop_topology is required")
+	}
+
 	if len(c.IndexerAddress) == 0 {
 		return fmt.Errorf("indexer_address is required")
 	}
@@ -244,6 +271,24 @@ func (t *NOPTopology) Validate() error {
 	return nil
 }
 
+func (t *NOPTopology) validateMinimumNOPsPerChain() error {
+	for qualifier, committee := range t.Committees {
+		for chainSelector, chainCfg := range committee.ChainConfigs {
+			nopCount := uniqueNOPCount(chainCfg.NOPAliases)
+			if nopCount < minProductionChainNOPs {
+				return fmt.Errorf(
+					"committee %q chain %q requires at least %d unique NOPs for production environments, got %d",
+					qualifier,
+					chainSelector,
+					minProductionChainNOPs,
+					nopCount,
+				)
+			}
+		}
+	}
+	return nil
+}
+
 func (c *CommitteeConfig) Validate(topology *NOPTopology) error {
 	if len(c.Aggregators) == 0 {
 		return fmt.Errorf("at least one aggregator is required")
@@ -301,6 +346,30 @@ func (p *ExecutorPoolConfig) Validate(poolName string, topology *NOPTopology) er
 	return nil
 }
 
+func (p *ExecutorPoolConfig) validateMinimumNOPsPerChain(poolName string) error {
+	for chainSelector, chainCfg := range p.ChainConfigs {
+		nopCount := uniqueNOPCount(chainCfg.NOPAliases)
+		if nopCount < minProductionChainNOPs {
+			return fmt.Errorf(
+				"executor pool %q chain %q requires at least %d unique NOPs for production environments, got %d",
+				poolName,
+				chainSelector,
+				minProductionChainNOPs,
+				nopCount,
+			)
+		}
+	}
+	return nil
+}
+
+func uniqueNOPCount(aliases []string) int {
+	seen := make(map[string]struct{}, len(aliases))
+	for _, alias := range aliases {
+		seen[alias] = struct{}{}
+	}
+	return len(seen)
+}
+
 func (c *EnvironmentTopology) GetNOPsForPool(poolName string) ([]string, error) {
 	pool, ok := c.ExecutorPools[poolName]
 	if !ok {
diff --git a/deployment/v2_0_0/offchain/topology_test.go b/deployment/v2_0_0/offchain/topology_test.go

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ func ApplyExecutorConfig(registry *adapters.ExecutorConfigRegistry) deployment.C`
`31`	`31`	`if cfg.Topology == nil {`
`32`	`32`	`return fmt.Errorf("topology is required")`
`33`	`33`	`}`
	`34`	`+ if err := cfg.Topology.ValidateForEnvironment(e.Name); err != nil {`
	`35`	`+ return fmt.Errorf("topology validation failed: %w", err)`
	`36`	`+ }`
`34`	`37`
`35`	`38`	`if cfg.ExecutorQualifier == "" {`
`36`	`39`	`return fmt.Errorf("executor qualifier is required")`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ func ApplyVerifierConfig(registry *adapters.VerifierConfigRegistry) deployment.C`
`34`	`34`	`if cfg.Topology == nil {`
`35`	`35`	`return fmt.Errorf("topology is required")`
`36`	`36`	`}`
	`37`	`+ if err := cfg.Topology.ValidateForEnvironment(e.Name); err != nil {`
	`38`	`+ return fmt.Errorf("topology validation failed: %w", err)`
	`39`	`+ }`
`37`	`40`
`38`	`41`	`if cfg.Topology.NOPTopology == nil \|\| len(cfg.Topology.NOPTopology.NOPs) == 0 {`
`39`	`42`	`return fmt.Errorf("NOP topology with at least one NOP is required")`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,9 @@ func ConfigureChainsForLanesFromTopology(`
`160`	`160`	`if cfg.Topology == nil {`
`161`	`161`	`return fmt.Errorf("topology is required")`
`162`	`162`	`}`
	`163`	`+ if err := cfg.Topology.ValidateForEnvironment(e.Name); err != nil {`
	`164`	`+ return fmt.Errorf("topology validation failed: %w", err)`
	`165`	`+ }`
`163`	`166`	`if cfg.Topology.NOPTopology == nil \|\| len(cfg.Topology.NOPTopology.Committees) == 0 {`
`164`	`167`	`return fmt.Errorf("no committees defined in topology")`
`165`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ func DeployChainContracts(registry *adapters.DeployChainContractsRegistry) deplo`
`60`	`60`	`if cfg.Cfg.Topology == nil {`
`61`	`61`	`return fmt.Errorf("topology is required")`
`62`	`62`	`}`
	`63`	`+ if err := cfg.Cfg.Topology.ValidateForEnvironment(e.Name); err != nil {`
	`64`	`+ return fmt.Errorf("topology validation failed: %w", err)`
	`65`	`+ }`
`63`	`66`
`64`	`67`	`if cfg.Cfg.Topology.NOPTopology == nil \|\| len(cfg.Cfg.Topology.NOPTopology.Committees) == 0 {`
`65`	`68`	`return fmt.Errorf("no committees defined in topology")`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,9 @@ func resolveAggregatorChainSelectors(e deployment.Environment, cfg GenerateAggre`
`65`	`65`	`if cfg.Topology == nil {`
`66`	`66`	`return nil, fmt.Errorf("topology is required")`
`67`	`67`	`}`
	`68`	`+ if err := cfg.Topology.ValidateForEnvironment(e.Name); err != nil {`
	`69`	`+ return nil, fmt.Errorf("topology validation failed: %w", err)`
	`70`	`+ }`
`68`	`71`	`if cfg.Topology.NOPTopology == nil {`
`69`	`72`	`return nil, fmt.Errorf("NOP topology is required")`
`70`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,12 @@ func ConvertStringToNopAliases(strs []string) []NOPAlias {`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`func IsProductionEnvironment(env string) bool {`
`203`		`- return env == "mainnet"`
	`203`	`+ switch env {`
	`204`	`+ case "mainnet", "prod_mainnet", "prod_testnet":`
	`205`	`+ return true`
	`206`	`+ default:`
	`207`	`+ return false`
	`208`	`+ }`
`204`	`209`	`}`
`205`	`210`
`206`	`211`	`func NOPAliasSliceToSet(slice []NOPAlias) map[NOPAlias]bool {`