Pass EventIdl & fix EventSignature

smartcontractkit · Feb 10, 2025 · 92676cf · 92676cf
1 parent 3fd4356
commit 92676cf
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pkg/solana/chainreader/chain_reader.go b/pkg/solana/chainreader/chain_reader.go
@@ -461,8 +461,8 @@ func (s *ContractReaderService) addMultiAccountRead(namespace string, readDefini
 func (s *ContractReaderService) addEventRead(
 	namespace, genericName string,
 	contractAddress solana.PublicKey,
-	_ codec.IDL,
-	_ codec.IdlEvent,
+	idl codec.IDL,
+	eventIdl codec.IdlEvent,
 	readDefinition config.ReadDefinition,
 	events EventsReader,
 ) error {
@@ -474,7 +474,7 @@ func (s *ContractReaderService) addEventRead(
 	applyIndexedFieldTuple(mappedTuples, subKeys, readDefinition.IndexedField2, 2)
 	applyIndexedFieldTuple(mappedTuples, subKeys, readDefinition.IndexedField3, 3)
 
-	filter := toLPFilter(readDefinition.PollingFilter, contractAddress, subKeys[:])
+	filter := toLPFilter(readDefinition.PollingFilter, contractAddress, subKeys[:], codec.EventIDLTypes{eventIdl, idl.Types})
 
 	s.filters = append(s.filters, filter)
 	s.bdRegistry.AddReadBinding(namespace, genericName, newEventReadBinding(
@@ -492,11 +492,13 @@ func toLPFilter(
 	f *config.PollingFilter,
 	address solana.PublicKey,
 	subKeyPaths [][]string,
+	eventIdl codec.EventIDLTypes,
 ) logpoller.Filter {
 	return logpoller.Filter{
 		Address:     logpoller.PublicKey(address),
 		EventName:   f.EventName,
-		EventSig:    logpoller.EventSignature([]byte(f.EventName)[:logpoller.EventSignatureLength]),
+		EventSig:    logpoller.NewEventSignatureFromName(f.EventName),
+		EventIdl:    logpoller.EventIdl(eventIdl),
 		SubkeyPaths: subKeyPaths,
 		Retention:   f.Retention,
 		MaxLogsKept: f.MaxLogsKept,