Updated solana selector check and added LogPoller event IDL to filter

Author: amit-momin

pkg/solana/ccip/chainaccessor/event.go

@@ -138,14 +138,9 @@ func buildEventsCodec() (types.RemoteCodec, error) {
 		if err := json.Unmarshal([]byte(eventCfg.idl), &codecIDL); err != nil {
 			return nil, fmt.Errorf("unexpected error: invalid CCIP OffRamp IDL, error: %w", err)
 		}
-
-		idlDef, err := codec.FindDefinitionFromIDL(codec.ChainConfigTypeInstructionDef, eventName, codecIDL)
+		eventIdl, err := extractEventIDL(eventName, codecIDL)
 		if err != nil {
-			return nil, err
-		}
-		eventIdl, isOk := idlDef.(codec.IdlEvent)
-		if !isOk {
-			return nil, fmt.Errorf("unexpected type from IDL definition for event read: %q", eventName)
+			return nil, fmt.Errorf("failed to extract event IDL: %w", err)
 		}
 		entry, err := codec.CreateCodecEntry(eventIdl, eventName, codecIDL, nil)
 		if err != nil {
@@ -162,6 +157,18 @@ func buildEventsCodec() (types.RemoteCodec, error) {
 	return codec, nil
 }
 
+func extractEventIDL(eventName string, codecIDL codec.IDL) (codec.IdlEvent, error) {
+	idlDef, err := codec.FindDefinitionFromIDL(codec.ChainConfigTypeInstructionDef, eventName, codecIDL)
+	if err != nil {
+		return codec.IdlEvent{}, err
+	}
+	eventIdl, isOk := idlDef.(codec.IdlEvent)
+	if !isOk {
+		return codec.IdlEvent{}, fmt.Errorf("unexpected type from IDL definition for event read: %q", eventName)
+	}
+	return eventIdl, nil
+}
+
 // registerFilterIfNotExists registers a filter for the given event if it doesn't already exist.
 func (a *SolanaAccessor) registerFilterIfNotExists(
 	ctx context.Context,
@@ -173,15 +180,25 @@ func (a *SolanaAccessor) registerFilterIfNotExists(
 		Retention: &defaultCCIPLogsRetention,
 	}
 
-	eventIDL := logpollertypes.EventIdl{}
+	var codecIDL codec.IDL
+	if err := json.Unmarshal([]byte(filterConfig.idl), &codecIDL); err != nil {
+		return fmt.Errorf("unexpected error: invalid CCIP OffRamp IDL, error: %w", err)
+	}
+
+	eventIdl, err := extractEventIDL(eventName, codecIDL)
+	if err != nil {
+		return fmt.Errorf("failed to extract event IDL: %w", err)
+	}
+
+	lpEventIDL := logpollertypes.EventIdl{Event: eventIdl, Types: codecIDL.Types}
 
 	subKeyPaths := processSubKeyPaths(filterConfig)
 
 	filter := logpollertypes.Filter{
 		Address:         logpollertypes.PublicKey(address),
 		EventName:       eventName,
 		EventSig:        logpollertypes.NewEventSignatureFromName(eventName),
-		EventIdl:        eventIDL,
+		EventIdl:        lpEventIDL,
 		SubkeyPaths:     subKeyPaths,
 		StartingBlock:   conf.GetStartingBlock(),
 		Retention:       conf.GetRetention(),

pkg/solana/ccip/provider/provider.go

@@ -39,6 +39,17 @@ func NewCCIPProvider(lggr logger.Logger, chainSelector ccipocr3.ChainSelector, c
 		return nil, fmt.Errorf("unexpected chain selector: %d, expect either %d or %d", chainSelector, chainsel.SOLANA_DEVNET.Selector, chainsel.SOLANA_MAINNET.Selector)
 	}
 
+	foundSel := false
+	for _, solChain := range chainsel.SolanaALL {
+		if solChain.Selector == uint64(chainSelector) {
+			foundSel = true
+			break
+		}
+	}
+	if !foundSel {
+		return nil, fmt.Errorf("chain selector %d does not match and Solana chain selectors", chainSelector)
+	}
+
 	c := ccipocr3.Codec{
 		ChainSpecificAddressCodec: codec.NewAddressCodec(),
 		// TODO move from core repo