add support for solana on home chain

deployment/ccip/changeset/cs_ccip_home.go

@@ -147,13 +147,8 @@ func (p PromoteCandidatesChangesetConfig) Validate(e deployment.Environment) ([]
 		if err := deployment.IsValidChainSelector(chainSelector); err != nil {
 			return nil, fmt.Errorf("don chain selector invalid: %w", err)
 		}
-		chainState, exists := state.Chains[chainSelector]
-		if !exists {
-			return nil, fmt.Errorf("chain %d does not exist", chainSelector)
-		}
-		if chainState.OffRamp == nil {
-			// should not be possible, but a defensive check.
-			return nil, fmt.Errorf("OffRamp contract does not exist")
+		if err := state.ValidateState(chainSelector); err != nil {
+			return nil, err
 		}
 
 		donID, err := internal.DonIDForChain(
@@ -310,9 +305,8 @@ func (s SetCandidateConfigBase) Validate(e deployment.Environment, state CCIPOnC
 		if err := deployment.IsValidChainSelector(chainSelector); err != nil {
 			return fmt.Errorf("don chain selector invalid: %w", err)
 		}
-		if state.Chains[chainSelector].OffRamp == nil {
-			// should not be possible, but a defensive check.
-			return fmt.Errorf("OffRamp contract does not exist on don chain selector %d", chainSelector)
+		if err := state.ValidateState(chainSelector); err != nil {
+			return err
 		}
 		if s.PluginType != types.PluginTypeCCIPCommit &&
 			s.PluginType != types.PluginTypeCCIPExec {
@@ -422,10 +416,18 @@ func AddDonAndSetCandidateChangeset(
 	}
 	var donOps []mcms.Operation
 	for chainSelector, params := range cfg.OCRConfigPerRemoteChainSelector {
+		var offRampAddress []byte
+		if deployment.IsSolanaChainFamily(chainSelector) {
+			// TODO: SOLANA_CCIP put the ccip_router address here
+			// offRampAddress = state.SolChains[chainSelector].CcipRouter.Address().Bytes()
+			offRampAddress = []byte{}
+		} else {
+			offRampAddress = state.Chains[chainSelector].OffRamp.Address().Bytes()
+		}
 		newDONArgs, err := internal.BuildOCR3ConfigForCCIPHome(
 			e.OCRSecrets,
-			state.Chains[chainSelector].OffRamp,
-			e.Chains[chainSelector],
+			offRampAddress,
+			chainSelector,
 			nodes.NonBootstraps(),
 			state.Chains[cfg.HomeChainSelector].RMNHome.Address(),
 			params.OCRParameters,
@@ -597,10 +599,18 @@ func SetCandidateChangeset(
 	}
 	var setCandidateOps []mcms.Operation
 	for chainSelector, params := range cfg.OCRConfigPerRemoteChainSelector {
+		var offRampAddress []byte
+		if deployment.IsSolanaChainFamily(chainSelector) {
+			// TODO: put the ccip_router address here
+			// offRampAddress = state.SolChains[chainSelector].CcipRouter.Address().Bytes()
+			offRampAddress = []byte{}
+		} else {
+			offRampAddress = state.Chains[chainSelector].OffRamp.Address().Bytes()
+		}
 		newDONArgs, err := internal.BuildOCR3ConfigForCCIPHome(
 			e.OCRSecrets,
-			state.Chains[chainSelector].OffRamp,
-			e.Chains[chainSelector],
+			offRampAddress,
+			chainSelector,
 			nodes.NonBootstraps(),
 			state.Chains[cfg.HomeChainSelector].RMNHome.Address(),
 			params.OCRParameters,

deployment/ccip/changeset/internal/deploy_home_chain.go

@@ -198,8 +198,8 @@ func BuildSetOCR3ConfigArgs(
 
 func BuildOCR3ConfigForCCIPHome(
 	ocrSecrets deployment.OCRSecrets,
-	offRamp *offramp.OffRamp,
-	dest deployment.Chain,
+	offRampAddress []byte,
+	destSelector uint64,
 	nodes deployment.Nodes,
 	rmnHomeAddress common.Address,
 	ocrParams types2.OCRParameters,
@@ -212,9 +212,9 @@ func BuildOCR3ConfigForCCIPHome(
 	var oracles []confighelper.OracleIdentityExtra
 	for _, node := range nodes {
 		schedule = append(schedule, 1)
-		cfg, exists := node.OCRConfigForChainSelector(dest.Selector)
+		cfg, exists := node.OCRConfigForChainSelector(destSelector)
 		if !exists {
-			return nil, fmt.Errorf("no OCR config for chain %d", dest.Selector)
+			return nil, fmt.Errorf("no OCR config for chain %d", destSelector)
 		}
 		oracles = append(oracles, confighelper.OracleIdentityExtra{
 			OracleIdentity: confighelper.OracleIdentity{
@@ -314,10 +314,10 @@ func BuildOCR3ConfigForCCIPHome(
 
 		ocr3Configs[pluginType] = ccip_home.CCIPHomeOCR3Config{
 			PluginType:            uint8(pluginType),
-			ChainSelector:         dest.Selector,
+			ChainSelector:         destSelector,
 			FRoleDON:              configF,
 			OffchainConfigVersion: offchainConfigVersion,
-			OfframpAddress:        offRamp.Address().Bytes(),
+			OfframpAddress:        offRampAddress,
 			Nodes:                 ocrNodes,
 			OffchainConfig:        offchainConfig,
 			RmnHomeAddress:        rmnHomeAddress.Bytes(),

deployment/ccip/changeset/state.go

@@ -346,6 +346,9 @@ func (s CCIPOnChainState) SupportedChains() map[uint64]struct{} {
 	for chain := range s.Chains {
 		chains[chain] = struct{}{}
 	}
+	for chain := range s.SolChains {
+		chains[chain] = struct{}{}
+	}
 	return chains
 }
 
@@ -663,3 +666,25 @@ func LoadChainState(chain deployment.Chain, addresses map[string]deployment.Type
 	}
 	return state, nil
 }
+
+// ValidateState validates the state of the CCIP deployment
+func (s CCIPOnChainState) ValidateState(chainSelector uint64) error {
+	if deployment.IsSolanaChainFamily(chainSelector) {
+		_, exists := s.SolChains[chainSelector]
+		if !exists {
+			return fmt.Errorf("chain %d does not exist", chainSelector)
+		}
+		// TODO: SOLANA_CCIP
+		// check for ccip router existing
+	} else {
+		chainState, exists := s.Chains[chainSelector]
+		if !exists {
+			return fmt.Errorf("chain %d does not exist", chainSelector)
+		}
+		if chainState.OffRamp == nil {
+			// should not be possible, but a defensive check.
+			return errors.New("OffRamp contract does not exist")
+		}
+	}
+	return nil
+}

deployment/helpers.go

@@ -206,3 +206,11 @@ func ChainInfo(cs uint64) (chain_selectors.ChainDetails, error) {
 	}
 	return info, nil
 }
+
+func IsSolanaChainFamily(cs uint64) bool {
+	family, err := chain_selectors.GetSelectorFamily(cs)
+	if err != nil {
+		return false
+	}
+	return family == chain_selectors.FamilySolana
+}