Fixed event filter include reverted flag

Author: amit-momin

pkg/solana/ccip/chainaccessor/event.go

@@ -54,11 +54,12 @@ type IndexedField struct {
 }
 
 type filterConfig struct {
-	idl           string
-	IndexedField0 *string
-	IndexedField1 *string
-	IndexedField2 *string
-	IndexedField3 *string
+	idl             string
+	includeReverted bool
+	indexedField0   *string
+	indexedField1   *string
+	indexedField2   *string
+	indexedField3   *string
 }
 
 var (
@@ -76,19 +77,22 @@ var (
 // Map of relevant events and their metadata required to build the codec and bind program addresses
 var eventFilterConfigMap = map[string]filterConfig{
 	consts.EventNameCCIPMessageSent: {
-		idl:           ccipRouterIDL,
-		IndexedField0: &msgSentSrcChainPath,
-		IndexedField1: &msgSentDestChainPath,
-		IndexedField2: &msgSentSeqNumPath,
+		idl:             ccipRouterIDL,
+		includeReverted: false,
+		indexedField0:   &msgSentSrcChainPath,
+		indexedField1:   &msgSentDestChainPath,
+		indexedField2:   &msgSentSeqNumPath,
 	},
 	consts.EventNameCommitReportAccepted: {
-		idl: ccipOffRampIDL,
+		idl:             ccipOffRampIDL,
+		includeReverted: false,
 	},
 	consts.EventNameExecutionStateChanged: {
-		idl:           ccipOffRampIDL,
-		IndexedField0: &execStateChangedSrcChainPath,
-		IndexedField1: &execStateChangedSeqNumPath,
-		IndexedField2: &execStateChangedStatePath,
+		idl:             ccipOffRampIDL,
+		includeReverted: true,
+		indexedField0:   &execStateChangedSrcChainPath,
+		indexedField1:   &execStateChangedSeqNumPath,
+		indexedField2:   &execStateChangedStatePath,
 	},
 }
 
@@ -203,7 +207,7 @@ func (a *SolanaAccessor) registerFilterIfNotExists(
 		StartingBlock:   conf.GetStartingBlock(),
 		Retention:       conf.GetRetention(),
 		MaxLogsKept:     conf.GetMaxLogsKept(),
-		IncludeReverted: conf.GetIncludeReverted(),
+		IncludeReverted: filterConfig.includeReverted,
 	}
 
 	filterName := deriveName(filter)
@@ -303,17 +307,17 @@ func deriveName(filter logpollertypes.Filter) string {
 func processSubKeyPaths(cfg filterConfig) [][]string {
 	subKeyPaths := make([][]string, 0)
 
-	if cfg.IndexedField0 != nil {
-		subKeyPaths = append(subKeyPaths, strings.Split(*cfg.IndexedField0, "."))
+	if cfg.indexedField0 != nil {
+		subKeyPaths = append(subKeyPaths, strings.Split(*cfg.indexedField0, "."))
 	}
-	if cfg.IndexedField1 != nil {
-		subKeyPaths = append(subKeyPaths, strings.Split(*cfg.IndexedField1, "."))
+	if cfg.indexedField1 != nil {
+		subKeyPaths = append(subKeyPaths, strings.Split(*cfg.indexedField1, "."))
 	}
-	if cfg.IndexedField2 != nil {
-		subKeyPaths = append(subKeyPaths, strings.Split(*cfg.IndexedField2, "."))
+	if cfg.indexedField2 != nil {
+		subKeyPaths = append(subKeyPaths, strings.Split(*cfg.indexedField2, "."))
 	}
-	if cfg.IndexedField3 != nil {
-		subKeyPaths = append(subKeyPaths, strings.Split(*cfg.IndexedField3, "."))
+	if cfg.indexedField3 != nil {
+		subKeyPaths = append(subKeyPaths, strings.Split(*cfg.indexedField3, "."))
 	}
 
 	return subKeyPaths

pkg/solana/ccip/chainaccessor/solana_accessor.go

@@ -131,7 +131,6 @@ func (a *SolanaAccessor) GetAllConfigsLegacy(ctx context.Context, destChainSelec
 
 		a.lggr.Debugw("feeQuoterStaticConfig", "config", feeQuoterStaticConfig)
 
-
 		rmnRemoteProxyAddr, err := a.getBinding(consts.ContractNameRMNProxy)
 		if !errors.Is(err, ErrNoBindings) && err != nil {
 			return ccipocr3.ChainConfigSnapshot{}, nil, fmt.Errorf("failed to get binding for rmn remote proxy: %w", err)