Handle geth abi panic when encoding data word value comparators

smartcontractkit · Sep 25, 2024 · c4ebced · c4ebced
1 parent 024d87d
commit c4ebced
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/core/services/relay/evm/read/event.go b/core/services/relay/evm/read/event.go
@@ -548,6 +548,12 @@ func (b *EventBinding) encodeComparator(comparator *primitives.Comparator) (quer
 }
 
 func (b *EventBinding) encodeValComparatorDataWord(dwTypeID string, value any) (hash common.Hash, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			err = fmt.Errorf("%w: cannot encode %s data word comparator", dwTypeID, commontypes.ErrInvalidType)
+		}
+	}()
+
 	dwTypes, exists := b.eventTypes[dwTypeID]
 	if !exists {
 		return common.Hash{}, fmt.Errorf("cannot find data word type for %s", dwTypeID)