Merge pull request #495 from icon-project/fix/missing-conn-check

fix: missing valid connection check

Author: sherpalden

relayer/chains/solana/listener.go

@@ -160,6 +160,24 @@ func (p *Provider) processTxSignature(ctx context.Context, sign solana.Signature
 	return txn, nil
 }
 
+func (p *Provider) isValidConnectionMessage(logs []string) bool {
+	validConnections := []string{}
+	if p.cfg.ConnectionProgram != "" {
+		validConnections = append(validConnections, p.cfg.ConnectionProgram)
+	}
+	for _, conn := range p.cfg.OtherConnections {
+		validConnections = append(validConnections, conn)
+	}
+	for _, conn := range validConnections {
+		for _, log := range logs {
+			if strings.HasPrefix(log, fmt.Sprintf("Program %s invoke", conn)) {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func (p *Provider) parseMessagesFromEvent(solEvent types.SolEvent) ([]*relayertypes.Message, error) {
 	messages := []*relayertypes.Message{}
 
@@ -193,6 +211,9 @@ func (p *Provider) parseMessagesFromEvent(solEvent types.SolEvent) ([]*relayerty
 				if slices.Equal(ev.Discriminator, discriminator) {
 					switch ev.Name {
 					case types.EventSendMessage:
+						if !p.isValidConnectionMessage(solEvent.Logs) {
+							continue
+						}
 						smEvent := types.SendMessageEvent{}
 						if err := borsh.Deserialize(&smEvent, eventBytes); err != nil {
 							return nil, fmt.Errorf("failed to decode send message event: %w", err)

relayer/chains/wasm/events.go

@@ -41,6 +41,17 @@ func (p *Provider) ParseMessageFromEvents(eventsList []abiTypes.Event) ([]*relay
 				EventType: events.EmitMessage,
 				Src:       p.NID(),
 			}
+
+			isValidConnectionMessage := false
+			for _, attr := range ev.Attributes {
+				if attr.Key == EventAttrKeyContractAddress && attr.Value == p.cfg.Contracts[relayerTypes.ConnectionContract] {
+					isValidConnectionMessage = true
+				}
+			}
+			if !isValidConnectionMessage {
+				continue
+			}
+
 			for _, attr := range ev.Attributes {
 				switch attr.Key {
 				case EventAttrKeyMsg:
@@ -61,6 +72,7 @@ func (p *Provider) ParseMessageFromEvents(eventsList []abiTypes.Event) ([]*relay
 					msg.Src = attr.Value
 				}
 			}
+
 			messages = append(messages, msg)
 		case EventTypeWasmCallMessage:
 			msg := &relayerTypes.Message{