Merge pull request #404 from icon-project/hotfix/empty_conn_program

fix: drop CallMessage if dst connection address is empty for old m…
icon-project · Oct 22, 2024 · d334a0e · d334a0e
2 parents e3dd880 + 8abaaf8
commit d334a0e
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/relayer/chains/solana/listener.go b/relayer/chains/solana/listener.go
@@ -172,18 +172,20 @@ func (p *Provider) parseMessagesFromEvent(solEvent types.SolEvent) ([]*relayerty
 						}
 						fromNID := strings.Split(cmEvent.FromNetworkAddress, "/")[0]
 						connProgram := solana.PublicKeyFromBytes(cmEvent.ConnProgram[:]).String()
-						messages = append(messages, &relayertypes.Message{
-							EventType:      relayerevents.CallMessage,
-							Sn:             &cmEvent.ConnSn,
-							XcallSn:        &cmEvent.Sn,
-							ReqID:          &cmEvent.ReqId,
-							Src:            fromNID,
-							Dst:            p.NID(),
-							Data:           cmEvent.Data,
-							MessageHeight:  solEvent.Slot,
-							TxInfo:         txInfoBytes,
-							DstConnAddress: connProgram,
-						})
+						if connProgram != "" {
+							messages = append(messages, &relayertypes.Message{
+								EventType:      relayerevents.CallMessage,
+								Sn:             &cmEvent.ConnSn,
+								XcallSn:        &cmEvent.Sn,
+								ReqID:          &cmEvent.ReqId,
+								Src:            fromNID,
+								Dst:            p.NID(),
+								Data:           cmEvent.Data,
+								MessageHeight:  solEvent.Slot,
+								TxInfo:         txInfoBytes,
+								DstConnAddress: connProgram,
+							})
+						}
 
 					case types.EventRollbackMessage:
 						rmEvent := types.RollbackMessageEvent{}