Solana changeset support for e2e testing

.gitignore

@@ -79,6 +79,7 @@ benchmark_report.csv
 benchmark_summary.json
 secrets.toml
 tmp_laneconfig/
+solana_contracts
 
 # goreleaser builds
 cosign.*

core/capabilities/ccip/delegate.go

@@ -251,10 +251,6 @@ func (d *Delegate) OnDeleteJob(ctx context.Context, spec job.Job) error {
 func (d *Delegate) getOCRKeys(ocrKeyBundleIDs job.JSONConfig) (map[string]ocr2key.KeyBundle, error) {
 	ocrKeys := make(map[string]ocr2key.KeyBundle)
 	for networkType, bundleIDRaw := range ocrKeyBundleIDs {
-		if networkType != relay.NetworkEVM {
-			return nil, fmt.Errorf("unsupported chain type: %s", networkType)
-		}
-
 		bundleID, ok := bundleIDRaw.(string)
 		if !ok {
 			return nil, fmt.Errorf("OCRKeyBundleIDs must be a map of chain types to OCR key bundle IDs, got: %T", bundleIDRaw)
@@ -273,22 +269,39 @@ func (d *Delegate) getOCRKeys(ocrKeyBundleIDs job.JSONConfig) (map[string]ocr2ke
 func (d *Delegate) getTransmitterKeys(ctx context.Context, relayIDs []types.RelayID) (map[types.RelayID][]string, error) {
 	transmitterKeys := make(map[types.RelayID][]string)
 	for _, relayID := range relayIDs {
-		chainID, ok := new(big.Int).SetString(relayID.ChainID, 10)
-		if !ok {
-			return nil, fmt.Errorf("error parsing chain ID, expected big int: %s", relayID.ChainID)
-		}
+		switch relayID.Network {
+		case relay.NetworkSolana:
+			solKeys, err := d.keystore.Solana().GetAll()
+			if err != nil {
+				return nil, fmt.Errorf("error getting enabled addresses for chain: %s %w", relayID.ChainID, err)
+			}
 
-		ethKeys, err := d.keystore.Eth().EnabledAddressesForChain(ctx, chainID)
-		if err != nil {
-			return nil, fmt.Errorf("error getting enabled addresses for chain: %s %w", chainID.String(), err)
-		}
+			transmitterKeys[relayID] = func() (r []string) {
+				for _, key := range solKeys {
+					r = append(r, key.PublicKey().String())
+				}
+				return
+			}()
+		case relay.NetworkEVM:
+			chainID, ok := new(big.Int).SetString(relayID.ChainID, 10)
+			if !ok {
+				return nil, fmt.Errorf("error parsing chain ID, expected big int: %s", relayID.ChainID)
+			}
 
-		transmitterKeys[relayID] = func() (r []string) {
-			for _, key := range ethKeys {
-				r = append(r, key.Hex())
+			ethKeys, err := d.keystore.Eth().EnabledAddressesForChain(ctx, chainID)
+			if err != nil {
+				return nil, fmt.Errorf("error getting enabled addresses for chain: %s %w", chainID.String(), err)
 			}
-			return
-		}()
+
+			transmitterKeys[relayID] = func() (r []string) {
+				for _, key := range ethKeys {
+					r = append(r, key.Hex())
+				}
+				return
+			}()
+		default:
+			return nil, fmt.Errorf("unsupported network: %s", relayID.Network)
+		}
 	}
 	return transmitterKeys, nil
 }

deployment/ccip/changeset/cs_ccip_home.go

@@ -13,6 +13,7 @@ import (
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/gethwrappers"
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/proposal/mcms"
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/proposal/timelock"
+	chain_selectors "github.com/smartcontractkit/chain-selectors"
 	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/chainlink-ccip/chainconfig"
@@ -31,7 +32,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_home"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry_1_1_0"
+	capabilities_registry "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry_1_1_0"
 )
 
 var (
@@ -303,13 +304,8 @@ func (p PromoteCandidateChangesetConfig) Validate(e deployment.Environment) (map
 			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, errors.New("OffRamp contract does not exist")
+			if err := state.ValidateState(chainSelector); err != nil {
+				return nil, err
 			}
 
 			donID, err := internal.DonIDForChain(
@@ -456,16 +452,14 @@ func (p SetCandidatePluginInfo) Validate(state CCIPOnChainState, homeChain uint6
 		return errors.New("PluginType must be set to either CCIPCommit or CCIPExec")
 	}
 	for chainSelector, params := range p.OCRConfigPerRemoteChainSelector {
-		_, ok := state.Chains[chainSelector]
-		if !ok {
+		if _, exists := state.SupportedChains()[chainSelector]; !exists {
 			return fmt.Errorf("chain %d does not exist in state", chainSelector)
 		}
 		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 p.PluginType == types.PluginTypeCCIPCommit && params.CommitOffChainConfig == nil {
 			return errors.New("commit off-chain config must be set")
@@ -619,12 +613,24 @@ func AddDonAndSetCandidateChangeset(
 		txOpts = deployment.SimTransactOpts()
 	}
 	var donOps []mcms.Operation
-
 	for chainSelector, params := range cfg.PluginInfo.OCRConfigPerRemoteChainSelector {
+		family, err := chain_selectors.GetSelectorFamily(chainSelector)
+		if err != nil {
+			return deployment.ChangesetOutput{}, err
+		}
+		var offRampAddress []byte
+		switch family {
+		case chain_selectors.FamilyEVM:
+			offRampAddress = state.Chains[chainSelector].OffRamp.Address().Bytes()
+		case chain_selectors.FamilySolana:
+			offRampAddress = state.SolChains[chainSelector].Router.Bytes()
+		default:
+			return deployment.ChangesetOutput{}, fmt.Errorf("unsupported chain family %s", family)
+		}
 		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,
@@ -808,10 +814,23 @@ func SetCandidateChangeset(
 	for _, plugin := range cfg.PluginInfo {
 		pluginInfos = append(pluginInfos, plugin.String())
 		for chainSelector, params := range plugin.OCRConfigPerRemoteChainSelector {
+			family, err := chain_selectors.GetSelectorFamily(chainSelector)
+			if err != nil {
+				return deployment.ChangesetOutput{}, err
+			}
+			var offRampAddress []byte
+			switch family {
+			case chain_selectors.FamilyEVM:
+				offRampAddress = state.Chains[chainSelector].OffRamp.Address().Bytes()
+			case chain_selectors.FamilySolana:
+				offRampAddress = state.SolChains[chainSelector].Router.Bytes()
+			default:
+				return deployment.ChangesetOutput{}, fmt.Errorf("unsupported chain family %s", family)
+			}
 			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/cs_ccip_home_test.go

@@ -77,8 +77,8 @@ func TestInvalidOCR3Params(t *testing.T) {
 	params.OCRParameters.DeltaRound = params.OCRParameters.DeltaProgress + time.Duration(1)
 	_, err = internal.BuildOCR3ConfigForCCIPHome(
 		e.Env.OCRSecrets,
-		state.Chains[chain1].OffRamp,
-		e.Env.Chains[chain1],
+		state.Chains[chain1].OffRamp.Address().Bytes(),
+		chain1,
 		nodes.NonBootstraps(),
 		state.Chains[e.HomeChainSel].RMNHome.Address(),
 		params.OCRParameters,