Updated log decoding

Author: amit-momin

pkg/solana/ccip/chainaccessor/event.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"reflect"
 	"slices"
 	"strconv"
 	"strings"
@@ -230,7 +229,7 @@ func (a *SolanaAccessor) convertCCIPMessageSent(logs []logpollertypes.Log, onram
 	// 	return nil, fmt.Errorf("failed to create type to decode event into: %w", err)
 	// }
 	// a.lggr.Debugf("created type to decode event into: %T", item)
-	iter, err := a.decodeLogsIntoSequences(consts.EventNameCCIPMessageSent, logs, &ccip.EventCCIPMessageSent{})
+	iter, err := a.decodeLogsIntoSequences(consts.EventNameCCIPMessageSent, logs)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decode logs into sequences: %w", err)
 	}
@@ -332,7 +331,7 @@ func (a *SolanaAccessor) processCommitReports(
 	// if err != nil {
 	// 	return nil, fmt.Errorf("failed to create type to decode event into: %w", err)
 	// }
-	iter, err := a.decodeLogsIntoSequences(consts.EventNameCommitReportAccepted, logs, &ccip.EventCommitReportAccepted{})
+	iter, err := a.decodeLogsIntoSequences(consts.EventNameCommitReportAccepted, logs)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decode logs into sequences: %w", err)
 	}
@@ -559,7 +558,7 @@ func (a *SolanaAccessor) processExecutionStateChangesEvents(logs []logpollertype
 	// if err != nil {
 	// 	return nil, fmt.Errorf("failed to create type to decode event into: %w", err)
 	// }
-	iter, err := a.decodeLogsIntoSequences(consts.EventNameExecutionStateChanged, logs, &ccip.EventExecutionStateChanged{})
+	iter, err := a.decodeLogsIntoSequences(consts.EventNameExecutionStateChanged, logs)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decode logs into sequences: %w", err)
 	}
@@ -616,7 +615,6 @@ func validateExecutionStateChangedEvent(
 func (a *SolanaAccessor) decodeLogsIntoSequences(
 	event string,
 	logs []logpollertypes.Log,
-	into any,
 ) ([]types.Sequence, error) {
 	sequences := make([]types.Sequence, len(logs))
 
@@ -630,29 +628,38 @@ func (a *SolanaAccessor) decodeLogsIntoSequences(
 			},
 		}
 
-		var typeVal reflect.Value
+		// var typeVal reflect.Value
 
-		typeInto := reflect.TypeOf(into)
-		if typeInto.Kind() == reflect.Pointer {
-			typeVal = reflect.New(typeInto.Elem())
-		} else {
-			typeVal = reflect.Indirect(reflect.New(typeInto))
-		}
+		// typeInto := reflect.TypeOf(into)
+		// if typeInto.Kind() == reflect.Pointer {
+		// 	typeVal = reflect.New(typeInto.Elem())
+		// } else {
+		// 	typeVal = reflect.Indirect(reflect.New(typeInto))
+		// }
 
-		// create a new value of the same type as 'into' for the data to be extracted to
-		sequences[idx].Data = typeVal.Interface()
+		// // create a new value of the same type as 'into' for the data to be extracted to
+		// sequences[idx].Data = typeVal.Interface()
 
 		// if the event is `EventCommitReportAccepted`, we need to handle it separately
 		switch event {
 		case consts.EventNameCommitReportAccepted:
+			sequences[idx].Data = ccip.EventCommitReportAccepted{}
 			derr := decodeCommitReportAcceptedEvent(logs[idx].Data, &sequences[idx].Data)
 			if derr != nil {
 				return nil, derr
 			}
-		default:
+		case consts.EventNameCCIPMessageSent:
+			sequences[idx].Data = ccip.EventCCIPMessageSent{}
 			if err := bin.UnmarshalBorsh(&sequences[idx].Data, logs[idx].Data); err != nil {
 				return nil, err
 			}
+		case consts.EventNameExecutionStateChanged:
+			sequences[idx].Data = ccip.EventExecutionStateChanged{}
+			if err := bin.UnmarshalBorsh(&sequences[idx].Data, logs[idx].Data); err != nil {
+				return nil, err
+			}
+		default:
+			return nil, fmt.Errorf("unsupported event %s", event)
 		}
 
 		// if err := a.decodeLog(ctx, itemType, logs[idx], sequences[idx].Data); err != nil {