From 98548438ccbd324d9846709eb904dd618aa313c6 Mon Sep 17 00:00:00 2001
From: mmsqe <mavis@crypto.com>
Date: Wed, 1 May 2024 23:37:58 +0800
Subject: [PATCH] add retry instead

---
 CHANGELOG.md                          |  2 +-
 relayer/processor/path_end_runtime.go | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f15cfb034..8cdc5868d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,7 @@
 * [\#1326](https://github.com/cosmos/relayer/pull/1326) Avoid sending channel close confirm message after channel get closed successfully.
 * [\#1364](https://github.com/cosmos/relayer/pull/1364) Include feegrant message when calculate gas.
 * [\#1390](https://github.com/cosmos/relayer/pull/1390) Avoid no concrete type registered for type URL error of EthAccount.
-* [\#1455](https://github.com/cosmos/relayer/pull/1455) Avoid counterparty recv packet message get removed before open channel.
+* [\#1455](https://github.com/cosmos/relayer/pull/1455) Allow retry for pathEnd to avoid packet message get removed before open channel.
 
 ## v0.9.3
 
diff --git a/relayer/processor/path_end_runtime.go b/relayer/processor/path_end_runtime.go
index 3a9fce2f7..b8187e28b 100644
--- a/relayer/processor/path_end_runtime.go
+++ b/relayer/processor/path_end_runtime.go
@@ -59,6 +59,7 @@ type pathEndRuntime struct {
 	metrics *PrometheusMetrics
 
 	finishedProcessing chan messageToTrack
+	retryCount         uint64
 }
 
 func newPathEndRuntime(log *zap.Logger, pathEnd PathEnd, metrics *PrometheusMetrics) *pathEndRuntime {
@@ -560,8 +561,12 @@ func (pathEnd *pathEndRuntime) shouldSendPacketMessage(message packetIBCMessage,
 			zap.Uint64("sequence", sequence),
 			zap.Inline(k),
 		)
-		pathEnd.removePacketRetention(counterparty, eventType, k, sequence)
-		return false
+		pathEnd.retryCount++
+		if pathEnd.retryCount >= maxMessageSendRetries {
+			pathEnd.removePacketRetention(counterparty, eventType, k, sequence)
+			pathEnd.retryCount = 0
+			return false
+		}
 	}
 	msgProcessCache, ok := pathEnd.packetProcessing[k]
 	if !ok {
@@ -637,7 +642,7 @@ func (pathEnd *pathEndRuntime) removePacketRetention(
 
 	// delete all packet flow retention history for this sequence
 	pathEnd.messageCache.PacketFlow[k].DeleteMessages(toDelete)
-	counterparty.messageCache.PacketFlow[k].DeleteMessages(toDeleteCounterparty)
+	counterparty.messageCache.PacketFlow[k.Counterparty()].DeleteMessages(toDeleteCounterparty)
 }
 
 // shouldSendConnectionMessage determines if the connection handshake message should be sent now.